mirror of
https://github.com/morluto/rea.git
synced 2026-11-10 08:47:00 +00:00
fix(javascript): align module lookup and source evidence
Preserve CommonJS literal paths and confined ESM URL semantics, including package main fallback, directory intent, Unicode identity, and present opaque modules. Parse extraction inputs at their AST/source owner, retain skipped HTML and source-map coverage, and distinguish endpoint candidates from proven receiver facts. Version structural fingerprints with computed literal contents and propagate them through worker contracts. Reviewed fixes include #1810, #1840, #2642, #2700, #2702, #2714, #2803, #2960, #2968, #2986, #3035, and #3036. Validation: 158 resolver tests passed; public CLI/MCP module lookup controls, package-main/Unicode workflows, and six builtin workflows passed in the current compiled lane. Worker schema/fingerprint regressions passed. Large public pdf.js completion and real Electron analysis remain unverified.
This commit is contained in:
morluto committed
1 parent
04672f2b91
commit
b58adafa4f
63 files changed
+4066
-326
No files matched your search
+482
@@ -8,6 +8,9 @@ import { createTestTempDirectory } from "../../../fixtures/temporaryDirectory.js
|
||||
import { createElectronActiveEvidence } from "../../../../src/application/javascript/ElectronActiveEvidence.js";
|
||||
import { reconcileJavaScriptRuntimeEvidence } from "../../../../src/application/javascript/JavaScriptRuntimeReconciliationService.js";
|
||||
import { createEvidence } from "../../../../src/domain/evidence.js";
|
||||
import { mappedRuntimePaths } from "../../../../src/domain/javascript/javascriptRuntimeStaticCandidates.js";
|
||||
import { projectRuntimeCaptures } from "../../../../src/domain/javascript/javascriptRuntimeReconciliationRuntime.js";
|
||||
import { electronPageInspectionSchema } from "../../../../src/domain/javascript/electronObservation.js";
|
||||
import {
|
||||
parseRuntimeReconciliationInput,
|
||||
reconcileJavaScriptRuntime,
|
||||
@@ -419,3 +422,482 @@ it("imports an operator-provided cache layer through an explicit file mapping",
|
||||
sharedFile?.observations.map(({ properties }) => properties.path),
|
||||
).toEqual(expect.arrayContaining(["app.js", "mapped/chunk.js"]));
|
||||
});
|
||||
|
||||
const sourceFreeRuntime = (runtimeRoot: string, scriptFile: string) => {
|
||||
const runtime = electronRuntimeEvidence(runtimeRoot, "", {
|
||||
scriptFile,
|
||||
sourceIncluded: false,
|
||||
includeWorker: false,
|
||||
});
|
||||
const observation = electronPageInspectionSchema.parse(
|
||||
runtime.normalized_result,
|
||||
);
|
||||
for (const script of observation.scripts.items)
|
||||
script.source = { included: false, reason: "not-requested" };
|
||||
return createEvidence(undefined, runtime.provider, {
|
||||
operation: runtime.operation,
|
||||
predicateType: runtime.predicate_type,
|
||||
parameters: runtime.parameters,
|
||||
result: observation,
|
||||
confidence: runtime.confidence,
|
||||
authority: runtime.authority,
|
||||
});
|
||||
};
|
||||
|
||||
const reconcileScriptLocation = (
|
||||
application: Awaited<ReturnType<typeof analyzeFixture>>,
|
||||
root: string,
|
||||
scriptFile: string,
|
||||
runtimeRoot = root,
|
||||
) => {
|
||||
return reconcileInput({
|
||||
static_layers: [
|
||||
{
|
||||
role: "application",
|
||||
analysis: application,
|
||||
runtime_mappings:
|
||||
runtimeRoot === root
|
||||
? []
|
||||
: [{ kind: "file-root", root: runtimeRoot, artifact_prefix: "" }],
|
||||
},
|
||||
],
|
||||
runtime_observations: [sourceFreeRuntime(runtimeRoot, scriptFile)],
|
||||
}).reconciliations.find(({ entity_kind }) => entity_kind === "script");
|
||||
};
|
||||
|
||||
it.skipIf(process.platform === "win32")(
|
||||
"keeps distinct POSIX backslash and slash script locations separate",
|
||||
async () => {
|
||||
const root = await createTestTempDirectory("rea-backslash-runtime-");
|
||||
const literal = "literal\\name.js";
|
||||
await writeFile(join(root, literal), "export const marker = 'literal';\n");
|
||||
const application = await analyzeFixture(root);
|
||||
expect(
|
||||
reconcileScriptLocation(application, root, "literal/name.js"),
|
||||
).toMatchObject({ status: "unmatched" });
|
||||
expect(reconcileScriptLocation(application, root, literal)).toMatchObject({
|
||||
status: "matched",
|
||||
basis: "artifact-path",
|
||||
});
|
||||
},
|
||||
);
|
||||
|
||||
it.skipIf(process.platform === "win32")(
|
||||
"does not make POSIX literal and slash paths ambiguous, including Windows runtime mappings",
|
||||
async () => {
|
||||
const root = await createTestTempDirectory("rea-backslash-runtime-pair-");
|
||||
const literal = "literal\\name.js";
|
||||
await mkdir(join(root, "literal"));
|
||||
await writeFile(join(root, literal), "export const marker = 'literal';\n");
|
||||
await writeFile(
|
||||
join(root, "literal", "name.js"),
|
||||
"export const marker = 'slash';\n",
|
||||
);
|
||||
const application = await analyzeFixture(root);
|
||||
const slash = reconcileScriptLocation(application, root, "literal/name.js");
|
||||
const backslash = reconcileScriptLocation(application, root, literal);
|
||||
expect(slash).toMatchObject({ status: "matched", basis: "artifact-path" });
|
||||
expect(backslash).toMatchObject({
|
||||
status: "matched",
|
||||
basis: "artifact-path",
|
||||
});
|
||||
expect(slash?.static_node_id).not.toBe(backslash?.static_node_id);
|
||||
// These recorded Windows paths exercise matching only, not native Windows IO.
|
||||
expect(
|
||||
reconcileScriptLocation(
|
||||
application,
|
||||
root,
|
||||
"literal\\name.js",
|
||||
"C:\\runtime",
|
||||
),
|
||||
).toMatchObject({
|
||||
status: "matched",
|
||||
static_node_id: slash?.static_node_id,
|
||||
});
|
||||
},
|
||||
);
|
||||
|
||||
it.skipIf(process.platform === "win32")(
|
||||
"preserves URL-prefix path semantics separately from logical artifact names",
|
||||
async () => {
|
||||
const root = await createTestTempDirectory("rea-backslash-runtime-url-");
|
||||
await writeFile(
|
||||
join(root, "literal\\name.js"),
|
||||
"export const marker = 42;\n",
|
||||
);
|
||||
const analysis = await analyzeFixture(root);
|
||||
const parsed = parseRuntimeReconciliationInput(
|
||||
reconcileJavaScriptRuntimeInputSchema.parse({
|
||||
static_layers: [
|
||||
{
|
||||
analysis,
|
||||
role: "application",
|
||||
runtime_mappings: [
|
||||
{
|
||||
kind: "url-prefix",
|
||||
prefix: "https://example.test/assets/",
|
||||
artifact_prefix: "",
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
runtime_observations: [sourceFreeRuntime(root, "literal\\name.js")],
|
||||
}),
|
||||
);
|
||||
const layer = parsed.layers[0];
|
||||
const entity = projectRuntimeCaptures(parsed.captures).entities.find(
|
||||
({ kind }) => kind === "script",
|
||||
);
|
||||
if (layer === undefined || entity === undefined)
|
||||
throw new Error("Expected parsed static layer and runtime script");
|
||||
const mapped = (value: string) =>
|
||||
mappedRuntimePaths(layer, {
|
||||
...entity,
|
||||
location: { kind: "url", value },
|
||||
}).map(({ path }) => path);
|
||||
expect(mapped("https://example.test/assets/literal%5Cname.js")).toEqual([
|
||||
"literal\\name.js",
|
||||
]);
|
||||
expect(mapped("https://example.test/assets/literal/name.js")).toEqual([
|
||||
"literal/name.js",
|
||||
]);
|
||||
expect(mapped("https://example.test/assets/literal\\name.js")).toEqual([
|
||||
"literal/name.js",
|
||||
]);
|
||||
expect(mapped("https://other.test/assets/literal/name.js")).toEqual([]);
|
||||
expect(mapped("https://example.test/assets/%2e%2e/outside.js")).toEqual([]);
|
||||
},
|
||||
);
|
||||
|
||||
const rendererCapture = (runtimeRoot: string, filePath: string) => {
|
||||
const runtime = sourceFreeRuntime(runtimeRoot, "main.cjs");
|
||||
const observation = electronPageInspectionSchema.parse(
|
||||
runtime.normalized_result,
|
||||
);
|
||||
observation.target.file_path = filePath;
|
||||
for (const frame of observation.frames) frame.file_path = filePath;
|
||||
return createEvidence(undefined, runtime.provider, {
|
||||
operation: runtime.operation,
|
||||
predicateType: runtime.predicate_type,
|
||||
parameters: runtime.parameters,
|
||||
result: observation,
|
||||
confidence: runtime.confidence,
|
||||
authority: runtime.authority,
|
||||
});
|
||||
};
|
||||
|
||||
it.skipIf(process.platform === "win32")(
|
||||
"interprets raw loadFile declarations using the captured native path format",
|
||||
async () => {
|
||||
const root = await createTestTempDirectory(
|
||||
"rea-native-loadfile-declaration-",
|
||||
);
|
||||
await mkdir(join(root, "dist"));
|
||||
await writeFile(join(root, "dist", "index.html"), "slash file");
|
||||
await writeFile(join(root, "dist\\index.html"), "literal file");
|
||||
await writeFile(
|
||||
join(root, "main.cjs"),
|
||||
`const { BrowserWindow } = require('electron'); const win = new BrowserWindow(); win.loadFile(${JSON.stringify("dist\\index.html")});`,
|
||||
);
|
||||
const analysis = await analyzeFixture(root);
|
||||
const reconcileTarget = (runtimeRoot: string, path: string) =>
|
||||
reconcileInput({
|
||||
static_layers: [
|
||||
{
|
||||
analysis,
|
||||
role: "application",
|
||||
runtime_mappings: [
|
||||
{ kind: "file-root", root: runtimeRoot, artifact_prefix: "" },
|
||||
],
|
||||
},
|
||||
],
|
||||
runtime_observations: [rendererCapture(runtimeRoot, path)],
|
||||
}).reconciliations.find(({ entity_kind }) => entity_kind === "target");
|
||||
// These Windows paths are recorded data, not native Windows execution.
|
||||
expect(
|
||||
reconcileTarget("C:\\runtime", "C:\\runtime\\dist\\index.html"),
|
||||
).toMatchObject({ status: "matched" });
|
||||
expect(reconcileTarget(root, join(root, "dist\\index.html"))).toMatchObject(
|
||||
{ status: "matched" },
|
||||
);
|
||||
expect(
|
||||
reconcileTarget(root, join(root, "dist", "index.html")),
|
||||
).toMatchObject({ status: "unmatched" });
|
||||
},
|
||||
);
|
||||
|
||||
it.skipIf(process.platform === "win32").each(["literal\\dir", "literal%5Cdir"])(
|
||||
"maps a runtime root to the exact logical artifact prefix %j",
|
||||
async (prefix) => {
|
||||
const root = await createTestTempDirectory("rea-literal-artifact-prefix-");
|
||||
await mkdir(join(root, prefix));
|
||||
await writeFile(
|
||||
join(root, prefix, "app.js"),
|
||||
"export const marker = 42;\n",
|
||||
);
|
||||
const analysis = await analyzeFixture(root);
|
||||
const result = reconcileInput({
|
||||
static_layers: [
|
||||
{
|
||||
analysis,
|
||||
role: "application",
|
||||
runtime_mappings: [
|
||||
{ kind: "file-root", root: "/deployed", artifact_prefix: prefix },
|
||||
],
|
||||
},
|
||||
],
|
||||
runtime_observations: [sourceFreeRuntime("/deployed", "app.js")],
|
||||
});
|
||||
expect(
|
||||
result.reconciliations.find(
|
||||
({ entity_kind }) => entity_kind === "script",
|
||||
),
|
||||
).toMatchObject({ status: "matched", basis: "operator-file-mapping" });
|
||||
},
|
||||
);
|
||||
|
||||
it.skipIf(process.platform === "win32")(
|
||||
"uses resolved artifact paths instead of a raw declaration alias",
|
||||
async () => {
|
||||
const root = await createTestTempDirectory("rea-resolved-loadfile-alias-");
|
||||
const directory = "literal\\dir";
|
||||
await mkdir(join(root, directory));
|
||||
await writeFile(join(root, directory, "index.html"), "owned target");
|
||||
await writeFile(join(root, "index.html"), "different target");
|
||||
await writeFile(
|
||||
join(root, directory, "package.json"),
|
||||
JSON.stringify({
|
||||
name: "literal-renderer",
|
||||
version: "1.0.0",
|
||||
renderer: "./index.html",
|
||||
}),
|
||||
);
|
||||
const analysis = await analyzeFixture(root);
|
||||
const reconcileTarget = (path: string) =>
|
||||
reconcileInput({
|
||||
static_layers: [{ analysis, role: "application" }],
|
||||
runtime_observations: [rendererCapture(root, path)],
|
||||
}).reconciliations.find(({ entity_kind }) => entity_kind === "target");
|
||||
expect(reconcileTarget(join(root, directory, "index.html"))).toMatchObject({
|
||||
status: "matched",
|
||||
});
|
||||
expect(reconcileTarget(join(root, "index.html"))).toMatchObject({
|
||||
status: "unmatched",
|
||||
});
|
||||
},
|
||||
);
|
||||
|
||||
it("rejects unsafe logical artifact prefixes without decoding literal names", async () => {
|
||||
const root = await createTestTempDirectory("rea-prefix-admission-");
|
||||
await writeFile(join(root, "app.js"), "export const marker = 42;\n");
|
||||
const analysis = await analyzeFixture(root);
|
||||
const accepts = (artifact_prefix: string) =>
|
||||
reconcileJavaScriptRuntimeInputSchema.safeParse({
|
||||
static_layers: [
|
||||
{
|
||||
analysis,
|
||||
role: "application",
|
||||
runtime_mappings: [
|
||||
{ kind: "file-root", root: "/deployed", artifact_prefix },
|
||||
],
|
||||
},
|
||||
],
|
||||
runtime_observations: [sourceFreeRuntime("/deployed", "app.js")],
|
||||
}).success;
|
||||
for (const prefix of [
|
||||
"\0",
|
||||
"/absolute",
|
||||
".",
|
||||
"..",
|
||||
"a/../b",
|
||||
"a//b",
|
||||
"a/",
|
||||
"./a",
|
||||
])
|
||||
expect(accepts(prefix), prefix).toBe(false);
|
||||
for (const prefix of ["", "literal\\dir", "literal%5Cdir", "literal%2Fdir"])
|
||||
expect(accepts(prefix), prefix).toBe(true);
|
||||
});
|
||||
|
||||
it.skipIf(process.platform === "win32")(
|
||||
"keeps a leading backslash declaration literal only for POSIX captures",
|
||||
async () => {
|
||||
const root = await createTestTempDirectory("rea-leading-loadfile-");
|
||||
await writeFile(join(root, "\\index.html"), "literal target");
|
||||
await writeFile(
|
||||
join(root, "main.cjs"),
|
||||
`const { BrowserWindow } = require('electron'); const win = new BrowserWindow(); win.loadFile(${JSON.stringify("\\index.html")});`,
|
||||
);
|
||||
const analysis = await analyzeFixture(root);
|
||||
const reconcileTarget = (runtimeRoot: string, path: string) =>
|
||||
reconcileInput({
|
||||
static_layers: [
|
||||
{
|
||||
analysis,
|
||||
role: "application",
|
||||
runtime_mappings: [
|
||||
{ kind: "file-root", root: runtimeRoot, artifact_prefix: "" },
|
||||
],
|
||||
},
|
||||
],
|
||||
runtime_observations: [rendererCapture(runtimeRoot, path)],
|
||||
}).reconciliations.find(({ entity_kind }) => entity_kind === "target");
|
||||
expect(reconcileTarget(root, join(root, "\\index.html"))).toMatchObject({
|
||||
status: "matched",
|
||||
});
|
||||
expect(
|
||||
reconcileTarget("C:\\runtime", "C:\\runtime\\index.html"),
|
||||
).toMatchObject({ status: "unmatched" });
|
||||
},
|
||||
);
|
||||
|
||||
it("keeps a raw nested loadFile target application-relative when the producer also resolves a nested decoy", async () => {
|
||||
const root = await createTestTempDirectory("rea-raw-loadfile-ownership-");
|
||||
await mkdir(join(root, "dist"));
|
||||
await mkdir(join(root, "sub", "dist"), { recursive: true });
|
||||
await writeFile(join(root, "dist", "index.html"), "application target");
|
||||
await writeFile(join(root, "sub", "dist", "index.html"), "nested decoy");
|
||||
await writeFile(
|
||||
join(root, "sub", "main.cjs"),
|
||||
"const { BrowserWindow } = require('electron'); const win = new BrowserWindow(); win.loadFile('dist/index.html');",
|
||||
);
|
||||
const analysis = await analyzeFixture(root);
|
||||
const reconcileTarget = (path: string) =>
|
||||
reconcileInput({
|
||||
static_layers: [{ analysis, role: "application" }],
|
||||
runtime_observations: [rendererCapture(root, path)],
|
||||
}).reconciliations.find(({ entity_kind }) => entity_kind === "target");
|
||||
expect(reconcileTarget(join(root, "dist", "index.html"))).toMatchObject({
|
||||
status: "matched",
|
||||
});
|
||||
expect(
|
||||
reconcileTarget(join(root, "sub", "dist", "index.html")),
|
||||
).toMatchObject({ status: "unmatched" });
|
||||
});
|
||||
|
||||
it
|
||||
.skipIf(process.platform === "win32")
|
||||
.each(["app", "literal\\app", "café", "cafe\u0301"])(
|
||||
"maps raw renderer declarations through the logical application prefix %j",
|
||||
async (prefix) => {
|
||||
const root = await createTestTempDirectory("rea-prefixed-native-renderer-");
|
||||
await mkdir(join(root, prefix, "dist"), { recursive: true });
|
||||
await writeFile(
|
||||
join(root, prefix, "dist", "index.html"),
|
||||
"application target",
|
||||
);
|
||||
await writeFile(
|
||||
join(root, prefix, "main.cjs"),
|
||||
"const { BrowserWindow } = require('electron'); const win = new BrowserWindow(); win.loadFile('dist/index.html');",
|
||||
);
|
||||
const analysis = await analyzeFixture(root);
|
||||
const reconcileTarget = (runtimeRoot: string, path: string) =>
|
||||
reconcileInput({
|
||||
static_layers: [
|
||||
{
|
||||
analysis,
|
||||
role: "application",
|
||||
runtime_mappings: [
|
||||
{ kind: "file-root", root: runtimeRoot, artifact_prefix: prefix },
|
||||
],
|
||||
},
|
||||
],
|
||||
runtime_observations: [rendererCapture(runtimeRoot, path)],
|
||||
}).reconciliations.find(({ entity_kind }) => entity_kind === "target");
|
||||
expect(
|
||||
reconcileTarget("/deployed", "/deployed/dist/index.html"),
|
||||
).toMatchObject({ status: "matched", basis: "operator-file-mapping" });
|
||||
expect(
|
||||
reconcileTarget("C:\\deployed", "C:\\deployed\\dist\\index.html"),
|
||||
).toMatchObject({ status: "matched", basis: "operator-file-mapping" });
|
||||
expect(reconcileTarget("/deployed", "/deployed/index.html")).toMatchObject({
|
||||
status: "unmatched",
|
||||
});
|
||||
},
|
||||
);
|
||||
|
||||
it("confines raw renderer declarations to the operator-selected artifact prefix", async () => {
|
||||
const root = await createTestTempDirectory("rea-native-prefix-isolation-");
|
||||
for (const app of ["appA", "appB"]) {
|
||||
await mkdir(join(root, app, "dist"), { recursive: true });
|
||||
await writeFile(join(root, app, "dist", "index.html"), app);
|
||||
await writeFile(
|
||||
join(root, app, "main.cjs"),
|
||||
"const { BrowserWindow } = require('electron'); const win = new BrowserWindow(); win.loadFile('dist/index.html');",
|
||||
);
|
||||
}
|
||||
const analysis = await analyzeFixture(root);
|
||||
const result = reconcileInput({
|
||||
static_layers: [
|
||||
{
|
||||
analysis,
|
||||
role: "application",
|
||||
runtime_mappings: [
|
||||
{ kind: "file-root", root: "/deployed", artifact_prefix: "appA" },
|
||||
],
|
||||
},
|
||||
],
|
||||
runtime_observations: [
|
||||
rendererCapture("/deployed", "/deployed/dist/index.html"),
|
||||
],
|
||||
});
|
||||
const target = result.reconciliations.find(
|
||||
({ entity_kind }) => entity_kind === "target",
|
||||
);
|
||||
expect(target).toMatchObject({
|
||||
status: "matched",
|
||||
candidate_static_count: 1,
|
||||
});
|
||||
const node = result.graph.nodes.find(
|
||||
({ node_id }) => node_id === target?.static_node_id,
|
||||
);
|
||||
expect(
|
||||
node?.observations.flatMap(({ evidence }) =>
|
||||
evidence.location.available &&
|
||||
evidence.location.value.kind === "source-range"
|
||||
? [evidence.location.value.source]
|
||||
: [],
|
||||
),
|
||||
).toEqual(["appA/main.cjs"]);
|
||||
});
|
||||
|
||||
it("retains uncertainty for overlapping file mappings with distinct application interpretations", async () => {
|
||||
const root = await createTestTempDirectory("rea-overlapping-native-prefix-");
|
||||
await mkdir(join(root, "app", "dist"), { recursive: true });
|
||||
await writeFile(join(root, "app", "dist", "index.html"), "shared target");
|
||||
for (const [path, declaration] of [
|
||||
["app/main.cjs", "dist/index.html"],
|
||||
["app/dist/main.cjs", "index.html"],
|
||||
])
|
||||
await writeFile(
|
||||
join(root, path!),
|
||||
`const { BrowserWindow } = require('electron'); const win = new BrowserWindow(); win.loadFile(${JSON.stringify(declaration)});`,
|
||||
);
|
||||
const analysis = await analyzeFixture(root);
|
||||
const result = reconcileInput({
|
||||
static_layers: [
|
||||
{
|
||||
analysis,
|
||||
role: "application",
|
||||
runtime_mappings: [
|
||||
{ kind: "file-root", root: "/deployed", artifact_prefix: "app" },
|
||||
{
|
||||
kind: "file-root",
|
||||
root: "/deployed/dist",
|
||||
artifact_prefix: "app/dist",
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
runtime_observations: [
|
||||
rendererCapture("/deployed", "/deployed/dist/index.html"),
|
||||
],
|
||||
});
|
||||
expect(
|
||||
result.reconciliations.find(({ entity_kind }) => entity_kind === "target"),
|
||||
).toMatchObject({
|
||||
status: "ambiguous",
|
||||
confidence: "unknown",
|
||||
candidate_static_count: 2,
|
||||
});
|
||||
});
|
||||
Reference in new issue
Block a user