Always set ClosureUnawareMode.SIMPLE_OPTIMIZATIONS_AND_TRANSPILATION & remove the flag

ClosureUnawareMode.SIMPLE_OPTIMIZATIONS_AND_TRANSPILATION was already the default, but we are just removing the ability to opt out.

The mode for handling @closureUnaware blocks is now specified within the annotation itself (e.g., @closureUnaware {SIMPLE} or @closureUnaware {WHITESPACE}), making the global CompilerOptions.ClosureUnawareMode redundant.

PiperOrigin-RevId: 892379719

Author: lauraharker

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

@@ -68,8 +68,6 @@ enum TypeInfoValidation {
   /** Validate that all required inlinings were performed. */
   private final boolean shouldValidateRequiredInlinings;
 
-  private final boolean shouldValidateFeaturesInClosureUnaware;
-
   public AstValidator(
       AbstractCompiler compiler,
       ViolationHandler handler,
@@ -79,9 +77,6 @@ public AstValidator(
     this.violationHandler = handler;
     this.isScriptFeatureValidationEnabled = validateScriptFeatures;
     this.shouldValidateRequiredInlinings = shouldValidateRequiredInlinings;
-    this.shouldValidateFeaturesInClosureUnaware =
-        compiler.getOptions().getClosureUnawareMode()
-            == CompilerOptions.ClosureUnawareMode.SIMPLE_OPTIMIZATIONS_AND_TRANSPILATION;
   }
 
   public AstValidator(AbstractCompiler compiler) {
@@ -2131,14 +2126,6 @@ private void validateMaximumChildCount(Node n, int i) {
   }
 
   private void validateFeature(Feature feature, Node n) {
-    if (!shouldValidateFeaturesInClosureUnaware && n.getIsInClosureUnawareSubtree()) {
-      // Closure-unaware code is currently hidden from transpilation passes in the compiler when
-      // options.setClosureUnawareMode(Mode.PASS_THROUGH) is enabled, so the AST
-      // might still contain features that should have been transpiled.
-      // TODO: b/321233583 - Once JSCompiler always transpiles closure-unaware code, remove this
-      // early-return to validate that all closure-unaware code is transpiled properly.
-      return;
-    }
     FeatureSet allowbleFeatures = compiler.getAllowableFeatures();
     // Checks that feature present in the AST is recorded in the compiler's featureSet.
     if (!n.isFromExterns() && !allowbleFeatures.has(feature)) {

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

@@ -87,10 +87,6 @@ private void setTranspilationOptions() {
     // DiagnosticGroups.UNTRANSPILABLE_FEATURES: features JSCompiler will never transpile but
     // can pass through unchanged to the output, such as newer regex syntax.
     shadowOptions.setWarningLevel(DiagnosticGroups.UNTRANSPILABLE_FEATURES, CheckLevel.OFF);
-
-    // No point in trying to run the TranspileAndOptimizeClosureUnaware pass recursively - we don't
-    // support nesting @closureUnaware code blocks.
-    shadowOptions.setClosureUnawareMode(CompilerOptions.ClosureUnawareMode.PASS_THROUGH);
   }
 
   private void setSafeOptimizationAssumptions() {

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

@@ -2898,34 +2898,6 @@ String getReplaceStringsPlaceholderToken() {
     return this.replaceStringsPlaceholderToken;
   }
 
-  /**
-   * How @closureUnaware code blocks should be handled.
-   *
-   * <p>PASS_THROUGH: they are entirely hidden from the compiler, as if they were an evaled string.
-   *
-   * <p>SIMPLE_OPTIMIZATIONS_AND_TRANSPILATION: This is *experimental* - we want to support some
-   * minimal transpilation & safe optimizations. TODO: b/421971366 - implement this flag.
-   */
-  public enum ClosureUnawareMode {
-    PASS_THROUGH,
-    SIMPLE_OPTIMIZATIONS_AND_TRANSPILATION
-  }
-
-  private ClosureUnawareMode closureUnawareMode =
-      ClosureUnawareMode.SIMPLE_OPTIMIZATIONS_AND_TRANSPILATION;
-
-  /**
-   * Opts into experimental support for transpiling/optimizing @closureUnaware code blocks, rather
-   * than just passing them through compilation unchanged.
-   */
-  public void setClosureUnawareMode(ClosureUnawareMode mode) {
-    this.closureUnawareMode = mode;
-  }
-
-  ClosureUnawareMode getClosureUnawareMode() {
-    return this.closureUnawareMode;
-  }
-
   public void setPrettyPrint(boolean prettyPrint) {
     this.prettyPrint = prettyPrint;
   }

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

@@ -148,10 +148,7 @@ protected PassListBuilder getTranspileOnlyPasses() {
 
     TranspilationPasses.addTranspilationRuntimeLibraries(passes);
 
-    if (options.getClosureUnawareMode()
-        == CompilerOptions.ClosureUnawareMode.SIMPLE_OPTIMIZATIONS_AND_TRANSPILATION) {
-      passes.maybeAdd(transpileOnlyClosureUnaware);
-    }
+    passes.maybeAdd(transpileOnlyClosureUnaware);
 
     if (options.needsTranspilationFrom(ES2015) && options.getRewritePolyfills()) {
       if (options.getIsolatePolyfills()) {
@@ -870,10 +867,7 @@ private PassListBuilder getEarlyOptimizationPasses() {
       passes.maybeAdd(j2clPass);
     }
 
-    if (options.getClosureUnawareMode()
-        == CompilerOptions.ClosureUnawareMode.SIMPLE_OPTIMIZATIONS_AND_TRANSPILATION) {
-      passes.maybeAdd(transpileAndOptimizeClosureUnaware);
-    }
+    passes.maybeAdd(transpileAndOptimizeClosureUnaware);
 
     TranspilationPasses.addTranspilationRuntimeLibraries(passes);