@takeshape/json-schema 8.113.0 → 8.117.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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema-validator.d.ts","sourceRoot":"","sources":["../../src/schema-validator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,WAAW,EAAE,OAAO,EAAE,YAAY,EAAC,MAAM,KAAK,CAAC;AAC5D,OAAO,GAAG,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"schema-validator.d.ts","sourceRoot":"","sources":["../../src/schema-validator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,WAAW,EAAE,OAAO,EAAE,YAAY,EAAC,MAAM,KAAK,CAAC;AAC5D,OAAO,GAAG,MAAM,KAAK,CAAC;AAOtB,oBAAY,IAAI,GAAG,GAAG,CAAC;AAEvB,MAAM,WAAW,cAAc;IAC7B,aAAa,EAAE,OAAO,CAAC;IACvB,WAAW,EAAE,OAAO,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,cAAc;IAC7B,KAAK,EAAE,OAAO,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,WAAW,EAAE,CAAC;CACvB;AAED,oBAAY,SAAS,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,KAAK,cAAc,CAAC;AAE1F,wBAAgB,aAAa,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,EAAE,CAE5D;AAwBD,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,WAAW,GAAG,OAAO,CAW3F;AAcD,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAE/C;AAMD;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,cAAc,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,YAAY,GAAG,SAAS,CA6B/G;AAED,oBAAY,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,UAAU,GAAG,QAAQ,GAAG,WAAW,GAAG,YAAY,CAAC,CAAC;AAMvF,wBAAgB,QAAQ,CAAC,GAAG,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,GAAG,cAAc,CA2BnH;AAED,OAAO,EAAC,GAAG,EAAE,WAAW,EAAC,CAAC;AAC1B,wBAAgB,SAAS,CAAC,OAAO,CAAC,EAAE,OAAO,GAAG,GAAG,CAmBhD;AAeD;;;GAGG;AACH,wBAAgB,SAAS,CAAC,MAAM,EAAE,YAAY,GAAG,YAAY,CAmB5D;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,YAAY,GAAG,YAAY,EAAE,EACrC,WAAW,GAAE,YAAY,EAAO,EAChC,OAAO,GAAE,OAAY,GACpB,SAAS,CAqBX"}
|
package/dist/schema-validator.js
CHANGED
|
@@ -24,16 +24,10 @@ var _ajvFormats = _interopRequireDefault(require("ajv-formats"));
|
|
|
24
24
|
|
|
25
25
|
var _get = _interopRequireDefault(require("lodash/get"));
|
|
26
26
|
|
|
27
|
-
var _set = _interopRequireDefault(require("lodash/set"));
|
|
28
|
-
|
|
29
27
|
var _unset = _interopRequireDefault(require("lodash/unset"));
|
|
30
28
|
|
|
31
|
-
var _isObject = _interopRequireDefault(require("lodash/isObject"));
|
|
32
|
-
|
|
33
29
|
var _isString = _interopRequireDefault(require("lodash/isString"));
|
|
34
30
|
|
|
35
|
-
var _isArray = _interopRequireDefault(require("lodash/isArray"));
|
|
36
|
-
|
|
37
31
|
var _util = require("@takeshape/util");
|
|
38
32
|
|
|
39
33
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
@@ -228,18 +222,6 @@ function fixSchema(schema) {
|
|
|
228
222
|
if (parent.type === 'string' && (!(0, _isString.default)(value) || !isValidRegex(value))) {
|
|
229
223
|
(0, _unset.default)(schema, path);
|
|
230
224
|
}
|
|
231
|
-
} // Inline $refs inside definitions that use discriminator
|
|
232
|
-
// https://github.com/ajv-validator/ajv/issues/1899
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
if (key === 'oneOf' && (0, _isArray.default)(value)) {
|
|
236
|
-
if ((0, _isObject.default)(parent.discriminator) && path[0] === 'definitions') {
|
|
237
|
-
for (const [index, subschema] of value.entries()) {
|
|
238
|
-
if (subschema.$ref) {
|
|
239
|
-
(0, _set.default)(schema, [...path, index], (0, _get.default)(schema, subschema.$ref.substr(2).split('/')));
|
|
240
|
-
}
|
|
241
|
-
}
|
|
242
|
-
}
|
|
243
225
|
}
|
|
244
226
|
});
|
|
245
227
|
return schema;
|
package/es/schema-validator.js
CHANGED
|
@@ -1,11 +1,8 @@
|
|
|
1
1
|
import Ajv from 'ajv';
|
|
2
2
|
import addFormats from 'ajv-formats';
|
|
3
3
|
import get from 'lodash/get';
|
|
4
|
-
import set from 'lodash/set';
|
|
5
4
|
import unset from 'lodash/unset';
|
|
6
|
-
import isObject from 'lodash/isObject';
|
|
7
5
|
import isString from 'lodash/isString';
|
|
8
|
-
import isArray from 'lodash/isArray';
|
|
9
6
|
import { visit } from '@takeshape/util';
|
|
10
7
|
export function parseDataPath(instancePath) {
|
|
11
8
|
return instancePath.substr(1).split('/');
|
|
@@ -196,18 +193,6 @@ export function fixSchema(schema) {
|
|
|
196
193
|
if (parent.type === 'string' && (!isString(value) || !isValidRegex(value))) {
|
|
197
194
|
unset(schema, path);
|
|
198
195
|
}
|
|
199
|
-
} // Inline $refs inside definitions that use discriminator
|
|
200
|
-
// https://github.com/ajv-validator/ajv/issues/1899
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
if (key === 'oneOf' && isArray(value)) {
|
|
204
|
-
if (isObject(parent.discriminator) && path[0] === 'definitions') {
|
|
205
|
-
for (const [index, subschema] of value.entries()) {
|
|
206
|
-
if (subschema.$ref) {
|
|
207
|
-
set(schema, [...path, index], get(schema, subschema.$ref.substr(2).split('/')));
|
|
208
|
-
}
|
|
209
|
-
}
|
|
210
|
-
}
|
|
211
196
|
}
|
|
212
197
|
});
|
|
213
198
|
return schema;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@takeshape/json-schema",
|
|
3
|
-
"version": "8.
|
|
3
|
+
"version": "8.117.0",
|
|
4
4
|
"description": "JSON Schema validator",
|
|
5
5
|
"homepage": "https://www.takeshape.io",
|
|
6
6
|
"repository": {
|
|
@@ -20,8 +20,8 @@
|
|
|
20
20
|
"es"
|
|
21
21
|
],
|
|
22
22
|
"dependencies": {
|
|
23
|
-
"@takeshape/util": "8.
|
|
24
|
-
"ajv": "^8.
|
|
23
|
+
"@takeshape/util": "8.117.0",
|
|
24
|
+
"ajv": "^8.11.0",
|
|
25
25
|
"ajv-formats": "^2.1.1",
|
|
26
26
|
"lodash": "^4.17.21"
|
|
27
27
|
},
|