@redocly/openapi-core 1.0.0-beta.79 → 1.0.0-beta.80

package/__tests__/utils.ts

@@ -1,8 +1,9 @@
 import * as path from 'path';
 
 import { Document, Source, NormalizedProblem, parseYaml, stringifyYaml } from '../src';
-import { RuleConfig, LintConfig, Plugin } from '../src/config/config';
+import { RuleConfig, LintConfig, Plugin, DecoratorConfig } from '../src/config/config';
 import { Oas3RuleSet } from '../src/oas-types';
+import { defaultPlugin } from '../src/config/builtIn';
 
 export function parseYamlToDocument(body: string, absoluteRef: string = ''): Document {
   return {
@@ -62,3 +63,12 @@ export function makeConfigForRuleset(rules: Oas3RuleSet, plugin?: Partial<Plugin
     rules: rulesConf,
   });
 }
+
+export function makeConfig(rules: Record<string, RuleConfig>, decorators?:  Record<string, DecoratorConfig>) {
+  return new LintConfig({
+    plugins: [defaultPlugin],
+    extends: [],
+    rules,
+    decorators,
+  });
+}

package/lib/config/builtIn.js

@@ -4,7 +4,12 @@ exports.defaultPlugin = exports.builtInConfigs = void 0;
 const recommended_1 = require("./recommended");
 const all_1 = require("./all");
 const minimal_1 = require("./minimal");
-const builtinRules = require("../rules/builtin");
+const oas3_1 = require("../rules/oas3");
+const oas2_1 = require("../rules/oas2");
+const oas3_2 = require("../rules/oas3");
+const oas2_2 = require("../rules/oas2");
+const oas3_3 = require("../decorators/oas3");
+const oas2_3 = require("../decorators/oas2");
 exports.builtInConfigs = {
     recommended: recommended_1.default,
     minimal: minimal_1.default,
@@ -15,8 +20,17 @@ exports.builtInConfigs = {
 };
 exports.defaultPlugin = {
     id: '',
-    rules: builtinRules.rules,
-    preprocessors: builtinRules.preprocessors,
-    decorators: builtinRules.decorators,
+    rules: {
+        oas3: oas3_1.rules,
+        oas2: oas2_1.rules,
+    },
+    preprocessors: {
+        oas3: oas3_2.preprocessors,
+        oas2: oas2_2.preprocessors,
+    },
+    decorators: {
+        oas3: oas3_3.decorators,
+        oas2: oas2_3.decorators,
+    },
     configs: exports.builtInConfigs,
 };

package/lib/decorators/oas2/index.d.ts

@@ -0,0 +1,8 @@
+import { Oas2Decorator } from '../../visitors';
+export declare const decorators: {
+    'registry-dependencies': Oas2Decorator;
+    'operation-description-override': Oas2Decorator;
+    'tag-description-override': Oas2Decorator;
+    'info-description-override': Oas2Decorator;
+    'remove-x-internal': Oas2Decorator;
+};

package/lib/decorators/oas2/index.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.decorators = void 0;
+const registry_dependencies_1 = require("../common/registry-dependencies");
+const operation_description_override_1 = require("../common/operation-description-override");
+const tag_description_override_1 = require("../common/tag-description-override");
+const info_description_override_1 = require("../common/info-description-override");
+const remove_x_internal_1 = require("../common/remove-x-internal");
+exports.decorators = {
+    'registry-dependencies': registry_dependencies_1.RegistryDependencies,
+    'operation-description-override': operation_description_override_1.OperationDescriptionOverride,
+    'tag-description-override': tag_description_override_1.TagDescriptionOverride,
+    'info-description-override': info_description_override_1.InfoDescriptionOverride,
+    'remove-x-internal': remove_x_internal_1.RemoveXInternal
+};

package/lib/decorators/oas3/index.d.ts

@@ -0,0 +1,8 @@
+import { Oas3Decorator } from '../../visitors';
+export declare const decorators: {
+    'registry-dependencies': Oas3Decorator;
+    'operation-description-override': Oas3Decorator;
+    'tag-description-override': Oas3Decorator;
+    'info-description-override': Oas3Decorator;
+    'remove-x-internal': Oas3Decorator;
+};

package/lib/decorators/oas3/index.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.decorators = void 0;
+const registry_dependencies_1 = require("../common/registry-dependencies");
+const operation_description_override_1 = require("../common/operation-description-override");
+const tag_description_override_1 = require("../common/tag-description-override");
+const info_description_override_1 = require("../common/info-description-override");
+const remove_x_internal_1 = require("../common/remove-x-internal");
+exports.decorators = {
+    'registry-dependencies': registry_dependencies_1.RegistryDependencies,
+    'operation-description-override': operation_description_override_1.OperationDescriptionOverride,
+    'tag-description-override': tag_description_override_1.TagDescriptionOverride,
+    'info-description-override': info_description_override_1.InfoDescriptionOverride,
+    'remove-x-internal': remove_x_internal_1.RemoveXInternal
+};

package/lib/js-yaml/index.js

@@ -15,5 +15,5 @@ const DEFAULT_SCHEMA_WITHOUT_TIMESTAMP = js_yaml_1.JSON_SCHEMA.extend({
 });
 const parseYaml = (str, opts) => js_yaml_1.load(str, Object.assign({ schema: DEFAULT_SCHEMA_WITHOUT_TIMESTAMP }, opts));
 exports.parseYaml = parseYaml;
-const stringifyYaml = (obj, opts) => js_yaml_1.dump(obj, Object.assign({ schema: DEFAULT_SCHEMA_WITHOUT_TIMESTAMP }, opts));
+const stringifyYaml = (obj, opts) => js_yaml_1.dump(obj, opts);
 exports.stringifyYaml = stringifyYaml;

package/lib/rules/oas2/index.d.ts

@@ -1,4 +1,4 @@
-import { Oas2Decorator, Oas2Rule } from '../../visitors';
+import { Oas2Rule } from '../../visitors';
 export declare const rules: {
     spec: Oas2Rule;
     'no-invalid-schema-examples': any;
@@ -40,10 +40,3 @@ export declare const rules: {
     'path-segment-plural': Oas2Rule;
 };
 export declare const preprocessors: {};
-export declare const decorators: {
-    'registry-dependencies': Oas2Decorator;
-    'operation-description-override': Oas2Decorator;
-    'tag-description-override': Oas2Decorator;
-    'info-description-override': Oas2Decorator;
-    'remove-x-internal': Oas2Decorator;
-};

package/lib/rules/oas2/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.decorators = exports.preprocessors = exports.rules = void 0;
+exports.preprocessors = exports.rules = void 0;
 const spec_1 = require("../common/spec");
 const no_invalid_schema_examples_1 = require("../common/no-invalid-schema-examples");
 const no_invalid_parameter_examples_1 = require("../common/no-invalid-parameter-examples");
@@ -29,7 +29,6 @@ const operation_singular_tag_1 = require("../common/operation-singular-tag");
 const operation_security_defined_1 = require("../common/operation-security-defined");
 const no_unresolved_refs_1 = require("../no-unresolved-refs");
 const path_http_verbs_order_1 = require("../common/path-http-verbs-order");
-const registry_dependencies_1 = require("../common/registry-dependencies");
 const no_identical_paths_1 = require("../common/no-identical-paths");
 const operation_operationId_1 = require("../common/operation-operationId");
 const operation_summary_1 = require("../common/operation-summary");
@@ -39,10 +38,6 @@ const path_excludes_patterns_1 = require("../common/path-excludes-patterns");
 const request_mime_type_1 = require("./request-mime-type");
 const response_mime_type_1 = require("./response-mime-type");
 const path_segment_plural_1 = require("../common/path-segment-plural");
-const operation_description_override_1 = require("../common/operation-description-override");
-const tag_description_override_1 = require("../common/tag-description-override");
-const info_description_override_1 = require("../common/info-description-override");
-const remove_x_internal_1 = require("../common/remove-x-internal");
 exports.rules = {
     spec: spec_1.OasSpec,
     'no-invalid-schema-examples': no_invalid_schema_examples_1.NoInvalidSchemaExamples,
@@ -84,10 +79,3 @@ exports.rules = {
     'path-segment-plural': path_segment_plural_1.PathSegmentPlural,
 };
 exports.preprocessors = {};
-exports.decorators = {
-    'registry-dependencies': registry_dependencies_1.RegistryDependencies,
-    'operation-description-override': operation_description_override_1.OperationDescriptionOverride,
-    'tag-description-override': tag_description_override_1.TagDescriptionOverride,
-    'info-description-override': info_description_override_1.InfoDescriptionOverride,
-    'remove-x-internal': remove_x_internal_1.RemoveXInternal
-};

package/lib/rules/oas3/index.d.ts

@@ -1,11 +1,3 @@
 import { Oas3RuleSet } from '../../oas-types';
-import { Oas3Decorator } from '../../visitors';
 export declare const rules: Oas3RuleSet;
 export declare const preprocessors: {};
-export declare const decorators: {
-    'registry-dependencies': Oas3Decorator;
-    'operation-description-override': Oas3Decorator;
-    'tag-description-override': Oas3Decorator;
-    'info-description-override': Oas3Decorator;
-    'remove-x-internal': Oas3Decorator;
-};

package/lib/rules/oas3/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.decorators = exports.preprocessors = exports.rules = void 0;
+exports.preprocessors = exports.rules = void 0;
 const spec_1 = require("../common/spec");
 const operation_2xx_response_1 = require("../common/operation-2xx-response");
 const operation_4xx_response_1 = require("../common/operation-4xx-response");
@@ -33,7 +33,6 @@ const paths_kebab_case_1 = require("../common/paths-kebab-case");
 const path_http_verbs_order_1 = require("../common/path-http-verbs-order");
 const no_empty_servers_1 = require("./no-empty-servers");
 const no_invalid_media_type_examples_1 = require("./no-invalid-media-type-examples");
-const registry_dependencies_1 = require("../common/registry-dependencies");
 const no_identical_paths_1 = require("../common/no-identical-paths");
 const no_undefined_server_variable_1 = require("./no-undefined-server-variable");
 const operation_operationId_1 = require("../common/operation-operationId");
@@ -44,13 +43,9 @@ const no_http_verbs_in_paths_1 = require("../common/no-http-verbs-in-paths");
 const request_mime_type_1 = require("./request-mime-type");
 const response_mime_type_1 = require("./response-mime-type");
 const path_segment_plural_1 = require("../common/path-segment-plural");
-const operation_description_override_1 = require("../common/operation-description-override");
-const tag_description_override_1 = require("../common/tag-description-override");
-const info_description_override_1 = require("../common/info-description-override");
 const path_excludes_patterns_1 = require("../common/path-excludes-patterns");
 const no_invalid_schema_examples_1 = require("../common/no-invalid-schema-examples");
 const no_invalid_parameter_examples_1 = require("../common/no-invalid-parameter-examples");
-const remove_x_internal_1 = require("../common/remove-x-internal");
 exports.rules = {
     spec: spec_1.OasSpec,
     'info-description': info_description_1.InfoDescription,
@@ -100,10 +95,3 @@ exports.rules = {
     'no-invalid-parameter-examples': no_invalid_parameter_examples_1.NoInvalidParameterExamples,
 };
 exports.preprocessors = {};
-exports.decorators = {
-    'registry-dependencies': registry_dependencies_1.RegistryDependencies,
-    'operation-description-override': operation_description_override_1.OperationDescriptionOverride,
-    'tag-description-override': tag_description_override_1.TagDescriptionOverride,
-    'info-description-override': info_description_override_1.InfoDescriptionOverride,
-    'remove-x-internal': remove_x_internal_1.RemoveXInternal
-};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redocly/openapi-core",
-  "version": "1.0.0-beta.79",
+  "version": "1.0.0-beta.80",
   "description": "",
   "main": "lib/index.js",
   "engines": {

package/src/__tests__/js-yaml.test.ts

@@ -1,3 +1,4 @@
+import { outdent } from 'outdent';
 import { parseYaml, stringifyYaml } from '../js-yaml';
 
 const yaml = `
@@ -7,7 +8,8 @@ const yaml = `
   number: 1000
   decimal: 12.34
   boolean: true
-  date: 2020-01-01
+  dateWithoutQuotes: 2020-01-01
+  dateWithQuotes: '2020-01-01'
   array:
     - 1
     - 2
@@ -16,6 +18,16 @@ const yaml = `
     key2: 2
 `;
 
+const yamlToDump = outdent`
+  date: '2022-01-21T11:29:56.694Z'
+  dateWithoutQuotes: 2020-01-01
+  dateWithQuotes: '2020-01-01'
+  dateImplicit: !!str 2020-01-01
+  string: test
+  stringWithQuotes: 'test'
+  stringWithDoubleQuotes: "test"
+`;
+
 const jsObject = {
   emptyValue: null,
   'spaces in keys': 'spaces in keys',
@@ -23,7 +35,8 @@ const jsObject = {
   number: 1000,
   decimal: 12.34,
   boolean: true,
-  date: '2020-01-01',
+  dateWithoutQuotes: '2020-01-01',
+  dateWithQuotes: '2020-01-01',
   array: [1, 2],
   object: { key1: 1, key2: 2 },
 };
@@ -33,14 +46,25 @@ describe('js-yaml', () => {
     expect(parseYaml(yaml)).toEqual(jsObject);
   });
 
+  test('should correctly dump date and string', () => {
+    expect(stringifyYaml(parseYaml(yamlToDump))).toMatchInlineSnapshot(
+    `
+    "date: '2022-01-21T11:29:56.694Z'
+    dateWithoutQuotes: '2020-01-01'
+    dateWithQuotes: '2020-01-01'
+    dateImplicit: '2020-01-01'
+    string: test
+    stringWithQuotes: test
+    stringWithDoubleQuotes: test
+    "
+    `);
+  });
+
   test('parse and stringify', () => {
     expect(parseYaml(stringifyYaml(jsObject))).toEqual(jsObject);
   });
 
   test('should throw an error for unsupported types', () => {
-    expect(() => stringifyYaml({ date: new Date() }))
-      .toThrow('unacceptable kind of an object to dump [object Date]');
-
     expect(() => stringifyYaml({ foo: () => {} }))
       .toThrow('unacceptable kind of an object to dump [object Function]');
   });

package/src/__tests__/lint.test.ts

@@ -3,9 +3,7 @@ import { outdent } from 'outdent';
 import { lintFromString, lintConfig, lintDocument } from '../lint';
 import { BaseResolver } from '../resolve';
 import { loadConfig } from '../config/load';
-import { parseYamlToDocument, replaceSourceWithRef } from '../../__tests__/utils';
-// todo create general utils for tests and move this config.
-import { makeConfig } from '../rules/__tests__/config';
+import { parseYamlToDocument, replaceSourceWithRef, makeConfig } from '../../__tests__/utils';
 
 describe('lint', () => {
   it('lintFromString should work', async () => {

package/src/config/builtIn.ts

@@ -1,9 +1,13 @@
 import recommended from './recommended';
 import all from './all';
 import minimal from './minimal';
-import { LintRawConfig, Plugin } from './config';
-
-import * as builtinRules from '../rules/builtin';
+import { CustomRulesConfig, LintRawConfig, Plugin } from './config';
+import { rules as oas3Rules } from '../rules/oas3';
+import { rules as oas2Rules } from '../rules/oas2';
+import { preprocessors as oas3Preprocessors } from '../rules/oas3';
+import { preprocessors as oas2Preprocessors } from '../rules/oas2';
+import { decorators as oas3Decorators } from '../decorators/oas3';
+import { decorators as oas2Decorators } from '../decorators/oas2';
 
 export const builtInConfigs: Record<string, LintRawConfig> = {
   recommended,
@@ -16,8 +20,17 @@ export const builtInConfigs: Record<string, LintRawConfig> = {
 
 export const defaultPlugin: Plugin = {
   id: '', // default plugin doesn't have id
-  rules: builtinRules.rules,
-  preprocessors: builtinRules.preprocessors,
-  decorators: builtinRules.decorators,
+  rules: {
+    oas3: oas3Rules,
+    oas2: oas2Rules,
+  } as CustomRulesConfig,
+  preprocessors: {
+    oas3: oas3Preprocessors,
+    oas2: oas2Preprocessors,
+  },
+  decorators: {
+    oas3: oas3Decorators,
+    oas2: oas2Decorators,
+  },
   configs: builtInConfigs,
-}
+}

package/src/{rules/__tests__/hide-internals.test.ts → decorators/__tests__/remove-x-internal.test.ts}

@@ -1,8 +1,7 @@
 import { outdent } from 'outdent';
 import { bundleDocument } from '../../bundle';
 import { BaseResolver } from '../../resolve';
-import { parseYamlToDocument, yamlSerializer } from '../../../__tests__/utils';
-import { makeConfig } from './config';
+import { parseYamlToDocument, yamlSerializer, makeConfig } from '../../../__tests__/utils';
 
 describe('oas3 remove-x-internal', () => {
   expect.addSnapshotSerializer(yamlSerializer);

package/src/decorators/oas2/index.ts

@@ -0,0 +1,14 @@
+import { Oas2Decorator } from '../../visitors';
+import { RegistryDependencies } from '../common/registry-dependencies';
+import { OperationDescriptionOverride } from '../common/operation-description-override';
+import { TagDescriptionOverride } from '../common/tag-description-override';
+import { InfoDescriptionOverride } from '../common/info-description-override';
+import { RemoveXInternal } from '../common/remove-x-internal';
+
+export const decorators = {
+  'registry-dependencies': RegistryDependencies as Oas2Decorator,
+  'operation-description-override': OperationDescriptionOverride as Oas2Decorator,
+  'tag-description-override': TagDescriptionOverride as Oas2Decorator,
+  'info-description-override': InfoDescriptionOverride as Oas2Decorator,
+  'remove-x-internal': RemoveXInternal as Oas2Decorator
+};

package/src/decorators/oas3/index.ts

@@ -0,0 +1,14 @@
+import { Oas3Decorator } from '../../visitors';
+import { RegistryDependencies } from '../common/registry-dependencies';
+import { OperationDescriptionOverride } from '../common/operation-description-override';
+import { TagDescriptionOverride } from '../common/tag-description-override';
+import { InfoDescriptionOverride } from '../common/info-description-override';
+import { RemoveXInternal } from '../common/remove-x-internal';
+
+export const decorators = {
+  'registry-dependencies': RegistryDependencies as Oas3Decorator,
+  'operation-description-override': OperationDescriptionOverride as Oas3Decorator,
+  'tag-description-override': TagDescriptionOverride as Oas3Decorator,
+  'info-description-override': InfoDescriptionOverride as Oas3Decorator,
+  'remove-x-internal': RemoveXInternal as Oas3Decorator
+};

package/src/js-yaml/index.ts

@@ -15,5 +15,4 @@ const DEFAULT_SCHEMA_WITHOUT_TIMESTAMP = JSON_SCHEMA.extend({
 export const parseYaml = (str: string, opts?: LoadOptions): unknown =>
   load(str, {schema: DEFAULT_SCHEMA_WITHOUT_TIMESTAMP, ...opts});
 
-export const stringifyYaml = (obj: any, opts?: DumpOptions): string =>
-  dump(obj, {schema: DEFAULT_SCHEMA_WITHOUT_TIMESTAMP, ...opts});
+export const stringifyYaml = (obj: any, opts?: DumpOptions): string => dump(obj, opts);

package/src/rules/__tests__/no-unresolved-refs.test.ts

@@ -1,11 +1,8 @@
 import path = require('path');
 import { outdent } from 'outdent';
-
 import { lintDocument } from '../../lint';
 import { BaseResolver } from '../../resolve';
-
-import { parseYamlToDocument, replaceSourceWithRef } from '../../../__tests__/utils';
-import { makeConfig } from './config';
+import { parseYamlToDocument, replaceSourceWithRef, makeConfig } from '../../../__tests__/utils';
 
 describe('oas3 boolean-parameter-prefixes', () => {
   it('should report on unresolved $ref', async () => {

package/src/rules/common/__tests__/info-description.test.ts

@@ -1,10 +1,8 @@
 import { outdent } from 'outdent';
 import { lintDocument } from '../../../lint';
-import { parseYamlToDocument, replaceSourceWithRef } from '../../../../__tests__/utils';
+import { parseYamlToDocument, replaceSourceWithRef, makeConfig } from '../../../../__tests__/utils';
 import { BaseResolver } from '../../../resolve';
 
-import { makeConfig } from '../../__tests__/config';
-
 describe('Oas3 info-description', () => {
   it('should report on info with no description', async () => {
     const document = parseYamlToDocument(

package/src/rules/common/__tests__/info-license.test.ts

@@ -1,7 +1,6 @@
 import { outdent } from 'outdent';
 import { lintDocument } from '../../../lint';
-import { parseYamlToDocument, replaceSourceWithRef } from '../../../../__tests__/utils';
-import { makeConfig } from '../../__tests__/config';
+import { parseYamlToDocument, replaceSourceWithRef, makeConfig } from '../../../../__tests__/utils';
 import { BaseResolver } from '../../../resolve';
 
 describe('Oas3 info-license', () => {

package/src/rules/common/__tests__/license-url.test.ts

@@ -1,7 +1,6 @@
 import { outdent } from 'outdent';
 import { lintDocument } from '../../../lint';
-import { parseYamlToDocument, replaceSourceWithRef } from '../../../../__tests__/utils';
-import { makeConfig } from '../../__tests__/config';
+import { parseYamlToDocument, replaceSourceWithRef, makeConfig } from '../../../../__tests__/utils';
 import { BaseResolver } from '../../../resolve';
 
 describe('Oas3 license-url', () => {

package/src/rules/common/__tests__/no-ambiguous-paths.test.ts

@@ -1,7 +1,6 @@
 import { outdent } from 'outdent';
 import { lintDocument } from '../../../lint';
-import { parseYamlToDocument, replaceSourceWithRef } from '../../../../__tests__/utils';
-import { makeConfig } from '../../__tests__/config';
+import { parseYamlToDocument, replaceSourceWithRef, makeConfig } from '../../../../__tests__/utils';
 import { BaseResolver } from '../../../resolve';
 
 describe('no-ambiguous-paths', () => {

package/src/rules/common/__tests__/no-enum-type-mismatch.test.ts

@@ -1,7 +1,6 @@
 import { outdent } from 'outdent';
 import { lintDocument } from '../../../lint';
-import { parseYamlToDocument, replaceSourceWithRef } from '../../../../__tests__/utils';
-import { makeConfig } from '../../__tests__/config';
+import { parseYamlToDocument, replaceSourceWithRef, makeConfig } from '../../../../__tests__/utils';
 import { BaseResolver } from '../../../resolve';
 
 describe('Oas3 typed enum', () => {

package/src/rules/common/__tests__/no-identical-paths.test.ts

@@ -1,7 +1,6 @@
 import { outdent } from 'outdent';
 import { lintDocument } from '../../../lint';
-import { parseYamlToDocument, replaceSourceWithRef } from '../../../../__tests__/utils';
-import { makeConfig } from '../../__tests__/config';
+import { parseYamlToDocument, replaceSourceWithRef, makeConfig } from '../../../../__tests__/utils';
 import { BaseResolver } from '../../../resolve';
 
 describe('no-identical-paths', () => {

package/src/rules/common/__tests__/no-path-trailing-slash.test.ts

@@ -1,7 +1,6 @@
 import { outdent } from 'outdent';
 import { lintDocument } from '../../../lint';
-import { parseYamlToDocument, replaceSourceWithRef } from '../../../../__tests__/utils';
-import { makeConfig } from '../../__tests__/config';
+import { parseYamlToDocument, replaceSourceWithRef, makeConfig } from '../../../../__tests__/utils';
 import { BaseResolver } from '../../../resolve';
 
 describe('no-path-trailing-slash', () => {

package/src/rules/common/__tests__/operation-2xx-response.test.ts

@@ -1,7 +1,6 @@
 import { outdent } from 'outdent';
 import { lintDocument } from '../../../lint';
-import { parseYamlToDocument, replaceSourceWithRef } from '../../../../__tests__/utils';
-import { makeConfig } from '../../__tests__/config';
+import { parseYamlToDocument, replaceSourceWithRef, makeConfig } from '../../../../__tests__/utils';
 import { BaseResolver } from '../../../resolve';
 
 describe('Oas3 operation-2xx-response', () => {

package/src/rules/common/__tests__/operation-4xx-response.test.ts

@@ -1,7 +1,6 @@
 import { outdent } from 'outdent';
 import { lintDocument } from '../../../lint';
-import { parseYamlToDocument, replaceSourceWithRef } from '../../../../__tests__/utils';
-import { makeConfig } from '../../__tests__/config';
+import { parseYamlToDocument, replaceSourceWithRef, makeConfig } from '../../../../__tests__/utils';
 import { BaseResolver } from '../../../resolve';
 
 describe('Oas3 operation-4xx-response', () => {

package/src/rules/common/__tests__/operation-operationId-unique.test.ts

@@ -1,7 +1,6 @@
 import { outdent } from 'outdent';
 import { lintDocument } from '../../../lint';
-import { parseYamlToDocument, replaceSourceWithRef } from '../../../../__tests__/utils';
-import { makeConfig } from '../../__tests__/config';
+import { parseYamlToDocument, replaceSourceWithRef, makeConfig } from '../../../../__tests__/utils';
 import { BaseResolver } from '../../../resolve';
 
 describe('Oas3 operation-operationId-unique', () => {

package/src/rules/common/__tests__/operation-operationId-url-safe.test.ts

@@ -1,7 +1,6 @@
 import { outdent } from 'outdent';
 import { lintDocument } from '../../../lint';
-import { parseYamlToDocument, replaceSourceWithRef } from '../../../../__tests__/utils';
-import { makeConfig } from '../../__tests__/config';
+import { parseYamlToDocument, replaceSourceWithRef, makeConfig } from '../../../../__tests__/utils';
 import { BaseResolver } from '../../../resolve';
 
 describe('Oas3 operation-operationId-url-safe', () => {

package/src/rules/common/__tests__/operation-parameters-unique.test.ts

@@ -1,7 +1,6 @@
 import { outdent } from 'outdent';
 import { lintDocument } from '../../../lint';
-import { parseYamlToDocument, replaceSourceWithRef } from '../../../../__tests__/utils';
-import { makeConfig } from '../../__tests__/config';
+import { parseYamlToDocument, replaceSourceWithRef, makeConfig } from '../../../../__tests__/utils';
 import { BaseResolver } from '../../../resolve';
 
 describe('Oas3 operation-parameters-unique', () => {

package/src/rules/common/__tests__/operation-security-defined.test.ts

@@ -1,7 +1,6 @@
 import { outdent } from 'outdent';
 import { lintDocument } from '../../../lint';
-import { parseYamlToDocument, replaceSourceWithRef } from '../../../../__tests__/utils';
-import { makeConfig } from '../../__tests__/config';
+import { parseYamlToDocument, replaceSourceWithRef, makeConfig } from '../../../../__tests__/utils';
 import { BaseResolver } from '../../../resolve';
 
 describe('Oas3 operation-security-defined', () => {

package/src/rules/common/__tests__/operation-singular-tag.test.ts

@@ -1,7 +1,6 @@
 import { outdent } from 'outdent';
 import { lintDocument } from '../../../lint';
-import { parseYamlToDocument, replaceSourceWithRef } from '../../../../__tests__/utils';
-import { makeConfig } from '../../__tests__/config';
+import { parseYamlToDocument, replaceSourceWithRef, makeConfig } from '../../../../__tests__/utils';
 import { BaseResolver } from '../../../resolve';
 
 describe('Oas3 operation-singular-tag', () => {

package/src/rules/common/__tests__/path-http-verbs-order.test.ts

@@ -1,7 +1,6 @@
 import { outdent } from 'outdent';
 import { lintDocument } from '../../../lint';
-import { parseYamlToDocument, replaceSourceWithRef } from '../../../../__tests__/utils';
-import { makeConfig } from '../../__tests__/config';
+import { parseYamlToDocument, replaceSourceWithRef, makeConfig } from '../../../../__tests__/utils';
 import { BaseResolver } from '../../../resolve';
 
 describe('Common path-http-verbs-order', () => {