Change JsCompiler and JsSafeCodingPolicy to strip the genfiles prefix

PiperOrigin-RevId: 732250224

Author: Closure Team

src/com/google/javascript/jscomp/CompilerOptions.java

@@ -1183,18 +1183,14 @@ public boolean getAssumeStaticInheritanceIsNotUsed() {
   private ImmutableList<ConformanceConfig> conformanceConfigs = ImmutableList.of();
 
   /**
-   * Remove the first match of this regex from any paths when checking conformance whitelists.
+   * Remove the first match of this regex from any paths when checking conformance allowlists.
    *
    * <p>You can use this to make absolute paths relative to the root of your source tree. This is
    * useful to work around CI and build systems that use absolute paths.
    */
   private Optional<Pattern> conformanceRemoveRegexFromPath =
       Optional.of(
-          // The regex uses lookahead because we want to be able to identify generated files. For a
-          // path like "blaze-out/directory/bin/some/file.js" we strip out the entire prefix,
-          // resulting in a reported path of "some/file.js". For generated files, we only strip the
-          // first two segments, leaving "genfiles/some/file.js".
-          Pattern.compile("^((.*/)?google3/)?(/?(blaze|bazel)-out/[^/]+/(bin/|(?=genfiles/)))?"));
+          Pattern.compile("^((.*/)?google3/)?(/?(blaze|bazel)-out/[^/]+/(bin|genfiles)/)?"));
 
   public void setConformanceRemoveRegexFromPath(Optional<Pattern> pattern) {
     conformanceRemoveRegexFromPath = pattern;

src/com/google/javascript/jscomp/conformance/conformance.proto

@@ -31,22 +31,26 @@ message Requirement {
   // and contacts.
   optional string error_message = 1;
 
-  // Optional: A list of source path prefixes that are exempt from the
-  // requirement.
+  // Optional: A list of google3-relative path prefixes that are exempt from the
+  // requirement. Do not include the `blaze-out/cfg/(bin|genfiles)` prefix for
+  // generated files.
   // DEPRECATED: Use allowlist instead.
   repeated string whitelist = 2 [deprecated = true];
 
-  // Optional: A list of source paths regexs that are exempt from the
-  // requirement.
+  // Optional: A list of google3-relative path regexps that are exempt from the
+  // requirement. Do not include the `blaze-out/cfg/(bin|genfiles)` prefix for
+  // generated files.
   // DEPRECATED: Use allowlist_regexp instead.
   repeated string whitelist_regexp = 3;
 
-  // Optional: A list of source path prefixes that are exempt from the
-  // requirement.
+  // Optional: A list of google3-relative path prefixes that are exempt from the
+  // requirement. Do not include the `blaze-out/cfg/(bin|genfiles)` prefix for
+  // generated files.
   repeated string allowlist = 17;
 
-  // Optional: A list of source path prefixes that are exempt from the
-  // requirement.
+  // Optional: A list of google3-relative path regexps that are exempt from the
+  // requirement. Do not include the `blaze-out/cfg/(bin|genfiles)` prefix for
+  // generated files.
   repeated string allowlist_regexp = 18;
 
   message WhitelistEntry {
@@ -59,10 +63,14 @@ message Requirement {
 
     optional Reason reason = 1;
 
-    // A list of source path prefixes.
+    // A list of google3-relative path prefixes to be allowlisted.
+    // Do not include the `blaze-out/cfg/(bin|genfiles)` prefix for generated
+    // files.
     repeated string prefix = 2;
 
-    // A list of regexes matching sources to be ignored
+    // A list of google3-relative path regexps to be allowlisted.
+    // Do not include the `blaze-out/cfg/(bin|genfiles)` prefix for generated
+    // files.
     repeated string regexp = 3;
 
     // Short explanation.

test/com/google/javascript/jscomp/CheckConformanceTest.java

@@ -495,7 +495,7 @@ public void testViolationWhitelistedIgnoresRegex_genfiles() {
             + "  type: BANNED_NAME\n"
             + "  value: 'eval'\n"
             + "  error_message: 'eval is not allowed'\n"
-            + "  whitelist: 'genfiles/file.js'\n "
+            + "  whitelist: 'file.js'\n "
             + "}";
 
     testNoWarning(srcs(SourceFile.fromCode("blaze-out/k8-opt/genfiles/file.js", "eval()")));
@@ -508,7 +508,7 @@ public void testViolationAllowlistedIgnoresRegex_genfiles() {
             + "  type: BANNED_NAME\n"
             + "  value: 'eval'\n"
             + "  error_message: 'eval is not allowed'\n"
-            + "  allowlist: 'genfiles/file.js'\n "
+            + "  allowlist: 'file.js'\n "
             + "}";
 
     testNoWarning(srcs(SourceFile.fromCode("blaze-out/k8-opt/genfiles/file.js", "eval()")));
@@ -521,8 +521,8 @@ public void testViolationWhitelistedAndAllowlistedIgnoresRegex_genfiles() {
             + "  type: BANNED_NAME\n"
             + "  value: 'eval'\n"
             + "  error_message: 'eval is not allowed'\n"
-            + "  whitelist: 'genfiles/file1.js'\n "
-            + "  allowlist: 'genfiles/file2.js'\n "
+            + "  whitelist: 'file1.js'\n "
+            + "  allowlist: 'file2.js'\n "
             + "}";
 
     testNoWarning(srcs(SourceFile.fromCode("blaze-out/k8-opt/genfiles/file1.js", "eval()")));

test/com/google/javascript/jscomp/CompilerOptionsTest.java

@@ -162,16 +162,25 @@ public void testRemoveRegexFromPath() {
         .isEqualTo("some/path");
     assertThat(pattern.matcher("blaze-out/k8-fastbin/bin/some/path").replaceAll(""))
         .isEqualTo("some/path");
-    assertThat(pattern.matcher("google3/bazel-out/k8-fastbin/bin/some/path").replaceAll(""))
+    assertThat(pattern.matcher("google3/blaze-out/k8-fastbin/bin/some/path").replaceAll(""))
         .isEqualTo("some/path");
     assertThat(pattern.matcher("google3/blaze-out/k8-fastbin/genfiles/some/path").replaceAll(""))
-        .isEqualTo("genfiles/some/path");
-    assertThat(pattern.matcher("somethin/google3/blaze-out/k8-fastbin/some/path").replaceAll(""))
+        .isEqualTo("some/path");
+    assertThat(pattern.matcher("something/google3/blaze-out/k8-fastbin/some/path").replaceAll(""))
         .isEqualTo("blaze-out/k8-fastbin/some/path");
+    assertThat(
+            pattern.matcher("/something/google3/blaze-out/k8-fastbin/bin/some/path").replaceAll(""))
+        .isEqualTo("some/path");
+    assertThat(pattern.matcher("google3/some/path").replaceAll("")).isEqualTo("some/path");
 
     assertThat(pattern.matcher("google3/foo/blaze-out/some/path").replaceAll(""))
         .isEqualTo("foo/blaze-out/some/path");
     assertThat(pattern.matcher("google3/blaze-out/foo/blaze-out/some/path").replaceAll(""))
         .isEqualTo("blaze-out/foo/blaze-out/some/path");
+
+    assertThat(pattern.matcher("bazel-out/k8-fastbin/bin/some/path").replaceAll(""))
+        .isEqualTo("some/path");
+    assertThat(pattern.matcher("bazel-out/k8-fastbin/genfiles/some/path").replaceAll(""))
+        .isEqualTo("some/path");
   }
 }