@redocly/openapi-core 1.18.0 → 1.19.0

package/lib/config/config-resolvers.js

@@ -1,26 +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());
-    });
-};
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolvePreset = exports.resolveStyleguideConfig = exports.resolveApis = exports.resolvePlugins = exports.resolveConfig = exports.resolveConfigFileAndRefs = void 0;
+exports.resolveConfigFileAndRefs = resolveConfigFileAndRefs;
+exports.resolveConfig = resolveConfig;
+exports.resolvePlugins = resolvePlugins;
+exports.resolveApis = resolveApis;
+exports.resolveStyleguideConfig = resolveStyleguideConfig;
+exports.resolvePreset = resolvePreset;
 const path = require("path");
 const ref_utils_1 = require("../ref-utils");
 const utils_1 = require("../utils");
@@ -34,47 +19,43 @@ const logger_1 = require("../logger");
 const asserts_1 = require("../rules/common/assertions/asserts");
 const types_1 = require("../types");
 const redocly_yaml_1 = require("../types/redocly-yaml");
-function resolveConfigFileAndRefs({ configPath, externalRefResolver = new resolve_1.BaseResolver(), base = null, }) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (!configPath) {
-            throw new Error('Reference to a config is required.\n');
-        }
-        const document = yield externalRefResolver.resolveDocument(base, configPath, true);
-        if (document instanceof Error) {
-            throw document;
-        }
-        const types = (0, types_1.normalizeTypes)(redocly_yaml_1.ConfigTypes);
-        const resolvedRefMap = yield (0, resolve_1.resolveDocument)({
-            rootDocument: document,
-            rootType: types.ConfigRoot,
-            externalRefResolver,
-        });
-        return { document, resolvedRefMap };
+async function resolveConfigFileAndRefs({ configPath, externalRefResolver = new resolve_1.BaseResolver(), base = null, }) {
+    if (!configPath) {
+        throw new Error('Reference to a config is required.\n');
+    }
+    const document = await externalRefResolver.resolveDocument(base, configPath, true);
+    if (document instanceof Error) {
+        throw document;
+    }
+    const types = (0, types_1.normalizeTypes)(redocly_yaml_1.ConfigTypes);
+    const resolvedRefMap = await (0, resolve_1.resolveDocument)({
+        rootDocument: document,
+        rootType: types.ConfigRoot,
+        externalRefResolver,
     });
+    return { document, resolvedRefMap };
 }
-exports.resolveConfigFileAndRefs = resolveConfigFileAndRefs;
-function resolveConfig({ rawConfig, configPath, externalRefResolver, }) {
-    var _a, _b;
-    return __awaiter(this, void 0, void 0, function* () {
-        if ((_b = (_a = rawConfig.styleguide) === null || _a === void 0 ? void 0 : _a.extends) === null || _b === void 0 ? void 0 : _b.some(utils_3.isNotString)) {
-            throw new Error(`Error configuration format not detected in extends value must contain strings`);
-        }
-        const resolver = externalRefResolver !== null && externalRefResolver !== void 0 ? externalRefResolver : new resolve_1.BaseResolver((0, utils_2.getResolveConfig)(rawConfig.resolve));
-        const apis = yield resolveApis({
-            rawConfig,
-            configPath,
-            resolver,
-        });
-        const styleguide = yield resolveStyleguideConfig({
-            styleguideConfig: rawConfig.styleguide,
-            configPath,
-            resolver,
-        });
-        return new config_1.Config(Object.assign(Object.assign({}, rawConfig), { apis,
-            styleguide }), configPath);
+async function resolveConfig({ rawConfig, configPath, externalRefResolver, }) {
+    if (rawConfig.styleguide?.extends?.some(utils_3.isNotString)) {
+        throw new Error(`Error configuration format not detected in extends value must contain strings`);
+    }
+    const resolver = externalRefResolver ?? new resolve_1.BaseResolver((0, utils_2.getResolveConfig)(rawConfig.resolve));
+    const apis = await resolveApis({
+        rawConfig,
+        configPath,
+        resolver,
+    });
+    const styleguide = await resolveStyleguideConfig({
+        styleguideConfig: rawConfig.styleguide,
+        configPath,
+        resolver,
     });
+    return new config_1.Config({
+        ...rawConfig,
+        apis,
+        styleguide,
+    }, configPath);
 }
-exports.resolveConfig = resolveConfig;
 function resolvePlugins(plugins, configPath = '') {
     if (!plugins)
         return [];
@@ -124,10 +105,14 @@ function resolvePlugins(plugins, configPath = '') {
             throw new Error(logger_1.colorize.red(`Plugin "id" must be unique. Plugin ${logger_1.colorize.blue(p.toString())} uses id "${logger_1.colorize.blue(id)}" already seen in ${logger_1.colorize.blue(pluginPath)}`));
         }
         seenPluginIds.set(id, p.toString());
-        const plugin = Object.assign(Object.assign({ id }, (pluginModule.configs ? { configs: pluginModule.configs } : {})), (pluginModule.typeExtension ? { typeExtension: pluginModule.typeExtension } : {}));
+        const plugin = {
+            id,
+            ...(pluginModule.configs ? { configs: pluginModule.configs } : {}),
+            ...(pluginModule.typeExtension ? { typeExtension: pluginModule.typeExtension } : {}),
+        };
         if (pluginModule.rules) {
             if (!pluginModule.rules.oas3 && !pluginModule.rules.oas2 && !pluginModule.rules.async2) {
-                throw new Error(`Plugin rules must have \`oas3\`, \`oas2\`, \`async2\`, or \`arazzo\` rules "${p}.`);
+                throw new Error(`Plugin rules must have \`oas3\`, \`oas2\`, \`async2\`, \`async3\` or \`arazzo\` rules "${p}.`);
             }
             plugin.rules = {};
             if (pluginModule.rules.oas3) {
@@ -139,6 +124,9 @@ function resolvePlugins(plugins, configPath = '') {
             if (pluginModule.rules.async2) {
                 plugin.rules.async2 = (0, utils_2.prefixRules)(pluginModule.rules.async2, id);
             }
+            if (pluginModule.rules.async3) {
+                plugin.rules.async3 = (0, utils_2.prefixRules)(pluginModule.rules.async3, id);
+            }
             if (pluginModule.rules.arazzo) {
                 plugin.rules.arazzo = (0, utils_2.prefixRules)(pluginModule.rules.arazzo, id);
             }
@@ -147,6 +135,7 @@ function resolvePlugins(plugins, configPath = '') {
             if (!pluginModule.preprocessors.oas3 &&
                 !pluginModule.preprocessors.oas2 &&
                 !pluginModule.preprocessors.async2 &&
+                !pluginModule.preprocessors.async3 &&
                 !pluginModule.preprocessors.arazzo) {
                 throw new Error(`Plugin \`preprocessors\` must have \`oas3\`, \`oas2\` or \`async2\` preprocessors "${p}.`);
             }
@@ -160,6 +149,9 @@ function resolvePlugins(plugins, configPath = '') {
             if (pluginModule.preprocessors.async2) {
                 plugin.preprocessors.async2 = (0, utils_2.prefixRules)(pluginModule.preprocessors.async2, id);
             }
+            if (pluginModule.preprocessors.async3) {
+                plugin.preprocessors.async3 = (0, utils_2.prefixRules)(pluginModule.preprocessors.async3, id);
+            }
             if (pluginModule.preprocessors.arazzo) {
                 plugin.preprocessors.arazzo = (0, utils_2.prefixRules)(pluginModule.preprocessors.arazzo, id);
             }
@@ -168,8 +160,9 @@ function resolvePlugins(plugins, configPath = '') {
             if (!pluginModule.decorators.oas3 &&
                 !pluginModule.decorators.oas2 &&
                 !pluginModule.decorators.async2 &&
+                !pluginModule.decorators.async3 &&
                 !pluginModule.decorators.arazzo) {
-                throw new Error(`Plugin \`decorators\` must have \`oas3\`, \`oas2\` or \`async2\` decorators "${p}.`);
+                throw new Error(`Plugin \`decorators\` must have \`oas3\`, \`oas2\`, \`async2\` or \`async3\` decorators "${p}.`);
             }
             plugin.decorators = {};
             if (pluginModule.decorators.oas3) {
@@ -181,6 +174,9 @@ function resolvePlugins(plugins, configPath = '') {
             if (pluginModule.decorators.async2) {
                 plugin.decorators.async2 = (0, utils_2.prefixRules)(pluginModule.decorators.async2, id);
             }
+            if (pluginModule.decorators.async3) {
+                plugin.decorators.async3 = (0, utils_2.prefixRules)(pluginModule.decorators.async3, id);
+            }
             if (pluginModule.decorators.arazzo) {
                 plugin.decorators.arazzo = (0, utils_2.prefixRules)(pluginModule.decorators.arazzo, id);
             }
@@ -192,77 +188,82 @@ function resolvePlugins(plugins, configPath = '') {
     })
         .filter(utils_3.isDefined);
 }
-exports.resolvePlugins = resolvePlugins;
-function resolveApis({ rawConfig, configPath = '', resolver, }) {
-    var _a, _b;
-    return __awaiter(this, void 0, void 0, function* () {
-        const { apis = {}, styleguide: styleguideConfig = {} } = rawConfig;
-        const resolvedApis = {};
-        for (const [apiName, apiContent] of Object.entries(apis || {})) {
-            if ((_b = (_a = apiContent.styleguide) === null || _a === void 0 ? void 0 : _a.extends) === null || _b === void 0 ? void 0 : _b.some(utils_3.isNotString)) {
-                throw new Error(`Error configuration format not detected in extends value must contain strings`);
-            }
-            const rawStyleguideConfig = getMergedRawStyleguideConfig(styleguideConfig, apiContent.styleguide);
-            const resolvedApiConfig = yield resolveStyleguideConfig({
-                styleguideConfig: rawStyleguideConfig,
-                configPath,
-                resolver,
-            });
-            resolvedApis[apiName] = Object.assign(Object.assign({}, apiContent), { styleguide: resolvedApiConfig });
+async function resolveApis({ rawConfig, configPath = '', resolver, }) {
+    const { apis = {}, styleguide: styleguideConfig = {} } = rawConfig;
+    const resolvedApis = {};
+    for (const [apiName, apiContent] of Object.entries(apis || {})) {
+        if (apiContent.styleguide?.extends?.some(utils_3.isNotString)) {
+            throw new Error(`Error configuration format not detected in extends value must contain strings`);
         }
-        return resolvedApis;
-    });
+        const rawStyleguideConfig = getMergedRawStyleguideConfig(styleguideConfig, apiContent.styleguide);
+        const resolvedApiConfig = await resolveStyleguideConfig({
+            styleguideConfig: rawStyleguideConfig,
+            configPath,
+            resolver,
+        });
+        resolvedApis[apiName] = { ...apiContent, styleguide: resolvedApiConfig };
+    }
+    return resolvedApis;
 }
-exports.resolveApis = resolveApis;
-function resolveAndMergeNestedStyleguideConfig({ styleguideConfig, configPath = '', resolver = new resolve_1.BaseResolver(), }, parentConfigPaths = [], extendPaths = []) {
-    var _a, _b, _c;
-    return __awaiter(this, void 0, void 0, function* () {
-        if (parentConfigPaths.includes(configPath)) {
-            throw new Error(`Circular dependency in config file: "${configPath}"`);
+async function resolveAndMergeNestedStyleguideConfig({ styleguideConfig, configPath = '', resolver = new resolve_1.BaseResolver(), }, parentConfigPaths = [], extendPaths = []) {
+    if (parentConfigPaths.includes(configPath)) {
+        throw new Error(`Circular dependency in config file: "${configPath}"`);
+    }
+    const plugins = (0, utils_2.getUniquePlugins)(resolvePlugins([...(styleguideConfig?.plugins || []), builtIn_1.defaultPlugin], configPath));
+    const pluginPaths = styleguideConfig?.plugins
+        ?.filter(utils_3.isString)
+        .map((p) => path.resolve(path.dirname(configPath), p));
+    const resolvedConfigPath = (0, ref_utils_1.isAbsoluteUrl)(configPath)
+        ? configPath
+        : configPath && path.resolve(configPath);
+    const extendConfigs = await Promise.all(styleguideConfig?.extends?.map(async (presetItem) => {
+        if (!(0, ref_utils_1.isAbsoluteUrl)(presetItem) && !path.extname(presetItem)) {
+            return resolvePreset(presetItem, plugins);
         }
-        const plugins = (0, utils_2.getUniquePlugins)(resolvePlugins([...((styleguideConfig === null || styleguideConfig === void 0 ? void 0 : styleguideConfig.plugins) || []), builtIn_1.defaultPlugin], configPath));
-        const pluginPaths = (_a = styleguideConfig === null || styleguideConfig === void 0 ? void 0 : styleguideConfig.plugins) === null || _a === void 0 ? void 0 : _a.filter(utils_3.isString).map((p) => path.resolve(path.dirname(configPath), p));
-        const resolvedConfigPath = (0, ref_utils_1.isAbsoluteUrl)(configPath)
-            ? configPath
-            : configPath && path.resolve(configPath);
-        const extendConfigs = yield Promise.all(((_b = styleguideConfig === null || styleguideConfig === void 0 ? void 0 : styleguideConfig.extends) === null || _b === void 0 ? void 0 : _b.map((presetItem) => __awaiter(this, void 0, void 0, function* () {
-            if (!(0, ref_utils_1.isAbsoluteUrl)(presetItem) && !path.extname(presetItem)) {
-                return resolvePreset(presetItem, plugins);
-            }
-            const pathItem = (0, ref_utils_1.isAbsoluteUrl)(presetItem)
-                ? presetItem
-                : (0, ref_utils_1.isAbsoluteUrl)(configPath)
-                    ? new URL(presetItem, configPath).href
-                    : path.resolve(path.dirname(configPath), presetItem);
-            const extendedStyleguideConfig = yield loadExtendStyleguideConfig(pathItem, resolver);
-            return yield resolveAndMergeNestedStyleguideConfig({
-                styleguideConfig: extendedStyleguideConfig,
-                configPath: pathItem,
-                resolver: resolver,
-            }, [...parentConfigPaths, resolvedConfigPath], extendPaths);
-        }))) || []);
-        const _d = (0, utils_2.mergeExtends)([
-            ...extendConfigs,
-            Object.assign(Object.assign({}, styleguideConfig), { plugins, extends: undefined, extendPaths: [...parentConfigPaths, resolvedConfigPath], pluginPaths }),
-        ]), { plugins: mergedPlugins = [] } = _d, styleguide = __rest(_d, ["plugins"]);
-        return Object.assign(Object.assign({}, styleguide), { extendPaths: (_c = styleguide.extendPaths) === null || _c === void 0 ? void 0 : _c.filter((path) => path && !(0, ref_utils_1.isAbsoluteUrl)(path)), plugins: (0, utils_2.getUniquePlugins)(mergedPlugins), recommendedFallback: styleguideConfig === null || styleguideConfig === void 0 ? void 0 : styleguideConfig.recommendedFallback, doNotResolveExamples: styleguideConfig === null || styleguideConfig === void 0 ? void 0 : styleguideConfig.doNotResolveExamples });
-    });
+        const pathItem = (0, ref_utils_1.isAbsoluteUrl)(presetItem)
+            ? presetItem
+            : (0, ref_utils_1.isAbsoluteUrl)(configPath)
+                ? new URL(presetItem, configPath).href
+                : path.resolve(path.dirname(configPath), presetItem);
+        const extendedStyleguideConfig = await loadExtendStyleguideConfig(pathItem, resolver);
+        return await resolveAndMergeNestedStyleguideConfig({
+            styleguideConfig: extendedStyleguideConfig,
+            configPath: pathItem,
+            resolver: resolver,
+        }, [...parentConfigPaths, resolvedConfigPath], extendPaths);
+    }) || []);
+    const { plugins: mergedPlugins = [], ...styleguide } = (0, utils_2.mergeExtends)([
+        ...extendConfigs,
+        {
+            ...styleguideConfig,
+            plugins,
+            extends: undefined,
+            extendPaths: [...parentConfigPaths, resolvedConfigPath],
+            pluginPaths,
+        },
+    ]);
+    return {
+        ...styleguide,
+        extendPaths: styleguide.extendPaths?.filter((path) => path && !(0, ref_utils_1.isAbsoluteUrl)(path)),
+        plugins: (0, utils_2.getUniquePlugins)(mergedPlugins),
+        recommendedFallback: styleguideConfig?.recommendedFallback,
+        doNotResolveExamples: styleguideConfig?.doNotResolveExamples,
+    };
 }
-function resolveStyleguideConfig(opts, parentConfigPaths = [], extendPaths = []) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const resolvedStyleguideConfig = yield resolveAndMergeNestedStyleguideConfig(opts, parentConfigPaths, extendPaths);
-        return Object.assign(Object.assign({}, resolvedStyleguideConfig), { rules: resolvedStyleguideConfig.rules && groupStyleguideAssertionRules(resolvedStyleguideConfig) });
-    });
+async function resolveStyleguideConfig(opts, parentConfigPaths = [], extendPaths = []) {
+    const resolvedStyleguideConfig = await resolveAndMergeNestedStyleguideConfig(opts, parentConfigPaths, extendPaths);
+    return {
+        ...resolvedStyleguideConfig,
+        rules: resolvedStyleguideConfig.rules && groupStyleguideAssertionRules(resolvedStyleguideConfig),
+    };
 }
-exports.resolveStyleguideConfig = resolveStyleguideConfig;
 function resolvePreset(presetName, plugins) {
-    var _a;
     const { pluginId, configName } = (0, utils_2.parsePresetName)(presetName);
     const plugin = plugins.find((p) => p.id === pluginId);
     if (!plugin) {
         throw new Error(`Invalid config ${logger_1.colorize.red(presetName)}: plugin ${pluginId} is not included.`);
     }
-    const preset = (_a = plugin.configs) === null || _a === void 0 ? void 0 : _a[configName];
+    const preset = plugin.configs?.[configName];
     if (!preset) {
         throw new Error(pluginId
             ? `Invalid config ${logger_1.colorize.red(presetName)}: plugin ${pluginId} doesn't export config with name ${configName}.`
@@ -270,26 +271,63 @@ function resolvePreset(presetName, plugins) {
     }
     return preset;
 }
-exports.resolvePreset = resolvePreset;
-function loadExtendStyleguideConfig(filePath, resolver) {
-    return __awaiter(this, void 0, void 0, function* () {
-        try {
-            const { parsed } = (yield resolver.resolveDocument(null, filePath));
-            const rawConfig = (0, utils_2.transformConfig)(parsed);
-            if (!rawConfig.styleguide) {
-                throw new Error(`Styleguide configuration format not detected: "${filePath}"`);
-            }
-            return rawConfig.styleguide;
+async function loadExtendStyleguideConfig(filePath, resolver) {
+    try {
+        const { parsed } = (await resolver.resolveDocument(null, filePath));
+        const rawConfig = (0, utils_2.transformConfig)(parsed);
+        if (!rawConfig.styleguide) {
+            throw new Error(`Styleguide configuration format not detected: "${filePath}"`);
         }
-        catch (error) {
-            throw new Error(`Failed to load "${filePath}": ${error.message}`);
-        }
-    });
+        return rawConfig.styleguide;
+    }
+    catch (error) {
+        throw new Error(`Failed to load "${filePath}": ${error.message}`);
+    }
 }
 function getMergedRawStyleguideConfig(rootStyleguideConfig, apiStyleguideConfig) {
-    const resultLint = Object.assign(Object.assign(Object.assign({}, rootStyleguideConfig), (0, utils_1.pickDefined)(apiStyleguideConfig)), { rules: Object.assign(Object.assign({}, rootStyleguideConfig === null || rootStyleguideConfig === void 0 ? void 0 : rootStyleguideConfig.rules), apiStyleguideConfig === null || apiStyleguideConfig === void 0 ? void 0 : apiStyleguideConfig.rules), oas2Rules: Object.assign(Object.assign({}, rootStyleguideConfig === null || rootStyleguideConfig === void 0 ? void 0 : rootStyleguideConfig.oas2Rules), apiStyleguideConfig === null || apiStyleguideConfig === void 0 ? void 0 : apiStyleguideConfig.oas2Rules), oas3_0Rules: Object.assign(Object.assign({}, rootStyleguideConfig === null || rootStyleguideConfig === void 0 ? void 0 : rootStyleguideConfig.oas3_0Rules), apiStyleguideConfig === null || apiStyleguideConfig === void 0 ? void 0 : apiStyleguideConfig.oas3_0Rules), oas3_1Rules: Object.assign(Object.assign({}, rootStyleguideConfig === null || rootStyleguideConfig === void 0 ? void 0 : rootStyleguideConfig.oas3_1Rules), apiStyleguideConfig === null || apiStyleguideConfig === void 0 ? void 0 : apiStyleguideConfig.oas3_1Rules), arazzoRules: Object.assign(Object.assign({}, rootStyleguideConfig === null || rootStyleguideConfig === void 0 ? void 0 : rootStyleguideConfig.arazzoRules), apiStyleguideConfig === null || apiStyleguideConfig === void 0 ? void 0 : apiStyleguideConfig.arazzoRules), preprocessors: Object.assign(Object.assign({}, rootStyleguideConfig === null || rootStyleguideConfig === void 0 ? void 0 : rootStyleguideConfig.preprocessors), apiStyleguideConfig === null || apiStyleguideConfig === void 0 ? void 0 : apiStyleguideConfig.preprocessors), oas2Preprocessors: Object.assign(Object.assign({}, rootStyleguideConfig === null || rootStyleguideConfig === void 0 ? void 0 : rootStyleguideConfig.oas2Preprocessors), apiStyleguideConfig === null || apiStyleguideConfig === void 0 ? void 0 : apiStyleguideConfig.oas2Preprocessors), oas3_0Preprocessors: Object.assign(Object.assign({}, rootStyleguideConfig === null || rootStyleguideConfig === void 0 ? void 0 : rootStyleguideConfig.oas3_0Preprocessors), apiStyleguideConfig === null || apiStyleguideConfig === void 0 ? void 0 : apiStyleguideConfig.oas3_0Preprocessors), oas3_1Preprocessors: Object.assign(Object.assign({}, rootStyleguideConfig === null || rootStyleguideConfig === void 0 ? void 0 : rootStyleguideConfig.oas3_1Preprocessors), apiStyleguideConfig === null || apiStyleguideConfig === void 0 ? void 0 : apiStyleguideConfig.oas3_1Preprocessors), decorators: Object.assign(Object.assign({}, rootStyleguideConfig === null || rootStyleguideConfig === void 0 ? void 0 : rootStyleguideConfig.decorators), apiStyleguideConfig === null || apiStyleguideConfig === void 0 ? void 0 : apiStyleguideConfig.decorators), oas2Decorators: Object.assign(Object.assign({}, rootStyleguideConfig === null || rootStyleguideConfig === void 0 ? void 0 : rootStyleguideConfig.oas2Decorators), apiStyleguideConfig === null || apiStyleguideConfig === void 0 ? void 0 : apiStyleguideConfig.oas2Decorators), oas3_0Decorators: Object.assign(Object.assign({}, rootStyleguideConfig === null || rootStyleguideConfig === void 0 ? void 0 : rootStyleguideConfig.oas3_0Decorators), apiStyleguideConfig === null || apiStyleguideConfig === void 0 ? void 0 : apiStyleguideConfig.oas3_0Decorators), oas3_1Decorators: Object.assign(Object.assign({}, rootStyleguideConfig === null || rootStyleguideConfig === void 0 ? void 0 : rootStyleguideConfig.oas3_1Decorators), apiStyleguideConfig === null || apiStyleguideConfig === void 0 ? void 0 : apiStyleguideConfig.oas3_1Decorators), recommendedFallback: (apiStyleguideConfig === null || apiStyleguideConfig === void 0 ? void 0 : apiStyleguideConfig.extends)
+    const resultLint = {
+        ...rootStyleguideConfig,
+        ...(0, utils_1.pickDefined)(apiStyleguideConfig),
+        rules: { ...rootStyleguideConfig?.rules, ...apiStyleguideConfig?.rules },
+        oas2Rules: { ...rootStyleguideConfig?.oas2Rules, ...apiStyleguideConfig?.oas2Rules },
+        oas3_0Rules: { ...rootStyleguideConfig?.oas3_0Rules, ...apiStyleguideConfig?.oas3_0Rules },
+        oas3_1Rules: { ...rootStyleguideConfig?.oas3_1Rules, ...apiStyleguideConfig?.oas3_1Rules },
+        async2Rules: { ...rootStyleguideConfig?.async2Rules, ...apiStyleguideConfig?.async2Rules },
+        async3Rules: { ...rootStyleguideConfig?.async3Rules, ...apiStyleguideConfig?.async3Rules },
+        arazzoRules: { ...rootStyleguideConfig?.arazzoRules, ...apiStyleguideConfig?.arazzoRules },
+        preprocessors: {
+            ...rootStyleguideConfig?.preprocessors,
+            ...apiStyleguideConfig?.preprocessors,
+        },
+        oas2Preprocessors: {
+            ...rootStyleguideConfig?.oas2Preprocessors,
+            ...apiStyleguideConfig?.oas2Preprocessors,
+        },
+        oas3_0Preprocessors: {
+            ...rootStyleguideConfig?.oas3_0Preprocessors,
+            ...apiStyleguideConfig?.oas3_0Preprocessors,
+        },
+        oas3_1Preprocessors: {
+            ...rootStyleguideConfig?.oas3_1Preprocessors,
+            ...apiStyleguideConfig?.oas3_1Preprocessors,
+        },
+        decorators: { ...rootStyleguideConfig?.decorators, ...apiStyleguideConfig?.decorators },
+        oas2Decorators: {
+            ...rootStyleguideConfig?.oas2Decorators,
+            ...apiStyleguideConfig?.oas2Decorators,
+        },
+        oas3_0Decorators: {
+            ...rootStyleguideConfig?.oas3_0Decorators,
+            ...apiStyleguideConfig?.oas3_0Decorators,
+        },
+        oas3_1Decorators: {
+            ...rootStyleguideConfig?.oas3_1Decorators,
+            ...apiStyleguideConfig?.oas3_1Decorators,
+        },
+        recommendedFallback: apiStyleguideConfig?.extends
             ? false
-            : rootStyleguideConfig.recommendedFallback });
+            : rootStyleguideConfig.recommendedFallback,
+    };
     return resultLint;
 }
 function groupStyleguideAssertionRules({ rules, plugins, }) {
@@ -313,7 +351,10 @@ function groupStyleguideAssertionRules({ rules, plugins, }) {
                     registerCustomAssertions(plugins, context);
                 }
             }
-            assertions.push(Object.assign(Object.assign({}, assertion), { assertionId: ruleKey }));
+            assertions.push({
+                ...assertion,
+                assertionId: ruleKey,
+            });
         }
         else {
             // If it's not an assertion, keep it as is

package/lib/config/config.d.ts

@@ -1,5 +1,5 @@
 import { NormalizedProblem } from '../walk';
-import { SpecVersion, SpecMajorVersion, Oas2RuleSet, Oas3RuleSet, Async2RuleSet, ArazzoRuleSet } from '../oas-types';
+import { SpecVersion, SpecMajorVersion, Oas2RuleSet, Oas3RuleSet, Async3RuleSet, ArazzoRuleSet } from '../oas-types';
 import type { NodeType } from '../types';
 import type { DecoratorConfig, Plugin, PreprocessorConfig, Region, ResolveConfig, ResolvedApi, ResolvedConfig, ResolvedStyleguideConfig, RuleConfig, RuleSettings, Telemetry, ThemeRawConfig } from './types';
 export declare const IGNORE_FILE = ".redocly.lint-ignore.yaml";
@@ -31,7 +31,7 @@ export declare class StyleguideConfig {
         preprocessors: string[];
         decorators: string[];
     };
-    getRulesForOasVersion(version: SpecMajorVersion): Oas3RuleSet[] | Oas2RuleSet[] | Async2RuleSet[] | ArazzoRuleSet[];
+    getRulesForOasVersion(version: SpecMajorVersion): Oas3RuleSet[] | Oas2RuleSet[] | Async3RuleSet[] | ArazzoRuleSet[];
     skipRules(rules?: string[]): void;
     skipPreprocessors(preprocessors?: string[]): void;
     skipDecorators(decorators?: string[]): void;

package/lib/config/config.js

@@ -33,25 +33,28 @@ class StyleguideConfig {
         this.doNotResolveExamples = !!rawConfig.doNotResolveExamples;
         this.recommendedFallback = rawConfig.recommendedFallback || false;
         this.rules = {
-            [oas_types_1.SpecVersion.OAS2]: Object.assign(Object.assign({}, rawConfig.rules), rawConfig.oas2Rules),
-            [oas_types_1.SpecVersion.OAS3_0]: Object.assign(Object.assign({}, rawConfig.rules), rawConfig.oas3_0Rules),
-            [oas_types_1.SpecVersion.OAS3_1]: Object.assign(Object.assign({}, rawConfig.rules), rawConfig.oas3_1Rules),
-            [oas_types_1.SpecVersion.Async2]: Object.assign(Object.assign({}, rawConfig.rules), rawConfig.async2Rules),
-            [oas_types_1.SpecVersion.Arazzo]: Object.assign({}, rawConfig.arazzoRules),
+            [oas_types_1.SpecVersion.OAS2]: { ...rawConfig.rules, ...rawConfig.oas2Rules },
+            [oas_types_1.SpecVersion.OAS3_0]: { ...rawConfig.rules, ...rawConfig.oas3_0Rules },
+            [oas_types_1.SpecVersion.OAS3_1]: { ...rawConfig.rules, ...rawConfig.oas3_1Rules },
+            [oas_types_1.SpecVersion.Async2]: { ...rawConfig.rules, ...rawConfig.async2Rules },
+            [oas_types_1.SpecVersion.Async3]: { ...rawConfig.rules, ...rawConfig.async3Rules },
+            [oas_types_1.SpecVersion.Arazzo]: { ...rawConfig.arazzoRules },
         };
         this.preprocessors = {
-            [oas_types_1.SpecVersion.OAS2]: Object.assign(Object.assign({}, rawConfig.preprocessors), rawConfig.oas2Preprocessors),
-            [oas_types_1.SpecVersion.OAS3_0]: Object.assign(Object.assign({}, rawConfig.preprocessors), rawConfig.oas3_0Preprocessors),
-            [oas_types_1.SpecVersion.OAS3_1]: Object.assign(Object.assign({}, rawConfig.preprocessors), rawConfig.oas3_1Preprocessors),
-            [oas_types_1.SpecVersion.Async2]: Object.assign(Object.assign({}, rawConfig.preprocessors), rawConfig.async2Preprocessors),
-            [oas_types_1.SpecVersion.Arazzo]: Object.assign({}, rawConfig.arazzoPreprocessors),
+            [oas_types_1.SpecVersion.OAS2]: { ...rawConfig.preprocessors, ...rawConfig.oas2Preprocessors },
+            [oas_types_1.SpecVersion.OAS3_0]: { ...rawConfig.preprocessors, ...rawConfig.oas3_0Preprocessors },
+            [oas_types_1.SpecVersion.OAS3_1]: { ...rawConfig.preprocessors, ...rawConfig.oas3_1Preprocessors },
+            [oas_types_1.SpecVersion.Async2]: { ...rawConfig.preprocessors, ...rawConfig.async2Preprocessors },
+            [oas_types_1.SpecVersion.Async3]: { ...rawConfig.preprocessors, ...rawConfig.async3Preprocessors },
+            [oas_types_1.SpecVersion.Arazzo]: { ...rawConfig.arazzoPreprocessors },
         };
         this.decorators = {
-            [oas_types_1.SpecVersion.OAS2]: Object.assign(Object.assign({}, rawConfig.decorators), rawConfig.oas2Decorators),
-            [oas_types_1.SpecVersion.OAS3_0]: Object.assign(Object.assign({}, rawConfig.decorators), rawConfig.oas3_0Decorators),
-            [oas_types_1.SpecVersion.OAS3_1]: Object.assign(Object.assign({}, rawConfig.decorators), rawConfig.oas3_1Decorators),
-            [oas_types_1.SpecVersion.Async2]: Object.assign(Object.assign({}, rawConfig.decorators), rawConfig.async2Decorators),
-            [oas_types_1.SpecVersion.Arazzo]: Object.assign({}, rawConfig.arazzoDecorators),
+            [oas_types_1.SpecVersion.OAS2]: { ...rawConfig.decorators, ...rawConfig.oas2Decorators },
+            [oas_types_1.SpecVersion.OAS3_0]: { ...rawConfig.decorators, ...rawConfig.oas3_0Decorators },
+            [oas_types_1.SpecVersion.OAS3_1]: { ...rawConfig.decorators, ...rawConfig.oas3_1Decorators },
+            [oas_types_1.SpecVersion.Async2]: { ...rawConfig.decorators, ...rawConfig.async2Decorators },
+            [oas_types_1.SpecVersion.Async3]: { ...rawConfig.decorators, ...rawConfig.async3Decorators },
+            [oas_types_1.SpecVersion.Arazzo]: { ...rawConfig.arazzoDecorators },
         };
         this.extendPaths = rawConfig.extendPaths || [];
         this.pluginPaths = rawConfig.pluginPaths || [];
@@ -105,7 +108,11 @@ class StyleguideConfig {
         const ruleIgnore = fileIgnore[problem.ruleId];
         const ignored = ruleIgnore && ruleIgnore.has(loc.pointer);
         return ignored
-            ? Object.assign(Object.assign({}, problem), { ignored }) : problem;
+            ? {
+                ...problem,
+                ignored,
+            }
+            : problem;
     }
     extendTypes(types, version) {
         let extendedTypes = types;
@@ -128,6 +135,11 @@ class StyleguideConfig {
                             continue;
                         extendedTypes = plugin.typeExtension.async2(extendedTypes, version);
                         break;
+                    case oas_types_1.SpecVersion.Async3:
+                        if (!plugin.typeExtension.async3)
+                            continue;
+                        extendedTypes = plugin.typeExtension.async3(extendedTypes, version);
+                        break;
                     case oas_types_1.SpecVersion.Arazzo:
                         if (!plugin.typeExtension.arazzo)
                             continue;
@@ -150,7 +162,7 @@ class StyleguideConfig {
             };
         }
         else {
-            return Object.assign({ severity: 'error' }, settings);
+            return { severity: 'error', ...settings };
         }
     }
     getPreprocessorSettings(ruleId, oasVersion) {
@@ -163,7 +175,7 @@ class StyleguideConfig {
             };
         }
         else {
-            return Object.assign({ severity: 'error' }, settings);
+            return { severity: 'error', ...settings };
         }
     }
     getDecoratorSettings(ruleId, oasVersion) {
@@ -176,7 +188,7 @@ class StyleguideConfig {
             };
         }
         else {
-            return Object.assign({ severity: 'error' }, settings);
+            return { severity: 'error', ...settings };
         }
     }
     getUnusedRules() {
@@ -199,30 +211,37 @@ class StyleguideConfig {
             case oas_types_1.SpecMajorVersion.OAS3:
                 // eslint-disable-next-line no-case-declarations
                 const oas3Rules = []; // default ruleset
-                this.plugins.forEach((p) => { var _a; return ((_a = p.preprocessors) === null || _a === void 0 ? void 0 : _a.oas3) && oas3Rules.push(p.preprocessors.oas3); });
-                this.plugins.forEach((p) => { var _a; return ((_a = p.rules) === null || _a === void 0 ? void 0 : _a.oas3) && oas3Rules.push(p.rules.oas3); });
-                this.plugins.forEach((p) => { var _a; return ((_a = p.decorators) === null || _a === void 0 ? void 0 : _a.oas3) && oas3Rules.push(p.decorators.oas3); });
+                this.plugins.forEach((p) => p.preprocessors?.oas3 && oas3Rules.push(p.preprocessors.oas3));
+                this.plugins.forEach((p) => p.rules?.oas3 && oas3Rules.push(p.rules.oas3));
+                this.plugins.forEach((p) => p.decorators?.oas3 && oas3Rules.push(p.decorators.oas3));
                 return oas3Rules;
             case oas_types_1.SpecMajorVersion.OAS2:
                 // eslint-disable-next-line no-case-declarations
                 const oas2Rules = []; // default ruleset
-                this.plugins.forEach((p) => { var _a; return ((_a = p.preprocessors) === null || _a === void 0 ? void 0 : _a.oas2) && oas2Rules.push(p.preprocessors.oas2); });
-                this.plugins.forEach((p) => { var _a; return ((_a = p.rules) === null || _a === void 0 ? void 0 : _a.oas2) && oas2Rules.push(p.rules.oas2); });
-                this.plugins.forEach((p) => { var _a; return ((_a = p.decorators) === null || _a === void 0 ? void 0 : _a.oas2) && oas2Rules.push(p.decorators.oas2); });
+                this.plugins.forEach((p) => p.preprocessors?.oas2 && oas2Rules.push(p.preprocessors.oas2));
+                this.plugins.forEach((p) => p.rules?.oas2 && oas2Rules.push(p.rules.oas2));
+                this.plugins.forEach((p) => p.decorators?.oas2 && oas2Rules.push(p.decorators.oas2));
                 return oas2Rules;
             case oas_types_1.SpecMajorVersion.Async2:
                 // eslint-disable-next-line no-case-declarations
-                const asyncApiRules = []; // default ruleset
-                this.plugins.forEach((p) => { var _a; return ((_a = p.preprocessors) === null || _a === void 0 ? void 0 : _a.async2) && asyncApiRules.push(p.preprocessors.async2); });
-                this.plugins.forEach((p) => { var _a; return ((_a = p.rules) === null || _a === void 0 ? void 0 : _a.async2) && asyncApiRules.push(p.rules.async2); });
-                this.plugins.forEach((p) => { var _a; return ((_a = p.decorators) === null || _a === void 0 ? void 0 : _a.async2) && asyncApiRules.push(p.decorators.async2); });
-                return asyncApiRules;
+                const asyncApi2Rules = []; // default ruleset
+                this.plugins.forEach((p) => p.preprocessors?.async2 && asyncApi2Rules.push(p.preprocessors.async2));
+                this.plugins.forEach((p) => p.rules?.async2 && asyncApi2Rules.push(p.rules.async2));
+                this.plugins.forEach((p) => p.decorators?.async2 && asyncApi2Rules.push(p.decorators.async2));
+                return asyncApi2Rules;
+            case oas_types_1.SpecMajorVersion.Async3:
+                // eslint-disable-next-line no-case-declarations
+                const asyncApi3Rules = []; // default ruleset
+                this.plugins.forEach((p) => p.preprocessors?.async3 && asyncApi3Rules.push(p.preprocessors.async3));
+                this.plugins.forEach((p) => p.rules?.async3 && asyncApi3Rules.push(p.rules.async3));
+                this.plugins.forEach((p) => p.decorators?.async3 && asyncApi3Rules.push(p.decorators.async3));
+                return asyncApi3Rules;
             case oas_types_1.SpecMajorVersion.Arazzo:
                 // eslint-disable-next-line no-case-declarations
                 const arazzoRules = []; // default ruleset
-                this.plugins.forEach((p) => { var _a; return ((_a = p.preprocessors) === null || _a === void 0 ? void 0 : _a.arazzo) && arazzoRules.push(p.preprocessors.arazzo); });
-                this.plugins.forEach((p) => { var _a; return ((_a = p.rules) === null || _a === void 0 ? void 0 : _a.arazzo) && arazzoRules.push(p.rules.arazzo); });
-                this.plugins.forEach((p) => { var _a; return ((_a = p.decorators) === null || _a === void 0 ? void 0 : _a.arazzo) && arazzoRules.push(p.decorators.arazzo); });
+                this.plugins.forEach((p) => p.preprocessors?.arazzo && arazzoRules.push(p.preprocessors.arazzo));
+                this.plugins.forEach((p) => p.rules?.arazzo && arazzoRules.push(p.rules.arazzo));
+                this.plugins.forEach((p) => p.decorators?.arazzo && arazzoRules.push(p.decorators.arazzo));
                 return arazzoRules;
         }
     }
@@ -262,7 +281,7 @@ class Config {
         this.apis = rawConfig.apis || {};
         this.styleguide = new StyleguideConfig(rawConfig.styleguide || {}, configFile);
         this.theme = rawConfig.theme || {};
-        this.resolve = (0, utils_2.getResolveConfig)(rawConfig === null || rawConfig === void 0 ? void 0 : rawConfig.resolve);
+        this.resolve = (0, utils_2.getResolveConfig)(rawConfig?.resolve);
         this.region = rawConfig.region;
         this.organization = rawConfig.organization;
         this.files = rawConfig.files || [];

package/lib/config/load.d.ts

@@ -1,9 +1,8 @@
 import { Config } from './config';
 import { BaseResolver } from '../resolve';
-import type { Document } from '../resolve';
+import type { Document, ResolvedRefMap } from '../resolve';
 import type { RegionalTokenWithValidity } from '../redocly/redocly-client-types';
 import type { RawConfig, RawUniversalConfig, Region } from './types';
-import type { ResolvedRefMap } from '../resolve';
 export type RawConfigProcessor = (params: {
     document: Document;
     resolvedRefMap: ResolvedRefMap;