@gitwand/core 2.2.0 → 2.4.1

package/dist/__tests__/structural/grandeur-nature.test.js

@@ -0,0 +1,264 @@
+/**
+ * Integration tests — "grandeur nature"
+ *
+ * These tests use content derived from the `_tmp_split_scenario` sub-repo
+ * (a tiny calculator module with a linear commit history) to produce
+ * realistic 3-way merge conflicts and run the full `resolveAsync` pipeline
+ * including the structural merge engine (tree-sitter / WASM).
+ *
+ * Source versions used (from _tmp_split_scenario git history):
+ *   - test-branch-from-ctx : add()
+ *   - split-base           : add() + subtract()
+ *   - main                 : add/subtract/multiply/divide/modulo
+ *
+ * Four scenarios:
+ *   S1 — two-branches-grow-independently : both sides add different functions
+ *        → structural merge should resolve cleanly
+ *   S2 — ours-only-change                : ours modifies + adds, theirs unchanged
+ *        → structural merge should resolve cleanly
+ *   S3 — body-conflict                   : both sides change the same function body
+ *        → structural merge returns null, hunk-based resolver takes over
+ *   S4 — delete-vs-modify                : ours deletes a function, theirs modifies it
+ *        → structural merge returns null, hunk-based resolver cannot resolve either
+ *
+ * The tests are designed to be non-flaky:
+ *   • If web-tree-sitter / tree-sitter-wasms are available (devDeps in this
+ *     package), the structural path is exercised and assertions are strict.
+ *   • If WASM loading fails (CI without optional deps), `resolveAsync` falls
+ *     back transparently and the tests still verify the hunk-based fallback.
+ */
+import { describe, it, expect, beforeAll } from "vitest";
+import { resolveAsync } from "../../resolver/index.js";
+import { tryStructuralMergeResolve } from "../../structural/index.js";
+import { _resetCache } from "../../structural/parsers/loader.js";
+// Reset WASM cache once before the suite so every run starts clean.
+beforeAll(() => {
+    _resetCache();
+});
+// ─────────────────────────────────────────────────────────────────────────────
+// Helpers
+// ─────────────────────────────────────────────────────────────────────────────
+/** Build a diff3-format conflict string from three source versions. */
+function makeConflict(ours, base, theirs) {
+    const parts = [];
+    parts.push(`<<<<<<< ours\n${ours}`);
+    parts.push(`||||||| base\n${base}`);
+    parts.push(`=======\n${theirs}`);
+    parts.push(`>>>>>>> theirs`);
+    return parts.join("\n") + "\n";
+}
+// ─────────────────────────────────────────────────────────────────────────────
+// Shared source fragments  (extracted from _tmp_split_scenario git history)
+// ─────────────────────────────────────────────────────────────────────────────
+const HEADER = `// Tiny calculator module — educational demo\n`;
+const FN_ADD = `export function add(a, b) {
+  return a + b;
+}`;
+const FN_ADD_WITH_LOG = `export function add(a, b) {
+  console.log(\`add(\${a}, \${b})\`);
+  return a + b;
+}`;
+const FN_ADD_WITH_VALIDATION = `export function add(a, b) {
+  if (!Number.isFinite(a) || !Number.isFinite(b)) {
+    throw new RangeError("add: arguments must be finite");
+  }
+  return a + b;
+}`;
+const FN_SUBTRACT = `export function subtract(a, b) {
+  return a - b;
+}`;
+const FN_SUBTRACT_GUARDED = `export function subtract(a, b) {
+  if (b === undefined) throw new TypeError("subtract requires two arguments");
+  return a - b;
+}`;
+const FN_MULTIPLY = `export function multiply(a, b) {
+  return a * b;
+}`;
+const FN_DIVIDE = `export function divide(a, b) {
+  if (b === 0) {
+    throw new Error("division by zero");
+  }
+  return a / b;
+}`;
+const FN_MODULO = `export function modulo(a, b) {
+  if (b === 0) {
+    throw new Error("modulo by zero");
+  }
+  return a % b;
+}`;
+// S3 variants — both sides REPLACE the same return line with different content.
+// These are genuine line-level conflicts (not pure insertions) that neither
+// structural nor hunk-based resolver can auto-merge.
+const FN_ADD_RETURN_PARENS = `export function add(a, b) {
+  return (a + b);
+}`;
+const FN_ADD_RETURN_FALLBACK = `export function add(a, b) {
+  return a + b || 0;
+}`;
+// ─────────────────────────────────────────────────────────────────────────────
+// S1 — Two branches grow independently
+// Base: add()
+// Ours: add() + subtract() + multiply()
+// Theirs: add() + divide() + modulo()
+// ─────────────────────────────────────────────────────────────────────────────
+describe("S1 — two-branches-grow-independently (calculator.js)", () => {
+    // Both branches branched from the "add only" state and each added their own
+    // functions.  Git produces one big conflict block after the shared `add`.
+    const BASE = FN_ADD;
+    const OURS = [FN_ADD, FN_SUBTRACT, FN_MULTIPLY].join("\n\n");
+    const THEIRS = [FN_ADD, FN_DIVIDE, FN_MODULO].join("\n\n");
+    // Conflict: the preamble (header + add) is identical; everything after is conflicted.
+    const CONFLICT = HEADER + FN_ADD + "\n\n" + makeConflict([FN_SUBTRACT, FN_MULTIPLY].join("\n\n") + "\n", "", [FN_DIVIDE, FN_MODULO].join("\n\n") + "\n");
+    it("resolveAsync resolves the file cleanly (requires WASM)", async () => {
+        // S1 has two independent insertion blocks at the same base boundary.
+        // The hunk-based resolver correctly flags this as ambiguous (it cannot
+        // decide the interleaving order without AST context). Structural merge
+        // resolves it correctly — but only when WASM is available.
+        // Gate: skip strict assertion when structural merge is not available.
+        const structuralAvailable = (await tryStructuralMergeResolve(CONFLICT, "calculator.js")) !== null;
+        if (!structuralAvailable)
+            return; // WASM not available in this environment
+        const result = await resolveAsync(CONFLICT, "calculator.js");
+        expect(result.stats.remaining).toBe(0);
+        expect(result.mergedContent).toBeTruthy();
+    });
+    it("merged content contains all five functions (when WASM available)", async () => {
+        const result = await resolveAsync(CONFLICT, "calculator.js");
+        if (!result.mergedContent)
+            return; // structural WASM unavailable, hunk-based left a conflict
+        expect(result.mergedContent).toContain("function add");
+        expect(result.mergedContent).toContain("function subtract");
+        expect(result.mergedContent).toContain("function multiply");
+        expect(result.mergedContent).toContain("function divide");
+        expect(result.mergedContent).toContain("function modulo");
+    });
+    it("structural merge specifically resolves it (when WASM available)", async () => {
+        const merged = await tryStructuralMergeResolve(CONFLICT, "calculator.js");
+        if (merged === null) {
+            // WASM not available in this environment — skip strict assertion
+            return;
+        }
+        expect(merged).toContain("function subtract");
+        expect(merged).toContain("function multiply");
+        expect(merged).toContain("function divide");
+        expect(merged).toContain("function modulo");
+        // No conflict markers left
+        expect(merged).not.toContain("<<<<<<<");
+        expect(merged).not.toContain("=======");
+        expect(merged).not.toContain(">>>>>>>");
+    });
+    it("tryStructuralMergeResolve never throws", async () => {
+        await expect(tryStructuralMergeResolve(CONFLICT, "calculator.js")).resolves.not.toThrow();
+    });
+});
+// ─────────────────────────────────────────────────────────────────────────────
+// S2 — Ours modifies a function + adds another; theirs unchanged
+// Base: add() + subtract()
+// Ours: modified add (with comment) + subtract + new multiply
+// Theirs: add() + subtract() (unchanged)
+// ─────────────────────────────────────────────────────────────────────────────
+describe("S2 — ours-only-change + ours-added (calculator.js)", () => {
+    const FN_ADD_COMMENTED = `// Adds two numbers and returns the result
+${FN_ADD}`;
+    const BASE_CONTENT = [FN_ADD, FN_SUBTRACT].join("\n\n");
+    const OURS_CONTENT = [FN_ADD_COMMENTED, FN_SUBTRACT, FN_MULTIPLY].join("\n\n");
+    const THEIRS_CONTENT = BASE_CONTENT;
+    const CONFLICT = HEADER + makeConflict(OURS_CONTENT + "\n", BASE_CONTENT + "\n", THEIRS_CONTENT + "\n");
+    it("resolveAsync resolves the file cleanly", async () => {
+        const result = await resolveAsync(CONFLICT, "calculator.js");
+        expect(result.stats.remaining).toBe(0);
+        expect(result.mergedContent).toBeTruthy();
+    });
+    it("merged content preserves the ours-only changes", async () => {
+        const result = await resolveAsync(CONFLICT, "calculator.js");
+        if (!result.mergedContent)
+            return;
+        // The ours comment and multiply should be present
+        expect(result.mergedContent).toContain("function multiply");
+    });
+    it("tryStructuralMergeResolve: merged output has multiply (when WASM available)", async () => {
+        const merged = await tryStructuralMergeResolve(CONFLICT, "calculator.js");
+        if (merged === null)
+            return; // WASM unavailable
+        expect(merged).toContain("function multiply");
+        expect(merged).toContain("function subtract");
+        expect(merged).not.toContain("<<<<<<<");
+    });
+});
+// ─────────────────────────────────────────────────────────────────────────────
+// S3 — Both branches modify the same line of the function body → true conflict
+// Base: add() returning `a + b`
+// Ours: add() returning `(a + b)`    — wraps in parens
+// Theirs: add() returning `a + b || 0` — adds a fallback
+//
+// Both sides REPLACE the `return a + b;` line with a different version.
+// There are no pure insertions — both have a removal+add on the same base line.
+// Neither insertion_at_boundary nor non_overlapping can fire, so this remains
+// an unresolvable conflict for the hunk-based resolver too.
+// ─────────────────────────────────────────────────────────────────────────────
+describe("S3 — body-conflict: both sides change the same function (calculator.js)", () => {
+    const CONFLICT = makeConflict(FN_ADD_RETURN_PARENS + "\n", FN_ADD + "\n", FN_ADD_RETURN_FALLBACK + "\n");
+    it("tryStructuralMergeResolve returns null — cannot auto-resolve", async () => {
+        const merged = await tryStructuralMergeResolve(CONFLICT, "calculator.js");
+        // Structural merge must not silently pick a side when both changed differently
+        expect(merged).toBeNull();
+    });
+    it("resolveAsync fallback result has remaining conflicts", async () => {
+        const result = await resolveAsync(CONFLICT, "calculator.js");
+        // Hunk-based resolver also cannot resolve this (both sides differ)
+        expect(result.stats.remaining).toBeGreaterThan(0);
+        expect(result.mergedContent).toBeNull();
+    });
+    it("resolveAsync never throws", async () => {
+        await expect(resolveAsync(CONFLICT, "calculator.js")).resolves.not.toThrow();
+    });
+});
+// ─────────────────────────────────────────────────────────────────────────────
+// S4 — Ours deletes a function that theirs modifies → conflict
+// Base: add() + subtract()
+// Ours: add() only (subtract removed)
+// Theirs: add() + subtract() with a guard
+// ─────────────────────────────────────────────────────────────────────────────
+describe("S4 — delete-vs-modify: ours deletes what theirs modifies (calculator.js)", () => {
+    const BASE_CONTENT = [FN_ADD, FN_SUBTRACT].join("\n\n");
+    const OURS_CONTENT = FN_ADD;
+    const THEIRS_CONTENT = [FN_ADD, FN_SUBTRACT_GUARDED].join("\n\n");
+    // Git produces a conflict covering the subtract block (ours deleted it, theirs changed it)
+    const CONFLICT = HEADER +
+        FN_ADD + "\n" +
+        makeConflict("\n", // ours: nothing after add
+        "\n" + FN_SUBTRACT + "\n", // base: subtract was here
+        "\n" + FN_SUBTRACT_GUARDED + "\n");
+    it("tryStructuralMergeResolve returns null — delete vs modify is a conflict", async () => {
+        const merged = await tryStructuralMergeResolve(CONFLICT, "calculator.js");
+        expect(merged).toBeNull();
+    });
+    it("resolveAsync fallback result has remaining conflicts", async () => {
+        const result = await resolveAsync(CONFLICT, "calculator.js");
+        // Neither resolver can auto-merge a delete vs a change
+        expect(result.stats.remaining).toBeGreaterThan(0);
+        expect(result.mergedContent).toBeNull();
+    });
+    it("resolveAsync never throws", async () => {
+        await expect(resolveAsync(CONFLICT, "calculator.js")).resolves.not.toThrow();
+    });
+});
+// ─────────────────────────────────────────────────────────────────────────────
+// S5 — Unsupported language: same scenarios on a .css file
+// Structural merge is disabled for .css — falls through to hunk-based resolver
+// ─────────────────────────────────────────────────────────────────────────────
+describe("S5 — unsupported language: structural merge skipped for .css files", () => {
+    const CSS_CONFLICT = makeConflict(".btn { color: red; }\n", ".btn { color: blue; }\n", ".btn { color: green; }\n");
+    it("tryStructuralMergeResolve returns null immediately for .css", async () => {
+        const merged = await tryStructuralMergeResolve(CSS_CONFLICT, "styles.css");
+        expect(merged).toBeNull();
+    });
+    it("resolveAsync falls back to hunk-based for .css", async () => {
+        const result = await resolveAsync(CSS_CONFLICT, "styles.css");
+        // Hunk-based: both sides changed differently → still a conflict
+        expect(result.stats.totalConflicts).toBe(1);
+        // structural merge is skipped for .css — resolution reason must not mention it
+        expect(result.resolutions[0]?.resolutionReason).not.toContain("structural");
+    });
+});
+//# sourceMappingURL=grandeur-nature.test.js.map

package/dist/__tests__/structural/grandeur-nature.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"grandeur-nature.test.js","sourceRoot":"","sources":["../../../src/__tests__/structural/grandeur-nature.test.ts"],"names":[],"mappings":"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"}

package/dist/__tests__/structural/languages.test.d.ts

@@ -0,0 +1,5 @@
+/**
+ * Tests for structural/parsers/grammars/languages.ts
+ */
+export {};
+//# sourceMappingURL=languages.test.d.ts.map

package/dist/__tests__/structural/languages.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"languages.test.d.ts","sourceRoot":"","sources":["../../../src/__tests__/structural/languages.test.ts"],"names":[],"mappings":"AAAA;;GAEG"}

package/dist/__tests__/structural/languages.test.js

@@ -0,0 +1,74 @@
+/**
+ * Tests for structural/parsers/grammars/languages.ts
+ */
+import { describe, it, expect } from "vitest";
+import { languageForFile, isStructuralLanguage, grammarNameForFile, } from "../../structural/parsers/grammars/languages.js";
+describe("languageForFile", () => {
+    it.each([
+        ["src/app.ts", "typescript"],
+        ["src/Component.tsx", "tsx"],
+        ["src/index.js", "javascript"],
+        ["src/utils.mjs", "javascript"],
+        ["lib/helper.cjs", "javascript"],
+        ["src/App.jsx", "jsx"],
+        ["src/main.py", "python"],
+        ["cmd/server.go", "go"],
+        ["src/lib.rs", "rust"],
+    ])("%s → %s", (path, lang) => {
+        expect(languageForFile(path)).toBe(lang);
+    });
+    it("returns null for unsupported extensions", () => {
+        expect(languageForFile("styles.css")).toBeNull();
+        expect(languageForFile("config.yaml")).toBeNull();
+        expect(languageForFile("README.md")).toBeNull();
+    });
+});
+describe("isStructuralLanguage", () => {
+    it("returns true for supported languages", () => {
+        expect(isStructuralLanguage("src/app.ts")).toBe(true);
+        expect(isStructuralLanguage("src/app.tsx")).toBe(true);
+        expect(isStructuralLanguage("src/app.js")).toBe(true);
+        expect(isStructuralLanguage("src/app.jsx")).toBe(true);
+        expect(isStructuralLanguage("src/app.py")).toBe(true);
+        expect(isStructuralLanguage("src/app.go")).toBe(true);
+        expect(isStructuralLanguage("src/app.rs")).toBe(true);
+    });
+    it("returns false for .d.ts (declaration files)", () => {
+        expect(isStructuralLanguage("src/types.d.ts")).toBe(false);
+        expect(isStructuralLanguage("dist/index.d.ts")).toBe(false);
+    });
+    it("returns false for unsupported extensions", () => {
+        expect(isStructuralLanguage("styles.css")).toBe(false);
+        expect(isStructuralLanguage("config.json")).toBe(false);
+    });
+});
+describe("grammarNameForFile", () => {
+    it("returns tree-sitter-typescript for .ts", () => {
+        expect(grammarNameForFile("src/app.ts")).toBe("tree-sitter-typescript");
+    });
+    it("returns tree-sitter-tsx for .tsx", () => {
+        expect(grammarNameForFile("src/app.tsx")).toBe("tree-sitter-tsx");
+    });
+    it("returns tree-sitter-javascript for .js and .jsx", () => {
+        expect(grammarNameForFile("src/app.js")).toBe("tree-sitter-javascript");
+        expect(grammarNameForFile("src/App.jsx")).toBe("tree-sitter-javascript");
+    });
+    it("returns tree-sitter-python for .py", () => {
+        expect(grammarNameForFile("main.py")).toBe("tree-sitter-python");
+    });
+    it("returns tree-sitter-go for .go", () => {
+        expect(grammarNameForFile("server.go")).toBe("tree-sitter-go");
+    });
+    it("returns tree-sitter-rust for .rs", () => {
+        expect(grammarNameForFile("lib.rs")).toBe("tree-sitter-rust");
+    });
+    it("returns null for unsupported extensions", () => {
+        expect(grammarNameForFile("style.css")).toBeNull();
+        expect(grammarNameForFile("config.yaml")).toBeNull();
+    });
+    it("still returns grammar name for .d.ts (exclusion is in isStructuralLanguage, not here)", () => {
+        // grammarNameForFile only maps extension → grammar; the .d.ts guard is in isStructuralLanguage
+        expect(grammarNameForFile("types.d.ts")).toBe("tree-sitter-typescript");
+    });
+});
+//# sourceMappingURL=languages.test.js.map

package/dist/__tests__/structural/languages.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"languages.test.js","sourceRoot":"","sources":["../../../src/__tests__/structural/languages.test.ts"],"names":[],"mappings":"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"}

package/dist/__tests__/structural/matching.test.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Tests for structural/matching.ts — 3-way entity matching.
+ * Pure logic, no tree-sitter / WASM dependency.
+ */
+export {};
+//# sourceMappingURL=matching.test.d.ts.map

package/dist/__tests__/structural/matching.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"matching.test.d.ts","sourceRoot":"","sources":["../../../src/__tests__/structural/matching.test.ts"],"names":[],"mappings":"AAAA;;;GAGG"}

package/dist/__tests__/structural/matching.test.js

@@ -0,0 +1,113 @@
+/**
+ * Tests for structural/matching.ts — 3-way entity matching.
+ * Pure logic, no tree-sitter / WASM dependency.
+ */
+import { describe, it, expect } from "vitest";
+import { matchEntities } from "../../structural/matching.js";
+// ─── Helpers ─────────────────────────────────────────────────────────────────
+function entity(sig, text) {
+    return {
+        signature: sig,
+        kind: "function",
+        text,
+        startByte: 0,
+        endByte: text.length,
+        startLine: 0,
+    };
+}
+// ─── Tests ────────────────────────────────────────────────────────────────────
+describe("matchEntities", () => {
+    it("marks entities identical in all three versions as unchanged", () => {
+        const e = entity("function:foo", "function foo() {}");
+        const matches = matchEntities([e], [e], [e]);
+        expect(matches).toHaveLength(1);
+        expect(matches[0].status).toBe("unchanged");
+    });
+    it("detects ours-only-change", () => {
+        const base = entity("function:foo", "function foo() {}");
+        const ours = entity("function:foo", "function foo() { return 1; }");
+        const theirs = entity("function:foo", "function foo() {}");
+        const [m] = matchEntities([base], [ours], [theirs]);
+        expect(m.status).toBe("ours-only-change");
+        expect(m.ours?.text).toBe(ours.text);
+    });
+    it("detects theirs-only-change", () => {
+        const base = entity("function:foo", "function foo() {}");
+        const ours = entity("function:foo", "function foo() {}");
+        const theirs = entity("function:foo", "function foo() { return 2; }");
+        const [m] = matchEntities([base], [ours], [theirs]);
+        expect(m.status).toBe("theirs-only-change");
+    });
+    it("detects both-changed-same when text is identical", () => {
+        const base = entity("function:foo", "function foo() {}");
+        const changed = entity("function:foo", "function foo() { /* same */ }");
+        const [m] = matchEntities([base], [changed], [changed]);
+        expect(m.status).toBe("both-changed-same");
+    });
+    it("detects both-changed-diff", () => {
+        const base = entity("function:foo", "function foo() {}");
+        const ours = entity("function:foo", "function foo() { return 1; }");
+        const theirs = entity("function:foo", "function foo() { return 2; }");
+        const [m] = matchEntities([base], [ours], [theirs]);
+        expect(m.status).toBe("both-changed-diff");
+    });
+    it("detects ours-added (entity not in base or theirs)", () => {
+        const e = entity("function:bar", "function bar() {}");
+        const matches = matchEntities([], [e], []);
+        expect(matches[0].status).toBe("ours-added");
+    });
+    it("detects theirs-added (entity not in base or ours)", () => {
+        const e = entity("function:bar", "function bar() {}");
+        const matches = matchEntities([], [], [e]);
+        expect(matches[0].status).toBe("theirs-added");
+    });
+    it("detects ours-deleted", () => {
+        const base = entity("function:foo", "function foo() {}");
+        const theirs = entity("function:foo", "function foo() {}");
+        const [m] = matchEntities([base], [], [theirs]);
+        expect(m.status).toBe("ours-deleted");
+    });
+    it("detects theirs-deleted", () => {
+        const base = entity("function:foo", "function foo() {}");
+        const ours = entity("function:foo", "function foo() {}");
+        const [m] = matchEntities([base], [ours], []);
+        expect(m.status).toBe("theirs-deleted");
+    });
+    it("handles multiple entities with different statuses", () => {
+        const unchanged = entity("function:unchanged", "function unchanged() {}");
+        const oursAdded = entity("function:oursAdded", "function oursAdded() {}");
+        const theirsAdded = entity("function:theirsAdded", "function theirsAdded() {}");
+        const base = entity("function:deleted", "function deleted() {}");
+        const matches = matchEntities([unchanged, base], [unchanged, oursAdded], [unchanged, theirsAdded]);
+        const byName = Object.fromEntries(matches.map((m) => [m.signature, m.status]));
+        expect(byName["function:unchanged"]).toBe("unchanged");
+        expect(byName["function:oursAdded"]).toBe("ours-added");
+        expect(byName["function:theirsAdded"]).toBe("theirs-added");
+        // "deleted" is in base but absent from both ours and theirs → both agreed to delete it
+        expect(byName["function:deleted"]).toBe("both-changed-same");
+    });
+    it("preserves base+ours order with new signatures appended", () => {
+        const a = entity("function:a", "function a() {}");
+        const b = entity("function:b", "function b() {}");
+        const c = entity("function:c", "function c() {}"); // only in theirs
+        const matches = matchEntities([a, b], [a, b], [a, b, c]);
+        expect(matches.map((m) => m.signature)).toEqual(["function:a", "function:b", "function:c"]);
+    });
+    it("both-deleted → both-changed-same", () => {
+        const base = entity("function:foo", "function foo() {}");
+        const [m] = matchEntities([base], [], []);
+        expect(m.status).toBe("both-changed-same");
+    });
+    it("both added with same text → both-changed-same", () => {
+        const e = entity("function:new", "function new() {}");
+        const [m] = matchEntities([], [e], [e]);
+        expect(m.status).toBe("both-changed-same");
+    });
+    it("both added with different text → both-changed-diff", () => {
+        const ours = entity("function:new", "function new() { return 1; }");
+        const theirs = entity("function:new", "function new() { return 2; }");
+        const [m] = matchEntities([], [ours], [theirs]);
+        expect(m.status).toBe("both-changed-diff");
+    });
+});
+//# sourceMappingURL=matching.test.js.map

package/dist/__tests__/structural/matching.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"matching.test.js","sourceRoot":"","sources":["../../../src/__tests__/structural/matching.test.ts"],"names":[],"mappings":"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"}

package/dist/__tests__/structural/merge.test.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Tests for structural/merge.ts — entity-level merge decisions.
+ * Pure logic, no tree-sitter / WASM dependency.
+ */
+export {};
+//# sourceMappingURL=merge.test.d.ts.map

package/dist/__tests__/structural/merge.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge.test.d.ts","sourceRoot":"","sources":["../../../src/__tests__/structural/merge.test.ts"],"names":[],"mappings":"AAAA;;;GAGG"}