@x0k/json-schema-merge 1.0.2 → 1.0.4
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 +18 -7
- package/dist/lib/json-schema/json-schema.d.ts.map +1 -1
- package/dist/lib/json-schema/json-schema.js.map +1 -1
- package/dist/lib/json-schema/merge/merge.d.ts.map +1 -1
- package/dist/lib/json-schema/merge/merge.js +20 -12
- package/dist/lib/json-schema/merge/merge.js.map +1 -1
- package/dist/lib/json-schema/merge/patterns.js +1 -1
- package/dist/lib/json-schema/merge/patterns.js.map +1 -1
- package/dist/lib/json-schema/traverse.d.ts.map +1 -1
- package/package.json +9 -10
package/README.md
CHANGED
|
@@ -1,11 +1,19 @@
|
|
|
1
|
-
#
|
|
1
|
+
# json-schema-merge
|
|
2
2
|
|
|
3
|
-
A
|
|
3
|
+
A library for merging **JSON Schema Draft-07** definitions with no runtime dependencies.
|
|
4
4
|
|
|
5
5
|
```shell
|
|
6
6
|
npm i @x0k/json-schema-merge
|
|
7
7
|
```
|
|
8
8
|
|
|
9
|
+
**Features**:
|
|
10
|
+
|
|
11
|
+
- Ordering comparison for JSON values
|
|
12
|
+
- Ordering comparison for JSON Schemas
|
|
13
|
+
- JSON Schema merging
|
|
14
|
+
- Shallow merging of the `allOf` keyword in JSON Schemas
|
|
15
|
+
- Deep merging of the `allOf` keyword in JSON Schemas
|
|
16
|
+
|
|
9
17
|
**Goals**
|
|
10
18
|
|
|
11
19
|
- Fast and correct merging of JSON Schemas Draft-07
|
|
@@ -14,7 +22,6 @@ npm i @x0k/json-schema-merge
|
|
|
14
22
|
**Non-goals**
|
|
15
23
|
|
|
16
24
|
- Support for drafts other than Draft-07
|
|
17
|
-
- Deep merging of the `allOf` keyword (possible, but not optimal)
|
|
18
25
|
- Handling invalid or incorrect JSON Schemas (the merge result is undefined)
|
|
19
26
|
- Resolving `$ref` references (see [json-schema-ref-parser](https://github.com/APIDevTools/json-schema-ref-parser))
|
|
20
27
|
|
|
@@ -29,11 +36,17 @@ import {
|
|
|
29
36
|
createMerger,
|
|
30
37
|
createComparator,
|
|
31
38
|
createShallowAllOfMerge,
|
|
39
|
+
// Use to merge nested `allOf`
|
|
40
|
+
createDeepAllOfMerge,
|
|
32
41
|
} from "@x0k/json-schema-merge";
|
|
33
42
|
|
|
34
43
|
const { compareSchemaDefinitions, compareSchemaValues } = createComparator();
|
|
35
44
|
|
|
36
|
-
const {
|
|
45
|
+
const {
|
|
46
|
+
mergeArrayOfSchemaDefinitions,
|
|
47
|
+
// Use to merge two `JSONSchema7Definition`
|
|
48
|
+
mergeSchemaDefinitions,
|
|
49
|
+
} = createMerger({
|
|
37
50
|
intersectJson: createIntersector(compareSchemaValues),
|
|
38
51
|
deduplicateJsonSchemaDef: createDeduplicator(compareSchemaDefinitions),
|
|
39
52
|
});
|
|
@@ -42,9 +55,7 @@ const shallowAllOfMerge = createShallowAllOfMerge(
|
|
|
42
55
|
mergeArrayOfSchemaDefinitions
|
|
43
56
|
);
|
|
44
57
|
|
|
45
|
-
const merged = shallowAllOfMerge({
|
|
46
|
-
/* your schema with `allOf` keyword */
|
|
47
|
-
});
|
|
58
|
+
const merged = shallowAllOfMerge({/* your schema with `allOf` keyword */});
|
|
48
59
|
```
|
|
49
60
|
|
|
50
61
|
### Options
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"json-schema.d.ts","sourceRoot":"","sources":["../../../src/lib/json-schema/json-schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,mBAAmB,EACnB,qBAAqB,EACtB,MAAM,aAAa,CAAC;AAIrB,eAAO,MAAM,sBAAsB,EAAE,MAAM,EAQD,CAAC;AAE3C,eAAO,MAAM,6BAA6B,aAAkC,CAAC;AAE7E,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,IAAI,mBAAmB,CAE1E;AAKD,eAAO,MAAM,sBAAsB,6EAMJ,CAAC;AAEhC,eAAO,MAAM,6BAA6B,oFAAkC,CAAC;AAE7E,MAAM,MAAM,mBAAmB,GAAG,CAAC,OAAO,sBAAsB,CAAC,CAAC,MAAM,CAAC,CAAC;AAG1E,eAAO,MAAM,qBAAqB,sCAKH,CAAC;AAEhC,eAAO,MAAM,4BAA4B,4CAAiC,CAAC;AAE3E,MAAM,MAAM,kBAAkB,GAAG,CAAC,OAAO,qBAAqB,CAAC,CAAC,MAAM,CAAC,CAAC;AAGxE,eAAO,MAAM,WAAW,gHAUO,CAAC;AAEhC,eAAO,MAAM,kBAAkB,2HAAuB,CAAC;AAEvD,MAAM,MAAM,YAAY,GAAG,CAAC,OAAO,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC;AAGxD,eAAO,MAAM,mBAAmB,wOAI/B,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG,CAAC,OAAO,mBAAmB,CAAC,CAAC,MAAM,CAAC,CAAC;AAEnE,MAAM,MAAM,iBAAiB,CAAC,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,eAAe,CAAC,GAAG;IAC/D,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,SAAS,CAAC;IAC5B,eAAe,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC;IAChC,QAAQ,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC;IACzB,oBAAoB,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC;IACrC,aAAa,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC;IAC9B,EAAE,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC;IACnB,IAAI,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC;IACrB,IAAI,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC;IACrB,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC;IAEpB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,SAAS,CAAC;IACtC,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,SAAS,CAAC;IAC3C,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,SAAS,CAAC;IAClD,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,MAAM,EAAE,CAAC,GAAG,SAAS,CAAC;IACxD,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,SAAS,CAAC;IAE5C,KAAK,CAAC,EAAE,CAAC,EAAE,GAAG,SAAS,CAAC;IACxB,KAAK,CAAC,EAAE,CAAC,EAAE,GAAG,SAAS,CAAC;IACxB,KAAK,CAAC,EAAE,CAAC,EAAE,GAAG,SAAS,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,2BAA2B,CAAC,CAAC,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"json-schema.d.ts","sourceRoot":"","sources":["../../../src/lib/json-schema/json-schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,mBAAmB,EACnB,qBAAqB,EACtB,MAAM,aAAa,CAAC;AAIrB,eAAO,MAAM,sBAAsB,EAAE,MAAM,EAQD,CAAC;AAE3C,eAAO,MAAM,6BAA6B,aAAkC,CAAC;AAE7E,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,IAAI,mBAAmB,CAE1E;AAKD,eAAO,MAAM,sBAAsB,6EAMJ,CAAC;AAEhC,eAAO,MAAM,6BAA6B,oFAAkC,CAAC;AAE7E,MAAM,MAAM,mBAAmB,GAAG,CAAC,OAAO,sBAAsB,CAAC,CAAC,MAAM,CAAC,CAAC;AAG1E,eAAO,MAAM,qBAAqB,sCAKH,CAAC;AAEhC,eAAO,MAAM,4BAA4B,4CAAiC,CAAC;AAE3E,MAAM,MAAM,kBAAkB,GAAG,CAAC,OAAO,qBAAqB,CAAC,CAAC,MAAM,CAAC,CAAC;AAGxE,eAAO,MAAM,WAAW,gHAUO,CAAC;AAEhC,eAAO,MAAM,kBAAkB,2HAAuB,CAAC;AAEvD,MAAM,MAAM,YAAY,GAAG,CAAC,OAAO,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC;AAGxD,eAAO,MAAM,mBAAmB,wOAI/B,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG,CAAC,OAAO,mBAAmB,CAAC,CAAC,MAAM,CAAC,CAAC;AAEnE,MAAM,MAAM,iBAAiB,CAAC,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,eAAe,CAAC,GAAG;IAC/D,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,SAAS,CAAC;IAC5B,eAAe,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC;IAChC,QAAQ,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC;IACzB,oBAAoB,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC;IACrC,aAAa,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC;IAC9B,EAAE,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC;IACnB,IAAI,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC;IACrB,IAAI,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC;IACrB,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC;IAEpB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,SAAS,CAAC;IACtC,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,SAAS,CAAC;IAC3C,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,SAAS,CAAC;IAClD,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,MAAM,EAAE,CAAC,GAAG,SAAS,CAAC;IACxD,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,SAAS,CAAC;IAE5C,KAAK,CAAC,EAAE,CAAC,EAAE,GAAG,SAAS,CAAC;IACxB,KAAK,CAAC,EAAE,CAAC,EAAE,GAAG,SAAS,CAAC;IACxB,KAAK,CAAC,EAAE,CAAC,EAAE,GAAG,SAAS,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,2BAA2B,CAAC,CAAC,EAAE,CAAC,IAC1C,iBAAiB,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,OAAO,CAAC;AAEpC,wBAAgB,cAAc,CAAC,CAAC,SAAS,qBAAqB,EAC5D,SAAS,EAAE,CAAC,GACX,SAAS,IAAI,OAAO,CAAC,CAAC,EAAE,OAAO,CAAC,CAElC;AAED,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,qBAAqB,GACzB,GAAG,IAAI,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAErC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"json-schema.js","sourceRoot":"","sources":["../../../src/lib/json-schema/json-schema.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE7C,MAAM,CAAC,MAAM,sBAAsB,GAAa;IAC9C,OAAO;IACP,SAAS;IACT,SAAS;IACT,MAAM;IACN,QAAQ;IACR,QAAQ;IACR,QAAQ;CACgC,CAAC;AAE3C,MAAM,CAAC,MAAM,6BAA6B,GAAG,IAAI,GAAG,CAAC,sBAAsB,CAAC,CAAC;AAE7E,MAAM,UAAU,gBAAgB,CAAC,IAAY;IAC3C,OAAO,6BAA6B,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;AACjD,CAAC;AAID,2BAA2B;AAC3B,MAAM,CAAC,MAAM,sBAAsB,GAAG;IACpC,OAAO;IACP,aAAa;IACb,YAAY;IACZ,mBAAmB;IACnB,cAAc;CACe,CAAC;AAEhC,MAAM,CAAC,MAAM,6BAA6B,GAAG,IAAI,GAAG,CAAC,sBAAsB,CAAC,CAAC;AAI7E,2BAA2B;AAC3B,MAAM,CAAC,MAAM,qBAAqB,GAAG;IACnC,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;CACsB,CAAC;AAEhC,MAAM,CAAC,MAAM,4BAA4B,GAAG,IAAI,GAAG,CAAC,qBAAqB,CAAC,CAAC;AAI3E,2BAA2B;AAC3B,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,OAAO;IACP,iBAAiB;IACjB,sBAAsB;IACtB,eAAe;IACf,UAAU;IACV,IAAI;IACJ,MAAM;IACN,MAAM;IACN,KAAK;CACwB,CAAC;AAEhC,MAAM,CAAC,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,CAAC;AAIvD,2BAA2B;AAC3B,MAAM,CAAC,MAAM,mBAAmB,GAAG;IACjC,GAAG,sBAAsB;IACzB,GAAG,qBAAqB;IACxB,GAAG,WAAW;CACf,CAAC;
|
|
1
|
+
{"version":3,"file":"json-schema.js","sourceRoot":"","sources":["../../../src/lib/json-schema/json-schema.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE7C,MAAM,CAAC,MAAM,sBAAsB,GAAa;IAC9C,OAAO;IACP,SAAS;IACT,SAAS;IACT,MAAM;IACN,QAAQ;IACR,QAAQ;IACR,QAAQ;CACgC,CAAC;AAE3C,MAAM,CAAC,MAAM,6BAA6B,GAAG,IAAI,GAAG,CAAC,sBAAsB,CAAC,CAAC;AAE7E,MAAM,UAAU,gBAAgB,CAAC,IAAY;IAC3C,OAAO,6BAA6B,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;AACjD,CAAC;AAID,2BAA2B;AAC3B,MAAM,CAAC,MAAM,sBAAsB,GAAG;IACpC,OAAO;IACP,aAAa;IACb,YAAY;IACZ,mBAAmB;IACnB,cAAc;CACe,CAAC;AAEhC,MAAM,CAAC,MAAM,6BAA6B,GAAG,IAAI,GAAG,CAAC,sBAAsB,CAAC,CAAC;AAI7E,2BAA2B;AAC3B,MAAM,CAAC,MAAM,qBAAqB,GAAG;IACnC,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;CACsB,CAAC;AAEhC,MAAM,CAAC,MAAM,4BAA4B,GAAG,IAAI,GAAG,CAAC,qBAAqB,CAAC,CAAC;AAI3E,2BAA2B;AAC3B,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,OAAO;IACP,iBAAiB;IACjB,sBAAsB;IACtB,eAAe;IACf,UAAU;IACV,IAAI;IACJ,MAAM;IACN,MAAM;IACN,KAAK;CACwB,CAAC;AAEhC,MAAM,CAAC,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,CAAC;AAIvD,2BAA2B;AAC3B,MAAM,CAAC,MAAM,mBAAmB,GAAG;IACjC,GAAG,sBAAsB;IACzB,GAAG,qBAAqB;IACxB,GAAG,WAAW;CACf,CAAC;AA6BF,MAAM,UAAU,cAAc,CAC5B,SAAY;IAEZ,OAAO,OAAO,SAAS,KAAK,QAAQ,CAAC;AACvC,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC9B,GAA0B;IAE1B,OAAO,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,IAAI,CAAC;AACjE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../../../src/lib/json-schema/merge/merge.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,WAAW,EACX,qBAAqB,EACrB,eAAe,EAEhB,MAAM,aAAa,CAAC;AAErB,OAAO,EAGL,KAAK,YAAY,EACjB,KAAK,WAAW,EACjB,MAAM,gBAAgB,CAAC;AAOxB,KAAK,SAAS,GAAG,MAAM,WAAW,CAAC;AAqCnC;;;;;;;;;;;GAWG;AACH,MAAM,MAAM,QAAQ,CAAC,CAAC,SAAS,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../../../src/lib/json-schema/merge/merge.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,WAAW,EACX,qBAAqB,EACrB,eAAe,EAEhB,MAAM,aAAa,CAAC;AAErB,OAAO,EAGL,KAAK,YAAY,EACjB,KAAK,WAAW,EACjB,MAAM,gBAAgB,CAAC;AAOxB,KAAK,SAAS,GAAG,MAAM,WAAW,CAAC;AAqCnC;;;;;;;;;;;GAWG;AACH,MAAM,MAAM,QAAQ,CAAC,CAAC,SAAS,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;AAmIlE;;GAEG;AACH,MAAM,MAAM,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;AAE1C;;GAEG;AACH,MAAM,MAAM,KAAK,CAAC,CAAC,SAAS,SAAS,IAAI,CACvC,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,KACnC,OAAO,CAAC;AAEb,MAAM,MAAM,UAAU,CAAC,CAAC,SAAS,SAAS,EAAE,CAAC,SAAS,SAAS,IAAI,SAAS;IAC1E,CAAC;IACD,CAAC;IACD,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC;CACb,CAAC;AAEF,wBAAgB,KAAK,CAAC,CAAC,SAAS,SAAS,EAAE,CAAC,SAAS,SAAS,EAC5D,CAAC,EAAE,CAAC,EACJ,CAAC,EAAE,CAAC,EACJ,KAAK,EAAE,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAClB,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,CAElB;AA8BD,MAAM,WAAW,YAAY;IAC3B;;;;OAIG;IACH,WAAW,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC;IAE9D;;;OAGG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IAE/B;;;OAGG;IACH,aAAa,CAAC,EAAE,WAAW,CAAC,eAAe,CAAC,CAAC;IAE7C;;;OAGG;IACH,wBAAwB,CAAC,EAAE,YAAY,CAAC,qBAAqB,CAAC,CAAC;IAE/D;;;OAGG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC;IAE5B;;;;;OAKG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;SACf,CAAC,IAAI,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;KAC7D,CAAC,CAAC;IAEH;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,QAAQ,CAAC,CAAC,SAAS,EAAE,EAAE,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IAE3D;;;;;;;;OAQG;IACH,MAAM,CAAC,EAAE,QAAQ,CAAC,UAAU,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC;CACrD;AAED,eAAO,MAAM,cAAc,8SAgB1B,CAAC;AAEF,wBAAgB,YAAY,CAAC,EAC3B,aAAoC,EACpC,WAAuB,EACvB,aAA4B,EAC5B,wBAAmC,EACnC,aAAwB,EACxB,SAAc,EACd,MAAuB,EACvB,OAAO,GACR,GAAE,YAAiB;mCA8UV,qBAAqB,SACpB,qBAAqB;6CA7UnB,qBAAqB,EAAE,KAC/B,qBAAqB;EAqhBzB"}
|
|
@@ -3,14 +3,14 @@ import { identity } from "../../function.js";
|
|
|
3
3
|
import { lcm } from "../../math.js";
|
|
4
4
|
import { isAllowAnySchema } from "../json-schema.js";
|
|
5
5
|
import { simplePatternsMerger } from "./patterns.js";
|
|
6
|
-
function
|
|
6
|
+
function createPairCombinations(l, r, action) {
|
|
7
7
|
const ll = l.length;
|
|
8
8
|
const rl = r.length;
|
|
9
9
|
if (ll > 0 && rl > 0) {
|
|
10
10
|
for (let i = 0; i < ll; i++) {
|
|
11
11
|
const lv = l[i];
|
|
12
12
|
for (let j = 0; j < rl; j++) {
|
|
13
|
-
|
|
13
|
+
action(lv, r[j]);
|
|
14
14
|
}
|
|
15
15
|
}
|
|
16
16
|
}
|
|
@@ -287,7 +287,7 @@ export function createMerger({ mergePatterns = simplePatternsMerger, isSubRegExp
|
|
|
287
287
|
let patterns = {};
|
|
288
288
|
const matchedPatterns = new Set();
|
|
289
289
|
if (lPatternKeys.length > 0 && rPatternKeys.length > 0) {
|
|
290
|
-
|
|
290
|
+
createPairCombinations(lPatternKeys, rPatternKeys, (lKey, rKey) => {
|
|
291
291
|
if (isSubRegExp(lKey, rKey)) {
|
|
292
292
|
matchedPatterns.add(lKey);
|
|
293
293
|
}
|
|
@@ -296,9 +296,6 @@ export function createMerger({ mergePatterns = simplePatternsMerger, isSubRegExp
|
|
|
296
296
|
}
|
|
297
297
|
patterns[mergePatterns(lKey, rKey)] = mergeSchemaDefinitions(lPatterns[lKey], rPatterns[rKey]);
|
|
298
298
|
});
|
|
299
|
-
while (!gen.next().done) {
|
|
300
|
-
/* empty */
|
|
301
|
-
}
|
|
302
299
|
}
|
|
303
300
|
patterns = assignPatternPropertiesAndAdditionalPropertiesMerge(patterns, lPatterns, lPatternKeys, matchedPatterns, rAdditional, isRAddTruthy);
|
|
304
301
|
patterns = assignPatternPropertiesAndAdditionalPropertiesMerge(patterns, rPatterns, rPatternKeys, matchedPatterns, lAdditional, isLAddTruthy);
|
|
@@ -362,7 +359,17 @@ export function createMerger({ mergePatterns = simplePatternsMerger, isSubRegExp
|
|
|
362
359
|
return target;
|
|
363
360
|
};
|
|
364
361
|
function mergeArraysOfSchemaDefinition(l, r) {
|
|
365
|
-
|
|
362
|
+
const definitions = [];
|
|
363
|
+
createPairCombinations(l, r, (a, b) => {
|
|
364
|
+
try {
|
|
365
|
+
definitions.push(mergeSchemaDefinitions(a, b));
|
|
366
|
+
}
|
|
367
|
+
catch { }
|
|
368
|
+
});
|
|
369
|
+
if (definitions.length === 0) {
|
|
370
|
+
throw new Error(`No valid schema combinations could be produced for "${JSON.stringify(l)}" and "${JSON.stringify(r)}"; the merged result is empty`);
|
|
371
|
+
}
|
|
372
|
+
return deduplicateJsonSchemaDef(definitions);
|
|
366
373
|
}
|
|
367
374
|
const ASSIGNERS_MAP = createMap([
|
|
368
375
|
[PROPERTIES_ASSIGNER_KEYS, propertiesAssigner],
|
|
@@ -387,7 +394,7 @@ export function createMerger({ mergePatterns = simplePatternsMerger, isSubRegExp
|
|
|
387
394
|
let target = { ...left };
|
|
388
395
|
const assigners = new Set();
|
|
389
396
|
const checks = new Set();
|
|
390
|
-
const rKeys =
|
|
397
|
+
const rKeys = Reflect.ownKeys(right);
|
|
391
398
|
const l = rKeys.length;
|
|
392
399
|
for (let i = 0; i < l; i++) {
|
|
393
400
|
const rKey = rKeys[i];
|
|
@@ -451,11 +458,12 @@ export function createMerger({ mergePatterns = simplePatternsMerger, isSubRegExp
|
|
|
451
458
|
else if (isAArr || isBArr) {
|
|
452
459
|
const r = new Set();
|
|
453
460
|
if (isAArr && isBArr) {
|
|
454
|
-
|
|
455
|
-
|
|
456
|
-
|
|
461
|
+
createPairCombinations(a, b, (x, y) => {
|
|
462
|
+
const type = intersectSchemaTypes(x, y);
|
|
463
|
+
if (type !== undefined) {
|
|
464
|
+
r.add(type);
|
|
457
465
|
}
|
|
458
|
-
}
|
|
466
|
+
});
|
|
459
467
|
}
|
|
460
468
|
else {
|
|
461
469
|
const arr = (isAArr ? a : b);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge.js","sourceRoot":"","sources":["../../../../src/lib/json-schema/merge/merge.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"merge.js","sourceRoot":"","sources":["../../../../src/lib/json-schema/merge/merge.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,6 @@ export function legacyPatternsMerger(a, b) {
|
|
|
2
2
|
return a === b ? a : `(?=${a})(?=${b})`;
|
|
3
3
|
}
|
|
4
4
|
export function simplePatternsMerger(a, b) {
|
|
5
|
-
return a === b ? a :
|
|
5
|
+
return a === b ? a : `(?=.*(?:${a}))(?=.*(?:${b}))`;
|
|
6
6
|
}
|
|
7
7
|
//# sourceMappingURL=patterns.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"patterns.js","sourceRoot":"","sources":["../../../../src/lib/json-schema/merge/patterns.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,oBAAoB,CAAC,CAAS,EAAE,CAAS;IACvD,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC;AAC1C,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,CAAS,EAAE,CAAS;IACvD,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"patterns.js","sourceRoot":"","sources":["../../../../src/lib/json-schema/merge/patterns.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,oBAAoB,CAAC,CAAS,EAAE,CAAS;IACvD,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC;AAC1C,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,CAAS,EAAE,CAAS;IACvD,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,aAAa,CAAC,IAAI,CAAC;AACtD,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"traverse.d.ts","sourceRoot":"","sources":["../../../src/lib/json-schema/traverse.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,WAAW,IAAI,MAAM,EACrB,qBAAqB,IAAI,gBAAgB,EAC1C,MAAM,aAAa,CAAC;AAErB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAE/C,OAAO,KAAK,EACV,eAAe,EACf,YAAY,EACZ,kBAAkB,EAClB,mBAAmB,EACpB,MAAM,kBAAkB,CAAC;AAE1B,MAAM,MAAM,0BAA0B,GAAG,OAAO,GAAG,QAAQ,GAAG,KAAK,GAAG,MAAM,CAAC;AAE7E,MAAM,WAAW,8BAA8B,CAC7C,CAAC,SAAS,0BAA0B,EACpC,CAAC,SAAS,eAAe;IAEzB,IAAI,EAAE,CAAC,CAAC;IACR,IAAI,EAAE,kBAAkB,SAAS,CAAC,GAAG,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,GAAG,MAAM,EAAE,CAAC;CACxE;AAED,MAAM,WAAW,2BAA2B,
|
|
1
|
+
{"version":3,"file":"traverse.d.ts","sourceRoot":"","sources":["../../../src/lib/json-schema/traverse.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,WAAW,IAAI,MAAM,EACrB,qBAAqB,IAAI,gBAAgB,EAC1C,MAAM,aAAa,CAAC;AAErB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAE/C,OAAO,KAAK,EACV,eAAe,EACf,YAAY,EACZ,kBAAkB,EAClB,mBAAmB,EACpB,MAAM,kBAAkB,CAAC;AAE1B,MAAM,MAAM,0BAA0B,GAAG,OAAO,GAAG,QAAQ,GAAG,KAAK,GAAG,MAAM,CAAC;AAE7E,MAAM,WAAW,8BAA8B,CAC7C,CAAC,SAAS,0BAA0B,EACpC,CAAC,SAAS,eAAe;IAEzB,IAAI,EAAE,CAAC,CAAC;IACR,IAAI,EAAE,kBAAkB,SAAS,CAAC,GAAG,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,GAAG,MAAM,EAAE,CAAC;CACxE;AAED,MAAM,WAAW,2BAA2B,CAC1C,CAAC,SAAS,eAAe,CACzB,SAAQ,8BAA8B,CAAC,OAAO,EAAE,CAAC,CAAC;IAClD,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,kBAAkB,GAAG,CAAC,CAAC;IAC5B,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,4BAA4B,CAC3C,CAAC,SAAS,eAAe,CACzB,SAAQ,8BAA8B,CAAC,QAAQ,EAAE,CAAC,CAAC;IACnD,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,mBAAmB,GAAG,CAAC,CAAC;IAC7B,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,yBAAyB,CACxC,CAAC,SAAS,eAAe,CACzB,SAAQ,8BAA8B,CAAC,KAAK,EAAE,CAAC,CAAC;IAChD,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,YAAY,GAAG,CAAC,CAAC;CACvB;AACD,MAAM,WAAW,0BAA0B,CACzC,CAAC,SAAS,eAAe,CACzB,SAAQ,8BAA8B,CAAC,MAAM,EAAE,CAAC,CAAC;CAAG;AAEtD,MAAM,MAAM,sBAAsB,CAAC,CAAC,SAAS,eAAe,IACxD,2BAA2B,CAAC,CAAC,CAAC,GAC9B,4BAA4B,CAAC,CAAC,CAAC,GAC/B,yBAAyB,CAAC,CAAC,CAAC,GAC5B,0BAA0B,CAAC,CAAC,CAAC,CAAC;AAElC,MAAM,MAAM,uBAAuB,CAAC,CAAC,SAAS,eAAe,EAAE,CAAC,IAAI,OAAO,CACzE,gBAAgB,EAChB,sBAAsB,CAAC,CAAC,CAAC,EACzB,CAAC,CACF,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@x0k/json-schema-merge",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.4",
|
|
4
4
|
"description": "A minimal JSON Schema merging library.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"license": "MIT",
|
|
@@ -33,19 +33,18 @@
|
|
|
33
33
|
"access": "public"
|
|
34
34
|
},
|
|
35
35
|
"devDependencies": {
|
|
36
|
-
"@changesets/changelog-github": "^0.
|
|
37
|
-
"@changesets/cli": "^2.
|
|
36
|
+
"@changesets/changelog-github": "^0.7.0",
|
|
37
|
+
"@changesets/cli": "^2.31.0",
|
|
38
38
|
"@types/json-schema-compare": "^0.2.4",
|
|
39
39
|
"@types/json-schema-merge-allof": "^0.6.5",
|
|
40
|
-
"ajv": "^8.
|
|
41
|
-
"allof-merge": "^0.6.
|
|
40
|
+
"ajv": "^8.20.0",
|
|
41
|
+
"allof-merge": "^0.6.8",
|
|
42
42
|
"json-schema-compare": "^0.2.2",
|
|
43
43
|
"json-schema-merge-allof": "^0.8.1",
|
|
44
|
-
"prettier": "^3.
|
|
45
|
-
"publint": "^0.3.
|
|
46
|
-
"
|
|
47
|
-
"
|
|
48
|
-
"vitest": "^3.2.4"
|
|
44
|
+
"prettier": "^3.9.1",
|
|
45
|
+
"publint": "^0.3.21",
|
|
46
|
+
"typescript": "^6.0.3",
|
|
47
|
+
"vitest": "^4.1.9"
|
|
49
48
|
},
|
|
50
49
|
"dependencies": {
|
|
51
50
|
"@types/json-schema": "^7.0.15"
|