@gitwand/core 1.6.0

package/dist/__tests__/imports-extended.test.js

@@ -0,0 +1,94 @@
+/**
+ * Tests pour le résolveur d'imports étendu (Phase 8.1 — tri par groupes, Node builtins)
+ */
+import { describe, it, expect } from "vitest";
+import { tryResolveImportConflict } from "../resolvers/imports.js";
+describe("tryResolveImportConflict — extended", () => {
+    it("should merge imports added on both sides for the same named module", () => {
+        const base = [
+            'import { useState } from "react";',
+        ];
+        const ours = [
+            'import { useState, useEffect } from "react";',
+        ];
+        const theirs = [
+            'import { useState, useCallback } from "react";',
+        ];
+        const result = tryResolveImportConflict(base, ours, theirs);
+        expect(result.mergedLines).not.toBeNull();
+        expect(result.unresolvedImports).toBe(0);
+        // All three names should be present
+        const merged = result.mergedLines.join("\n");
+        expect(merged).toContain("useCallback");
+        expect(merged).toContain("useEffect");
+        expect(merged).toContain("useState");
+    });
+    it("should merge when ours adds a new module and theirs adds a different one", () => {
+        const base = [
+            'import React from "react";',
+        ];
+        const ours = [
+            'import React from "react";',
+            'import { formatDate } from "./utils";',
+        ];
+        const theirs = [
+            'import React from "react";',
+            'import axios from "axios";',
+        ];
+        const result = tryResolveImportConflict(base, ours, theirs);
+        expect(result.mergedLines).not.toBeNull();
+        expect(result.unresolvedImports).toBe(0);
+        const merged = result.mergedLines.join("\n");
+        expect(merged).toContain('axios');
+        expect(merged).toContain('./utils');
+        expect(merged).toContain('react');
+    });
+    it("should sort Node builtins before npm packages", () => {
+        const base = [];
+        const ours = [
+            'import path from "path";',
+        ];
+        const theirs = [
+            'import axios from "axios";',
+        ];
+        const result = tryResolveImportConflict(base, ours, theirs);
+        expect(result.mergedLines).not.toBeNull();
+        const lines = result.mergedLines.filter(l => l.trim());
+        // path (built-in) should come before axios (npm)
+        const pathIdx = lines.findIndex(l => l.includes("path"));
+        const axiosIdx = lines.findIndex(l => l.includes("axios"));
+        expect(pathIdx).toBeLessThan(axiosIdx);
+    });
+    it("should handle TypeScript type imports alongside value imports", () => {
+        const base = [
+            'import { useState } from "react";',
+        ];
+        const ours = [
+            'import { useState } from "react";',
+            'import type { FC } from "react";',
+        ];
+        const theirs = [
+            'import { useState, useRef } from "react";',
+        ];
+        const result = tryResolveImportConflict(base, ours, theirs);
+        expect(result.mergedLines).not.toBeNull();
+        const merged = result.mergedLines.join("\n");
+        expect(merged).toContain("type");
+        expect(merged).toContain("useRef");
+        expect(merged).toContain("useState");
+    });
+    it("should detect conflict when same module imported incompatibly", () => {
+        const base = [];
+        const ours = [
+            'import * as React from "react";',
+        ];
+        const theirs = [
+            'import React from "react";',
+        ];
+        const result = tryResolveImportConflict(base, ours, theirs);
+        // Namespace vs default = conflict
+        expect(result.mergedLines).toBeNull();
+        expect(result.unresolvedImports).toBeGreaterThan(0);
+    });
+});
+//# sourceMappingURL=imports-extended.test.js.map

package/dist/__tests__/imports-extended.test.js.map

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

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

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=lockfile-resolvers.test.d.ts.map

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

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

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

@@ -0,0 +1,200 @@
+/**
+ * Tests pour les résolveurs lockfile sémantiques (Phase 8.1 — Auto-resolve étendu)
+ */
+import { describe, it, expect } from "vitest";
+import { tryResolveLockfileNpmConflict } from "../resolvers/lockfile-npm.js";
+import { tryResolveYarnLockConflict } from "../resolvers/lockfile-yarn.js";
+import { tryResolvePnpmLockConflict } from "../resolvers/lockfile-pnpm.js";
+// ─── npm lockfile (package-lock.json) ────────────────────
+describe("tryResolveLockfileNpmConflict", () => {
+    it("should merge when ours adds a package and theirs adds a different one", () => {
+        const base = JSON.stringify({
+            name: "test",
+            lockfileVersion: 3,
+            packages: {
+                "": { name: "test", version: "1.0.0" },
+                "node_modules/react": { version: "18.2.0", resolved: "https://registry.npmjs.org/react/-/react-18.2.0.tgz" },
+            },
+        }, null, 2);
+        const ours = JSON.stringify({
+            name: "test",
+            lockfileVersion: 3,
+            packages: {
+                "": { name: "test", version: "1.0.0" },
+                "node_modules/react": { version: "18.2.0", resolved: "https://registry.npmjs.org/react/-/react-18.2.0.tgz" },
+                "node_modules/lodash": { version: "4.17.21", resolved: "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz" },
+            },
+        }, null, 2);
+        const theirs = JSON.stringify({
+            name: "test",
+            lockfileVersion: 3,
+            packages: {
+                "": { name: "test", version: "1.0.0" },
+                "node_modules/react": { version: "18.2.0", resolved: "https://registry.npmjs.org/react/-/react-18.2.0.tgz" },
+                "node_modules/axios": { version: "1.6.0", resolved: "https://registry.npmjs.org/axios/-/axios-1.6.0.tgz" },
+            },
+        }, null, 2);
+        const result = tryResolveLockfileNpmConflict(base.split("\n"), ours.split("\n"), theirs.split("\n"));
+        expect(result.merged).not.toBeNull();
+        expect(result.versionConflicts).toBe(0);
+        // Both lodash and axios should be present
+        const parsed = JSON.parse(result.merged);
+        expect(parsed.packages["node_modules/lodash"]).toBeDefined();
+        expect(parsed.packages["node_modules/axios"]).toBeDefined();
+        expect(parsed.packages["node_modules/react"]).toBeDefined();
+    });
+    it("should handle ours removing a package while theirs keeps it unchanged", () => {
+        const base = JSON.stringify({
+            name: "test",
+            lockfileVersion: 3,
+            packages: {
+                "node_modules/react": { version: "18.2.0" },
+                "node_modules/lodash": { version: "4.17.21" },
+            },
+        }, null, 2);
+        const ours = JSON.stringify({
+            name: "test",
+            lockfileVersion: 3,
+            packages: {
+                "node_modules/react": { version: "18.2.0" },
+            },
+        }, null, 2);
+        const theirs = base;
+        const result = tryResolveLockfileNpmConflict(base.split("\n"), ours.split("\n"), theirs.split("\n"));
+        expect(result.merged).not.toBeNull();
+        const parsed = JSON.parse(result.merged);
+        // lodash should be removed (ours removed it, theirs didn't change it)
+        expect(parsed.packages["node_modules/lodash"]).toBeUndefined();
+        expect(parsed.packages["node_modules/react"]).toBeDefined();
+    });
+    it("should resolve property-level conflicts (ours updates version, theirs updates integrity)", () => {
+        const base = JSON.stringify({
+            name: "test",
+            lockfileVersion: 3,
+            packages: {
+                "node_modules/react": { version: "18.2.0", integrity: "sha512-old", resolved: "https://old" },
+            },
+        }, null, 2);
+        const ours = JSON.stringify({
+            name: "test",
+            lockfileVersion: 3,
+            packages: {
+                "node_modules/react": { version: "18.3.0", integrity: "sha512-old", resolved: "https://old" },
+            },
+        }, null, 2);
+        const theirs = JSON.stringify({
+            name: "test",
+            lockfileVersion: 3,
+            packages: {
+                "node_modules/react": { version: "18.2.0", integrity: "sha512-new", resolved: "https://new" },
+            },
+        }, null, 2);
+        const result = tryResolveLockfileNpmConflict(base.split("\n"), ours.split("\n"), theirs.split("\n"));
+        expect(result.merged).not.toBeNull();
+        const parsed = JSON.parse(result.merged);
+        const react = parsed.packages["node_modules/react"];
+        // ours changed version, theirs changed integrity+resolved → both should be merged
+        expect(react.version).toBe("18.3.0");
+        expect(react.integrity).toBe("sha512-new");
+        expect(react.resolved).toBe("https://new");
+    });
+});
+// ─── yarn lockfile (yarn.lock) ───────────────────────────
+describe("tryResolveYarnLockConflict", () => {
+    const baseLock = `# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+react@^18.0.0:
+  version "18.2.0"
+  resolved "https://registry.yarnpkg.com/react/-/react-18.2.0.tgz"
+  integrity sha512-xxx
+
+lodash@^4.0.0:
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz"
+  integrity sha512-yyy
+`;
+    it("should merge when ours adds a package and theirs adds a different one", () => {
+        const oursLock = baseLock + `\naxios@^1.0.0:\n  version "1.6.0"\n  resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.0.tgz"\n  integrity sha512-aaa\n`;
+        const theirsLock = baseLock + `\ndate-fns@^3.0.0:\n  version "3.0.0"\n  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-3.0.0.tgz"\n  integrity sha512-bbb\n`;
+        const result = tryResolveYarnLockConflict(baseLock.split("\n"), oursLock.split("\n"), theirsLock.split("\n"));
+        expect(result.merged).not.toBeNull();
+        expect(result.versionConflicts).toBe(0);
+        expect(result.merged).toContain("axios@^1.0.0:");
+        expect(result.merged).toContain("date-fns@^3.0.0:");
+        expect(result.merged).toContain("react@^18.0.0:");
+        expect(result.merged).toContain("lodash@^4.0.0:");
+    });
+    it("should handle deletion from one side", () => {
+        // Ours removes lodash
+        const oursLock = `# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+react@^18.0.0:
+  version "18.2.0"
+  resolved "https://registry.yarnpkg.com/react/-/react-18.2.0.tgz"
+  integrity sha512-xxx
+`;
+        const result = tryResolveYarnLockConflict(baseLock.split("\n"), oursLock.split("\n"), baseLock.split("\n"));
+        expect(result.merged).not.toBeNull();
+        expect(result.merged).not.toContain("lodash@^4.0.0:");
+        expect(result.merged).toContain("react@^18.0.0:");
+    });
+});
+// ─── pnpm lockfile (pnpm-lock.yaml) ─────────────────────
+describe("tryResolvePnpmLockConflict", () => {
+    const baseLock = `lockfileVersion: '9.0'
+
+settings:
+  autoInstallPeers: true
+
+packages:
+  /react@18.2.0:
+    resolution: {integrity: sha512-xxx}
+    engines: {node: '>=16'}
+
+  /lodash@4.17.21:
+    resolution: {integrity: sha512-yyy}
+`;
+    it("should merge when ours adds a package and theirs adds a different one", () => {
+        const oursLock = `lockfileVersion: '9.0'
+
+settings:
+  autoInstallPeers: true
+
+packages:
+  /react@18.2.0:
+    resolution: {integrity: sha512-xxx}
+    engines: {node: '>=16'}
+
+  /lodash@4.17.21:
+    resolution: {integrity: sha512-yyy}
+
+  /axios@1.6.0:
+    resolution: {integrity: sha512-aaa}
+`;
+        const theirsLock = `lockfileVersion: '9.0'
+
+settings:
+  autoInstallPeers: true
+
+packages:
+  /react@18.2.0:
+    resolution: {integrity: sha512-xxx}
+    engines: {node: '>=16'}
+
+  /lodash@4.17.21:
+    resolution: {integrity: sha512-yyy}
+
+  /date-fns@3.0.0:
+    resolution: {integrity: sha512-bbb}
+`;
+        const result = tryResolvePnpmLockConflict(baseLock.split("\n"), oursLock.split("\n"), theirsLock.split("\n"));
+        expect(result.merged).not.toBeNull();
+        expect(result.conflicts).toBe(0);
+        expect(result.merged).toContain("axios");
+        expect(result.merged).toContain("date-fns");
+        expect(result.merged).toContain("react");
+    });
+});
+//# sourceMappingURL=lockfile-resolvers.test.js.map

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

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

package/dist/__tests__/patterns/insertion-at-boundary.test.d.ts

@@ -0,0 +1,10 @@
+/**
+ * Tests du pattern insertion_at_boundary (v1.4)
+ *
+ * Fixtures :
+ *   F23 — liste de dépendances npm (diff3, insertions distinctes)
+ *   F24 — tableau de routes (diff3)
+ * + cas diff2, chevauchement, faux positifs
+ */
+export {};
+//# sourceMappingURL=insertion-at-boundary.test.d.ts.map

package/dist/__tests__/patterns/insertion-at-boundary.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"insertion-at-boundary.test.d.ts","sourceRoot":"","sources":["../../../src/__tests__/patterns/insertion-at-boundary.test.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG"}

package/dist/__tests__/patterns/insertion-at-boundary.test.js

@@ -0,0 +1,185 @@
+/**
+ * Tests du pattern insertion_at_boundary (v1.4)
+ *
+ * Fixtures :
+ *   F23 — liste de dépendances npm (diff3, insertions distinctes)
+ *   F24 — tableau de routes (diff3)
+ * + cas diff2, chevauchement, faux positifs
+ */
+import { describe, it, expect } from "vitest";
+import { resolve } from "../../resolver.js";
+// ─── F23 — liste de dépendances (diff3) ──────────────────────
+describe("F23 — insertion_at_boundary : liste de dépendances npm (diff3)", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `  "lodash": "^4.17.21",`,
+        `  "axios": "^1.6.0",`,
+        `  "dayjs": "^1.11.10",`,
+        `||||||| base`,
+        `  "lodash": "^4.17.21",`,
+        `  "axios": "^1.6.0",`,
+        `=======`,
+        `  "lodash": "^4.17.21",`,
+        `  "axios": "^1.6.0",`,
+        `  "zod": "^3.22.4",`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("classifie en insertion_at_boundary", () => {
+        const result = resolve(input, "package.json");
+        expect(result.hunks[0].type).toBe("insertion_at_boundary");
+    });
+    it("auto-résout avec haute confiance (diff3)", () => {
+        const result = resolve(input, "package.json");
+        expect(result.stats.autoResolved).toBe(1);
+        expect(["high", "certain"]).toContain(result.hunks[0].confidence.label);
+    });
+    it("le résultat contient les insertions des deux côtés", () => {
+        const result = resolve(input, "package.json");
+        const merged = result.mergedContent;
+        expect(merged).toContain("dayjs");
+        expect(merged).toContain("zod");
+        expect(merged).toContain("lodash");
+        expect(merged).toContain("axios");
+    });
+    it("le booster 'Insertions pures' est présent", () => {
+        const result = resolve(input, "package.json");
+        expect(result.hunks[0].confidence.boosters.join(" ")).toMatch(/Insertions pures/);
+    });
+});
+// ─── F24 — tableau de routes (diff3) ─────────────────────────
+describe("F24 — insertion_at_boundary : tableau de routes (diff3)", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `  { path: "/", component: Home },`,
+        `  { path: "/about", component: About },`,
+        `  { path: "/dashboard", component: Dashboard },`,
+        `||||||| base`,
+        `  { path: "/", component: Home },`,
+        `  { path: "/about", component: About },`,
+        `=======`,
+        `  { path: "/", component: Home },`,
+        `  { path: "/about", component: About },`,
+        `  { path: "/settings", component: Settings },`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("classifie en insertion_at_boundary", () => {
+        const result = resolve(input, "src/router.ts");
+        expect(result.hunks[0].type).toBe("insertion_at_boundary");
+    });
+    it("auto-résout", () => {
+        const result = resolve(input, "src/router.ts");
+        expect(result.stats.autoResolved).toBe(1);
+    });
+    it("les deux nouvelles routes sont présentes dans le résultat", () => {
+        const result = resolve(input, "src/router.ts");
+        const merged = result.mergedContent;
+        expect(merged).toContain("dashboard");
+        expect(merged).toContain("settings");
+    });
+});
+// ─── diff2 (sans base) — confiance réduite ───────────────────
+// ─── diff2 (sans base) — heuristique stricte (sous-ensemble) ────────────────
+// En diff2, insertion_at_boundary ne s'applique que si un côté est un strict
+// sous-ensemble de l'autre (tailles différentes). Cas typique : ours a inséré
+// une ligne de plus que theirs, ou vice versa.
+describe("insertion_at_boundary sans base (diff2) — sous-ensemble strict", () => {
+    // ours a ajouté PURPLE par rapport à theirs
+    const input = [
+        `<<<<<<< ours`,
+        `  RED = "red",`,
+        `  GREEN = "green",`,
+        `  BLUE = "blue",`,
+        `  PURPLE = "purple",`,
+        `=======`,
+        `  RED = "red",`,
+        `  GREEN = "green",`,
+        `  BLUE = "blue",`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    // En diff2, la confiance est ~58 (medium) — nécessite minConfidence: "medium"
+    const opts = { minConfidence: "medium" };
+    it("classifie en insertion_at_boundary (heuristique diff2 — theirs ⊂ ours)", () => {
+        const result = resolve(input, "src/colors.ts", opts);
+        expect(result.hunks[0].type).toBe("insertion_at_boundary");
+    });
+    it("typeClassification inférieur au cas diff3 (confiance réduite)", () => {
+        const result = resolve(input, "src/colors.ts", opts);
+        expect(result.hunks[0].confidence.dimensions.typeClassification).toBeLessThan(90);
+    });
+    it("la pénalité 'Sans base (diff2)' est présente", () => {
+        const result = resolve(input, "src/colors.ts", opts);
+        expect(result.hunks[0].confidence.penalties.join(" ")).toMatch(/diff2/);
+    });
+    it("le résultat contient la ligne insérée par ours (avec minConfidence medium)", () => {
+        const result = resolve(input, "src/colors.ts", opts);
+        expect(result.stats.autoResolved).toBe(1);
+        const merged = result.mergedContent;
+        expect(merged).toContain("RED");
+        expect(merged).toContain("GREEN");
+        expect(merged).toContain("BLUE");
+        expect(merged).toContain("PURPLE");
+    });
+});
+// ─── Chevauchement — doit tomber en complex ───────────────────
+describe("insertion_at_boundary : chevauchement d'insertions → pas de match", () => {
+    it("ne matche pas si les deux côtés ont inséré la même ligne", () => {
+        const input = [
+            `<<<<<<< ours`,
+            `  foo,`,
+            `  bar,`,
+            `  shared,`,
+            `||||||| base`,
+            `  foo,`,
+            `  bar,`,
+            `=======`,
+            `  foo,`,
+            `  bar,`,
+            `  shared,`,
+            `>>>>>>> theirs`,
+        ].join("\n");
+        const result = resolve(input, "src/test.ts");
+        // same_change captera cela (ours === theirs)
+        expect(result.hunks[0].type).toBe("same_change");
+    });
+    it("ne matche pas si un côté supprime par rapport à la base", () => {
+        const input = [
+            `<<<<<<< ours`,
+            `  foo,`,
+            `  newThing,`,
+            `||||||| base`,
+            `  foo,`,
+            `  bar,`,
+            `=======`,
+            `  foo,`,
+            `  bar,`,
+            `  anotherThing,`,
+            `>>>>>>> theirs`,
+        ].join("\n");
+        const result = resolve(input, "src/test.ts");
+        // ours supprime "bar" → pas une insertion pure
+        expect(result.hunks[0].type).not.toBe("insertion_at_boundary");
+    });
+});
+// ─── Relation avec non_overlapping ───────────────────────────
+describe("insertion_at_boundary vs non_overlapping", () => {
+    it("non_overlapping (prio 40) prend la main avant insertion_at_boundary (prio 57) quand le LCS réussit", () => {
+        // Insertions à positions clairement différentes → LCS 3-way réussit → non_overlapping
+        const input = [
+            `<<<<<<< ours`,
+            `  alpha,`,
+            `  INSERTED_OURS,`,
+            `  beta,`,
+            `||||||| base`,
+            `  alpha,`,
+            `  beta,`,
+            `=======`,
+            `  alpha,`,
+            `  beta,`,
+            `  INSERTED_THEIRS,`,
+            `>>>>>>> theirs`,
+        ].join("\n");
+        const result = resolve(input, "src/list.ts");
+        expect(result.hunks[0].type).toBe("non_overlapping");
+    });
+});
+//# sourceMappingURL=insertion-at-boundary.test.js.map

package/dist/__tests__/patterns/insertion-at-boundary.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"insertion-at-boundary.test.js","sourceRoot":"","sources":["../../../src/__tests__/patterns/insertion-at-boundary.test.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAE5C,gEAAgE;AAEhE,QAAQ,CAAC,gEAAgE,EAAE,GAAG,EAAE;IAC9E,MAAM,KAAK,GAAG;QACZ,cAAc;QACd,yBAAyB;QACzB,sBAAsB;QACtB,wBAAwB;QACxB,cAAc;QACd,yBAAyB;QACzB,sBAAsB;QACtB,SAAS;QACT,yBAAyB;QACzB,sBAAsB;QACtB,qBAAqB;QACrB,gBAAgB;KACjB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEb,EAAE,CAAC,oCAAoC,EAAE,GAAG,EAAE;QAC5C,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;QAC9C,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;IAC7D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0CAA0C,EAAE,GAAG,EAAE;QAClD,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;QAC9C,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC1C,MAAM,CAAC,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IAC1E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oDAAoD,EAAE,GAAG,EAAE;QAC5D,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;QAC9C,MAAM,MAAM,GAAG,MAAM,CAAC,aAAc,CAAC;QACrC,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAClC,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAChC,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QACnC,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2CAA2C,EAAE,GAAG,EAAE;QACnD,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;QAC9C,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;IACpF,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,gEAAgE;AAEhE,QAAQ,CAAC,yDAAyD,EAAE,GAAG,EAAE;IACvE,MAAM,KAAK,GAAG;QACZ,cAAc;QACd,mCAAmC;QACnC,yCAAyC;QACzC,iDAAiD;QACjD,cAAc;QACd,mCAAmC;QACnC,yCAAyC;QACzC,SAAS;QACT,mCAAmC;QACnC,yCAAyC;QACzC,+CAA+C;QAC/C,gBAAgB;KACjB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEb,EAAE,CAAC,oCAAoC,EAAE,GAAG,EAAE;QAC5C,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC;QAC/C,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;IAC7D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,aAAa,EAAE,GAAG,EAAE;QACrB,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC;QAC/C,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC5C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2DAA2D,EAAE,GAAG,EAAE;QACnE,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC;QAC/C,MAAM,MAAM,GAAG,MAAM,CAAC,aAAc,CAAC;QACrC,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;QACtC,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IACvC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,gEAAgE;AAEhE,+EAA+E;AAC/E,6EAA6E;AAC7E,8EAA8E;AAC9E,+CAA+C;AAE/C,QAAQ,CAAC,gEAAgE,EAAE,GAAG,EAAE;IAC9E,4CAA4C;IAC5C,MAAM,KAAK,GAAG;QACZ,cAAc;QACd,gBAAgB;QAChB,oBAAoB;QACpB,kBAAkB;QAClB,sBAAsB;QACtB,SAAS;QACT,gBAAgB;QAChB,oBAAoB;QACpB,kBAAkB;QAClB,gBAAgB;KACjB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACb,8EAA8E;IAC9E,MAAM,IAAI,GAAG,EAAE,aAAa,EAAE,QAAiB,EAAE,CAAC;IAElD,EAAE,CAAC,wEAAwE,EAAE,GAAG,EAAE;QAChF,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,EAAE,eAAe,EAAE,IAAI,CAAC,CAAC;QACrD,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;IAC7D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+DAA+D,EAAE,GAAG,EAAE;QACvE,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,EAAE,eAAe,EAAE,IAAI,CAAC,CAAC;QACrD,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;IACpF,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8CAA8C,EAAE,GAAG,EAAE;QACtD,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,EAAE,eAAe,EAAE,IAAI,CAAC,CAAC;QACrD,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC1E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4EAA4E,EAAE,GAAG,EAAE;QACpF,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,EAAE,eAAe,EAAE,IAAI,CAAC,CAAC;QACrD,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC1C,MAAM,MAAM,GAAG,MAAM,CAAC,aAAc,CAAC;QACrC,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAChC,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAClC,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QACjC,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;IACrC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,iEAAiE;AAEjE,QAAQ,CAAC,mEAAmE,EAAE,GAAG,EAAE;IACjF,EAAE,CAAC,0DAA0D,EAAE,GAAG,EAAE;QAClE,MAAM,KAAK,GAAG;YACZ,cAAc;YACd,QAAQ;YACR,QAAQ;YACR,WAAW;YACX,cAAc;YACd,QAAQ;YACR,QAAQ;YACR,SAAS;YACT,QAAQ;YACR,QAAQ;YACR,WAAW;YACX,gBAAgB;SACjB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACb,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;QAC7C,6CAA6C;QAC7C,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IACnD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yDAAyD,EAAE,GAAG,EAAE;QACjE,MAAM,KAAK,GAAG;YACZ,cAAc;YACd,QAAQ;YACR,aAAa;YACb,cAAc;YACd,QAAQ;YACR,QAAQ;YACR,SAAS;YACT,QAAQ;YACR,QAAQ;YACR,iBAAiB;YACjB,gBAAgB;SACjB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACb,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;QAC7C,+CAA+C;QAC/C,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;IACjE,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,gEAAgE;AAEhE,QAAQ,CAAC,0CAA0C,EAAE,GAAG,EAAE;IACxD,EAAE,CAAC,oGAAoG,EAAE,GAAG,EAAE;QAC5G,sFAAsF;QACtF,MAAM,KAAK,GAAG;YACZ,cAAc;YACd,UAAU;YACV,kBAAkB;YAClB,SAAS;YACT,cAAc;YACd,UAAU;YACV,SAAS;YACT,SAAS;YACT,UAAU;YACV,SAAS;YACT,oBAAoB;YACpB,gBAAgB;SACjB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACb,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;QAC7C,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IACvD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/__tests__/patterns/reorder-only.test.d.ts

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

package/dist/__tests__/patterns/reorder-only.test.d.ts.map

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