diff --git a/src/application/javascript/JavaScriptArtifactGraphFindings.ts b/src/application/javascript/JavaScriptArtifactGraphFindings.ts index 8bef71eb85..74aca4d02a 100644 --- a/src/application/javascript/JavaScriptArtifactGraphFindings.ts +++ b/src/application/javascript/JavaScriptArtifactGraphFindings.ts @@ -741,7 +741,8 @@ const resolveReference = ( targetPath !== undefined && isJsonModuleTarget(targetPath, targetKind); const targetImportsUnexamined = !targetIsJson && - (resolution.resolution_status === "unavailable" || + (resolution.unexamined_module_imports === true || + resolution.resolution_status === "unavailable" || (path !== null && !context.applicationModuleReferencesRetained.has(path))); if (path === null) { diff --git a/src/application/javascript/JavaScriptArtifactPathResolution.test.ts b/src/application/javascript/JavaScriptArtifactPathResolution.test.ts index c17cd7198a..81ccce44db 100644 --- a/src/application/javascript/JavaScriptArtifactPathResolution.test.ts +++ b/src/application/javascript/JavaScriptArtifactPathResolution.test.ts @@ -4494,3 +4494,28 @@ describe("package metadata at archive module boundaries", () => { }, ); }); + +it("distinguishes an unobserved bare package from builtins and blocked aliases", () => { + const files = aliasFiles({ + "package.json": JSON.stringify({ + imports: { "#blocked": null, "#builtin": "node:path" }, + }), + "main.js": "", + }); + const resolveName = (declaredPath: string) => + resolve({ + declaredPath, + sourcePath: "main.js", + context: "module-specifier", + moduleKind: "require", + files, + }); + expect(resolveName("outside-package")).toMatchObject({ + resolution_status: "external", + unexamined_module_imports: true, + }); + for (const name of ["node:path", "electron", "#blocked", "#builtin"]) + expect(resolveName(name), name).not.toHaveProperty( + "unexamined_module_imports", + ); +}); diff --git a/src/application/javascript/JavaScriptArtifactPathResolution.ts b/src/application/javascript/JavaScriptArtifactPathResolution.ts index ccc4a51477..cfddaf68ec 100644 --- a/src/application/javascript/JavaScriptArtifactPathResolution.ts +++ b/src/application/javascript/JavaScriptArtifactPathResolution.ts @@ -58,6 +58,8 @@ interface ArtifactPathResolutionBase { readonly limitations: readonly string[]; readonly conditional_resolutions?: readonly ConditionalModuleResolution[]; readonly candidate_path?: string; + /** An external module can run code whose imports were not inventoried. */ + readonly unexamined_module_imports?: true; } export interface ConditionalModuleResolution { @@ -192,6 +194,7 @@ type CandidateResolution = { readonly limitations: readonly string[]; readonly candidatePath?: string; readonly conditionalResolutions?: readonly ConditionalModuleResolution[]; + readonly unexaminedModuleImports?: true; } & ( | { readonly resolvedPath: string; readonly status: "resolved" } | { @@ -219,6 +222,9 @@ export const resolveArtifactPathByContext = ( : {}), resolution_context: input.context, limitations: resolution.limitations, + ...(resolution.unexaminedModuleImports === true + ? { unexamined_module_imports: true as const } + : {}), ...(resolution.candidatePath === undefined ? {} : { candidate_path: resolution.candidatePath }), @@ -339,6 +345,10 @@ const resolvePath = (input: ResolveArtifactPathInput): CandidateResolution => { return sameOutcome ? { ...imported, + ...(imported.unexaminedModuleImports === true || + required.unexaminedModuleImports === true + ? { unexaminedModuleImports: true as const } + : {}), limitations: [ ...new Set([ ...imported.limitations, @@ -910,10 +920,21 @@ const bareModuleCandidate = ( } else return packageResolution; } } - if (nearestNotFound !== null) return nearestNotFound; - return unresolvedCandidate("external", [ - "No matching bare package was inventoried in an enclosing node_modules directory.", - ]); + if (nearestNotFound !== null) + return { + ...nearestNotFound, + ...(ELECTRON_MODULE.test(input.declaredPath) + ? {} + : { unexaminedModuleImports: true as const }), + }; + return { + ...unresolvedCandidate("external", [ + "No matching bare package was inventoried in an enclosing node_modules directory.", + ]), + ...(ELECTRON_MODULE.test(input.declaredPath) + ? {} + : { unexaminedModuleImports: true as const }), + }; }; function* packageLookupDirectories( diff --git a/tests/boundary/cli/electronScopedIpc.test.ts b/tests/boundary/cli/electronScopedIpc.test.ts index beab7c507f..6f0fc9eecc 100644 --- a/tests/boundary/cli/electronScopedIpc.test.ts +++ b/tests/boundary/cli/electronScopedIpc.test.ts @@ -228,3 +228,28 @@ cliTest.for(["CLI", "stdio MCP"] as const)( } }, ); + +cliTest.for(["CLI", "stdio MCP"] as const)( + "keeps unexamined external package effects unknown without obscuring builtins through %s", + async (surface, { cli }) => { + for (const [label, extra, expected] of [ + ["builtins", `require("node:path");`, "paired"], + ["external", `require("unobserved-package");`, "ambiguous"], + ["dynamic", `require(unknownName);`, "ambiguous"], + ["native", `require("./addon.node");`, "ambiguous"], + ] as const) { + const root = await createTestTempDirectory("rea-external-ipc-owner-"); + await writeFixtureFiles(root, { + "package.json": JSON.stringify({ name: "app", main: "main.cjs" }), + "main.cjs": `const {ipcMain}=require("electron"); ${extra} ipcMain.handle("known",()=>1);`, + "preload.cjs": `const {ipcRenderer}=require("electron"); ipcRenderer.invoke("known");`, + ...(label === "native" ? { "addon.node": "fixture" } : {}), + }); + const application = await analyzeJavaScriptDirectory(surface, cli, root); + expect(application.summary.ipc, label).toMatchObject({ + paired_renderer_transmissions: expected === "paired" ? 1 : 0, + ambiguous_renderer_transmissions: expected === "ambiguous" ? 1 : 0, + }); + } + }, +);