-
Notifications
You must be signed in to change notification settings - Fork 47
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #615 from stoplightio/feat/newer-spectral
feat: use newer Spectral
- Loading branch information
Showing
9 changed files
with
382 additions
and
749 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -61,3 +61,6 @@ typings/ | |
| .next | ||
|
|
||
| dist | ||
|
|
||
| # JetBrains IDEs | ||
| .idea/ | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| import { Optional } from '@stoplight/types'; | ||
| import { Ruleset, RulesetDefinition } from '@stoplight/spectral-core'; | ||
| import * as fs from 'fs'; | ||
| import * as path from 'path'; | ||
| import * as process from 'process'; | ||
| import { migrateRuleset } from '@stoplight/spectral-ruleset-migrator'; | ||
| import { info, error } from '@actions/core'; | ||
|
|
||
| // eslint-disable-next-line @typescript-eslint/require-await | ||
| const AsyncFunction = (async (): Promise<void> => void 0).constructor as FunctionConstructor; | ||
|
|
||
| async function getDefaultRulesetFile(): Promise<Optional<string>> { | ||
| const cwd = process.cwd(); | ||
| for (const filename of await fs.promises.readdir(cwd)) { | ||
| if (Ruleset.isDefaultRulesetFile(filename)) { | ||
| return path.join(cwd, filename); | ||
| } | ||
| } | ||
|
|
||
| return; | ||
| } | ||
|
|
||
| export async function getRuleset(rulesetFile: Optional<string>): Promise<Ruleset> { | ||
| if (!rulesetFile) { | ||
| rulesetFile = await getDefaultRulesetFile(); | ||
| } else if (!path.isAbsolute(rulesetFile)) { | ||
| rulesetFile = path.join(process.cwd(), rulesetFile); | ||
| } | ||
|
|
||
| if (!rulesetFile) { | ||
| throw new Error( | ||
| 'No ruleset has been found. Please provide a ruleset using the --ruleset CLI argument, or make sure your ruleset file matches .?spectral.(js|ya?ml|json)' | ||
| ); | ||
| } | ||
|
|
||
| info(`Loading ruleset '${rulesetFile}'...`); | ||
|
|
||
| let ruleset; | ||
|
|
||
| try { | ||
| if (/(json|ya?ml)$/.test(path.extname(rulesetFile))) { | ||
| const m: { exports?: RulesetDefinition } = {}; | ||
| const paths = [path.dirname(rulesetFile), __dirname]; | ||
|
|
||
| await AsyncFunction( | ||
| 'module, require', | ||
| await migrateRuleset(rulesetFile, { | ||
| format: 'commonjs', | ||
| fs, | ||
| }) | ||
| // eslint-disable-next-line @typescript-eslint/no-var-requires | ||
| )(m, (id: string) => require(require.resolve(id, { paths })) as unknown); | ||
|
|
||
| ruleset = m.exports; | ||
| } else { | ||
| const imported = (await import(rulesetFile)) as { default: unknown } | unknown; | ||
| ruleset = | ||
| typeof imported === 'object' && imported !== null && 'default' in imported | ||
| ? (imported as Record<'default', unknown>).default | ||
| : imported; | ||
| } | ||
| } catch (e) { | ||
| error(`Failed to load ruleset '${rulesetFile}'... Error: ${e.message}`); | ||
| throw e; | ||
| } | ||
|
|
||
| return new Ruleset(ruleset, { | ||
| severity: 'recommended', | ||
| source: rulesetFile, | ||
| }); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.