@redocly/openapi-core 2.32.0 → 2.32.1
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/lint.d.ts.map +1 -1
- package/lib/lint.js +0 -2
- package/lib/lint.js.map +1 -1
- package/lib/rules/ajv.d.ts +18 -14
- package/lib/rules/ajv.d.ts.map +1 -1
- package/lib/rules/ajv.js +86 -88
- package/lib/rules/ajv.js.map +1 -1
- package/lib/rules/common/no-invalid-parameter-examples.d.ts.map +1 -1
- package/lib/rules/common/no-invalid-parameter-examples.js +4 -0
- package/lib/rules/common/no-invalid-parameter-examples.js.map +1 -1
- package/lib/rules/common/no-invalid-schema-examples.d.ts.map +1 -1
- package/lib/rules/common/no-invalid-schema-examples.js +4 -0
- package/lib/rules/common/no-invalid-schema-examples.js.map +1 -1
- package/lib/rules/oas3/no-invalid-media-type-examples.d.ts.map +1 -1
- package/lib/rules/oas3/no-invalid-media-type-examples.js +3 -0
- package/lib/rules/oas3/no-invalid-media-type-examples.js.map +1 -1
- package/lib/rules/utils.d.ts +2 -0
- package/lib/rules/utils.d.ts.map +1 -1
- package/lib/rules/utils.js +2 -3
- package/lib/rules/utils.js.map +1 -1
- package/package.json +1 -1
package/lib/lint.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lint.d.ts","sourceRoot":"","sources":["../src/lint.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAIhD,OAAO,EAAE,YAAY,EAA2C,KAAK,QAAQ,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"lint.d.ts","sourceRoot":"","sources":["../src/lint.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAIhD,OAAO,EAAE,YAAY,EAA2C,KAAK,QAAQ,EAAE,MAAM,cAAc,CAAC;AAGpG,OAAO,EAAkB,KAAK,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAEjE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAalD,OAAO,EAAgB,KAAK,eAAe,EAAoB,MAAM,WAAW,CAAC;AASjF,wBAAsB,IAAI,CAAC,IAAI,EAAE;IAC/B,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,mBAAmB,CAAC,EAAE,YAAY,CAAC;IACnC,eAAe,CAAC,EAAE,SAAS,CAAC;CAC7B,oDAUA;AAED,wBAAsB,cAAc,CAAC,IAAI,EAAE;IACzC,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,mBAAmB,CAAC,EAAE,YAAY,CAAC;CACpC,oDASA;AAED,wBAAsB,YAAY,CAAC,IAAI,EAAE;IACvC,QAAQ,EAAE,QAAQ,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IACvC,mBAAmB,EAAE,YAAY,CAAC;CACnC,oDAoDA;AAED,wBAAsB,UAAU,CAAC,IAAI,EAAE;IACrC,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,eAAe,CAAC;IAC3B,mBAAmB,CAAC,EAAE,YAAY,CAAC;IACnC,mBAAmB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;CAChD,oDAgEA"}
|
package/lib/lint.js
CHANGED
|
@@ -3,7 +3,6 @@ import { initRules } from './config/rules.js';
|
|
|
3
3
|
import { detectSpec, getMajorSpecVersion } from './detect-spec.js';
|
|
4
4
|
import { getTypes } from './oas-types.js';
|
|
5
5
|
import { BaseResolver, resolveDocument, makeDocumentFromString } from './resolve.js';
|
|
6
|
-
import { releaseAjvInstance } from './rules/ajv.js';
|
|
7
6
|
import { NoUnresolvedRefs } from './rules/common/no-unresolved-refs.js';
|
|
8
7
|
import { Struct } from './rules/common/struct.js';
|
|
9
8
|
import { normalizeTypes } from './types/index.js';
|
|
@@ -36,7 +35,6 @@ export async function lintFromString(opts) {
|
|
|
36
35
|
});
|
|
37
36
|
}
|
|
38
37
|
export async function lintDocument(opts) {
|
|
39
|
-
releaseAjvInstance(); // FIXME: preprocessors can modify nodes which are then cached to ajv-instance by absolute path
|
|
40
38
|
const { document, customTypes, externalRefResolver, config } = opts;
|
|
41
39
|
const specVersion = detectSpec(document.parsed);
|
|
42
40
|
const specMajorVersion = getMajorSpecVersion(specVersion);
|
package/lib/lint.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lint.js","sourceRoot":"","sources":["../src/lint.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAG1D,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACnE,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,sBAAsB,EAAiB,MAAM,cAAc,CAAC;AACpG,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"lint.js","sourceRoot":"","sources":["../src/lint.ts"],"names":[],"mappings":"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"}
|
package/lib/rules/ajv.d.ts
CHANGED
|
@@ -3,18 +3,22 @@ import type { SpecVersion } from '../oas-types.js';
|
|
|
3
3
|
import { type Location } from '../ref-utils.js';
|
|
4
4
|
import type { Oas3Schema, Oas3_1Schema } from '../typings/openapi.js';
|
|
5
5
|
import type { ResolveFn } from '../walk.js';
|
|
6
|
-
export declare
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
};
|
|
6
|
+
export declare class AjvValidator {
|
|
7
|
+
private instances;
|
|
8
|
+
validate(data: unknown, schema: Oas3Schema | Oas3_1Schema, options: {
|
|
9
|
+
schemaLoc: Location;
|
|
10
|
+
instancePath: string;
|
|
11
|
+
resolve: ResolveFn;
|
|
12
|
+
allowAdditionalProperties: boolean;
|
|
13
|
+
ajvContext?: AjvContext;
|
|
14
|
+
specVersion: SpecVersion;
|
|
15
|
+
}): {
|
|
16
|
+
valid: boolean;
|
|
17
|
+
errors: (ErrorObject & {
|
|
18
|
+
suggest?: string[];
|
|
19
|
+
})[];
|
|
20
|
+
};
|
|
21
|
+
private getAjv;
|
|
22
|
+
private getValidator;
|
|
23
|
+
}
|
|
20
24
|
//# sourceMappingURL=ajv.d.ts.map
|
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":"AAAA,OAAgB,EACd,KAAK,WAAW,EAEhB,KAAK,OAAO,IAAI,UAAU,EAE3B,MAAM,2BAA2B,CAAC;AAInC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAyB,KAAK,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AACvE,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACtE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"ajv.d.ts","sourceRoot":"","sources":["../../src/rules/ajv.ts"],"names":[],"mappings":"AAAA,OAAgB,EACd,KAAK,WAAW,EAEhB,KAAK,OAAO,IAAI,UAAU,EAE3B,MAAM,2BAA2B,CAAC;AAInC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAyB,KAAK,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AACvE,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACtE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAa5C,qBAAa,YAAY;IACvB,OAAO,CAAC,SAAS,CAAwC;IAEzD,QAAQ,CACN,IAAI,EAAE,OAAO,EACb,MAAM,EAAE,UAAU,GAAG,YAAY,EACjC,OAAO,EAAE;QACP,SAAS,EAAE,QAAQ,CAAC;QACpB,YAAY,EAAE,MAAM,CAAC;QACrB,OAAO,EAAE,SAAS,CAAC;QACnB,yBAAyB,EAAE,OAAO,CAAC;QACnC,UAAU,CAAC,EAAE,UAAU,CAAC;QACxB,WAAW,EAAE,WAAW,CAAC;KAC1B,GACA;QAAE,KAAK,EAAE,OAAO,CAAC;QAAC,MAAM,EAAE,CAAC,WAAW,GAAG;YAAE,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;SAAE,CAAC,EAAE,CAAA;KAAE;IA2DvE,OAAO,CAAC,MAAM;IAoCd,OAAO,CAAC,YAAY;CAwBrB"}
|
package/lib/rules/ajv.js
CHANGED
|
@@ -2,11 +2,6 @@ import Ajv2020 from '@redocly/ajv/dist/2020.js';
|
|
|
2
2
|
import AjvDraft4 from '@redocly/ajv/dist/draft4.js';
|
|
3
3
|
import addFormats from 'ajv-formats';
|
|
4
4
|
import { escapePointerFragment } from '../ref-utils.js';
|
|
5
|
-
const ajvInstances = {};
|
|
6
|
-
export function releaseAjvInstance() {
|
|
7
|
-
ajvInstances['2020'] = undefined;
|
|
8
|
-
ajvInstances['draft4'] = undefined;
|
|
9
|
-
}
|
|
10
5
|
function getSchemaIdKey(dialect) {
|
|
11
6
|
return dialect === 'draft4' ? 'id' : '$id';
|
|
12
7
|
}
|
|
@@ -15,93 +10,96 @@ function getDialectBySpecVersion(specVersion) {
|
|
|
15
10
|
return 'draft4';
|
|
16
11
|
return '2020';
|
|
17
12
|
}
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
const
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
loadSchemaSync(base, $ref, $id) {
|
|
33
|
-
const decodedBase = decodeURI(base.split('#')[0]);
|
|
34
|
-
const resolvedRef = resolve({ $ref }, decodedBase);
|
|
35
|
-
if (!resolvedRef || !resolvedRef.location)
|
|
36
|
-
return false;
|
|
37
|
-
return {
|
|
38
|
-
[schemaIdKey]: encodeURI(resolvedRef.location.source.absoluteRef) + '#' + $id,
|
|
39
|
-
...resolvedRef.node,
|
|
40
|
-
};
|
|
41
|
-
},
|
|
42
|
-
logger: false,
|
|
13
|
+
export class AjvValidator {
|
|
14
|
+
instances = {};
|
|
15
|
+
validate(data, schema, options) {
|
|
16
|
+
const { schemaLoc, instancePath, resolve, allowAdditionalProperties, ajvContext, specVersion } = options;
|
|
17
|
+
const dialect = getDialectBySpecVersion(specVersion);
|
|
18
|
+
const validate = this.getValidator(schema, schemaLoc, resolve, allowAdditionalProperties, dialect);
|
|
19
|
+
if (!validate)
|
|
20
|
+
return { valid: true, errors: [] }; // unresolved refs are reported
|
|
21
|
+
const dataCxt = {
|
|
22
|
+
instancePath,
|
|
23
|
+
parentData: { fake: {} },
|
|
24
|
+
parentDataProperty: 'fake',
|
|
25
|
+
rootData: {},
|
|
26
|
+
dynamicAnchors: {},
|
|
43
27
|
};
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
}
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
rootData: {},
|
|
74
|
-
dynamicAnchors: {},
|
|
75
|
-
};
|
|
76
|
-
const valid = validate.call(ajvContext ?? {}, data, dataCxt);
|
|
77
|
-
return {
|
|
78
|
-
valid: !!valid,
|
|
79
|
-
errors: (validate.errors || []).map(beatifyErrorMessage),
|
|
80
|
-
};
|
|
81
|
-
function beatifyErrorMessage(error) {
|
|
82
|
-
let message = error.message;
|
|
83
|
-
const suggest = error.keyword === 'enum' ? error.params.allowedValues : undefined;
|
|
84
|
-
if (suggest) {
|
|
85
|
-
message += ` ${suggest.map((e) => `"${e}"`).join(', ')}`;
|
|
86
|
-
}
|
|
87
|
-
if (error.keyword === 'type') {
|
|
88
|
-
message = `type ${message}`;
|
|
28
|
+
const valid = validate.call(ajvContext ?? {}, data, dataCxt);
|
|
29
|
+
return {
|
|
30
|
+
valid: !!valid,
|
|
31
|
+
errors: (validate.errors || []).map(beatifyErrorMessage),
|
|
32
|
+
};
|
|
33
|
+
function beatifyErrorMessage(error) {
|
|
34
|
+
let message = error.message;
|
|
35
|
+
const suggest = error.keyword === 'enum' ? error.params.allowedValues : undefined;
|
|
36
|
+
if (suggest) {
|
|
37
|
+
message += ` ${suggest.map((e) => `"${e}"`).join(', ')}`;
|
|
38
|
+
}
|
|
39
|
+
if (error.keyword === 'type') {
|
|
40
|
+
message = `type ${message}`;
|
|
41
|
+
}
|
|
42
|
+
const relativePath = error.instancePath.substring(instancePath.length + 1);
|
|
43
|
+
const propName = relativePath.substring(relativePath.lastIndexOf('/') + 1);
|
|
44
|
+
if (propName) {
|
|
45
|
+
message = `\`${propName}\` property ${message}`;
|
|
46
|
+
}
|
|
47
|
+
if (error.keyword === 'additionalProperties' || error.keyword === 'unevaluatedProperties') {
|
|
48
|
+
const property = error.params.additionalProperty || error.params.unevaluatedProperty;
|
|
49
|
+
message = `${message} \`${property}\``;
|
|
50
|
+
error.instancePath += '/' + escapePointerFragment(property);
|
|
51
|
+
}
|
|
52
|
+
return {
|
|
53
|
+
...error,
|
|
54
|
+
message,
|
|
55
|
+
suggest,
|
|
56
|
+
};
|
|
89
57
|
}
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
if (
|
|
93
|
-
|
|
58
|
+
}
|
|
59
|
+
getAjv(resolve, dialect) {
|
|
60
|
+
if (!this.instances[dialect]) {
|
|
61
|
+
const schemaIdKey = getSchemaIdKey(dialect);
|
|
62
|
+
const options = {
|
|
63
|
+
schemaId: schemaIdKey,
|
|
64
|
+
meta: true,
|
|
65
|
+
allErrors: true,
|
|
66
|
+
strictSchema: false,
|
|
67
|
+
inlineRefs: false,
|
|
68
|
+
validateSchema: false,
|
|
69
|
+
discriminator: true,
|
|
70
|
+
allowUnionTypes: true,
|
|
71
|
+
validateFormats: true,
|
|
72
|
+
passContext: true,
|
|
73
|
+
loadSchemaSync(base, $ref, $id) {
|
|
74
|
+
const decodedBase = decodeURI(base.split('#')[0]);
|
|
75
|
+
const resolvedRef = resolve({ $ref }, decodedBase);
|
|
76
|
+
if (!resolvedRef || !resolvedRef.location)
|
|
77
|
+
return false;
|
|
78
|
+
return {
|
|
79
|
+
[schemaIdKey]: encodeURI(resolvedRef.location.source.absoluteRef) + '#' + $id,
|
|
80
|
+
...resolvedRef.node,
|
|
81
|
+
};
|
|
82
|
+
},
|
|
83
|
+
logger: false,
|
|
84
|
+
};
|
|
85
|
+
this.instances[dialect] =
|
|
86
|
+
dialect === '2020' ? new Ajv2020(options) : new AjvDraft4(options);
|
|
87
|
+
addFormats(this.instances[dialect]);
|
|
94
88
|
}
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
89
|
+
return this.instances[dialect];
|
|
90
|
+
}
|
|
91
|
+
getValidator(schema, loc, resolve, allowAdditionalProperties, dialect) {
|
|
92
|
+
const ajv = this.getAjv(resolve, dialect);
|
|
93
|
+
const $id = encodeURI(loc.absolutePointer);
|
|
94
|
+
const schemaIdKey = getSchemaIdKey(dialect);
|
|
95
|
+
if (!ajv.getSchema($id)) {
|
|
96
|
+
ajv.setDefaultUnevaluatedProperties(allowAdditionalProperties);
|
|
97
|
+
ajv.addSchema({
|
|
98
|
+
[schemaIdKey]: $id,
|
|
99
|
+
...schema,
|
|
100
|
+
}, $id);
|
|
99
101
|
}
|
|
100
|
-
return
|
|
101
|
-
...error,
|
|
102
|
-
message,
|
|
103
|
-
suggest,
|
|
104
|
-
};
|
|
102
|
+
return ajv.getSchema($id);
|
|
105
103
|
}
|
|
106
104
|
}
|
|
107
105
|
//# sourceMappingURL=ajv.js.map
|
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,OAKN,MAAM,2BAA2B,CAAC;AACnC,OAAO,SAAS,MAAM,6BAA6B,CAAC;AACpD,OAAO,UAAU,MAAM,aAAa,CAAC;AAGrC,OAAO,EAAE,qBAAqB,EAAiB,MAAM,iBAAiB,CAAC;AAMvE,
|
|
1
|
+
{"version":3,"file":"ajv.js","sourceRoot":"","sources":["../../src/rules/ajv.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"no-invalid-parameter-examples.d.ts","sourceRoot":"","sources":["../../../src/rules/common/no-invalid-parameter-examples.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"no-invalid-parameter-examples.d.ts","sourceRoot":"","sources":["../../../src/rules/common/no-invalid-parameter-examples.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAK5D,eAAO,MAAM,0BAA0B,EAAE,QAAQ,GAAG,QAyCnD,CAAC"}
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import { isDefined } from '../../utils/is-defined.js';
|
|
2
2
|
import { isPlainObject } from '../../utils/is-plain-object.js';
|
|
3
|
+
import { AjvValidator } from '../ajv.js';
|
|
3
4
|
import { validateExample } from '../utils.js';
|
|
4
5
|
export const NoInvalidParameterExamples = (opts) => {
|
|
6
|
+
const validator = new AjvValidator();
|
|
5
7
|
return {
|
|
6
8
|
Parameter: {
|
|
7
9
|
leave(parameter, ctx) {
|
|
@@ -12,6 +14,7 @@ export const NoInvalidParameterExamples = (opts) => {
|
|
|
12
14
|
options: {
|
|
13
15
|
location: ctx.location.child('example'),
|
|
14
16
|
ctx,
|
|
17
|
+
validator,
|
|
15
18
|
allowAdditionalProperties: !!opts.allowAdditionalProperties,
|
|
16
19
|
ajvContext: { apiContext: 'request' },
|
|
17
20
|
},
|
|
@@ -27,6 +30,7 @@ export const NoInvalidParameterExamples = (opts) => {
|
|
|
27
30
|
options: {
|
|
28
31
|
location: ctx.location.child(['examples', key]),
|
|
29
32
|
ctx,
|
|
33
|
+
validator,
|
|
30
34
|
allowAdditionalProperties: !!opts.allowAdditionalProperties,
|
|
31
35
|
ajvContext: { apiContext: 'request' },
|
|
32
36
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"no-invalid-parameter-examples.js","sourceRoot":"","sources":["../../../src/rules/common/no-invalid-parameter-examples.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAG/D,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,MAAM,CAAC,MAAM,0BAA0B,GAAwB,CAAC,IAAI,EAAE,EAAE;IACtE,OAAO;QACL,SAAS,EAAE;YACT,KAAK,CAAC,SAAwB,EAAE,GAAgB;gBAC9C,IAAI,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC;oBACjC,eAAe,CAAC;wBACd,OAAO,EAAE,SAAS,CAAC,OAAO;wBAC1B,MAAM,EAAE,SAAS,CAAC,MAAO;wBACzB,OAAO,EAAE;4BACP,QAAQ,EAAE,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,SAAS,CAAC;4BACvC,GAAG;4BACH,yBAAyB,EAAE,CAAC,CAAC,IAAI,CAAC,yBAAyB;4BAC3D,UAAU,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE;yBACtC;wBACD,SAAS,EAAE,sEAAsE;qBAClF,CAAC,CAAC;gBACL,CAAC;gBAED,IAAI,aAAa,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;oBACtC,KAAK,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;wBAChE,IAAI,aAAa,CAAC,OAAO,CAAC,IAAI,OAAO,IAAI,OAAO,EAAE,CAAC;4BACjD,eAAe,CAAC;gCACd,OAAO,EAAE,OAAO,CAAC,KAAK;gCACtB,MAAM,EAAE,SAAS,CAAC,MAAO;gCACzB,OAAO,EAAE;oCACP,QAAQ,EAAE,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;oCAC/C,GAAG;oCACH,yBAAyB,EAAE,CAAC,CAAC,IAAI,CAAC,yBAAyB;oCAC3D,UAAU,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE;iCACtC;gCACD,SAAS,EAAE,sEAAsE;6BAClF,CAAC,CAAC;wBACL,CAAC;oBACH,CAAC;gBACH,CAAC;YACH,CAAC;SACF;KACF,CAAC;AACJ,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"no-invalid-parameter-examples.js","sourceRoot":"","sources":["../../../src/rules/common/no-invalid-parameter-examples.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAG/D,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,MAAM,CAAC,MAAM,0BAA0B,GAAwB,CAAC,IAAI,EAAE,EAAE;IACtE,MAAM,SAAS,GAAG,IAAI,YAAY,EAAE,CAAC;IACrC,OAAO;QACL,SAAS,EAAE;YACT,KAAK,CAAC,SAAwB,EAAE,GAAgB;gBAC9C,IAAI,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC;oBACjC,eAAe,CAAC;wBACd,OAAO,EAAE,SAAS,CAAC,OAAO;wBAC1B,MAAM,EAAE,SAAS,CAAC,MAAO;wBACzB,OAAO,EAAE;4BACP,QAAQ,EAAE,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,SAAS,CAAC;4BACvC,GAAG;4BACH,SAAS;4BACT,yBAAyB,EAAE,CAAC,CAAC,IAAI,CAAC,yBAAyB;4BAC3D,UAAU,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE;yBACtC;wBACD,SAAS,EAAE,sEAAsE;qBAClF,CAAC,CAAC;gBACL,CAAC;gBAED,IAAI,aAAa,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;oBACtC,KAAK,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;wBAChE,IAAI,aAAa,CAAC,OAAO,CAAC,IAAI,OAAO,IAAI,OAAO,EAAE,CAAC;4BACjD,eAAe,CAAC;gCACd,OAAO,EAAE,OAAO,CAAC,KAAK;gCACtB,MAAM,EAAE,SAAS,CAAC,MAAO;gCACzB,OAAO,EAAE;oCACP,QAAQ,EAAE,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;oCAC/C,GAAG;oCACH,SAAS;oCACT,yBAAyB,EAAE,CAAC,CAAC,IAAI,CAAC,yBAAyB;oCAC3D,UAAU,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE;iCACtC;gCACD,SAAS,EAAE,sEAAsE;6BAClF,CAAC,CAAC;wBACL,CAAC;oBACH,CAAC;gBACH,CAAC;YACH,CAAC;SACF;KACF,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"no-invalid-schema-examples.d.ts","sourceRoot":"","sources":["../../../src/rules/common/no-invalid-schema-examples.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"no-invalid-schema-examples.d.ts","sourceRoot":"","sources":["../../../src/rules/common/no-invalid-schema-examples.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAK5D,eAAO,MAAM,uBAAuB,EAAE,QAAQ,GAAG,QAgDhD,CAAC"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { isDefined } from '../../utils/is-defined.js';
|
|
2
|
+
import { AjvValidator } from '../ajv.js';
|
|
2
3
|
import { validateExample } from '../utils.js';
|
|
3
4
|
export const NoInvalidSchemaExamples = (opts) => {
|
|
5
|
+
const validator = new AjvValidator();
|
|
4
6
|
return {
|
|
5
7
|
Schema: {
|
|
6
8
|
leave(schema, ctx) {
|
|
@@ -13,6 +15,7 @@ export const NoInvalidSchemaExamples = (opts) => {
|
|
|
13
15
|
options: {
|
|
14
16
|
location: ctx.location.child(['examples', examples.indexOf(example)]),
|
|
15
17
|
ctx,
|
|
18
|
+
validator,
|
|
16
19
|
allowAdditionalProperties: !!opts.allowAdditionalProperties,
|
|
17
20
|
},
|
|
18
21
|
reference: 'https://redocly.com/docs/cli/rules/oas/no-invalid-schema-examples',
|
|
@@ -32,6 +35,7 @@ export const NoInvalidSchemaExamples = (opts) => {
|
|
|
32
35
|
options: {
|
|
33
36
|
location: ctx.location.child('example'),
|
|
34
37
|
ctx,
|
|
38
|
+
validator,
|
|
35
39
|
allowAdditionalProperties: !!opts.allowAdditionalProperties,
|
|
36
40
|
},
|
|
37
41
|
reference: 'https://redocly.com/docs/cli/rules/oas/no-invalid-schema-examples',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"no-invalid-schema-examples.js","sourceRoot":"","sources":["../../../src/rules/common/no-invalid-schema-examples.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAGtD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,MAAM,CAAC,MAAM,uBAAuB,GAAwB,CAAC,IAAI,EAAE,EAAE;IACnE,OAAO;QACL,MAAM,EAAE;YACN,KAAK,CAAC,MAAiC,EAAE,GAAgB;gBACvD,MAAM,QAAQ,GAAI,MAAuB,CAAC,QAAQ,CAAC;gBAEnD,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;oBAC5B,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;wBAC/B,eAAe,CAAC;4BACd,OAAO;4BACP,MAAM;4BACN,OAAO,EAAE;gCACP,QAAQ,EAAE,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,UAAU,EAAE,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;gCACrE,GAAG;gCACH,yBAAyB,EAAE,CAAC,CAAC,IAAI,CAAC,yBAAyB;6BAC5D;4BACD,SAAS,EAAE,mEAAmE;yBAC/E,CAAC,CAAC;oBACL,CAAC;gBACH,CAAC;gBAED,IAAI,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;oBAC9B,mCAAmC;oBACnC,IACG,MAAqB,CAAC,QAAQ,KAAK,IAAI;wBACxC,MAAM,CAAC,OAAO,KAAK,IAAI;wBACvB,MAAM,CAAC,IAAI,KAAK,SAAS,EACzB,CAAC;wBACD,OAAO;oBACT,CAAC;oBAED,eAAe,CAAC;wBACd,OAAO,EAAE,MAAM,CAAC,OAAO;wBACvB,MAAM;wBACN,OAAO,EAAE;4BACP,QAAQ,EAAE,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,SAAS,CAAC;4BACvC,GAAG;4BACH,yBAAyB,EAAE,CAAC,CAAC,IAAI,CAAC,yBAAyB;yBAC5D;wBACD,SAAS,EAAE,mEAAmE;qBAC/E,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;SACF;KACF,CAAC;AACJ,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"no-invalid-schema-examples.js","sourceRoot":"","sources":["../../../src/rules/common/no-invalid-schema-examples.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAGtD,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,MAAM,CAAC,MAAM,uBAAuB,GAAwB,CAAC,IAAI,EAAE,EAAE;IACnE,MAAM,SAAS,GAAG,IAAI,YAAY,EAAE,CAAC;IACrC,OAAO;QACL,MAAM,EAAE;YACN,KAAK,CAAC,MAAiC,EAAE,GAAgB;gBACvD,MAAM,QAAQ,GAAI,MAAuB,CAAC,QAAQ,CAAC;gBAEnD,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;oBAC5B,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;wBAC/B,eAAe,CAAC;4BACd,OAAO;4BACP,MAAM;4BACN,OAAO,EAAE;gCACP,QAAQ,EAAE,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,UAAU,EAAE,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;gCACrE,GAAG;gCACH,SAAS;gCACT,yBAAyB,EAAE,CAAC,CAAC,IAAI,CAAC,yBAAyB;6BAC5D;4BACD,SAAS,EAAE,mEAAmE;yBAC/E,CAAC,CAAC;oBACL,CAAC;gBACH,CAAC;gBAED,IAAI,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;oBAC9B,mCAAmC;oBACnC,IACG,MAAqB,CAAC,QAAQ,KAAK,IAAI;wBACxC,MAAM,CAAC,OAAO,KAAK,IAAI;wBACvB,MAAM,CAAC,IAAI,KAAK,SAAS,EACzB,CAAC;wBACD,OAAO;oBACT,CAAC;oBAED,eAAe,CAAC;wBACd,OAAO,EAAE,MAAM,CAAC,OAAO;wBACvB,MAAM;wBACN,OAAO,EAAE;4BACP,QAAQ,EAAE,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,SAAS,CAAC;4BACvC,GAAG;4BACH,SAAS;4BACT,yBAAyB,EAAE,CAAC,CAAC,IAAI,CAAC,yBAAyB;yBAC5D;wBACD,SAAS,EAAE,mEAAmE;qBAC/E,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;SACF;KACF,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"no-invalid-media-type-examples.d.ts","sourceRoot":"","sources":["../../../src/rules/oas3/no-invalid-media-type-examples.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"no-invalid-media-type-examples.d.ts","sourceRoot":"","sources":["../../../src/rules/oas3/no-invalid-media-type-examples.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAKlD,eAAO,MAAM,oBAAoB,EAAE,QAuElC,CAAC"}
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
import { isRef } from '../../ref-utils.js';
|
|
2
2
|
import { isDefined } from '../../utils/is-defined.js';
|
|
3
3
|
import { isPlainObject } from '../../utils/is-plain-object.js';
|
|
4
|
+
import { AjvValidator } from '../ajv.js';
|
|
4
5
|
import { validateExample } from '../utils.js';
|
|
5
6
|
export const ValidContentExamples = (opts) => {
|
|
7
|
+
const validator = new AjvValidator();
|
|
6
8
|
const skip = (mediaType) => {
|
|
7
9
|
return mediaType.schema === undefined;
|
|
8
10
|
};
|
|
@@ -33,6 +35,7 @@ export const ValidContentExamples = (opts) => {
|
|
|
33
35
|
options: {
|
|
34
36
|
location,
|
|
35
37
|
ctx,
|
|
38
|
+
validator,
|
|
36
39
|
allowAdditionalProperties: !!opts.allowAdditionalProperties,
|
|
37
40
|
ajvContext: context,
|
|
38
41
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"no-invalid-media-type-examples.js","sourceRoot":"","sources":["../../../src/rules/oas3/no-invalid-media-type-examples.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAiB,MAAM,oBAAoB,CAAC;AAE1D,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAG/D,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,MAAM,CAAC,MAAM,oBAAoB,GAAa,CAAC,IAAI,EAAE,EAAE;IACrD,MAAM,IAAI,GAAG,CAAC,SAAwB,EAAE,EAAE;QACxC,OAAO,SAAS,CAAC,MAAM,KAAK,SAAS,CAAC;IACxC,CAAC,CAAC;IAEF,MAAM,KAAK,GAAG,CAAC,OAAmB,EAAE,EAAE,CAAC,CAAC,SAAwB,EAAE,GAAgB,EAAE,EAAE;QACpF,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC;QAElC,IAAI,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC;YACjC,yBAAyB,CAAC,SAAS,CAAC,OAAO,EAAE,QAAQ,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC;QAC1E,CAAC;aAAM,IAAI,aAAa,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC7C,KAAK,MAAM,WAAW,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC1D,yBAAyB,CACvB,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,EAC/B,QAAQ,CAAC,KAAK,CAAC,CAAC,UAAU,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC,EAClD,IAAI,CACL,CAAC;YACJ,CAAC;QACH,CAAC;QAED,SAAS,yBAAyB,CAChC,OAA0B,EAC1B,QAAkB,EAClB,UAAoB;YAEpB,IAAI,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;gBACnB,MAAM,QAAQ,GAAG,OAAO,CAAc,OAAO,CAAC,CAAC;gBAC/C,IAAI,CAAC,QAAQ,CAAC,QAAQ;oBAAE,OAAO;gBAC/B,QAAQ,GAAG,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC;gBAC7E,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC;YAC1B,CAAC;YACD,IAAI,UAAU,IAAI,OAAO,OAAO,EAAE,KAAK,KAAK,WAAW,EAAE,CAAC;gBACxD,OAAO;YACT,CAAC;YACD,eAAe,CAAC;gBACd,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO;gBAC7C,MAAM,EAAE,SAAS,CAAC,MAAO;gBACzB,OAAO,EAAE;oBACP,QAAQ;oBACR,GAAG;oBACH,yBAAyB,EAAE,CAAC,CAAC,IAAI,CAAC,yBAAyB;oBAC3D,UAAU,EAAE,OAAO;iBACpB;gBACD,SAAS,EAAE,uEAAuE;aACnF,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC;IAEF,OAAO;QACL,SAAS,EAAE;YACT,SAAS,EAAE;gBACT,IAAI;gBACJ,KAAK,EAAE,KAAK,CAAC,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC;aACxC;SACF;QACD,WAAW,EAAE;YACX,SAAS,EAAE;gBACT,IAAI;gBACJ,KAAK,EAAE,KAAK,CAAC,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC;aACxC;SACF;QACD,QAAQ,EAAE;YACR,SAAS,EAAE;gBACT,IAAI;gBACJ,KAAK,EAAE,KAAK,CAAC,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC;aACzC;SACF;KACF,CAAC;AACJ,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"no-invalid-media-type-examples.js","sourceRoot":"","sources":["../../../src/rules/oas3/no-invalid-media-type-examples.ts"],"names":[],"mappings":"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"}
|
package/lib/rules/utils.d.ts
CHANGED
|
@@ -3,6 +3,7 @@ import { Location } from '../ref-utils.js';
|
|
|
3
3
|
import type { Oas3Schema, Oas3Tag, Oas3_2Tag, Oas3_1Schema, Referenced } from '../typings/openapi.js';
|
|
4
4
|
import type { Oas2Tag } from '../typings/swagger.js';
|
|
5
5
|
import type { NonUndefined, UserContext } from '../walk.js';
|
|
6
|
+
import type { AjvValidator } from './ajv.js';
|
|
6
7
|
export declare const resolveSchema: <T extends NonUndefined>(schemaOrRef: Referenced<T> | undefined, ctx: UserContext, resolveFrom?: string) => {
|
|
7
8
|
schema: T | undefined;
|
|
8
9
|
location: string | undefined;
|
|
@@ -38,6 +39,7 @@ export declare function validateExample({ example, schema, options, reference, }
|
|
|
38
39
|
options: {
|
|
39
40
|
location: Location;
|
|
40
41
|
ctx: UserContext;
|
|
42
|
+
validator: AjvValidator;
|
|
41
43
|
allowAdditionalProperties: boolean;
|
|
42
44
|
ajvContext?: AjvContext;
|
|
43
45
|
};
|
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":"AAAA,OAAO,KAAK,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAGvE,OAAO,EAAS,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAClD,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;AAErD,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/rules/utils.ts"],"names":[],"mappings":"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"}
|
package/lib/rules/utils.js
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { default as levenshtein } from 'js-levenshtein';
|
|
2
2
|
import { isRef, Location } from '../ref-utils.js';
|
|
3
3
|
import { isPlainObject } from '../utils/is-plain-object.js';
|
|
4
|
-
import { validateJsonSchema } from './ajv.js';
|
|
5
4
|
export const resolveSchema = (schemaOrRef, ctx, resolveFrom) => {
|
|
6
5
|
if (isRef(schemaOrRef)) {
|
|
7
6
|
const resolved = ctx.resolve(schemaOrRef, resolveFrom);
|
|
@@ -117,10 +116,10 @@ export function getSuggest(given, variants) {
|
|
|
117
116
|
return distances.map((d) => d.variant);
|
|
118
117
|
}
|
|
119
118
|
export function validateExample({ example, schema, options, reference, }) {
|
|
120
|
-
const { location, ctx, allowAdditionalProperties, ajvContext } = options;
|
|
119
|
+
const { location, ctx, validator, allowAdditionalProperties, ajvContext } = options;
|
|
121
120
|
const { resolve, location: parentLocation, report, specVersion } = ctx;
|
|
122
121
|
try {
|
|
123
|
-
const { valid, errors } =
|
|
122
|
+
const { valid, errors } = validator.validate(example, schema, {
|
|
124
123
|
schemaLoc: parentLocation.child('schema'),
|
|
125
124
|
instancePath: location.pointer,
|
|
126
125
|
resolve,
|
package/lib/rules/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/rules/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAExD,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AASlD,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/rules/utils.ts"],"names":[],"mappings":"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"}
|