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(javascript): admit CommonJS bare scoped package directory resolution (#4838)
Prasad Navale09de00b4108a
diff --git a/src/application/javascript/JavaScriptArtifactPathResolution.test.ts b/src/application/javascript/JavaScriptArtifactPathResolution.test.tsindex dc0ccf5e6..268932456 100644--- a/src/application/javascript/JavaScriptArtifactPathResolution.test.ts+++ b/src/application/javascript/JavaScriptArtifactPathResolution.test.ts@@ -1280,6 +1280,173 @@ describe("package exports subpath resolution", () => {});});+describe("scoped package directory and specifier resolution", () => {+ it("resolves CommonJS bare scoped package directory to index or package main", () => {+ const files = fileMap([+ file("app/src/consumer.js", "root"),+ file("app/node_modules/@scope/index.js", "root"),+ file(+ "app/node_modules/@scope-main/package.json",+ "root",+ JSON.stringify({ main: "entry.js" }),+ ),+ file("app/node_modules/@scope-main/entry.js", "root"),+ ]);++ expect(+ resolve({+ declaredPath: "@scope",+ sourcePath: "app/src/consumer.js",+ context: "module-specifier",+ moduleKind: "require",+ files,+ }),+ ).toMatchObject({+ resolution_status: "resolved",+ resolved_path: "app/node_modules/@scope/index.js",+ });++ expect(+ resolve({+ declaredPath: "@scope/",+ sourcePath: "app/src/consumer.js",+ context: "module-specifier",+ moduleKind: "require",+ files,+ }),+ ).toMatchObject({+ resolution_status: "resolved",+ resolved_path: "app/node_modules/@scope/index.js",+ });++ expect(+ resolve({+ declaredPath: "@scope-main",+ sourcePath: "app/src/consumer.js",+ context: "module-specifier",+ moduleKind: "require",+ files,+ }),+ ).toMatchObject({+ resolution_status: "resolved",+ resolved_path: "app/node_modules/@scope-main/entry.js",+ });++ expect(+ resolve({+ declaredPath: "@scope-main/",+ sourcePath: "app/src/consumer.js",+ context: "module-specifier",+ moduleKind: "require",+ files,+ }),+ ).toMatchObject({+ resolution_status: "resolved",+ resolved_path: "app/node_modules/@scope-main/entry.js",+ });+ });++ it("distinguishes CommonJS scoped exports from ESM loader-owned export and specifier errors", () => {+ const files = fileMap([+ file("app/src/consumer.js", "root"),+ file(+ "app/node_modules/@scope/package.json",+ "root",+ JSON.stringify({+ exports: {+ ".": "./selected.js",+ },+ }),+ ),+ file("app/node_modules/@scope/selected.js", "root"),+ file("app/node_modules/@scope/index.js", "root"),+ ]);++ // CommonJS require("@scope") resolves root exports+ expect(+ resolve({+ declaredPath: "@scope",+ sourcePath: "app/src/consumer.js",+ context: "module-specifier",+ moduleKind: "require",+ files,+ }),+ ).toMatchObject({+ resolution_status: "resolved",+ resolved_path: "app/node_modules/@scope/selected.js",+ });++ // CommonJS require("@scope/") does not match "." subpath exports+ expect(+ resolve({+ declaredPath: "@scope/",+ sourcePath: "app/src/consumer.js",+ context: "module-specifier",+ moduleKind: "require",+ files,+ }),+ ).toMatchObject({+ resolution_status: "external",+ resolved_path: null,+ });++ // ESM import "@scope" without trailing slash is an invalid module specifier+ expect(+ resolve({+ declaredPath: "@scope",+ sourcePath: "app/src/consumer.js",+ context: "module-specifier",+ moduleKind: "import",+ files,+ }),+ ).toMatchObject({+ resolution_status: "external",+ resolved_path: null,+ });++ // ESM import "@scope/" with trailing slash resolves root exports+ expect(+ resolve({+ declaredPath: "@scope/",+ sourcePath: "app/src/consumer.js",+ context: "module-specifier",+ moduleKind: "import",+ files,+ }),+ ).toMatchObject({+ resolution_status: "resolved",+ resolved_path: "app/node_modules/@scope/selected.js",+ });++ // Truly invalid scoped specifiers stay external+ expect(+ resolve({+ declaredPath: "@",+ sourcePath: "app/src/consumer.js",+ context: "module-specifier",+ moduleKind: "require",+ files,+ }),+ ).toMatchObject({+ resolution_status: "external",+ resolved_path: null,+ });++ expect(+ resolve({+ declaredPath: "@/",+ sourcePath: "app/src/consumer.js",+ context: "module-specifier",+ moduleKind: "require",+ files,+ }),+ ).toMatchObject({+ resolution_status: "external",+ resolved_path: null,+ });+ });+});+describe("package exports subpath encapsulation", () => {it("keeps subpaths encapsulated when only a root target is exported", () => {const files = fileMap([diff --git a/src/application/javascript/JavaScriptArtifactPathResolution.ts b/src/application/javascript/JavaScriptArtifactPathResolution.tsindex 94ffbc772..b536b0a33 100644--- a/src/application/javascript/JavaScriptArtifactPathResolution.ts+++ b/src/application/javascript/JavaScriptArtifactPathResolution.ts@@ -1056,11 +1056,15 @@ const parseBarePackageRequest = (): BarePackageRequest | null => {const segments = specifier.split("/");let packageName = segments[0] ?? "";- if (packageName === "") return null;+ if (packageName === "" || packageName === "@") return null;if (specifier.startsWith("@")) {const packageSegment = segments[1];- if (packageSegment === undefined || packageSegment === "") return null;- packageName = `${packageName}/${packageSegment}`;+ if (packageSegment !== undefined && packageSegment !== "") {+ packageName = `${packageName}/${packageSegment}`;+ } else if (moduleKind !== "require") {+ if (packageSegment === undefined) return null;+ packageName = `${packageName}/`;+ }}// Node's CommonJS exports matcher excludes percent-containing package names.// Compare the captured name so a scoped name cannot fall back to its scope.