diff --git a/src/application/javascript/JavaScriptSemanticGraphBuilder.test.ts b/src/application/javascript/JavaScriptSemanticGraphBuilder.test.ts index 43d63a7d0..7794debf9 100644 --- a/src/application/javascript/JavaScriptSemanticGraphBuilder.test.ts +++ b/src/application/javascript/JavaScriptSemanticGraphBuilder.test.ts @@ -1,9 +1,9 @@ import { primitiveByteExpansionSource } from "../../../tests/fixtures/javascriptPrimitiveExpansion.js"; +import { graphForJavaScript as graphFor } from "../../../tests/fixtures/javascriptSemanticGraph.js"; import * as t from "@babel/types"; import { expect, it } from "vitest"; import { - buildJavaScriptSemanticGraph, SEMANTIC_GRAPH_FILE_NODE_CEILING, SEMANTIC_GRAPH_NODE_CEILING, } from "./JavaScriptSemanticGraphBuilder.js"; @@ -12,7 +12,6 @@ import { constructSemanticGraphNode, createSemanticGraphProjectionState, } from "./JavaScriptSemanticGraphConstruction.js"; -import type { JavaScriptArtifactAnalysis } from "./JavaScriptArtifactAnalysisTypes.js"; import type { JavaScriptArtifactFile } from "../../domain/javascript/javascriptArtifactFiles.js"; import { queryJavaScriptSemanticGraph } from "../../domain/javascript/javascriptSemanticQuery.js"; import { @@ -23,7 +22,6 @@ import { parseJavaScriptSource } from "../../domain/javascript/javascriptSourceP import { semanticCoverageResourceLimits } from "../../domain/javascript/javascriptSemanticCoverage.js"; const SHA256 = "a".repeat(64); -const GRAPH_ID = `jag_${"b".repeat(64)}`; it("projects closure and direct interprocedural flow without execution", () => { const graph = graphFor(` @@ -346,42 +344,6 @@ it("keeps duplicate function fingerprints ambiguous", () => { expect(query.summary.total_seed_matches).toBe(2); }); -const graphFor = (source: string, ir = analyzeJavaScriptSemantics(source)) => { - const file: JavaScriptArtifactFile = { - path: "app.js", - container_sha256: SHA256, - sha256: SHA256, - bytes: Buffer.byteLength(source), - inventory_artifact_id: `art_${SHA256}`, - kind: "javascript", - unpacked: false, - text: { included: true, value: source }, - }; - const analysis: JavaScriptArtifactAnalysis = { - files: [ - { - file, - javascript: null, - semantic: { ir }, - }, - ], - packages: [], - json_modules: [], - html_scripts: [], - source_maps: [], - visited_ast_nodes: 0, - findings: 0, - modules: 0, - parse_failures: 0, - limitations: [], - }; - return buildJavaScriptSemanticGraph({ - rootArtifactSha256: SHA256, - applicationGraph: { graph_id: GRAPH_ID, nodes: [] }, - analysis, - }); -}; - const semanticNodeFor = (roleKey: string) => { const file: JavaScriptArtifactFile = { path: "budget.js", diff --git a/src/application/javascript/JavaScriptSemanticGraphResources.test.ts b/src/application/javascript/JavaScriptSemanticGraphResources.test.ts index afedb6f96..62771c042 100644 --- a/src/application/javascript/JavaScriptSemanticGraphResources.test.ts +++ b/src/application/javascript/JavaScriptSemanticGraphResources.test.ts @@ -1,11 +1,10 @@ import { expect, it } from "vitest"; +import { graphForJavaScript as graphFor } from "../../../tests/fixtures/javascriptSemanticGraph.js"; import { buildJavaScriptSemanticGraph } from "./JavaScriptSemanticGraphBuilder.js"; import type { JavaScriptArtifactAnalysis } from "./JavaScriptArtifactAnalysisTypes.js"; -import type { JavaScriptArtifactFile } from "../../domain/javascript/javascriptArtifactFiles.js"; import { queryJavaScriptSemanticGraph } from "../../domain/javascript/javascriptSemanticQuery.js"; import { resolveJavaScriptSemanticEvidence } from "../../domain/javascript/javascriptSemanticGraph.js"; -import { analyzeJavaScriptSemantics } from "../../domain/javascript/javascriptSemanticAnalysis.js"; const SHA256 = "a".repeat(64); const GRAPH_ID = `jag_${"b".repeat(64)}`; @@ -359,41 +358,3 @@ const emptyAnalysis = (): JavaScriptArtifactAnalysis => ({ parse_failures: 0, limitations: [], }); - -const graphFor = (source: string) => { - const file: JavaScriptArtifactFile = { - path: "app.js", - container_sha256: SHA256, - sha256: SHA256, - bytes: Buffer.byteLength(source), - inventory_artifact_id: `art_${SHA256}`, - kind: "javascript", - unpacked: false, - text: { included: true, value: source }, - }; - const analysis: JavaScriptArtifactAnalysis = { - files: [ - { - file, - javascript: null, - semantic: { - ir: analyzeJavaScriptSemantics(source), - }, - }, - ], - packages: [], - json_modules: [], - html_scripts: [], - source_maps: [], - visited_ast_nodes: 0, - findings: 0, - modules: 0, - parse_failures: 0, - limitations: [], - }; - return buildJavaScriptSemanticGraph({ - rootArtifactSha256: SHA256, - applicationGraph: { graph_id: GRAPH_ID, nodes: [] }, - analysis, - }); -}; diff --git a/src/application/javascript/JavaScriptSemanticGraphScope.test.ts b/src/application/javascript/JavaScriptSemanticGraphScope.test.ts index fca97b81a..5fc14c68f 100644 --- a/src/application/javascript/JavaScriptSemanticGraphScope.test.ts +++ b/src/application/javascript/JavaScriptSemanticGraphScope.test.ts @@ -1,50 +1,9 @@ import { expect, it } from "vitest"; -import { buildJavaScriptSemanticGraph } from "./JavaScriptSemanticGraphBuilder.js"; -import type { JavaScriptArtifactAnalysis } from "./JavaScriptArtifactAnalysisTypes.js"; -import type { JavaScriptArtifactFile } from "../../domain/javascript/javascriptArtifactFiles.js"; +import { graphForJavaScript as graphFor } from "../../../tests/fixtures/javascriptSemanticGraph.js"; import { analyzeJavaScriptSemantics } from "../../domain/javascript/javascriptSemanticAnalysis.js"; import { topLevelBinding } from "../../domain/javascript/javascriptSemanticAnalysis.fixture.js"; -const SHA256 = "a".repeat(64); -const GRAPH_ID = `jag_${"b".repeat(64)}`; - -const graphFor = (source: string) => { - const file: JavaScriptArtifactFile = { - path: "app.js", - container_sha256: SHA256, - sha256: SHA256, - bytes: Buffer.byteLength(source), - inventory_artifact_id: `art_${SHA256}`, - kind: "javascript", - unpacked: false, - text: { included: true, value: source }, - }; - const analysis: JavaScriptArtifactAnalysis = { - files: [ - { - file, - javascript: null, - semantic: { ir: analyzeJavaScriptSemantics(source) }, - }, - ], - packages: [], - json_modules: [], - html_scripts: [], - source_maps: [], - visited_ast_nodes: 0, - findings: 0, - modules: 0, - parse_failures: 0, - limitations: [], - }; - return buildJavaScriptSemanticGraph({ - rootArtifactSha256: SHA256, - applicationGraph: { graph_id: GRAPH_ID, nodes: [] }, - analysis, - }); -}; - const dynamicScopeUnknowns = (source: string) => graphFor(source).unknowns.filter(({ reason }) => reason === "dynamic-scope"); diff --git a/tests/fixtures/javascriptSemanticGraph.ts b/tests/fixtures/javascriptSemanticGraph.ts new file mode 100644 index 000000000..0615b5419 --- /dev/null +++ b/tests/fixtures/javascriptSemanticGraph.ts @@ -0,0 +1,42 @@ +import { buildJavaScriptSemanticGraph } from "../../src/application/javascript/JavaScriptSemanticGraphBuilder.js"; +import type { JavaScriptArtifactAnalysis } from "../../src/application/javascript/JavaScriptArtifactAnalysisTypes.js"; +import type { JavaScriptArtifactFile } from "../../src/domain/javascript/javascriptArtifactFiles.js"; +import type { JavaScriptSemanticIr } from "../../src/domain/javascript/javascriptSemanticIr.js"; +import { analyzeJavaScriptSemantics } from "../../src/domain/javascript/javascriptSemanticAnalysis.js"; + +const SHA256 = "a".repeat(64); + +/** Build a semantic graph from one source file for application-level tests. */ +export const graphForJavaScript = ( + source: string, + ir: JavaScriptSemanticIr = analyzeJavaScriptSemantics(source), +) => { + const file: JavaScriptArtifactFile = { + path: "app.js", + container_sha256: SHA256, + sha256: SHA256, + bytes: Buffer.byteLength(source), + inventory_artifact_id: `art_${SHA256}`, + kind: "javascript", + unpacked: false, + text: { included: true, value: source }, + }; + const analysis: JavaScriptArtifactAnalysis = { + files: [{ file, javascript: null, semantic: { ir } }], + packages: [], + json_modules: [], + html_scripts: [], + source_maps: [], + visited_ast_nodes: 0, + findings: 0, + modules: 0, + parse_failures: 0, + limitations: [], + }; + + return buildJavaScriptSemanticGraph({ + rootArtifactSha256: SHA256, + applicationGraph: { graph_id: `jag_${"b".repeat(64)}`, nodes: [] }, + analysis, + }); +};