@stoplight/spectral-core 1.17.0 → 1.18.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.
- package/dist/ruleset/function.d.ts +1 -0
- package/dist/ruleset/function.js +17 -3
- package/dist/ruleset/function.js.map +1 -1
- package/dist/ruleset/meta/json-extensions.json +1 -16
- package/dist/ruleset/ruleset.js +2 -2
- package/dist/ruleset/ruleset.js.map +1 -1
- package/dist/ruleset/validation/errors.d.ts +1 -1
- package/dist/ruleset/validation/validators/function.js +1 -1
- package/dist/ruleset/validation/validators/function.js.map +1 -1
- package/package.json +1 -1
|
@@ -3,6 +3,7 @@ import { RulesetValidationError } from './validation/index';
|
|
|
3
3
|
import { JSONSchema, RulesetFunction, RulesetFunctionWithValidator } from '../types';
|
|
4
4
|
export declare class RulesetFunctionValidationError extends RulesetValidationError {
|
|
5
5
|
constructor(fn: string, error: ErrorObject);
|
|
6
|
+
private static getPath;
|
|
6
7
|
private static printMessage;
|
|
7
8
|
}
|
|
8
9
|
declare type SchemaKeyedFragmentKeyword = 'properties' | 'patternProperties' | 'definitions';
|
package/dist/ruleset/function.js
CHANGED
|
@@ -14,7 +14,21 @@ const ajv = new ajv_1.default({ allErrors: true, allowUnionTypes: true, strict:
|
|
|
14
14
|
(0, ajv_formats_1.default)(ajv);
|
|
15
15
|
class RulesetFunctionValidationError extends index_1.RulesetValidationError {
|
|
16
16
|
constructor(fn, error) {
|
|
17
|
-
super('invalid-function-options', RulesetFunctionValidationError.printMessage(fn, error),
|
|
17
|
+
super('invalid-function-options', RulesetFunctionValidationError.printMessage(fn, error), RulesetFunctionValidationError.getPath(error));
|
|
18
|
+
}
|
|
19
|
+
static getPath(error) {
|
|
20
|
+
const path = [
|
|
21
|
+
'functionOptions',
|
|
22
|
+
...(error.instancePath === '' ? [] : error.instancePath.slice(1).split('/')),
|
|
23
|
+
];
|
|
24
|
+
switch (error.keyword) {
|
|
25
|
+
case 'additionalProperties': {
|
|
26
|
+
const additionalProperty = error.params.additionalProperty;
|
|
27
|
+
path.push(additionalProperty);
|
|
28
|
+
break;
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
return path;
|
|
18
32
|
}
|
|
19
33
|
static printMessage(fn, error) {
|
|
20
34
|
var _a;
|
|
@@ -79,7 +93,7 @@ function createRulesetFunction({ input, errorOnInvalidInput = false, options, },
|
|
|
79
93
|
return;
|
|
80
94
|
}
|
|
81
95
|
if (options === null) {
|
|
82
|
-
throw new index_1.RulesetValidationError('invalid-function-options', `"${fn.name || '<unknown>'}" function does not accept any options`, []);
|
|
96
|
+
throw new index_1.RulesetValidationError('invalid-function-options', `"${fn.name || '<unknown>'}" function does not accept any options`, ['functionOptions']);
|
|
83
97
|
}
|
|
84
98
|
else if ('errors' in validateOptions &&
|
|
85
99
|
Array.isArray(validateOptions.errors) &&
|
|
@@ -87,7 +101,7 @@ function createRulesetFunction({ input, errorOnInvalidInput = false, options, },
|
|
|
87
101
|
throw new AggregateError(validateOptions.errors.map(error => new RulesetFunctionValidationError(fn.name || '<unknown>', error)));
|
|
88
102
|
}
|
|
89
103
|
else {
|
|
90
|
-
throw new index_1.RulesetValidationError('invalid-function-options', `"functionOptions" of "${fn.name || '<unknown>'}" function must be valid`, []);
|
|
104
|
+
throw new index_1.RulesetValidationError('invalid-function-options', `"functionOptions" of "${fn.name || '<unknown>'}" function must be valid`, ['functionOptions']);
|
|
91
105
|
}
|
|
92
106
|
};
|
|
93
107
|
Reflect.defineProperty(wrappedFn, 'schemas', {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"function.js","sourceRoot":"","sources":["../../src/ruleset/function.ts"],"names":[],"mappings":";;;;AAAA,2DAAuC;AACvC,2EAAqC;AACrC,yEAAmC;AAMnC,kEAAgF;AAEhF,8CAA4D;AAE5D,mCAAkC;AAClC,qDAAsD;AAEtD,MAAM,GAAG,GAAG,IAAI,aAAG,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;AACxG,IAAA,oBAAS,EAAC,GAAG,CAAC,CAAC;AACf,IAAA,qBAAU,EAAC,GAAG,CAAC,CAAC;AAEhB,MAAa,8BAA+B,SAAQ,8BAAsB;IACxE,YAAY,EAAU,EAAE,KAAkB;QACxC,KAAK,CACH,0BAA0B,EAC1B,8BAA8B,CAAC,YAAY,CAAC,EAAE,EAAE,KAAK,CAAC,EACtD,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"function.js","sourceRoot":"","sources":["../../src/ruleset/function.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,22 +36,7 @@
|
|
|
36
36
|
},
|
|
37
37
|
"Format": {
|
|
38
38
|
"$anchor": "format",
|
|
39
|
-
"
|
|
40
|
-
"oas2",
|
|
41
|
-
"oas3",
|
|
42
|
-
"oas3.0",
|
|
43
|
-
"oas3.1",
|
|
44
|
-
"asyncapi2",
|
|
45
|
-
"json-schema",
|
|
46
|
-
"json-schema-loose",
|
|
47
|
-
"json-schema-draft4",
|
|
48
|
-
"json-schema-draft6",
|
|
49
|
-
"json-schema-draft7",
|
|
50
|
-
"json-schema-draft-2019-09",
|
|
51
|
-
"json-schema-2019-09",
|
|
52
|
-
"json-schema-draft-2020-12",
|
|
53
|
-
"json-schema-2020-12"
|
|
54
|
-
],
|
|
39
|
+
"type": "string",
|
|
55
40
|
"errorMessage": "must be a valid format"
|
|
56
41
|
},
|
|
57
42
|
"Functions": {
|
package/dist/ruleset/ruleset.js
CHANGED
|
@@ -28,11 +28,11 @@ class Ruleset {
|
|
|
28
28
|
let definition;
|
|
29
29
|
if ((0, json_1.isPlainObject)(maybeDefinition) && 'extends' in maybeDefinition) {
|
|
30
30
|
const { extends: _, ...def } = maybeDefinition;
|
|
31
|
-
(0, index_1.assertValidRuleset)({ extends: [], ...def });
|
|
31
|
+
(0, index_1.assertValidRuleset)({ extends: [], ...def }, 'js');
|
|
32
32
|
definition = maybeDefinition;
|
|
33
33
|
}
|
|
34
34
|
else {
|
|
35
|
-
(0, index_1.assertValidRuleset)(maybeDefinition);
|
|
35
|
+
(0, index_1.assertValidRuleset)(maybeDefinition, 'js');
|
|
36
36
|
definition = maybeDefinition;
|
|
37
37
|
}
|
|
38
38
|
this.definition = definition;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ruleset.js","sourceRoot":"","sources":["../../src/ruleset/ruleset.ts"],"names":[],"mappings":";;;;;AAAA,0CAAoD;AACpD,0CAA6F;AAE7F,iDAA8C;AAC9C,iCAA+C;AAS/C,8CAAwD;AACxD,2CAA4C;AAC5C,0BAAmE;AACnE,iDAAmD;AACnD,uCAAoC;AACpC,2CAAyD;AAGzD,MAAM,YAAY,GAAG,MAAM,CAAC,oCAAoC,CAAC,CAAC;AAClE,MAAM,iBAAiB,GAAG,MAAM,CAAC,gDAAgD,CAAC,CAAC;AACnF,MAAM,oBAAoB,GAAG,kCAAkC,CAAC;AAShE,IAAI,IAAI,GAAG,CAAC,CAAC;AAeb,MAAa,OAAO;IAalB,YAAqB,eAAwB,EAAE,OAAwB;;QAAlD,oBAAe,GAAf,eAAe,CAAS;;QAZ7B,OAAE,GAAG,IAAI,EAAE,CAAC;QAGZ,YAAO,GAAG,IAAI,iBAAO,EAAE,CAAC;QAOxC,mCAAgF;QAG9E,IAAI,UAA6B,CAAC;QAClC,IAAI,IAAA,oBAAa,EAAC,eAAe,CAAC,IAAI,SAAS,IAAI,eAAe,EAAE;YAClE,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,GAAG,GAAG,EAAE,GAAG,eAAe,CAAC;YAE/C,IAAA,0BAAkB,EAAC,EAAE,OAAO,EAAE,EAAE,EAAE,GAAG,GAAG,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"ruleset.js","sourceRoot":"","sources":["../../src/ruleset/ruleset.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import type { ErrorObject } from 'ajv';
|
|
|
2
2
|
import type { IDiagnostic, JsonPath } from '@stoplight/types';
|
|
3
3
|
export declare type RulesetValidationErrorCode = 'generic-validation-error' | 'invalid-ruleset-definition' | 'invalid-parser-options-definition' | 'invalid-alias-definition' | 'invalid-extend-definition' | 'invalid-rule-definition' | 'invalid-override-definition' | 'invalid-function-options' | 'invalid-given-definition' | 'invalid-severity' | 'invalid-format' | 'undefined-function' | 'undefined-alias';
|
|
4
4
|
interface IRulesetValidationSingleError extends Pick<IDiagnostic, 'message' | 'path'> {
|
|
5
|
-
code: RulesetValidationErrorCode;
|
|
5
|
+
readonly code: RulesetValidationErrorCode;
|
|
6
6
|
}
|
|
7
7
|
export declare class RulesetValidationError extends Error implements IRulesetValidationSingleError {
|
|
8
8
|
readonly code: RulesetValidationErrorCode;
|
|
@@ -18,7 +18,7 @@ function validateFunction(fn, opts, path) {
|
|
|
18
18
|
}
|
|
19
19
|
catch (ex) {
|
|
20
20
|
if (ex instanceof ReferenceError) {
|
|
21
|
-
return new errors_1.RulesetValidationError('undefined-function', ex.message, (0, error_1.toParsedPath)(path));
|
|
21
|
+
return new errors_1.RulesetValidationError('undefined-function', ex.message, [...(0, error_1.toParsedPath)(path), 'function']);
|
|
22
22
|
}
|
|
23
23
|
return (0, error_1.wrapError)(ex, path);
|
|
24
24
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"function.js","sourceRoot":"","sources":["../../../../src/ruleset/validation/validators/function.ts"],"names":[],"mappings":";;;AACA,0CAAyD;AACzD,sCAAmD;AAEnD,SAAS,qBAAqB,CAC5B,oBAA6B;IAE7B,IAAI,OAAO,oBAAoB,KAAK,UAAU,EAAE;QAC9C,MAAM,cAAc,CAAC,yBAAyB,CAAC,CAAC;KACjD;AACH,CAAC;AAED,SAAgB,gBAAgB,CAC9B,EAA4D,EAC5D,IAAa,EACb,IAAY;IAEZ,IAAI;QACF,qBAAqB,CAAC,EAAE,CAAC,CAAC;QAE1B,IAAI,CAAC,CAAC,WAAW,IAAI,EAAE,CAAC;YAAE,OAAO;QAEjC,MAAM,SAAS,GAA8C,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACnF,SAAS,CAAC,IAAI,CAAC,CAAC;KACjB;IAAC,OAAO,EAAE,EAAE;QACX,IAAI,EAAE,YAAY,cAAc,EAAE;YAChC,OAAO,IAAI,+BAAsB,CAAC,oBAAoB,EAAE,EAAE,CAAC,OAAO,EAAE,IAAA,oBAAY,EAAC,IAAI,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"function.js","sourceRoot":"","sources":["../../../../src/ruleset/validation/validators/function.ts"],"names":[],"mappings":";;;AACA,0CAAyD;AACzD,sCAAmD;AAEnD,SAAS,qBAAqB,CAC5B,oBAA6B;IAE7B,IAAI,OAAO,oBAAoB,KAAK,UAAU,EAAE;QAC9C,MAAM,cAAc,CAAC,yBAAyB,CAAC,CAAC;KACjD;AACH,CAAC;AAED,SAAgB,gBAAgB,CAC9B,EAA4D,EAC5D,IAAa,EACb,IAAY;IAEZ,IAAI;QACF,qBAAqB,CAAC,EAAE,CAAC,CAAC;QAE1B,IAAI,CAAC,CAAC,WAAW,IAAI,EAAE,CAAC;YAAE,OAAO;QAEjC,MAAM,SAAS,GAA8C,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACnF,SAAS,CAAC,IAAI,CAAC,CAAC;KACjB;IAAC,OAAO,EAAE,EAAE;QACX,IAAI,EAAE,YAAY,cAAc,EAAE;YAChC,OAAO,IAAI,+BAAsB,CAAC,oBAAoB,EAAE,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,IAAA,oBAAY,EAAC,IAAI,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC;SAC1G;QAED,OAAO,IAAA,iBAAS,EAAC,EAAE,EAAE,IAAI,CAAC,CAAC;KAC5B;AACH,CAAC;AAnBD,4CAmBC"}
|