@gitwand/core 2.2.0 → 2.4.1

package/dist/__tests__/resolvers/imports.test.js

@@ -0,0 +1,135 @@
+/**
+ * Tests du resolver imports ES/TS (GitWand)
+ *
+ * Fixtures :
+ *   F1 — import ajouté d'un seul côté
+ *   F2 — même module importé différemment des deux côtés → conflit non résolvable
+ *   F3 — imports vides (bloc vide)
+ *   F4 — TypeScript avec `import type`
+ *   F5 — re-exports `export { X } from 'y'`
+ */
+import { describe, it, expect } from "vitest";
+import { resolve } from "../../resolver.js";
+// ─── F1 — import ajouté d'un seul côté ───────────────────────────────────────
+describe("F1 — imports : import ajouté d'un seul côté (diff3)", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `import { ref } from 'vue';`,
+        `import { computed } from 'vue';`,
+        `import { useRouter } from 'vue-router';`,
+        `||||||| base`,
+        `import { ref } from 'vue';`,
+        `import { computed } from 'vue';`,
+        `=======`,
+        `import { ref } from 'vue';`,
+        `import { computed } from 'vue';`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("auto-résout via le resolver imports", () => {
+        const result = resolve(input, "composable.ts");
+        expect(result.stats.autoResolved).toBe(1);
+    });
+    it("les deux imports sont présents dans le merge", () => {
+        const result = resolve(input, "composable.ts");
+        expect(result.mergedContent).toContain("useRouter");
+        expect(result.mergedContent).toContain("computed");
+        expect(result.mergedContent).toContain("ref");
+    });
+    it("la raison mentionne [imports]", () => {
+        const result = resolve(input, "composable.ts");
+        expect(result.resolutions[0].resolutionReason).toMatch(/\[imports\]/i);
+    });
+});
+// ─── F2 — même module importé différemment des deux côtés ────────────────────
+describe("F2 — imports : même module importé différemment des deux côtés (diff3)", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `import { ref, computed, watch } from 'vue';`,
+        `||||||| base`,
+        `import { ref } from 'vue';`,
+        `=======`,
+        `import { ref, reactive, toRefs } from 'vue';`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("ne lève pas d'exception", () => {
+        expect(() => resolve(input, "store.ts")).not.toThrow();
+    });
+    it("la raison mentionne [imports]", () => {
+        const result = resolve(input, "store.ts");
+        expect(result.resolutions[0].resolutionReason).toMatch(/\[imports\]/i);
+    });
+});
+// ─── F3 — imports vides ───────────────────────────────────────────────────────
+describe("F3 — imports vides : ne plante pas", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `import {} from 'vue';`,
+        `=======`,
+        `import {} from 'vue';`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("ne lève pas d'exception", () => {
+        expect(() => resolve(input, "empty.ts")).not.toThrow();
+    });
+    it("produit un résultat avec au moins un hunk", () => {
+        const result = resolve(input, "empty.ts");
+        expect(result.hunks.length).toBeGreaterThanOrEqual(1);
+    });
+});
+// ─── F4 — TypeScript avec import type ────────────────────────────────────────
+describe("F4 — imports : TypeScript avec `import type` (diff3)", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `import type { Ref } from 'vue';`,
+        `import type { Router } from 'vue-router';`,
+        `import type { GitWandOptions } from '@gitwand/core';`,
+        `||||||| base`,
+        `import type { Ref } from 'vue';`,
+        `import type { Router } from 'vue-router';`,
+        `=======`,
+        `import type { Ref } from 'vue';`,
+        `import type { Router } from 'vue-router';`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("auto-résout via le resolver imports", () => {
+        const result = resolve(input, "types.ts");
+        expect(result.stats.autoResolved).toBe(1);
+    });
+    it("le résultat contient l'import type ajouté", () => {
+        const result = resolve(input, "types.ts");
+        expect(result.mergedContent).toContain("GitWandOptions");
+        expect(result.mergedContent).toContain("import type");
+    });
+    it("la raison mentionne [imports]", () => {
+        const result = resolve(input, "types.ts");
+        expect(result.resolutions[0].resolutionReason).toMatch(/\[imports\]/i);
+    });
+});
+// ─── F5 — re-exports ──────────────────────────────────────────────────────────
+// F5 — imports de deux modules différents ajoutés des deux côtés (diff2)
+// En diff2, insertion_at_boundary n'a pas accès à la base → le resolver imports
+// est sollicité pour la fusion sémantique.
+describe("F5 — imports : deux modules différents ajoutés (diff2)", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `import { useRouter } from 'vue-router';`,
+        `import { ref } from 'vue';`,
+        `import { useI18n } from './composables/useI18n';`,
+        `=======`,
+        `import { useRouter } from 'vue-router';`,
+        `import { ref } from 'vue';`,
+        `import { useTheme } from './composables/useTheme';`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("auto-résout", () => {
+        const result = resolve(input, "src/App.ts");
+        expect(result.stats.autoResolved).toBe(1);
+    });
+    it("le résultat contient les imports des deux côtés", () => {
+        const result = resolve(input, "src/App.ts");
+        expect(result.mergedContent).toContain("useI18n");
+        expect(result.mergedContent).toContain("useTheme");
+        expect(result.mergedContent).toContain("useRouter");
+    });
+});
+//# sourceMappingURL=imports.test.js.map

package/dist/__tests__/resolvers/imports.test.js.map

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

package/dist/__tests__/resolvers/json.test.d.ts

@@ -0,0 +1,12 @@
+/**
+ * Tests du resolver JSON/JSONC (GitWand)
+ *
+ * Fixtures :
+ *   F1 — clé ajoutée d'un seul côté
+ *   F2 — même clé modifiée des deux côtés → conflit non résolvable
+ *   F3 — JSON vide/minimal {}
+ *   F4 — conflit dans package.json scripts
+ *   F5 — conflit dans tsconfig.json compilerOptions
+ */
+export {};
+//# sourceMappingURL=json.test.d.ts.map

package/dist/__tests__/resolvers/json.test.d.ts.map

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

package/dist/__tests__/resolvers/json.test.js

@@ -0,0 +1,184 @@
+/**
+ * Tests du resolver JSON/JSONC (GitWand)
+ *
+ * Fixtures :
+ *   F1 — clé ajoutée d'un seul côté
+ *   F2 — même clé modifiée des deux côtés → conflit non résolvable
+ *   F3 — JSON vide/minimal {}
+ *   F4 — conflit dans package.json scripts
+ *   F5 — conflit dans tsconfig.json compilerOptions
+ */
+import { describe, it, expect } from "vitest";
+import { resolve } from "../../resolver.js";
+// ─── F1 — clé ajoutée d'un seul côté ─────────────────────────────────────────
+describe("F1 — JSON : clé ajoutée d'un seul côté (diff3)", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `{`,
+        `  "name": "my-app",`,
+        `  "version": "1.0.0",`,
+        `  "description": "A test app"`,
+        `}`,
+        `||||||| base`,
+        `{`,
+        `  "name": "my-app",`,
+        `  "version": "1.0.0"`,
+        `}`,
+        `=======`,
+        `{`,
+        `  "name": "my-app",`,
+        `  "version": "1.0.0"`,
+        `}`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("auto-résout via le resolver json", () => {
+        const result = resolve(input, "package.json");
+        expect(result.stats.autoResolved).toBe(1);
+    });
+    it("le résultat contient la clé ajoutée", () => {
+        const result = resolve(input, "package.json");
+        expect(result.mergedContent).toContain("description");
+    });
+    it("la raison mentionne [json]", () => {
+        const result = resolve(input, "package.json");
+        expect(result.resolutions[0].resolutionReason).toMatch(/\[json\]/i);
+    });
+});
+// ─── F2 — même clé modifiée des deux côtés ────────────────────────────────────
+describe("F2 — JSON : même clé modifiée des deux côtés → conflit non résolvable", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `{`,
+        `  "name": "my-app",`,
+        `  "version": "2.0.0"`,
+        `}`,
+        `||||||| base`,
+        `{`,
+        `  "name": "my-app",`,
+        `  "version": "1.0.0"`,
+        `}`,
+        `=======`,
+        `{`,
+        `  "name": "my-app",`,
+        `  "version": "3.0.0"`,
+        `}`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("ne lève pas d'exception", () => {
+        expect(() => resolve(input, "package.json")).not.toThrow();
+    });
+    it("la raison mentionne [json]", () => {
+        const result = resolve(input, "package.json");
+        expect(result.resolutions[0].resolutionReason).toMatch(/\[json\]/i);
+    });
+});
+// ─── F3 — JSON vide / minimal ─────────────────────────────────────────────────
+describe("F3 — JSON minimal {} : ne plante pas", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `{}`,
+        `||||||| base`,
+        `{}`,
+        `=======`,
+        `{}`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("ne lève pas d'exception", () => {
+        expect(() => resolve(input, "empty.json")).not.toThrow();
+    });
+    it("produit un résultat avec au moins un hunk", () => {
+        const result = resolve(input, "empty.json");
+        expect(result.hunks.length).toBeGreaterThanOrEqual(1);
+    });
+});
+// ─── F4 — conflit dans package.json scripts ───────────────────────────────────
+describe("F4 — package.json : merge des scripts (diff3)", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `{`,
+        `  "scripts": {`,
+        `    "build": "tsc",`,
+        `    "test": "vitest",`,
+        `    "lint": "eslint ."`,
+        `  }`,
+        `}`,
+        `||||||| base`,
+        `{`,
+        `  "scripts": {`,
+        `    "build": "tsc",`,
+        `    "test": "vitest"`,
+        `  }`,
+        `}`,
+        `=======`,
+        `{`,
+        `  "scripts": {`,
+        `    "build": "tsc",`,
+        `    "test": "vitest",`,
+        `    "format": "prettier --write ."`,
+        `  }`,
+        `}`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("auto-résout via le resolver json", () => {
+        const result = resolve(input, "package.json");
+        expect(result.stats.autoResolved).toBe(1);
+    });
+    it("le résultat contient les scripts des deux côtés", () => {
+        const result = resolve(input, "package.json");
+        expect(result.mergedContent).toContain("lint");
+        expect(result.mergedContent).toContain("format");
+        expect(result.mergedContent).toContain("build");
+        expect(result.mergedContent).toContain("test");
+    });
+    it("la raison mentionne [json]", () => {
+        const result = resolve(input, "package.json");
+        expect(result.resolutions[0].resolutionReason).toMatch(/\[json\]/i);
+    });
+});
+// ─── F5 — conflit dans tsconfig.json compilerOptions ─────────────────────────
+describe("F5 — tsconfig.json : merge des compilerOptions (diff3)", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `{`,
+        `  "compilerOptions": {`,
+        `    "target": "ES2022",`,
+        `    "module": "ESNext",`,
+        `    "strict": true,`,
+        `    "noUncheckedIndexedAccess": true`,
+        `  }`,
+        `}`,
+        `||||||| base`,
+        `{`,
+        `  "compilerOptions": {`,
+        `    "target": "ES2022",`,
+        `    "module": "ESNext",`,
+        `    "strict": true`,
+        `  }`,
+        `}`,
+        `=======`,
+        `{`,
+        `  "compilerOptions": {`,
+        `    "target": "ES2022",`,
+        `    "module": "ESNext",`,
+        `    "strict": true,`,
+        `    "exactOptionalPropertyTypes": true`,
+        `  }`,
+        `}`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("auto-résout via le resolver json", () => {
+        const result = resolve(input, "tsconfig.json");
+        expect(result.stats.autoResolved).toBe(1);
+    });
+    it("le résultat contient les options des deux côtés", () => {
+        const result = resolve(input, "tsconfig.json");
+        expect(result.mergedContent).toContain("noUncheckedIndexedAccess");
+        expect(result.mergedContent).toContain("exactOptionalPropertyTypes");
+        expect(result.mergedContent).toContain("strict");
+    });
+    it("la raison mentionne [json]", () => {
+        const result = resolve(input, "tsconfig.json");
+        expect(result.resolutions[0].resolutionReason).toMatch(/\[json\]/i);
+    });
+});
+//# sourceMappingURL=json.test.js.map

package/dist/__tests__/resolvers/json.test.js.map

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

package/dist/__tests__/resolvers/lockfile-npm.test.d.ts

@@ -0,0 +1,12 @@
+/**
+ * Tests du resolver lockfile-npm (package-lock.json) — GitWand
+ *
+ * Fixtures :
+ *   F1 — package ajouté d'un seul côté
+ *   F2 — même package, version différente → prefer theirs ou conflit
+ *   F3 — lockfile minimal (structure vide)
+ *   F4 — dépendances directes ajoutées des deux côtés (différents packages)
+ *   F5 — détection du nom `package-lock.json` → bon resolver utilisé
+ */
+export {};
+//# sourceMappingURL=lockfile-npm.test.d.ts.map

package/dist/__tests__/resolvers/lockfile-npm.test.d.ts.map

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

package/dist/__tests__/resolvers/lockfile-npm.test.js

@@ -0,0 +1,187 @@
+/**
+ * Tests du resolver lockfile-npm (package-lock.json) — GitWand
+ *
+ * Fixtures :
+ *   F1 — package ajouté d'un seul côté
+ *   F2 — même package, version différente → prefer theirs ou conflit
+ *   F3 — lockfile minimal (structure vide)
+ *   F4 — dépendances directes ajoutées des deux côtés (différents packages)
+ *   F5 — détection du nom `package-lock.json` → bon resolver utilisé
+ */
+import { describe, it, expect } from "vitest";
+import { resolve } from "../../resolver.js";
+// ─── helpers ──────────────────────────────────────────────────────────────────
+function makeLock(extra = {}) {
+    return JSON.stringify({
+        name: "my-app",
+        version: "1.0.0",
+        lockfileVersion: 3,
+        requires: true,
+        packages: {
+            "": { name: "my-app", version: "1.0.0" },
+            "node_modules/react": {
+                version: "18.2.0",
+                resolved: "https://registry.npmjs.org/react/-/react-18.2.0.tgz",
+                integrity: "sha512-react",
+            },
+            ...extra,
+        },
+    }, null, 2);
+}
+// ─── F1 — package ajouté d'un seul côté ───────────────────────────────────────
+describe("F1 — package-lock.json : package ajouté d'un seul côté (diff3)", () => {
+    const base = makeLock();
+    const ours = makeLock({
+        "node_modules/lodash": {
+            version: "4.17.21",
+            resolved: "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+            integrity: "sha512-lodash",
+        },
+    });
+    const input = [
+        `<<<<<<< ours`,
+        ...ours.split("\n"),
+        `||||||| base`,
+        ...base.split("\n"),
+        `=======`,
+        ...base.split("\n"),
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("auto-résout via le resolver lockfile-npm", () => {
+        const result = resolve(input, "package-lock.json");
+        expect(result.stats.autoResolved).toBe(1);
+    });
+    it("le résultat contient le package ajouté", () => {
+        const result = resolve(input, "package-lock.json");
+        expect(result.mergedContent).toContain("lodash");
+        expect(result.mergedContent).toContain("react");
+    });
+    it("la raison mentionne [lockfile-npm]", () => {
+        const result = resolve(input, "package-lock.json");
+        expect(result.resolutions[0].resolutionReason).toMatch(/\[lockfile-npm\]/i);
+    });
+});
+// ─── F2 — même package, version différente ────────────────────────────────────
+describe("F2 — package-lock.json : même package, version différente (diff3)", () => {
+    const base = makeLock();
+    const ours = makeLock({
+        "node_modules/lodash": {
+            version: "4.17.20",
+            resolved: "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
+            integrity: "sha512-old",
+        },
+    });
+    const theirs = makeLock({
+        "node_modules/lodash": {
+            version: "4.17.21",
+            resolved: "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+            integrity: "sha512-new",
+        },
+    });
+    const input = [
+        `<<<<<<< ours`,
+        ...ours.split("\n"),
+        `||||||| base`,
+        ...base.split("\n"),
+        `=======`,
+        ...theirs.split("\n"),
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("ne lève pas d'exception", () => {
+        expect(() => resolve(input, "package-lock.json")).not.toThrow();
+    });
+    it("la raison mentionne [lockfile-npm]", () => {
+        const result = resolve(input, "package-lock.json");
+        expect(result.resolutions[0].resolutionReason).toMatch(/\[lockfile-npm\]/i);
+    });
+});
+// ─── F3 — lockfile minimal ────────────────────────────────────────────────────
+describe("F3 — package-lock.json minimal : ne plante pas", () => {
+    const minimal = JSON.stringify({ name: "test", version: "1.0.0", lockfileVersion: 3, packages: {} }, null, 2);
+    const input = [
+        `<<<<<<< ours`,
+        ...minimal.split("\n"),
+        `||||||| base`,
+        ...minimal.split("\n"),
+        `=======`,
+        ...minimal.split("\n"),
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("ne lève pas d'exception", () => {
+        expect(() => resolve(input, "package-lock.json")).not.toThrow();
+    });
+    it("produit un résultat avec au moins un hunk", () => {
+        const result = resolve(input, "package-lock.json");
+        expect(result.hunks.length).toBeGreaterThanOrEqual(1);
+    });
+});
+// ─── F4 — dépendances différentes ajoutées des deux côtés ────────────────────
+describe("F4 — package-lock.json : packages différents ajoutés des deux côtés (diff3)", () => {
+    const base = makeLock();
+    const ours = makeLock({
+        "node_modules/axios": {
+            version: "1.6.0",
+            resolved: "https://registry.npmjs.org/axios/-/axios-1.6.0.tgz",
+            integrity: "sha512-axios",
+        },
+    });
+    const theirs = makeLock({
+        "node_modules/date-fns": {
+            version: "3.0.0",
+            resolved: "https://registry.npmjs.org/date-fns/-/date-fns-3.0.0.tgz",
+            integrity: "sha512-datefns",
+        },
+    });
+    const input = [
+        `<<<<<<< ours`,
+        ...ours.split("\n"),
+        `||||||| base`,
+        ...base.split("\n"),
+        `=======`,
+        ...theirs.split("\n"),
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("auto-résout via le resolver lockfile-npm", () => {
+        const result = resolve(input, "package-lock.json");
+        expect(result.stats.autoResolved).toBe(1);
+    });
+    it("le résultat contient les deux packages", () => {
+        const result = resolve(input, "package-lock.json");
+        expect(result.mergedContent).toContain("axios");
+        expect(result.mergedContent).toContain("date-fns");
+        expect(result.mergedContent).toContain("react");
+    });
+    it("la raison mentionne [lockfile-npm]", () => {
+        const result = resolve(input, "package-lock.json");
+        expect(result.resolutions[0].resolutionReason).toMatch(/\[lockfile-npm\]/i);
+    });
+});
+// ─── F5 — détection du nom de fichier ────────────────────────────────────────
+describe("F5 — package-lock.json : détection du nom de fichier", () => {
+    const base = makeLock();
+    const ours = makeLock({
+        "node_modules/vue": {
+            version: "3.4.0",
+            resolved: "https://registry.npmjs.org/vue/-/vue-3.4.0.tgz",
+            integrity: "sha512-vue",
+        },
+    });
+    const input = [
+        `<<<<<<< ours`,
+        ...ours.split("\n"),
+        `||||||| base`,
+        ...base.split("\n"),
+        `=======`,
+        ...base.split("\n"),
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("le nom package-lock.json active le bon resolver", () => {
+        const result = resolve(input, "package-lock.json");
+        expect(result.resolutions[0].resolutionReason).toMatch(/\[lockfile-npm\]/i);
+    });
+    it("le nom dans un sous-dossier est aussi détecté", () => {
+        const result = resolve(input, "apps/frontend/package-lock.json");
+        expect(result.resolutions[0].resolutionReason).toMatch(/\[lockfile-npm\]/i);
+    });
+});
+//# sourceMappingURL=lockfile-npm.test.js.map

package/dist/__tests__/resolvers/lockfile-npm.test.js.map

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

package/dist/__tests__/resolvers/lockfile-pnpm.test.d.ts

@@ -0,0 +1,12 @@
+/**
+ * Tests du resolver lockfile-pnpm (pnpm-lock.yaml) — GitWand
+ *
+ * Fixtures :
+ *   F1 — package ajouté dans `packages:` d'un seul côté
+ *   F2 — même package, version différente → prefer theirs ou conflit
+ *   F3 — lockfile minimal
+ *   F4 — ajout dans `importers:` d'un seul côté
+ *   F5 — détection du nom `pnpm-lock.yaml` → bon resolver utilisé
+ */
+export {};
+//# sourceMappingURL=lockfile-pnpm.test.d.ts.map

package/dist/__tests__/resolvers/lockfile-pnpm.test.d.ts.map

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