move dependency construction from parser to linker

This means it's no longer included in the cached AST, so incremental builds will be very slightly longer while full builds should not be affected. But this means it's now easier to defer the decision of whether something is a dependency or not to link time.
evanw · Dec 28, 2021 · 989f03e · 989f03e
1 parent e873959
commit 989f03e
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 24 deletions.
diff --git a/internal/bundler/linker.go b/internal/bundler/linker.go
@@ -1339,6 +1339,31 @@ func (c *linkerContext) scanImportsAndExports() {
 			// come second after we fill in that array
 			c.createExportsForFile(uint32(sourceIndex))
 
+			// Each part tracks the other parts it depends on within this file
+			localDependencies := make(map[uint32]uint32)
+			parts := repr.AST.Parts
+			namedImports := repr.AST.NamedImports
+			for partIndex := range parts {
+				part := &parts[partIndex]
+				for ref := range part.SymbolUses {
+					for _, otherPartIndex := range repr.TopLevelSymbolToParts(ref) {
+						if oldPartIndex, ok := localDependencies[otherPartIndex]; !ok || oldPartIndex != uint32(partIndex) {
+							localDependencies[otherPartIndex] = uint32(partIndex)
+							part.Dependencies = append(part.Dependencies, js_ast.Dependency{
+								SourceIndex: sourceIndex,
+								PartIndex:   otherPartIndex,
+							})
+						}
+					}
+
+					// Also map from imports to parts that use them
+					if namedImport, ok := namedImports[ref]; ok {
+						namedImport.LocalPartsWithUses = append(namedImport.LocalPartsWithUses, uint32(partIndex))
+						namedImports[ref] = namedImport
+					}
+				}
+			}
+
 			waitGroup.Done()
 		}(sourceIndex, repr)
 	}

diff --git a/internal/graph/graph.go b/internal/graph/graph.go
@@ -174,7 +174,6 @@ func CloneLinkerGraph(
 						clone[ref] = uses
 					}
 					part.SymbolUses = clone
-					part.Dependencies = append([]js_ast.Dependency{}, part.Dependencies...)
 				}
 
 				// Clone the import records

diff --git a/internal/js_parser/js_parser.go b/internal/js_parser/js_parser.go
@@ -15291,29 +15291,6 @@ func (p *parser) toAST(parts []js_ast.Part, hashbang string, directive string) j
 
 		// Pulling in the exports of this module always pulls in the export part
 		p.topLevelSymbolToParts[p.exportsRef] = append(p.topLevelSymbolToParts[p.exportsRef], js_ast.NSExportPartIndex)
-
-		// Each part tracks the other parts it depends on within this file
-		localDependencies := make(map[uint32]uint32)
-		for partIndex := range parts {
-			part := &parts[partIndex]
-			for ref := range part.SymbolUses {
-				for _, otherPartIndex := range p.topLevelSymbolToParts[ref] {
-					if oldPartIndex, ok := localDependencies[otherPartIndex]; !ok || oldPartIndex != uint32(partIndex) {
-						localDependencies[otherPartIndex] = uint32(partIndex)
-						part.Dependencies = append(part.Dependencies, js_ast.Dependency{
-							SourceIndex: p.source.Index,
-							PartIndex:   otherPartIndex,
-						})
-					}
-				}
-
-				// Also map from imports to parts that use them
-				if namedImport, ok := p.namedImports[ref]; ok {
-					namedImport.LocalPartsWithUses = append(namedImport.LocalPartsWithUses, uint32(partIndex))
-					p.namedImports[ref] = namedImport
-				}
-			}
-		}
 	}
 
 	// Make a wrapper symbol in case we need to be wrapped in a closure