@gitwand/core 2.2.0 → 2.4.1

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

@@ -0,0 +1,225 @@
+/**
+ * Tests du resolver Vue SFC (GitWand)
+ *
+ * Fixtures :
+ *   F1 — modification dans <template> d'un seul côté
+ *   F2 — modification dans <script setup> d'un seul côté
+ *   F3 — fichier .vue minimal
+ *   F4 — ajout d'un <style scoped> d'un côté
+ *   F5 — conflit dans <template> des deux côtés → conflit ou fallback
+ */
+import { describe, it, expect } from "vitest";
+import { resolve } from "../../resolver.js";
+// ─── F1 — modification dans <template> d'un seul côté ────────────────────────
+describe("F1 — Vue : modification dans <template> d'un seul côté (diff3)", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `<template>`,
+        `  <div class="app">`,
+        `    <h1>Hello World</h1>`,
+        `    <p>Welcome to my app</p>`,
+        `  </div>`,
+        `</template>`,
+        ``,
+        `<script setup>`,
+        `const title = 'Hello World';`,
+        `</script>`,
+        `||||||| base`,
+        `<template>`,
+        `  <div class="app">`,
+        `    <h1>Hello World</h1>`,
+        `  </div>`,
+        `</template>`,
+        ``,
+        `<script setup>`,
+        `const title = 'Hello World';`,
+        `</script>`,
+        `=======`,
+        `<template>`,
+        `  <div class="app">`,
+        `    <h1>Hello World</h1>`,
+        `  </div>`,
+        `</template>`,
+        ``,
+        `<script setup>`,
+        `const title = 'Hello World';`,
+        `</script>`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("auto-résout via le resolver vue", () => {
+        const result = resolve(input, "App.vue");
+        expect(result.stats.autoResolved).toBe(1);
+    });
+    it("le résultat contient la modification du template", () => {
+        const result = resolve(input, "App.vue");
+        expect(result.mergedContent).toContain("Welcome to my app");
+    });
+    it("la raison mentionne [vue]", () => {
+        const result = resolve(input, "App.vue");
+        expect(result.resolutions[0].resolutionReason).toMatch(/\[vue\]/i);
+    });
+});
+// ─── F2 — modification dans <script setup> d'un seul côté ────────────────────
+describe("F2 — Vue : modification dans <script setup> d'un seul côté (diff3)", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `<template>`,
+        `  <button @click="handleClick">Click me</button>`,
+        `</template>`,
+        ``,
+        `<script setup lang="ts">`,
+        `import { ref } from 'vue';`,
+        `import { useRouter } from 'vue-router';`,
+        ``,
+        `const count = ref(0);`,
+        `const router = useRouter();`,
+        ``,
+        `function handleClick() {`,
+        `  count.value++;`,
+        `}`,
+        `</script>`,
+        `||||||| base`,
+        `<template>`,
+        `  <button @click="handleClick">Click me</button>`,
+        `</template>`,
+        ``,
+        `<script setup lang="ts">`,
+        `import { ref } from 'vue';`,
+        ``,
+        `const count = ref(0);`,
+        ``,
+        `function handleClick() {`,
+        `  count.value++;`,
+        `}`,
+        `</script>`,
+        `=======`,
+        `<template>`,
+        `  <button @click="handleClick">Click me</button>`,
+        `</template>`,
+        ``,
+        `<script setup lang="ts">`,
+        `import { ref } from 'vue';`,
+        ``,
+        `const count = ref(0);`,
+        ``,
+        `function handleClick() {`,
+        `  count.value++;`,
+        `}`,
+        `</script>`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("auto-résout via le resolver vue", () => {
+        const result = resolve(input, "Button.vue");
+        expect(result.stats.autoResolved).toBe(1);
+    });
+    it("le résultat contient le code ajouté dans script setup", () => {
+        const result = resolve(input, "Button.vue");
+        expect(result.mergedContent).toContain("useRouter");
+    });
+    it("la raison mentionne [vue]", () => {
+        const result = resolve(input, "Button.vue");
+        expect(result.resolutions[0].resolutionReason).toMatch(/\[vue\]/i);
+    });
+});
+// ─── F3 — fichier .vue minimal ────────────────────────────────────────────────
+describe("F3 — Vue minimal : ne plante pas", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `<template><div>Ours</div></template>`,
+        `=======`,
+        `<template><div>Theirs</div></template>`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("ne lève pas d'exception", () => {
+        expect(() => resolve(input, "Minimal.vue")).not.toThrow();
+    });
+    it("produit un résultat avec au moins un hunk", () => {
+        const result = resolve(input, "Minimal.vue");
+        expect(result.hunks.length).toBeGreaterThanOrEqual(1);
+    });
+});
+// ─── F4 — ajout d'un <style scoped> d'un côté ────────────────────────────────
+describe("F4 — Vue : ajout d'un <style scoped> d'un côté (diff3)", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `<template>`,
+        `  <div class="card">Card content</div>`,
+        `</template>`,
+        ``,
+        `<script setup lang="ts">`,
+        `// component logic`,
+        `</script>`,
+        ``,
+        `<style scoped>`,
+        `.card {`,
+        `  padding: 16px;`,
+        `  border-radius: 8px;`,
+        `  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);`,
+        `}`,
+        `</style>`,
+        `||||||| base`,
+        `<template>`,
+        `  <div class="card">Card content</div>`,
+        `</template>`,
+        ``,
+        `<script setup lang="ts">`,
+        `// component logic`,
+        `</script>`,
+        `=======`,
+        `<template>`,
+        `  <div class="card">Card content</div>`,
+        `</template>`,
+        ``,
+        `<script setup lang="ts">`,
+        `// component logic`,
+        `</script>`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("auto-résout via le resolver vue", () => {
+        const result = resolve(input, "Card.vue");
+        expect(result.stats.autoResolved).toBe(1);
+    });
+    it("le résultat contient le bloc style ajouté", () => {
+        const result = resolve(input, "Card.vue");
+        expect(result.mergedContent).toContain("<style scoped>");
+        expect(result.mergedContent).toContain(".card");
+    });
+    it("la raison mentionne [vue]", () => {
+        const result = resolve(input, "Card.vue");
+        expect(result.resolutions[0].resolutionReason).toMatch(/\[vue\]/i);
+    });
+});
+// ─── F5 — conflit dans <template> des deux côtés ─────────────────────────────
+describe("F5 — Vue : conflit dans <template> des deux côtés (diff3)", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `<template>`,
+        `  <div class="app">`,
+        `    <h1>My Awesome App</h1>`,
+        `    <p>Version 2.0</p>`,
+        `  </div>`,
+        `</template>`,
+        `||||||| base`,
+        `<template>`,
+        `  <div class="app">`,
+        `    <h1>My App</h1>`,
+        `  </div>`,
+        `</template>`,
+        `=======`,
+        `<template>`,
+        `  <div class="app">`,
+        `    <h1>My Great App</h1>`,
+        `    <span>Beta</span>`,
+        `  </div>`,
+        `</template>`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("ne lève pas d'exception", () => {
+        expect(() => resolve(input, "App.vue")).not.toThrow();
+    });
+    it("la raison mentionne [vue]", () => {
+        const result = resolve(input, "App.vue");
+        expect(result.resolutions[0].resolutionReason).toMatch(/\[vue\]/i);
+    });
+});
+//# sourceMappingURL=vue.test.js.map

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

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

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

@@ -0,0 +1,12 @@
+/**
+ * Tests du resolver YAML (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 — YAML minimal (1 ligne)
+ *   F4 — conflit dans values.yaml Helm (clés indépendantes)
+ *   F5 — conflit dans un workflow GitHub Actions
+ */
+export {};
+//# sourceMappingURL=yaml.test.d.ts.map

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

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

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

@@ -0,0 +1,203 @@
+/**
+ * Tests du resolver YAML (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 — YAML minimal (1 ligne)
+ *   F4 — conflit dans values.yaml Helm (clés indépendantes)
+ *   F5 — conflit dans un workflow GitHub Actions
+ */
+import { describe, it, expect } from "vitest";
+import { resolve } from "../../resolver.js";
+// ─── F1 — clé ajoutée d'un seul côté ─────────────────────────────────────────
+describe("F1 — YAML : clé ajoutée d'un seul côté (diff3)", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `app:`,
+        `  name: my-app`,
+        `  version: 1.0.0`,
+        `  debug: true`,
+        `||||||| base`,
+        `app:`,
+        `  name: my-app`,
+        `  version: 1.0.0`,
+        `=======`,
+        `app:`,
+        `  name: my-app`,
+        `  version: 1.0.0`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("auto-résout via le resolver yaml", () => {
+        const result = resolve(input, "config.yaml");
+        expect(result.stats.autoResolved).toBe(1);
+    });
+    it("le résultat contient la clé ajoutée", () => {
+        const result = resolve(input, "config.yaml");
+        expect(result.mergedContent).toContain("debug");
+    });
+    it("la raison mentionne [yaml]", () => {
+        const result = resolve(input, "config.yaml");
+        expect(result.resolutions[0].resolutionReason).toMatch(/\[yaml\]/i);
+    });
+});
+// ─── F2 — même clé modifiée des deux côtés ────────────────────────────────────
+describe("F2 — YAML : même clé modifiée des deux côtés → conflit non résolvable", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `app:`,
+        `  name: my-app`,
+        `  port: 8080`,
+        `||||||| base`,
+        `app:`,
+        `  name: my-app`,
+        `  port: 3000`,
+        `=======`,
+        `app:`,
+        `  name: my-app`,
+        `  port: 9090`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("ne lève pas d'exception", () => {
+        expect(() => resolve(input, "config.yaml")).not.toThrow();
+    });
+    it("la raison mentionne [yaml]", () => {
+        const result = resolve(input, "config.yaml");
+        expect(result.resolutions[0].resolutionReason).toMatch(/\[yaml\]/i);
+    });
+});
+// ─── F3 — YAML minimal ───────────────────────────────────────────────────────
+describe("F3 — YAML minimal : ne plante pas", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `key: value-ours`,
+        `||||||| base`,
+        `key: value-base`,
+        `=======`,
+        `key: value-theirs`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("ne lève pas d'exception", () => {
+        expect(() => resolve(input, "minimal.yaml")).not.toThrow();
+    });
+    it("produit un résultat avec au moins un hunk", () => {
+        const result = resolve(input, "minimal.yaml");
+        expect(result.hunks.length).toBeGreaterThanOrEqual(1);
+    });
+});
+// ─── F4 — conflit dans values.yaml Helm (clés indépendantes) ─────────────────
+describe("F4 — values.yaml Helm : merge de clés indépendantes (diff3)", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `replicaCount: 2`,
+        ``,
+        `image:`,
+        `  repository: my-registry/my-app`,
+        `  tag: v1.2.0`,
+        ``,
+        `resources:`,
+        `  limits:`,
+        `    cpu: 500m`,
+        `    memory: 512Mi`,
+        `||||||| base`,
+        `replicaCount: 1`,
+        ``,
+        `image:`,
+        `  repository: my-registry/my-app`,
+        `  tag: v1.1.0`,
+        `||||||| base`,
+        `replicaCount: 1`,
+        ``,
+        `image:`,
+        `  repository: my-registry/my-app`,
+        `  tag: v1.1.0`,
+        `=======`,
+        `replicaCount: 1`,
+        ``,
+        `image:`,
+        `  repository: my-registry/my-app`,
+        `  tag: v1.2.0`,
+        ``,
+        `service:`,
+        `  type: ClusterIP`,
+        `  port: 80`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("ne lève pas d'exception", () => {
+        expect(() => resolve(input, "values.yaml")).not.toThrow();
+    });
+    it("la raison mentionne [yaml]", () => {
+        const result = resolve(input, "values.yaml");
+        expect(result.resolutions[0].resolutionReason).toMatch(/\[yaml\]/i);
+    });
+});
+describe("F4b — values.yml Helm simple : merge de clés indépendantes (diff3)", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `replicaCount: 2`,
+        `image:`,
+        `  repository: my-registry/my-app`,
+        `  tag: v1.2.0`,
+        `resources:`,
+        `  limits:`,
+        `    cpu: 500m`,
+        `||||||| base`,
+        `replicaCount: 1`,
+        `image:`,
+        `  repository: my-registry/my-app`,
+        `  tag: v1.1.0`,
+        `=======`,
+        `replicaCount: 1`,
+        `image:`,
+        `  repository: my-registry/my-app`,
+        `  tag: v1.2.0`,
+        `service:`,
+        `  type: ClusterIP`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("auto-résout ou ne plante pas", () => {
+        expect(() => resolve(input, "values.yml")).not.toThrow();
+    });
+    it("la raison mentionne [yaml]", () => {
+        const result = resolve(input, "values.yml");
+        expect(result.resolutions[0].resolutionReason).toMatch(/\[yaml\]/i);
+    });
+});
+// ─── F5 — clé ajoutée d'un seul côté (conflit YAML réel nécessitant le resolver) ─
+describe("F5 — YAML : clé de config ajoutée d'un seul côté (diff3)", () => {
+    // Ours ajoute `cache:`, theirs n'a pas changé la base → one_side_change trop simple,
+    // on utilise deux clés imbriquées différentes pour forcer le resolver YAML.
+    const input = [
+        `<<<<<<< ours`,
+        `database:`,
+        `  host: localhost`,
+        `  port: 5432`,
+        `  name: mydb`,
+        `  pool: 10`,
+        `||||||| base`,
+        `database:`,
+        `  host: localhost`,
+        `  port: 5432`,
+        `  name: mydb`,
+        `=======`,
+        `database:`,
+        `  host: localhost`,
+        `  port: 5432`,
+        `  name: mydb`,
+        `  timeout: 30`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("ne lève pas d'exception", () => {
+        expect(() => resolve(input, "config.yml")).not.toThrow();
+    });
+    it("auto-résout (deux ajouts indépendants)", () => {
+        const result = resolve(input, "config.yml");
+        expect(result.stats.autoResolved).toBe(1);
+    });
+    it("le résultat contient les deux nouvelles clés", () => {
+        const result = resolve(input, "config.yml");
+        expect(result.mergedContent).toContain("pool: 10");
+        expect(result.mergedContent).toContain("timeout: 30");
+    });
+});
+//# sourceMappingURL=yaml.test.js.map

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

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

package/dist/__tests__/structural/grandeur-nature.test.d.ts

@@ -0,0 +1,31 @@
+/**
+ * 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.
+ */
+export {};
+//# sourceMappingURL=grandeur-nature.test.d.ts.map

package/dist/__tests__/structural/grandeur-nature.test.d.ts.map

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