Comparing version 6.0.4 to 6.0.5-joshbwlng-dedup-required-d7e5c771fa5e10da17933e25cd1da60aa32ce77e
@@ -7,2 +7,7 @@ # Change Log | ||
# v6.0.5 | ||
## (2022-03-04) | ||
* Properly combine anyOf on merge [Josh Bowling] | ||
# v6.0.4 | ||
@@ -9,0 +14,0 @@ ## (2022-03-04) |
@@ -720,3 +720,3 @@ /* | ||
return merge(omit(mergedSchemas, 'anyOf'), anyOf) | ||
return combineAnyOf(omit(mergedSchemas, 'anyOf'), anyOf) | ||
} | ||
@@ -1374,3 +1374,3 @@ | ||
const combineSchemas = (left, right, customizer) => { | ||
// Merge fragment schema with scehma values defined at the top level | ||
// Merge fragment schema with schema values defined at the top level | ||
// - Defaults schema `type` to 'object' | ||
@@ -1377,0 +1377,0 @@ // - Removes any $id attribute, as we may be compiling the same $id |
{ | ||
"name": "skhema", | ||
"version": "6.0.4", | ||
"version": "6.0.5-joshbwlng-dedup-required-d7e5c771fa5e10da17933e25cd1da60aa32ce77e", | ||
"description": "JSON Schema utility collection", | ||
@@ -62,4 +62,4 @@ "main": "lib/index.js", | ||
"versionist": { | ||
"publishedAt": "2022-03-04T02:31:47.041Z" | ||
"publishedAt": "2022-03-04T02:46:08.944Z" | ||
} | ||
} |
@@ -780,3 +780,52 @@ [ | ||
} | ||
}, | ||
{ | ||
"schemas": [ | ||
{ | ||
"type": "object", | ||
"properties": { | ||
"type": { | ||
"type": "string" | ||
}, | ||
"data": { | ||
"type": "object" | ||
} | ||
}, | ||
"required": [ "type", "data" ] | ||
}, | ||
{ | ||
"type": "object", | ||
"anyOf": [ | ||
{ | ||
"type": "object", | ||
"properties": { | ||
"name": { | ||
"type": "string" | ||
}, | ||
"data": { | ||
"type": "object" | ||
} | ||
}, | ||
"required": [ "name", "data" ] | ||
} | ||
] | ||
} | ||
], | ||
"expected": { | ||
"type": "object", | ||
"additionalProperties": true, | ||
"properties": { | ||
"type": { | ||
"type": "string" | ||
}, | ||
"name": { | ||
"type": "string" | ||
}, | ||
"data": { | ||
"type": "object" | ||
} | ||
}, | ||
"required": [ "data", "name", "type" ] | ||
} | ||
} | ||
] |
Sorry, the diff of this file is not supported yet
No v1
QualityPackage is not semver >=1. This means it is not stable and does not support ^ ranges.
Found 1 instance in 1 package
167594
5304
1