fix(graph): skip import edges for lexically shadowed require (#2890)

src/domain/javascript/javascriptSemanticAnalysis.ts

@@ -76,6 +76,7 @@ interface BindPatternInput {
   readonly state: JavaScriptSemanticAnalysisState;
   readonly mutable: boolean;
   readonly kind?: JavaScriptSemanticDefinition["kind"];
+  readonly declarationKind?: JavaScriptSemanticDefinition["declarationKind"];
   readonly projection?: readonly (string | number | null)[];
   readonly referenceOnly?: boolean;
   readonly copyKind?: "object-rest" | "array-rest";
@@ -100,6 +101,7 @@ interface AddBindingInput {
   readonly mutable: boolean;
   readonly definitionNode: t.Node;
   readonly initializer: t.Node | null;
+  readonly declarationKind?: JavaScriptSemanticDefinition["declarationKind"];
   readonly directOrigin?: JavaScriptModuleOrigin;
   readonly runtimeImport?: boolean;
   readonly projection?: readonly (string | number | null)[];
@@ -876,6 +878,14 @@ const bindInnerDeclaration = (
         parent !== null && t.isVariableDeclaration(parent)
           ? parent.kind !== "const"
           : true,
+      declarationKind:
+        parent !== null && t.isVariableDeclaration(parent)
+          ? parent.kind === "var" ||
+            parent.kind === "let" ||
+            parent.kind === "const"
+            ? parent.kind
+            : undefined
+          : undefined,
     });
   else if (t.isClassExpression(node) && t.isIdentifier(node.id))
     addBinding({
@@ -1154,6 +1164,7 @@ const bindPattern = (input: BindPatternInput): void => {
     state,
     mutable,
     kind = "variable",
+    declarationKind,
     projection = [],
     referenceOnly = false,
     copyKind,
@@ -1198,6 +1209,7 @@ const bindPattern = (input: BindPatternInput): void => {
       definitionNode: pattern,
       initializer,
       projection,
+      ...(declarationKind === undefined ? {} : { declarationKind }),
     });
     return;
   }
@@ -1299,6 +1311,7 @@ const addBinding = (input: AddBindingInput): void => {
     mutable,
     definitionNode,
     initializer,
+    declarationKind,
     directOrigin,
     runtimeImport,
     projection = [],
@@ -1311,7 +1324,11 @@ const addBinding = (input: AddBindingInput): void => {
     state.bindingsById.set(binding.bindingId, binding);
   }
   binding.mutable ||= mutable;
-  binding.definitions.push({ kind, location: range(definitionNode) });
+  binding.definitions.push({
+    kind,
+    location: range(definitionNode),
+    ...(declarationKind === undefined ? {} : { declarationKind }),
+  });
   if (initializer !== null)
     binding.initializers.push({ node: initializer, projection });
   if (directOrigin !== undefined)

src/domain/javascript/javascriptSemanticIr.ts

@@ -66,6 +66,12 @@ export interface JavaScriptSemanticDefinition {
     | "catch"
     | "assignment";
   readonly location: JavaScriptSourceRange;
+  /**
+   * The `VariableDeclaration` kind (`var`, `let`, `const`) for a `variable`
+   * definition. Recorded so consumers can distinguish hoisted `var`
+   * declarations from block-scoped `let`/`const` without reparsing.
+   */
+  readonly declarationKind?: "var" | "let" | "const";
 }
 
 /** One resolved lexical binding plus static value and provenance. */

src/domain/javascript/javascriptStaticAnalysisBundler.ts

@@ -2,6 +2,7 @@ import * as t from "@babel/types";
 import { javascriptBootstrapAt } from "./javascriptBootstrap.js";
 import {
   resolveSemanticBindingState,
+  semanticScopeId,
   type JavaScriptSemanticAnalysisState,
 } from "./javascriptSemanticState.js";
 
@@ -259,6 +260,11 @@ const recoverBundlerModule = (
       key,
       runtime,
       requireName,
+      // The factory's own scope always exists: the semantic pass creates one
+      // function scope per visited function node, and the factory is part of
+      // the analyzed source.
+      loaderScopeId:
+        requireName === "require" ? semanticScopeId("function", factory) : null,
     };
     accumulator.moduleRangeIndex.add(moduleRange);
   }