@redocly/openapi-core 1.18.1 → 1.20.0

package/lib/bundle.js

@@ -1,15 +1,11 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mapTypeToComponent = exports.bundleDocument = exports.bundleFromString = exports.bundle = exports.bundleConfig = exports.OasVersion = void 0;
+exports.OasVersion = void 0;
+exports.bundleConfig = bundleConfig;
+exports.bundle = bundle;
+exports.bundleFromString = bundleFromString;
+exports.bundleDocument = bundleDocument;
+exports.mapTypeToComponent = mapTypeToComponent;
 const resolve_1 = require("./resolve");
 const visitors_1 = require("./visitors");
 const types_1 = require("./types");
@@ -29,132 +25,130 @@ var OasVersion;
     OasVersion["Version3_0"] = "oas3_0";
     OasVersion["Version3_1"] = "oas3_1";
 })(OasVersion || (exports.OasVersion = OasVersion = {}));
-function bundleConfig(document, resolvedRefMap) {
-    var _a;
-    return __awaiter(this, void 0, void 0, function* () {
-        const types = (0, types_1.normalizeTypes)(redocly_yaml_1.ConfigTypes);
-        const ctx = {
-            problems: [],
-            oasVersion: oas_types_1.SpecVersion.OAS3_0,
-            refTypes: new Map(),
-            visitorsData: {},
-        };
-        const bundleVisitor = (0, visitors_1.normalizeVisitors)([
-            {
-                severity: 'error',
-                ruleId: 'configBundler',
-                visitor: {
-                    ref: {
-                        leave(node, ctx, resolved) {
-                            replaceRef(node, resolved, ctx);
-                        },
+async function bundleConfig(document, resolvedRefMap) {
+    const types = (0, types_1.normalizeTypes)(redocly_yaml_1.ConfigTypes);
+    const ctx = {
+        problems: [],
+        oasVersion: oas_types_1.SpecVersion.OAS3_0,
+        refTypes: new Map(),
+        visitorsData: {},
+    };
+    const bundleVisitor = (0, visitors_1.normalizeVisitors)([
+        {
+            severity: 'error',
+            ruleId: 'configBundler',
+            visitor: {
+                ref: {
+                    leave(node, ctx, resolved) {
+                        replaceRef(node, resolved, ctx);
                     },
                 },
             },
-        ], types);
-        (0, walk_1.walkDocument)({
-            document,
-            rootType: types.ConfigRoot,
-            normalizedVisitors: bundleVisitor,
-            resolvedRefMap,
-            ctx,
-        });
-        return (_a = document.parsed) !== null && _a !== void 0 ? _a : {};
+        },
+    ], types);
+    (0, walk_1.walkDocument)({
+        document,
+        rootType: types.ConfigRoot,
+        normalizedVisitors: bundleVisitor,
+        resolvedRefMap,
+        ctx,
     });
+    return document.parsed ?? {};
 }
-exports.bundleConfig = bundleConfig;
-function bundle(opts) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { ref, doc, externalRefResolver = new resolve_1.BaseResolver(opts.config.resolve), base = null, } = opts;
-        if (!(ref || doc)) {
-            throw new Error('Document or reference is required.\n');
-        }
-        const document = doc === undefined ? yield externalRefResolver.resolveDocument(base, ref, true) : doc;
-        if (document instanceof Error) {
-            throw document;
-        }
-        return bundleDocument(Object.assign(Object.assign({ document }, opts), { config: opts.config.styleguide, externalRefResolver }));
+async function bundle(opts) {
+    const { ref, doc, externalRefResolver = new resolve_1.BaseResolver(opts.config.resolve), base = null, } = opts;
+    if (!(ref || doc)) {
+        throw new Error('Document or reference is required.\n');
+    }
+    const document = doc === undefined ? await externalRefResolver.resolveDocument(base, ref, true) : doc;
+    if (document instanceof Error) {
+        throw document;
+    }
+    opts.collectSpecData?.(document.parsed);
+    return bundleDocument({
+        document,
+        ...opts,
+        config: opts.config.styleguide,
+        externalRefResolver,
     });
 }
-exports.bundle = bundle;
-function bundleFromString(opts) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { source, absoluteRef, externalRefResolver = new resolve_1.BaseResolver(opts.config.resolve) } = opts;
-        const document = (0, resolve_1.makeDocumentFromString)(source, absoluteRef || '/');
-        return bundleDocument(Object.assign(Object.assign({ document }, opts), { externalRefResolver, config: opts.config.styleguide }));
+async function bundleFromString(opts) {
+    const { source, absoluteRef, externalRefResolver = new resolve_1.BaseResolver(opts.config.resolve) } = opts;
+    const document = (0, resolve_1.makeDocumentFromString)(source, absoluteRef || '/');
+    return bundleDocument({
+        document,
+        ...opts,
+        externalRefResolver,
+        config: opts.config.styleguide,
     });
 }
-exports.bundleFromString = bundleFromString;
-function bundleDocument(opts) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { document, config, customTypes, externalRefResolver, dereference = false, skipRedoclyRegistryRefs = false, removeUnusedComponents = false, keepUrlRefs = false, } = opts;
-        const specVersion = (0, oas_types_1.detectSpec)(document.parsed);
-        const specMajorVersion = (0, oas_types_1.getMajorSpecVersion)(specVersion);
-        const rules = config.getRulesForOasVersion(specMajorVersion);
-        const types = (0, types_1.normalizeTypes)(config.extendTypes(customTypes !== null && customTypes !== void 0 ? customTypes : (0, oas_types_1.getTypes)(specVersion), specVersion), config);
-        const preprocessors = (0, rules_1.initRules)(rules, config, 'preprocessors', specVersion);
-        const decorators = (0, rules_1.initRules)(rules, config, 'decorators', specVersion);
-        const ctx = {
-            problems: [],
-            oasVersion: specVersion,
-            refTypes: new Map(),
-            visitorsData: {},
-        };
-        if (removeUnusedComponents) {
-            decorators.push({
-                severity: 'error',
-                ruleId: 'remove-unused-components',
-                visitor: specMajorVersion === oas_types_1.SpecMajorVersion.OAS2
-                    ? (0, remove_unused_components_1.RemoveUnusedComponents)({})
-                    : (0, remove_unused_components_2.RemoveUnusedComponents)({}),
-            });
-        }
-        let resolvedRefMap = yield (0, resolve_1.resolveDocument)({
-            rootDocument: document,
-            rootType: types.Root,
-            externalRefResolver,
+async function bundleDocument(opts) {
+    const { document, config, customTypes, externalRefResolver, dereference = false, skipRedoclyRegistryRefs = false, removeUnusedComponents = false, keepUrlRefs = false, } = opts;
+    const specVersion = (0, oas_types_1.detectSpec)(document.parsed);
+    const specMajorVersion = (0, oas_types_1.getMajorSpecVersion)(specVersion);
+    const rules = config.getRulesForOasVersion(specMajorVersion);
+    const types = (0, types_1.normalizeTypes)(config.extendTypes(customTypes ?? (0, oas_types_1.getTypes)(specVersion), specVersion), config);
+    const preprocessors = (0, rules_1.initRules)(rules, config, 'preprocessors', specVersion);
+    const decorators = (0, rules_1.initRules)(rules, config, 'decorators', specVersion);
+    const ctx = {
+        problems: [],
+        oasVersion: specVersion,
+        refTypes: new Map(),
+        visitorsData: {},
+    };
+    if (removeUnusedComponents) {
+        decorators.push({
+            severity: 'error',
+            ruleId: 'remove-unused-components',
+            visitor: specMajorVersion === oas_types_1.SpecMajorVersion.OAS2
+                ? (0, remove_unused_components_1.RemoveUnusedComponents)({})
+                : (0, remove_unused_components_2.RemoveUnusedComponents)({}),
         });
-        if (preprocessors.length > 0) {
-            // Make additional pass to resolve refs defined in preprocessors.
-            (0, walk_1.walkDocument)({
-                document,
-                rootType: types.Root,
-                normalizedVisitors: (0, visitors_1.normalizeVisitors)(preprocessors, types),
-                resolvedRefMap,
-                ctx,
-            });
-            resolvedRefMap = yield (0, resolve_1.resolveDocument)({
-                rootDocument: document,
-                rootType: types.Root,
-                externalRefResolver,
-            });
-        }
-        const bundleVisitor = (0, visitors_1.normalizeVisitors)([
-            {
-                severity: 'error',
-                ruleId: 'bundler',
-                visitor: makeBundleVisitor(specMajorVersion, dereference, skipRedoclyRegistryRefs, document, resolvedRefMap, keepUrlRefs),
-            },
-            ...decorators,
-        ], types);
+    }
+    let resolvedRefMap = await (0, resolve_1.resolveDocument)({
+        rootDocument: document,
+        rootType: types.Root,
+        externalRefResolver,
+    });
+    if (preprocessors.length > 0) {
+        // Make additional pass to resolve refs defined in preprocessors.
         (0, walk_1.walkDocument)({
             document,
             rootType: types.Root,
-            normalizedVisitors: bundleVisitor,
+            normalizedVisitors: (0, visitors_1.normalizeVisitors)(preprocessors, types),
             resolvedRefMap,
             ctx,
         });
-        return {
-            bundle: document,
-            problems: ctx.problems.map((problem) => config.addProblemToIgnore(problem)),
-            fileDependencies: externalRefResolver.getFiles(),
+        resolvedRefMap = await (0, resolve_1.resolveDocument)({
+            rootDocument: document,
             rootType: types.Root,
-            refTypes: ctx.refTypes,
-            visitorsData: ctx.visitorsData,
-        };
+            externalRefResolver,
+        });
+    }
+    const bundleVisitor = (0, visitors_1.normalizeVisitors)([
+        {
+            severity: 'error',
+            ruleId: 'bundler',
+            visitor: makeBundleVisitor(specMajorVersion, dereference, skipRedoclyRegistryRefs, document, resolvedRefMap, keepUrlRefs),
+        },
+        ...decorators,
+    ], types);
+    (0, walk_1.walkDocument)({
+        document,
+        rootType: types.Root,
+        normalizedVisitors: bundleVisitor,
+        resolvedRefMap,
+        ctx,
     });
+    return {
+        bundle: document,
+        problems: ctx.problems.map((problem) => config.addProblemToIgnore(problem)),
+        fileDependencies: externalRefResolver.getFiles(),
+        rootType: types.Root,
+        refTypes: ctx.refTypes,
+        visitorsData: ctx.visitorsData,
+    };
 }
-exports.bundleDocument = bundleDocument;
 function mapTypeToComponent(typeName, version) {
     switch (version) {
         case oas_types_1.SpecMajorVersion.OAS3:
@@ -200,6 +194,15 @@ function mapTypeToComponent(typeName, version) {
                 default:
                     return null;
             }
+        case oas_types_1.SpecMajorVersion.Async3:
+            switch (typeName) {
+                case 'Schema':
+                    return 'schemas';
+                case 'Parameter':
+                    return 'parameters';
+                default:
+                    return null;
+            }
         case oas_types_1.SpecMajorVersion.Arazzo:
             switch (typeName) {
                 case 'Root.x-parameters_items':
@@ -211,7 +214,6 @@ function mapTypeToComponent(typeName, version) {
             }
     }
 }
-exports.mapTypeToComponent = mapTypeToComponent;
 function replaceRef(ref, resolved, ctx) {
     if (!(0, utils_1.isPlainObject)(resolved.node)) {
         ctx.parent[ctx.key] = resolved.node;
@@ -276,6 +278,9 @@ function makeBundleVisitor(version, dereference, skipRedoclyRegistryRefs, rootDo
                 else if (version === oas_types_1.SpecMajorVersion.Async2) {
                     components = root.components = root.components || {};
                 }
+                else if (version === oas_types_1.SpecMajorVersion.Async3) {
+                    components = root.components = root.components || {};
+                }
                 else if (version === oas_types_1.SpecMajorVersion.Arazzo) {
                     components = root.components = root.components || {};
                 }
@@ -320,14 +325,16 @@ function makeBundleVisitor(version, dereference, skipRedoclyRegistryRefs, rootDo
         if (version === oas_types_1.SpecMajorVersion.OAS3) {
             return `#/components/${componentType}/${name}`;
         }
+        else if (version === oas_types_1.SpecMajorVersion.Async2 || version === oas_types_1.SpecMajorVersion.Async3) {
+            return `#/components/${componentType}/${name}`;
+        }
         else {
             return `#/${componentType}/${name}`;
         }
     }
     function isEqualOrEqualRef(node, target, ctx) {
-        var _a;
         if ((0, ref_utils_1.isRef)(node) &&
-            ((_a = ctx.resolve(node, rootLocation.absolutePointer).location) === null || _a === void 0 ? void 0 : _a.absolutePointer) ===
+            ctx.resolve(node, rootLocation.absolutePointer).location?.absolutePointer ===
                 target.location.absolutePointer) {
             return true;
         }

package/lib/config/all.js

@@ -5,6 +5,7 @@ const all = {
         'info-contact': 'error',
         'info-license': 'error',
         'info-license-url': 'error',
+        'info-license-strict': 'error',
         'tag-description': 'error',
         'tags-alphabetical': 'error',
         'parameter-description': 'error',
@@ -108,12 +109,23 @@ const all = {
     async2Rules: {
         spec: 'error',
         'info-contact': 'error',
+        'info-license-strict': 'error',
         'operation-operationId': 'error',
         'tag-description': 'error',
         'tags-alphabetical': 'error',
         'channels-kebab-case': 'error',
         'no-channel-trailing-slash': 'error',
     },
-    arazzoRules: { spec: 'error' },
+    async3Rules: {
+        spec: 'error',
+        'info-contact': 'error',
+        'info-license-strict': 'error',
+        'operation-operationId': 'error',
+        'tag-description': 'error',
+        'tags-alphabetical': 'error',
+        'channels-kebab-case': 'error',
+        'no-channel-trailing-slash': 'error',
+    },
+    arazzoRules: { spec: 'error', 'parameters-no-body-inside-in': 'off' },
 };
 exports.default = all;

package/lib/config/builtIn.js

@@ -8,15 +8,13 @@ const minimal_1 = require("./minimal");
 const oas3_1 = require("../rules/oas3");
 const oas2_1 = require("../rules/oas2");
 const async2_1 = require("../rules/async2");
+const async3_1 = require("../rules/async3");
 const arazzo_1 = require("../rules/arazzo");
-const oas3_2 = require("../rules/oas3");
-const oas2_2 = require("../rules/oas2");
-const async2_2 = require("../rules/async2");
-const arazzo_2 = require("../rules/arazzo");
-const oas3_3 = require("../decorators/oas3");
-const oas2_3 = require("../decorators/oas2");
-const async2_3 = require("../decorators/async2");
-const arazzo_3 = require("../decorators/arazzo");
+const oas3_2 = require("../decorators/oas3");
+const oas2_2 = require("../decorators/oas2");
+const async2_2 = require("../decorators/async2");
+const async3_2 = require("../decorators/async3");
+const arazzo_2 = require("../decorators/arazzo");
 exports.builtInConfigs = {
     recommended: recommended_1.default,
     'recommended-strict': recommended_strict_1.default,
@@ -27,24 +25,27 @@ exports.builtInConfigs = {
     },
 };
 exports.defaultPlugin = {
-    id: '',
+    id: '', // default plugin doesn't have id
     rules: {
         oas3: oas3_1.rules,
         oas2: oas2_1.rules,
         async2: async2_1.rules,
+        async3: async3_1.rules,
         arazzo: arazzo_1.rules,
     },
     preprocessors: {
-        oas3: oas3_2.preprocessors,
-        oas2: oas2_2.preprocessors,
-        async2: async2_2.preprocessors,
-        arazzo: arazzo_2.preprocessors,
+        oas3: oas3_1.preprocessors,
+        oas2: oas2_1.preprocessors,
+        async2: async2_1.preprocessors,
+        async3: async3_1.preprocessors,
+        arazzo: arazzo_1.preprocessors,
     },
     decorators: {
-        oas3: oas3_3.decorators,
-        oas2: oas2_3.decorators,
-        async2: async2_3.decorators,
-        arazzo: arazzo_3.decorators,
+        oas3: oas3_2.decorators,
+        oas2: oas2_2.decorators,
+        async2: async2_2.decorators,
+        async3: async3_2.decorators,
+        arazzo: arazzo_2.decorators,
     },
     configs: exports.builtInConfigs,
 };

package/lib/config/config-resolvers.d.ts

@@ -14,7 +14,7 @@ export declare function resolveConfig({ rawConfig, configPath, externalRefResolv
     configPath?: string;
     externalRefResolver?: BaseResolver;
 }): Promise<Config>;
-export declare function resolvePlugins(plugins: (string | Plugin)[] | null, configPath?: string): Plugin[];
+export declare function resolvePlugins(plugins: (string | Plugin)[] | null, configPath?: string): Promise<Plugin[]>;
 export declare function resolveApis({ rawConfig, configPath, resolver, }: {
     rawConfig: RawConfig;
     configPath?: string;