@redocly/openapi-core 1.0.0-beta.65 → 1.0.0-beta.69

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

@@ -99,3 +99,129 @@ components:
       name: shared-a
 
 `;
+
+exports[`bundle should not place referened schema inline when component in question is not of type "schemas" 1`] = `
+openapi: 3.0.0
+paths:
+  /pet:
+    post:
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/requestBody'
+components:
+  schemas:
+    requestBody:
+      content:
+        application/json:
+          schema:
+            type: object
+            properties:
+              a:
+                type: string
+              b:
+                type: number
+
+`;
+
+exports[`bundle should place referenced schema inline when referenced schema name resolves to original schema name 1`] = `
+openapi: 3.1.0
+info:
+  title: My API
+  description: It ain't so wonderful, but at least it's mine.
+  version: '1.0'
+  contact:
+    email: me@theintenet.com
+    name: me
+paths:
+  /test:
+    get:
+      summary: test
+      responses:
+        '200':
+          description: test
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/vendor'
+components:
+  schemas:
+    vendor:
+      title: vendor
+      type: object
+      description: Vendors
+      properties:
+        key:
+          type: string
+          description: System-assigned key for the vendor.
+          readOnly: true
+        id:
+          type: string
+          description: >
+            Unique identifier of the vendor.
+
+            You must specify a unique vendor ID when creating a vendor unless
+            document sequencing is configured, in which case the ID is
+            auto-generated.
+        name:
+          type: string
+          description: Name of the vendor.
+        isOneTimeUse:
+          type: boolean
+          description: One-time use
+          default: false
+    myvendor:
+      $ref: '#/components/schemas/vendor'
+    simple:
+      type: string
+    A:
+      type: string
+    test:
+      $ref: '#/components/schemas/rename-2'
+    rename:
+      type: string
+    rename-2:
+      type: number
+
+`;
+
+exports[`bundle should pull hosted schema 1`] = `
+openapi: 3.0.3
+info:
+  title: bugtest
+  version: '1.0'
+  description: Demo
+  license:
+    name: DEMO
+    url: https://demo.com
+servers:
+  - url: http://demo.com/api
+paths:
+  /customer:
+    summary: Customer scope
+    get:
+      summary: Get demo no refs
+      operationId: GetCustomer
+      description: Returns Demo No Refs
+      responses:
+        '200':
+          description: Demo No Refs
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Customer'
+components:
+  schemas:
+    Customer:
+      type: object
+      properties:
+        customerName:
+          type: string
+        accounts:
+          type: array
+          items:
+            $ref: '#/components/schemas/someexternal'
+    someexternal: External schema content
+
+`;

package/__tests__/bundle.test.ts

@@ -10,7 +10,7 @@ import { BaseResolver } from '../src/resolve';
 describe('bundle', () => {
   expect.addSnapshotSerializer(yamlSerializer);
 
-  const testDocument =  parseYamlToDocument(
+  const testDocument = parseYamlToDocument(
     outdent`
       openapi: 3.0.0
       paths:
@@ -77,4 +77,56 @@ describe('bundle', () => {
     expect(problems).toHaveLength(0);
     expect(res.parsed).toMatchSnapshot();
   });
+
+  it('should place referenced schema inline when referenced schema name resolves to original schema name', async () => {
+    const { bundle: res, problems } = await bundle({
+      config: new Config({}),
+      ref: path.join(__dirname, 'fixtures/refs/externalref.yaml'),
+    });
+
+    expect(problems).toHaveLength(0);
+    expect(res.parsed).toMatchSnapshot();
+  });
+
+  it('should not place referened schema inline when component in question is not of type "schemas"', async () => {
+    const { bundle: res, problems } = await bundle({
+      config: new Config({}),
+      ref: path.join(__dirname, 'fixtures/refs/external-request-body.yaml'),
+    });
+
+    expect(problems).toHaveLength(0);
+    expect(res.parsed).toMatchSnapshot();
+  });
+
+  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({}),
+      externalRefResolver: new BaseResolver({
+        http: {
+          customFetch: fetchMock,
+          headers: []
+        }
+      }),
+      ref: path.join(__dirname, 'fixtures/refs/hosted.yaml')
+    });
+
+    expect(problems).toHaveLength(0);
+    expect(fetchMock).toHaveBeenCalledWith(
+      "https://someexternal.schema",
+      {
+        headers: {}
+      }
+    );
+    expect(res.parsed).toMatchSnapshot();
+  })
 });

package/__tests__/fixtures/refs/definitions.yaml

@@ -0,0 +1,3 @@
+$defs:
+  A:
+    type: string

package/__tests__/fixtures/refs/external-request-body.yaml

@@ -0,0 +1,13 @@
+openapi: 3.0.0
+paths:
+  /pet:
+    post:
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: ./requestBody.yaml
+components:
+  schemas:
+    requestBody:
+      $ref: ./requestBody.yaml

package/__tests__/fixtures/refs/externalref.yaml

@@ -0,0 +1,35 @@
+openapi: 3.1.0
+info:
+  title: My API
+  description: It ain't so wonderful, but at least it's mine.
+  version: '1.0'
+  contact:
+    email: me@theintenet.com
+    name: me
+paths:
+  /test:
+    get:
+      summary: 'test'
+      responses:
+        200:
+          description: test
+          content:
+            application/json:
+              schema:
+                $ref: ./vendor.schema.yaml
+components:
+  schemas:
+    vendor:
+      $ref: ./vendor.schema.yaml
+    myvendor:
+      $ref: ./vendor.schema.yaml
+    simple:
+      $ref: ./simple.yaml
+    A:
+      $ref: ./definitions.yaml#/$defs/A
+    test:
+      $ref: ./rename.yaml
+    rename:
+      type: string
+    rename-2:
+      $ref: ./rename.yaml

package/__tests__/fixtures/refs/hosted.yaml

@@ -0,0 +1,35 @@
+openapi: "3.0.3"
+info:
+  title: bugtest
+  version: "1.0"
+  description: Demo
+  license:
+    name: DEMO
+    url: https://demo.com
+servers:
+  - url: http://demo.com/api
+paths:
+  /customer:
+    summary: "Customer scope"
+    get:
+      summary: "Get demo no refs"
+      operationId: GetCustomer
+      description: "Returns Demo No Refs"
+      responses:
+        200:
+          description: Demo No Refs
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Customer"  
+components:
+  schemas: 
+    Customer:
+      type: object
+      properties:
+        customerName:
+          type: string
+        accounts:
+          type: array
+          items:
+            $ref: "https://someexternal.schema"

package/__tests__/fixtures/refs/rename.yaml

@@ -0,0 +1 @@
+type: number

package/__tests__/fixtures/refs/requestBody.yaml

@@ -0,0 +1,9 @@
+content: 
+  application/json: 
+    schema: 
+      type: object
+      properties: 
+        a:
+          type: string
+        b:
+          type: number

package/__tests__/fixtures/refs/simple.yaml

@@ -0,0 +1 @@
+type: string

package/__tests__/fixtures/refs/vendor.schema.yaml

@@ -0,0 +1,20 @@
+title: vendor
+type: object
+description: Vendors
+properties:
+  key:
+    type: string
+    description: System-assigned key for the vendor.
+    readOnly: true
+  id:
+    type: string
+    description: |
+      Unique identifier of the vendor.
+      You must specify a unique vendor ID when creating a vendor unless document sequencing is configured, in which case the ID is auto-generated.
+  name:
+    type: string
+    description: Name of the vendor.
+  isOneTimeUse:
+    type: boolean
+    description: One-time use
+    default: false

package/lib/bundle.d.ts

@@ -15,12 +15,14 @@ export declare function bundle(opts: {
     config: Config;
     dereference?: boolean;
     base?: string;
+    skipRedoclyRegistryRefs?: boolean;
 }): Promise<{
     bundle: Document;
     problems: import("./walk").NormalizedProblem[];
     fileDependencies: Set<string>;
     rootType: NormalizedNodeType;
     refTypes: Map<string, NormalizedNodeType> | undefined;
+    visitorsData: Record<string, Record<string, unknown>>;
 }>;
 export declare function bundleDocument(opts: {
     document: Document;
@@ -28,10 +30,12 @@ export declare function bundleDocument(opts: {
     customTypes?: Record<string, NodeType>;
     externalRefResolver: BaseResolver;
     dereference?: boolean;
+    skipRedoclyRegistryRefs?: boolean;
 }): Promise<{
     bundle: Document;
     problems: import("./walk").NormalizedProblem[];
     fileDependencies: Set<string>;
     rootType: NormalizedNodeType;
     refTypes: Map<string, NormalizedNodeType> | undefined;
+    visitorsData: Record<string, Record<string, unknown>>;
 }>;

package/lib/bundle.js

@@ -23,6 +23,7 @@ const ref_utils_1 = require("./ref-utils");
 const rules_1 = require("./config/rules");
 const no_unresolved_refs_1 = require("./rules/no-unresolved-refs");
 const utils_1 = require("./utils");
+const redocly_1 = require("./redocly");
 var OasVersion;
 (function (OasVersion) {
     OasVersion["Version2"] = "oas2";
@@ -45,24 +46,29 @@ function bundle(opts) {
 exports.bundle = bundle;
 function bundleDocument(opts) {
     return __awaiter(this, void 0, void 0, function* () {
-        const { document, config, customTypes, externalRefResolver, dereference = false } = opts;
+        const { document, config, customTypes, externalRefResolver, dereference = false, skipRedoclyRegistryRefs = false, } = opts;
         const oasVersion = oas_types_1.detectOpenAPI(document.parsed);
         const oasMajorVersion = oas_types_1.openAPIMajor(oasVersion);
         const rules = config.getRulesForOasVersion(oasMajorVersion);
-        const types = types_1.normalizeTypes(config.extendTypes((customTypes !== null && customTypes !== void 0 ? customTypes : oasMajorVersion === oas_types_1.OasMajorVersion.Version3) ? (oasVersion === OasVersion.Version3_1 ? oas3_1_1.Oas3_1Types : oas3_1.Oas3Types) : oas2_1.Oas2Types, oasVersion), config);
+        const types = types_1.normalizeTypes(config.extendTypes((customTypes !== null && customTypes !== void 0 ? customTypes : oasMajorVersion === oas_types_1.OasMajorVersion.Version3)
+            ? oasVersion === OasVersion.Version3_1
+                ? oas3_1_1.Oas3_1Types
+                : oas3_1.Oas3Types
+            : oas2_1.Oas2Types, oasVersion), config);
         const preprocessors = rules_1.initRules(rules, config, 'preprocessors', oasVersion);
         const decorators = rules_1.initRules(rules, config, 'decorators', oasVersion);
         const ctx = {
             problems: [],
             oasVersion: oasVersion,
             refTypes: new Map(),
+            visitorsData: {},
         };
         const bundleVisitor = visitors_1.normalizeVisitors([
             ...preprocessors,
             {
                 severity: 'error',
                 ruleId: 'bundler',
-                visitor: makeBundleVisitor(oasMajorVersion, dereference, document),
+                visitor: makeBundleVisitor(oasMajorVersion, dereference, skipRedoclyRegistryRefs, document),
             },
             ...decorators,
         ], types);
@@ -84,6 +90,7 @@ function bundleDocument(opts) {
             fileDependencies: externalRefResolver.getFiles(),
             rootType: types.DefinitionRoot,
             refTypes: ctx.refTypes,
+            visitorsData: ctx.visitorsData,
         };
     });
 }
@@ -127,7 +134,7 @@ function mapTypeToComponent(typeName, version) {
     }
 }
 // function oas3Move
-function makeBundleVisitor(version, dereference, rootDocument) {
+function makeBundleVisitor(version, dereference, skipRedoclyRegistryRefs, rootDocument) {
     let components;
     const visitor = {
         ref: {
@@ -142,6 +149,9 @@ function makeBundleVisitor(version, dereference, rootDocument) {
                     !dereference) {
                     return;
                 }
+                if (skipRedoclyRegistryRefs && redocly_1.isRedoclyRegistryURL(node.$ref)) {
+                    return;
+                }
                 const componentType = mapTypeToComponent(ctx.type.name, version);
                 if (!componentType) {
                     replaceRef(node, resolved, ctx);
@@ -210,6 +220,14 @@ function makeBundleVisitor(version, dereference, rootDocument) {
             return `#/${componentType}/${name}`;
         }
     }
+    function isEqualOrEqualRef(node, target, ctx) {
+        var _a;
+        if (ref_utils_1.isRef(node) &&
+            ((_a = ctx.resolve(node).location) === null || _a === void 0 ? void 0 : _a.absolutePointer) === target.location.absolutePointer) {
+            return true;
+        }
+        return isEqual(node, target.node);
+    }
     function getComponentName(target, componentType, ctx) {
         const [fileRef, pointer] = [target.location.source.absoluteRef, target.location.pointer];
         const componentsGroup = components[componentType];
@@ -219,17 +237,17 @@ function makeBundleVisitor(version, dereference, rootDocument) {
             name = refParts.pop() + (name ? `-${name}` : '');
             if (!componentsGroup ||
                 !componentsGroup[name] ||
-                isEqual(componentsGroup[name], target.node)) {
+                isEqualOrEqualRef(componentsGroup[name], target, ctx)) {
                 return name;
             }
         }
         name = ref_utils_1.refBaseName(fileRef) + (name ? `_${name}` : '');
-        if (!componentsGroup[name] || isEqual(componentsGroup[name], target.node)) {
+        if (!componentsGroup[name] || isEqualOrEqualRef(componentsGroup[name], target, ctx)) {
             return name;
         }
         const prevName = name;
         let serialId = 2;
-        while (componentsGroup[name] && !isEqual(componentsGroup[name], target.node)) {
+        while (componentsGroup[name] && !isEqualOrEqualRef(componentsGroup[name], target, ctx)) {
             name = `${prevName}-${serialId}`;
             serialId++;
         }

package/lib/config/all.js

@@ -12,11 +12,13 @@ exports.default = {
         'no-identical-paths': 'error',
         'no-ambiguous-paths': 'error',
         'no-path-trailing-slash': 'error',
+        'path-segment-plural': 'error',
         'path-declaration-must-exist': 'error',
         'path-not-include-query': 'error',
         'path-parameters-defined': 'error',
         'operation-description': 'error',
         'operation-2xx-response': 'error',
+        'operation-4xx-response': 'error',
         'operation-operationId': 'error',
         'operation-summary': 'error',
         'operation-operationId-unique': 'error',
@@ -29,6 +31,12 @@ exports.default = {
         'no-enum-type-mismatch': 'error',
         'boolean-parameter-prefixes': 'error',
         'paths-kebab-case': 'error',
+        'no-http-verbs-in-paths': 'error',
+        'path-excludes-patterns': {
+            severity: 'error',
+            patterns: [],
+        },
+        'request-mime-type': 'error',
         spec: 'error',
     },
     oas3_0Rules: {
@@ -49,5 +57,5 @@ exports.default = {
         'no-unused-components': 'error',
         'no-undefined-server-variable': 'error',
         'no-servers-empty-enum': 'error',
-    }
+    },
 };

package/lib/config/config.js

@@ -73,7 +73,7 @@ class LintConfig {
         const ignoreFile = path.join(dir, exports.IGNORE_FILE);
         const mapped = {};
         for (const absFileName of Object.keys(this.ignore)) {
-            const ignoredRules = (mapped[path.relative(dir, absFileName)] = this.ignore[absFileName]);
+            const ignoredRules = (mapped[utils_1.slash(path.relative(dir, absFileName))] = this.ignore[absFileName]);
             for (const ruleId of Object.keys(ignoredRules)) {
                 ignoredRules[ruleId] = Array.from(ignoredRules[ruleId]);
             }

package/lib/config/minimal.js

@@ -17,6 +17,7 @@ exports.default = {
         'path-parameters-defined': 'warn',
         'operation-description': 'off',
         'operation-2xx-response': 'warn',
+        'operation-4xx-response': 'off',
         'operation-operationId': 'warn',
         'operation-summary': 'warn',
         'operation-operationId-unique': 'warn',

package/lib/config/recommended.js

@@ -17,6 +17,7 @@ exports.default = {
         'path-parameters-defined': 'error',
         'operation-description': 'off',
         'operation-2xx-response': 'warn',
+        'operation-4xx-response': 'warn',
         'operation-operationId': 'warn',
         'operation-summary': 'error',
         'operation-operationId-unique': 'error',

package/lib/index.d.ts

@@ -1,4 +1,4 @@
-export { BundleOutputFormat, readFileFromUrl } from './utils';
+export { BundleOutputFormat, readFileFromUrl, slash } from './utils';
 export { Oas3_1Types } from './types/oas3_1';
 export { Oas3Types } from './types/oas3';
 export { Oas2Types } from './types/oas2';

package/lib/index.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.bundleDocument = exports.bundle = exports.lintConfig = exports.lintFromString = exports.lintDocument = exports.validate = exports.lint = exports.getTotals = exports.formatProblems = exports.getLineColLocation = exports.getAstNodeByPointer = exports.walkDocument = exports.normalizeVisitors = exports.OasVersion = exports.openAPIMajor = exports.OasMajorVersion = exports.detectOpenAPI = exports.unescapePointer = exports.stringifyYaml = exports.parseYaml = exports.makeDocumentFromString = exports.YamlParseError = exports.ResolveError = exports.resolveDocument = exports.BaseResolver = exports.Source = exports.RedoclyClient = exports.loadConfig = exports.IGNORE_FILE = exports.LintConfig = exports.Config = exports.Stats = exports.normalizeTypes = exports.ConfigTypes = exports.Oas2Types = exports.Oas3Types = exports.Oas3_1Types = exports.readFileFromUrl = void 0;
+exports.bundleDocument = exports.bundle = exports.lintConfig = exports.lintFromString = exports.lintDocument = exports.validate = exports.lint = exports.getTotals = exports.formatProblems = exports.getLineColLocation = exports.getAstNodeByPointer = exports.walkDocument = exports.normalizeVisitors = exports.OasVersion = exports.openAPIMajor = exports.OasMajorVersion = exports.detectOpenAPI = exports.unescapePointer = exports.stringifyYaml = exports.parseYaml = exports.makeDocumentFromString = exports.YamlParseError = exports.ResolveError = exports.resolveDocument = exports.BaseResolver = exports.Source = exports.RedoclyClient = exports.loadConfig = exports.IGNORE_FILE = exports.LintConfig = exports.Config = exports.Stats = exports.normalizeTypes = exports.ConfigTypes = exports.Oas2Types = exports.Oas3Types = exports.Oas3_1Types = exports.slash = exports.readFileFromUrl = void 0;
 var utils_1 = require("./utils");
 Object.defineProperty(exports, "readFileFromUrl", { enumerable: true, get: function () { return utils_1.readFileFromUrl; } });
+Object.defineProperty(exports, "slash", { enumerable: true, get: function () { return utils_1.slash; } });
 var oas3_1_1 = require("./types/oas3_1");
 Object.defineProperty(exports, "Oas3_1Types", { enumerable: true, get: function () { return oas3_1_1.Oas3_1Types; } });
 var oas3_1 = require("./types/oas3");

package/lib/lint.js

@@ -51,6 +51,7 @@ function lintDocument(opts) {
         const ctx = {
             problems: [],
             oasVersion: oasVersion,
+            visitorsData: {},
         };
         const preprocessors = rules_1.initRules(rules, config, 'preprocessors', oasVersion);
         const regularRules = rules_1.initRules(rules, config, 'rules', oasVersion);
@@ -77,6 +78,7 @@ function lintConfig(opts) {
         const ctx = {
             problems: [],
             oasVersion: oas_types_1.OasVersion.Version3_0,
+            visitorsData: {},
         };
         const config = new config_1.LintConfig({
             plugins: [builtIn_1.defaultPlugin],

package/lib/redocly/index.d.ts

@@ -1,5 +1,7 @@
+import { RegistryApi } from './registry-api';
 export declare class RedoclyClient {
     private accessToken;
+    registryApi: RegistryApi;
     constructor();
     hasToken(): boolean;
     loadToken(): void;
@@ -8,18 +10,5 @@ export declare class RedoclyClient {
     getAuthorizationHeader(): Promise<string | undefined>;
     login(accessToken: string, verbose?: boolean): Promise<void>;
     logout(): void;
-    query(queryString: string, parameters?: {}, headers?: {}): Promise<any>;
-    static authorize(accessToken: string, options: {
-        queryName?: string;
-        verbose?: boolean;
-    }): Promise<any>;
-    updateDependencies(dependencies: string[] | undefined): Promise<void>;
-    updateDefinitionVersion(definitionId: number, versionId: number, updatePatch: object): Promise<void>;
-    getOrganizationId(organizationId: string): Promise<any>;
-    getDefinitionByName(name: string, organizationId: string): Promise<any>;
-    createDefinition(organizationId: string, name: string): Promise<any>;
-    createDefinitionVersion(definitionId: string, name: string, sourceType: string, source: any): Promise<any>;
-    getSignedUrl(organizationId: string, filesHash: string, fileName: string): Promise<any>;
-    getDefinitionVersion(organizationId: string, definitionName: string, versionName: string): Promise<any>;
-    static isRegistryURL(link: string): boolean;
 }
+export declare function isRedoclyRegistryURL(link: string): boolean;