Use LinkedHash(Map|Set) to guarantee deterministic iteration order

modules

PiperOrigin-RevId: 617584390

Author: brad4d

src/com/google/javascript/jscomp/modules/ClosureModuleProcessor.java

@@ -33,9 +33,8 @@
 import com.google.javascript.jscomp.modules.ModuleMapCreator.ModuleProcessor;
 import com.google.javascript.jscomp.modules.ModuleMetadataMap.ModuleMetadata;
 import com.google.javascript.rhino.Node;
-import java.util.HashMap;
-import java.util.HashSet;
 import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
 import org.jspecify.nullness.Nullable;
@@ -117,7 +116,7 @@ public Module resolve(
 
     /** A map from import bound name to binding. */
     Map<String, Binding> getAllResolvedImports(ModuleRequestResolver moduleRequestResolver) {
-      Map<String, Binding> imports = new HashMap<>();
+      Map<String, Binding> imports = new LinkedHashMap<>();
 
       for (String name : requiresByLocalName.keySet()) {
         ResolveExportResult b = resolveImport(moduleRequestResolver, name);
@@ -152,8 +151,8 @@ ResolveExportResult resolveImport(ModuleRequestResolver moduleRequestResolver, S
                 moduleRequestResolver,
                 importRecord.moduleRequest(),
                 importRecord.importName(),
-                new HashSet<>(),
-                new HashSet<>());
+                new LinkedHashSet<>(),
+                new LinkedHashSet<>());
         if (!result.found() && !result.hadError()) {
           reportInvalidDestructuringRequire(requested, importRecord);
           return ResolveExportResult.ERROR;
@@ -288,15 +287,19 @@ public UnresolvedModule process(ModuleMetadata metadata, ModulePath path, Node s
   /** Traverses a subtree rooted at a module, gathering all exports and requires */
   private static class ModuleProcessingCallback extends AbstractPreOrderCallback {
     private final ModuleMetadata metadata;
+
     /** The Closure namespace 'a.b.c' from the `goog.module('a.b.c');` statement */
     private final String closureNamespace;
+
     // Note: the following two maps are mutable because in some cases, we need to check if a key has
     // already been added before trying to add a second.
 
     /** All named exports and explicit assignments of the `exports` object */
     private final Map<String, Binding> namespace;
+
     /** All required/forwardDeclared local names */
     private final Map<String, Require> requiresByLocalName;
+
     /** Whether we've come across an "exports = ..." assignment */
     private boolean seenExportsAssignment;
 

src/com/google/javascript/jscomp/modules/EsModuleProcessor.java

@@ -38,9 +38,8 @@
 import com.google.javascript.jscomp.modules.ModuleMetadataMap.ModuleMetadata;
 import com.google.javascript.rhino.Node;
 import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
 import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -196,9 +195,9 @@ private final class UnresolvedModuleBuilder {
     UnresolvedModuleBuilder(ModulePath path, Node root) {
       this.path = path;
       this.root = root;
-      importsByLocalName = new HashMap<>();
+      importsByLocalName = new LinkedHashMap<>();
       exports = new ArrayList<>();
-      exportedNames = new HashSet<>();
+      exportedNames = new LinkedHashSet<>();
     }
 
     void add(Import i) {
@@ -293,8 +292,8 @@ private UnresolvedEsModule(
       this.indirectExports = indirectExports;
       this.starExports = starExports;
       exportedNames = null;
-      resolvedImports = new HashMap<>();
-      resolvedExports = new HashMap<>();
+      resolvedImports = new LinkedHashMap<>();
+      resolvedExports = new LinkedHashMap<>();
       resolved = null;
     }
 
@@ -314,7 +313,7 @@ public Module resolve(
         Map<String, Binding> boundNames =
             new LinkedHashMap<>(getAllResolvedImports(moduleRequestResolver));
 
-        Map<String, Export> localNameToLocalExport = new HashMap<>();
+        Map<String, Export> localNameToLocalExport = new LinkedHashMap<>();
 
         // Only local exports that are not an anonymous default export create local bindings.
         for (Export e : localExports) {
@@ -350,7 +349,7 @@ ModuleMetadata metadata() {
 
     /** A map from import bound name to binding. */
     Map<String, Binding> getAllResolvedImports(ModuleRequestResolver moduleRequestResolver) {
-      Map<String, Binding> imports = new HashMap<>();
+      Map<String, Binding> imports = new LinkedHashMap<>();
 
       for (String name : importsByLocalName.keySet()) {
         ResolveExportResult b = resolveImport(moduleRequestResolver, name);
@@ -378,7 +377,8 @@ public ResolveExportResult resolveImport(
 
     public ResolveExportResult resolveImport(
         ModuleRequestResolver moduleRequestResolver, String name) {
-      return resolveImport(moduleRequestResolver, name, new HashSet<>(), new HashSet<>());
+      return resolveImport(
+          moduleRequestResolver, name, new LinkedHashSet<>(), new LinkedHashSet<>());
     }
 
     private ResolveExportResult resolveImportImpl(
@@ -461,7 +461,7 @@ private ResolveExportResult resolveImportImpl(
     @Override
     public ImmutableSet<String> getExportedNames(ModuleRequestResolver moduleRequestResolver) {
       if (exportedNames == null) {
-        exportedNames = getExportedNames(moduleRequestResolver, new HashSet<>());
+        exportedNames = getExportedNames(moduleRequestResolver, new LinkedHashSet<>());
       }
       return exportedNames;
     }
@@ -672,10 +672,7 @@ public ResolveExportResult resolveExport(
   private @Nullable ModuleMetadata metadata;
 
   @Override
-  public UnresolvedModule process(
-      ModuleMetadata metadata,
-      ModulePath path,
-      Node script) {
+  public UnresolvedModule process(ModuleMetadata metadata, ModulePath path, Node script) {
     this.metadata = metadata;
     currentModuleBuilder = new UnresolvedModuleBuilder(path, script);
 

src/com/google/javascript/jscomp/modules/ModuleMapCreator.java

@@ -26,7 +26,7 @@
 import com.google.javascript.jscomp.modules.ModuleMetadataMap.ModuleMetadata;
 import com.google.javascript.jscomp.modules.ModuleMetadataMap.ModuleType;
 import com.google.javascript.rhino.Node;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
 import org.jspecify.nullness.Nullable;
@@ -185,8 +185,8 @@ public ModuleMapCreator(AbstractCompiler compiler, ModuleMetadataMap moduleMetad
     this.esModuleProcessor = new EsModuleProcessor(compiler);
     this.closureModuleProcessor = new ClosureModuleProcessor(compiler);
     this.nonEsModuleProcessor = new NonEsModuleProcessor();
-    unresolvedModules = new HashMap<>();
-    unresolvedModulesByClosureNamespace = new HashMap<>();
+    unresolvedModules = new LinkedHashMap<>();
+    unresolvedModulesByClosureNamespace = new LinkedHashMap<>();
   }
 
   private ModuleMap create() {
@@ -204,8 +204,8 @@ private ModuleMap create() {
 
   private ModuleMap resolve() {
     ModuleRequestResolver requestResolver = new ModuleRequestResolverImpl();
-    Map<String, Module> resolvedModules = new HashMap<>();
-    Map<String, Module> resolvedClosureModules = new HashMap<>();
+    Map<String, Module> resolvedModules = new LinkedHashMap<>();
+    Map<String, Module> resolvedClosureModules = new LinkedHashMap<>();
 
     // We need to resolve in a loop as any missing reference will add a fake to the
     // unresolvedModules map (see getFallback* methods above). This would cause a concurrent
@@ -286,5 +286,4 @@ private void process(ModuleMetadata moduleMetadata) {
   public void process(Node externs, Node root) {
     compiler.setModuleMap(create());
   }
-
 }

src/com/google/javascript/jscomp/modules/UnresolvedModule.java

@@ -17,7 +17,7 @@
 
 import com.google.common.collect.ImmutableSet;
 import com.google.javascript.jscomp.modules.ModuleMetadataMap.ModuleMetadata;
-import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.Set;
 import org.jspecify.nullness.Nullable;
 
@@ -81,8 +81,8 @@ ResolveExportResult resolveExport(
         moduleRequestResolver,
         /* moduleSpecifier= */ null,
         exportName,
-        new HashSet<>(),
-        new HashSet<>());
+        new LinkedHashSet<>(),
+        new LinkedHashSet<>());
   }
 
   /**