Comparing version 6.0.4-joshbwlng-dedup-required-bdc05fb0f81f4ed4764b90d28b627bec3fcb6c7f to 6.0.4-joshbwlng-fix-tests-1092785c9d7fdd614c3e2a5b08e5972b747858d2
@@ -8,5 +8,5 @@ # Change Log | ||
# v6.0.4 | ||
## (2022-03-03) | ||
## (2022-03-04) | ||
* Deduplicate required arrays on merge [Josh Bowling] | ||
* Fix failing test [Josh Bowling] | ||
@@ -13,0 +13,0 @@ # v6.0.3 |
@@ -30,3 +30,2 @@ /* | ||
intersection, | ||
isArray, | ||
isString, | ||
@@ -722,8 +721,3 @@ isUndefined, | ||
// Deduplicate required array values | ||
const merged = merge(omit(mergedSchemas, 'anyOf'), anyOf) | ||
if (isArray(merged.required) && merged.required.length > 1) { | ||
merged.required = uniq(merged.required) | ||
} | ||
return merged | ||
return merge(omit(mergedSchemas, 'anyOf'), anyOf) | ||
} | ||
@@ -730,0 +724,0 @@ |
const concat = require('lodash/concat') | ||
const intersection = require('lodash/intersection') | ||
const isArray = require('lodash/isArray') | ||
const mapValues = require('lodash/mapValues') | ||
@@ -35,3 +34,2 @@ const merge = require('lodash/merge') | ||
exports.intersection = intersection | ||
exports.isArray = isArray | ||
exports.mapValues = mapValues | ||
@@ -38,0 +36,0 @@ exports.merge = merge |
{ | ||
"name": "skhema", | ||
"version": "6.0.4-joshbwlng-dedup-required-bdc05fb0f81f4ed4764b90d28b627bec3fcb6c7f", | ||
"version": "6.0.4-joshbwlng-fix-tests-1092785c9d7fdd614c3e2a5b08e5972b747858d2", | ||
"description": "JSON Schema utility collection", | ||
@@ -62,4 +62,4 @@ "main": "lib/index.js", | ||
"versionist": { | ||
"publishedAt": "2022-03-03T04:36:13.206Z" | ||
"publishedAt": "2022-03-04T02:19:25.475Z" | ||
} | ||
} |
@@ -118,3 +118,3 @@ /* | ||
const result = skhema.match({ | ||
hello: 'foobar' | ||
required: 'foobar' | ||
}, { | ||
@@ -121,0 +121,0 @@ foo: 'bar' |
Sorry, the diff of this file is not supported yet
166340
5255