@gitwand/core 1.6.0

package/dist/__tests__/config.test.js

@@ -0,0 +1,317 @@
+import { describe, it, expect } from "vitest";
+import { resolve } from "../resolver.js";
+import { matchGlob, effectivePolicyForFile, policyToConfig, parseGitwandrc, DEFAULT_POLICY, } from "../config.js";
+// ═══════════════════════════════════════════════════════════════
+// PHASE 7.4 — Politiques de merge et configuration par projet
+// ═══════════════════════════════════════════════════════════════
+describe("Phase 7.4 — matchGlob", () => {
+    describe("extensions simples", () => {
+        it("matche *.lock sur yarn.lock", () => {
+            expect(matchGlob("*.lock", "yarn.lock")).toBe(true);
+        });
+        it("matche *.lock sur Cargo.lock", () => {
+            expect(matchGlob("*.lock", "Cargo.lock")).toBe(true);
+        });
+        it("ne matche pas *.lock sur package.json", () => {
+            expect(matchGlob("*.lock", "package.json")).toBe(false);
+        });
+        it("matche *.json sur package.json", () => {
+            expect(matchGlob("*.json", "package.json")).toBe(true);
+        });
+        it("matche *.json même dans un sous-dossier (basename match)", () => {
+            expect(matchGlob("*.json", "src/config.json")).toBe(true);
+        });
+    });
+    describe("correspondance exacte", () => {
+        it("matche package.json exactement", () => {
+            expect(matchGlob("package.json", "package.json")).toBe(true);
+        });
+        it("ne matche pas package.json sur other.json", () => {
+            expect(matchGlob("package.json", "other.json")).toBe(false);
+        });
+    });
+    describe("globs avec slash", () => {
+        it("matche src/**/*.ts sur src/utils/helper.ts", () => {
+            expect(matchGlob("src/**/*.ts", "src/utils/helper.ts")).toBe(true);
+        });
+        it("matche src/**/*.ts sur src/components/App.ts", () => {
+            expect(matchGlob("src/**/*.ts", "src/components/App.ts")).toBe(true);
+        });
+        it("ne matche pas src/**/*.ts sur test/utils.ts", () => {
+            expect(matchGlob("src/**/*.ts", "test/utils.ts")).toBe(false);
+        });
+        it("matche docs/*.md sur docs/README.md", () => {
+            expect(matchGlob("docs/*.md", "docs/README.md")).toBe(true);
+        });
+        it("ne matche pas docs/*.md sur docs/sub/README.md", () => {
+            expect(matchGlob("docs/*.md", "docs/sub/README.md")).toBe(false);
+        });
+        it("matche **/*.lock sur node_modules/foo/yarn.lock", () => {
+            expect(matchGlob("**/*.lock", "node_modules/foo/yarn.lock")).toBe(true);
+        });
+    });
+});
+describe("Phase 7.4 — effectivePolicyForFile", () => {
+    it("retourne DEFAULT_POLICY si aucune option", () => {
+        expect(effectivePolicyForFile("src/app.ts")).toBe(DEFAULT_POLICY);
+    });
+    it("retourne la politique globale si définie", () => {
+        expect(effectivePolicyForFile("src/app.ts", "prefer-ours")).toBe("prefer-ours");
+    });
+    it("le pattern override bat la politique globale", () => {
+        expect(effectivePolicyForFile("yarn.lock", "prefer-ours", { "*.lock": "prefer-theirs" })).toBe("prefer-theirs");
+    });
+    it("le pattern le plus spécifique gagne", () => {
+        expect(effectivePolicyForFile("package.json", "prefer-merge", {
+            "*.json": "prefer-safety",
+            "package.json": "strict", // plus spécifique
+        })).toBe("strict");
+    });
+    it("les fichiers non-matchés utilisent la politique globale", () => {
+        expect(effectivePolicyForFile("src/app.ts", "prefer-merge", { "*.json": "strict" })).toBe("prefer-merge");
+    });
+});
+describe("Phase 7.4 — policyToConfig", () => {
+    it("prefer-ours : preferOurs = true", () => {
+        const cfg = policyToConfig("prefer-ours");
+        expect(cfg.preferOurs).toBe(true);
+        expect(cfg.allowWhitespace).toBe(true);
+        expect(cfg.allowValueOnly).toBe(true);
+    });
+    it("prefer-theirs : preferOurs = false", () => {
+        const cfg = policyToConfig("prefer-theirs");
+        expect(cfg.preferOurs).toBe(false);
+    });
+    it("prefer-merge : minConfidence medium", () => {
+        const cfg = policyToConfig("prefer-merge");
+        expect(cfg.minConfidence).toBe("medium");
+        expect(cfg.allowWhitespace).toBe(true);
+    });
+    it("prefer-safety : whitespace et value_only désactivés", () => {
+        const cfg = policyToConfig("prefer-safety");
+        expect(cfg.allowWhitespace).toBe(false);
+        expect(cfg.allowValueOnly).toBe(false);
+        expect(cfg.allowNonOverlapping).toBe(true);
+    });
+    it("strict : whitespace, value_only, non_overlapping désactivés", () => {
+        const cfg = policyToConfig("strict");
+        expect(cfg.allowWhitespace).toBe(false);
+        expect(cfg.allowValueOnly).toBe(false);
+        expect(cfg.allowNonOverlapping).toBe(false);
+    });
+});
+describe("Phase 7.4 — parseGitwandrc", () => {
+    it("parse un .gitwandrc valide", () => {
+        const json = JSON.stringify({
+            policy: "prefer-safety",
+            patterns: {
+                "*.lock": "prefer-theirs",
+                "src/**/*.ts": "prefer-ours",
+            },
+        });
+        const cfg = parseGitwandrc(json);
+        expect(cfg).not.toBeNull();
+        expect(cfg.policy).toBe("prefer-safety");
+        expect(cfg.patterns?.["*.lock"]).toBe("prefer-theirs");
+    });
+    it("retourne null pour JSON invalide", () => {
+        expect(parseGitwandrc("not json")).toBeNull();
+    });
+    it("ignore les politiques invalides", () => {
+        const json = JSON.stringify({ policy: "unknown-policy" });
+        const cfg = parseGitwandrc(json);
+        // Ne doit pas crasher, juste ignorer la politique invalide
+        expect(cfg).not.toBeNull();
+        expect(cfg.policy).toBeUndefined();
+    });
+    it("parse un objet partiel (seulement policy)", () => {
+        const json = JSON.stringify({ policy: "strict" });
+        const cfg = parseGitwandrc(json);
+        expect(cfg.policy).toBe("strict");
+        expect(cfg.patterns).toBeUndefined();
+    });
+    it("retourne null pour un JSON non-objet", () => {
+        expect(parseGitwandrc('"string"')).toBeNull();
+        expect(parseGitwandrc("42")).toBeNull();
+        expect(parseGitwandrc("null")).toBeNull();
+    });
+    // ─── P2.4 — generatedFiles ────────────────────────────────
+    it("P2.4: parse un tableau generatedFiles valide", () => {
+        const json = JSON.stringify({
+            generatedFiles: ["**/*.generated.ts", "*.pb.go"],
+        });
+        const cfg = parseGitwandrc(json);
+        expect(cfg.generatedFiles).toEqual(["**/*.generated.ts", "*.pb.go"]);
+    });
+    it("P2.4: filtre les entrées non-string dans generatedFiles", () => {
+        const json = JSON.stringify({
+            generatedFiles: ["**/*.gen.ts", 42, null, "", "valid.pattern"],
+        });
+        const cfg = parseGitwandrc(json);
+        expect(cfg.generatedFiles).toEqual(["**/*.gen.ts", "valid.pattern"]);
+    });
+    it("P2.4: generatedFiles non-array est ignoré", () => {
+        const json = JSON.stringify({ generatedFiles: "not an array" });
+        const cfg = parseGitwandrc(json);
+        expect(cfg.generatedFiles).toBeUndefined();
+    });
+    it("P2.4: generatedFiles vide ou sans entrée valide → undefined", () => {
+        expect(parseGitwandrc(JSON.stringify({ generatedFiles: [] })).generatedFiles).toBeUndefined();
+        expect(parseGitwandrc(JSON.stringify({ generatedFiles: [42, null] })).generatedFiles).toBeUndefined();
+    });
+});
+// ─── Fixtures pour les tests d'intégration ───────────────
+const WHITESPACE_CONFLICT = `<<<<<<< ours
+function hello() {
+    return "world";
+}
+=======
+function hello() {
+  return "world";
+}
+>>>>>>> theirs`;
+const VALUE_ONLY_CONFLICT = `<<<<<<< HEAD
+  "version": "3.2.1",
+  "integrity": "sha512-abc123"
+=======
+  "version": "3.3.0",
+  "integrity": "sha512-xyz789"
+>>>>>>> master`;
+const NON_OVERLAPPING_CONFLICT = `<<<<<<< ours
+import React from "react";
+import { useState } from "react";
+import { useEffect } from "react";
+import axios from "axios";
+||||||| base
+import React from "react";
+import { useState } from "react";
+import axios from "axios";
+=======
+import React from "react";
+import { useState } from "react";
+import axios from "axios";
+import dayjs from "dayjs";
+>>>>>>> theirs`;
+describe("Phase 7.4 — politiques via resolve()", () => {
+    describe("prefer-ours", () => {
+        it("whitespace_only : résolution avec ours", () => {
+            const result = resolve(WHITESPACE_CONFLICT, "style.css", { policy: "prefer-ours" });
+            expect(result.stats.autoResolved).toBe(1);
+        });
+        it("value_only_change : prend ours (pas theirs)", () => {
+            const result = resolve(VALUE_ONLY_CONFLICT, "lock.json", { policy: "prefer-ours" });
+            if (result.stats.autoResolved > 0) {
+                expect(result.mergedContent).toContain("3.2.1"); // ours
+                expect(result.mergedContent).not.toContain("3.3.0"); // pas theirs
+            }
+        });
+        it("la raison mentionne la politique", () => {
+            const result = resolve(VALUE_ONLY_CONFLICT, "lock.json", { policy: "prefer-ours" });
+            if (result.resolutions[0].autoResolved) {
+                expect(result.resolutions[0].resolutionReason).toMatch(/prefer-ours/);
+            }
+        });
+    });
+    describe("prefer-theirs (défaut)", () => {
+        it("value_only_change : prend theirs", () => {
+            const result = resolve(VALUE_ONLY_CONFLICT, "lock.json");
+            if (result.stats.autoResolved > 0) {
+                expect(result.mergedContent).toContain("3.3.0"); // theirs
+                expect(result.mergedContent).not.toContain("3.2.1"); // pas ours
+            }
+        });
+    });
+    describe("prefer-merge", () => {
+        it("résout non_overlapping normalement", () => {
+            const result = resolve(NON_OVERLAPPING_CONFLICT, "imports.ts", { policy: "prefer-merge" });
+            expect(result.stats.autoResolved).toBe(1);
+        });
+        it("accepte les hunks de confiance medium", () => {
+            // Un conflit whitespace sans base (diff2) → confidence: medium
+            const diff2ws = `<<<<<<< HEAD
+function foo() {
+    return 1;
+}
+=======
+function foo() {
+  return 1;
+}
+>>>>>>> master`;
+            const resultStrict = resolve(diff2ws, "f.ts", { policy: "strict" });
+            const resultMerge = resolve(diff2ws, "f.ts", { policy: "prefer-merge" });
+            // prefer-merge doit résoudre plus (ou autant) que strict
+            expect(resultMerge.stats.autoResolved).toBeGreaterThanOrEqual(resultStrict.stats.autoResolved);
+        });
+    });
+    describe("prefer-safety", () => {
+        it("ne résout pas whitespace_only", () => {
+            const result = resolve(WHITESPACE_CONFLICT, "style.css", { policy: "prefer-safety" });
+            expect(result.stats.autoResolved).toBe(0);
+            expect(result.resolutions[0].resolutionReason).toMatch(/prefer-safety/);
+        });
+        it("ne résout pas value_only_change", () => {
+            const result = resolve(VALUE_ONLY_CONFLICT, "lock.json", { policy: "prefer-safety" });
+            expect(result.stats.autoResolved).toBe(0);
+            expect(result.resolutions[0].resolutionReason).toMatch(/prefer-safety/);
+        });
+        it("résout quand même same_change", () => {
+            const sameChange = `import { useState } from "react";
+<<<<<<< ours
+import { useEffect } from "react";
+||||||| base
+=======
+import { useEffect } from "react";
+>>>>>>> theirs
+export default function App() {}`;
+            const result = resolve(sameChange, "App.tsx", { policy: "prefer-safety" });
+            expect(result.stats.autoResolved).toBe(1);
+        });
+    });
+    describe("strict", () => {
+        it("ne résout pas non_overlapping", () => {
+            const result = resolve(NON_OVERLAPPING_CONFLICT, "imports.ts", { policy: "strict" });
+            expect(result.stats.autoResolved).toBe(0);
+            expect(result.resolutions[0].resolutionReason).toMatch(/strict/);
+        });
+        it("résout one_side_change", () => {
+            const oneSide = `const config = {
+<<<<<<< ours
+  port: 3000,
+  host: "localhost",
+||||||| base
+  port: 3000,
+=======
+  port: 3000,
+>>>>>>> theirs
+};`;
+            const result = resolve(oneSide, "config.ts", { policy: "strict" });
+            expect(result.stats.autoResolved).toBe(1);
+        });
+    });
+    describe("patternOverrides", () => {
+        it("override par pattern pour les lockfiles", () => {
+            // En prefer-safety, value_only_change n'est pas résolu
+            // Mais avec un override *.lock → prefer-theirs, il devrait l'être
+            const result = resolve(VALUE_ONLY_CONFLICT, "yarn.lock", {
+                policy: "prefer-safety",
+                patternOverrides: { "*.lock": "prefer-theirs" },
+            });
+            // La politique "prefer-theirs" permet value_only_change
+            if (result.hunks[0]?.type === "value_only_change") {
+                expect(result.stats.autoResolved).toBe(1);
+                expect(result.resolutions[0].resolutionReason).toMatch(/prefer-theirs/);
+            }
+        });
+        it("les fichiers non-matchés gardent la politique globale", () => {
+            const result = resolve(VALUE_ONLY_CONFLICT, "config.ts", {
+                policy: "prefer-safety",
+                patternOverrides: { "*.lock": "prefer-theirs" },
+            });
+            // config.ts ne matche pas *.lock → prefer-safety → value_only skippé
+            if (result.hunks[0]?.type === "value_only_change") {
+                expect(result.stats.autoResolved).toBe(0);
+            }
+        });
+    });
+});
+//# sourceMappingURL=config.test.js.map

package/dist/__tests__/config.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"config.test.js","sourceRoot":"","sources":["../../src/__tests__/config.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACzC,OAAO,EACL,SAAS,EACT,sBAAsB,EACtB,cAAc,EACd,cAAc,EACd,cAAc,GACf,MAAM,cAAc,CAAC;AAEtB,kEAAkE;AAClE,8DAA8D;AAC9D,kEAAkE;AAElE,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;IACrC,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;QAClC,EAAE,CAAC,6BAA6B,EAAE,GAAG,EAAE;YACrC,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,8BAA8B,EAAE,GAAG,EAAE;YACtC,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,uCAAuC,EAAE,GAAG,EAAE;YAC/C,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC1D,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;YACxC,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,0DAA0D,EAAE,GAAG,EAAE;YAClE,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5D,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;QACrC,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;YACxC,MAAM,CAAC,SAAS,CAAC,cAAc,EAAE,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC/D,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,2CAA2C,EAAE,GAAG,EAAE;YACnD,MAAM,CAAC,SAAS,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC9D,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;QAChC,EAAE,CAAC,4CAA4C,EAAE,GAAG,EAAE;YACpD,MAAM,CAAC,SAAS,CAAC,aAAa,EAAE,qBAAqB,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrE,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,8CAA8C,EAAE,GAAG,EAAE;YACtD,MAAM,CAAC,SAAS,CAAC,aAAa,EAAE,uBAAuB,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvE,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,6CAA6C,EAAE,GAAG,EAAE;YACrD,MAAM,CAAC,SAAS,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAChE,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,qCAAqC,EAAE,GAAG,EAAE;YAC7C,MAAM,CAAC,SAAS,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC9D,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,gDAAgD,EAAE,GAAG,EAAE;YACxD,MAAM,CAAC,SAAS,CAAC,WAAW,EAAE,oBAAoB,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACnE,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,iDAAiD,EAAE,GAAG,EAAE;YACzD,MAAM,CAAC,SAAS,CAAC,WAAW,EAAE,4BAA4B,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1E,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,oCAAoC,EAAE,GAAG,EAAE;IAClD,EAAE,CAAC,0CAA0C,EAAE,GAAG,EAAE;QAClD,MAAM,CAAC,sBAAsB,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IACpE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0CAA0C,EAAE,GAAG,EAAE;QAClD,MAAM,CAAC,sBAAsB,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAClF,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8CAA8C,EAAE,GAAG,EAAE;QACtD,MAAM,CACJ,sBAAsB,CAAC,WAAW,EAAE,aAAa,EAAE,EAAE,QAAQ,EAAE,eAAe,EAAE,CAAC,CAClF,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IAC1B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qCAAqC,EAAE,GAAG,EAAE;QAC7C,MAAM,CACJ,sBAAsB,CACpB,cAAc,EACd,cAAc,EACd;YACE,QAAQ,EAAE,eAAe;YACzB,cAAc,EAAE,QAAQ,EAAG,kBAAkB;SAC9C,CACF,CACF,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACnB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yDAAyD,EAAE,GAAG,EAAE;QACjE,MAAM,CACJ,sBAAsB,CAAC,YAAY,EAAE,cAAc,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAC7E,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IACzB,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,4BAA4B,EAAE,GAAG,EAAE;IAC1C,EAAE,CAAC,iCAAiC,EAAE,GAAG,EAAE;QACzC,MAAM,GAAG,GAAG,cAAc,CAAC,aAAa,CAAC,CAAC;QAC1C,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAClC,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvC,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACxC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oCAAoC,EAAE,GAAG,EAAE;QAC5C,MAAM,GAAG,GAAG,cAAc,CAAC,eAAe,CAAC,CAAC;QAC5C,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACrC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qCAAqC,EAAE,GAAG,EAAE;QAC7C,MAAM,GAAG,GAAG,cAAc,CAAC,cAAc,CAAC,CAAC;QAC3C,MAAM,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACzC,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qDAAqD,EAAE,GAAG,EAAE;QAC7D,MAAM,GAAG,GAAG,cAAc,CAAC,eAAe,CAAC,CAAC;QAC5C,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACxC,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACvC,MAAM,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6DAA6D,EAAE,GAAG,EAAE;QACrE,MAAM,GAAG,GAAG,cAAc,CAAC,QAAQ,CAAC,CAAC;QACrC,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACxC,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACvC,MAAM,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,4BAA4B,EAAE,GAAG,EAAE;IAC1C,EAAE,CAAC,4BAA4B,EAAE,GAAG,EAAE;QACpC,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC;YAC1B,MAAM,EAAE,eAAe;YACvB,QAAQ,EAAE;gBACR,QAAQ,EAAE,eAAe;gBACzB,aAAa,EAAE,aAAa;aAC7B;SACF,CAAC,CAAC;QACH,MAAM,GAAG,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC;QACjC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;QAC3B,MAAM,CAAC,GAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAC1C,MAAM,CAAC,GAAI,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kCAAkC,EAAE,GAAG,EAAE;QAC1C,MAAM,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;IAChD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iCAAiC,EAAE,GAAG,EAAE;QACzC,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC,CAAC;QAC1D,MAAM,GAAG,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC;QACjC,2DAA2D;QAC3D,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;QAC3B,MAAM,CAAC,GAAI,CAAC,MAAM,CAAC,CAAC,aAAa,EAAE,CAAC;IACtC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2CAA2C,EAAE,GAAG,EAAE;QACnD,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;QAClD,MAAM,GAAG,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC;QACjC,MAAM,CAAC,GAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACnC,MAAM,CAAC,GAAI,CAAC,QAAQ,CAAC,CAAC,aAAa,EAAE,CAAC;IACxC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sCAAsC,EAAE,GAAG,EAAE;QAC9C,MAAM,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;QAC9C,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;QACxC,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;IAC5C,CAAC,CAAC,CAAC;IAEH,6DAA6D;IAE7D,EAAE,CAAC,8CAA8C,EAAE,GAAG,EAAE;QACtD,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC;YAC1B,cAAc,EAAE,CAAC,mBAAmB,EAAE,SAAS,CAAC;SACjD,CAAC,CAAC;QACH,MAAM,GAAG,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC;QACjC,MAAM,CAAC,GAAI,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,CAAC,mBAAmB,EAAE,SAAS,CAAC,CAAC,CAAC;IACxE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yDAAyD,EAAE,GAAG,EAAE;QACjE,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC;YAC1B,cAAc,EAAE,CAAC,aAAa,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,eAAe,CAAC;SAC/D,CAAC,CAAC;QACH,MAAM,GAAG,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC;QACjC,MAAM,CAAC,GAAI,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC,CAAC;IACxE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2CAA2C,EAAE,GAAG,EAAE;QACnD,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,cAAc,EAAE,cAAc,EAAE,CAAC,CAAC;QAChE,MAAM,GAAG,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC;QACjC,MAAM,CAAC,GAAI,CAAC,cAAc,CAAC,CAAC,aAAa,EAAE,CAAC;IAC9C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6DAA6D,EAAE,GAAG,EAAE;QACrE,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,cAAc,EAAE,EAAE,EAAE,CAAC,CAAE,CAAC,cAAc,CAAC,CAAC,aAAa,EAAE,CAAC;QAC/F,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,cAAc,EAAE,CAAC,EAAE,EAAE,IAAI,CAAC,EAAE,CAAC,CAAE,CAAC,cAAc,CAAC,CAAC,aAAa,EAAE,CAAC;IACzG,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,4DAA4D;AAE5D,MAAM,mBAAmB,GAAG;;;;;;;;eAQb,CAAC;AAEhB,MAAM,mBAAmB,GAAG;;;;;;eAMb,CAAC;AAEhB,MAAM,wBAAwB,GAAG;;;;;;;;;;;;;;eAclB,CAAC;AAEhB,QAAQ,CAAC,sCAAsC,EAAE,GAAG,EAAE;IACpD,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;QAC3B,EAAE,CAAC,wCAAwC,EAAE,GAAG,EAAE;YAChD,MAAM,MAAM,GAAG,OAAO,CAAC,mBAAmB,EAAE,WAAW,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,CAAC;YACpF,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC5C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,6CAA6C,EAAE,GAAG,EAAE;YACrD,MAAM,MAAM,GAAG,OAAO,CAAC,mBAAmB,EAAE,WAAW,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,CAAC;YACpF,IAAI,MAAM,CAAC,KAAK,CAAC,YAAY,GAAG,CAAC,EAAE,CAAC;gBAClC,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAG,OAAO;gBAC1D,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,aAAa;YACpE,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,kCAAkC,EAAE,GAAG,EAAE;YAC1C,MAAM,MAAM,GAAG,OAAO,CAAC,mBAAmB,EAAE,WAAW,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,CAAC;YACpF,IAAI,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,YAAY,EAAE,CAAC;gBACvC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;YACxE,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,wBAAwB,EAAE,GAAG,EAAE;QACtC,EAAE,CAAC,kCAAkC,EAAE,GAAG,EAAE;YAC1C,MAAM,MAAM,GAAG,OAAO,CAAC,mBAAmB,EAAE,WAAW,CAAC,CAAC;YACzD,IAAI,MAAM,CAAC,KAAK,CAAC,YAAY,GAAG,CAAC,EAAE,CAAC;gBAClC,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAI,SAAS;gBAC7D,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW;YAClE,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;QAC5B,EAAE,CAAC,oCAAoC,EAAE,GAAG,EAAE;YAC5C,MAAM,MAAM,GAAG,OAAO,CAAC,wBAAwB,EAAE,YAAY,EAAE,EAAE,MAAM,EAAE,cAAc,EAAE,CAAC,CAAC;YAC3F,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC5C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,uCAAuC,EAAE,GAAG,EAAE;YAC/C,+DAA+D;YAC/D,MAAM,OAAO,GAAG;;;;;;;;eAQP,CAAC;YACV,MAAM,YAAY,GAAG,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;YACpE,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,cAAc,EAAE,CAAC,CAAC;YACzE,yDAAyD;YACzD,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,sBAAsB,CAAC,YAAY,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QACjG,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;QAC7B,EAAE,CAAC,+BAA+B,EAAE,GAAG,EAAE;YACvC,MAAM,MAAM,GAAG,OAAO,CAAC,mBAAmB,EAAE,WAAW,EAAE,EAAE,MAAM,EAAE,eAAe,EAAE,CAAC,CAAC;YACtF,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC1C,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;QAC1E,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,iCAAiC,EAAE,GAAG,EAAE;YACzC,MAAM,MAAM,GAAG,OAAO,CAAC,mBAAmB,EAAE,WAAW,EAAE,EAAE,MAAM,EAAE,eAAe,EAAE,CAAC,CAAC;YACtF,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC1C,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;QAC1E,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,+BAA+B,EAAE,GAAG,EAAE;YACvC,MAAM,UAAU,GAAG;;;;;;;iCAOQ,CAAC;YAC5B,MAAM,MAAM,GAAG,OAAO,CAAC,UAAU,EAAE,SAAS,EAAE,EAAE,MAAM,EAAE,eAAe,EAAE,CAAC,CAAC;YAC3E,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC5C,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,QAAQ,EAAE,GAAG,EAAE;QACtB,EAAE,CAAC,+BAA+B,EAAE,GAAG,EAAE;YACvC,MAAM,MAAM,GAAG,OAAO,CAAC,wBAAwB,EAAE,YAAY,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;YACrF,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC1C,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACnE,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,wBAAwB,EAAE,GAAG,EAAE;YAChC,MAAM,OAAO,GAAG;;;;;;;;;GASnB,CAAC;YACE,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,WAAW,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;YACnE,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC5C,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;QAChC,EAAE,CAAC,yCAAyC,EAAE,GAAG,EAAE;YACjD,uDAAuD;YACvD,kEAAkE;YAClE,MAAM,MAAM,GAAG,OAAO,CAAC,mBAAmB,EAAE,WAAW,EAAE;gBACvD,MAAM,EAAE,eAAe;gBACvB,gBAAgB,EAAE,EAAE,QAAQ,EAAE,eAAe,EAAE;aAChD,CAAC,CAAC;YACH,wDAAwD;YACxD,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,IAAI,KAAK,mBAAmB,EAAE,CAAC;gBAClD,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAC1C,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;YAC1E,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,uDAAuD,EAAE,GAAG,EAAE;YAC/D,MAAM,MAAM,GAAG,OAAO,CAAC,mBAAmB,EAAE,WAAW,EAAE;gBACvD,MAAM,EAAE,eAAe;gBACvB,gBAAgB,EAAE,EAAE,QAAQ,EAAE,eAAe,EAAE;aAChD,CAAC,CAAC;YACH,qEAAqE;YACrE,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,IAAI,KAAK,mBAAmB,EAAE,CAAC;gBAClD,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC5C,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/__tests__/corpus.d.ts

@@ -0,0 +1,36 @@
+/**
+ * GitWand — Corpus de conflits de référence
+ *
+ * Phase 7.5 : 20 fixtures réalistes couvrant tous les types de conflit,
+ * les deux formats (diff2 / diff3), et différents types de fichiers.
+ *
+ * Chaque fixture définit :
+ * - `input`           : le fichier avec marqueurs de conflit
+ * - `expectedType`    : le type attendu (ex: "same_change")
+ * - `expectedResolved`: si le moteur doit auto-résoudre
+ * - `expectedOutput`  : le contenu attendu après résolution (optionnel)
+ * - `category`        : famille du conflit
+ */
+import type { ConflictType, GitWandOptions } from "../types.js";
+export interface CorpusFixture {
+    id: string;
+    description: string;
+    filePath: string;
+    input: string;
+    expectedType: ConflictType;
+    expectedResolved: boolean;
+    /** Contenu mergé attendu (null = non résolu, undefined = ne pas vérifier) */
+    expectedOutput?: string | null;
+    category: "trivial" | "structural" | "semantic" | "format-aware" | "complex";
+    options?: GitWandOptions;
+}
+export declare const CORPUS: CorpusFixture[];
+/** Résumé par catégorie */
+export declare const CORPUS_CATEGORIES: {
+    trivial: CorpusFixture[];
+    structural: CorpusFixture[];
+    semantic: CorpusFixture[];
+    "format-aware": CorpusFixture[];
+    complex: CorpusFixture[];
+};
+//# sourceMappingURL=corpus.d.ts.map

package/dist/__tests__/corpus.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"corpus.d.ts","sourceRoot":"","sources":["../../src/__tests__/corpus.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAIhE,MAAM,WAAW,aAAa;IAC5B,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,YAAY,CAAC;IAC3B,gBAAgB,EAAE,OAAO,CAAC;IAC1B,6EAA6E;IAC7E,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,QAAQ,EAAE,SAAS,GAAG,YAAY,GAAG,UAAU,GAAG,cAAc,GAAG,SAAS,CAAC;IAC7E,OAAO,CAAC,EAAE,cAAc,CAAC;CAC1B;AAmiBD,eAAO,MAAM,MAAM,EAAE,aAAa,EAKjC,CAAC;AAEF,2BAA2B;AAC3B,eAAO,MAAM,iBAAiB;;;;;;CAM7B,CAAC"}