@gitwand/core 1.6.0

package/dist/__tests__/patterns/reorder-only.test.js

@@ -0,0 +1,181 @@
+/**
+ * Tests du pattern reorder_only (v1.4)
+ *
+ * Fixtures :
+ *   F21 — imports triés alphabétiquement
+ *   F22 — clés de config réorganisées
+ * + cas limites : doublons, diff2 vs diff3, faux positifs
+ */
+import { describe, it, expect } from "vitest";
+import { resolve } from "../../resolver.js";
+// ─── F21 — exports triés alphabétiquement ────────────────────
+// Note : on utilise des export statements (pas des imports) pour éviter
+// que le resolver spécialisé d'imports ne prenne la main en premier.
+describe("F21 — reorder_only : exports triés alphabétiquement (diff3)", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `export { AuthService } from "./auth";`,
+        `export { LogService } from "./log";`,
+        `export { UserService } from "./user";`,
+        `||||||| base`,
+        `export { UserService } from "./user";`,
+        `export { AuthService } from "./auth";`,
+        `export { LogService } from "./log";`,
+        `=======`,
+        `export { LogService } from "./log";`,
+        `export { AuthService } from "./auth";`,
+        `export { UserService } from "./user";`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("classifie en reorder_only", () => {
+        const result = resolve(input, "src/index.ts");
+        expect(result.hunks[0].type).toBe("reorder_only");
+    });
+    it("auto-résout (confiance high ou certain)", () => {
+        const result = resolve(input, "src/index.ts");
+        expect(result.stats.autoResolved).toBe(1);
+        expect(["high", "certain"]).toContain(result.hunks[0].confidence.label);
+    });
+    it("résolution = ordre theirs (base ≠ theirs)", () => {
+        const result = resolve(input, "src/index.ts");
+        // base = User, Auth, Log
+        // theirs = Log, Auth, User → base ≠ theirs → accepter theirs
+        const lines = result.mergedContent.split("\n");
+        expect(lines[0]).toContain('LogService');
+    });
+    it("le booster 'Permutation pure' est présent", () => {
+        const result = resolve(input, "src/index.ts");
+        expect(result.hunks[0].confidence.boosters.join(" ")).toMatch(/Permutation pure/);
+    });
+});
+// ─── F22 — clés de config réorganisées ───────────────────────
+describe("F22 — reorder_only : clés de config réorganisées (diff3)", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `  debug: true,`,
+        `  timeout: 5000,`,
+        `  retries: 3,`,
+        `||||||| base`,
+        `  timeout: 5000,`,
+        `  retries: 3,`,
+        `  debug: true,`,
+        `=======`,
+        `  retries: 3,`,
+        `  debug: true,`,
+        `  timeout: 5000,`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("classifie en reorder_only", () => {
+        const result = resolve(input, "src/config.ts");
+        expect(result.hunks[0].type).toBe("reorder_only");
+    });
+    it("auto-résout", () => {
+        const result = resolve(input, "src/config.ts");
+        expect(result.stats.autoResolved).toBe(1);
+    });
+});
+// ─── diff2 (sans base) ───────────────────────────────────────
+describe("reorder_only sans base (diff2)", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `export { UserService };`,
+        `export { AuthService };`,
+        `export { LogService };`,
+        `=======`,
+        `export { LogService };`,
+        `export { UserService };`,
+        `export { AuthService };`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("classifie en reorder_only même sans base", () => {
+        const result = resolve(input, "src/index.ts");
+        expect(result.hunks[0].type).toBe("reorder_only");
+    });
+    it("auto-résout", () => {
+        const result = resolve(input, "src/index.ts");
+        expect(result.stats.autoResolved).toBe(1);
+    });
+});
+// ─── Lignes dupliquées — pénalité ────────────────────────────
+describe("reorder_only avec lignes dupliquées (F32-like)", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `foo`,
+        `bar`,
+        `foo`,
+        `=======`,
+        `bar`,
+        `foo`,
+        `foo`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("classifie en reorder_only (multiset égal)", () => {
+        const result = resolve(input, "src/test.ts");
+        expect(result.hunks[0].type).toBe("reorder_only");
+    });
+    it("applique la pénalité 'Lignes dupliquées'", () => {
+        const result = resolve(input, "src/test.ts");
+        const penalties = result.hunks[0].confidence.penalties.join(" ");
+        expect(penalties).toMatch(/dupliqu/i);
+    });
+    it("le score est réduit par rapport au cas sans doublons", () => {
+        const withDupResult = resolve(input, "src/test.ts");
+        const noDupInput = [
+            `<<<<<<< ours`,
+            `foo`,
+            `bar`,
+            `baz`,
+            `=======`,
+            `baz`,
+            `foo`,
+            `bar`,
+            `>>>>>>> theirs`,
+        ].join("\n");
+        const noDupResult = resolve(noDupInput, "src/test.ts");
+        expect(withDupResult.hunks[0].confidence.score).toBeLessThan(noDupResult.hunks[0].confidence.score);
+    });
+});
+// ─── Faux positifs — ne doit PAS matcher ─────────────────────
+describe("reorder_only : cas qui ne doivent pas matcher", () => {
+    it("ne matche pas si une ligne est ajoutée", () => {
+        const input = [
+            `<<<<<<< ours`,
+            `foo`,
+            `bar`,
+            `=======`,
+            `bar`,
+            `foo`,
+            `baz`,
+            `>>>>>>> theirs`,
+        ].join("\n");
+        const result = resolve(input, "src/test.ts");
+        expect(result.hunks[0].type).not.toBe("reorder_only");
+    });
+    it("ne matche pas si ours === theirs (same_change prend la main)", () => {
+        const input = [
+            `<<<<<<< ours`,
+            `foo`,
+            `bar`,
+            `=======`,
+            `foo`,
+            `bar`,
+            `>>>>>>> theirs`,
+        ].join("\n");
+        const result = resolve(input, "src/test.ts");
+        expect(result.hunks[0].type).toBe("same_change");
+    });
+    it("ne matche pas si les contenus sont vraiment différents", () => {
+        const input = [
+            `<<<<<<< ours`,
+            `foo`,
+            `bar`,
+            `=======`,
+            `baz`,
+            `qux`,
+            `>>>>>>> theirs`,
+        ].join("\n");
+        const result = resolve(input, "src/test.ts");
+        expect(result.hunks[0].type).not.toBe("reorder_only");
+    });
+});
+//# sourceMappingURL=reorder-only.test.js.map

package/dist/__tests__/patterns/reorder-only.test.js.map

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

package/dist/__tests__/phase-7-2-3b.test.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Tests Phase 7.2 — Whitespace normalization + threshold tuning
+ * Tests Phase 7.3b — YAML, TS/JS imports, Vue SFC, CSS resolvers
+ */
+export {};
+//# sourceMappingURL=phase-7-2-3b.test.d.ts.map

package/dist/__tests__/phase-7-2-3b.test.d.ts.map

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