@gitwand/core 2.0.0 → 2.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +58 -0
- package/dist/__tests__/bench.bench.js +39 -0
- package/dist/__tests__/bench.bench.js.map +1 -1
- package/dist/__tests__/corpus.d.ts.map +1 -1
- package/dist/__tests__/corpus.js +363 -0
- package/dist/__tests__/corpus.js.map +1 -1
- package/dist/__tests__/diff/block-move.test.d.ts +5 -0
- package/dist/__tests__/diff/block-move.test.d.ts.map +1 -0
- package/dist/__tests__/diff/block-move.test.js +132 -0
- package/dist/__tests__/diff/block-move.test.js.map +1 -0
- package/dist/__tests__/diff/histogram.test.d.ts +8 -0
- package/dist/__tests__/diff/histogram.test.d.ts.map +1 -0
- package/dist/__tests__/diff/histogram.test.js +150 -0
- package/dist/__tests__/diff/histogram.test.js.map +1 -0
- package/dist/__tests__/diff/parity.test.d.ts +17 -0
- package/dist/__tests__/diff/parity.test.d.ts.map +1 -0
- package/dist/__tests__/diff/parity.test.js +149 -0
- package/dist/__tests__/diff/parity.test.js.map +1 -0
- package/dist/__tests__/diff.test.js +6 -2
- package/dist/__tests__/diff.test.js.map +1 -1
- package/dist/__tests__/format-profiles/integration.test.d.ts +7 -0
- package/dist/__tests__/format-profiles/integration.test.d.ts.map +1 -0
- package/dist/__tests__/format-profiles/integration.test.js +193 -0
- package/dist/__tests__/format-profiles/integration.test.js.map +1 -0
- package/dist/__tests__/format-profiles/json-patch.test.d.ts +12 -0
- package/dist/__tests__/format-profiles/json-patch.test.d.ts.map +1 -0
- package/dist/__tests__/format-profiles/json-patch.test.js +222 -0
- package/dist/__tests__/format-profiles/json-patch.test.js.map +1 -0
- package/dist/__tests__/format-profiles/registry.test.d.ts +5 -0
- package/dist/__tests__/format-profiles/registry.test.d.ts.map +1 -0
- package/dist/__tests__/format-profiles/registry.test.js +124 -0
- package/dist/__tests__/format-profiles/registry.test.js.map +1 -0
- package/dist/__tests__/patterns/make-score.test.d.ts +9 -0
- package/dist/__tests__/patterns/make-score.test.d.ts.map +1 -0
- package/dist/__tests__/patterns/make-score.test.js +49 -0
- package/dist/__tests__/patterns/make-score.test.js.map +1 -0
- package/dist/diff/block-move.d.ts +53 -0
- package/dist/diff/block-move.d.ts.map +1 -0
- package/dist/diff/block-move.js +192 -0
- package/dist/diff/block-move.js.map +1 -0
- package/dist/diff/histogram.d.ts +45 -0
- package/dist/diff/histogram.d.ts.map +1 -0
- package/dist/diff/histogram.js +172 -0
- package/dist/diff/histogram.js.map +1 -0
- package/dist/diff/index.d.ts +30 -0
- package/dist/diff/index.d.ts.map +1 -0
- package/dist/diff/index.js +47 -0
- package/dist/diff/index.js.map +1 -0
- package/dist/diff/lcs.d.ts +34 -0
- package/dist/diff/lcs.d.ts.map +1 -0
- package/dist/diff/lcs.js +184 -0
- package/dist/diff/lcs.js.map +1 -0
- package/dist/diff/shared.d.ts +54 -0
- package/dist/diff/shared.d.ts.map +1 -0
- package/dist/diff/shared.js +164 -0
- package/dist/diff/shared.js.map +1 -0
- package/dist/diff.d.ts +6 -65
- package/dist/diff.d.ts.map +1 -1
- package/dist/diff.js +6 -324
- package/dist/diff.js.map +1 -1
- package/dist/format-profiles/index.d.ts +34 -0
- package/dist/format-profiles/index.d.ts.map +1 -0
- package/dist/format-profiles/index.js +86 -0
- package/dist/format-profiles/index.js.map +1 -0
- package/dist/format-profiles/json-patch.d.ts +61 -0
- package/dist/format-profiles/json-patch.d.ts.map +1 -0
- package/dist/format-profiles/json-patch.js +269 -0
- package/dist/format-profiles/json-patch.js.map +1 -0
- package/dist/format-profiles/merge-strategies.d.ts +54 -0
- package/dist/format-profiles/merge-strategies.d.ts.map +1 -0
- package/dist/format-profiles/merge-strategies.js +156 -0
- package/dist/format-profiles/merge-strategies.js.map +1 -0
- package/dist/format-profiles/profiles/composer.d.ts +18 -0
- package/dist/format-profiles/profiles/composer.d.ts.map +1 -0
- package/dist/format-profiles/profiles/composer.js +45 -0
- package/dist/format-profiles/profiles/composer.js.map +1 -0
- package/dist/format-profiles/profiles/helm-values.d.ts +21 -0
- package/dist/format-profiles/profiles/helm-values.d.ts.map +1 -0
- package/dist/format-profiles/profiles/helm-values.js +40 -0
- package/dist/format-profiles/profiles/helm-values.js.map +1 -0
- package/dist/format-profiles/profiles/kubernetes.d.ts +22 -0
- package/dist/format-profiles/profiles/kubernetes.d.ts.map +1 -0
- package/dist/format-profiles/profiles/kubernetes.js +60 -0
- package/dist/format-profiles/profiles/kubernetes.js.map +1 -0
- package/dist/format-profiles/profiles/package-json.d.ts +18 -0
- package/dist/format-profiles/profiles/package-json.d.ts.map +1 -0
- package/dist/format-profiles/profiles/package-json.js +36 -0
- package/dist/format-profiles/profiles/package-json.js.map +1 -0
- package/dist/format-profiles/profiles/tsconfig.d.ts +21 -0
- package/dist/format-profiles/profiles/tsconfig.d.ts.map +1 -0
- package/dist/format-profiles/profiles/tsconfig.js +47 -0
- package/dist/format-profiles/profiles/tsconfig.js.map +1 -0
- package/dist/format-profiles/types.d.ts +67 -0
- package/dist/format-profiles/types.d.ts.map +1 -0
- package/dist/format-profiles/types.js +9 -0
- package/dist/format-profiles/types.js.map +1 -0
- package/dist/index.d.ts +4 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +5 -0
- package/dist/index.js.map +1 -1
- package/dist/patterns/insertion-at-boundary.d.ts.map +1 -1
- package/dist/patterns/insertion-at-boundary.js +15 -33
- package/dist/patterns/insertion-at-boundary.js.map +1 -1
- package/dist/patterns/utils.d.ts +11 -8
- package/dist/patterns/utils.d.ts.map +1 -1
- package/dist/patterns/utils.js +28 -10
- package/dist/patterns/utils.js.map +1 -1
- package/dist/resolver/format-dispatch.d.ts.map +1 -1
- package/dist/resolver/format-dispatch.js +3 -1
- package/dist/resolver/format-dispatch.js.map +1 -1
- package/dist/resolver/policy.d.ts.map +1 -1
- package/dist/resolver/policy.js +2 -0
- package/dist/resolver/policy.js.map +1 -1
- package/dist/resolvers/dispatcher.d.ts +5 -1
- package/dist/resolvers/dispatcher.d.ts.map +1 -1
- package/dist/resolvers/dispatcher.js +8 -3
- package/dist/resolvers/dispatcher.js.map +1 -1
- package/dist/resolvers/json.d.ts +11 -2
- package/dist/resolvers/json.d.ts.map +1 -1
- package/dist/resolvers/json.js +55 -7
- package/dist/resolvers/json.js.map +1 -1
- package/dist/resolvers/yaml.d.ts +8 -2
- package/dist/resolvers/yaml.d.ts.map +1 -1
- package/dist/resolvers/yaml.js +156 -2
- package/dist/resolvers/yaml.js.map +1 -1
- package/dist/types.d.ts +25 -0
- package/dist/types.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,193 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Tests d'intégration v2.2 — vérifie que le hook profil dans
|
|
3
|
+
* `tryResolveJsonConflict` débloque les cas qui retombaient en fallback
|
|
4
|
+
* textuel en v2.1.
|
|
5
|
+
*/
|
|
6
|
+
import { describe, it, expect } from "vitest";
|
|
7
|
+
import { tryResolveJsonConflict } from "../../resolvers/json.js";
|
|
8
|
+
describe("tryResolveJsonConflict — package.json + profil", () => {
|
|
9
|
+
it("/keywords ajoutés des deux côtés (set) — résout", () => {
|
|
10
|
+
const base = `{
|
|
11
|
+
"name": "demo",
|
|
12
|
+
"keywords": ["git"]
|
|
13
|
+
}`;
|
|
14
|
+
const ours = `{
|
|
15
|
+
"name": "demo",
|
|
16
|
+
"keywords": ["git", "merge"]
|
|
17
|
+
}`;
|
|
18
|
+
const theirs = `{
|
|
19
|
+
"name": "demo",
|
|
20
|
+
"keywords": ["git", "diff"]
|
|
21
|
+
}`;
|
|
22
|
+
const result = tryResolveJsonConflict(base.split("\n"), ours.split("\n"), theirs.split("\n"), "package.json");
|
|
23
|
+
expect(result.merged).not.toBeNull();
|
|
24
|
+
const parsed = JSON.parse(result.merged);
|
|
25
|
+
// Le set doit contenir tous les keywords (ordre = ours d'abord, puis nouveaux de theirs)
|
|
26
|
+
expect(parsed.keywords).toEqual(["git", "merge", "diff"]);
|
|
27
|
+
});
|
|
28
|
+
it("/files modifiés des deux côtés — set préserve les ajouts", () => {
|
|
29
|
+
const base = `{
|
|
30
|
+
"name": "demo",
|
|
31
|
+
"files": ["dist", "README.md"]
|
|
32
|
+
}`;
|
|
33
|
+
const ours = `{
|
|
34
|
+
"name": "demo",
|
|
35
|
+
"files": ["dist", "README.md", "LICENSE"]
|
|
36
|
+
}`;
|
|
37
|
+
const theirs = `{
|
|
38
|
+
"name": "demo",
|
|
39
|
+
"files": ["dist", "README.md", "CHANGELOG.md"]
|
|
40
|
+
}`;
|
|
41
|
+
const result = tryResolveJsonConflict(base.split("\n"), ours.split("\n"), theirs.split("\n"), "package.json");
|
|
42
|
+
expect(result.merged).not.toBeNull();
|
|
43
|
+
const parsed = JSON.parse(result.merged);
|
|
44
|
+
expect(parsed.files).toEqual(["dist", "README.md", "LICENSE", "CHANGELOG.md"]);
|
|
45
|
+
});
|
|
46
|
+
it("sans filePath — pas de profil, fallback v2.1 (pas de routage)", () => {
|
|
47
|
+
// Sans filePath, le résolveur ne consulte pas le profil → comportement
|
|
48
|
+
// v2.1 (les arrays modifiés différemment retombent en conflit).
|
|
49
|
+
const base = `{ "tags": ["a"] }`;
|
|
50
|
+
const ours = `{ "tags": ["a", "b"] }`;
|
|
51
|
+
const theirs = `{ "tags": ["a", "c"] }`;
|
|
52
|
+
const result = tryResolveJsonConflict(base.split("\n"), ours.split("\n"), theirs.split("\n"));
|
|
53
|
+
expect(result.merged).toBeNull();
|
|
54
|
+
});
|
|
55
|
+
});
|
|
56
|
+
describe("tryResolveJsonConflict — tsconfig.json + profil", () => {
|
|
57
|
+
it("/include divergent (set) — résout", () => {
|
|
58
|
+
const base = `{
|
|
59
|
+
"compilerOptions": { "strict": true },
|
|
60
|
+
"include": ["src"]
|
|
61
|
+
}`;
|
|
62
|
+
const ours = `{
|
|
63
|
+
"compilerOptions": { "strict": true },
|
|
64
|
+
"include": ["src", "tests"]
|
|
65
|
+
}`;
|
|
66
|
+
const theirs = `{
|
|
67
|
+
"compilerOptions": { "strict": true },
|
|
68
|
+
"include": ["src", "scripts"]
|
|
69
|
+
}`;
|
|
70
|
+
const result = tryResolveJsonConflict(base.split("\n"), ours.split("\n"), theirs.split("\n"), "tsconfig.json");
|
|
71
|
+
expect(result.merged).not.toBeNull();
|
|
72
|
+
const parsed = JSON.parse(result.merged);
|
|
73
|
+
expect(parsed.include).toEqual(["src", "tests", "scripts"]);
|
|
74
|
+
});
|
|
75
|
+
it("/compilerOptions/lib ajouté des deux côtés (depuis base sans lib)", () => {
|
|
76
|
+
const base = `{
|
|
77
|
+
"compilerOptions": { "strict": true }
|
|
78
|
+
}`;
|
|
79
|
+
const ours = `{
|
|
80
|
+
"compilerOptions": { "strict": true, "lib": ["ES2022", "DOM"] }
|
|
81
|
+
}`;
|
|
82
|
+
const theirs = `{
|
|
83
|
+
"compilerOptions": { "strict": true, "lib": ["ES2022", "WebWorker"] }
|
|
84
|
+
}`;
|
|
85
|
+
const result = tryResolveJsonConflict(base.split("\n"), ours.split("\n"), theirs.split("\n"), "tsconfig.json");
|
|
86
|
+
expect(result.merged).not.toBeNull();
|
|
87
|
+
const parsed = JSON.parse(result.merged);
|
|
88
|
+
expect(parsed.compilerOptions.lib).toEqual(["ES2022", "DOM", "WebWorker"]);
|
|
89
|
+
});
|
|
90
|
+
it("/references avec identité 'path' — déduplique correctement", () => {
|
|
91
|
+
const base = `{
|
|
92
|
+
"references": [{ "path": "../shared" }]
|
|
93
|
+
}`;
|
|
94
|
+
const ours = `{
|
|
95
|
+
"references": [{ "path": "../shared" }, { "path": "../utils" }]
|
|
96
|
+
}`;
|
|
97
|
+
const theirs = `{
|
|
98
|
+
"references": [{ "path": "../shared" }, { "path": "../core" }]
|
|
99
|
+
}`;
|
|
100
|
+
const result = tryResolveJsonConflict(base.split("\n"), ours.split("\n"), theirs.split("\n"), "tsconfig.json");
|
|
101
|
+
expect(result.merged).not.toBeNull();
|
|
102
|
+
const parsed = JSON.parse(result.merged);
|
|
103
|
+
expect(parsed.references).toEqual([
|
|
104
|
+
{ path: "../shared" },
|
|
105
|
+
{ path: "../utils" },
|
|
106
|
+
{ path: "../core" },
|
|
107
|
+
]);
|
|
108
|
+
});
|
|
109
|
+
});
|
|
110
|
+
describe("tryResolveYamlConflict — kubernetes + profil", () => {
|
|
111
|
+
it("Deployment containers mergés par 'name'", async () => {
|
|
112
|
+
const { tryResolveYamlConflict } = await import("../../resolvers/yaml.js");
|
|
113
|
+
const base = `apiVersion: apps/v1
|
|
114
|
+
kind: Deployment
|
|
115
|
+
spec:
|
|
116
|
+
template:
|
|
117
|
+
spec:
|
|
118
|
+
containers:
|
|
119
|
+
- name: app
|
|
120
|
+
image: app:1.0
|
|
121
|
+
`;
|
|
122
|
+
const ours = `apiVersion: apps/v1
|
|
123
|
+
kind: Deployment
|
|
124
|
+
spec:
|
|
125
|
+
template:
|
|
126
|
+
spec:
|
|
127
|
+
containers:
|
|
128
|
+
- name: app
|
|
129
|
+
image: app:2.0
|
|
130
|
+
- name: sidecar
|
|
131
|
+
image: sidecar:1.0
|
|
132
|
+
`;
|
|
133
|
+
const theirs = `apiVersion: apps/v1
|
|
134
|
+
kind: Deployment
|
|
135
|
+
spec:
|
|
136
|
+
template:
|
|
137
|
+
spec:
|
|
138
|
+
containers:
|
|
139
|
+
- name: app
|
|
140
|
+
image: app:1.0
|
|
141
|
+
- name: log-shipper
|
|
142
|
+
image: fluent-bit:2.0
|
|
143
|
+
`;
|
|
144
|
+
const result = tryResolveYamlConflict(base.split("\n"), ours.split("\n"), theirs.split("\n"), "k8s/deployment.yaml");
|
|
145
|
+
expect(result.mergedLines).not.toBeNull();
|
|
146
|
+
const merged = result.mergedLines.join("\n");
|
|
147
|
+
// app a été modifié (1.0 → 2.0) côté ours, theirs n'y a pas touché → 2.0
|
|
148
|
+
expect(merged).toContain("image: app:2.0");
|
|
149
|
+
// les deux nouveaux containers sont présents
|
|
150
|
+
expect(merged).toContain("sidecar");
|
|
151
|
+
expect(merged).toContain("log-shipper");
|
|
152
|
+
});
|
|
153
|
+
});
|
|
154
|
+
describe("disableFormatProfiles — rollback global v2.1", () => {
|
|
155
|
+
it("désactive le hook profil dans le pipeline complet (resolve)", async () => {
|
|
156
|
+
const { resolve } = await import("../../resolver.js");
|
|
157
|
+
const conflict = `<<<<<<< ours
|
|
158
|
+
{
|
|
159
|
+
"name": "demo",
|
|
160
|
+
"keywords": ["a", "b"]
|
|
161
|
+
}
|
|
162
|
+
=======
|
|
163
|
+
{
|
|
164
|
+
"name": "demo",
|
|
165
|
+
"keywords": ["a", "c"]
|
|
166
|
+
}
|
|
167
|
+
>>>>>>> theirs
|
|
168
|
+
`;
|
|
169
|
+
// Sans disable : profil package.json résout via "set"
|
|
170
|
+
const enabled = resolve(conflict, "package.json");
|
|
171
|
+
expect(enabled.stats.autoResolved).toBe(1);
|
|
172
|
+
// Avec disable : retombée comportement v2.1 (fallback textuel)
|
|
173
|
+
const disabled = resolve(conflict, "package.json", { disableFormatProfiles: true });
|
|
174
|
+
expect(disabled.stats.autoResolved).toBe(0);
|
|
175
|
+
});
|
|
176
|
+
});
|
|
177
|
+
describe("tryResolveJsonConflict — non-applicable", () => {
|
|
178
|
+
it("conflit sur scalaire (modif divergente) — pas résolu malgré profil", () => {
|
|
179
|
+
const base = `{ "name": "demo" }`;
|
|
180
|
+
const ours = `{ "name": "demo-app" }`;
|
|
181
|
+
const theirs = `{ "name": "demo-lib" }`;
|
|
182
|
+
const result = tryResolveJsonConflict(base.split("\n"), ours.split("\n"), theirs.split("\n"), "package.json");
|
|
183
|
+
expect(result.merged).toBeNull();
|
|
184
|
+
});
|
|
185
|
+
it("filePath inconnu (pas de profil) — comportement v2.1", () => {
|
|
186
|
+
const base = `{ "list": ["a"] }`;
|
|
187
|
+
const ours = `{ "list": ["a", "b"] }`;
|
|
188
|
+
const theirs = `{ "list": ["a", "c"] }`;
|
|
189
|
+
const result = tryResolveJsonConflict(base.split("\n"), ours.split("\n"), theirs.split("\n"), "unknown-file.json");
|
|
190
|
+
expect(result.merged).toBeNull();
|
|
191
|
+
});
|
|
192
|
+
});
|
|
193
|
+
//# sourceMappingURL=integration.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"integration.test.js","sourceRoot":"","sources":["../../../src/__tests__/format-profiles/integration.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Tests de l'implémentation RFC 6902 maison (v2.2).
|
|
3
|
+
*
|
|
4
|
+
* Couvre :
|
|
5
|
+
* - parseJsonPointer / buildJsonPointer (escapes ~0, ~1)
|
|
6
|
+
* - applyJsonPatch sur add / remove / replace
|
|
7
|
+
* - diffJson (objets, scalaires, type changes)
|
|
8
|
+
* - mergeJsonPatches (paths disjoints vs en conflit)
|
|
9
|
+
* - test de propriété : applyJsonPatch(base, diffJson(base, x)) ≡ x
|
|
10
|
+
*/
|
|
11
|
+
export {};
|
|
12
|
+
//# sourceMappingURL=json-patch.test.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"json-patch.test.d.ts","sourceRoot":"","sources":["../../../src/__tests__/format-profiles/json-patch.test.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG"}
|
|
@@ -0,0 +1,222 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Tests de l'implémentation RFC 6902 maison (v2.2).
|
|
3
|
+
*
|
|
4
|
+
* Couvre :
|
|
5
|
+
* - parseJsonPointer / buildJsonPointer (escapes ~0, ~1)
|
|
6
|
+
* - applyJsonPatch sur add / remove / replace
|
|
7
|
+
* - diffJson (objets, scalaires, type changes)
|
|
8
|
+
* - mergeJsonPatches (paths disjoints vs en conflit)
|
|
9
|
+
* - test de propriété : applyJsonPatch(base, diffJson(base, x)) ≡ x
|
|
10
|
+
*/
|
|
11
|
+
import { describe, it, expect } from "vitest";
|
|
12
|
+
import { parseJsonPointer, buildJsonPointer, applyJsonPatch, diffJson, mergeJsonPatches, jsonStructEqual, } from "../../format-profiles/json-patch.js";
|
|
13
|
+
// ─── JSON Pointer (RFC 6901) ────────────────────────────────
|
|
14
|
+
describe("parseJsonPointer / buildJsonPointer", () => {
|
|
15
|
+
it("racine vide", () => {
|
|
16
|
+
expect(parseJsonPointer("")).toEqual([]);
|
|
17
|
+
expect(buildJsonPointer([])).toBe("");
|
|
18
|
+
});
|
|
19
|
+
it("path simple", () => {
|
|
20
|
+
expect(parseJsonPointer("/foo/bar")).toEqual(["foo", "bar"]);
|
|
21
|
+
expect(buildJsonPointer(["foo", "bar"])).toBe("/foo/bar");
|
|
22
|
+
});
|
|
23
|
+
it("escapes ~0 (~) et ~1 (/)", () => {
|
|
24
|
+
expect(parseJsonPointer("/a~1b/c~0d")).toEqual(["a/b", "c~d"]);
|
|
25
|
+
expect(buildJsonPointer(["a/b", "c~d"])).toBe("/a~1b/c~0d");
|
|
26
|
+
});
|
|
27
|
+
it("token vide légal (clé '')", () => {
|
|
28
|
+
expect(parseJsonPointer("//x")).toEqual(["", "x"]);
|
|
29
|
+
});
|
|
30
|
+
it("path invalide → throw", () => {
|
|
31
|
+
expect(() => parseJsonPointer("foo/bar")).toThrow();
|
|
32
|
+
});
|
|
33
|
+
});
|
|
34
|
+
// ─── applyJsonPatch ─────────────────────────────────────────
|
|
35
|
+
describe("applyJsonPatch — opérations de base", () => {
|
|
36
|
+
it("add à la racine — replace tout le doc", () => {
|
|
37
|
+
expect(applyJsonPatch({ a: 1 }, [{ op: "add", path: "", value: { b: 2 } }])).toEqual({ b: 2 });
|
|
38
|
+
});
|
|
39
|
+
it("add une nouvelle clé d'objet", () => {
|
|
40
|
+
expect(applyJsonPatch({ a: 1 }, [{ op: "add", path: "/b", value: 2 }])).toEqual({ a: 1, b: 2 });
|
|
41
|
+
});
|
|
42
|
+
it("replace une clé existante", () => {
|
|
43
|
+
expect(applyJsonPatch({ a: 1 }, [{ op: "replace", path: "/a", value: 99 }])).toEqual({ a: 99 });
|
|
44
|
+
});
|
|
45
|
+
it("remove une clé existante", () => {
|
|
46
|
+
expect(applyJsonPatch({ a: 1, b: 2 }, [{ op: "remove", path: "/a" }])).toEqual({ b: 2 });
|
|
47
|
+
});
|
|
48
|
+
it("add dans un tableau (index)", () => {
|
|
49
|
+
expect(applyJsonPatch([1, 2, 3], [{ op: "add", path: "/1", value: 99 }])).toEqual([1, 99, 2, 3]);
|
|
50
|
+
});
|
|
51
|
+
it("add en fin de tableau via '-'", () => {
|
|
52
|
+
expect(applyJsonPatch([1, 2], [{ op: "add", path: "/-", value: 3 }])).toEqual([1, 2, 3]);
|
|
53
|
+
});
|
|
54
|
+
it("remove dans un tableau (shift)", () => {
|
|
55
|
+
expect(applyJsonPatch([1, 2, 3], [{ op: "remove", path: "/1" }])).toEqual([1, 3]);
|
|
56
|
+
});
|
|
57
|
+
it("path imbriqué", () => {
|
|
58
|
+
const doc = { user: { name: "alice", age: 30 } };
|
|
59
|
+
const out = applyJsonPatch(doc, [{ op: "replace", path: "/user/name", value: "bob" }]);
|
|
60
|
+
expect(out).toEqual({ user: { name: "bob", age: 30 } });
|
|
61
|
+
// Immutabilité : doc d'origine intact
|
|
62
|
+
expect(doc.user.name).toBe("alice");
|
|
63
|
+
});
|
|
64
|
+
it("séquence de plusieurs ops", () => {
|
|
65
|
+
const out = applyJsonPatch({ a: 1, b: 2 }, [
|
|
66
|
+
{ op: "add", path: "/c", value: 3 },
|
|
67
|
+
{ op: "remove", path: "/a" },
|
|
68
|
+
{ op: "replace", path: "/b", value: 20 },
|
|
69
|
+
]);
|
|
70
|
+
expect(out).toEqual({ b: 20, c: 3 });
|
|
71
|
+
});
|
|
72
|
+
it("remove sur clé absente → throw", () => {
|
|
73
|
+
expect(() => applyJsonPatch({ a: 1 }, [{ op: "remove", path: "/missing" }])).toThrow();
|
|
74
|
+
});
|
|
75
|
+
it("replace sur path inexistant → throw", () => {
|
|
76
|
+
expect(() => applyJsonPatch({ a: 1 }, [{ op: "replace", path: "/missing/sub", value: 0 }])).toThrow();
|
|
77
|
+
});
|
|
78
|
+
});
|
|
79
|
+
// ─── diffJson ───────────────────────────────────────────────
|
|
80
|
+
describe("diffJson", () => {
|
|
81
|
+
it("aucune différence → []", () => {
|
|
82
|
+
expect(diffJson({ a: 1 }, { a: 1 })).toEqual([]);
|
|
83
|
+
});
|
|
84
|
+
it("ajout d'une clé", () => {
|
|
85
|
+
expect(diffJson({ a: 1 }, { a: 1, b: 2 })).toEqual([
|
|
86
|
+
{ op: "add", path: "/b", value: 2 },
|
|
87
|
+
]);
|
|
88
|
+
});
|
|
89
|
+
it("suppression d'une clé", () => {
|
|
90
|
+
expect(diffJson({ a: 1, b: 2 }, { a: 1 })).toEqual([
|
|
91
|
+
{ op: "remove", path: "/b" },
|
|
92
|
+
]);
|
|
93
|
+
});
|
|
94
|
+
it("changement scalaire → replace", () => {
|
|
95
|
+
expect(diffJson({ a: 1 }, { a: 2 })).toEqual([
|
|
96
|
+
{ op: "replace", path: "/a", value: 2 },
|
|
97
|
+
]);
|
|
98
|
+
});
|
|
99
|
+
it("changement de type → replace", () => {
|
|
100
|
+
expect(diffJson({ a: 1 }, { a: "one" })).toEqual([
|
|
101
|
+
{ op: "replace", path: "/a", value: "one" },
|
|
102
|
+
]);
|
|
103
|
+
});
|
|
104
|
+
it("récursion sur objet imbriqué", () => {
|
|
105
|
+
const ops = diffJson({ user: { name: "a", age: 30 } }, { user: { name: "b", age: 30 } });
|
|
106
|
+
expect(ops).toEqual([
|
|
107
|
+
{ op: "replace", path: "/user/name", value: "b" },
|
|
108
|
+
]);
|
|
109
|
+
});
|
|
110
|
+
it("tableau différent → replace global du tableau", () => {
|
|
111
|
+
expect(diffJson({ deps: [1, 2] }, { deps: [1, 2, 3] })).toEqual([
|
|
112
|
+
{ op: "replace", path: "/deps", value: [1, 2, 3] },
|
|
113
|
+
]);
|
|
114
|
+
});
|
|
115
|
+
});
|
|
116
|
+
// ─── mergeJsonPatches ───────────────────────────────────────
|
|
117
|
+
describe("mergeJsonPatches", () => {
|
|
118
|
+
it("paths disjoints → concaténation", () => {
|
|
119
|
+
const ours = [
|
|
120
|
+
{ op: "add", path: "/x", value: 1 },
|
|
121
|
+
];
|
|
122
|
+
const theirs = [
|
|
123
|
+
{ op: "add", path: "/y", value: 2 },
|
|
124
|
+
];
|
|
125
|
+
const r = mergeJsonPatches(ours, theirs);
|
|
126
|
+
expect(r.merged).toEqual([...ours, ...theirs]);
|
|
127
|
+
expect(r.conflictingPaths).toEqual([]);
|
|
128
|
+
});
|
|
129
|
+
it("path identique → conflit", () => {
|
|
130
|
+
const ours = [
|
|
131
|
+
{ op: "replace", path: "/v", value: 1 },
|
|
132
|
+
];
|
|
133
|
+
const theirs = [
|
|
134
|
+
{ op: "replace", path: "/v", value: 2 },
|
|
135
|
+
];
|
|
136
|
+
const r = mergeJsonPatches(ours, theirs);
|
|
137
|
+
expect(r.merged).toBeNull();
|
|
138
|
+
expect(r.conflictingPaths).toEqual(["/v"]);
|
|
139
|
+
});
|
|
140
|
+
it("path préfixe → conflit", () => {
|
|
141
|
+
// ours touche /user, theirs touche /user/name → ils se chevauchent.
|
|
142
|
+
const ours = [
|
|
143
|
+
{ op: "replace", path: "/user", value: { name: "x" } },
|
|
144
|
+
];
|
|
145
|
+
const theirs = [
|
|
146
|
+
{ op: "replace", path: "/user/name", value: "y" },
|
|
147
|
+
];
|
|
148
|
+
const r = mergeJsonPatches(ours, theirs);
|
|
149
|
+
expect(r.merged).toBeNull();
|
|
150
|
+
});
|
|
151
|
+
it("paths frères dans un même objet → disjoints", () => {
|
|
152
|
+
// /a/b et /a/c sont disjoints (frères).
|
|
153
|
+
const ours = [
|
|
154
|
+
{ op: "add", path: "/a/b", value: 1 },
|
|
155
|
+
];
|
|
156
|
+
const theirs = [
|
|
157
|
+
{ op: "add", path: "/a/c", value: 2 },
|
|
158
|
+
];
|
|
159
|
+
const r = mergeJsonPatches(ours, theirs);
|
|
160
|
+
expect(r.merged).toHaveLength(2);
|
|
161
|
+
});
|
|
162
|
+
});
|
|
163
|
+
// ─── Test de propriété : round-trip ─────────────────────────
|
|
164
|
+
/** PRNG déterministe (mulberry32) — évite la flakiness. */
|
|
165
|
+
function mulberry32(seed) {
|
|
166
|
+
let t = seed;
|
|
167
|
+
return () => {
|
|
168
|
+
t = (t + 0x6d2b79f5) | 0;
|
|
169
|
+
let x = t;
|
|
170
|
+
x = Math.imul(x ^ (x >>> 15), x | 1);
|
|
171
|
+
x ^= x + Math.imul(x ^ (x >>> 7), x | 61);
|
|
172
|
+
return ((x ^ (x >>> 14)) >>> 0) / 4294967296;
|
|
173
|
+
};
|
|
174
|
+
}
|
|
175
|
+
/** Génère un JSON pseudo-aléatoire avec profondeur bornée. */
|
|
176
|
+
function randomJson(rng, depth) {
|
|
177
|
+
if (depth <= 0) {
|
|
178
|
+
const r = rng();
|
|
179
|
+
if (r < 0.25)
|
|
180
|
+
return null;
|
|
181
|
+
if (r < 0.5)
|
|
182
|
+
return Math.floor(rng() * 100);
|
|
183
|
+
if (r < 0.75)
|
|
184
|
+
return rng() < 0.5;
|
|
185
|
+
return `s_${Math.floor(rng() * 1000)}`;
|
|
186
|
+
}
|
|
187
|
+
const r = rng();
|
|
188
|
+
if (r < 0.4) {
|
|
189
|
+
const n = Math.floor(rng() * 4);
|
|
190
|
+
const obj = {};
|
|
191
|
+
for (let i = 0; i < n; i++) {
|
|
192
|
+
obj[`k${i}`] = randomJson(rng, depth - 1);
|
|
193
|
+
}
|
|
194
|
+
return obj;
|
|
195
|
+
}
|
|
196
|
+
if (r < 0.6) {
|
|
197
|
+
const n = Math.floor(rng() * 3);
|
|
198
|
+
return Array.from({ length: n }, () => randomJson(rng, depth - 1));
|
|
199
|
+
}
|
|
200
|
+
return randomJson(rng, 0); // scalaire
|
|
201
|
+
}
|
|
202
|
+
describe("Round-trip — propriété diffJson + applyJsonPatch", () => {
|
|
203
|
+
it("applyJsonPatch(base, diffJson(base, x)) ≡ x sur 100 entrées générées", () => {
|
|
204
|
+
const rng = mulberry32(20260427);
|
|
205
|
+
for (let run = 0; run < 100; run++) {
|
|
206
|
+
const base = randomJson(rng, 3);
|
|
207
|
+
const target = randomJson(rng, 3);
|
|
208
|
+
const ops = diffJson(base, target);
|
|
209
|
+
const reconstructed = applyJsonPatch(base, ops);
|
|
210
|
+
// Égalité structurelle (pas de référence — `target` peut contenir des
|
|
211
|
+
// sous-arbres équivalents par valeur mais pas identiques par référence).
|
|
212
|
+
const ok = jsonStructEqual(reconstructed, target);
|
|
213
|
+
if (!ok) {
|
|
214
|
+
// Affiche l'input pour debug si l'assert casse.
|
|
215
|
+
// eslint-disable-next-line no-console
|
|
216
|
+
console.error(`FAIL run ${run}:`, { base, target, ops, reconstructed });
|
|
217
|
+
}
|
|
218
|
+
expect(ok).toBe(true);
|
|
219
|
+
}
|
|
220
|
+
});
|
|
221
|
+
});
|
|
222
|
+
//# sourceMappingURL=json-patch.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"json-patch.test.js","sourceRoot":"","sources":["../../../src/__tests__/format-profiles/json-patch.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"registry.test.d.ts","sourceRoot":"","sources":["../../../src/__tests__/format-profiles/registry.test.ts"],"names":[],"mappings":"AAAA;;GAEG"}
|
|
@@ -0,0 +1,124 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Tests du registre de profils (v2.2).
|
|
3
|
+
*/
|
|
4
|
+
import { describe, it, expect } from "vitest";
|
|
5
|
+
import { profileForFile, registerFormatProfile, strategyForPath, } from "../../format-profiles/index.js";
|
|
6
|
+
describe("profileForFile — built-ins", () => {
|
|
7
|
+
it("matche package.json à la racine", () => {
|
|
8
|
+
const p = profileForFile("package.json");
|
|
9
|
+
expect(p?.name).toBe("package.json");
|
|
10
|
+
});
|
|
11
|
+
it("matche package.json dans un workspace", () => {
|
|
12
|
+
const p = profileForFile("apps/desktop/package.json");
|
|
13
|
+
expect(p?.name).toBe("package.json");
|
|
14
|
+
});
|
|
15
|
+
it("ne matche pas package-lock.json", () => {
|
|
16
|
+
expect(profileForFile("package-lock.json")).toBeNull();
|
|
17
|
+
});
|
|
18
|
+
it("ne matche pas un fichier non reconnu", () => {
|
|
19
|
+
expect(profileForFile("README.md")).toBeNull();
|
|
20
|
+
expect(profileForFile("src/utils.ts")).toBeNull();
|
|
21
|
+
});
|
|
22
|
+
it("matche tsconfig.json et ses variants", () => {
|
|
23
|
+
expect(profileForFile("tsconfig.json")?.name).toBe("tsconfig.json");
|
|
24
|
+
expect(profileForFile("tsconfig.build.json")?.name).toBe("tsconfig.json");
|
|
25
|
+
expect(profileForFile("apps/desktop/tsconfig.app.json")?.name).toBe("tsconfig.json");
|
|
26
|
+
});
|
|
27
|
+
it("matche composer.json", () => {
|
|
28
|
+
expect(profileForFile("composer.json")?.name).toBe("composer.json");
|
|
29
|
+
expect(profileForFile("backend/composer.json")?.name).toBe("composer.json");
|
|
30
|
+
// composer-lock pas couvert par ce profil
|
|
31
|
+
expect(profileForFile("composer.lock")).toBeNull();
|
|
32
|
+
});
|
|
33
|
+
it("matche helm/values.yaml", () => {
|
|
34
|
+
expect(profileForFile("helm/values.yaml")?.name).toBe("helm/values.yaml");
|
|
35
|
+
expect(profileForFile("charts/myapp/values.yaml")?.name).toBe("helm/values.yaml");
|
|
36
|
+
expect(profileForFile("charts/myapp/values.production.yaml")?.name).toBe("helm/values.yaml");
|
|
37
|
+
// .yaml sans dossier helm/charts → kubernetes ou null
|
|
38
|
+
expect(profileForFile("config/values.yaml")?.name).not.toBe("helm/values.yaml");
|
|
39
|
+
});
|
|
40
|
+
it("matche kubernetes manifests", () => {
|
|
41
|
+
expect(profileForFile("k8s/deployment.yaml")?.name).toBe("kubernetes");
|
|
42
|
+
expect(profileForFile("kubernetes/service.yml")?.name).toBe("kubernetes");
|
|
43
|
+
expect(profileForFile("manifests/configmap.yaml")?.name).toBe("kubernetes");
|
|
44
|
+
// basename only (sans dossier k8s)
|
|
45
|
+
expect(profileForFile("deployment.yaml")?.name).toBe("kubernetes");
|
|
46
|
+
expect(profileForFile("ingress.yml")?.name).toBe("kubernetes");
|
|
47
|
+
// .yaml sans signal kubernetes ni helm → null
|
|
48
|
+
expect(profileForFile("config/app.yaml")).toBeNull();
|
|
49
|
+
});
|
|
50
|
+
});
|
|
51
|
+
describe("strategyForPath — tsconfig.json", () => {
|
|
52
|
+
const profile = profileForFile("tsconfig.json");
|
|
53
|
+
it("/compilerOptions/lib → set", () => {
|
|
54
|
+
expect(strategyForPath(profile, "/compilerOptions/lib")).toEqual({ kind: "set" });
|
|
55
|
+
});
|
|
56
|
+
it("/include → set", () => {
|
|
57
|
+
expect(strategyForPath(profile, "/include")).toEqual({ kind: "set" });
|
|
58
|
+
});
|
|
59
|
+
it("/references identité par path", () => {
|
|
60
|
+
const s = strategyForPath(profile, "/references");
|
|
61
|
+
expect(s.kind).toBe("set");
|
|
62
|
+
if (s.kind === "set" && s.identity) {
|
|
63
|
+
expect(s.identity({ path: "../shared" })).toBe("../shared");
|
|
64
|
+
}
|
|
65
|
+
});
|
|
66
|
+
});
|
|
67
|
+
describe("strategyForPath — package.json", () => {
|
|
68
|
+
const profile = profileForFile("package.json");
|
|
69
|
+
it("/dependencies → merge-keys", () => {
|
|
70
|
+
expect(strategyForPath(profile, "/dependencies")).toEqual({ kind: "merge-keys" });
|
|
71
|
+
});
|
|
72
|
+
it("/scripts → merge-keys", () => {
|
|
73
|
+
expect(strategyForPath(profile, "/scripts")).toEqual({ kind: "merge-keys" });
|
|
74
|
+
});
|
|
75
|
+
it("/keywords → set", () => {
|
|
76
|
+
expect(strategyForPath(profile, "/keywords")).toEqual({ kind: "set" });
|
|
77
|
+
});
|
|
78
|
+
it("path inconnu → défaut (merge-keys)", () => {
|
|
79
|
+
expect(strategyForPath(profile, "/foo")).toEqual({ kind: "merge-keys" });
|
|
80
|
+
});
|
|
81
|
+
});
|
|
82
|
+
describe("registerFormatProfile — custom + cleanup", () => {
|
|
83
|
+
it("override un built-in et désinscrit proprement", () => {
|
|
84
|
+
const customProfile = {
|
|
85
|
+
name: "custom-package-json",
|
|
86
|
+
matches: (fp) => fp.endsWith("package.json"),
|
|
87
|
+
paths: {
|
|
88
|
+
"/dependencies": { kind: "ordered-list" },
|
|
89
|
+
},
|
|
90
|
+
default: { kind: "opaque" },
|
|
91
|
+
};
|
|
92
|
+
// Avant register : built-in trouvé
|
|
93
|
+
expect(profileForFile("package.json")?.name).toBe("package.json");
|
|
94
|
+
const unregister = registerFormatProfile(customProfile);
|
|
95
|
+
try {
|
|
96
|
+
// Le custom prend priorité (inséré en tête)
|
|
97
|
+
expect(profileForFile("package.json")?.name).toBe("custom-package-json");
|
|
98
|
+
expect(strategyForPath(customProfile, "/dependencies")).toEqual({ kind: "ordered-list" });
|
|
99
|
+
}
|
|
100
|
+
finally {
|
|
101
|
+
unregister();
|
|
102
|
+
}
|
|
103
|
+
// Après cleanup : built-in retrouvé
|
|
104
|
+
expect(profileForFile("package.json")?.name).toBe("package.json");
|
|
105
|
+
});
|
|
106
|
+
});
|
|
107
|
+
describe("strategyForPath — wildcards", () => {
|
|
108
|
+
it("matche un segment via *", () => {
|
|
109
|
+
const profile = {
|
|
110
|
+
name: "test",
|
|
111
|
+
matches: () => true,
|
|
112
|
+
paths: {
|
|
113
|
+
"/items/*/tags": { kind: "set" },
|
|
114
|
+
},
|
|
115
|
+
default: { kind: "opaque" },
|
|
116
|
+
};
|
|
117
|
+
expect(strategyForPath(profile, "/items/foo/tags")).toEqual({ kind: "set" });
|
|
118
|
+
expect(strategyForPath(profile, "/items/0/tags")).toEqual({ kind: "set" });
|
|
119
|
+
// Non-match : nombre de segments différent
|
|
120
|
+
expect(strategyForPath(profile, "/items/foo")).toEqual({ kind: "opaque" });
|
|
121
|
+
expect(strategyForPath(profile, "/items/foo/tags/extra")).toEqual({ kind: "opaque" });
|
|
122
|
+
});
|
|
123
|
+
});
|
|
124
|
+
//# sourceMappingURL=registry.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"registry.test.js","sourceRoot":"","sources":["../../../src/__tests__/format-profiles/registry.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Tests directs de `makeScore` — la formule du `ConfidenceScore`.
|
|
3
|
+
*
|
|
4
|
+
* v2.1 ajoute la dimension optionnelle `algorithmStability` (poids −0.10).
|
|
5
|
+
* Ces tests verrouillent la rétro-compat (paramètre par défaut 0 → score
|
|
6
|
+
* identique à v1.4) et la sémantique de la nouvelle pénalité.
|
|
7
|
+
*/
|
|
8
|
+
export {};
|
|
9
|
+
//# sourceMappingURL=make-score.test.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"make-score.test.d.ts","sourceRoot":"","sources":["../../../src/__tests__/patterns/make-score.test.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG"}
|