@redocly/openapi-core 2.18.1 → 2.18.2
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/lib/rules/ajv.d.ts +4 -1
- package/lib/rules/ajv.d.ts.map +1 -1
- package/lib/rules/ajv.js +33 -16
- package/lib/rules/ajv.js.map +1 -1
- package/lib/rules/utils.d.ts.map +1 -1
- package/lib/rules/utils.js +2 -1
- package/lib/rules/utils.js.map +1 -1
- package/package.json +1 -1
package/lib/rules/ajv.d.ts
CHANGED
|
@@ -1,13 +1,16 @@
|
|
|
1
1
|
import type { ErrorObject, Context as AjvContext } from '@redocly/ajv/dist/2020.js';
|
|
2
2
|
import type { Location } from '../ref-utils.js';
|
|
3
3
|
import type { ResolveFn } from '../walk.js';
|
|
4
|
+
import type { SpecVersion } from '../oas-types.js';
|
|
5
|
+
import type { Oas3Schema, Oas3_1Schema } from '../typings/openapi.js';
|
|
4
6
|
export declare function releaseAjvInstance(): void;
|
|
5
|
-
export declare function validateJsonSchema(data:
|
|
7
|
+
export declare function validateJsonSchema(data: unknown, schema: Oas3Schema | Oas3_1Schema, options: {
|
|
6
8
|
schemaLoc: Location;
|
|
7
9
|
instancePath: string;
|
|
8
10
|
resolve: ResolveFn;
|
|
9
11
|
allowAdditionalProperties: boolean;
|
|
10
12
|
ajvContext?: AjvContext;
|
|
13
|
+
specVersion: SpecVersion;
|
|
11
14
|
}): {
|
|
12
15
|
valid: boolean;
|
|
13
16
|
errors: (ErrorObject & {
|
package/lib/rules/ajv.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ajv.d.ts","sourceRoot":"","sources":["../../src/rules/ajv.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ajv.d.ts","sourceRoot":"","sources":["../../src/rules/ajv.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,WAAW,EAEX,OAAO,IAAI,UAAU,EAEtB,MAAM,2BAA2B,CAAC;AACnC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAOtE,wBAAgB,kBAAkB,SAGjC;AAuED,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,OAAO,EACb,MAAM,EAAE,UAAU,GAAG,YAAY,EACjC,OAAO,EAAE;IACP,SAAS,EAAE,QAAQ,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,SAAS,CAAC;IACnB,yBAAyB,EAAE,OAAO,CAAC;IACnC,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,WAAW,EAAE,WAAW,CAAC;CAC1B,GACA;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,CAAC,WAAW,GAAG;QAAE,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC,EAAE,CAAA;CAAE,CAkDtE"}
|
package/lib/rules/ajv.js
CHANGED
|
@@ -1,14 +1,25 @@
|
|
|
1
1
|
import addFormats from 'ajv-formats';
|
|
2
|
-
import
|
|
2
|
+
import Ajv2020 from '@redocly/ajv/dist/2020.js';
|
|
3
|
+
import AjvDraft4 from '@redocly/ajv/dist/draft4.js';
|
|
3
4
|
import { escapePointerFragment } from '../ref-utils.js';
|
|
4
|
-
|
|
5
|
+
const ajvInstances = {};
|
|
5
6
|
export function releaseAjvInstance() {
|
|
6
|
-
|
|
7
|
+
ajvInstances['2020'] = undefined;
|
|
8
|
+
ajvInstances['draft4'] = undefined;
|
|
7
9
|
}
|
|
8
|
-
function
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
10
|
+
function getSchemaIdKey(dialect) {
|
|
11
|
+
return dialect === 'draft4' ? 'id' : '$id';
|
|
12
|
+
}
|
|
13
|
+
function getDialectBySpecVersion(specVersion) {
|
|
14
|
+
if (specVersion === 'oas2' || specVersion === 'oas3_0')
|
|
15
|
+
return 'draft4';
|
|
16
|
+
return '2020';
|
|
17
|
+
}
|
|
18
|
+
function getAjv(resolve, dialect) {
|
|
19
|
+
if (!ajvInstances[dialect]) {
|
|
20
|
+
const schemaIdKey = getSchemaIdKey(dialect);
|
|
21
|
+
const options = {
|
|
22
|
+
schemaId: schemaIdKey,
|
|
12
23
|
meta: true,
|
|
13
24
|
allErrors: true,
|
|
14
25
|
strictSchema: false,
|
|
@@ -24,28 +35,34 @@ function getAjv(resolve) {
|
|
|
24
35
|
if (!resolvedRef || !resolvedRef.location)
|
|
25
36
|
return false;
|
|
26
37
|
return {
|
|
27
|
-
|
|
38
|
+
[schemaIdKey]: encodeURI(resolvedRef.location.source.absoluteRef) + '#' + $id,
|
|
28
39
|
...resolvedRef.node,
|
|
29
40
|
};
|
|
30
41
|
},
|
|
31
42
|
logger: false,
|
|
32
|
-
}
|
|
33
|
-
|
|
43
|
+
};
|
|
44
|
+
ajvInstances[dialect] = dialect === '2020' ? new Ajv2020(options) : new AjvDraft4(options);
|
|
45
|
+
addFormats(ajvInstances[dialect]);
|
|
34
46
|
}
|
|
35
|
-
return
|
|
47
|
+
return ajvInstances[dialect];
|
|
36
48
|
}
|
|
37
|
-
function getAjvValidator(schema, loc, resolve, allowAdditionalProperties) {
|
|
38
|
-
const ajv = getAjv(resolve);
|
|
49
|
+
function getAjvValidator(schema, loc, resolve, allowAdditionalProperties, dialect) {
|
|
50
|
+
const ajv = getAjv(resolve, dialect);
|
|
39
51
|
const $id = encodeURI(loc.absolutePointer);
|
|
52
|
+
const schemaIdKey = getSchemaIdKey(dialect);
|
|
40
53
|
if (!ajv.getSchema($id)) {
|
|
41
54
|
ajv.setDefaultUnevaluatedProperties(allowAdditionalProperties);
|
|
42
|
-
ajv.addSchema({
|
|
55
|
+
ajv.addSchema({
|
|
56
|
+
[schemaIdKey]: $id,
|
|
57
|
+
...schema,
|
|
58
|
+
}, $id);
|
|
43
59
|
}
|
|
44
60
|
return ajv.getSchema($id);
|
|
45
61
|
}
|
|
46
62
|
export function validateJsonSchema(data, schema, options) {
|
|
47
|
-
const { schemaLoc, instancePath, resolve, allowAdditionalProperties, ajvContext } = options;
|
|
48
|
-
const
|
|
63
|
+
const { schemaLoc, instancePath, resolve, allowAdditionalProperties, ajvContext, specVersion } = options;
|
|
64
|
+
const dialect = getDialectBySpecVersion(specVersion);
|
|
65
|
+
const validate = getAjvValidator(schema, schemaLoc, resolve, allowAdditionalProperties, dialect);
|
|
49
66
|
if (!validate)
|
|
50
67
|
return { valid: true, errors: [] }; // unresolved refs are reported
|
|
51
68
|
const dataCxt = {
|
package/lib/rules/ajv.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ajv.js","sourceRoot":"","sources":["../../src/rules/ajv.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,aAAa,CAAC;AACrC,OAAO,
|
|
1
|
+
{"version":3,"file":"ajv.js","sourceRoot":"","sources":["../../src/rules/ajv.ts"],"names":[],"mappings":"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"}
|
package/lib/rules/utils.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/rules/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAI3C,OAAO,KAAK,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvE,OAAO,KAAK,EACV,UAAU,EACV,OAAO,EACP,SAAS,EACT,YAAY,EACZ,UAAU,EACX,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C,wBAAgB,SAAS,CAAC,KAAK,EAAE,OAAO,8HAUvC;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,GAAG,OAAO,CAiB9F;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAExE;AAED,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAIjF;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAEjE;AAED,wBAAgB,0BAA0B,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,WAAW,QAgBzF;AAED,wBAAgB,+BAA+B,CAC7C,UAAU,EAAE,MAAM,EAAE,EACpB,KAAK,EAAE,GAAG,EACV,GAAG,EAAE,WAAW,QAqBjB;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAkBtE;AAED,wBAAgB,eAAe,CAC7B,OAAO,EAAE,GAAG,EACZ,MAAM,EAAE,UAAU,CAAC,UAAU,GAAG,YAAY,CAAC,EAC7C,OAAO,EAAE;IACP,QAAQ,EAAE,QAAQ,CAAC;IACnB,GAAG,EAAE,WAAW,CAAC;IACjB,yBAAyB,EAAE,OAAO,CAAC;IACnC,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/rules/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAI3C,OAAO,KAAK,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvE,OAAO,KAAK,EACV,UAAU,EACV,OAAO,EACP,SAAS,EACT,YAAY,EACZ,UAAU,EACX,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C,wBAAgB,SAAS,CAAC,KAAK,EAAE,OAAO,8HAUvC;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,GAAG,OAAO,CAiB9F;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAExE;AAED,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAIjF;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAEjE;AAED,wBAAgB,0BAA0B,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,WAAW,QAgBzF;AAED,wBAAgB,+BAA+B,CAC7C,UAAU,EAAE,MAAM,EAAE,EACpB,KAAK,EAAE,GAAG,EACV,GAAG,EAAE,WAAW,QAqBjB;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAkBtE;AAED,wBAAgB,eAAe,CAC7B,OAAO,EAAE,GAAG,EACZ,MAAM,EAAE,UAAU,CAAC,UAAU,GAAG,YAAY,CAAC,EAC7C,OAAO,EAAE;IACP,QAAQ,EAAE,QAAQ,CAAC;IACnB,GAAG,EAAE,WAAW,CAAC;IACjB,yBAAyB,EAAE,OAAO,CAAC;IACnC,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB,QAsCF;AAED,wBAAgB,sBAAsB,CACpC,UAAU,EAAE,MAAM,EAAE,EACpB,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,QAAQ,GAAG,SAAS,EACjC,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,WAAW,QAelC;AAED,wBAAgB,qBAAqB,CACnC,aAAa,EAAE,MAAM,EAAE,EACvB,SAAS,EAAE,MAAM,EACjB,EAAE,MAAM,EAAE,EAAE,WAAW,QAgBxB;AAED,wBAAgB,UAAU,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,GAAG,SAAS,EAAE,UAAU,EAAE,OAAO,GAAG,MAAM,CAE1F"}
|
package/lib/rules/utils.js
CHANGED
|
@@ -105,7 +105,7 @@ export function getSuggest(given, variants) {
|
|
|
105
105
|
}
|
|
106
106
|
export function validateExample(example, schema, options) {
|
|
107
107
|
const { location, ctx, allowAdditionalProperties, ajvContext } = options;
|
|
108
|
-
const { resolve, location: parentLocation, report } = ctx;
|
|
108
|
+
const { resolve, location: parentLocation, report, specVersion } = ctx;
|
|
109
109
|
try {
|
|
110
110
|
const { valid, errors } = validateJsonSchema(example, schema, {
|
|
111
111
|
schemaLoc: parentLocation.child('schema'),
|
|
@@ -113,6 +113,7 @@ export function validateExample(example, schema, options) {
|
|
|
113
113
|
resolve,
|
|
114
114
|
allowAdditionalProperties,
|
|
115
115
|
ajvContext,
|
|
116
|
+
specVersion,
|
|
116
117
|
});
|
|
117
118
|
if (!valid) {
|
|
118
119
|
for (const error of errors) {
|
package/lib/rules/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/rules/utils.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/rules/utils.ts"],"names":[],"mappings":"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"}
|