Merge pull request #4007 from Vertispan:4006-dont-parse-ast-for-bundle

PiperOrigin-RevId: 504106625

Author: copybara-github

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

@@ -2403,7 +2403,7 @@ void printBundleTo(JSChunk module, Appendable out) throws IOException {
       // ES6 modules will need a runtime in a bundle. Skip appending this runtime if there are no
       // ES6 modules to cut down on size.
       for (CompilerInput input : inputs) {
-        if ("es6".equals(input.getLoadFlags().get("module"))) {
+        if (input.isEs6Module()) {
           appendRuntimeTo(out);
           break;
         }

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

@@ -2249,7 +2249,7 @@ private void parsePotentialModules(Iterable<CompilerInput> inputsToProcess) {
       // Only process files that are detected as ES6 modules
       if (!options.getDependencyOptions().shouldPrune()
           || !JsFileRegexParser.isSupported()
-          || "es6".equals(input.getLoadFlags().get("module"))) {
+          || input.isEs6Module()) {
         filteredInputs.add(input);
       }
     }

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

@@ -47,7 +47,7 @@
  * and maintain state such as module for the input and whether the input is an extern. Also
  * calculates provided and required types.
  */
-public class CompilerInput extends DependencyInfo.Base {
+public class CompilerInput implements DependencyInfo {
 
   private static final long serialVersionUID = 2L;
 
@@ -587,6 +587,20 @@ public String toString() {
     return getName();
   }
 
+  @Override
+  public boolean isEs6Module() {
+    // Instead of doing a full parse to read all load flags, just ask the delegate, which at least
+    // has this much info
+    return getDependencyInfo().isEs6Module();
+  }
+
+  @Override
+  public boolean isGoogModule() {
+    // Instead of doing a full parse to read all load flags, just ask the delegate, which at least
+    // has this much info
+    return getDependencyInfo().isGoogModule();
+  }
+
   @Override
   public ImmutableMap<String, String> getLoadFlags() {
     return getDependencyInfo().getLoadFlags();

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

@@ -41,7 +41,7 @@
  * A JavaScript chunk has a unique name, consists of a list of compiler inputs, and can depend on
  * other chunks.
  */
-public final class JSChunk extends DependencyInfo.Base implements Serializable {
+public final class JSChunk implements Serializable, DependencyInfo {
   // The name of the artificial chunk containing all strong sources when there is no chunk spec.
   // If there is a chunk spec, strong sources go in their respective chunks, and this chunk does
   // not exist.
@@ -59,7 +59,7 @@ public final class JSChunk extends DependencyInfo.Base implements Serializable {
   private final String name;
 
   /** Source code inputs */
-  // non-final for deserilaization
+  // non-final for deserialization
   // CompilerInputs must be explicitly added to the JSChunk again after deserialization
   // A map keyed by the {@code CompilerInput.getName()} to speed up getByName and removeByName.
   private transient Map<String, CompilerInput> inputs = new LinkedHashMap<>();
@@ -132,11 +132,12 @@ public ImmutableMap<String, String> getLoadFlags() {
   }
 
   @Override
-  public boolean isModule() {
-    // NOTE: The meaning of "module" has changed over time.  A "JsChunk" is
-    // a collection of inputs that are loaded together. A "module" file,
-    // is a CommonJs module, ES6 module, goog.module or other file whose
-    // top level symbols are not in global scope.
+  public boolean isGoogModule() {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public boolean isEs6Module() {
     throw new UnsupportedOperationException();
   }
 

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

@@ -29,7 +29,7 @@
 import org.jspecify.nullness.Nullable;
 
 /** A DependencyInfo class that determines load flags by parsing the AST just-in-time. */
-public class LazyParsedDependencyInfo extends DependencyInfo.Base {
+public class LazyParsedDependencyInfo implements DependencyInfo {
 
   private final DependencyInfo delegate;
   private @Nullable JsAst ast;
@@ -43,6 +43,20 @@ public LazyParsedDependencyInfo(DependencyInfo delegate, JsAst ast, AbstractComp
     this.compiler = checkNotNull(compiler);
   }
 
+  @Override
+  public boolean isEs6Module() {
+    // Instead of doing a full parse to read all load flags, just ask the delegate, which at least
+    // has this much info
+    return delegate.isEs6Module();
+  }
+
+  @Override
+  public boolean isGoogModule() {
+    // Instead of doing a full parse to read all load flags, just ask the delegate, which at least
+    // has this much info
+    return delegate.isGoogModule();
+  }
+
   @Override
   public ImmutableMap<String, String> getLoadFlags() {
     if (loadFlags == null) {

src/com/google/javascript/jscomp/deps/ClosureBundler.java

@@ -189,9 +189,9 @@ public void appendTo(Appendable out, DependencyInfo info, File content, Charset
   /** Append the contents of the CharSource to the supplied appendable. */
   public void appendTo(Appendable out, DependencyInfo info, CharSource content) throws IOException {
     String code = content.read();
-    if (info.isModule()) {
+    if (info.isGoogModule()) {
       mode.appendGoogModule(transpile(code), out, sourceUrl);
-    } else if ("es6".equals(info.getLoadFlags().get("module")) && transpiler == Transpiler.NULL) {
+    } else if (info.isEs6Module() && transpiler == Transpiler.NULL) {
       // TODO(johnplaisted): Make the default transpiler the ES_MODULE_TO_CJS_TRANSPILER. Currently
       // some code is passing in unicode identifiers in non-ES6 modules the compiler fails to parse.
       // Once this compiler bug is fixed we can always transpile.

src/com/google/javascript/jscomp/deps/DependencyInfo.java

@@ -30,6 +30,7 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 /** A data structure for JS dependency information for a single .js file. */
 public interface DependencyInfo {
@@ -129,38 +130,32 @@ abstract static class Builder {
   /** Gets the symbols required by this file. */
   ImmutableList<Require> getRequires();
 
-  ImmutableList<String> getRequiredSymbols();
+  default ImmutableList<String> getRequiredSymbols() {
+    return Require.asSymbolList(getRequires());
+  }
 
   /** Gets the symbols type-required by this file (i.e. for typechecking only). */
   ImmutableList<String> getTypeRequires();
 
   /** Gets the loading information for this file. */
   ImmutableMap<String, String> getLoadFlags();
 
-  /** Whether the symbol is provided by a module */
-  boolean isModule();
+  /** Whether the symbol is provided by an ES6 module */
+  default boolean isEs6Module() {
+    return Objects.equals(getLoadFlags().get("module"), "es6");
+  }
+
+  /** Whether the symbol is provided by a goog module */
+  default boolean isGoogModule() {
+    return Objects.equals(getLoadFlags().get("module"), "goog");
+  }
 
   /** Whether the file '@externs' annotation. */
   boolean getHasExternsAnnotation();
 
   /** Whether the file has the '@nocompile' annotation. */
   boolean getHasNoCompileAnnotation();
 
-  /**
-   * Abstract base implementation that defines derived accessors such
-   * as {@link #isModule}.
-   */
-  abstract class Base implements DependencyInfo {
-    @Override public boolean isModule() {
-      return "goog".equals(getLoadFlags().get("module"));
-    }
-
-    @Override
-    public ImmutableList<String> getRequiredSymbols() {
-      return Require.asSymbolList(getRequires());
-    }
-  }
-
   /** Utility methods. */
   class Util {
     private Util() {}

src/com/google/javascript/jscomp/deps/DepsGenerator.java

@@ -219,7 +219,7 @@ private Map<String, DependencyInfo> removeMungedSymbols(
 
       ImmutableList<String> provides = dependencyInfo.getProvides();
 
-      if ("es6".equals(dependencyInfo.getLoadFlags().get("module"))) {
+      if (dependencyInfo.isEs6Module()) {
         String mungedProvide = loader.resolve(dependencyInfo.getName()).toModuleName();
         // Filter out the munged symbol.
         // Note that at the moment ES6 modules should not have any other provides! In the future
@@ -277,8 +277,7 @@ private void validateDependencies(Iterable<DependencyInfo> preparsedFileDependen
         } else if (provider == depInfo) {
           reportSameFile(namespace, depInfo);
         } else {
-          depInfo.isModule();
-          boolean providerIsEs6Module = "es6".equals(provider.getLoadFlags().get("module"));
+          boolean providerIsEs6Module = provider.isEs6Module();
 
           switch (require.getType()) {
             case ES6_IMPORT:
@@ -363,7 +362,7 @@ private void addToProvideMap(
                 .toModuleName());
       } else {
         // ES6 modules already provide these munged symbols.
-        if (!"es6".equals(depInfo.getLoadFlags().get("module"))) {
+        if (!depInfo.isEs6Module()) {
           provides.add(loader.resolve(depInfo.getName()).toModuleName());
         }
       }

src/com/google/javascript/jscomp/deps/SimpleDependencyInfo.java

@@ -23,11 +23,11 @@
 import java.util.Collection;
 import java.util.Map;
 
-/**
- * A class to hold JS dependency information for a single .js file.
- */
-@Immutable @AutoValue @AutoValue.CopyAnnotations
-public abstract class SimpleDependencyInfo extends DependencyInfo.Base {
+/** A class to hold JS dependency information for a single .js file. */
+@Immutable
+@AutoValue
+@AutoValue.CopyAnnotations
+public abstract class SimpleDependencyInfo implements DependencyInfo {
 
   public static Builder builder(String srcPathRelativeToClosure, String pathOfDefiningFile) {
     return new AutoValue_SimpleDependencyInfo.Builder()

src/com/google/javascript/jscomp/deps/SortedDependencies.java

@@ -207,7 +207,7 @@ private void processInputs() {
           || (provides.size() == 1
               && firstProvide.startsWith("module$")
               // ES6 modules should always be considered as exporting something.
-              && !"es6".equals(userOrderedInput.getLoadFlags().get("module")))) {
+              && !userOrderedInput.isEs6Module())) {
         nonExportingInputs.put(
             ModuleNames.fileToModuleName(userOrderedInput.getName()), userOrderedInput);
       }