@redocly/openapi-core 1.0.0-beta.108 → 1.0.0-beta.109

package/src/__tests__/resolve.test.ts

@@ -24,7 +24,7 @@ describe('collect refs', () => {
     const resolvedRefs = await resolveDocument({
       rootDocument,
       externalRefResolver: new BaseResolver(),
-      rootType: normalizeTypes(Oas3Types).DefinitionRoot,
+      rootType: normalizeTypes(Oas3Types).Root,
     });
 
     expect(resolvedRefs).toBeDefined();
@@ -63,7 +63,7 @@ describe('collect refs', () => {
       await resolveDocument({
         rootDocument,
         externalRefResolver: new BaseResolver(),
-        rootType: normalizeTypes(Oas3Types).DefinitionRoot,
+        rootType: normalizeTypes(Oas3Types).Root,
       });
     } catch (e) {
       expect(e.message).toEqual('Self-referencing circular pointer');
@@ -95,7 +95,7 @@ describe('collect refs', () => {
     const resolvedRefs = await resolveDocument({
       rootDocument,
       externalRefResolver: new BaseResolver(),
-      rootType: normalizeTypes(Oas3Types).DefinitionRoot,
+      rootType: normalizeTypes(Oas3Types).Root,
     });
 
     expect(resolvedRefs).toBeDefined();
@@ -132,7 +132,7 @@ describe('collect refs', () => {
       await resolveDocument({
         rootDocument,
         externalRefResolver: new BaseResolver(),
-        rootType: normalizeTypes(Oas3Types).DefinitionRoot,
+        rootType: normalizeTypes(Oas3Types).Root,
       });
     } catch (e) {
       expect(e.message).toEqual('Self-referencing circular pointer');
@@ -153,7 +153,7 @@ describe('collect refs', () => {
     const resolvedRefs = await resolveDocument({
       rootDocument,
       externalRefResolver: new BaseResolver(),
-      rootType: normalizeTypes(Oas3Types).DefinitionRoot,
+      rootType: normalizeTypes(Oas3Types).Root,
     });
 
     expect(resolvedRefs).toBeDefined();
@@ -187,7 +187,7 @@ describe('collect refs', () => {
     const resolvedRefs = await resolveDocument({
       rootDocument: rootDocument as Document,
       externalRefResolver: externalRefResolver,
-      rootType: normalizeTypes(Oas3Types).DefinitionRoot,
+      rootType: normalizeTypes(Oas3Types).Root,
     });
 
     expect(resolvedRefs).toBeDefined();
@@ -263,7 +263,7 @@ describe('collect refs', () => {
     const resolvedRefs = await resolveDocument({
       rootDocument: rootDocument as Document,
       externalRefResolver: externalRefResolver,
-      rootType: normalizeTypes(Oas3Types).DefinitionRoot,
+      rootType: normalizeTypes(Oas3Types).Root,
     });
 
     expect(resolvedRefs).toBeDefined();
@@ -358,7 +358,7 @@ describe('collect refs', () => {
     const resolvedRefs = await resolveDocument({
       rootDocument: rootDocument as Document,
       externalRefResolver: externalRefResolver,
-      rootType: normalizeTypes(Oas3Types).DefinitionRoot,
+      rootType: normalizeTypes(Oas3Types).Root,
     });
 
     expect(resolvedRefs).toBeDefined();
@@ -392,7 +392,7 @@ describe('collect refs', () => {
     const resolvedRefs = await resolveDocument({
       rootDocument,
       externalRefResolver: new BaseResolver(),
-      rootType: normalizeTypes(Oas3Types).DefinitionRoot,
+      rootType: normalizeTypes(Oas3Types).Root,
     });
 
     expect(resolvedRefs).toBeDefined();

package/src/__tests__/walk.test.ts

@@ -16,7 +16,7 @@ import { Oas3RuleSet } from '../oas-types';
 describe('walk order', () => {
   it('should run visitors', async () => {
     const visitors = {
-      DefinitionRoot: {
+      Root: {
         enter: jest.fn(),
         leave: jest.fn(),
       },
@@ -63,6 +63,74 @@ describe('walk order', () => {
     }
   });
 
+  it('should run legacy visitors', async () => {
+    const visitors = {
+      DefinitionRoot: {
+        enter: jest.fn(),
+        leave: jest.fn(),
+      },
+      PathMap: {
+        enter: jest.fn(),
+        leave: jest.fn(),
+      },
+      ServerVariableMap: {
+        enter: jest.fn(),
+        leave: jest.fn(),
+      },
+      MediaTypeMap: {
+        enter: jest.fn(),
+        leave: jest.fn(),
+      },
+      ExampleMap: {
+        enter: jest.fn(),
+        leave: jest.fn(),
+      },
+      HeaderMap: {
+        enter: jest.fn(),
+        leave: jest.fn(),
+      },
+    };
+
+    const testRuleSet: Oas3RuleSet = {
+      test: jest.fn(() => {
+        return visitors;
+      }),
+    };
+
+    const document = parseYamlToDocument(
+      outdent`
+        openapi: 3.0.0
+        servers: 
+        - url: http://{test}.url
+          variables:
+            test: test
+        paths: 
+          /test-path: 
+            get:
+              responses:
+                200:
+                  headers: {}
+                  content:
+                    application/json:
+                      schema: {}
+                      examples: {}
+      `,
+      ''
+    );
+
+    await lintDocument({
+      externalRefResolver: new BaseResolver(),
+      document,
+      config: makeConfigForRuleset(testRuleSet),
+    });
+
+    expect(testRuleSet.test).toBeCalledTimes(1);
+    for (const fns of Object.values(visitors)) {
+      expect(fns.enter).toBeCalled();
+      expect(fns.leave).toBeCalled();
+    }
+  });
+
   it('should run nested visitors correctly', async () => {
     const calls: string[] = [];
 
@@ -1046,8 +1114,8 @@ describe('walk order', () => {
 
     expect(calls).toMatchInlineSnapshot(`
       Array [
-        "enter DefinitionRoot",
-        "enter PathMap",
+        "enter Root",
+        "enter PathsMap",
         "enter PathItem",
         "enter ParameterList",
         "enter Parameter",
@@ -1066,7 +1134,7 @@ describe('walk order', () => {
         "leave ParameterList",
         "leave Operation",
         "leave PathItem",
-        "leave PathMap",
+        "leave PathsMap",
         "enter Components",
         "enter NamedParameters",
         "leave NamedParameters",
@@ -1075,7 +1143,7 @@ describe('walk order', () => {
         "leave Schema",
         "leave NamedSchemas",
         "leave Components",
-        "leave DefinitionRoot",
+        "leave Root",
       ]
     `);
   });
@@ -1378,10 +1446,10 @@ describe('type extensions', () => {
                   parameters: listOf('Parameter'),
                 },
               },
-              DefinitionRoot: {
-                ...types.DefinitionRoot,
+              Root: {
+                ...types.Root,
                 properties: {
-                  ...types.DefinitionRoot.properties,
+                  ...types.Root.properties,
                   'x-webhooks': 'XWebHooks',
                 },
               },
@@ -1393,7 +1461,7 @@ describe('type extensions', () => {
 
     expect(calls).toMatchInlineSnapshot(`
       Array [
-        "enter DefinitionRoot",
+        "enter Root",
         "enter XWebHooks",
         "enter hook test",
         "enter ParameterList",
@@ -1402,7 +1470,7 @@ describe('type extensions', () => {
         "leave ParameterList",
         "leave hook test",
         "leave XWebHooks",
-        "leave DefinitionRoot",
+        "leave Root",
       ]
     `);
   });

package/src/benchmark/benches/resolve-with-no-external.bench.ts

@@ -18,6 +18,6 @@ export function measureAsync() {
   return resolveDocument({
     rootDocument: rebillyDocument,
     externalRefResolver,
-    rootType: normalizeTypes(Oas3Types).DefinitionRoot,
+    rootType: normalizeTypes(Oas3Types).Root,
   });
 }

package/src/bundle.ts

@@ -122,7 +122,7 @@ export async function bundleDocument(opts: {
 
   const resolvedRefMap = await resolveDocument({
     rootDocument: document,
-    rootType: types.DefinitionRoot,
+    rootType: types.Root,
     externalRefResolver,
   });
 
@@ -148,7 +148,7 @@ export async function bundleDocument(opts: {
 
   walkDocument({
     document,
-    rootType: types.DefinitionRoot as NormalizedNodeType,
+    rootType: types.Root as NormalizedNodeType,
     normalizedVisitors: bundleVisitor,
     resolvedRefMap,
     ctx,
@@ -158,7 +158,7 @@ export async function bundleDocument(opts: {
     bundle: document,
     problems: ctx.problems.map((problem) => config.addProblemToIgnore(problem)),
     fileDependencies: externalRefResolver.getFiles(),
-    rootType: types.DefinitionRoot,
+    rootType: types.Root,
     refTypes: ctx.refTypes,
     visitorsData: ctx.visitorsData,
   };
@@ -254,7 +254,7 @@ function makeBundleVisitor(
         }
       },
     },
-    DefinitionRoot: {
+    Root: {
       enter(root: any) {
         if (version === OasMajorVersion.Version3) {
           components = root.components = root.components || {};

package/src/config/__tests__/__snapshots__/config-resolvers.test.ts.snap

@@ -18,6 +18,7 @@ Object {
     "no-server-variables-empty-enum": "error",
     "no-undefined-server-variable": "error",
     "no-unused-components": "warn",
+    "spec-components-invalid-map-name": "error",
   },
   "oas3_1Decorators": Object {},
   "oas3_1Preprocessors": Object {},
@@ -30,6 +31,7 @@ Object {
     "no-server-variables-empty-enum": "error",
     "no-undefined-server-variable": "error",
     "no-unused-components": "warn",
+    "spec-components-invalid-map-name": "error",
   },
   "preprocessors": Object {},
   "recommendedFallback": false,
@@ -54,7 +56,6 @@ Object {
     "operation-operationId-unique": "error",
     "operation-operationId-url-safe": "error",
     "operation-parameters-unique": "error",
-    "operation-security-defined": "error",
     "operation-singular-tag": "off",
     "operation-summary": "error",
     "operation-tag-defined": "off",
@@ -64,6 +65,7 @@ Object {
     "path-not-include-query": "error",
     "path-parameters-defined": "error",
     "paths-kebab-case": "off",
+    "security-defined": "error",
     "spec": "error",
     "tag-description": "warn",
     "tags-alphabetical": "off",
@@ -89,6 +91,7 @@ Object {
     "no-server-variables-empty-enum": "error",
     "no-undefined-server-variable": "error",
     "no-unused-components": "warn",
+    "spec-components-invalid-map-name": "error",
   },
   "oas3_1Decorators": Object {},
   "oas3_1Preprocessors": Object {},
@@ -101,6 +104,7 @@ Object {
     "no-server-variables-empty-enum": "error",
     "no-undefined-server-variable": "error",
     "no-unused-components": "warn",
+    "spec-components-invalid-map-name": "error",
   },
   "preprocessors": Object {},
   "recommendedFallback": undefined,
@@ -142,7 +146,6 @@ Object {
     "operation-operationId-unique": "error",
     "operation-operationId-url-safe": "error",
     "operation-parameters-unique": "error",
-    "operation-security-defined": "error",
     "operation-singular-tag": "off",
     "operation-summary": "error",
     "operation-tag-defined": "off",
@@ -151,6 +154,7 @@ Object {
     "path-not-include-query": "error",
     "path-parameters-defined": "error",
     "paths-kebab-case": "off",
+    "security-defined": "error",
     "spec": "error",
     "tag-description": "warn",
     "tags-alphabetical": "off",

package/src/config/__tests__/fixtures/plugin-config.yaml

@@ -1,3 +1,2 @@
-lint:
-  plugins:
-    - './plugin.js'
+plugins:
+  - './plugin.js'

package/src/config/__tests__/fixtures/resolve-config/api/nested-config.yaml

@@ -1,12 +1,11 @@
-lint:
-  plugins:
-    - plugin.js
-  rules:
-    operation-2xx-response: error
-    assert/path-item-get-defined:
-      subject: PathItem
-      property: get
-      message: Every path item must have a GET operation.
-      defined: true
-  extends:
-    - test-plugin-nested/all
+plugins:
+  - plugin.js
+rules:
+  operation-2xx-response: error
+  assert/path-item-get-defined:
+    subject: PathItem
+    property: get
+    message: Every path item must have a GET operation.
+    defined: true
+extends:
+  - test-plugin-nested/all

package/src/config/__tests__/fixtures/resolve-config/local-config-with-circular.yaml

@@ -1,8 +1,7 @@
-lint:
-  extends:
-    - local-config-with-circular.yaml
-  rules:
-    no-invalid-media-type-examples: error
-    operation-description: error
-    path-http-verbs-order: error
-    operation-2xx-response: off
+extends:
+  - local-config-with-circular.yaml
+rules:
+  no-invalid-media-type-examples: error
+  operation-description: error
+  path-http-verbs-order: error
+  operation-2xx-response: off

package/src/config/__tests__/fixtures/resolve-config/local-config-with-file.yaml

@@ -1,19 +1,18 @@
-lint:
-  rules:
-    no-invalid-media-type-examples: warn
-    operation-4xx-response: off
-    assert/tag-description:
-      subject: Tag
-      property: description
-      message: Tag description must be at least 13 characters and end with a full stop.
-      severity: error
-      minLength: 13
-      pattern: /\.$/
-  plugins:
-    - plugin.js
-    - api/plugin.js
-  extends:
-    - recommended
-    - api/nested-config.yaml
-    - test-plugin-nested/all
-    - test-plugin/all
+rules:
+  no-invalid-media-type-examples: warn
+  operation-4xx-response: off
+  assert/tag-description:
+    subject: Tag
+    property: description
+    message: Tag description must be at least 13 characters and end with a full stop.
+    severity: error
+    minLength: 13
+    pattern: /\.$/
+plugins:
+  - plugin.js
+  - api/plugin.js
+extends:
+  - recommended
+  - api/nested-config.yaml
+  - test-plugin-nested/all
+  - test-plugin/all

package/src/config/__tests__/fixtures/resolve-config/local-config.yaml

@@ -1,10 +1,9 @@
-lint:
-  plugins:
-    - plugin.js
-  extends:
-    - test-plugin/all
-  rules:
-    no-invalid-media-type-examples: error
-    operation-description: error
-    path-http-verbs-order: error
-    operation-2xx-response: off
+plugins:
+  - plugin.js
+extends:
+  - test-plugin/all
+rules:
+  no-invalid-media-type-examples: error
+  operation-description: error
+  path-http-verbs-order: error
+  operation-2xx-response: off

package/src/config/__tests__/fixtures/resolve-remote-configs/nested-remote-config.yaml

@@ -1,4 +1,3 @@
-lint:
-  rules:
-    operation-2xx-response: off
-    operation-4xx-response: error
+rules:
+  operation-2xx-response: off
+  operation-4xx-response: error

package/src/config/__tests__/fixtures/resolve-remote-configs/remote-config.yaml

@@ -1,5 +1,4 @@
-lint:
-  extends:
-    - nested-remote-config.yaml
-  rules:
-    operation-2xx-response: error
+extends:
+  - nested-remote-config.yaml
+rules:
+  operation-2xx-response: error

package/src/config/__tests__/load.test.ts

@@ -1,6 +1,6 @@
 import { loadConfig, findConfig, getConfig, createConfig } from '../load';
 import { RedoclyClient } from '../../redocly';
-import { RuleConfig, RawConfig } from './../types';
+import { RuleConfig, FlatRawConfig } from './../types';
 import { Config } from '../config';
 
 const fs = require('fs');
@@ -93,11 +93,10 @@ describe('getConfig', () => {
 describe('createConfig', () => {
   it('should create config from string', async () => {
     const config = await createConfig(`
-      styleguide:
-        extends:
-          - recommended
-        rules:
-          info-license: off
+      extends:
+      - recommended
+      rules:
+        info-license: off
     `);
 
     verifyExtendedConfig(config, {
@@ -107,21 +106,19 @@ describe('createConfig', () => {
   });
 
   it('should create config from object', async () => {
-    const rawConfig: RawConfig = {
-      styleguide: {
-        extends: ['minimal'],
-        rules: {
-          'info-license': 'off',
-          'tag-description': 'off',
-          'operation-2xx-response': 'off',
-        },
+    const rawConfig: FlatRawConfig = {
+      extends: ['minimal'],
+      rules: {
+        'info-license': 'off',
+        'tag-description': 'off',
+        'operation-2xx-response': 'off',
       },
     };
     const config = await createConfig(rawConfig);
 
     verifyExtendedConfig(config, {
       extendsRuleSet: 'minimal',
-      overridesRules: rawConfig.styleguide!.rules as Record<string, RuleConfig>,
+      overridesRules: rawConfig.rules as Record<string, RuleConfig>,
     });
   });
 });

package/src/config/__tests__/utils.test.ts

@@ -1,4 +1,4 @@
-import { DeprecatedInRawConfig, RawConfig } from '../types';
+import { DeprecatedInRawConfig, RawConfig, FlatRawConfig } from '../types';
 import * as utils from '../utils';
 
 const makeTestRawConfig = (
@@ -22,8 +22,54 @@ const makeTestRawConfig = (
   },
 });
 
+const rawTestConfig: RawConfig = {
+  apis: {
+    'test@v1': {
+      root: 'root.yaml',
+      styleguide: {
+        extends: ['recommended'],
+        rules: { 'operation-2xx-response': 'error' },
+      },
+    },
+  },
+  styleguide: {
+    plugins: ['test-plugin'],
+    extends: ['minimal'],
+    rules: { 'operation-4xx-response': 'warn' },
+    doNotResolveExamples: true,
+  },
+  resolve: {
+    http: { headers: [{ matches: '*', name: 'all', envVariable: 'all' }] },
+  },
+  'features.openapi': {
+    disableSidebar: true,
+  },
+};
+
+const flatTestConfig: FlatRawConfig = {
+  apis: {
+    'test@v1': {
+      root: 'root.yaml',
+      extends: ['recommended'],
+      rules: { 'operation-2xx-response': 'error' },
+    },
+  },
+  plugins: ['test-plugin'],
+  extends: ['minimal'],
+  rules: {
+    'operation-4xx-response': 'warn',
+  },
+  resolve: {
+    http: { headers: [{ matches: '*', name: 'all', envVariable: 'all' }] },
+    doNotResolveExamples: true,
+  },
+  'features.openapi': {
+    disableSidebar: true,
+  },
+};
+
 describe('transformConfig', () => {
-  it('should work for new syntax', () => {
+  it('should work for the `styleguide` syntax', () => {
     const transformedRawConfig: RawConfig = utils.transformConfig(
       makeTestRawConfig('styleguide', 'styleguide')
     );
@@ -73,11 +119,25 @@ describe('transformConfig', () => {
       }
     `);
   });
-  it('should throw an error if both new and old syntax used together', () => {
+  it('should throw an error if both `styleguide` and `lint` syntaxes used together', () => {
     const testRawConfig = makeTestRawConfig('styleguide', 'lint');
     testRawConfig.apiDefinitions = { legacyApiDefinition: 'file.yaml' };
     expect(() => utils.transformConfig(testRawConfig)).toThrowError(
-      `Do not use 'apiDefinitions' field. Use 'apis' instead.`
+      `Do not use 'apiDefinitions' field. Use 'apis' instead. `
+    );
+  });
+  it('should transform flatten config into styleguide', () => {
+    expect(utils.transformConfig(flatTestConfig)).toEqual({
+      ...rawTestConfig,
+      resolve: { ...rawTestConfig.resolve, doNotResolveExamples: true },
+    });
+  });
+  it('should transform styleguide config into styleguide identically', () => {
+    expect(utils.transformConfig(rawTestConfig)).toEqual(rawTestConfig);
+  });
+  it('should fail when there is a mixed config', () => {
+    expect(() => utils.transformConfig({ ...rawTestConfig, extends: ['recommended'] })).toThrow(
+      `Do not use 'lint', 'styleguide' and flat syntax together. \nSee more about the configuration in the docs: https://redocly.com/docs/cli/configuration/ \n`
     );
   });
 });

package/src/config/all.ts

@@ -26,7 +26,7 @@ export default {
     'operation-operationId-url-safe': 'error',
     'operation-parameters-unique': 'error',
     'operation-tag-defined': 'error',
-    'operation-security-defined': 'error',
+    'security-defined': 'error',
     'operation-singular-tag': 'error',
     'no-unresolved-refs': 'error',
     'no-enum-type-mismatch': 'error',
@@ -52,6 +52,7 @@ export default {
     'no-unused-components': 'error',
     'no-undefined-server-variable': 'error',
     'no-server-variables-empty-enum': 'error',
+    'operation-4xx-problem-details-rfc7807': 'error',
   },
   oas3_1Rules: {
     'no-server-example.com': 'error',
@@ -61,5 +62,6 @@ export default {
     'no-unused-components': 'error',
     'no-undefined-server-variable': 'error',
     'no-server-variables-empty-enum': 'error',
+    'operation-4xx-problem-details-rfc7807': 'error',
   },
 } as PluginStyleguideConfig;

package/src/config/config-resolvers.ts

@@ -21,7 +21,7 @@ import type {
   DeprecatedInRawConfig,
 } from './types';
 import { isBrowser } from '../env';
-import { isNotString, isString, notUndefined, parseYaml } from '../utils';
+import { isNotString, isString, isDefined, parseYaml } from '../utils';
 import { Config } from './config';
 import { colorize, logger } from '../logger';
 
@@ -177,7 +177,7 @@ export function resolvePlugins(
 
       return plugin;
     })
-    .filter(notUndefined);
+    .filter(isDefined);
 }
 
 export async function resolveApis({

package/src/config/load.ts

@@ -7,7 +7,7 @@ import { Config, DOMAINS } from './config';
 import { transformConfig } from './utils';
 import { resolveConfig } from './config-resolvers';
 
-import type { DeprecatedInRawConfig, RawConfig, Region } from './types';
+import type { DeprecatedInRawConfig, FlatRawConfig, RawConfig, Region } from './types';
 import { RegionalTokenWithValidity } from '../redocly/redocly-client-types';
 
 async function addConfigMetadata({
@@ -102,7 +102,8 @@ export function findConfig(dir?: string): string | undefined {
 export async function getConfig(configPath: string | undefined = findConfig()): Promise<RawConfig> {
   if (!configPath || !doesYamlFileExist(configPath)) return {};
   try {
-    const rawConfig = (await loadYaml<RawConfig & DeprecatedInRawConfig>(configPath)) || {};
+    const rawConfig =
+      (await loadYaml<RawConfig & DeprecatedInRawConfig & FlatRawConfig>(configPath)) || {};
     return transformConfig(rawConfig);
   } catch (e) {
     throw new Error(`Error parsing config file at '${configPath}': ${e.message}`);