@stoplight/spectral-core 1.14.1 → 1.14.2
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/runner/index.d.ts +0 -1
- package/dist/runner/index.js +1 -3
- package/dist/runner/index.js.map +1 -1
- package/dist/runner/lintNode.d.ts +3 -3
- package/dist/runner/lintNode.js +11 -12
- package/dist/runner/lintNode.js.map +1 -1
- package/dist/runner/runner.d.ts +1 -3
- package/dist/runner/runner.js +3 -11
- package/dist/runner/runner.js.map +1 -1
- package/dist/spectral.d.ts +0 -2
- package/dist/spectral.js +1 -3
- package/dist/spectral.js.map +1 -1
- package/package.json +1 -2
- package/dist/runner/runtime.d.ts +0 -16
- package/dist/runner/runtime.js +0 -33
- package/dist/runner/runtime.js.map +0 -1
package/dist/runner/index.d.ts
CHANGED
package/dist/runner/index.js
CHANGED
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.Runner = void 0;
|
|
4
4
|
var runner_1 = require("./runner");
|
|
5
5
|
Object.defineProperty(exports, "Runner", { enumerable: true, get: function () { return runner_1.Runner; } });
|
|
6
|
-
var runtime_1 = require("./runtime");
|
|
7
|
-
Object.defineProperty(exports, "RunnerRuntime", { enumerable: true, get: function () { return runtime_1.RunnerRuntime; } });
|
|
8
6
|
//# sourceMappingURL=index.js.map
|
package/dist/runner/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/runner/index.ts"],"names":[],"mappings":";;;AAAA,mCAAkC;AAAzB,gGAAA,MAAM,OAAA
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/runner/index.ts"],"names":[],"mappings":";;;AAAA,mCAAkC;AAAzB,gGAAA,MAAM,OAAA"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { IGivenNode } from '../types';
|
|
2
|
-
import { IRunnerInternalContext } from './types';
|
|
3
|
-
import { Rule } from '../ruleset/rule';
|
|
1
|
+
import type { IGivenNode } from '../types';
|
|
2
|
+
import type { IRunnerInternalContext } from './types';
|
|
3
|
+
import type { Rule } from '../ruleset/rule';
|
|
4
4
|
export declare const lintNode: (context: IRunnerInternalContext, node: IGivenNode, rule: Rule) => void;
|
package/dist/runner/lintNode.js
CHANGED
|
@@ -8,23 +8,22 @@ const document_1 = require("../document");
|
|
|
8
8
|
const utils_1 = require("./utils");
|
|
9
9
|
const lintNode = (context, node, rule) => {
|
|
10
10
|
var _a;
|
|
11
|
+
const givenPath = node.path.length > 0 && node.path[0] === '$' ? node.path.slice(1) : node.path.slice();
|
|
11
12
|
const fnContext = {
|
|
12
13
|
document: context.documentInventory.document,
|
|
13
14
|
documentInventory: context.documentInventory,
|
|
14
15
|
rule,
|
|
15
|
-
path:
|
|
16
|
+
path: givenPath,
|
|
16
17
|
};
|
|
17
|
-
const givenPath = node.path.length > 0 && node.path[0] === '$' ? node.path.slice(1) : node.path;
|
|
18
18
|
for (const then of rule.then) {
|
|
19
19
|
const targets = (0, utils_1.getLintTargets)(node.value, then.field);
|
|
20
20
|
for (const target of targets) {
|
|
21
|
-
|
|
21
|
+
if (target.path.length > 0) {
|
|
22
|
+
fnContext.path = [...givenPath, ...target.path];
|
|
23
|
+
}
|
|
22
24
|
let targetResults;
|
|
23
25
|
try {
|
|
24
|
-
targetResults = then.function(target.value, (_a = then.functionOptions) !== null && _a !== void 0 ? _a : null,
|
|
25
|
-
...fnContext,
|
|
26
|
-
path,
|
|
27
|
-
});
|
|
26
|
+
targetResults = then.function(target.value, (_a = then.functionOptions) !== null && _a !== void 0 ? _a : null, fnContext);
|
|
28
27
|
}
|
|
29
28
|
catch (e) {
|
|
30
29
|
throw new pony_cause_1.ErrorWithCause(`Function "${then.function.name}" threw an exception${(0, lodash_1.isError)(e) ? `: ${e.message}` : ''}`, {
|
|
@@ -34,19 +33,19 @@ const lintNode = (context, node, rule) => {
|
|
|
34
33
|
if (targetResults === void 0)
|
|
35
34
|
continue;
|
|
36
35
|
if ('then' in targetResults) {
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
: void processTargetResults(context, results, rule, path)));
|
|
36
|
+
const _fnContext = { ...fnContext };
|
|
37
|
+
context.promises.push(targetResults.then(results => results === void 0 ? void 0 : processTargetResults(context, _fnContext, results)));
|
|
40
38
|
}
|
|
41
39
|
else {
|
|
42
|
-
processTargetResults(context,
|
|
40
|
+
processTargetResults(context, fnContext, targetResults);
|
|
43
41
|
}
|
|
44
42
|
}
|
|
45
43
|
}
|
|
46
44
|
};
|
|
47
45
|
exports.lintNode = lintNode;
|
|
48
|
-
function processTargetResults(context,
|
|
46
|
+
function processTargetResults(context, fnContext, results) {
|
|
49
47
|
var _a, _b, _c, _d, _e;
|
|
48
|
+
const { rule, path: targetPath } = fnContext;
|
|
50
49
|
for (const result of results) {
|
|
51
50
|
const escapedJsonPath = ((_a = result.path) !== null && _a !== void 0 ? _a : targetPath).map(spectral_runtime_1.decodeSegmentFragment);
|
|
52
51
|
const associatedItem = context.documentInventory.findAssociatedItemForPath(escapedJsonPath, rule.resolved);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lintNode.js","sourceRoot":"","sources":["../../src/runner/lintNode.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"lintNode.js","sourceRoot":"","sources":["../../src/runner/lintNode.ts"],"names":[],"mappings":";;;AAAA,kEAA+G;AAC/G,mCAAsC;AACtC,2CAA4C;AAE5C,0CAAuC;AAGvC,mCAA+D;AAGxD,MAAM,QAAQ,GAAG,CAAC,OAA+B,EAAE,IAAgB,EAAE,IAAU,EAAQ,EAAE;;IAC9F,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,KAAK,EAAE,CAAC;IAExG,MAAM,SAAS,GAA4C;QACzD,QAAQ,EAAE,OAAO,CAAC,iBAAiB,CAAC,QAAQ;QAC5C,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;QAC5C,IAAI;QACJ,IAAI,EAAE,SAAS;KAChB,CAAC;IAEF,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE;QAC5B,MAAM,OAAO,GAAG,IAAA,sBAAc,EAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QAEvD,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;YAC5B,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC1B,SAAS,CAAC,IAAI,GAAG,CAAC,GAAG,SAAS,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;aACjD;YAED,IAAI,aAAa,CAAC;YAClB,IAAI;gBACF,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,MAAA,IAAI,CAAC,eAAe,mCAAI,IAAI,EAAE,SAAS,CAAC,CAAC;aACtF;YAAC,OAAO,CAAC,EAAE;gBACV,MAAM,IAAI,2BAAc,CACtB,aAAa,IAAI,CAAC,QAAQ,CAAC,IAAI,uBAAuB,IAAA,gBAAO,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAC1F;oBACE,KAAK,EAAE,CAAC;iBACT,CACF,CAAC;aACH;YAED,IAAI,aAAa,KAAK,KAAK,CAAC;gBAAE,SAAS;YAEvC,IAAI,MAAM,IAAI,aAAa,EAAE;gBAC3B,MAAM,UAAU,GAAG,EAAE,GAAG,SAAS,EAAE,CAAC;gBACpC,OAAO,CAAC,QAAQ,CAAC,IAAI,CACnB,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAC3B,OAAO,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,oBAAoB,CAAC,OAAO,EAAE,UAAU,EAAE,OAAO,CAAC,CACjF,CACF,CAAC;aACH;iBAAM;gBACL,oBAAoB,CAAC,OAAO,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC;aACzD;SACF;KACF;AACH,CAAC,CAAC;AA5CW,QAAA,QAAQ,YA4CnB;AAEF,SAAS,oBAAoB,CAC3B,OAA+B,EAC/B,SAAkD,EAClD,OAA0B;;IAE1B,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,SAAS,CAAC;IAC7C,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC5B,MAAM,eAAe,GAAG,CAAC,MAAA,MAAM,CAAC,IAAI,mCAAI,UAAU,CAAC,CAAC,GAAG,CAAC,wCAAqB,CAAC,CAAC;QAC/E,MAAM,cAAc,GAAG,OAAO,CAAC,iBAAiB,CAAC,yBAAyB,CAAC,eAAe,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC3G,MAAM,IAAI,GAAG,MAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,IAAI,mCAAI,IAAA,qCAAkB,EAAC,OAAO,CAAC,iBAAiB,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC;QAC7G,MAAM,MAAM,GAAG,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,QAAQ,CAAC,MAAM,CAAC;QAE/C,MAAM,QAAQ,GAAG,MAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,QAAQ,mCAAI,OAAO,CAAC,iBAAiB,CAAC,QAAQ,CAAC;QAChF,MAAM,KAAK,GAAG,MAAA,QAAQ,CAAC,mBAAmB,CAAC,IAAI,EAAE,IAAI,CAAC,mCAAI,mBAAQ,CAAC,aAAa,CAAC;QACjF,MAAM,KAAK,GAAY,IAAI,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,IAAA,YAAG,EAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAEpF,MAAM,IAAI,GAAgB;YACxB,QAAQ,EACN,CAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,mBAAmB,MAAK,KAAK,CAAC,IAAI,cAAc,CAAC,mBAAmB,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM;gBACvG,CAAC,CAAC,IAAA,4BAAS,EAAC,cAAc,CAAC,mBAAmB,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,6BAAU,CAAC,GAAG,CAAC;gBACtF,CAAC,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC;oBACjB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;oBACvB,CAAC,CAAC,EAAE;YACR,KAAK,EAAE,MAAM,CAAC,OAAO;YACrB,IAAI,EAAE,IAAA,4BAAS,EAAC,IAAI,EAAE,6BAAU,CAAC,cAAc,CAAC;YAChD,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,KAAK;SACN,CAAC;QAEF,MAAM,aAAa,GAAG,IAAA,eAAO,EAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACpD,IAAI,CAAC,KAAK,GAAG,aAAa,CAAC;QAE3B,MAAM,QAAQ,GAAG,MAAM,KAAK,IAAI,IAAI,MAAM,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC;QAEhH,IAAI,QAAQ,KAAK,CAAC,CAAC;YAAE,SAAS;QAE9B,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC;YACnB,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,OAAO,EAAE,CAAC,IAAI,CAAC,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,MAAA,IAAI,CAAC,WAAW,mCAAI,aAAa,CAAC,CAAC,CAAC,IAAA,eAAO,EAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE;YACzG,IAAI;YACJ,QAAQ;YACR,GAAG,CAAC,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;YACxC,KAAK;SACN,CAAC,CAAC;KACJ;AACH,CAAC"}
|
package/dist/runner/runner.d.ts
CHANGED
|
@@ -2,13 +2,11 @@ import { IDocument } from '../document';
|
|
|
2
2
|
import { DocumentInventory } from '../documentInventory';
|
|
3
3
|
import { IRuleResult } from '../types';
|
|
4
4
|
import { ComputeFingerprintFunc } from '../utils';
|
|
5
|
-
import { RunnerRuntime } from './runtime';
|
|
6
5
|
import { Ruleset } from '../ruleset/ruleset';
|
|
7
6
|
export declare class Runner {
|
|
8
|
-
protected readonly runtime: RunnerRuntime;
|
|
9
7
|
protected readonly inventory: DocumentInventory;
|
|
10
8
|
readonly results: IRuleResult[];
|
|
11
|
-
constructor(
|
|
9
|
+
constructor(inventory: DocumentInventory);
|
|
12
10
|
protected get document(): IDocument;
|
|
13
11
|
addResult(result: IRuleResult): void;
|
|
14
12
|
run(ruleset: Ruleset): Promise<void>;
|
package/dist/runner/runner.js
CHANGED
|
@@ -8,9 +8,8 @@ const legacy_1 = (0, tslib_1.__importDefault)(require("nimma/legacy"));
|
|
|
8
8
|
const fallbacks_1 = require("nimma/fallbacks");
|
|
9
9
|
const json_1 = require("@stoplight/json");
|
|
10
10
|
class Runner {
|
|
11
|
-
constructor(
|
|
11
|
+
constructor(inventory) {
|
|
12
12
|
var _a;
|
|
13
|
-
this.runtime = runtime;
|
|
14
13
|
this.inventory = inventory;
|
|
15
14
|
this.results = [...this.inventory.diagnostics, ...((_a = this.inventory.errors) !== null && _a !== void 0 ? _a : [])];
|
|
16
15
|
}
|
|
@@ -23,7 +22,6 @@ class Runner {
|
|
|
23
22
|
async run(ruleset) {
|
|
24
23
|
var _a, _b;
|
|
25
24
|
var _c;
|
|
26
|
-
this.runtime.emit('setup');
|
|
27
25
|
const { inventory: documentInventory } = this;
|
|
28
26
|
const { rules } = ruleset;
|
|
29
27
|
const formats = (_a = this.document.formats) !== null && _a !== void 0 ? _a : null;
|
|
@@ -55,14 +53,8 @@ class Runner {
|
|
|
55
53
|
if (unresolvedJsonPaths.length > 0) {
|
|
56
54
|
execute(runnerContext.documentInventory.unresolved, callbacks.unresolved, unresolvedJsonPaths);
|
|
57
55
|
}
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
if (runnerContext.promises.length > 0) {
|
|
61
|
-
await Promise.all(runnerContext.promises);
|
|
62
|
-
}
|
|
63
|
-
}
|
|
64
|
-
finally {
|
|
65
|
-
this.runtime.emit('afterTeardown');
|
|
56
|
+
if (runnerContext.promises.length > 0) {
|
|
57
|
+
await Promise.all(runnerContext.promises);
|
|
66
58
|
}
|
|
67
59
|
}
|
|
68
60
|
getResults(computeFingerprint) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../src/runner/runner.ts"],"names":[],"mappings":";;;;AAGA,oCAAkE;AAClE,yCAAsC;
|
|
1
|
+
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../src/runner/runner.ts"],"names":[],"mappings":"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"}
|
package/dist/spectral.d.ts
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { IDocument, IParsedResult } from './document';
|
|
2
|
-
import { RunnerRuntime } from './runner';
|
|
3
2
|
import { IConstructorOpts, IRunOpts, ISpectralDiagnostic, ISpectralFullResult } from './types';
|
|
4
3
|
import { Ruleset } from './ruleset/ruleset';
|
|
5
4
|
import { RulesetDefinition } from './ruleset/types';
|
|
@@ -8,7 +7,6 @@ export declare class Spectral {
|
|
|
8
7
|
protected readonly opts?: IConstructorOpts | undefined;
|
|
9
8
|
private readonly _resolver;
|
|
10
9
|
ruleset?: Ruleset;
|
|
11
|
-
protected readonly runtime: RunnerRuntime;
|
|
12
10
|
private readonly _computeFingerprint;
|
|
13
11
|
constructor(opts?: IConstructorOpts | undefined);
|
|
14
12
|
protected parseDocument(target: IParsedResult | IDocument | Record<string, unknown> | string): IDocument;
|
package/dist/spectral.js
CHANGED
|
@@ -26,7 +26,6 @@ class Spectral {
|
|
|
26
26
|
else {
|
|
27
27
|
this._resolver = (0, spectral_ref_resolver_1.createHttpAndFileResolver)();
|
|
28
28
|
}
|
|
29
|
-
this.runtime = new runner_1.RunnerRuntime();
|
|
30
29
|
}
|
|
31
30
|
parseDocument(target) {
|
|
32
31
|
return target instanceof document_1.Document
|
|
@@ -43,7 +42,7 @@ class Spectral {
|
|
|
43
42
|
const ruleset = this.ruleset.fromSource(document.source);
|
|
44
43
|
const inventory = new documentInventory_1.DocumentInventory(document, this._resolver);
|
|
45
44
|
await inventory.resolve();
|
|
46
|
-
const runner = new runner_1.Runner(
|
|
45
|
+
const runner = new runner_1.Runner(inventory);
|
|
47
46
|
runner.results.push(...this._filterParserErrors(document.diagnostics, ruleset.parserOptions));
|
|
48
47
|
if (document.formats === void 0) {
|
|
49
48
|
const foundFormats = [...ruleset.formats].filter(format => format(inventory.resolved, document.source));
|
|
@@ -68,7 +67,6 @@ class Spectral {
|
|
|
68
67
|
return (await this.runWithResolved(target, opts)).results;
|
|
69
68
|
}
|
|
70
69
|
setRuleset(ruleset) {
|
|
71
|
-
this.runtime.revoke();
|
|
72
70
|
this.ruleset = ruleset instanceof ruleset_1.Ruleset ? ruleset : new ruleset_1.Ruleset(ruleset);
|
|
73
71
|
}
|
|
74
72
|
_generateUnrecognizedFormatError(document, formats) {
|
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,kFAAuD;AACvD,4EAAuF;AACvF,mCAAiC;AAEjC,yCAAgG;AAChG,2DAAwD;AACxD,
|
|
1
|
+
{"version":3,"file":"spectral.js","sourceRoot":"","sources":["../src/spectral.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@stoplight/spectral-core",
|
|
3
|
-
"version": "1.14.
|
|
3
|
+
"version": "1.14.2",
|
|
4
4
|
"sideEffects": false,
|
|
5
5
|
"homepage": "https://github.com/stoplightio/spectral",
|
|
6
6
|
"bugs": "https://github.com/stoplightio/spectral/issues",
|
|
@@ -39,7 +39,6 @@
|
|
|
39
39
|
"dependencies": {
|
|
40
40
|
"@stoplight/better-ajv-errors": "1.0.3",
|
|
41
41
|
"@stoplight/json": "~3.20.1",
|
|
42
|
-
"@stoplight/lifecycle": "2.3.2",
|
|
43
42
|
"@stoplight/path": "1.3.2",
|
|
44
43
|
"@stoplight/spectral-parsers": "^1.0.0",
|
|
45
44
|
"@stoplight/spectral-ref-resolver": "^1.0.0",
|
package/dist/runner/runtime.d.ts
DELETED
|
@@ -1,16 +0,0 @@
|
|
|
1
|
-
import { EventEmitter, IDisposable } from '@stoplight/lifecycle';
|
|
2
|
-
declare type Revokable = () => void;
|
|
3
|
-
export declare type SpectralEvents = {
|
|
4
|
-
setup(): void;
|
|
5
|
-
beforeTeardown(): void;
|
|
6
|
-
afterTeardown(): void;
|
|
7
|
-
};
|
|
8
|
-
export declare class RunnerRuntime extends EventEmitter<SpectralEvents> {
|
|
9
|
-
protected readonly revokables: Revokable[];
|
|
10
|
-
constructor();
|
|
11
|
-
persist<O extends Record<string, unknown>>(obj: O): O;
|
|
12
|
-
revoke(): void;
|
|
13
|
-
spawn(): Pick<RunnerRuntime, 'on'>;
|
|
14
|
-
protected hijackDisposable<F extends (...args: any[]) => IDisposable>(fn: F): F;
|
|
15
|
-
}
|
|
16
|
-
export {};
|
package/dist/runner/runtime.js
DELETED
|
@@ -1,33 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.RunnerRuntime = void 0;
|
|
4
|
-
const lifecycle_1 = require("@stoplight/lifecycle");
|
|
5
|
-
class RunnerRuntime extends lifecycle_1.EventEmitter {
|
|
6
|
-
constructor() {
|
|
7
|
-
super();
|
|
8
|
-
this.revokables = [];
|
|
9
|
-
}
|
|
10
|
-
persist(obj) {
|
|
11
|
-
const { proxy, revoke } = Proxy.revocable(obj, {});
|
|
12
|
-
this.revokables.push(revoke);
|
|
13
|
-
return proxy;
|
|
14
|
-
}
|
|
15
|
-
revoke() {
|
|
16
|
-
let revokable;
|
|
17
|
-
while ((revokable = this.revokables.shift())) {
|
|
18
|
-
revokable();
|
|
19
|
-
}
|
|
20
|
-
}
|
|
21
|
-
spawn() {
|
|
22
|
-
return this.persist(Object.freeze({
|
|
23
|
-
on: this.hijackDisposable(this.on),
|
|
24
|
-
}));
|
|
25
|
-
}
|
|
26
|
-
hijackDisposable(fn) {
|
|
27
|
-
return ((...args) => {
|
|
28
|
-
this.revokables.push(fn.apply(this, args).dispose);
|
|
29
|
-
});
|
|
30
|
-
}
|
|
31
|
-
}
|
|
32
|
-
exports.RunnerRuntime = RunnerRuntime;
|
|
33
|
-
//# sourceMappingURL=runtime.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../../src/runner/runtime.ts"],"names":[],"mappings":";;;AAAA,oDAAiE;AAUjE,MAAa,aAAc,SAAQ,wBAA4B;IAG7D;QACE,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;IACvB,CAAC;IAEM,OAAO,CAAoC,GAAM;QACtD,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC,SAAS,CAAI,GAAG,EAAE,EAAE,CAAC,CAAC;QACtD,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC7B,OAAO,KAAK,CAAC;IACf,CAAC;IAEM,MAAM;QACX,IAAI,SAAS,CAAC;QAEd,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,EAAE;YAC5C,SAAS,EAAE,CAAC;SACb;IACH,CAAC;IAEM,KAAK;QACV,OAAO,IAAI,CAAC,OAAO,CACjB,MAAM,CAAC,MAAM,CAAC;YAEZ,EAAE,EAAE,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC;SACnC,CAAC,CACH,CAAC;IACJ,CAAC;IAES,gBAAgB,CAA4C,EAAK;QACzE,OAAO,CAAC,CAAC,GAAG,IAAI,EAAE,EAAE;YAElB,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC;QACrD,CAAC,CAAM,CAAC;IACV,CAAC;CACF;AAtCD,sCAsCC"}
|