Reverse engineer anything with agents, from app behavior down to native binaries.
TypeScript agent-skillsai-agentsbinary-analysisclaude-codeclicodexcordisdecompilerdeveloper-toolsdshdsh-pluginghidrahopperllmmcpmodel-context-protocolreareverse-engineeringstatic-analysistouhou
fix(browser): omit erased type-only import-equals from source-map dependencies (#4165)
Kaoru08228686b32209f4
diff --git a/src/browser/WebSourceMapFetcher.ts b/src/browser/WebSourceMapFetcher.tsindex 567ed4aa9..b7bb390db 100644--- a/src/browser/WebSourceMapFetcher.ts+++ b/src/browser/WebSourceMapFetcher.ts@@ -14,6 +14,7 @@ import { parseJavaScriptSource } from "../domain/javascript/javascriptSourceParsimport {isTypeOnlyExportDeclaration,isTypeOnlyImportDeclaration,+ semanticImportEqualsSpecifier,} from "../domain/javascript/javascriptModuleDeclaration.js";import { stringValue } from "../domain/javascript/javascriptStaticAnalysisHelpers.js";import type {@@ -1100,16 +1101,11 @@ const originalDependency = (: { kind: "require", specifier, requireCallee: node.callee };}// `import x = require("m")` is only legal at module top level and always- // refers to the host loader, so it needs no unbound-`require` check. The- // `moduleReference` is an entity name for a local alias instead, which- // declares no dependency.- if (- t.isTSImportEqualsDeclaration(node) &&- t.isTSExternalModuleReference(node.moduleReference)- )- return {- kind: "require",- specifier: node.moduleReference.expression.value,- };+ // refers to the host loader, so it needs no unbound-`require` check. An+ // entity-name alias or an erased `import type` declares no dependency.+ if (t.isTSImportEqualsDeclaration(node)) {+ const specifier = semanticImportEqualsSpecifier(node);+ return specifier === null ? null : { kind: "require", specifier };+ }return null;};diff --git a/src/domain/javascript/javascriptModuleDeclaration.ts b/src/domain/javascript/javascriptModuleDeclaration.tsindex d7a8d6754..30e705b08 100644--- a/src/domain/javascript/javascriptModuleDeclaration.ts+++ b/src/domain/javascript/javascriptModuleDeclaration.ts@@ -16,6 +16,19 @@ export const isTypeOnlyExportDeclaration = (t.isTSTypeAliasDeclaration(node.declaration) ||t.isTSDeclareFunction(node.declaration)));+/**+ * Runtime external-module target for a value import-equals declaration;+ * `import type X = require("m")` is erased and declares no dependency.+ */+export const semanticImportEqualsSpecifier = (+ node: t.TSImportEqualsDeclaration,+): string | null =>+ node.importKind !== "type" &&+ t.isTSExternalModuleReference(node.moduleReference) &&+ t.isStringLiteral(node.moduleReference.expression)+ ? node.moduleReference.expression.value+ : null;+/** Whether this import binding is explicitly type-only. */export const isTypeOnlyImportSpecifier = (node: t.ImportSpecifier): boolean =>node.importKind === "type" || node.importKind === "typeof";diff --git a/src/domain/javascript/javascriptSemanticAnalysis.ts b/src/domain/javascript/javascriptSemanticAnalysis.tsindex 176be51dd..a44914ab0 100644--- a/src/domain/javascript/javascriptSemanticAnalysis.ts+++ b/src/domain/javascript/javascriptSemanticAnalysis.ts@@ -10,7 +10,6 @@ import {import {collectSemanticModuleLink,collectSemanticCallable,- semanticImportEqualsSpecifier,collectSemanticReferences,collectSemanticReferencesSteps,immutableSemanticBindings,@@ -47,7 +46,10 @@ import { semanticRequireOrigin } from "./javascriptSemanticRequireOrigin.js";import { semanticBundledRequireOrigin } from "./javascriptBundledRequireOrigin.js";import { collectSemanticMemberMutationsSteps } from "./javascriptSemanticMemberMutations.js";import { indexJavaScriptAmbientWritesSteps } from "./javascriptSemanticAmbientWrites.js";-import { hasUncertainTypeOnlyModuleSideEffect } from "./javascriptModuleDeclaration.js";+import {+ hasUncertainTypeOnlyModuleSideEffect,+ semanticImportEqualsSpecifier,+} from "./javascriptModuleDeclaration.js";import {collectSemanticReturns,resolveSemanticModuleCallables,diff --git a/src/domain/javascript/javascriptSemanticProjection.ts b/src/domain/javascript/javascriptSemanticProjection.tsindex 9389427d8..27f2fd36c 100644--- a/src/domain/javascript/javascriptSemanticProjection.ts+++ b/src/domain/javascript/javascriptSemanticProjection.ts@@ -36,6 +36,7 @@ import {isTypeOnlyExportSpecifier,isTypeOnlyImportDeclaration,isTypeOnlyImportSpecifier,+ semanticImportEqualsSpecifier,} from "./javascriptModuleDeclaration.js";import {commonJsExportName,@@ -149,16 +150,6 @@ const collectImportEquals = ();};-/** Runtime external-module target for a value import-equals declaration. */-export const semanticImportEqualsSpecifier = (- node: t.TSImportEqualsDeclaration,-): string | null =>- node.importKind !== "type" &&- t.isTSExternalModuleReference(node.moduleReference) &&- t.isStringLiteral(node.moduleReference.expression)- ? node.moduleReference.expression.value- : null;-/** Collect lexical references after definitions exist, optionally for one name. */export const collectSemanticReferences = (program: t.Program,diff --git a/src/domain/javascript/javascriptStaticAnalysis.ts b/src/domain/javascript/javascriptStaticAnalysis.tsindex 49158abe6..a630ff578 100644--- a/src/domain/javascript/javascriptStaticAnalysis.ts+++ b/src/domain/javascript/javascriptStaticAnalysis.ts@@ -51,11 +51,11 @@ import {} from "./javascriptSourceParser.js";import { createJavaScriptRpcScan } from "./javascriptRpcEndpoints.js";-import { semanticImportEqualsSpecifier } from "./javascriptSemanticProjection.js";import {hasUncertainTypeOnlyModuleSideEffect,isTypeOnlyExportDeclaration,isTypeOnlyImportDeclaration,+ semanticImportEqualsSpecifier,} from "./javascriptModuleDeclaration.js";/** Parse one JavaScript artifact and recover static structure only. */diff --git a/tests/boundary/browser/webSourceMapFetcher.test.ts b/tests/boundary/browser/webSourceMapFetcher.test.tsindex 782ff8cf0..7ff80d534 100644--- a/tests/boundary/browser/webSourceMapFetcher.test.ts+++ b/tests/boundary/browser/webSourceMapFetcher.test.ts@@ -1102,6 +1102,11 @@ describe("source-map dependency coverage of hard-to-parse sources", () => {'import lib = require("./lib.js");',["./lib.js"],],+ [+ "type-only import equals",+ 'import type Types = require("./types.js");\nimport lib = require("./lib.js");',+ ["./lib.js"],+ ],["whole-statement type-only import",'import type { Value } from "./types.js";',