@stoplight/spectral-core 1.6.0 → 1.8.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/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.js +1 -1
- package/dist/guards/isAggregateError.js.map +1 -1
- package/dist/index.js +3 -3
- package/dist/index.js.map +1 -1
- package/dist/meta/ruleset.schema.json +1 -0
- package/dist/ruleset/index.d.ts +1 -1
- package/dist/ruleset/index.js.map +1 -1
- package/dist/ruleset/mergers/rules.js +1 -1
- package/dist/ruleset/mergers/rules.js.map +1 -1
- package/dist/ruleset/rule/rule.js +18 -18
- package/dist/ruleset/rule/rule.js.map +1 -1
- package/dist/ruleset/ruleset.js +15 -15
- package/dist/ruleset/ruleset.js.map +1 -1
- package/dist/ruleset/rulesetFunction.d.ts +17 -7
- package/dist/ruleset/rulesetFunction.js +7 -7
- package/dist/ruleset/rulesetFunction.js.map +1 -1
- package/dist/ruleset/types.d.ts +1 -0
- package/dist/ruleset/utils/index.js +1 -1
- package/dist/ruleset/utils/index.js.map +1 -1
- package/dist/ruleset/validation.js +10 -10
- 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 +16 -27
- 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 +11 -9
|
@@ -6,15 +6,15 @@ const ajv_formats_1 = require("ajv-formats");
|
|
|
6
6
|
const ajv_errors_1 = require("ajv-errors");
|
|
7
7
|
const spectral_runtime_1 = require("@stoplight/spectral-runtime");
|
|
8
8
|
const validation_1 = require("./validation");
|
|
9
|
-
const ajv = new ajv_1.default({ allErrors: true, allowUnionTypes: true, strict: true });
|
|
10
|
-
ajv_errors_1.default(ajv);
|
|
11
|
-
ajv_formats_1.default(ajv);
|
|
9
|
+
const ajv = new ajv_1.default({ allErrors: true, allowUnionTypes: true, strict: true, keywords: ['x-internal'] });
|
|
10
|
+
(0, ajv_errors_1.default)(ajv);
|
|
11
|
+
(0, ajv_formats_1.default)(ajv);
|
|
12
12
|
class RulesetFunctionValidationError extends validation_1.RulesetValidationError {
|
|
13
13
|
constructor(fn, errors) {
|
|
14
14
|
const messages = errors.map(error => {
|
|
15
15
|
switch (error.keyword) {
|
|
16
16
|
case 'type': {
|
|
17
|
-
const path = spectral_runtime_1.printPath(error.instancePath.slice(1).split('/'), spectral_runtime_1.PrintStyle.Dot);
|
|
17
|
+
const path = (0, spectral_runtime_1.printPath)(error.instancePath.slice(1).split('/'), spectral_runtime_1.PrintStyle.Dot);
|
|
18
18
|
const values = Array.isArray(error.params.type) ? error.params.type.join(', ') : String(error.params.type);
|
|
19
19
|
return `"${fn}" function and its "${path}" option accepts only the following types: ${values}`;
|
|
20
20
|
}
|
|
@@ -22,18 +22,18 @@ class RulesetFunctionValidationError extends validation_1.RulesetValidationError
|
|
|
22
22
|
const missingProperty = error.params.missingProperty;
|
|
23
23
|
const missingPropertyPath = error.instancePath === ''
|
|
24
24
|
? missingProperty
|
|
25
|
-
: spectral_runtime_1.printPath([...error.instancePath.slice(1).split('/'), missingProperty], spectral_runtime_1.PrintStyle.Dot);
|
|
25
|
+
: (0, spectral_runtime_1.printPath)([...error.instancePath.slice(1).split('/'), missingProperty], spectral_runtime_1.PrintStyle.Dot);
|
|
26
26
|
return `"${fn}" function is missing "${missingPropertyPath}" option`;
|
|
27
27
|
}
|
|
28
28
|
case 'additionalProperties': {
|
|
29
29
|
const additionalProperty = error.params.additionalProperty;
|
|
30
30
|
const additionalPropertyPath = error.instancePath === ''
|
|
31
31
|
? additionalProperty
|
|
32
|
-
: spectral_runtime_1.printPath([...error.instancePath.slice(1).split('/'), additionalProperty], spectral_runtime_1.PrintStyle.Dot);
|
|
32
|
+
: (0, spectral_runtime_1.printPath)([...error.instancePath.slice(1).split('/'), additionalProperty], spectral_runtime_1.PrintStyle.Dot);
|
|
33
33
|
return `"${fn}" function does not support "${additionalPropertyPath}" option`;
|
|
34
34
|
}
|
|
35
35
|
case 'enum': {
|
|
36
|
-
const path = spectral_runtime_1.printPath(error.instancePath.slice(1).split('/'), spectral_runtime_1.PrintStyle.Dot);
|
|
36
|
+
const path = (0, spectral_runtime_1.printPath)(error.instancePath.slice(1).split('/'), spectral_runtime_1.PrintStyle.Dot);
|
|
37
37
|
const values = error.params.allowedValues.map(spectral_runtime_1.printValue).join(', ');
|
|
38
38
|
return `"${fn}" function and its "${path}" option accepts only the following values: ${values}`;
|
|
39
39
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rulesetFunction.js","sourceRoot":"","sources":["../../src/ruleset/rulesetFunction.ts"],"names":[],"mappings":";;;AAAA,6BAAuC;AACvC,6CAAqC;AACrC,2CAAmC;AAMnC,kEAAgF;AAEhF,6CAAsD;AAGtD,MAAM,GAAG,GAAG,IAAI,aAAG,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"rulesetFunction.js","sourceRoot":"","sources":["../../src/ruleset/rulesetFunction.ts"],"names":[],"mappings":"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"}
|
package/dist/ruleset/types.d.ts
CHANGED
|
@@ -49,6 +49,7 @@ export declare type RulesetScopedAliasDefinition = {
|
|
|
49
49
|
export declare type RulesetAliasesDefinition = Record<string, string | RulesetScopedAliasDefinition>;
|
|
50
50
|
export declare type RulesetDefinition = Readonly<{
|
|
51
51
|
documentationUrl?: string;
|
|
52
|
+
description?: string;
|
|
52
53
|
formats?: Format<any>[];
|
|
53
54
|
parserOptions?: Partial<ParserOptions>;
|
|
54
55
|
overrides?: RulesetOverridesDefinition;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/ruleset/utils/index.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/ruleset/utils/index.ts"],"names":[],"mappings":";;;AAAA,0DAA2B"}
|
|
@@ -9,27 +9,27 @@ const spectral_runtime_1 = require("@stoplight/spectral-runtime");
|
|
|
9
9
|
const ruleSchema = require("../meta/rule.schema.json");
|
|
10
10
|
const rulesetSchema = require("../meta/ruleset.schema.json");
|
|
11
11
|
const shared = require("../meta/shared.json");
|
|
12
|
-
const message = ajv_1._ `'spectral-message'`;
|
|
13
|
-
const ajv = new ajv_1.default({ allErrors: true, strict: true, strictRequired: false, keywords: ['$anchor'] });
|
|
14
|
-
ajv_formats_1.default(ajv);
|
|
15
|
-
ajv_errors_1.default(ajv);
|
|
12
|
+
const message = (0, ajv_1._) `'spectral-message'`;
|
|
13
|
+
const ajv = new ajv_1.default({ allErrors: true, strict: true, strictRequired: false, keywords: ['$anchor', 'x-internal'] });
|
|
14
|
+
(0, ajv_formats_1.default)(ajv);
|
|
15
|
+
(0, ajv_errors_1.default)(ajv);
|
|
16
16
|
ajv.addKeyword({
|
|
17
17
|
keyword: 'spectral-runtime',
|
|
18
18
|
schemaType: 'string',
|
|
19
19
|
error: {
|
|
20
20
|
message(ctx) {
|
|
21
|
-
return ajv_1._ `${ctx.data}[Symbol.for(${message})]`;
|
|
21
|
+
return (0, ajv_1._) `${ctx.data}[Symbol.for(${message})]`;
|
|
22
22
|
},
|
|
23
23
|
},
|
|
24
24
|
code(cxt) {
|
|
25
25
|
const { data } = cxt;
|
|
26
26
|
switch (cxt.schema) {
|
|
27
27
|
case 'spectral-format':
|
|
28
|
-
cxt.fail(ajv_1._ `typeof ${data} !== "function"`);
|
|
28
|
+
cxt.fail((0, ajv_1._) `typeof ${data} !== "function"`);
|
|
29
29
|
break;
|
|
30
30
|
case 'spectral-function':
|
|
31
|
-
cxt.pass(ajv_1._ `typeof ${data}.function === "function"`);
|
|
32
|
-
cxt.pass(ajv_1._ `(() => { try { ${data}.function.validator && ${data}.function.validator('functionOptions' in ${data} ? ${data} : null); } catch (e) { ${data}[${message}] = e.message } })()`);
|
|
31
|
+
cxt.pass((0, ajv_1._) `typeof ${data}.function === "function"`);
|
|
32
|
+
cxt.pass((0, ajv_1._) `(() => { try { ${data}.function.validator && ${data}.function.validator('functionOptions' in ${data} ? ${data} : null); } catch (e) { ${data}[${message}] = e.message } })()`);
|
|
33
33
|
break;
|
|
34
34
|
}
|
|
35
35
|
},
|
|
@@ -84,13 +84,13 @@ class RulesetAjvValidationError extends RulesetValidationError {
|
|
|
84
84
|
filteredErrors.push(error);
|
|
85
85
|
}
|
|
86
86
|
return filteredErrors
|
|
87
|
-
.map(({ message, instancePath }) => `Error at ${spectral_runtime_1.printPath(instancePath.slice(1).split('/'), spectral_runtime_1.PrintStyle.Pointer)}: ${message !== null && message !== void 0 ? message : ''}`)
|
|
87
|
+
.map(({ message, instancePath }) => `Error at ${(0, spectral_runtime_1.printPath)(instancePath.slice(1).split('/'), spectral_runtime_1.PrintStyle.Pointer)}: ${message !== null && message !== void 0 ? message : ''}`)
|
|
88
88
|
.join('\n');
|
|
89
89
|
}
|
|
90
90
|
}
|
|
91
91
|
function assertValidRuleset(ruleset) {
|
|
92
92
|
var _a;
|
|
93
|
-
if (!json_1.isPlainObject(ruleset)) {
|
|
93
|
+
if (!(0, json_1.isPlainObject)(ruleset)) {
|
|
94
94
|
throw new Error('Provided ruleset is not an object');
|
|
95
95
|
}
|
|
96
96
|
if (!('rules' in ruleset) && !('extends' in ruleset) && !('overrides' in ruleset)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../src/ruleset/validation.ts"],"names":[],"mappings":";;;AAAA,6BAA0C;AAC1C,6CAAqC;AACrC,2CAAmC;AACnC,0CAAgD;AAChD,kEAAoE;AAEpE,uDAAuD;AACvD,6DAA6D;AAC7D,8CAA8C;AAG9C,MAAM,OAAO,GAAG,OAAC,
|
|
1
|
+
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../src/ruleset/validation.ts"],"names":[],"mappings":";;;AAAA,6BAA0C;AAC1C,6CAAqC;AACrC,2CAAmC;AACnC,0CAAgD;AAChD,kEAAoE;AAEpE,uDAAuD;AACvD,6DAA6D;AAC7D,8CAA8C;AAG9C,MAAM,OAAO,GAAG,IAAA,OAAC,EAAA,oBAAoB,CAAC;AAEtC,MAAM,GAAG,GAAG,IAAI,aAAG,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,SAAS,EAAE,YAAY,CAAC,EAAE,CAAC,CAAC;AACnH,IAAA,qBAAU,EAAC,GAAG,CAAC,CAAC;AAChB,IAAA,oBAAS,EAAC,GAAG,CAAC,CAAC;AACf,GAAG,CAAC,UAAU,CAAC;IACb,OAAO,EAAE,kBAAkB;IAC3B,UAAU,EAAE,QAAQ;IACpB,KAAK,EAAE;QACL,OAAO,CAAC,GAAG;YACT,OAAO,IAAA,OAAC,EAAA,GAAG,GAAG,CAAC,IAAI,eAAe,OAAO,IAAI,CAAC;QAChD,CAAC;KACF;IACD,IAAI,CAAC,GAAG;QACN,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC;QAErB,QAAQ,GAAG,CAAC,MAAiB,EAAE;YAC7B,KAAK,iBAAiB;gBACpB,GAAG,CAAC,IAAI,CAAC,IAAA,OAAC,EAAA,UAAU,IAAI,iBAAiB,CAAC,CAAC;gBAC3C,MAAM;YACR,KAAK,mBAAmB;gBACtB,GAAG,CAAC,IAAI,CAAC,IAAA,OAAC,EAAA,UAAU,IAAI,0BAA0B,CAAC,CAAC;gBACpD,GAAG,CAAC,IAAI,CACN,IAAA,OAAC,EAAA,kBAAkB,IAAI,0BAA0B,IAAI,4CAA4C,IAAI,MAAM,IAAI,2BAA2B,IAAI,IAAI,OAAO,sBAAsB,CAChL,CAAC;gBACF,MAAM;SACT;IACH,CAAC;CACF,CAAC,CAAC;AAEH,MAAM,QAAQ,GAAG,GAAG,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;AAEpF,MAAa,sBAAuB,SAAQ,KAAK;IAC/C,YAA4B,OAAe;QACzC,KAAK,CAAC,OAAO,CAAC,CAAC;QADW,YAAO,GAAP,OAAO,CAAQ;IAE3C,CAAC;CACF;AAJD,wDAIC;AAED,MAAM,kBAAkB,GAAG,iBAAiB,CAAC;AAC7C,MAAM,qBAAqB,GAAG,qDAAqD,CAAC;AAEpF,MAAM,yBAA0B,SAAQ,sBAAsB;IAC5D,YAAmB,OAAgC,EAAS,MAAqB;QAC/E,KAAK,CAAC,yBAAyB,CAAC,kBAAkB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC;QADpD,YAAO,GAAP,OAAO,CAAyB;QAAS,WAAM,GAAN,MAAM,CAAe;IAEjF,CAAC;IAEM,MAAM,CAAC,kBAAkB,CAAC,OAAgC,EAAE,MAAqB;QACtF,MAAM,YAAY,GAAG,CAAC,GAAG,MAAM,CAAC;aAC7B,IAAI,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE;YACvB,MAAM,IAAI,GAAG,MAAM,CAAC,YAAY,CAAC,MAAM,GAAG,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC;YACrE,OAAO,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,KAAK,cAAc,IAAI,MAAM,CAAC,OAAO,KAAK,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAC/G,CAAC,CAAC;aACD,MAAM,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,YAAY,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,YAAY,KAAK,KAAK,CAAC,YAAY,CAAC,CAAC;QAE1G,MAAM,cAAc,GAAkB,EAAE,CAAC;QAEzC,CAAC,EAAE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAC/C,MAAM,KAAK,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;YAC9B,MAAM,SAAS,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YAEvD,IAAI,qBAAqB,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE;gBAClD,IAAI,CAAC,GAAG,CAAC,CAAC;gBACV,OAAO,CAAC,GAAG,CAAC,GAAG,YAAY,CAAC,MAAM,EAAE;oBAClC,IACE,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,YAAY,CAAC,UAAU,CAAC,KAAK,CAAC,YAAY,CAAC;wBAC/D,CAAC,qBAAqB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,YAAY,CAAC,EAC7D;wBACA,SAAS,CAAC,CAAC;qBACZ;oBAED,CAAC,EAAE,CAAC;iBACL;aACF;iBAAM,IAAI,SAAS,KAAK,IAAI,EAAE;gBAC7B,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBAC3B,SAAS;aACV;iBAAM;gBACL,MAAM,KAAK,GAAG,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;gBAE1D,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC,YAAY,EAAE;oBACrF,cAAc,CAAC,GAAG,EAAE,CAAC;iBACtB;aACF;YAED,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SAC5B;QAED,OAAO,cAAc;aAClB,GAAG,CACF,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,EAAE,CAC5B,YAAY,IAAA,4BAAS,EAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,6BAAU,CAAC,OAAO,CAAC,KAAK,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,EAAE,EAAE,CAClG;aACA,IAAI,CAAC,IAAI,CAAC,CAAC;IAChB,CAAC;CACF;AAED,SAAgB,kBAAkB,CAAC,OAAgB;;IACjD,IAAI,CAAC,IAAA,oBAAa,EAAC,OAAO,CAAC,EAAE;QAC3B,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;KACtD;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,sBAAsB,CAAC,yDAAyD,CAAC,CAAC;KAC7F;IAED,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;QACtB,MAAM,IAAI,yBAAyB,CAAC,OAAO,EAAE,MAAA,QAAQ,CAAC,MAAM,mCAAI,EAAE,CAAC,CAAC;KACrE;AACH,CAAC;AAZD,gDAYC;AAED,SAAgB,WAAW,CAAC,IAAwB;IAClD,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;AAFD,kCAEC;AAED,SAAgB,eAAe,CAAC,IAAwB;IACtD,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE;QACtB,MAAM,IAAI,SAAS,CAAC,cAAc,CAAC,CAAC;KACrC;AACH,CAAC;AAJD,0CAIC"}
|
package/dist/runner/lintNode.js
CHANGED
|
@@ -15,7 +15,7 @@ const lintNode = (context, node, rule) => {
|
|
|
15
15
|
};
|
|
16
16
|
const givenPath = node.path.length > 0 && node.path[0] === '$' ? node.path.slice(1) : node.path;
|
|
17
17
|
for (const then of rule.then) {
|
|
18
|
-
const targets = utils_1.getLintTargets(node.value, then.field);
|
|
18
|
+
const targets = (0, utils_1.getLintTargets)(node.value, then.field);
|
|
19
19
|
for (const target of targets) {
|
|
20
20
|
const path = target.path.length > 0 ? [...givenPath, ...target.path] : givenPath;
|
|
21
21
|
const targetResults = then.function(target.value, (_a = then.functionOptions) !== null && _a !== void 0 ? _a : null, {
|
|
@@ -41,30 +41,30 @@ function processTargetResults(context, results, rule, targetPath) {
|
|
|
41
41
|
for (const result of results) {
|
|
42
42
|
const escapedJsonPath = ((_a = result.path) !== null && _a !== void 0 ? _a : targetPath).map(spectral_runtime_1.decodeSegmentFragment);
|
|
43
43
|
const associatedItem = context.documentInventory.findAssociatedItemForPath(escapedJsonPath, rule.resolved);
|
|
44
|
-
const path = (_b = associatedItem === null || associatedItem === void 0 ? void 0 : associatedItem.path) !== null && _b !== void 0 ? _b : spectral_runtime_1.getClosestJsonPath(context.documentInventory.resolved, escapedJsonPath);
|
|
44
|
+
const path = (_b = associatedItem === null || associatedItem === void 0 ? void 0 : associatedItem.path) !== null && _b !== void 0 ? _b : (0, spectral_runtime_1.getClosestJsonPath)(context.documentInventory.resolved, escapedJsonPath);
|
|
45
45
|
const source = associatedItem === null || associatedItem === void 0 ? void 0 : associatedItem.document.source;
|
|
46
46
|
const document = (_c = associatedItem === null || associatedItem === void 0 ? void 0 : associatedItem.document) !== null && _c !== void 0 ? _c : context.documentInventory.document;
|
|
47
47
|
const range = (_d = document.getRangeForJsonPath(path, true)) !== null && _d !== void 0 ? _d : document_1.Document.DEFAULT_RANGE;
|
|
48
|
-
const value = path.length === 0 ? document.data : lodash_1.get(document.data, path);
|
|
48
|
+
const value = path.length === 0 ? document.data : (0, lodash_1.get)(document.data, path);
|
|
49
49
|
const vars = {
|
|
50
50
|
property: (associatedItem === null || associatedItem === void 0 ? void 0 : associatedItem.missingPropertyPath) !== void 0 && associatedItem.missingPropertyPath.length > path.length
|
|
51
|
-
? spectral_runtime_1.printPath(associatedItem.missingPropertyPath.slice(path.length - 1), spectral_runtime_1.PrintStyle.Dot)
|
|
51
|
+
? (0, spectral_runtime_1.printPath)(associatedItem.missingPropertyPath.slice(path.length - 1), spectral_runtime_1.PrintStyle.Dot)
|
|
52
52
|
: path.length > 0
|
|
53
53
|
? path[path.length - 1]
|
|
54
54
|
: '',
|
|
55
55
|
error: result.message,
|
|
56
|
-
path: spectral_runtime_1.printPath(path, spectral_runtime_1.PrintStyle.EscapedPointer),
|
|
56
|
+
path: (0, spectral_runtime_1.printPath)(path, spectral_runtime_1.PrintStyle.EscapedPointer),
|
|
57
57
|
description: rule.description,
|
|
58
58
|
value,
|
|
59
59
|
};
|
|
60
|
-
const resultMessage = utils_1.message(result.message, vars);
|
|
60
|
+
const resultMessage = (0, utils_1.message)(result.message, vars);
|
|
61
61
|
vars.error = resultMessage;
|
|
62
62
|
const severity = source !== null && source !== void 0 ? rule.getSeverityForSource(source, path) : rule.severity;
|
|
63
63
|
if (severity === -1)
|
|
64
64
|
continue;
|
|
65
65
|
context.results.push({
|
|
66
66
|
code: rule.name,
|
|
67
|
-
message: (rule.message === null ? (_e = rule.description) !== null && _e !== void 0 ? _e : resultMessage : utils_1.message(rule.message, vars)).trim(),
|
|
67
|
+
message: (rule.message === null ? (_e = rule.description) !== null && _e !== void 0 ? _e : resultMessage : (0, utils_1.message)(rule.message, vars)).trim(),
|
|
68
68
|
path,
|
|
69
69
|
severity,
|
|
70
70
|
...(source !== null ? { source } : null),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lintNode.js","sourceRoot":"","sources":["../../src/runner/lintNode.ts"],"names":[],"mappings":";;;AACA,kEAA+G;AAC/G,mCAA6B;AAE7B,0CAAuC;AAGvC,mCAA+D;AAGxD,MAAM,QAAQ,GAAG,CAAC,OAA+B,EAAE,IAAgB,EAAE,IAAU,EAAQ,EAAE;;IAC9F,MAAM,SAAS,GAA2B;QACxC,QAAQ,EAAE,OAAO,CAAC,iBAAiB,CAAC,QAAQ;QAC5C,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;QAC5C,IAAI;QACJ,IAAI,EAAE,EAAE;KACT,CAAC;IAEF,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;IAEhG,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE;QAC5B,MAAM,OAAO,GAAG,sBAAc,
|
|
1
|
+
{"version":3,"file":"lintNode.js","sourceRoot":"","sources":["../../src/runner/lintNode.ts"],"names":[],"mappings":"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"}
|
package/dist/runner/runner.js
CHANGED
|
@@ -6,7 +6,6 @@ const lintNode_1 = require("./lintNode");
|
|
|
6
6
|
const legacy_1 = require("nimma/legacy");
|
|
7
7
|
const fallbacks_1 = require("nimma/fallbacks");
|
|
8
8
|
const json_1 = require("@stoplight/json");
|
|
9
|
-
const isAggregateError_1 = require("../guards/isAggregateError");
|
|
10
9
|
class Runner {
|
|
11
10
|
constructor(runtime, inventory) {
|
|
12
11
|
var _a;
|
|
@@ -42,7 +41,7 @@ class Runner {
|
|
|
42
41
|
for (const rule of relevantRules) {
|
|
43
42
|
for (const given of rule.getGivenForFormats(formats)) {
|
|
44
43
|
const cb = (scope) => {
|
|
45
|
-
lintNode_1.lintNode(runnerContext, scope, rule);
|
|
44
|
+
(0, lintNode_1.lintNode)(runnerContext, scope, rule);
|
|
46
45
|
};
|
|
47
46
|
((_b = (_c = callbacks[rule.resolved ? 'resolved' : 'unresolved'])[given]) !== null && _b !== void 0 ? _b : (_c[given] = [])).push(cb);
|
|
48
47
|
}
|
|
@@ -66,13 +65,13 @@ class Runner {
|
|
|
66
65
|
}
|
|
67
66
|
}
|
|
68
67
|
getResults(computeFingerprint) {
|
|
69
|
-
return utils_1.prepareResults(this.results, computeFingerprint);
|
|
68
|
+
return (0, utils_1.prepareResults)(this.results, computeFingerprint);
|
|
70
69
|
}
|
|
71
70
|
}
|
|
72
71
|
exports.Runner = Runner;
|
|
73
72
|
function execute(input, callbacks, jsonPathExpressions) {
|
|
74
73
|
var _a;
|
|
75
|
-
if (!json_1.isPlainObject(input) && !Array.isArray(input)) {
|
|
74
|
+
if (!(0, json_1.isPlainObject)(input) && !Array.isArray(input)) {
|
|
76
75
|
for (const cb of (_a = callbacks.$) !== null && _a !== void 0 ? _a : []) {
|
|
77
76
|
cb({
|
|
78
77
|
path: [],
|
|
@@ -81,28 +80,18 @@ function execute(input, callbacks, jsonPathExpressions) {
|
|
|
81
80
|
}
|
|
82
81
|
return;
|
|
83
82
|
}
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
}, {}));
|
|
98
|
-
}
|
|
99
|
-
catch (e) {
|
|
100
|
-
if (isAggregateError_1.isAggregateError(e) && e.errors.length === 1) {
|
|
101
|
-
throw e.errors[0];
|
|
102
|
-
}
|
|
103
|
-
else {
|
|
104
|
-
throw e;
|
|
105
|
-
}
|
|
106
|
-
}
|
|
83
|
+
const nimma = new legacy_1.default(jsonPathExpressions, {
|
|
84
|
+
fallback: fallbacks_1.jsonPathPlus,
|
|
85
|
+
unsafe: false,
|
|
86
|
+
output: 'auto',
|
|
87
|
+
});
|
|
88
|
+
nimma.query(input, Object.entries(callbacks).reduce((mapped, [key, cbs]) => {
|
|
89
|
+
mapped[key] = scope => {
|
|
90
|
+
for (const cb of cbs) {
|
|
91
|
+
cb(scope);
|
|
92
|
+
}
|
|
93
|
+
};
|
|
94
|
+
return mapped;
|
|
95
|
+
}, {}));
|
|
107
96
|
}
|
|
108
97
|
//# sourceMappingURL=runner.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../src/runner/runner.ts"],"names":[],"mappings":";;;AAGA,oCAAkE;AAClE,yCAAsC;AAItC,yCAA+C;AAC/C,+CAA+C;AAC/C,0CAAgD;
|
|
1
|
+
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../src/runner/runner.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ const jsonpath_plus_1 = require("jsonpath-plus");
|
|
|
5
5
|
const lodash_1 = require("lodash");
|
|
6
6
|
const getLintTargets = (targetValue, field) => {
|
|
7
7
|
const targets = [];
|
|
8
|
-
if (lodash_1.isObject(targetValue) && typeof field === 'string') {
|
|
8
|
+
if ((0, lodash_1.isObject)(targetValue) && typeof field === 'string') {
|
|
9
9
|
if (field === '@key') {
|
|
10
10
|
for (const key of Object.keys(targetValue)) {
|
|
11
11
|
targets.push({
|
|
@@ -15,13 +15,13 @@ const getLintTargets = (targetValue, field) => {
|
|
|
15
15
|
}
|
|
16
16
|
}
|
|
17
17
|
else if (field.startsWith('$')) {
|
|
18
|
-
jsonpath_plus_1.JSONPath({
|
|
18
|
+
(0, jsonpath_plus_1.JSONPath)({
|
|
19
19
|
path: field,
|
|
20
20
|
json: targetValue,
|
|
21
21
|
resultType: 'all',
|
|
22
22
|
callback(result) {
|
|
23
23
|
targets.push({
|
|
24
|
-
path: lodash_1.toPath(result.path.slice(1)),
|
|
24
|
+
path: (0, lodash_1.toPath)(result.path.slice(1)),
|
|
25
25
|
value: result.value,
|
|
26
26
|
});
|
|
27
27
|
},
|
|
@@ -29,8 +29,8 @@ const getLintTargets = (targetValue, field) => {
|
|
|
29
29
|
}
|
|
30
30
|
else {
|
|
31
31
|
targets.push({
|
|
32
|
-
path: lodash_1.toPath(field),
|
|
33
|
-
value: lodash_1.get(targetValue, field),
|
|
32
|
+
path: (0, lodash_1.toPath)(field),
|
|
33
|
+
value: (0, lodash_1.get)(targetValue, field),
|
|
34
34
|
});
|
|
35
35
|
}
|
|
36
36
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getLintTargets.js","sourceRoot":"","sources":["../../../src/runner/utils/getLintTargets.ts"],"names":[],"mappings":";;;AACA,iDAAyC;AACzC,mCAA+C;AAOxC,MAAM,cAAc,GAAG,CAAC,WAAoB,EAAE,KAAuB,EAAiB,EAAE;IAC7F,MAAM,OAAO,GAAkB,EAAE,CAAC;IAElC,IAAI,iBAAQ,
|
|
1
|
+
{"version":3,"file":"getLintTargets.js","sourceRoot":"","sources":["../../../src/runner/utils/getLintTargets.ts"],"names":[],"mappings":";;;AACA,iDAAyC;AACzC,mCAA+C;AAOxC,MAAM,cAAc,GAAG,CAAC,WAAoB,EAAE,KAAuB,EAAiB,EAAE;IAC7F,MAAM,OAAO,GAAkB,EAAE,CAAC;IAElC,IAAI,IAAA,iBAAQ,EAAC,WAAW,CAAC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QACtD,IAAI,KAAK,KAAK,MAAM,EAAE;YACpB,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE;gBAC1C,OAAO,CAAC,IAAI,CAAC;oBACX,IAAI,EAAE,CAAC,GAAG,CAAC;oBACX,KAAK,EAAE,GAAG;iBACX,CAAC,CAAC;aACJ;SACF;aAAM,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;YAChC,IAAA,wBAAQ,EAAC;gBACP,IAAI,EAAE,KAAK;gBACX,IAAI,EAAE,WAAW;gBACjB,UAAU,EAAE,KAAK;gBACjB,QAAQ,CAAC,MAAM;oBACb,OAAO,CAAC,IAAI,CAAC;wBAEX,IAAI,EAAE,IAAA,eAAM,EAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;wBAElC,KAAK,EAAE,MAAM,CAAC,KAAK;qBACpB,CAAC,CAAC;gBACL,CAAC;aACF,CAAC,CAAC;SACJ;aAAM;YAEL,OAAO,CAAC,IAAI,CAAC;gBACX,IAAI,EAAE,IAAA,eAAM,EAAC,KAAK,CAAC;gBACnB,KAAK,EAAE,IAAA,YAAG,EAAC,WAAW,EAAE,KAAK,CAAC;aAC/B,CAAC,CAAC;SACJ;KACF;SAAM;QACL,OAAO,CAAC,IAAI,CAAC;YACX,IAAI,EAAE,EAAE;YACR,KAAK,EAAE,WAAW;SACnB,CAAC,CAAC;KACJ;IAED,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;QAExB,OAAO,CAAC,IAAI,CAAC;YACX,IAAI,EAAE,EAAE;YACR,KAAK,EAAE,KAAK,CAAC;SACd,CAAC,CAAC;KACJ;IAED,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAhDW,QAAA,cAAc,kBAgDzB"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
|
-
tslib_1.__exportStar(require("./getLintTargets"), exports);
|
|
5
|
-
tslib_1.__exportStar(require("./message"), exports);
|
|
4
|
+
(0, tslib_1.__exportStar)(require("./getLintTargets"), exports);
|
|
5
|
+
(0, tslib_1.__exportStar)(require("./message"), exports);
|
|
6
6
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/runner/utils/index.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/runner/utils/index.ts"],"names":[],"mappings":";;;AAAA,gEAAiC;AACjC,yDAA0B"}
|
|
@@ -15,7 +15,7 @@ MessageReplacer.addFunction('print', function (type) {
|
|
|
15
15
|
}
|
|
16
16
|
return `The document `;
|
|
17
17
|
case 'value':
|
|
18
|
-
return spectral_runtime_1.printValue(value);
|
|
18
|
+
return (0, spectral_runtime_1.printValue)(value);
|
|
19
19
|
default:
|
|
20
20
|
if (type in this && this[type] !== null) {
|
|
21
21
|
return String(this[type]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message.js","sourceRoot":"","sources":["../../../src/runner/utils/message.ts"],"names":[],"mappings":";;;AACA,kEAAyD;AACzD,mDAAgD;AAYhD,MAAM,eAAe,GAAG,IAAI,mBAAQ,CAAc,CAAC,CAAC,CAAC;AAErD,eAAe,CAAC,WAAW,CAAC,OAAO,EAAE,UAAU,IAAI;IACjD,IAAI,OAAO,IAAI,KAAK,QAAQ;QAAE,OAAO,EAAE,CAAC;IACxC,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;IACjC,QAAQ,IAAI,EAAE;QACZ,KAAK,UAAU;YACb,IAAI,QAAQ,KAAK,KAAK,CAAC,IAAI,QAAQ,KAAK,EAAE,EAAE;gBAC1C,OAAO,IAAI,QAAQ,aAAa,CAAC;aAClC;YAED,OAAO,eAAe,CAAC;QACzB,KAAK,OAAO;YACV,OAAO,6BAAU,
|
|
1
|
+
{"version":3,"file":"message.js","sourceRoot":"","sources":["../../../src/runner/utils/message.ts"],"names":[],"mappings":";;;AACA,kEAAyD;AACzD,mDAAgD;AAYhD,MAAM,eAAe,GAAG,IAAI,mBAAQ,CAAc,CAAC,CAAC,CAAC;AAErD,eAAe,CAAC,WAAW,CAAC,OAAO,EAAE,UAAU,IAAI;IACjD,IAAI,OAAO,IAAI,KAAK,QAAQ;QAAE,OAAO,EAAE,CAAC;IACxC,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;IACjC,QAAQ,IAAI,EAAE;QACZ,KAAK,UAAU;YACb,IAAI,QAAQ,KAAK,KAAK,CAAC,IAAI,QAAQ,KAAK,EAAE,EAAE;gBAC1C,OAAO,IAAI,QAAQ,aAAa,CAAC;aAClC;YAED,OAAO,eAAe,CAAC;QACzB,KAAK,OAAO;YACV,OAAO,IAAA,6BAAU,EAAC,KAAK,CAAC,CAAC;QAC3B;YACE,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE;gBACvC,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;aAC3B;YAED,OAAO,EAAE,CAAC;KACb;AACH,CAAC,CAAC,CAAC;AAEU,QAAA,OAAO,GAAwB,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC"}
|
package/dist/spectral.js
CHANGED
|
@@ -15,25 +15,25 @@ const ruleset_1 = require("./ruleset/ruleset");
|
|
|
15
15
|
const generateDocumentWideResult_1 = require("./utils/generateDocumentWideResult");
|
|
16
16
|
const ruleset_2 = require("./ruleset");
|
|
17
17
|
lodash_1.memoize.Cache = WeakMap;
|
|
18
|
-
tslib_1.__exportStar(require("./types"), exports);
|
|
18
|
+
(0, tslib_1.__exportStar)(require("./types"), exports);
|
|
19
19
|
class Spectral {
|
|
20
20
|
constructor(opts) {
|
|
21
21
|
this.opts = opts;
|
|
22
|
-
this._computeFingerprint = lodash_1.memoize(utils_1.defaultComputeResultFingerprint);
|
|
22
|
+
this._computeFingerprint = (0, lodash_1.memoize)(utils_1.defaultComputeResultFingerprint);
|
|
23
23
|
if ((opts === null || opts === void 0 ? void 0 : opts.resolver) !== void 0) {
|
|
24
24
|
this._resolver = opts.resolver;
|
|
25
25
|
}
|
|
26
26
|
else {
|
|
27
|
-
this._resolver = spectral_ref_resolver_1.createHttpAndFileResolver();
|
|
27
|
+
this._resolver = (0, spectral_ref_resolver_1.createHttpAndFileResolver)();
|
|
28
28
|
}
|
|
29
29
|
this.runtime = new runner_1.RunnerRuntime();
|
|
30
30
|
}
|
|
31
31
|
parseDocument(target) {
|
|
32
32
|
return target instanceof document_1.Document
|
|
33
33
|
? target
|
|
34
|
-
: document_1.isParsedResult(target)
|
|
34
|
+
: (0, document_1.isParsedResult)(target)
|
|
35
35
|
? new document_1.ParsedDocument(target)
|
|
36
|
-
: new document_1.Document(typeof target === 'string' ? target : json_1.stringify(target, void 0, 2), Parsers.Yaml);
|
|
36
|
+
: new document_1.Document(typeof target === 'string' ? target : (0, json_1.stringify)(target, void 0, 2), Parsers.Yaml);
|
|
37
37
|
}
|
|
38
38
|
async runWithResolved(target, opts = {}) {
|
|
39
39
|
if (this.ruleset === void 0) {
|
|
@@ -72,7 +72,7 @@ class Spectral {
|
|
|
72
72
|
this.ruleset = ruleset instanceof ruleset_1.Ruleset ? ruleset : new ruleset_1.Ruleset(ruleset);
|
|
73
73
|
}
|
|
74
74
|
_generateUnrecognizedFormatError(document, formats) {
|
|
75
|
-
return generateDocumentWideResult_1.generateDocumentWideResult(document, `The provided document does not match any of the registered formats [${formats
|
|
75
|
+
return (0, generateDocumentWideResult_1.generateDocumentWideResult)(document, `The provided document does not match any of the registered formats [${formats
|
|
76
76
|
.map(fn => { var _a; return (_a = fn.displayName) !== null && _a !== void 0 ? _a : fn.name; })
|
|
77
77
|
.join(', ')}]`, types_1.DiagnosticSeverity.Warning, 'unrecognized-format');
|
|
78
78
|
}
|
|
@@ -82,10 +82,10 @@ class Spectral {
|
|
|
82
82
|
return diagnostics;
|
|
83
83
|
let severity;
|
|
84
84
|
if (diagnostic.message.startsWith('Mapping key must be a string scalar rather than')) {
|
|
85
|
-
severity = ruleset_2.getDiagnosticSeverity(parserOptions.incompatibleValues);
|
|
85
|
+
severity = (0, ruleset_2.getDiagnosticSeverity)(parserOptions.incompatibleValues);
|
|
86
86
|
}
|
|
87
87
|
else if (diagnostic.message.startsWith('Duplicate key')) {
|
|
88
|
-
severity = ruleset_2.getDiagnosticSeverity(parserOptions.duplicateKeys);
|
|
88
|
+
severity = (0, ruleset_2.getDiagnosticSeverity)(parserOptions.duplicateKeys);
|
|
89
89
|
}
|
|
90
90
|
else {
|
|
91
91
|
diagnostics.push(diagnostic);
|
package/dist/spectral.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spectral.js","sourceRoot":"","sources":["../src/spectral.ts"],"names":[],"mappings":";;;;AAAA,0CAA4C;AAC5C,4CAAsD;AACtD,uDAAuD;AACvD,4EAAuF;AACvF,mCAAiC;AAEjC,yCAAgG;AAChG,2DAAwD;AACxD,qCAAiD;AAEjD,mCAAkF;AAClF,+CAA4C;AAC5C,mFAAgF;AAGhF,uCAAkD;AAElD,gBAAO,CAAC,KAAK,GAAG,OAAO,CAAC;AAExB,
|
|
1
|
+
{"version":3,"file":"spectral.js","sourceRoot":"","sources":["../src/spectral.ts"],"names":[],"mappings":"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"}
|
package/dist/types/index.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
|
-
tslib_1.__exportStar(require("./spectral"), exports);
|
|
5
|
-
tslib_1.__exportStar(require("./function"), exports);
|
|
4
|
+
(0, tslib_1.__exportStar)(require("./spectral"), exports);
|
|
5
|
+
(0, tslib_1.__exportStar)(require("./function"), exports);
|
|
6
6
|
//# sourceMappingURL=index.js.map
|
package/dist/types/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":";;;AAAA,0DAA2B;AAC3B,0DAA2B"}
|
package/dist/utils/index.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
|
-
tslib_1.__exportStar(require("./prepareResults"), exports);
|
|
5
|
-
tslib_1.__exportStar(require("./sortResults"), exports);
|
|
4
|
+
(0, tslib_1.__exportStar)(require("./prepareResults"), exports);
|
|
5
|
+
(0, tslib_1.__exportStar)(require("./sortResults"), exports);
|
|
6
6
|
//# sourceMappingURL=index.js.map
|
package/dist/utils/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":";;;AAAA,gEAAiC;AACjC,6DAA8B"}
|
|
@@ -32,7 +32,7 @@ const decorateResultsWithFingerprint = (results, computeFingerprint) => {
|
|
|
32
32
|
return results;
|
|
33
33
|
};
|
|
34
34
|
const deduplicateResults = (results) => {
|
|
35
|
-
return lodash_1.uniqBy([...results], 'fingerprint');
|
|
35
|
+
return (0, lodash_1.uniqBy)([...results], 'fingerprint');
|
|
36
36
|
};
|
|
37
37
|
const sortResults = (results) => {
|
|
38
38
|
return [...results].sort(sortResults_1.compareResults);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepareResults.js","sourceRoot":"","sources":["../../src/utils/prepareResults.ts"],"names":[],"mappings":";;;AACA,MAAM,GAAG,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;AAEnC,mCAAgC;AAGhC,+CAA+C;AAIxC,MAAM,+BAA+B,GAA2B,CAAC,IAAI,EAAE,IAAI,EAAU,EAAE;IAC5F,IAAI,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAE3B,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;QACxB,EAAE,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;KACjC;SAAM;QACL,EAAE,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;KAClC;IAED,IAAI,IAAI,CAAC,MAAM,KAAK,KAAK,CAAC,EAAE;QAC1B,EAAE,IAAI,IAAI,CAAC,MAAM,CAAC;KACnB;IAED,OAAO,IAAI,CAAC,EAAE,CAAC,CAAC;AAClB,CAAC,CAAC;AAdW,QAAA,+BAA+B,mCAc1C;AAEK,MAAM,cAAc,GAAG,CAAC,OAAsB,EAAE,kBAA0C,EAAiB,EAAE;IAClH,8BAA8B,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC;IAE5D,OAAO,WAAW,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC;AAClD,CAAC,CAAC;AAJW,QAAA,cAAc,kBAIzB;AAEF,MAAM,8BAA8B,GAAG,CACrC,OAAsB,EACtB,kBAA0C,EAC3B,EAAE;IACjB,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE;QACvB,MAAM,CAAC,cAAc,CAAC,CAAC,EAAE,aAAa,EAAE;YACtC,KAAK,EAAE,kBAAkB,CAAC,CAAC,EAAE,GAAG,CAAC;SAClC,CAAC,CAAC;KACJ;IAED,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAG,CAAC,OAAsB,EAAiB,EAAE;IACnE,OAAO,eAAM,
|
|
1
|
+
{"version":3,"file":"prepareResults.js","sourceRoot":"","sources":["../../src/utils/prepareResults.ts"],"names":[],"mappings":";;;AACA,MAAM,GAAG,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;AAEnC,mCAAgC;AAGhC,+CAA+C;AAIxC,MAAM,+BAA+B,GAA2B,CAAC,IAAI,EAAE,IAAI,EAAU,EAAE;IAC5F,IAAI,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAE3B,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;QACxB,EAAE,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;KACjC;SAAM;QACL,EAAE,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;KAClC;IAED,IAAI,IAAI,CAAC,MAAM,KAAK,KAAK,CAAC,EAAE;QAC1B,EAAE,IAAI,IAAI,CAAC,MAAM,CAAC;KACnB;IAED,OAAO,IAAI,CAAC,EAAE,CAAC,CAAC;AAClB,CAAC,CAAC;AAdW,QAAA,+BAA+B,mCAc1C;AAEK,MAAM,cAAc,GAAG,CAAC,OAAsB,EAAE,kBAA0C,EAAiB,EAAE;IAClH,8BAA8B,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC;IAE5D,OAAO,WAAW,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC;AAClD,CAAC,CAAC;AAJW,QAAA,cAAc,kBAIzB;AAEF,MAAM,8BAA8B,GAAG,CACrC,OAAsB,EACtB,kBAA0C,EAC3B,EAAE;IACjB,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE;QACvB,MAAM,CAAC,cAAc,CAAC,CAAC,EAAE,aAAa,EAAE;YACtC,KAAK,EAAE,kBAAkB,CAAC,CAAC,EAAE,GAAG,CAAC;SAClC,CAAC,CAAC;KACJ;IAED,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAG,CAAC,OAAsB,EAAiB,EAAE;IACnE,OAAO,IAAA,eAAM,EAAC,CAAC,GAAG,OAAO,CAAC,EAAE,aAAa,CAAC,CAAC;AAC7C,CAAC,CAAC;AAEF,MAAM,WAAW,GAAG,CAAC,OAAsB,EAAiB,EAAE;IAC5D,OAAO,CAAC,GAAG,OAAO,CAAC,CAAC,IAAI,CAAC,4BAAc,CAAC,CAAC;AAC3C,CAAC,CAAC"}
|
package/dist/utils/replacer.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Replacer = void 0;
|
|
4
|
-
const
|
|
4
|
+
const simple_eval_1 = require("simple-eval");
|
|
5
5
|
class Replacer {
|
|
6
6
|
constructor(count) {
|
|
7
7
|
this.regex = new RegExp(`#?${'{'.repeat(count)}([^}\n]+)${'}'.repeat(count)}`, 'g');
|
|
@@ -14,7 +14,7 @@ class Replacer {
|
|
|
14
14
|
return input.replace(this.regex, (substr, identifier, index) => {
|
|
15
15
|
const shouldEvaluate = input[index] === '#';
|
|
16
16
|
if (shouldEvaluate) {
|
|
17
|
-
return String(
|
|
17
|
+
return String((0, simple_eval_1.default)(identifier, {
|
|
18
18
|
...Object.entries(this.functions).reduce((fns, [name, fn]) => {
|
|
19
19
|
fns[name] = fn.bind(values);
|
|
20
20
|
return fns;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"replacer.js","sourceRoot":"","sources":["../../src/utils/replacer.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"replacer.js","sourceRoot":"","sources":["../../src/utils/replacer.ts"],"names":[],"mappings":";;;AACA,6CAA+B;AAI/B,MAAa,QAAQ;IAInB,YAAY,KAAa;QACvB,IAAI,CAAC,KAAK,GAAG,IAAI,MAAM,CAAC,KAAK,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;QAEpF,IAAI,CAAC,SAAS,GAAG,EAAE,CAAC;IACtB,CAAC;IAEM,WAAW,CAAC,IAAY,EAAE,MAAsB;QACrD,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC;IAChC,CAAC;IAEM,KAAK,CAAC,KAAa,EAAE,MAAS;QACnC,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE;YAE7D,MAAM,cAAc,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC;YAE5C,IAAI,cAAc,EAAE;gBAClB,OAAO,MAAM,CACX,IAAA,qBAAI,EAAC,UAAU,EAAE;oBACf,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,EAAE;wBAC3D,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;wBAC5B,OAAO,GAAG,CAAC;oBACb,CAAC,EAAE,EAAE,CAAC;oBACN,GAAG,MAAM;iBACV,CAAC,CACH,CAAC;aACH;YAED,IAAI,CAAC,CAAC,UAAU,IAAI,MAAM,CAAC,EAAE;gBAC3B,OAAO,EAAE,CAAC;aACX;YAGD,OAAO,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;QACpC,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAvCD,4BAuCC"}
|
|
@@ -48,7 +48,7 @@ const compareResults = (left, right) => {
|
|
|
48
48
|
if (diffSource !== 0) {
|
|
49
49
|
return normalize(diffSource);
|
|
50
50
|
}
|
|
51
|
-
const diffStart = exports.comparePosition(left.range.start, right.range.start);
|
|
51
|
+
const diffStart = (0, exports.comparePosition)(left.range.start, right.range.start);
|
|
52
52
|
if (diffStart !== 0) {
|
|
53
53
|
return diffStart;
|
|
54
54
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sortResults.js","sourceRoot":"","sources":["../../src/utils/sortResults.ts"],"names":[],"mappings":";;;AAGA,MAAM,WAAW,GAAG,CAAC,IAAiC,EAAE,KAAkC,EAAU,EAAE;IACpG,IAAI,IAAI,KAAK,KAAK,CAAC,IAAI,KAAK,KAAK,KAAK,CAAC,EAAE;QACvC,OAAO,CAAC,CAAC;KACV;IAED,IAAI,IAAI,KAAK,KAAK,CAAC,EAAE;QACnB,OAAO,CAAC,CAAC,CAAC;KACX;IAED,IAAI,KAAK,KAAK,KAAK,CAAC,EAAE;QACpB,OAAO,CAAC,CAAC;KACV;IAED,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;AAC9E,CAAC,CAAC;AAEF,MAAM,aAAa,GAAG,CAAC,IAAwB,EAAE,KAAyB,EAAU,EAAE;IACpF,IAAI,IAAI,KAAK,KAAK,CAAC,IAAI,KAAK,KAAK,KAAK,CAAC,EAAE;QACvC,OAAO,CAAC,CAAC;KACV;IAED,IAAI,IAAI,KAAK,KAAK,CAAC,EAAE;QACnB,OAAO,CAAC,CAAC,CAAC;KACX;IAED,IAAI,KAAK,KAAK,KAAK,CAAC,EAAE;QACpB,OAAO,CAAC,CAAC;KACV;IAED,OAAO,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;AACnC,CAAC,CAAC;AAEF,MAAM,SAAS,GAAG,CAAC,KAAa,EAAc,EAAE;IAC9C,IAAI,KAAK,GAAG,CAAC,EAAE;QACb,OAAO,CAAC,CAAC,CAAC;KACX;IAED,IAAI,KAAK,GAAG,CAAC,EAAE;QACb,OAAO,CAAC,CAAC;KACV;IAED,OAAO,CAAC,CAAC;AACX,CAAC,CAAC;AAEK,MAAM,eAAe,GAAG,CAAC,IAAe,EAAE,KAAgB,EAAc,EAAE;IAC/E,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;IAExC,IAAI,QAAQ,KAAK,CAAC,EAAE;QAClB,OAAO,SAAS,CAAC,QAAQ,CAAC,CAAC;KAC5B;IAED,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC;IAElD,OAAO,SAAS,CAAC,QAAQ,CAAC,CAAC;AAC7B,CAAC,CAAC;AAVW,QAAA,eAAe,mBAU1B;AAEK,MAAM,cAAc,GAAG,CAAC,IAAiB,EAAE,KAAkB,EAAc,EAAE;IAClF,MAAM,UAAU,GAAG,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAE5D,IAAI,UAAU,KAAK,CAAC,EAAE;QACpB,OAAO,SAAS,CAAC,UAAU,CAAC,CAAC;KAC9B;IAED,MAAM,SAAS,GAAG,uBAAe,
|
|
1
|
+
{"version":3,"file":"sortResults.js","sourceRoot":"","sources":["../../src/utils/sortResults.ts"],"names":[],"mappings":"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"}
|