Merge branch 'develop' into fix/ruleset-migrator/node-resolution

stoplightio · Jan 17, 2022 · 65ae608 · 65ae608
2 parents 9468469 + 3f47abc
commit 65ae608
Show file tree

Hide file tree

Showing 23 changed files with 48 additions and 57 deletions.
diff --git a/packages/cli/src/formatters/__tests__/pretty.test.ts b/packages/cli/src/formatters/__tests__/pretty.test.ts
@@ -1,5 +1,5 @@
 import { DiagnosticSeverity } from '@stoplight/types';
-import * as chalk from 'chalk';
+import chalk from 'chalk';
 import { pretty } from '../pretty';
 
 const oas3SchemaErrors = require('./__fixtures__/oas3-schema-errors.json');

diff --git a/packages/cli/src/formatters/__tests__/stylish.test.ts b/packages/cli/src/formatters/__tests__/stylish.test.ts
@@ -1,5 +1,5 @@
 import { DiagnosticSeverity } from '@stoplight/types';
-import * as chalk from 'chalk';
+import chalk from 'chalk';
 import { stylish } from '../stylish';
 
 const oas3SchemaErrors = require('./__fixtures__/oas3-schema-errors.json');

diff --git a/packages/cli/src/formatters/pretty.ts b/packages/cli/src/formatters/pretty.ts
@@ -26,7 +26,7 @@
 
 import { printPath, PrintStyle } from '@stoplight/spectral-runtime';
 import { IDiagnostic, IRange } from '@stoplight/types';
-import * as chalk from 'chalk';
+import chalk from 'chalk';
 
 import { Formatter } from './types';
 import { getColorForSeverity, getHighestSeverity, getSummary, getSeverityName, groupBySource } from './utils';

diff --git a/packages/cli/src/formatters/stylish.ts b/packages/cli/src/formatters/stylish.ts
@@ -24,14 +24,14 @@
  * @author Sindre Sorhus
  */
 
-import { DiagnosticSeverity, IRange } from '@stoplight/types';
-import * as chalk from 'chalk';
+import type { DiagnosticSeverity, IRange } from '@stoplight/types';
+import chalk from 'chalk';
 import stripAnsi = require('strip-ansi');
-import * as table from 'text-table';
+import table from 'text-table';
 import { printPath, PrintStyle } from '@stoplight/spectral-runtime';
-import { IRuleResult } from '@stoplight/spectral-core';
+import type { IRuleResult } from '@stoplight/spectral-core';
 
-import { Formatter } from './types';
+import type { Formatter } from './types';
 import { getColorForSeverity, getHighestSeverity, getSeverityName, getSummary, groupBySource } from './utils';
 
 // -----------------------------------------------------------------------------

diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts
@@ -8,7 +8,7 @@ import type * as Agent from 'proxy-agent';
 
 if (typeof process.env.PROXY === 'string') {
   // eslint-disable-next-line @typescript-eslint/no-var-requires
-  const ProxyAgent = require('proxy-agent') as typeof Agent;
+  const ProxyAgent = require('proxy-agent') as typeof Agent['default'];
   DEFAULT_REQUEST_OPTIONS.agent = new ProxyAgent(process.env.PROXY);
 }
 

diff --git a/packages/cli/src/services/__tests__/linter.test.ts b/packages/cli/src/services/__tests__/linter.test.ts
@@ -1,5 +1,5 @@
 import { join, resolve } from '@stoplight/path';
-import * as nock from 'nock';
+import nock from 'nock';
 import * as yargs from 'yargs';
 import lintCommand from '../../commands/lint';
 import { lint } from '../linter';

diff --git a/packages/cli/src/services/linter/utils/getRuleset.ts b/packages/cli/src/services/linter/utils/getRuleset.ts
@@ -11,7 +11,7 @@ import { node } from '@stoplight/spectral-ruleset-bundler/presets/node';
 import { stdin } from '@stoplight/spectral-ruleset-bundler/plugins/stdin';
 import { builtins } from '@stoplight/spectral-ruleset-bundler/plugins/builtins';
 import { isError, isObject } from 'lodash';
-import * as commonjs from '@rollup/plugin-commonjs';
+import commonjs from '@rollup/plugin-commonjs';
 import { ErrorWithCause } from 'pony-cause';
 
 async function getDefaultRulesetFile(): Promise<Optional<string>> {
@@ -60,23 +60,13 @@ export async function getRuleset(rulesetFile: Optional<string>): Promise<Ruleset
       ruleset = await bundleRuleset(rulesetFile, {
         target: 'node',
         format: 'commonjs',
-        plugins: [
-          stdin(migratedRuleset, rulesetFile),
-          builtins(),
-          // sigh, 2021 and we still do not use ESM
-          (commonjs as unknown as typeof import('@rollup/plugin-commonjs').default)(),
-          ...node({ fs, fetch }),
-        ],
+        plugins: [stdin(migratedRuleset, rulesetFile), builtins(), commonjs(), ...node({ fs, fetch })],
       });
     } else {
       ruleset = await bundleRuleset(rulesetFile, {
         target: 'node',
         format: 'commonjs',
-        plugins: [
-          builtins(),
-          (commonjs as unknown as typeof import('@rollup/plugin-commonjs').default)(),
-          ...node({ fs, fetch }),
-        ],
+        plugins: [builtins(), commonjs(), ...node({ fs, fetch })],
       });
     }
   } catch (e) {

diff --git a/packages/cli/src/services/linter/utils/listFiles.ts b/packages/cli/src/services/linter/utils/listFiles.ts
@@ -1,5 +1,5 @@
 import { normalize } from '@stoplight/path';
-import * as fg from 'fast-glob';
+import fg from 'fast-glob';
 
 const GLOB_OPTIONS = {
   absolute: true,

diff --git a/packages/core/src/__tests__/spectral.jest.test.ts b/packages/core/src/__tests__/spectral.jest.test.ts
@@ -2,7 +2,7 @@ import { normalize } from '@stoplight/path';
 import { truthy, pattern } from '@stoplight/spectral-functions';
 import { DiagnosticSeverity } from '@stoplight/types';
 import * as fs from 'fs';
-import * as nock from 'nock';
+import nock from 'nock';
 import * as path from '@stoplight/path';
 import * as Parsers from '@stoplight/spectral-parsers';
 import { httpAndFileResolver } from '@stoplight/spectral-ref-resolver';

diff --git a/packages/core/src/ruleset/rulesetFunction.ts b/packages/core/src/ruleset/rulesetFunction.ts
@@ -2,7 +2,7 @@ import Ajv, { ErrorObject } from 'ajv';
 import addFormats from 'ajv-formats';
 import ajvErrors from 'ajv-errors';
 import type { RequiredError } from 'ajv/dist/vocabularies/validation/required';
-import type { AdditionalPropertiesError } from 'ajv/lib/vocabularies/applicator/additionalProperties';
+import type { AdditionalPropertiesError } from 'ajv/dist/vocabularies/applicator/additionalProperties';
 import type { EnumError } from 'ajv/dist/vocabularies/validation/enum';
 import type { JSONSchema7 } from 'json-schema';
 

diff --git a/packages/core/src/ruleset/utils/minimatch.ts b/packages/core/src/ruleset/utils/minimatch.ts
@@ -1,4 +1,4 @@
-import * as mm from 'minimatch';
+import mm from 'minimatch';
 
 const DEFAULT_OPTS = { matchBase: true };
 

diff --git a/packages/core/src/types/spectral.ts b/packages/core/src/types/spectral.ts
@@ -1,5 +1,5 @@
 import { IDiagnostic, JsonPath } from '@stoplight/types';
-import { JSONSchema7 } from 'json-schema';
+import type { JSONSchema7 } from 'json-schema';
 import type { Resolver } from '@stoplight/spectral-ref-resolver';
 
 export interface IConstructorOpts {

diff --git a/packages/core/src/utils/__tests__/prepareResults.test.ts b/packages/core/src/utils/__tests__/prepareResults.test.ts
@@ -1,6 +1,6 @@
 import { defaultComputeResultFingerprint, prepareResults } from '../prepareResults';
 
-import * as duplicateValidationResults from './__fixtures__/duplicate-validation-results.json';
+import duplicateValidationResults from './__fixtures__/duplicate-validation-results.json';
 
 describe('prepareResults util', () => {
   it('deduplicate exact validation results', () => {

diff --git a/packages/functions/src/schema/index.ts b/packages/functions/src/schema/index.ts
@@ -1,5 +1,5 @@
 import type { ErrorObject } from 'ajv';
-import * as betterAjvErrors from '@stoplight/better-ajv-errors';
+import betterAjvErrors from '@stoplight/better-ajv-errors';
 import { detectDialect } from '@stoplight/spectral-formats';
 import { createAjvInstances } from './ajv';
 import MissingRefError from 'ajv/dist/compile/ref_error';

diff --git a/packages/ruleset-bundler/src/utils/isPackageImport.ts b/packages/ruleset-bundler/src/utils/isPackageImport.ts
@@ -1,4 +1,4 @@
-import * as validate from 'validate-npm-package-name';
+import validate from 'validate-npm-package-name';
 
 const isValidPackageName = (packageName: string): boolean => validate(packageName).validForNewPackages;
 

diff --git a/packages/ruleset-migrator/src/__tests__/ruleset.test.ts b/packages/ruleset-migrator/src/__tests__/ruleset.test.ts
@@ -8,7 +8,7 @@ import * as fetchMock from 'fetch-mock';
 import { serveAssets } from '@stoplight/spectral-test-utils';
 
 import { migrateRuleset } from '..';
-import * as fixtures from './__fixtures__/.cache/index.json';
+import fixtures from './__fixtures__/.cache/index.json';
 
 const cwd = '/.tmp/spectral';
 

diff --git a/packages/ruleset-migrator/src/tree/scope.ts b/packages/ruleset-migrator/src/tree/scope.ts
@@ -1,4 +1,4 @@
-import * as reserved from 'reserved';
+import reserved from 'reserved';
 
 const REGISTERED_WORDS = [
   ...reserved,

diff --git a/packages/rulesets/package.json b/packages/rulesets/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@stoplight/spectral-rulesets",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "homepage": "https://github.com/stoplightio/spectral",
   "bugs": "https://github.com/stoplightio/spectral/issues",
   "author": "Stoplight <support@stoplight.io>",
@@ -22,14 +22,14 @@
   },
   "dependencies": {
     "@stoplight/better-ajv-errors": "1.0.1",
-    "@stoplight/json": "3.17.0",
-    "@stoplight/spectral-core": "^1.3.0",
-    "@stoplight/spectral-formats": "^1.0.1",
-    "@stoplight/spectral-functions": "^1.1.2",
-    "@stoplight/spectral-runtime": "^1.0.0",
+    "@stoplight/json": "^3.17.0",
+    "@stoplight/spectral-core": "^1.8.1",
+    "@stoplight/spectral-formats": "^1.0.2",
+    "@stoplight/spectral-functions": "^1.5.1",
+    "@stoplight/spectral-runtime": "^1.1.1",
     "@stoplight/types": "^12.3.0",
     "@types/json-schema": "^7.0.7",
-    "ajv": "~8.6.0",
+    "ajv": "^8.8.2",
     "ajv-formats": "~2.1.0",
     "json-schema-traverse": "^1.0.0",
     "lodash": "~4.17.21",

diff --git a/packages/rulesets/src/asyncapi/functions/asyncApi2PayloadValidation.ts b/packages/rulesets/src/asyncapi/functions/asyncApi2PayloadValidation.ts
@@ -1,7 +1,7 @@
 import Ajv from 'ajv';
 import addFormats from 'ajv-formats';
 import { createRulesetFunction } from '@stoplight/spectral-core';
-import * as betterAjvErrors from '@stoplight/better-ajv-errors';
+import betterAjvErrors from '@stoplight/better-ajv-errors';
 import * as asyncApi2Schema from '../schemas/schema.asyncapi2.json';
 
 const fakeSchemaObjectId = 'asyncapi2#/definitions/schema';

diff --git a/packages/rulesets/src/oas/functions/oasSchema.ts b/packages/rulesets/src/oas/functions/oasSchema.ts
@@ -1,5 +1,5 @@
 import type { SchemaObject, ErrorObject } from 'ajv';
-import * as traverse from 'json-schema-traverse';
+import traverse from 'json-schema-traverse';
 import { schema as schemaFn, SchemaOptions } from '@stoplight/spectral-functions';
 import { createRulesetFunction } from '@stoplight/spectral-core';
 import { oas2, oas3_1, extractDraftVersion, oas3_0 } from '@stoplight/spectral-formats';

diff --git a/test-utils/node/index.ts b/test-utils/node/index.ts
@@ -1,4 +1,4 @@
-import * as nock from 'nock';
+import nock from 'nock';
 import * as nodeFs from 'fs';
 import { URL } from 'url';
 import { dirname, isURL } from '@stoplight/path';

diff --git a/tsconfig.json b/tsconfig.json
@@ -21,6 +21,7 @@
     "moduleResolution": "node",
     "target": "ES2019",
     "module": "CommonJS",
+    "esModuleInterop": true,
     "lib": ["es2020"],
     "strict": true,
     "pretty": true,

diff --git a/yarn.lock b/yarn.lock
@@ -2010,7 +2010,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@stoplight/spectral-core@>=1, @stoplight/spectral-core@^1.1.0, @stoplight/spectral-core@^1.3.0, @stoplight/spectral-core@^1.5.1, @stoplight/spectral-core@^1.7.0, @stoplight/spectral-core@^1.8.0, @stoplight/spectral-core@workspace:packages/core":
+"@stoplight/spectral-core@>=1, @stoplight/spectral-core@^1.1.0, @stoplight/spectral-core@^1.5.1, @stoplight/spectral-core@^1.7.0, @stoplight/spectral-core@^1.8.0, @stoplight/spectral-core@^1.8.1, @stoplight/spectral-core@workspace:packages/core":
   version: 0.0.0-use.local
   resolution: "@stoplight/spectral-core@workspace:packages/core"
   dependencies:
@@ -2045,7 +2045,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@stoplight/spectral-formats@*, @stoplight/spectral-formats@>=1, @stoplight/spectral-formats@^1.0.0, @stoplight/spectral-formats@^1.0.1, @stoplight/spectral-formats@workspace:packages/formats":
+"@stoplight/spectral-formats@*, @stoplight/spectral-formats@>=1, @stoplight/spectral-formats@^1.0.0, @stoplight/spectral-formats@^1.0.2, @stoplight/spectral-formats@workspace:packages/formats":
   version: 0.0.0-use.local
   resolution: "@stoplight/spectral-formats@workspace:packages/formats"
   dependencies:
@@ -2056,7 +2056,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@stoplight/spectral-functions@*, @stoplight/spectral-functions@>=1, @stoplight/spectral-functions@^1.0.0, @stoplight/spectral-functions@^1.1.2, @stoplight/spectral-functions@workspace:packages/functions":
+"@stoplight/spectral-functions@*, @stoplight/spectral-functions@>=1, @stoplight/spectral-functions@^1.0.0, @stoplight/spectral-functions@^1.5.1, @stoplight/spectral-functions@workspace:packages/functions":
   version: 0.0.0-use.local
   resolution: "@stoplight/spectral-functions@workspace:packages/functions"
   dependencies:
@@ -2157,17 +2157,17 @@ __metadata:
   resolution: "@stoplight/spectral-rulesets@workspace:packages/rulesets"
   dependencies:
     "@stoplight/better-ajv-errors": 1.0.1
-    "@stoplight/json": 3.17.0
+    "@stoplight/json": ^3.17.0
     "@stoplight/path": ^1.3.2
-    "@stoplight/spectral-core": ^1.3.0
-    "@stoplight/spectral-formats": ^1.0.1
-    "@stoplight/spectral-functions": ^1.1.2
+    "@stoplight/spectral-core": ^1.8.1
+    "@stoplight/spectral-formats": ^1.0.2
+    "@stoplight/spectral-functions": ^1.5.1
     "@stoplight/spectral-parsers": "*"
     "@stoplight/spectral-ref-resolver": "*"
-    "@stoplight/spectral-runtime": ^1.0.0
+    "@stoplight/spectral-runtime": ^1.1.1
     "@stoplight/types": ^12.3.0
     "@types/json-schema": ^7.0.7
-    ajv: ~8.6.0
+    ajv: ^8.8.2
     ajv-formats: ~2.1.0
     immer: ^9.0.6
     json-schema-traverse: ^1.0.0
@@ -2176,7 +2176,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@stoplight/spectral-runtime@^1.0.0, @stoplight/spectral-runtime@^1.1.0, @stoplight/spectral-runtime@workspace:packages/runtime":
+"@stoplight/spectral-runtime@^1.0.0, @stoplight/spectral-runtime@^1.1.0, @stoplight/spectral-runtime@^1.1.1, @stoplight/spectral-runtime@workspace:packages/runtime":
   version: 0.0.0-use.local
   resolution: "@stoplight/spectral-runtime@workspace:packages/runtime"
   dependencies:
@@ -2835,15 +2835,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ajv@npm:^8.0.0, ajv@npm:^8.0.1, ajv@npm:^8.6.0, ajv@npm:^8.6.3, ajv@npm:~8.6.0":
-  version: 8.6.3
-  resolution: "ajv@npm:8.6.3"
+"ajv@npm:^8.0.0, ajv@npm:^8.0.1, ajv@npm:^8.6.0, ajv@npm:^8.6.3, ajv@npm:^8.8.2":
+  version: 8.8.2
+  resolution: "ajv@npm:8.8.2"
   dependencies:
     fast-deep-equal: ^3.1.1
     json-schema-traverse: ^1.0.0
     require-from-string: ^2.0.2
     uri-js: ^4.2.2
-  checksum: 690ffb9408415fdab43686b3f92037ba0c8362f5d0709a123ba3fb546e6ad81414455f80a2b5cc432ce924afe9864671198f022bc331a19c072d4ede152ec3ca
+  checksum: 90849ef03c4f4f7051d15f655120137b89e3205537d683beebd39d95f40c0ca00ea8476cd999602d2f433863e7e4bf1b81d1869d1e07f4dcf56d71b6430a605c
   languageName: node
   linkType: hard