@redocly/openapi-core 1.0.0-beta.105 → 1.0.0-beta.106

package/lib/types/index.d.ts

@@ -22,7 +22,7 @@ export declare type NodeType = {
     items?: string;
     required?: string[] | ((value: any, key: string | number | undefined) => string[]);
     requiredOneOf?: string[];
-    allowed?: ((value: any) => string[] | undefined);
+    allowed?: (value: any) => string[] | undefined;
     extensionsPrefix?: string;
 };
 declare type PropType = string | NodeType | ScalarSchema | undefined | null;
@@ -34,7 +34,7 @@ export declare type NormalizedNodeType = {
     items?: NormalizedNodeType;
     required?: string[] | ((value: any, key: string | number | undefined) => string[]);
     requiredOneOf?: string[];
-    allowed?: ((value: any) => string[] | undefined);
+    allowed?: (value: any) => string[] | undefined;
     extensionsPrefix?: string;
 };
 declare type NormalizedPropType = NormalizedNodeType | NormalizedScalarSchema | undefined | null;

package/lib/types/redocly-yaml.js

@@ -112,7 +112,8 @@ const ConfigRoot = {
             properties: {},
             additionalProperties: { properties: { type: 'string' } },
         },
-        lint: 'RootConfigLint',
+        styleguide: 'RootConfigStyleguide',
+        lint: 'RootConfigStyleguide',
         'features.openapi': 'ConfigReferenceDocs',
         referenceDocs: 'ConfigReferenceDocs',
         'features.mockServer': 'ConfigMockServer',
@@ -137,7 +138,7 @@ const ConfigApisProperties = {
                 type: 'string',
             },
         },
-        lint: 'ConfigLint',
+        styleguide: 'ConfigStyleguide',
         'features.openapi': 'ConfigReferenceDocs',
         'features.mockServer': 'ConfigMockServer',
     },
@@ -153,7 +154,7 @@ const ConfigHTTP = {
         },
     },
 };
-const ConfigLint = {
+const ConfigStyleguide = {
     properties: {
         extends: {
             type: 'array',
@@ -176,11 +177,11 @@ const ConfigLint = {
         oas3_1Decorators: { type: 'object' },
     },
 };
-const RootConfigLint = {
+const RootConfigStyleguide = {
     properties: Object.assign({ plugins: {
             type: 'array',
             items: { type: 'string' },
-        } }, ConfigLint.properties),
+        } }, ConfigStyleguide.properties),
 };
 const Rules = {
     properties: {},
@@ -765,8 +766,8 @@ exports.ConfigTypes = {
     ConfigRoot,
     ConfigApis,
     ConfigApisProperties,
-    RootConfigLint,
-    ConfigLint,
+    RootConfigStyleguide,
+    ConfigStyleguide,
     ConfigReferenceDocs,
     ConfigMockServer,
     ConfigHTTP,

package/package.json

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

package/src/__tests__/__snapshots__/bundle.test.ts.snap

@@ -1,5 +1,146 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`bundle should add to meta ref from redocly registry 1`] = `
+fileDependencies: {}
+rootType:
+  properties:
+    openapi: null
+    info:
+      properties:
+        title:
+          type: string
+        version:
+          type: string
+        description:
+          type: string
+        termsOfService:
+          type: string
+        contact:
+          properties:
+            name:
+              type: string
+            url:
+              type: string
+            email:
+              type: string
+          name: Contact
+        license:
+          properties:
+            name:
+              type: string
+            url:
+              type: string
+          required:
+            - name
+          name: License
+      required:
+        - title
+        - version
+      name: Info
+    servers:
+      name: ServerList
+      properties: {}
+      items:
+        properties:
+          url:
+            type: string
+          description:
+            type: string
+          variables:
+            name: ServerVariableMap
+            properties: {}
+        required:
+          - url
+        name: Server
+    security:
+      name: SecurityRequirementList
+      properties: {}
+      items:
+        properties: {}
+        additionalProperties:
+          type: array
+          items:
+            type: string
+        name: SecurityRequirement
+    tags:
+      name: TagList
+      properties: {}
+      items:
+        properties:
+          name:
+            type: string
+          description:
+            type: string
+          externalDocs:
+            properties:
+              description:
+                type: string
+              url:
+                type: string
+            required:
+              - url
+            name: ExternalDocs
+        required:
+          - name
+        name: Tag
+    externalDocs:
+      properties:
+        description:
+          type: string
+        url:
+          type: string
+      required:
+        - url
+      name: ExternalDocs
+    paths:
+      properties: {}
+      name: PathMap
+    components:
+      properties:
+        parameters:
+          name: NamedParameters
+          properties: {}
+        schemas:
+          name: NamedSchemas
+          properties: {}
+        responses:
+          name: NamedResponses
+          properties: {}
+        examples:
+          name: NamedExamples
+          properties: {}
+        requestBodies:
+          name: NamedRequestBodies
+          properties: {}
+        headers:
+          name: NamedHeaders
+          properties: {}
+        securitySchemes:
+          name: NamedSecuritySchemes
+          properties: {}
+        links:
+          name: NamedLinks
+          properties: {}
+        callbacks:
+          name: NamedCallbacks
+          properties: {}
+      name: Components
+    x-webhooks:
+      properties: {}
+      name: WebhooksMap
+  required:
+    - openapi
+    - paths
+    - info
+  name: DefinitionRoot
+refTypes: {}
+visitorsData:
+  registry-dependencies:
+    links:
+      - https://api.redocly.com/registry/params
+
+`;
+
 exports[`bundle should bundle external refs 1`] = `
 openapi: 3.0.0
 paths:

package/src/__tests__/bundle.test.ts

@@ -2,11 +2,21 @@ import outdent from 'outdent';
 import * as path from 'path';
 
 import { bundleDocument, bundle } from '../bundle';
-import { parseYamlToDocument, yamlSerializer } from '../../__tests__/utils';
-import { LintConfig, Config, ResolvedConfig } from '../config';
+import { parseYamlToDocument, yamlSerializer, makeConfig } from '../../__tests__/utils';
+import { StyleguideConfig, Config, ResolvedConfig } from '../config';
 import { BaseResolver } from '../resolve';
 
 describe('bundle', () => {
+  const fetchMock = jest.fn(() =>
+    Promise.resolve({
+      ok: true,
+      text: () => 'External schema content',
+      headers: {
+        get: () => '',
+      },
+    })
+  );
+
   expect.addSnapshotSerializer(yamlSerializer);
 
   const testDocument = parseYamlToDocument(
@@ -28,14 +38,14 @@ describe('bundle', () => {
           shared_a:
             name: shared-a
     `,
-    '',
+    ''
   );
 
   it('change nothing with only internal refs', async () => {
     const { bundle, problems } = await bundleDocument({
       document: testDocument,
       externalRefResolver: new BaseResolver(),
-      config: new LintConfig({}),
+      config: new StyleguideConfig({}),
     });
 
     const origCopy = JSON.parse(JSON.stringify(testDocument.parsed));
@@ -60,7 +70,7 @@ describe('bundle', () => {
     });
     expect(problems).toHaveLength(1);
     expect(problems[0].message).toEqual(
-      `Two schemas are referenced with the same name but different content. Renamed param-b to param-b-2.`,
+      `Two schemas are referenced with the same name but different content. Renamed param-b to param-b-2.`
     );
     expect(res.parsed).toMatchSnapshot();
   });
@@ -68,7 +78,7 @@ describe('bundle', () => {
   it('should dereferenced correctly when used with dereference', async () => {
     const { bundle: res, problems } = await bundleDocument({
       externalRefResolver: new BaseResolver(),
-      config: new LintConfig({}),
+      config: new StyleguideConfig({}),
       document: testDocument,
       dereference: true,
     });
@@ -98,47 +108,25 @@ describe('bundle', () => {
   });
 
   it('should pull hosted schema', async () => {
-    const fetchMock = jest.fn(
-      () => Promise.resolve({
-        ok: true,
-        text: () => 'External schema content',
-        headers: {
-          get: () => ''
-        }
-      })
-    );
-
     const { bundle: res, problems } = await bundle({
       config: new Config({} as ResolvedConfig),
       externalRefResolver: new BaseResolver({
         http: {
           customFetch: fetchMock,
-          headers: []
-        }
+          headers: [],
+        },
       }),
-      ref: path.join(__dirname, 'fixtures/refs/hosted.yaml')
+      ref: path.join(__dirname, 'fixtures/refs/hosted.yaml'),
     });
 
     expect(problems).toHaveLength(0);
-    expect(fetchMock).toHaveBeenCalledWith(
-      "https://someexternal.schema",
-      {
-        headers: {}
-      }
-    );
+    expect(fetchMock).toHaveBeenCalledWith('https://someexternal.schema', {
+      headers: {},
+    });
     expect(res.parsed).toMatchSnapshot();
   });
 
   it('should not bundle url refs if used with keepUrlRefs', async () => {
-    const fetchMock = jest.fn(() =>
-        Promise.resolve({
-          ok: true,
-          text: () => 'External schema content',
-          headers: {
-            get: () => '',
-          },
-        }),
-    );
     const { bundle: res, problems } = await bundle({
       config: new Config({} as ResolvedConfig),
       externalRefResolver: new BaseResolver({
@@ -153,4 +141,50 @@ describe('bundle', () => {
     expect(problems).toHaveLength(0);
     expect(res.parsed).toMatchSnapshot();
   });
+
+  it('should add to meta ref from redocly registry', async () => {
+    const testDocument = parseYamlToDocument(
+      outdent`
+        openapi: 3.0.0
+        paths:
+          /pet:
+            get:
+              operationId: get
+              parameters:
+                - $ref: '#/components/parameters/shared_a'
+                - name: get_b
+            post:
+              operationId: post
+              parameters:
+                - $ref: 'https://api.redocly.com/registry/params'
+        components:
+          parameters:
+            shared_a:
+              name: shared-a
+      `,
+      ''
+    );
+
+    const config = await makeConfig({}, { 'registry-dependencies': 'on' });
+
+    const {
+      bundle: result,
+      problems,
+      ...meta
+    } = await bundleDocument({
+      document: testDocument,
+      config: config,
+      externalRefResolver: new BaseResolver({
+        http: {
+          customFetch: fetchMock,
+          headers: [],
+        },
+      }),
+    });
+
+    const parsedMeta = JSON.parse(JSON.stringify(meta));
+
+    expect(problems).toHaveLength(0);
+    expect(parsedMeta).toMatchSnapshot();
+  });
 });

package/src/__tests__/codeframes.test.ts

@@ -17,7 +17,7 @@ describe('Location', () => {
             license:
               name: MIT
               url: https://google.com
-        `,
+        `
       ),
     };
     const preciseLocation = getLineColLocation(loc);
@@ -37,7 +37,7 @@ describe('Location', () => {
             license:
               name: MIT
               url: https://google.com
-        `,
+        `
       ),
     };
     const preciseLocation = getLineColLocation(loc);
@@ -57,7 +57,7 @@ describe('Location', () => {
             license:
               name: MIT
               url: https://google.com
-        `,
+        `
       ),
     };
     const preciseLocation = getLineColLocation(loc);
@@ -77,7 +77,7 @@ describe('Location', () => {
             license:
               name: MIT
               url: https://google.com
-        `,
+        `
       ),
     };
     const preciseLocation = getLineColLocation(loc);
@@ -98,7 +98,7 @@ describe('Location', () => {
             license:
               name: MIT
               url: https://google.com
-        `,
+        `
       ),
     };
     const preciseLocation = getLineColLocation(loc);
@@ -106,7 +106,6 @@ describe('Location', () => {
     expect(preciseLocation.end).toEqual({ line: 2, col: 9 });
   });
 
-
   it('should return first line for empty doc', () => {
     const loc = {
       reportOnKey: false,
@@ -158,7 +157,7 @@ describe('codeframes', () => {
             license:
               name: MIT
               url: https://google.com
-            `,
+            `
       ),
     };
 
@@ -222,7 +221,7 @@ describe('codeframes', () => {
             license:
               name: MIT
               url: https://google.com
-            `,
+            `
       ),
     };
 
@@ -256,7 +255,7 @@ describe('codeframes', () => {
               name: MIT,
               url: https://google.com
             }
-            `,
+            `
       ),
     };
 
@@ -299,7 +298,7 @@ describe('codeframes', () => {
               field5: MIT
               url: https://google.com
           openapi: 3.0.2
-          `,
+          `
       ),
     };
 
@@ -343,7 +342,7 @@ describe('codeframes', () => {
               field3: MIT
               field4: MIT
               field5: MIT
-          `,
+          `
       ),
     };
 
@@ -390,7 +389,7 @@ describe('codeframes', () => {
                     in: wrong
               post:
                 operationId: test2
-          `,
+          `
       ),
     };
 
@@ -425,7 +424,7 @@ describe('codeframes', () => {
             license:
               name: MIT
               url: https://google.com
-          `,
+          `
       ),
     };
 
@@ -483,7 +482,7 @@ describe('codeframes', () => {
           license:
             name: MIT
             url: https://google.com
-      `,
+      `
       ),
     };
 

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

@@ -48,7 +48,7 @@ describe('js-yaml', () => {
 
   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'
@@ -57,7 +57,8 @@ describe('js-yaml', () => {
     stringWithQuotes: test
     stringWithDoubleQuotes: test
     "
-    `);
+    `
+    );
   });
 
   test('parse and stringify', () => {
@@ -65,7 +66,8 @@ describe('js-yaml', () => {
   });
 
   test('should throw an error for unsupported types', () => {
-    expect(() => stringifyYaml({ foo: () => {} }))
-      .toThrow('unacceptable kind of an object to dump [object Function]');
+    expect(() => stringifyYaml({ foo: () => {} })).toThrow(
+      'unacceptable kind of an object to dump [object Function]'
+    );
   });
 });

package/src/__tests__/lint.test.ts

@@ -49,7 +49,7 @@ describe('lint', () => {
     const document = parseYamlToDocument(
       outdent`
       apis: error string
-      lint:
+      styleguide:
         plugins:
           - './local-plugin.js'
         extends:
@@ -107,14 +107,82 @@ describe('lint', () => {
     `);
   });
 
-  it("'plugins' shouldn't be allowed in 'apis' -> 'lint' field", async () => {
+  it('lintConfig should detect wrong fields and suggest correct ones', async () => {
+    const document = parseYamlToDocument(
+      outdent`
+      api: 
+        name@version:
+          root: ./file.yaml
+      syleguide:
+        rules:
+          operation-2xx-response: warn
+      `,
+      ''
+    );
+    const results = await lintConfig({ document });
+
+    expect(replaceSourceWithRef(results)).toMatchInlineSnapshot(`
+      Array [
+        Object {
+          "location": Array [
+            Object {
+              "pointer": "#/api",
+              "reportOnKey": true,
+              "source": "",
+            },
+          ],
+          "message": "Property \`api\` is not expected here.",
+          "ruleId": "configuration spec",
+          "severity": "error",
+          "suggest": Array [
+            "apis",
+          ],
+        },
+        Object {
+          "location": Array [
+            Object {
+              "pointer": "#/syleguide",
+              "reportOnKey": true,
+              "source": "",
+            },
+          ],
+          "message": "Property \`syleguide\` is not expected here.",
+          "ruleId": "configuration spec",
+          "severity": "error",
+          "suggest": Array [
+            "styleguide",
+          ],
+        },
+      ]
+    `);
+  });
+
+  it('lintConfig should work with legacy fields', async () => {
+    const document = parseYamlToDocument(
+      outdent`
+      apiDefinitions: 
+        entry: ./file.yaml
+      lint:
+        rules:
+          operation-2xx-response: warn
+      referenceDocs:
+        showConsole: true
+      `,
+      ''
+    );
+    const results = await lintConfig({ document });
+
+    expect(replaceSourceWithRef(results)).toMatchInlineSnapshot(`Array []`);
+  });
+
+  it("'plugins' shouldn't be allowed in 'apis' -> 'styleguide' field", async () => {
     const document = parseYamlToDocument(
       outdent`
       apis: 
-        lint: 
+        styleguide: 
           plugins: 
             - './local-plugin.js'
-      lint:
+      styleguide:
         plugins:
           - './local-plugin.js'
       `,
@@ -127,7 +195,7 @@ describe('lint', () => {
         Object {
           "location": Array [
             Object {
-              "pointer": "#/apis/lint",
+              "pointer": "#/apis/styleguide",
               "reportOnKey": true,
               "source": "",
             },
@@ -140,7 +208,7 @@ describe('lint', () => {
         Object {
           "location": Array [
             Object {
-              "pointer": "#/apis/lint/plugins",
+              "pointer": "#/apis/styleguide/plugins",
               "reportOnKey": true,
               "source": "",
             },

package/src/__tests__/login.test.ts

@@ -6,10 +6,10 @@ describe.skip('login', () => {
     Object.defineProperty(client, 'registryApi', {
       value: {
         setAccessTokens: jest.fn(),
-        authStatus: jest.fn(() => true)
+        authStatus: jest.fn(() => true),
       },
       writable: true,
-      configurable: true
+      configurable: true,
     });
     await client.login('token'); // TODO: bug with rewrite local config file
     expect(client.registryApi.setAccessTokens).toHaveBeenCalled();

package/src/__tests__/normalizeVisitors.test.ts

@@ -22,7 +22,7 @@ describe('Normalize visitors', () => {
         ruleId,
         severity: 'error' as 'error',
         visitor: ruleset[ruleId]({}),
-      })),
+      }))
     );
 
     const normalized = normalizeVisitors(visitors, normalizeTypes(Oas3Types));
@@ -66,7 +66,7 @@ describe('Normalize visitors', () => {
         ruleId,
         severity: 'error' as 'error',
         visitor: ruleset[ruleId]({}),
-      })),
+      }))
     );
 
     const normalized = normalizeVisitors(visitors, normalizeTypes(Oas3Types));
@@ -104,7 +104,7 @@ describe('Normalize visitors', () => {
         ruleId,
         severity: 'error' as 'error',
         visitor: ruleset[ruleId]({}),
-      })),
+      }))
     );
 
     const normalized = normalizeVisitors(visitors, normalizeTypes(Oas3Types));
@@ -139,7 +139,7 @@ describe('Normalize visitors', () => {
         ruleId,
         severity: 'error' as 'error',
         visitor: ruleset[ruleId]({}),
-      })),
+      }))
     );
 
     const normalized = normalizeVisitors(visitors, normalizeTypes(Oas3Types));