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): preserve HTML carriage return source ranges (#1092)
Rudy Mizrahi Celekli23862af1b574
diff --git a/docs/javascript-artifact-reconstruction.md b/docs/javascript-artifact-reconstruction.mdindex 4707ef085..4cb46cfd2 100644--- a/docs/javascript-artifact-reconstruction.md+++ b/docs/javascript-artifact-reconstruction.md@@ -268,3 +268,5 @@ document base and query/fragment rules. CommonJS module lookups retain extensionand directory resolution.Unresolved HTML references retain their declaration, source range, and resolutionreason in the renderer observations.+HTML script source ranges follow the HTML parser across LF, CRLF, and bare CR+line endings, preserving UTF-16 columns.diff --git a/src/application/javascript/JavaScriptArtifactAnalysis.ts b/src/application/javascript/JavaScriptArtifactAnalysis.tsindex aba362b76..d7af23bba 100644--- a/src/application/javascript/JavaScriptArtifactAnalysis.ts+++ b/src/application/javascript/JavaScriptArtifactAnalysis.ts@@ -407,7 +407,7 @@ const pointForOffset = (text: string,offset: number,): JavaScriptSourcePoint => {- const lines = text.slice(0, offset).split("\n");+ const lines = text.slice(0, offset).split(/\r\n|\r|\n/u);return { line: lines.length, column: lines.at(-1)?.length ?? 0 };};diff --git a/tests/boundary/cli/javascriptApplicationProgress.test.ts b/tests/boundary/cli/javascriptApplicationProgress.test.tsindex a4a0863e4..06fc1c8cb 100644--- a/tests/boundary/cli/javascriptApplicationProgress.test.ts+++ b/tests/boundary/cli/javascriptApplicationProgress.test.ts@@ -4,6 +4,7 @@ import { join } from "node:path";import { expect } from "vitest";import { z } from "zod";+import { javascriptApplicationAnalysisResultSchema } from "../../../src/domain/javascript/javascriptApplicationAnalysis.js";import { parseEvidence } from "../../../src/domain/evidence.js";import { analyzeJavaScriptApplication } from "../../../src/application/javascript/JavaScriptApplicationService.js";import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js";@@ -70,3 +71,45 @@ cliTest(expect(updates.every(({ terminal }) => terminal !== true)).toBe(true);},);++for (const command of ["analyze-javascript-application", "analyze"]) {+ cliTest(+ `${command} retains HTML source ranges after a bare carriage return`,+ async ({ cli }) => {+ const root = await createTestTempDirectory("rea-html-coordinate-cli-");+ const opening = '<script src="actual.js">';+ await Promise.all([+ writeFile(+ join(root, "index.html"),+ `<main>context</main>\r${opening}</script>`,+ ),+ writeFile(join(root, "actual.js"), "export const actual = true;"),+ ]);+ const output = await cli.run({ arguments: [command, root, "--json"] });+ expect(output.exitCode).toBe(0);+ const evidence = parseEvidence(output.json);+ const result = javascriptApplicationAnalysisResultSchema.parse(+ evidence.normalized_result,+ );+ const loads = result.graph.edges.filter(+ ({ relation, properties }) =>+ relation === "loads" && properties.script_path === "actual.js",+ );+ expect(loads).toHaveLength(1);+ expect(loads[0]).toMatchObject({+ properties: { resolved_path: "actual.js" },+ evidence: {+ location: {+ available: true,+ value: {+ kind: "source-range",+ source: "index.html",+ start: { line: 2, column: 0 },+ end: { line: 2, column: opening.length },+ },+ },+ },+ });+ },+ );+}diff --git a/tests/boundary/filesystem/javascriptHtmlEntrypoints.test.ts b/tests/boundary/filesystem/javascriptHtmlEntrypoints.test.tsindex f25d7fb9e..a251469b0 100644--- a/tests/boundary/filesystem/javascriptHtmlEntrypoints.test.ts+++ b/tests/boundary/filesystem/javascriptHtmlEntrypoints.test.ts@@ -2,6 +2,11 @@ import { createHash } from "node:crypto";import { mkdir, writeFile } from "node:fs/promises";import { join } from "node:path";+import {+ defaultTreeAdapter,+ parse,+ type DefaultTreeAdapterTypes,+} from "parse5";import { expect, it } from "vitest";import { reconstructJavaScriptArtifact } from "../../../src/application/javascript/JavaScriptArtifactReconstruction.js";@@ -85,3 +90,104 @@ it("preserves source digest, opening-tag range and decoded local base resolution},});});++const coordinateCases = [+ { name: "LF", prefix: "before\n", opening: '<script src="actual.js">' },+ { name: "CRLF", prefix: "before\r\n", opening: '<script src="actual.js">' },+ { name: "bare CR", prefix: "before\r", opening: '<script src="actual.js">' },+ {+ name: "mixed CRLF and CR",+ prefix: "before\r\nafter\r",+ opening: '<script src="actual.js">',+ },+ {+ name: "CR inside opening tag",+ prefix: "before\n",+ opening: '<script\r src="actual.js">',+ },+ {+ name: "CRLF inside opening tag",+ prefix: "before\n",+ opening: '<script\r\n src="actual.js">',+ },+ {+ name: "astral UTF-16 columns",+ prefix: "😀",+ opening: '<script src="actual.js">',+ },+ {+ name: "U+2028 literal text",+ prefix: "before\u2028",+ opening: '<script src="actual.js">',+ },+] as const;++it.each(coordinateCases)(+ "retains parse5 source coordinates for resolved and unresolved scripts with $name",+ async ({ prefix, opening }) => {+ const root = await createTestTempDirectory("rea-html-coordinate-evidence-");+ const html = `${prefix}${opening}</script><script src="missing.js"></script>`;+ const expected = htmlScriptRanges(html);+ expect(expected).toHaveLength(2);+ await Promise.all([+ writeFile(join(root, "index.html"), html),+ writeFile(join(root, "actual.js"), "export const actual = true;"),+ ]);+ const result = await reconstructJavaScriptArtifact({ input_path: root });+ const resolved = result.graph.edges.filter(+ ({ relation, properties }) =>+ relation === "loads" && properties.script_path === "actual.js",+ );+ const unresolved = result.graph.nodes+ .flatMap(({ observations }) => observations)+ .filter(+ ({ properties }) =>+ properties.mechanism === "html-script-reference" &&+ properties.script_path === "missing.js",+ );+ expect(resolved).toHaveLength(1);+ expect(unresolved).toHaveLength(1);+ for (const [index, observation] of [resolved[0], unresolved[0]].entries()) {+ expect(observation).toMatchObject({+ evidence: {+ artifact: {+ available: true,+ sha256: createHash("sha256").update(html).digest("hex"),+ },+ location: {+ available: true,+ value: {+ kind: "source-range",+ source: "index.html",+ ...expected[index],+ },+ },+ },+ });+ }+ },+);++const htmlScriptRanges = (html: string) => {+ const pending: DefaultTreeAdapterTypes.Node[] = [+ parse(html, { sourceCodeLocationInfo: true }),+ ];+ const ranges = [];+ while (pending.length > 0) {+ const node = pending.pop();+ if (node === undefined) continue;+ if (defaultTreeAdapter.isElementNode(node) && node.tagName === "script") {+ const location = node.sourceCodeLocation?.startTag;+ if (location === undefined)+ throw new Error("Missing parse5 script range");+ ranges.push({+ start: { line: location.startLine, column: location.startCol - 1 },+ end: { line: location.endLine, column: location.endCol - 1 },+ });+ }+ if ("childNodes" in node) {+ for (const child of node.childNodes.toReversed()) pending.push(child);+ }+ }+ return ranges;+};