@stoplight/spectral-core 1.14.2 → 1.15.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/alias.js +2 -2
- package/dist/ruleset/alias.js.map +1 -1
- package/dist/ruleset/function.js +3 -3
- package/dist/ruleset/function.js.map +1 -1
- package/dist/ruleset/meta/ruleset.schema.json +1 -1
- package/dist/ruleset/rule.d.ts +5 -3
- package/dist/ruleset/rule.js.map +1 -1
- package/dist/ruleset/ruleset.d.ts +5 -3
- package/dist/ruleset/ruleset.js.map +1 -1
- package/dist/ruleset/types.d.ts +5 -0
- package/dist/ruleset/validation/assertions.js +3 -3
- package/dist/ruleset/validation/assertions.js.map +1 -1
- package/dist/ruleset/validation/errors.d.ts +7 -3
- package/dist/ruleset/validation/errors.js +63 -4
- package/dist/ruleset/validation/errors.js.map +1 -1
- package/dist/ruleset/validation/index.d.ts +1 -1
- package/dist/ruleset/validation/index.js.map +1 -1
- package/dist/ruleset/validation/validators/alias.js +5 -1
- package/dist/ruleset/validation/validators/alias.js.map +1 -1
- package/dist/ruleset/validation/validators/common/error.d.ts +1 -0
- package/dist/ruleset/validation/validators/common/error.js +7 -3
- package/dist/ruleset/validation/validators/common/error.js.map +1 -1
- package/dist/ruleset/validation/validators/function.js +5 -1
- package/dist/ruleset/validation/validators/function.js.map +1 -1
- package/package.json +1 -1
package/dist/ruleset/alias.js
CHANGED
|
@@ -28,11 +28,11 @@ function _resolveAlias(aliases, expression, formats, stack) {
|
|
|
28
28
|
if (expression.startsWith('#')) {
|
|
29
29
|
const alias = (_a = ALIAS.exec(expression)) === null || _a === void 0 ? void 0 : _a[1];
|
|
30
30
|
if (alias === void 0 || alias === null) {
|
|
31
|
-
throw new
|
|
31
|
+
throw new TypeError(`Alias must match /^#([A-Za-z0-9_-]+)/`);
|
|
32
32
|
}
|
|
33
33
|
if (stack.has(alias)) {
|
|
34
34
|
const _stack = [...stack, alias];
|
|
35
|
-
throw new
|
|
35
|
+
throw new Error(`Alias "${_stack[0]}" is circular. Resolution stack: ${_stack.join(' -> ')}`);
|
|
36
36
|
}
|
|
37
37
|
stack.add(alias);
|
|
38
38
|
if (aliases === null || !(alias in aliases)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"alias.js","sourceRoot":"","sources":["../../src/ruleset/alias.ts"],"names":[],"mappings":";;;AAAA,2CAAkF;AAGlF,MAAM,KAAK,GAAG,oBAAoB,CAAC;AAEnC,SAAgB,sBAAsB,CACpC,EAAE,OAAO,EAAgC,EACzC,OAA4B;IAE5B,IAAI,OAAO,KAAK,IAAI,IAAI,OAAO,CAAC,IAAI,KAAK,CAAC,EAAE;QAC1C,OAAO,IAAI,CAAC;KACb;IAGD,KAAK,IAAI,CAAC,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE;QAC5C,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QAC1B,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,OAAO,EAAE;YACnC,IAAI,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;gBACvB,OAAO,MAAM,CAAC,KAAK,CAAC;aACrB;SACF;KACF;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAnBD,wDAmBC;AAED,SAAgB,YAAY,CAC1B,OAAuC,EACvC,UAAkB,EAClB,OAA4B;IAE5B,OAAO,aAAa,CAAC,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;AAChE,CAAC;AAND,oCAMC;AAED,SAAS,aAAa,CACpB,OAAuC,EACvC,UAAkB,EAClB,OAA4B,EAC5B,KAAkB;;IAElB,MAAM,mBAAmB,GAAa,EAAE,CAAC;IAEzC,IAAI,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;QAC9B,MAAM,KAAK,GAAG,MAAA,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,0CAAG,CAAC,CAAC,CAAC;QAE1C,IAAI,KAAK,KAAK,KAAK,CAAC,IAAI,KAAK,KAAK,IAAI,EAAE;YACtC,MAAM,IAAI,
|
|
1
|
+
{"version":3,"file":"alias.js","sourceRoot":"","sources":["../../src/ruleset/alias.ts"],"names":[],"mappings":";;;AAAA,2CAAkF;AAGlF,MAAM,KAAK,GAAG,oBAAoB,CAAC;AAEnC,SAAgB,sBAAsB,CACpC,EAAE,OAAO,EAAgC,EACzC,OAA4B;IAE5B,IAAI,OAAO,KAAK,IAAI,IAAI,OAAO,CAAC,IAAI,KAAK,CAAC,EAAE;QAC1C,OAAO,IAAI,CAAC;KACb;IAGD,KAAK,IAAI,CAAC,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE;QAC5C,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QAC1B,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,OAAO,EAAE;YACnC,IAAI,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;gBACvB,OAAO,MAAM,CAAC,KAAK,CAAC;aACrB;SACF;KACF;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAnBD,wDAmBC;AAED,SAAgB,YAAY,CAC1B,OAAuC,EACvC,UAAkB,EAClB,OAA4B;IAE5B,OAAO,aAAa,CAAC,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;AAChE,CAAC;AAND,oCAMC;AAED,SAAS,aAAa,CACpB,OAAuC,EACvC,UAAkB,EAClB,OAA4B,EAC5B,KAAkB;;IAElB,MAAM,mBAAmB,GAAa,EAAE,CAAC;IAEzC,IAAI,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;QAC9B,MAAM,KAAK,GAAG,MAAA,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,0CAAG,CAAC,CAAC,CAAC;QAE1C,IAAI,KAAK,KAAK,KAAK,CAAC,IAAI,KAAK,KAAK,IAAI,EAAE;YACtC,MAAM,IAAI,SAAS,CAAC,uCAAuC,CAAC,CAAC;SAC9D;QAED,IAAI,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;YACpB,MAAM,MAAM,GAAG,CAAC,GAAG,KAAK,EAAE,KAAK,CAAC,CAAC;YACjC,MAAM,IAAI,KAAK,CAAC,UAAU,MAAM,CAAC,CAAC,CAAC,oCAAoC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;SAC/F;QAED,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAEjB,IAAI,OAAO,KAAK,IAAI,IAAI,CAAC,CAAC,KAAK,IAAI,OAAO,CAAC,EAAE;YAC3C,MAAM,IAAI,cAAc,CAAC,UAAU,KAAK,kBAAkB,CAAC,CAAC;SAC7D;QAED,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;QAClC,IAAI,gBAAiC,CAAC;QACtC,IAAI,IAAA,gCAAuB,EAAC,UAAU,CAAC,EAAE;YACvC,gBAAgB,GAAG,UAAU,CAAC;SAC/B;aAAM,IAAI,IAAA,gCAAuB,EAAC,UAAU,CAAC,EAAE;YAC9C,gBAAgB,GAAG,sBAAsB,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;SAChE;aAAM;YACL,gBAAgB,GAAG,IAAI,CAAC;SACzB;QAED,IAAI,gBAAgB,KAAK,IAAI,EAAE;YAC7B,mBAAmB,CAAC,IAAI,CACtB,GAAG,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CACjC,aAAa,CAAC,OAAO,EAAE,IAAI,GAAG,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAChG,CACF,CAAC;SACH;KACF;SAAM;QACL,mBAAmB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;KACtC;IAED,OAAO,mBAAmB,CAAC;AAC7B,CAAC"}
|
package/dist/ruleset/function.js
CHANGED
|
@@ -14,7 +14,7 @@ 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(RulesetFunctionValidationError.printMessage(fn, error), error.instancePath.slice(1).split('/'));
|
|
17
|
+
super('invalid-function-options', RulesetFunctionValidationError.printMessage(fn, error), error.instancePath.slice(1).split('/'));
|
|
18
18
|
}
|
|
19
19
|
static printMessage(fn, error) {
|
|
20
20
|
var _a;
|
|
@@ -79,7 +79,7 @@ function createRulesetFunction({ input, errorOnInvalidInput = false, options, },
|
|
|
79
79
|
return;
|
|
80
80
|
}
|
|
81
81
|
if (options === null) {
|
|
82
|
-
throw new index_1.RulesetValidationError(`"${fn.name || '<unknown>'}" function does not accept any options`, []);
|
|
82
|
+
throw new index_1.RulesetValidationError('invalid-function-options', `"${fn.name || '<unknown>'}" function does not accept any options`, []);
|
|
83
83
|
}
|
|
84
84
|
else if ('errors' in validateOptions &&
|
|
85
85
|
Array.isArray(validateOptions.errors) &&
|
|
@@ -87,7 +87,7 @@ function createRulesetFunction({ input, errorOnInvalidInput = false, options, },
|
|
|
87
87
|
throw new AggregateError(validateOptions.errors.map(error => new RulesetFunctionValidationError(fn.name || '<unknown>', error)));
|
|
88
88
|
}
|
|
89
89
|
else {
|
|
90
|
-
throw new index_1.RulesetValidationError(`"functionOptions" of "${fn.name || '<unknown>'}" function must be valid`, []);
|
|
90
|
+
throw new index_1.RulesetValidationError('invalid-function-options', `"functionOptions" of "${fn.name || '<unknown>'}" function must be valid`, []);
|
|
91
91
|
}
|
|
92
92
|
};
|
|
93
93
|
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,
|
|
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,CACvC,CAAC;IACJ,CAAC;IAEO,MAAM,CAAC,YAAY,CAAC,EAAU,EAAE,KAAkB;;QACxD,QAAQ,KAAK,CAAC,OAAO,EAAE;YACrB,KAAK,MAAM,CAAC,CAAC;gBACX,MAAM,IAAI,GAAG,IAAA,4BAAS,EAAC,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,6BAAU,CAAC,GAAG,CAAC,CAAC;gBAC/E,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;gBAE3G,OAAO,IAAI,EAAE,uBAAuB,IAAI,8CAA8C,MAAM,EAAE,CAAC;aAChG;YAED,KAAK,UAAU,CAAC,CAAC;gBACf,MAAM,eAAe,GAAI,KAAuB,CAAC,MAAM,CAAC,eAAe,CAAC;gBACxE,MAAM,mBAAmB,GACvB,KAAK,CAAC,YAAY,KAAK,EAAE;oBACvB,CAAC,CAAC,eAAe;oBACjB,CAAC,CAAC,IAAA,4BAAS,EAAC,CAAC,GAAG,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,eAAe,CAAC,EAAE,6BAAU,CAAC,GAAG,CAAC,CAAC;gBAE9F,OAAO,IAAI,EAAE,0BAA0B,mBAAmB,UAAU,CAAC;aACtE;YAED,KAAK,sBAAsB,CAAC,CAAC;gBAC3B,MAAM,kBAAkB,GAAI,KAAmC,CAAC,MAAM,CAAC,kBAAkB,CAAC;gBAC1F,MAAM,sBAAsB,GAC1B,KAAK,CAAC,YAAY,KAAK,EAAE;oBACvB,CAAC,CAAC,kBAAkB;oBACpB,CAAC,CAAC,IAAA,4BAAS,EAAC,CAAC,GAAG,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,kBAAkB,CAAC,EAAE,6BAAU,CAAC,GAAG,CAAC,CAAC;gBAEjG,OAAO,IAAI,EAAE,gCAAgC,sBAAsB,UAAU,CAAC;aAC/E;YAED,KAAK,MAAM,CAAC,CAAC;gBACX,MAAM,IAAI,GAAG,IAAA,4BAAS,EAAC,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,6BAAU,CAAC,GAAG,CAAC,CAAC;gBAC/E,MAAM,MAAM,GAAI,KAAmB,CAAC,MAAM,CAAC,aAAa,CAAC,GAAG,CAAC,6BAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAEpF,OAAO,IAAI,EAAE,uBAAuB,IAAI,+CAA+C,MAAM,EAAE,CAAC;aACjG;YACD;gBACE,OAAO,MAAA,KAAK,CAAC,OAAO,mCAAI,eAAe,CAAC;SAC3C;IACH,CAAC;CACF;AAhDD,wEAgDC;AA8BD,MAAM,yBAAyB,GAAG,CAAC,CAAU,EAAW,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC;AAEtE,SAAgB,qBAAqB,CACnC,EACE,KAAK,EACL,mBAAmB,GAAG,KAAK,EAC3B,OAAO,GAKR,EACD,EAAyB;IAEzB,MAAM,eAAe,GAAG,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,yBAAyB,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC5F,MAAM,aAAa,GAAG,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IAUlE,MAAM,SAAS,GAA2B,UACxC,KAAK,EACL,OAAO,EACP,GAAG,IAAI;;QAEP,IAAI,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAG,KAAK,CAAC,MAAK,KAAK,EAAE;YACpC,IAAI,mBAAmB,EAAE;gBACvB,OAAO;oBACL;wBACE,OAAO,EAAE,MAAA,MAAA,MAAA,aAAa,CAAC,MAAM,0CAAE,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,KAAK,cAAc,CAAC,0CAAE,OAAO,mCAAI,eAAe;qBAC3G;iBACF,CAAC;aACH;YAED,OAAO;SACR;QAED,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAE7B,OAAO,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;IACrC,CAAC,CAAC;IAEF,OAAO,CAAC,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;IAE9D,MAAM,SAAS,GAAG,IAAI,OAAO,EAAE,CAAC;IAChC,SAAS,CAAC,SAAS,GAAG,UAAU,CAAU;QACxC,IAAI,IAAA,iBAAQ,EAAC,CAAC,CAAC,IAAI,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;YAAE,OAAO;QAE5C,IAAI,eAAe,CAAC,CAAC,CAAC,EAAE;YACtB,IAAI,IAAA,iBAAQ,EAAC,CAAC,CAAC;gBAAE,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YAClC,OAAO;SACR;QAED,IAAI,OAAO,KAAK,IAAI,EAAE;YACpB,MAAM,IAAI,8BAAsB,CAC9B,0BAA0B,EAC1B,IAAI,EAAE,CAAC,IAAI,IAAI,WAAW,wCAAwC,EAClE,EAAE,CACH,CAAC;SACH;aAAM,IACL,QAAQ,IAAI,eAAe;YAC3B,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC;YACrC,eAAe,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EACjC;YACA,MAAM,IAAI,cAAc,CACtB,eAAe,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,8BAA8B,CAAC,EAAE,CAAC,IAAI,IAAI,WAAW,EAAE,KAAK,CAAC,CAAC,CACvG,CAAC;SACH;aAAM;YACL,MAAM,IAAI,8BAAsB,CAC9B,0BAA0B,EAC1B,yBAAyB,EAAE,CAAC,IAAI,IAAI,WAAW,0BAA0B,EACzE,EAAE,CACH,CAAC;SACH;IACH,CAAC,CAAC;IAEF,OAAO,CAAC,cAAc,CAAC,SAAS,EAAE,SAAS,EAAE;QAC3C,UAAU,EAAE,KAAK;QACjB,KAAK,EAAE;YACL,KAAK;YACL,OAAO;SACR;KACF,CAAC,CAAC;IAEH,OAAO,SAA+C,CAAC;AACzD,CAAC;AAxFD,sDAwFC"}
|
package/dist/ruleset/rule.d.ts
CHANGED
|
@@ -3,6 +3,7 @@ import { Ruleset } from './ruleset';
|
|
|
3
3
|
import { Format } from './format';
|
|
4
4
|
import type { HumanReadableDiagnosticSeverity, IRuleThen, RuleDefinition, Stringifable } from './types';
|
|
5
5
|
import { Formats } from './formats';
|
|
6
|
+
import type { Stringified } from './types';
|
|
6
7
|
export interface IRule {
|
|
7
8
|
description: string | null;
|
|
8
9
|
message: string | null;
|
|
@@ -15,15 +16,15 @@ export interface IRule {
|
|
|
15
16
|
then: IRuleThen[];
|
|
16
17
|
given: string[];
|
|
17
18
|
}
|
|
18
|
-
|
|
19
|
+
declare type RuleJson = Omit<IRule, 'then'> & {
|
|
19
20
|
name: string;
|
|
20
|
-
formats: string[] | null;
|
|
21
21
|
then: (Pick<IRuleThen, 'field'> & {
|
|
22
22
|
function: string;
|
|
23
23
|
functionOptions?: string;
|
|
24
24
|
})[];
|
|
25
25
|
owner: number;
|
|
26
26
|
};
|
|
27
|
+
export declare type StringifiedRule = Stringified<RuleJson>;
|
|
27
28
|
export declare class Rule implements IRule {
|
|
28
29
|
#private;
|
|
29
30
|
readonly name: string;
|
|
@@ -52,5 +53,6 @@ export declare class Rule implements IRule {
|
|
|
52
53
|
getGivenForFormats(formats: Set<Format> | null): string[];
|
|
53
54
|
matchesFormat(formats: Set<Format> | null): boolean;
|
|
54
55
|
clone(): Rule;
|
|
55
|
-
toJSON(): Stringifable<
|
|
56
|
+
toJSON(): Stringifable<RuleJson>;
|
|
56
57
|
}
|
|
58
|
+
export {};
|
package/dist/ruleset/rule.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rule.js","sourceRoot":"","sources":["../../src/ruleset/rule.ts"],"names":[],"mappings":";;;;;AAAA,mCAAkC;AAElC,0CAAoD;AACpD,0CAAgD;AAChD,kEAAyD;AAEzD,+CAAiF;AAIjF,iDAA8C;AAC9C,uCAAoC;AACpC,mCAAuC;
|
|
1
|
+
{"version":3,"file":"rule.js","sourceRoot":"","sources":["../../src/ruleset/rule.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,15 +1,16 @@
|
|
|
1
1
|
import { Rule, StringifiedRule } from './rule';
|
|
2
2
|
import type { FileRulesetSeverityDefinition, ParserOptions, RulesetAliasesDefinition, RulesetDefinition, RulesetOverridesDefinition, Stringifable } from './types';
|
|
3
3
|
import { Formats } from './formats';
|
|
4
|
+
import type { Stringified } from './types';
|
|
4
5
|
declare const STACK_SYMBOL: unique symbol;
|
|
5
6
|
declare type RulesetContext = {
|
|
6
7
|
readonly severity?: FileRulesetSeverityDefinition;
|
|
7
8
|
readonly source?: string;
|
|
8
9
|
readonly [STACK_SYMBOL]?: Map<RulesetDefinition, Ruleset>;
|
|
9
10
|
};
|
|
10
|
-
|
|
11
|
+
declare type RulesetJson = {
|
|
11
12
|
id: number;
|
|
12
|
-
extends:
|
|
13
|
+
extends: RulesetJson[] | null;
|
|
13
14
|
source: string | null;
|
|
14
15
|
aliases: RulesetAliasesDefinition | null;
|
|
15
16
|
formats: Formats | null;
|
|
@@ -17,6 +18,7 @@ export declare type StringifiedRuleset = {
|
|
|
17
18
|
overrides: RulesetOverridesDefinition | null;
|
|
18
19
|
parserOptions: ParserOptions;
|
|
19
20
|
};
|
|
21
|
+
export declare type StringifiedRuleset = Stringified<RulesetJson>;
|
|
20
22
|
export declare class Ruleset {
|
|
21
23
|
#private;
|
|
22
24
|
readonly maybeDefinition: unknown;
|
|
@@ -33,6 +35,6 @@ export declare class Ruleset {
|
|
|
33
35
|
fromSource(source: string | null): Ruleset;
|
|
34
36
|
get parserOptions(): ParserOptions;
|
|
35
37
|
static isDefaultRulesetFile(uri: string): boolean;
|
|
36
|
-
toJSON(): Stringifable<
|
|
38
|
+
toJSON(): Stringifable<RulesetJson>;
|
|
37
39
|
}
|
|
38
40
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ruleset.js","sourceRoot":"","sources":["../../src/ruleset/ruleset.ts"],"names":[],"mappings":";;;;;AAAA,0CAAoD;AACpD,0CAA6F;AAE7F,iDAA8C;AAU9C,8CAAwD;AACxD,2CAA4C;AAC5C,0BAAmE;AACnE,iDAAmD;AACnD,uCAAoC;AACpC,2CAAyD;
|
|
1
|
+
{"version":3,"file":"ruleset.js","sourceRoot":"","sources":["../../src/ruleset/ruleset.ts"],"names":[],"mappings":"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"}
|
package/dist/ruleset/types.d.ts
CHANGED
|
@@ -70,3 +70,8 @@ export declare type Stringifable<T> = T extends object ? {
|
|
|
70
70
|
toJSON?(): Stringifable<T[P]>;
|
|
71
71
|
};
|
|
72
72
|
} : T;
|
|
73
|
+
export declare type Stringified<T> = T extends object ? {
|
|
74
|
+
[P in keyof T]: NonNullable<T[P]> extends {
|
|
75
|
+
toJSON(): infer R;
|
|
76
|
+
} ? R : Stringified<T[P]>;
|
|
77
|
+
} : T;
|
|
@@ -9,10 +9,10 @@ const es_aggregate_error_1 = (0, tslib_1.__importDefault)(require("es-aggregate-
|
|
|
9
9
|
function assertValidRuleset(ruleset, format = 'js') {
|
|
10
10
|
var _a;
|
|
11
11
|
if (!(0, json_1.isPlainObject)(ruleset)) {
|
|
12
|
-
throw new errors_1.RulesetValidationError('Provided ruleset is not an object', []);
|
|
12
|
+
throw new errors_1.RulesetValidationError('invalid-ruleset-definition', 'Provided ruleset is not an object', []);
|
|
13
13
|
}
|
|
14
14
|
if (!('rules' in ruleset) && !('extends' in ruleset) && !('overrides' in ruleset)) {
|
|
15
|
-
throw new errors_1.RulesetValidationError('Ruleset must have rules or extends or overrides defined', []);
|
|
15
|
+
throw new errors_1.RulesetValidationError('invalid-ruleset-definition', 'Ruleset must have rules or extends or overrides defined', []);
|
|
16
16
|
}
|
|
17
17
|
const validate = (0, ajv_1.createValidator)(format);
|
|
18
18
|
if (!validate(ruleset)) {
|
|
@@ -25,7 +25,7 @@ function isRuleDefinition(rule) {
|
|
|
25
25
|
}
|
|
26
26
|
function assertValidRule(rule, name) {
|
|
27
27
|
if (!isRuleDefinition(rule)) {
|
|
28
|
-
throw new errors_1.RulesetValidationError('Rule definition expected', ['rules', name]);
|
|
28
|
+
throw new errors_1.RulesetValidationError('invalid-rule-definition', 'Rule definition expected', ['rules', name]);
|
|
29
29
|
}
|
|
30
30
|
}
|
|
31
31
|
exports.assertValidRule = assertValidRule;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assertions.js","sourceRoot":"","sources":["../../../src/ruleset/validation/assertions.ts"],"names":[],"mappings":";;;;AAAA,0CAAgD;AAChD,+BAAwC;AACxC,qCAAoE;AAEpE,yFAAgD;AAEhD,SAAgB,kBAAkB,CAChC,OAAgB,EAChB,SAAwB,IAAI;;IAE5B,IAAI,CAAC,IAAA,oBAAa,EAAC,OAAO,CAAC,EAAE;QAC3B,MAAM,IAAI,+BAAsB,CAAC,mCAAmC,EAAE,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"assertions.js","sourceRoot":"","sources":["../../../src/ruleset/validation/assertions.ts"],"names":[],"mappings":";;;;AAAA,0CAAgD;AAChD,+BAAwC;AACxC,qCAAoE;AAEpE,yFAAgD;AAEhD,SAAgB,kBAAkB,CAChC,OAAgB,EAChB,SAAwB,IAAI;;IAE5B,IAAI,CAAC,IAAA,oBAAa,EAAC,OAAO,CAAC,EAAE;QAC3B,MAAM,IAAI,+BAAsB,CAAC,4BAA4B,EAAE,mCAAmC,EAAE,EAAE,CAAC,CAAC;KACzG;IAED,IAAI,CAAC,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,WAAW,IAAI,OAAO,CAAC,EAAE;QACjF,MAAM,IAAI,+BAAsB,CAC9B,4BAA4B,EAC5B,yDAAyD,EACzD,EAAE,CACH,CAAC;KACH;IAED,MAAM,QAAQ,GAAG,IAAA,qBAAe,EAAC,MAAM,CAAC,CAAC;IAEzC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;QACtB,MAAM,IAAI,4BAAc,CAAC,IAAA,yBAAgB,EAAC,MAAA,QAAQ,CAAC,MAAM,mCAAI,EAAE,CAAC,CAAC,CAAC;KACnE;AACH,CAAC;AArBD,gDAqBC;AAED,SAAS,gBAAgB,CAAC,IAAwB;IAChD,OAAO,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,IAAI,IAAI,MAAM,IAAI,IAAI,CAAC,CAAC;AAClH,CAAC;AAED,SAAgB,eAAe,CAAC,IAAwB,EAAE,IAAY;IACpE,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE;QAC3B,MAAM,IAAI,+BAAsB,CAAC,yBAAyB,EAAE,0BAA0B,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;KAC1G;AACH,CAAC;AAJD,0CAIC"}
|
|
@@ -1,10 +1,14 @@
|
|
|
1
1
|
import type { ErrorObject } from 'ajv';
|
|
2
2
|
import type { IDiagnostic, JsonPath } from '@stoplight/types';
|
|
3
|
-
declare type
|
|
4
|
-
|
|
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
|
+
interface IRulesetValidationSingleError extends Pick<IDiagnostic, 'message' | 'path'> {
|
|
5
|
+
code: RulesetValidationErrorCode;
|
|
6
|
+
}
|
|
7
|
+
export declare class RulesetValidationError extends Error implements IRulesetValidationSingleError {
|
|
8
|
+
readonly code: RulesetValidationErrorCode;
|
|
5
9
|
readonly message: string;
|
|
6
10
|
readonly path: JsonPath;
|
|
7
|
-
constructor(message: string, path: JsonPath);
|
|
11
|
+
constructor(code: RulesetValidationErrorCode, message: string, path: JsonPath);
|
|
8
12
|
}
|
|
9
13
|
export declare function convertAjvErrors(errors: ErrorObject[]): RulesetValidationError[];
|
|
10
14
|
export {};
|
|
@@ -3,8 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.convertAjvErrors = exports.RulesetValidationError = void 0;
|
|
4
4
|
const isAggregateError_1 = require("../../guards/isAggregateError");
|
|
5
5
|
class RulesetValidationError extends Error {
|
|
6
|
-
constructor(message, path) {
|
|
6
|
+
constructor(code, message, path) {
|
|
7
7
|
super(message);
|
|
8
|
+
this.code = code;
|
|
8
9
|
this.message = message;
|
|
9
10
|
this.path = path;
|
|
10
11
|
}
|
|
@@ -49,9 +50,11 @@ function convertAjvErrors(errors) {
|
|
|
49
50
|
}
|
|
50
51
|
return filteredErrors.flatMap(error => {
|
|
51
52
|
var _a;
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
53
|
+
if (error.keyword === 'x-spectral-runtime') {
|
|
54
|
+
return flatErrors(error.params.errors);
|
|
55
|
+
}
|
|
56
|
+
const path = error.instancePath.slice(1).split('/');
|
|
57
|
+
return new RulesetValidationError(inferErrorCode(path, error.keyword), (_a = error.message) !== null && _a !== void 0 ? _a : 'unknown error', path);
|
|
55
58
|
});
|
|
56
59
|
}
|
|
57
60
|
exports.convertAjvErrors = convertAjvErrors;
|
|
@@ -61,4 +64,60 @@ function flatErrors(error) {
|
|
|
61
64
|
}
|
|
62
65
|
return error;
|
|
63
66
|
}
|
|
67
|
+
function inferErrorCode(path, keyword) {
|
|
68
|
+
if (path.length === 0) {
|
|
69
|
+
return 'generic-validation-error';
|
|
70
|
+
}
|
|
71
|
+
if (path.length === 1 && keyword !== 'errorMessage') {
|
|
72
|
+
return 'invalid-ruleset-definition';
|
|
73
|
+
}
|
|
74
|
+
switch (path[0]) {
|
|
75
|
+
case 'rules':
|
|
76
|
+
return inferErrorCodeFromRulesError(path);
|
|
77
|
+
case 'parserOptions':
|
|
78
|
+
return 'invalid-parser-options-definition';
|
|
79
|
+
case 'aliases':
|
|
80
|
+
return inferErrorCodeFromAliasesError(path);
|
|
81
|
+
case 'extends':
|
|
82
|
+
return 'invalid-extend-definition';
|
|
83
|
+
case 'overrides':
|
|
84
|
+
return inferErrorCodeFromOverrideError(path, keyword);
|
|
85
|
+
case 'formats':
|
|
86
|
+
if (path.length === 1) {
|
|
87
|
+
return 'invalid-ruleset-definition';
|
|
88
|
+
}
|
|
89
|
+
return 'invalid-format';
|
|
90
|
+
default:
|
|
91
|
+
return 'generic-validation-error';
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
function inferErrorCodeFromRulesError(path) {
|
|
95
|
+
if (path.length === 3 && path[2] === 'severity') {
|
|
96
|
+
return 'invalid-severity';
|
|
97
|
+
}
|
|
98
|
+
if (path.length === 4 && path[2] === 'formats') {
|
|
99
|
+
return 'invalid-format';
|
|
100
|
+
}
|
|
101
|
+
if (path.length === 4 && path[2] === 'given') {
|
|
102
|
+
return 'invalid-given-definition';
|
|
103
|
+
}
|
|
104
|
+
return 'invalid-rule-definition';
|
|
105
|
+
}
|
|
106
|
+
function inferErrorCodeFromOverrideError(path, keyword) {
|
|
107
|
+
if (path.length >= 3) {
|
|
108
|
+
return inferErrorCode(path.slice(2), keyword);
|
|
109
|
+
}
|
|
110
|
+
return 'invalid-override-definition';
|
|
111
|
+
}
|
|
112
|
+
function inferErrorCodeFromAliasesError(path) {
|
|
113
|
+
if (path.length === 6) {
|
|
114
|
+
if (path[4] === 'given') {
|
|
115
|
+
return 'invalid-given-definition';
|
|
116
|
+
}
|
|
117
|
+
if (path[4] === 'formats') {
|
|
118
|
+
return 'invalid-format';
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
return 'invalid-alias-definition';
|
|
122
|
+
}
|
|
64
123
|
//# sourceMappingURL=errors.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../src/ruleset/validation/errors.ts"],"names":[],"mappings":";;;AAEA,oEAAiE;
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../src/ruleset/validation/errors.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export { RulesetValidationError } from './errors';
|
|
1
|
+
export { RulesetValidationError, RulesetValidationErrorCode } from './errors';
|
|
2
2
|
export { assertValidRuleset } from './assertions';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/ruleset/validation/index.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/ruleset/validation/index.ts"],"names":[],"mappings":";;;AAAA,mCAA8E;AAArE,gHAAA,sBAAsB,OAAA;AAC/B,2CAAkD;AAAzC,gHAAA,kBAAkB,OAAA"}
|
|
@@ -6,6 +6,7 @@ const lodash_1 = require("lodash");
|
|
|
6
6
|
const alias_1 = require("../../alias");
|
|
7
7
|
const formats_1 = require("../../formats");
|
|
8
8
|
const error_1 = require("./common/error");
|
|
9
|
+
const errors_1 = require("../errors");
|
|
9
10
|
function getOverrides(overrides, key) {
|
|
10
11
|
if (!Array.isArray(overrides))
|
|
11
12
|
return null;
|
|
@@ -18,8 +19,8 @@ function getOverrides(overrides, key) {
|
|
|
18
19
|
return (0, json_1.isPlainObject)(actualOverrides) && (0, json_1.isPlainObject)(actualOverrides.aliases) ? actualOverrides.aliases : null;
|
|
19
20
|
}
|
|
20
21
|
function validateAlias(ruleset, alias, path) {
|
|
22
|
+
const parsedPath = (0, error_1.toParsedPath)(path);
|
|
21
23
|
try {
|
|
22
|
-
const parsedPath = path.slice(1).split('/');
|
|
23
24
|
const formats = (0, lodash_1.get)(ruleset, [...parsedPath.slice(0, parsedPath.indexOf('rules') + 2), 'formats']);
|
|
24
25
|
const aliases = parsedPath[0] === 'overrides'
|
|
25
26
|
? {
|
|
@@ -30,6 +31,9 @@ function validateAlias(ruleset, alias, path) {
|
|
|
30
31
|
(0, alias_1.resolveAlias)(aliases !== null && aliases !== void 0 ? aliases : null, alias, Array.isArray(formats) ? new formats_1.Formats(formats) : null);
|
|
31
32
|
}
|
|
32
33
|
catch (ex) {
|
|
34
|
+
if (ex instanceof ReferenceError) {
|
|
35
|
+
return new errors_1.RulesetValidationError('undefined-alias', ex.message, parsedPath);
|
|
36
|
+
}
|
|
33
37
|
return (0, error_1.wrapError)(ex, path);
|
|
34
38
|
}
|
|
35
39
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"alias.js","sourceRoot":"","sources":["../../../../src/ruleset/validation/validators/alias.ts"],"names":[],"mappings":";;;AAAA,0CAAgD;AAChD,mCAA6B;AAC7B,uCAA2C;AAC3C,2CAAwC;AACxC,
|
|
1
|
+
{"version":3,"file":"alias.js","sourceRoot":"","sources":["../../../../src/ruleset/validation/validators/alias.ts"],"names":[],"mappings":";;;AAAA,0CAAgD;AAChD,mCAA6B;AAC7B,uCAA2C;AAC3C,2CAAwC;AACxC,0CAAyD;AACzD,sCAAmD;AAEnD,SAAS,YAAY,CAAC,SAAkB,EAAE,GAAW;IACnD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC;QAAE,OAAO,IAAI,CAAC;IAE3C,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;IAC1B,IAAI,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IACrC,IAAI,KAAK,GAAG,CAAC,IAAI,KAAK,IAAI,SAAS,CAAC,MAAM;QAAE,OAAO,IAAI,CAAC;IAExD,MAAM,eAAe,GAAY,SAAS,CAAC,KAAK,CAAC,CAAC;IAClD,OAAO,IAAA,oBAAa,EAAC,eAAe,CAAC,IAAI,IAAA,oBAAa,EAAC,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;AACnH,CAAC;AAED,SAAgB,aAAa,CAC3B,OAAmF,EACnF,KAAa,EACb,IAAY;IAEZ,MAAM,UAAU,GAAG,IAAA,oBAAY,EAAC,IAAI,CAAC,CAAC;IAEtC,IAAI;QACF,MAAM,OAAO,GAAY,IAAA,YAAG,EAAC,OAAO,EAAE,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC;QAE5G,MAAM,OAAO,GACX,UAAU,CAAC,CAAC,CAAC,KAAK,WAAW;YAC3B,CAAC,CAAC;gBACE,GAAG,OAAO,CAAC,OAAO;gBAClB,GAAG,YAAY,CAAC,OAAO,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;aAClD;YACH,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC;QAEtB,IAAA,oBAAY,EAAC,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,iBAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;KAC5F;IAAC,OAAO,EAAE,EAAE;QACX,IAAI,EAAE,YAAY,cAAc,EAAE;YAChC,OAAO,IAAI,+BAAsB,CAAC,iBAAiB,EAAE,EAAE,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;SAC9E;QAED,OAAO,IAAA,iBAAS,EAAC,EAAE,EAAE,IAAI,CAAC,CAAC;KAC5B;AACH,CAAC;AA1BD,sCA0BC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.wrapError = void 0;
|
|
3
|
+
exports.toParsedPath = exports.wrapError = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const lodash_1 = require("lodash");
|
|
6
6
|
const es_aggregate_error_1 = (0, tslib_1.__importDefault)(require("es-aggregate-error"));
|
|
@@ -11,14 +11,18 @@ function toRulesetValidationError(ex) {
|
|
|
11
11
|
ex.path.unshift(...this);
|
|
12
12
|
return ex;
|
|
13
13
|
}
|
|
14
|
-
return new errors_1.RulesetValidationError((0, lodash_1.isError)(ex) ? ex.message : String(ex), [...this]);
|
|
14
|
+
return new errors_1.RulesetValidationError('generic-validation-error', (0, lodash_1.isError)(ex) ? ex.message : String(ex), [...this]);
|
|
15
15
|
}
|
|
16
16
|
function wrapError(ex, path) {
|
|
17
|
-
const parsedPath = path
|
|
17
|
+
const parsedPath = toParsedPath(path);
|
|
18
18
|
if ((0, isAggregateError_1.isAggregateError)(ex)) {
|
|
19
19
|
return new es_aggregate_error_1.default(ex.errors.map(toRulesetValidationError, parsedPath));
|
|
20
20
|
}
|
|
21
21
|
return toRulesetValidationError.call(parsedPath, ex);
|
|
22
22
|
}
|
|
23
23
|
exports.wrapError = wrapError;
|
|
24
|
+
function toParsedPath(path) {
|
|
25
|
+
return path.slice(1).split('/');
|
|
26
|
+
}
|
|
27
|
+
exports.toParsedPath = toParsedPath;
|
|
24
28
|
//# sourceMappingURL=error.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error.js","sourceRoot":"","sources":["../../../../../src/ruleset/validation/validators/common/error.ts"],"names":[],"mappings":";;;;AAAA,mCAAiC;AACjC,yFAAgD;AAEhD,yCAAsD;AACtD,0EAAuE;AAEvE,SAAS,wBAAwB,CAA8B,EAAW;IACxE,IAAI,EAAE,YAAY,+BAAsB,EAAE;QACxC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC;QACzB,OAAO,EAAE,CAAC;KACX;IAED,OAAO,IAAI,+BAAsB,CAAC,IAAA,gBAAO,EAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"error.js","sourceRoot":"","sources":["../../../../../src/ruleset/validation/validators/common/error.ts"],"names":[],"mappings":";;;;AAAA,mCAAiC;AACjC,yFAAgD;AAEhD,yCAAsD;AACtD,0EAAuE;AAEvE,SAAS,wBAAwB,CAA8B,EAAW;IACxE,IAAI,EAAE,YAAY,+BAAsB,EAAE;QACxC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC;QACzB,OAAO,EAAE,CAAC;KACX;IAED,OAAO,IAAI,+BAAsB,CAAC,0BAA0B,EAAE,IAAA,gBAAO,EAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;AAClH,CAAC;AAED,SAAgB,SAAS,CAAC,EAAW,EAAE,IAAY;IACjD,MAAM,UAAU,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;IAEtC,IAAI,IAAA,mCAAgB,EAAC,EAAE,CAAC,EAAE;QACxB,OAAO,IAAI,4BAAc,CAAC,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,wBAAwB,EAAE,UAAU,CAAC,CAAC,CAAC;KAChF;IAED,OAAO,wBAAwB,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;AACvD,CAAC;AARD,8BAQC;AAED,SAAgB,YAAY,CAAC,IAAY;IACvC,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;AAClC,CAAC;AAFD,oCAEC"}
|
|
@@ -2,9 +2,10 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.validateFunction = void 0;
|
|
4
4
|
const error_1 = require("./common/error");
|
|
5
|
+
const errors_1 = require("../errors");
|
|
5
6
|
function assertRulesetFunction(maybeRulesetFunction) {
|
|
6
7
|
if (typeof maybeRulesetFunction !== 'function') {
|
|
7
|
-
throw
|
|
8
|
+
throw ReferenceError('Function is not defined');
|
|
8
9
|
}
|
|
9
10
|
}
|
|
10
11
|
function validateFunction(fn, opts, path) {
|
|
@@ -16,6 +17,9 @@ function validateFunction(fn, opts, path) {
|
|
|
16
17
|
validator(opts);
|
|
17
18
|
}
|
|
18
19
|
catch (ex) {
|
|
20
|
+
if (ex instanceof ReferenceError) {
|
|
21
|
+
return new errors_1.RulesetValidationError('undefined-function', ex.message, (0, error_1.toParsedPath)(path));
|
|
22
|
+
}
|
|
19
23
|
return (0, error_1.wrapError)(ex, path);
|
|
20
24
|
}
|
|
21
25
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"function.js","sourceRoot":"","sources":["../../../../src/ruleset/validation/validators/function.ts"],"names":[],"mappings":";;;AACA,
|
|
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;SACzF;QAED,OAAO,IAAA,iBAAS,EAAC,EAAE,EAAE,IAAI,CAAC,CAAC;KAC5B;AACH,CAAC;AAnBD,4CAmBC"}
|