Skip to content

Commit

Permalink
chore(core): drop runner runtime (#2302)
Browse files Browse the repository at this point in the history
  • Loading branch information
P0lip authored Oct 3, 2022
1 parent 5579e86 commit 8dde6f3
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 180 deletions.
1 change: 0 additions & 1 deletion packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
"dependencies": {
"@stoplight/better-ajv-errors": "1.0.3",
"@stoplight/json": "~3.20.1",
"@stoplight/lifecycle": "2.3.2",
"@stoplight/path": "1.3.2",
"@stoplight/spectral-parsers": "^1.0.0",
"@stoplight/spectral-ref-resolver": "^1.0.0",
Expand Down
90 changes: 0 additions & 90 deletions packages/core/src/runner/__tests__/runner.spec.ts

This file was deleted.

1 change: 0 additions & 1 deletion packages/core/src/runner/index.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
export { Runner } from './runner';
export { RunnerRuntime } from './runtime';
15 changes: 3 additions & 12 deletions packages/core/src/runner/runner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { DocumentInventory } from '../documentInventory';
import { IRuleResult } from '../types';
import { ComputeFingerprintFunc, prepareResults } from '../utils';
import { lintNode } from './lintNode';
import { RunnerRuntime } from './runtime';
import { IRunnerInternalContext } from './types';
import { Ruleset } from '../ruleset/ruleset';
import Nimma, { Callback } from 'nimma/legacy'; // legacy = Node v12, nimma without /legacy supports only 14+
Expand All @@ -13,7 +12,7 @@ import { isPlainObject } from '@stoplight/json';
export class Runner {
public readonly results: IRuleResult[];

constructor(protected readonly runtime: RunnerRuntime, protected readonly inventory: DocumentInventory) {
constructor(protected readonly inventory: DocumentInventory) {
this.results = [...this.inventory.diagnostics, ...(this.inventory.errors ?? [])];
}

Expand All @@ -26,8 +25,6 @@ export class Runner {
}

public async run(ruleset: Ruleset): Promise<void> {
this.runtime.emit('setup');

const { inventory: documentInventory } = this;
const { rules } = ruleset;
const formats = this.document.formats ?? null;
Expand Down Expand Up @@ -67,14 +64,8 @@ export class Runner {
execute(runnerContext.documentInventory.unresolved, callbacks.unresolved, unresolvedJsonPaths);
}

this.runtime.emit('beforeTeardown');

try {
if (runnerContext.promises.length > 0) {
await Promise.all(runnerContext.promises);
}
} finally {
this.runtime.emit('afterTeardown');
if (runnerContext.promises.length > 0) {
await Promise.all(runnerContext.promises);
}
}

Expand Down
49 changes: 0 additions & 49 deletions packages/core/src/runner/runtime.ts

This file was deleted.

9 changes: 2 additions & 7 deletions packages/core/src/spectral.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { memoize } from 'lodash';

import { Document, IDocument, IParsedResult, isParsedResult, ParsedDocument } from './document';
import { DocumentInventory } from './documentInventory';
import { Runner, RunnerRuntime } from './runner';
import { Runner } from './runner';
import { IConstructorOpts, IRunOpts, ISpectralDiagnostic, ISpectralFullResult } from './types';
import { ComputeFingerprintFunc, defaultComputeResultFingerprint } from './utils';
import { Ruleset } from './ruleset/ruleset';
Expand All @@ -24,8 +24,6 @@ export class Spectral {

public ruleset?: Ruleset;

protected readonly runtime: RunnerRuntime;

private readonly _computeFingerprint: ComputeFingerprintFunc;

constructor(protected readonly opts?: IConstructorOpts) {
Expand All @@ -36,8 +34,6 @@ export class Spectral {
} else {
this._resolver = createHttpAndFileResolver();
}

this.runtime = new RunnerRuntime();
}

protected parseDocument(target: IParsedResult | IDocument | Record<string, unknown> | string): IDocument {
Expand Down Expand Up @@ -65,7 +61,7 @@ export class Spectral {
const inventory = new DocumentInventory(document, this._resolver);
await inventory.resolve();

const runner = new Runner(this.runtime, inventory);
const runner = new Runner(inventory);
runner.results.push(...this._filterParserErrors(document.diagnostics, ruleset.parserOptions));

if (document.formats === void 0) {
Expand Down Expand Up @@ -97,7 +93,6 @@ export class Spectral {
}

public setRuleset(ruleset: RulesetDefinition | Ruleset): void {
this.runtime.revoke();
this.ruleset = ruleset instanceof Ruleset ? ruleset : new Ruleset(ruleset);
}

Expand Down
23 changes: 3 additions & 20 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2490,15 +2490,6 @@ __metadata:
languageName: node
linkType: hard

"@stoplight/lifecycle@npm:2.3.2":
version: 2.3.2
resolution: "@stoplight/lifecycle@npm:2.3.2"
dependencies:
wolfy87-eventemitter: ~5.2.8
checksum: ee60a3e5dda82bc2d58a2f2922bae8abd0cb874daa7e17d3b759747bcdf1de20b029524583de69001d5a1640f31fb61a84b322283043e425a4b25b3b682dba00
languageName: node
linkType: hard

"@stoplight/ordered-object-literal@npm:^1.0.1, @stoplight/ordered-object-literal@npm:^1.0.2, @stoplight/ordered-object-literal@npm:^1.0.3, @stoplight/ordered-object-literal@npm:~1.0.4":
version: 1.0.4
resolution: "@stoplight/ordered-object-literal@npm:1.0.4"
Expand Down Expand Up @@ -2561,7 +2552,6 @@ __metadata:
dependencies:
"@stoplight/better-ajv-errors": 1.0.3
"@stoplight/json": ~3.20.1
"@stoplight/lifecycle": 2.3.2
"@stoplight/path": 1.3.2
"@stoplight/spectral-formats": "*"
"@stoplight/spectral-functions": "*"
Expand Down Expand Up @@ -3259,9 +3249,9 @@ __metadata:
linkType: hard

"@types/urijs@npm:^1.19.16":
version: 1.19.17
resolution: "@types/urijs@npm:1.19.17"
checksum: 51241ca915d00b1d30cda1199304295269b91d234470c00529d282f3ec3eefb22d1ff8b51532a17d921c2bcaea025340ba3f6a91f8f6982b126765faaaf9c75c
version: 1.19.19
resolution: "@types/urijs@npm:1.19.19"
checksum: 2c08d41782149a243b374b28be009ca461f541c440d8d47c9d75b1d3255ff7169b34bb721cf2dd6266c2c44be6b70fc6d67a1abad50c4dae369774042b1facd8
languageName: node
linkType: hard

Expand Down Expand Up @@ -13397,13 +13387,6 @@ __metadata:
languageName: node
linkType: hard

"wolfy87-eventemitter@npm:~5.2.8":
version: 5.2.9
resolution: "wolfy87-eventemitter@npm:5.2.9"
checksum: 753b03fb876d5704378b08c02926b2040eb5c4c27288bee66b6d9b6e5bf7b194072d36afd33d80bdd94f3c4316dd72064ef1aa3629a514a6df5473187a304622
languageName: node
linkType: hard

"word-wrap@npm:^1.2.3, word-wrap@npm:~1.2.3":
version: 1.2.3
resolution: "word-wrap@npm:1.2.3"
Expand Down

0 comments on commit 8dde6f3

Please sign in to comment.