@stoplight/spectral-core 1.5.0 → 1.7.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/consts.d.ts +0 -1
- package/dist/consts.js +1 -2
- package/dist/consts.js.map +1 -1
- package/dist/document.js +4 -4
- package/dist/document.js.map +1 -1
- package/dist/documentInventory.js +17 -17
- package/dist/documentInventory.js.map +1 -1
- package/dist/errorMessages.js +2 -2
- package/dist/errorMessages.js.map +1 -1
- package/dist/guards/isAggregateError.d.ts +3 -0
- package/dist/guards/isAggregateError.js +9 -0
- package/dist/guards/isAggregateError.js.map +1 -0
- package/dist/index.js +3 -3
- package/dist/index.js.map +1 -1
- package/dist/meta/rule.schema.json +4 -4
- package/dist/meta/ruleset.schema.json +47 -10
- package/dist/meta/shared.json +5 -2
- package/dist/ruleset/mergers/rules.js +1 -1
- package/dist/ruleset/mergers/rules.js.map +1 -1
- package/dist/ruleset/rule/rule.d.ts +6 -5
- package/dist/ruleset/rule/rule.js +57 -23
- package/dist/ruleset/rule/rule.js.map +1 -1
- package/dist/ruleset/ruleset.d.ts +4 -3
- package/dist/ruleset/ruleset.js +38 -20
- package/dist/ruleset/ruleset.js.map +1 -1
- package/dist/ruleset/rulesetFunction.d.ts +16 -6
- package/dist/ruleset/rulesetFunction.js +7 -7
- package/dist/ruleset/rulesetFunction.js.map +1 -1
- package/dist/ruleset/types.d.ts +9 -1
- package/dist/ruleset/utils/formatsSet.d.ts +4 -0
- package/dist/ruleset/utils/formatsSet.js +14 -0
- package/dist/ruleset/utils/formatsSet.js.map +1 -0
- package/dist/ruleset/utils/index.js +1 -1
- package/dist/ruleset/utils/index.js.map +1 -1
- package/dist/ruleset/validation.js +11 -11
- package/dist/ruleset/validation.js.map +1 -1
- package/dist/runner/lintNode.js +7 -7
- package/dist/runner/lintNode.js.map +1 -1
- package/dist/runner/runner.js +17 -15
- package/dist/runner/runner.js.map +1 -1
- package/dist/runner/utils/getLintTargets.js +5 -5
- package/dist/runner/utils/getLintTargets.js.map +1 -1
- package/dist/runner/utils/index.js +2 -2
- package/dist/runner/utils/index.js.map +1 -1
- package/dist/runner/utils/message.js +1 -1
- package/dist/runner/utils/message.js.map +1 -1
- package/dist/spectral.js +8 -8
- package/dist/spectral.js.map +1 -1
- package/dist/types/index.js +2 -2
- package/dist/types/index.js.map +1 -1
- package/dist/utils/index.js +2 -2
- package/dist/utils/index.js.map +1 -1
- package/dist/utils/prepareResults.js +1 -1
- package/dist/utils/prepareResults.js.map +1 -1
- package/dist/utils/replacer.js +2 -2
- package/dist/utils/replacer.js.map +1 -1
- package/dist/utils/sortResults.js +1 -1
- package/dist/utils/sortResults.js.map +1 -1
- package/package.json +8 -10
package/dist/consts.d.ts
CHANGED
package/dist/consts.js
CHANGED
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.DEFAULT_PARSER_OPTIONS =
|
|
3
|
+
exports.DEFAULT_PARSER_OPTIONS = void 0;
|
|
4
4
|
const types_1 = require("@stoplight/types");
|
|
5
|
-
exports.SPECTRAL_PKG_VERSION = '1.4.0';
|
|
6
5
|
exports.DEFAULT_PARSER_OPTIONS = Object.freeze({
|
|
7
6
|
incompatibleValues: types_1.DiagnosticSeverity.Error,
|
|
8
7
|
duplicateKeys: types_1.DiagnosticSeverity.Error,
|
package/dist/consts.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"consts.js","sourceRoot":"","sources":["../src/consts.ts"],"names":[],"mappings":";;;AAAA,4CAAsD;AAGzC,QAAA,
|
|
1
|
+
{"version":3,"file":"consts.js","sourceRoot":"","sources":["../src/consts.ts"],"names":[],"mappings":";;;AAAA,4CAAsD;AAGzC,QAAA,sBAAsB,GAAG,MAAM,CAAC,MAAM,CAA0B;IAC3E,kBAAkB,EAAE,0BAAkB,CAAC,KAAK;IAC5C,aAAa,EAAE,0BAAkB,CAAC,KAAK;CACxC,CAAC,CAAC"}
|
package/dist/document.js
CHANGED
|
@@ -8,7 +8,7 @@ const json_1 = require("@stoplight/json");
|
|
|
8
8
|
function normalizeSource(source) {
|
|
9
9
|
if (source === void 0)
|
|
10
10
|
return null;
|
|
11
|
-
return source.length > 0 && !spectral_runtime_1.startsWithProtocol(source) ? path_1.normalize(source) : source;
|
|
11
|
+
return source.length > 0 && !(0, spectral_runtime_1.startsWithProtocol)(source) ? (0, path_1.normalize)(source) : source;
|
|
12
12
|
}
|
|
13
13
|
exports.normalizeSource = normalizeSource;
|
|
14
14
|
class Document {
|
|
@@ -17,7 +17,7 @@ class Document {
|
|
|
17
17
|
this.parser = parser;
|
|
18
18
|
this.parserResult = parser.parse(input);
|
|
19
19
|
this.source = normalizeSource(source);
|
|
20
|
-
this.diagnostics = errorMessages_1.formatParserDiagnostics(this.parserResult.diagnostics, this.source);
|
|
20
|
+
this.diagnostics = (0, errorMessages_1.formatParserDiagnostics)(this.parserResult.diagnostics, this.source);
|
|
21
21
|
}
|
|
22
22
|
getRangeForJsonPath(path, closest) {
|
|
23
23
|
var _a;
|
|
@@ -47,7 +47,7 @@ class ParsedDocument {
|
|
|
47
47
|
constructor(parserResult) {
|
|
48
48
|
this.parserResult = parserResult;
|
|
49
49
|
this.source = normalizeSource(parserResult.source);
|
|
50
|
-
this.diagnostics = errorMessages_1.formatParserDiagnostics(this.parserResult.parsed.diagnostics, this.source);
|
|
50
|
+
this.diagnostics = (0, errorMessages_1.formatParserDiagnostics)(this.parserResult.parsed.diagnostics, this.source);
|
|
51
51
|
}
|
|
52
52
|
trapAccess(obj) {
|
|
53
53
|
return obj;
|
|
@@ -61,6 +61,6 @@ class ParsedDocument {
|
|
|
61
61
|
}
|
|
62
62
|
}
|
|
63
63
|
exports.ParsedDocument = ParsedDocument;
|
|
64
|
-
const isParsedResult = (obj) => json_1.isPlainObject(obj) && json_1.isPlainObject(obj.parsed) && typeof obj.getLocationForJsonPath === 'function';
|
|
64
|
+
const isParsedResult = (obj) => (0, json_1.isPlainObject)(obj) && (0, json_1.isPlainObject)(obj.parsed) && typeof obj.getLocationForJsonPath === 'function';
|
|
65
65
|
exports.isParsedResult = isParsedResult;
|
|
66
66
|
//# sourceMappingURL=document.js.map
|
package/dist/document.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"document.js","sourceRoot":"","sources":["../src/document.ts"],"names":[],"mappings":";;;AAAA,0CAA4C;AAE5C,mDAA0D;AAC1D,kEAAiE;AACjE,0CAAgD;AAiBhD,SAAgB,eAAe,CAAC,MAAwB;IACtD,IAAI,MAAM,KAAK,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IACnC,OAAO,MAAM,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,qCAAkB,
|
|
1
|
+
{"version":3,"file":"document.js","sourceRoot":"","sources":["../src/document.ts"],"names":[],"mappings":";;;AAAA,0CAA4C;AAE5C,mDAA0D;AAC1D,kEAAiE;AACjE,0CAAgD;AAiBhD,SAAgB,eAAe,CAAC,MAAwB;IACtD,IAAI,MAAM,KAAK,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IACnC,OAAO,MAAM,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,IAAA,qCAAkB,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAA,gBAAS,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;AACvF,CAAC;AAHD,0CAGC;AAED,MAAa,QAAQ;IAMnB,YAA+B,KAAa,EAAqB,MAAkB,EAAE,MAAe;QAArE,UAAK,GAAL,KAAK,CAAQ;QAAqB,WAAM,GAAN,MAAM,CAAY;QACjF,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAExC,IAAI,CAAC,MAAM,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;QACtC,IAAI,CAAC,WAAW,GAAG,IAAA,uCAAuB,EAAC,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACzF,CAAC;IAEM,mBAAmB,CAAC,IAAc,EAAE,OAAiB;;QAC1D,OAAO,MAAA,IAAI,CAAC,MAAM,CAAC,sBAAsB,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,EAAE,OAAO,CAAC,0CAAE,KAAK,CAAC;IACrF,CAAC;IAEM,UAAU,CAA8D,GAAM;QACnF,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,CAAI,GAAG,CAAC,CAAC;IACxC,CAAC;IAEM,MAAM,KAAK,aAAa;QAC7B,OAAO;YACL,KAAK,EAAE;gBACL,SAAS,EAAE,CAAC;gBACZ,IAAI,EAAE,CAAC;aACR;YACD,GAAG,EAAE;gBACH,SAAS,EAAE,CAAC;gBACZ,IAAI,EAAE,CAAC;aACR;SACF,CAAC;IACJ,CAAC;IAED,IAAW,IAAI;QACb,OAAO,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC;IAChC,CAAC;CACF;AArCD,4BAqCC;AAED,MAAa,cAAc;IAKzB,YAA+B,YAAe;QAAf,iBAAY,GAAZ,YAAY,CAAG;QAE5C,IAAI,CAAC,MAAM,GAAG,eAAe,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QACnD,IAAI,CAAC,WAAW,GAAG,IAAA,uCAAuB,EAAC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAChG,CAAC;IAEM,UAAU,CAA8D,GAAM;QACnF,OAAO,GAAG,CAAC;IACb,CAAC;IAEM,mBAAmB,CAAC,IAAc,EAAE,OAAiB;;QAC1D,OAAO,MAAA,IAAI,CAAC,YAAY,CAAC,sBAAsB,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,0CAAE,KAAK,CAAC;IAClG,CAAC;IAED,IAAW,IAAI;QACb,OAAO,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC;IACvC,CAAC;CACF;AAtBD,wCAsBC;AAUM,MAAM,cAAc,GAAG,CAAC,GAAY,EAAwB,EAAE,CACnE,IAAA,oBAAa,EAAC,GAAG,CAAC,IAAI,IAAA,oBAAa,EAAC,GAAG,CAAC,MAAM,CAAC,IAAI,OAAO,GAAG,CAAC,sBAAsB,KAAK,UAAU,CAAC;AADzF,QAAA,cAAc,kBAC2E"}
|
|
@@ -15,13 +15,13 @@ class DocumentInventory {
|
|
|
15
15
|
this.diagnostics = [];
|
|
16
16
|
this.parseResolveResult = resolveOpts => {
|
|
17
17
|
const source = resolveOpts.targetAuthority.href().replace(/\/$/, '');
|
|
18
|
-
const ext = path_1.extname(source);
|
|
18
|
+
const ext = (0, path_1.extname)(source);
|
|
19
19
|
const content = String(resolveOpts.result);
|
|
20
20
|
const parser = ext === '.json' ? Parsers.Json : Parsers.Yaml;
|
|
21
21
|
const document = new document_1.Document(content, parser, source);
|
|
22
22
|
resolveOpts.result = document.data;
|
|
23
23
|
if (document.diagnostics.length > 0) {
|
|
24
|
-
this.diagnostics.push(...errorMessages_1.formatParserDiagnostics(document.diagnostics, document.source));
|
|
24
|
+
this.diagnostics.push(...(0, errorMessages_1.formatParserDiagnostics)(document.diagnostics, document.source));
|
|
25
25
|
}
|
|
26
26
|
this.referencedDocuments[source] = document;
|
|
27
27
|
return Promise.resolve(resolveOpts);
|
|
@@ -49,7 +49,7 @@ class DocumentInventory {
|
|
|
49
49
|
return (_a = this.document.formats) !== null && _a !== void 0 ? _a : null;
|
|
50
50
|
}
|
|
51
51
|
async resolve() {
|
|
52
|
-
if (!lodash_1.isObjectLike(this.document.data)) {
|
|
52
|
+
if (!(0, lodash_1.isObjectLike)(this.document.data)) {
|
|
53
53
|
this.graph = null;
|
|
54
54
|
this.resolved = this.document.data;
|
|
55
55
|
this.errors = null;
|
|
@@ -61,11 +61,11 @@ class DocumentInventory {
|
|
|
61
61
|
});
|
|
62
62
|
this.graph = resolveResult.graph;
|
|
63
63
|
this.resolved = resolveResult.result;
|
|
64
|
-
this.errors = errorMessages_1.formatResolverErrors(this.document, resolveResult.errors);
|
|
64
|
+
this.errors = (0, errorMessages_1.formatResolverErrors)(this.document, resolveResult.errors);
|
|
65
65
|
}
|
|
66
66
|
findAssociatedItemForPath(path, resolved) {
|
|
67
67
|
if (!resolved) {
|
|
68
|
-
const newPath = spectral_runtime_1.getClosestJsonPath(this.unresolved, path);
|
|
68
|
+
const newPath = (0, spectral_runtime_1.getClosestJsonPath)(this.unresolved, path);
|
|
69
69
|
return {
|
|
70
70
|
document: this.document,
|
|
71
71
|
path: newPath,
|
|
@@ -73,12 +73,12 @@ class DocumentInventory {
|
|
|
73
73
|
};
|
|
74
74
|
}
|
|
75
75
|
try {
|
|
76
|
-
const newPath = spectral_runtime_1.getClosestJsonPath(this.resolved, path);
|
|
77
|
-
let $ref = spectral_runtime_1.traverseObjUntilRef(this.unresolved, newPath);
|
|
76
|
+
const newPath = (0, spectral_runtime_1.getClosestJsonPath)(this.resolved, path);
|
|
77
|
+
let $ref = (0, spectral_runtime_1.traverseObjUntilRef)(this.unresolved, newPath);
|
|
78
78
|
if ($ref === null) {
|
|
79
79
|
return {
|
|
80
80
|
document: this.document,
|
|
81
|
-
path: spectral_runtime_1.getClosestJsonPath(this.unresolved, path),
|
|
81
|
+
path: (0, spectral_runtime_1.getClosestJsonPath)(this.unresolved, path),
|
|
82
82
|
missingPropertyPath: path,
|
|
83
83
|
};
|
|
84
84
|
}
|
|
@@ -87,32 +87,32 @@ class DocumentInventory {
|
|
|
87
87
|
while (true) {
|
|
88
88
|
if (source === null || this.graph === null)
|
|
89
89
|
return null;
|
|
90
|
-
$ref = spectral_runtime_1.getEndRef(this.graph.getNodeData(source).refMap, $ref);
|
|
90
|
+
$ref = (0, spectral_runtime_1.getEndRef)(this.graph.getNodeData(source).refMap, $ref);
|
|
91
91
|
if ($ref === null)
|
|
92
92
|
return null;
|
|
93
|
-
const scopedPath = [...spectral_runtime_1.safePointerToPath($ref), ...newPath];
|
|
93
|
+
const scopedPath = [...(0, spectral_runtime_1.safePointerToPath)($ref), ...newPath];
|
|
94
94
|
let resolvedDoc = this.document;
|
|
95
|
-
if (json_1.isLocalRef($ref)) {
|
|
95
|
+
if ((0, json_1.isLocalRef)($ref)) {
|
|
96
96
|
resolvedDoc = source === this.document.source ? this.document : this.referencedDocuments[source];
|
|
97
97
|
}
|
|
98
98
|
else {
|
|
99
|
-
const extractedSource = json_1.extractSourceFromRef($ref);
|
|
99
|
+
const extractedSource = (0, json_1.extractSourceFromRef)($ref);
|
|
100
100
|
if (extractedSource === null) {
|
|
101
101
|
return {
|
|
102
102
|
document: resolvedDoc,
|
|
103
|
-
path: spectral_runtime_1.getClosestJsonPath(resolvedDoc.data, path),
|
|
103
|
+
path: (0, spectral_runtime_1.getClosestJsonPath)(resolvedDoc.data, path),
|
|
104
104
|
missingPropertyPath: path,
|
|
105
105
|
};
|
|
106
106
|
}
|
|
107
|
-
source = spectral_runtime_1.isAbsoluteRef(extractedSource) ? extractedSource : path_1.resolve(source, '..', extractedSource);
|
|
107
|
+
source = (0, spectral_runtime_1.isAbsoluteRef)(extractedSource) ? extractedSource : (0, path_1.resolve)(source, '..', extractedSource);
|
|
108
108
|
resolvedDoc = source === this.document.source ? this.document : this.referencedDocuments[source];
|
|
109
|
-
const obj = scopedPath.length === 0 || json_1.hasRef(resolvedDoc.data) ? resolvedDoc.data : lodash_1.get(resolvedDoc.data, scopedPath);
|
|
110
|
-
if (json_1.hasRef(obj)) {
|
|
109
|
+
const obj = scopedPath.length === 0 || (0, json_1.hasRef)(resolvedDoc.data) ? resolvedDoc.data : (0, lodash_1.get)(resolvedDoc.data, scopedPath);
|
|
110
|
+
if ((0, json_1.hasRef)(obj)) {
|
|
111
111
|
$ref = obj.$ref;
|
|
112
112
|
continue;
|
|
113
113
|
}
|
|
114
114
|
}
|
|
115
|
-
const closestPath = spectral_runtime_1.getClosestJsonPath(resolvedDoc.data, scopedPath);
|
|
115
|
+
const closestPath = (0, spectral_runtime_1.getClosestJsonPath)(resolvedDoc.data, scopedPath);
|
|
116
116
|
return {
|
|
117
117
|
document: resolvedDoc,
|
|
118
118
|
path: closestPath,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"documentInventory.js","sourceRoot":"","sources":["../src/documentInventory.ts"],"names":[],"mappings":";;;AAAA,0CAA2E;AAC3E,0CAAmD;AAEnD,mCAA2C;AAC3C,yCAAiD;AAGjD,mDAAgF;AAChF,uDAAuD;AAEvD,kEAMqC;AAerC,MAAa,iBAAiB;IAsB5B,YAA4B,QAAmB,EAAY,QAAkB;QAAjD,aAAQ,GAAR,QAAQ,CAAW;QAAY,aAAQ,GAAR,QAAQ,CAAU;QAhBtE,gBAAW,GAAkB,EAAE,CAAC;QA4H7B,uBAAkB,GAAmC,WAAW,CAAC,EAAE;YAC3E,MAAM,MAAM,GAAG,WAAW,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YACrE,MAAM,GAAG,GAAG,cAAO,
|
|
1
|
+
{"version":3,"file":"documentInventory.js","sourceRoot":"","sources":["../src/documentInventory.ts"],"names":[],"mappings":"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"}
|
package/dist/errorMessages.js
CHANGED
|
@@ -39,7 +39,7 @@ function formatParserDiagnostics(diagnostics, source) {
|
|
|
39
39
|
}
|
|
40
40
|
exports.formatParserDiagnostics = formatParserDiagnostics;
|
|
41
41
|
const formatResolverErrors = (document, diagnostics) => {
|
|
42
|
-
return lodash_1.uniqBy(diagnostics, 'message').map(error => {
|
|
42
|
+
return (0, lodash_1.uniqBy)(diagnostics, 'message').map(error => {
|
|
43
43
|
var _a;
|
|
44
44
|
const path = [...error.path, '$ref'];
|
|
45
45
|
const range = (_a = document.getRangeForJsonPath(path, true)) !== null && _a !== void 0 ? _a : document_1.Document.DEFAULT_RANGE;
|
|
@@ -47,7 +47,7 @@ const formatResolverErrors = (document, diagnostics) => {
|
|
|
47
47
|
return {
|
|
48
48
|
code: 'invalid-ref',
|
|
49
49
|
path,
|
|
50
|
-
message: exports.prettyPrintResolverErrorMessage(error.message),
|
|
50
|
+
message: (0, exports.prettyPrintResolverErrorMessage)(error.message),
|
|
51
51
|
severity: types_1.DiagnosticSeverity.Error,
|
|
52
52
|
range,
|
|
53
53
|
...(source !== null ? { source } : null),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errorMessages.js","sourceRoot":"","sources":["../src/errorMessages.ts"],"names":[],"mappings":";;;AAAA,4CAAsF;AACtF,mCAAgC;AAChC,yCAAiD;AAIjD,MAAM,WAAW,GAAG,CAAC,IAAY,EAAU,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;AACjE,MAAM,SAAS,GAAG,CAAC,IAAY,EAAE,GAAW,EAAE,KAAa,EAAU,EAAE,CAAC,GAAG,GAAG,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;AAExG,SAAgB,yBAAyB,CAAC,UAAuB;IAC/D,MAAM,GAAG,GAAG,cAAc,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IAC5C,IAAI,iBAAiB,GAAG,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;IAE1E,IAAI,UAAU,CAAC,IAAI,KAAK,eAAe,EAAE;QAEvC,iBAAiB,GAAG,iBAAiB,CAAC,OAAO,CAAC,iBAAiB,EAAE,SAAS,CAAC,CAAC;KAC7E;IAED,IAAI,GAAG,KAAK,SAAS,EAAE;QACrB,iBAAiB,GAAG,iBAAiB,CAAC,OAAO,CAAC,iBAAiB,EAAE,OAAO,GAAG,EAAE,CAAC,CAAC;KAChF;IAED,OAAO,iBAAiB,CAAC;AAC3B,CAAC;AAdD,8DAcC;AAEM,MAAM,+BAA+B,GAAG,CAAC,OAAe,EAAU,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC;AAApG,QAAA,+BAA+B,mCAAqE;AAEjH,MAAM,cAAc,GAAG,CAAC,IAA0B,EAAkB,EAAE;IACpE,IAAI,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;QACzC,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;KAC9B;AACH,CAAC,CAAC;AAEF,SAAgB,uBAAuB,CAAC,WAAuC,EAAE,MAAqB;IACpG,OAAO,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE;;QAAC,OAAA,CAAC;YACpC,GAAG,UAAU;YACb,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,yBAAyB,CAAC,UAAU,CAAC;YAC9C,IAAI,EAAE,MAAA,UAAU,CAAC,IAAI,mCAAI,EAAE;YAC3B,GAAG,CAAC,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;SACzC,CAAC,CAAA;KAAA,CAAC,CAAC;AACN,CAAC;AARD,0DAQC;AAEM,MAAM,oBAAoB,GAAG,CAAC,QAAmB,EAAE,WAA2B,EAAiB,EAAE;IACtG,OAAO,eAAM,
|
|
1
|
+
{"version":3,"file":"errorMessages.js","sourceRoot":"","sources":["../src/errorMessages.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.isAggregateError = void 0;
|
|
4
|
+
const lodash_1 = require("lodash");
|
|
5
|
+
function isAggregateError(maybeAggregateError) {
|
|
6
|
+
return (0, lodash_1.isError)(maybeAggregateError) && maybeAggregateError.constructor.name === 'AggregateError';
|
|
7
|
+
}
|
|
8
|
+
exports.isAggregateError = isAggregateError;
|
|
9
|
+
//# sourceMappingURL=isAggregateError.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"isAggregateError.js","sourceRoot":"","sources":["../../src/guards/isAggregateError.ts"],"names":[],"mappings":";;;AAAA,mCAAiC;AAEjC,SAAgB,gBAAgB,CAAC,mBAA4B;IAC3D,OAAO,IAAA,gBAAO,EAAC,mBAAmB,CAAC,IAAI,mBAAmB,CAAC,WAAW,CAAC,IAAI,KAAK,gBAAgB,CAAC;AACnG,CAAC;AAFD,4CAEC"}
|
package/dist/index.js
CHANGED
|
@@ -2,10 +2,10 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ParsedDocument = exports.Document = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
-
tslib_1.__exportStar(require("./consts"), exports);
|
|
6
|
-
tslib_1.__exportStar(require("./spectral"), exports);
|
|
5
|
+
(0, tslib_1.__exportStar)(require("./consts"), exports);
|
|
6
|
+
(0, tslib_1.__exportStar)(require("./spectral"), exports);
|
|
7
7
|
var document_1 = require("./document");
|
|
8
8
|
Object.defineProperty(exports, "Document", { enumerable: true, get: function () { return document_1.Document; } });
|
|
9
9
|
Object.defineProperty(exports, "ParsedDocument", { enumerable: true, get: function () { return document_1.ParsedDocument; } });
|
|
10
|
-
tslib_1.__exportStar(require("./ruleset"), exports);
|
|
10
|
+
(0, tslib_1.__exportStar)(require("./ruleset"), exports);
|
|
11
11
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;AAAA,wDAAyB;AACzB,0DAA2B;AAC3B,uCAAsD;AAA7C,oGAAA,QAAQ,OAAA;AAAE,0GAAA,cAAc,OAAA;AACjC,yDAA0B"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"$schema": "http://json-schema.org/draft-07/schema#",
|
|
3
|
-
"$id": "
|
|
3
|
+
"$id": "@stoplight/spectral-core/meta/rule.schema",
|
|
4
4
|
"$defs": {
|
|
5
5
|
"Then": {
|
|
6
6
|
"type": "object",
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
]
|
|
21
21
|
},
|
|
22
22
|
"Severity": {
|
|
23
|
-
"$ref": "shared
|
|
23
|
+
"$ref": "shared#severity"
|
|
24
24
|
}
|
|
25
25
|
},
|
|
26
26
|
"oneOf": [
|
|
@@ -66,7 +66,7 @@
|
|
|
66
66
|
"type": "array"
|
|
67
67
|
},
|
|
68
68
|
"formats": {
|
|
69
|
-
"$ref": "shared
|
|
69
|
+
"$ref": "shared#formats"
|
|
70
70
|
},
|
|
71
71
|
"then": {
|
|
72
72
|
"anyOf": [
|
|
@@ -95,7 +95,7 @@
|
|
|
95
95
|
}
|
|
96
96
|
},
|
|
97
97
|
{
|
|
98
|
-
"$ref": "shared
|
|
98
|
+
"$ref": "shared#/$defs/HumanReadableSeverity"
|
|
99
99
|
},
|
|
100
100
|
{
|
|
101
101
|
"type": "boolean"
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"$schema": "http://json-schema.org/draft-07/schema#",
|
|
3
|
-
"$id": "
|
|
3
|
+
"$id": "@stoplight/spectral-core/meta/ruleset.schema",
|
|
4
4
|
"type": "object",
|
|
5
5
|
"additionalProperties": false,
|
|
6
6
|
"properties": {
|
|
@@ -12,11 +12,11 @@
|
|
|
12
12
|
"rules": {
|
|
13
13
|
"type": "object",
|
|
14
14
|
"additionalProperties": {
|
|
15
|
-
"$ref": "rule.schema
|
|
15
|
+
"$ref": "rule.schema#"
|
|
16
16
|
}
|
|
17
17
|
},
|
|
18
18
|
"formats": {
|
|
19
|
-
"$ref": "shared
|
|
19
|
+
"$ref": "shared#formats"
|
|
20
20
|
},
|
|
21
21
|
"extends": {
|
|
22
22
|
"oneOf": [
|
|
@@ -56,10 +56,10 @@
|
|
|
56
56
|
"type": "object",
|
|
57
57
|
"properties": {
|
|
58
58
|
"duplicateKeys": {
|
|
59
|
-
"$ref": "shared
|
|
59
|
+
"$ref": "shared#severity"
|
|
60
60
|
},
|
|
61
61
|
"incompatibleValues": {
|
|
62
|
-
"$ref": "shared
|
|
62
|
+
"$ref": "shared#severity"
|
|
63
63
|
}
|
|
64
64
|
},
|
|
65
65
|
"additionalProperties": false
|
|
@@ -91,7 +91,7 @@
|
|
|
91
91
|
"rules": {
|
|
92
92
|
"type": "object",
|
|
93
93
|
"additionalProperties": {
|
|
94
|
-
"$ref": "shared
|
|
94
|
+
"$ref": "shared#severity"
|
|
95
95
|
},
|
|
96
96
|
"errorMessage": {
|
|
97
97
|
"enum": "must be a valid severity level"
|
|
@@ -130,7 +130,7 @@
|
|
|
130
130
|
"type": "object",
|
|
131
131
|
"properties": {
|
|
132
132
|
"formats": {
|
|
133
|
-
"$ref": "
|
|
133
|
+
"$ref": "shared#formats"
|
|
134
134
|
},
|
|
135
135
|
"extends": {
|
|
136
136
|
"$ref": "#/properties/extends"
|
|
@@ -171,9 +171,46 @@
|
|
|
171
171
|
}
|
|
172
172
|
},
|
|
173
173
|
"additionalProperties": {
|
|
174
|
-
"
|
|
175
|
-
|
|
176
|
-
|
|
174
|
+
"oneOf": [
|
|
175
|
+
{
|
|
176
|
+
"$id": "alias-value",
|
|
177
|
+
"type": "string",
|
|
178
|
+
"pattern": "^[$#]",
|
|
179
|
+
"errorMessage": {
|
|
180
|
+
"_": "the value of an alias must be a valid JSON Path expression, a reference to the existing Alias optionally paired with a JSON Path expression subset, or contain a valid set of targets",
|
|
181
|
+
"pattern": "the value of an alias must be a valid JSON Path expression or a reference to the existing Alias optionally paired with a JSON Path expression subset"
|
|
182
|
+
}
|
|
183
|
+
},
|
|
184
|
+
{
|
|
185
|
+
"type": "object",
|
|
186
|
+
"properties": {
|
|
187
|
+
"description": {
|
|
188
|
+
"type": "string"
|
|
189
|
+
},
|
|
190
|
+
"targets": {
|
|
191
|
+
"type": "array",
|
|
192
|
+
"minItems": 1,
|
|
193
|
+
"items": {
|
|
194
|
+
"type": "object",
|
|
195
|
+
"properties": {
|
|
196
|
+
"formats": {
|
|
197
|
+
"$ref": "shared#formats"
|
|
198
|
+
},
|
|
199
|
+
"given": {
|
|
200
|
+
"$ref": "alias-value"
|
|
201
|
+
}
|
|
202
|
+
},
|
|
203
|
+
"required": ["formats", "given"],
|
|
204
|
+
"errorMessage": "a valid target must contain given and non-empty formats"
|
|
205
|
+
},
|
|
206
|
+
"errorMessage": {
|
|
207
|
+
"minItems": "targets must have at least a single alias definition"
|
|
208
|
+
}
|
|
209
|
+
}
|
|
210
|
+
},
|
|
211
|
+
"required": ["targets"]
|
|
212
|
+
}
|
|
213
|
+
]
|
|
177
214
|
}
|
|
178
215
|
}
|
|
179
216
|
},
|
package/dist/meta/shared.json
CHANGED
|
@@ -1,15 +1,17 @@
|
|
|
1
1
|
{
|
|
2
2
|
"$schema": "http://json-schema.org/draft-07/schema#",
|
|
3
|
-
"$id": "
|
|
3
|
+
"$id": "@stoplight/spectral-core/meta/shared",
|
|
4
4
|
"$defs": {
|
|
5
5
|
"Formats": {
|
|
6
|
+
"$anchor": "formats",
|
|
6
7
|
"type": "array",
|
|
7
8
|
"items": {
|
|
8
|
-
"$ref": "
|
|
9
|
+
"$ref": "#format"
|
|
9
10
|
},
|
|
10
11
|
"errorMessage": "must be an array of formats"
|
|
11
12
|
},
|
|
12
13
|
"Format": {
|
|
14
|
+
"$anchor": "format",
|
|
13
15
|
"spectral-runtime": "spectral-format",
|
|
14
16
|
"errorMessage": "must be a valid format"
|
|
15
17
|
},
|
|
@@ -20,6 +22,7 @@
|
|
|
20
22
|
"enum": ["error", "warn", "info", "hint", "off"]
|
|
21
23
|
},
|
|
22
24
|
"Severity": {
|
|
25
|
+
"$anchor": "severity",
|
|
23
26
|
"oneOf": [
|
|
24
27
|
{
|
|
25
28
|
"$ref": "#/$defs/DiagnosticSeverity"
|
|
@@ -30,7 +30,7 @@ function mergeRule(existingRule, name, rule, ruleset) {
|
|
|
30
30
|
Object.assign(existingRule, rule, { owner: existingRule.owner });
|
|
31
31
|
}
|
|
32
32
|
else {
|
|
33
|
-
validation_1.assertValidRule(rule);
|
|
33
|
+
(0, validation_1.assertValidRule)(rule);
|
|
34
34
|
return new rule_1.Rule(name, rule, ruleset);
|
|
35
35
|
}
|
|
36
36
|
break;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rules.js","sourceRoot":"","sources":["../../../src/ruleset/mergers/rules.ts"],"names":[],"mappings":";;;AACA,8CAAgD;AAChD,uCAAoC;AAIpC,SAAS,kBAAkB,CAAC,SAAyB,EAAE,IAAY;IACjE,IAAI,SAAS,KAAK,KAAK,CAAC,EAAE;QACxB,MAAM,IAAI,cAAc,CAAC,qCAAqC,IAAI,GAAG,CAAC,CAAC;KACxE;AACH,CAAC;AAQD,SAAgB,SAAS,CACvB,YAA4B,EAC5B,IAAY,EACZ,IAAwB,EACxB,OAAgB;IAEhB,QAAQ,OAAO,IAAI,EAAE;QACnB,KAAK,SAAS;YACZ,kBAAkB,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;YACvC,YAAY,CAAC,OAAO,GAAG,IAAI,CAAC;YAC5B,MAAM;QACR,KAAK,QAAQ,CAAC;QACd,KAAK,QAAQ;YACX,kBAAkB,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;YACvC,YAAY,CAAC,QAAQ,GAAG,IAAI,CAAC;YAC7B,IAAI,IAAI,KAAK,KAAK,EAAE;gBAClB,YAAY,CAAC,OAAO,GAAG,KAAK,CAAC;aAC9B;iBAAM,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE;gBAChC,YAAY,CAAC,OAAO,GAAG,IAAI,CAAC;aAC7B;YACD,MAAM;QACR,KAAK,QAAQ;YACX,IAAI,YAAY,KAAK,KAAK,CAAC,EAAE;gBAC3B,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,YAAY,CAAC,KAAK,EAAE,CAAC,CAAC;aAClE;iBAAM;gBACL,4BAAe,
|
|
1
|
+
{"version":3,"file":"rules.js","sourceRoot":"","sources":["../../../src/ruleset/mergers/rules.ts"],"names":[],"mappings":";;;AACA,8CAAgD;AAChD,uCAAoC;AAIpC,SAAS,kBAAkB,CAAC,SAAyB,EAAE,IAAY;IACjE,IAAI,SAAS,KAAK,KAAK,CAAC,EAAE;QACxB,MAAM,IAAI,cAAc,CAAC,qCAAqC,IAAI,GAAG,CAAC,CAAC;KACxE;AACH,CAAC;AAQD,SAAgB,SAAS,CACvB,YAA4B,EAC5B,IAAY,EACZ,IAAwB,EACxB,OAAgB;IAEhB,QAAQ,OAAO,IAAI,EAAE;QACnB,KAAK,SAAS;YACZ,kBAAkB,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;YACvC,YAAY,CAAC,OAAO,GAAG,IAAI,CAAC;YAC5B,MAAM;QACR,KAAK,QAAQ,CAAC;QACd,KAAK,QAAQ;YACX,kBAAkB,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;YACvC,YAAY,CAAC,QAAQ,GAAG,IAAI,CAAC;YAC7B,IAAI,IAAI,KAAK,KAAK,EAAE;gBAClB,YAAY,CAAC,OAAO,GAAG,KAAK,CAAC;aAC9B;iBAAM,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE;gBAChC,YAAY,CAAC,OAAO,GAAG,IAAI,CAAC;aAC7B;YACD,MAAM;QACR,KAAK,QAAQ;YACX,IAAI,YAAY,KAAK,KAAK,CAAC,EAAE;gBAC3B,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,YAAY,CAAC,KAAK,EAAE,CAAC,CAAC;aAClE;iBAAM;gBACL,IAAA,4BAAe,EAAC,IAAI,CAAC,CAAC;gBACtB,OAAO,IAAI,WAAI,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;aACtC;YAED,MAAM;QACR;YACE,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;KACpC;IAED,OAAO,YAAY,CAAC;AACtB,CAAC;AAnCD,8BAmCC"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { JsonPath, Optional } from '@stoplight/types';
|
|
2
|
-
import { DiagnosticSeverity } from '@stoplight/types';
|
|
1
|
+
import { JsonPath, Optional, DiagnosticSeverity } from '@stoplight/types';
|
|
3
2
|
import { Ruleset } from '../ruleset';
|
|
4
3
|
import { Format } from '../format';
|
|
5
|
-
import { HumanReadableDiagnosticSeverity, IRuleThen, RuleDefinition } from '../types';
|
|
4
|
+
import type { HumanReadableDiagnosticSeverity, IRuleThen, RuleDefinition } from '../types';
|
|
5
|
+
import { FormatsSet } from '../utils/formatsSet';
|
|
6
6
|
export interface IRule {
|
|
7
7
|
description: string | null;
|
|
8
8
|
message: string | null;
|
|
@@ -17,7 +17,7 @@ export interface IRule {
|
|
|
17
17
|
}
|
|
18
18
|
export declare type StringifiedRule = Omit<IRule, 'formats' | 'then'> & {
|
|
19
19
|
name: string;
|
|
20
|
-
formats:
|
|
20
|
+
formats: FormatsSet | null;
|
|
21
21
|
then: (Pick<IRuleThen, 'field'> & {
|
|
22
22
|
function: string;
|
|
23
23
|
functionOptions?: string;
|
|
@@ -32,7 +32,7 @@ export declare class Rule implements IRule {
|
|
|
32
32
|
description: string | null;
|
|
33
33
|
message: string | null;
|
|
34
34
|
resolved: boolean;
|
|
35
|
-
formats:
|
|
35
|
+
formats: FormatsSet | null;
|
|
36
36
|
recommended: boolean;
|
|
37
37
|
documentationUrl: string | null;
|
|
38
38
|
constructor(name: string, definition: RuleDefinition, owner: Ruleset);
|
|
@@ -49,6 +49,7 @@ export declare class Rule implements IRule {
|
|
|
49
49
|
set then(then: RuleDefinition['then']);
|
|
50
50
|
get given(): string[];
|
|
51
51
|
set given(given: RuleDefinition['given']);
|
|
52
|
+
getGivenForFormats(formats: Set<Format<any>> | null): string[];
|
|
52
53
|
matchesFormat(formats: Set<Format> | null): boolean;
|
|
53
54
|
clone(): Rule;
|
|
54
55
|
toJSON(): StringifiedRule;
|