@redocly/openapi-core 1.18.1 → 1.20.0

package/lib/config/config-resolvers.js

@@ -1,99 +1,101 @@
 "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 fs_1 = require("fs");
 const ref_utils_1 = require("../ref-utils");
 const utils_1 = require("../utils");
 const resolve_1 = require("../resolve");
 const builtIn_1 = require("./builtIn");
 const utils_2 = require("./utils");
 const env_1 = require("../env");
-const utils_3 = require("../utils");
 const config_1 = require("./config");
 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 };
+const DEFAULT_PROJECT_PLUGIN_PATHS = ['@theme/plugin.js', '@theme/plugin.cjs', '@theme/plugin.mjs'];
+// Workaround for dynamic imports being transpiled to require by Typescript: https://github.com/microsoft/TypeScript/issues/43329#issuecomment-811606238
+const _importDynamic = new Function('modulePath', 'return import(modulePath)');
+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_1.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 = '') {
+function getDefaultPluginPath(configPath) {
+    for (const pluginPath of DEFAULT_PROJECT_PLUGIN_PATHS) {
+        const absolutePluginPath = path.resolve(path.dirname(configPath), pluginPath);
+        if ((0, fs_1.existsSync)(absolutePluginPath)) {
+            return pluginPath;
+        }
+    }
+    return undefined;
+}
+async function resolvePlugins(plugins, configPath = '') {
     if (!plugins)
         return [];
     // TODO: implement or reuse Resolver approach so it will work in node and browser envs
-    const requireFunc = (plugin) => {
-        if (env_1.isBrowser && (0, utils_3.isString)(plugin)) {
+    const requireFunc = async (plugin) => {
+        if (env_1.isBrowser && (0, utils_1.isString)(plugin)) {
             logger_1.logger.error(`Cannot load ${plugin}. Plugins aren't supported in browser yet.`);
             return undefined;
         }
-        if ((0, utils_3.isString)(plugin)) {
+        if ((0, utils_1.isString)(plugin)) {
             try {
-                const absoltePluginPath = path.resolve(path.dirname(configPath), plugin);
+                const maybeAbsolutePluginPath = path.resolve(path.dirname(configPath), plugin);
+                const absolutePluginPath = (0, fs_1.existsSync)(maybeAbsolutePluginPath)
+                    ? maybeAbsolutePluginPath
+                    : // For plugins imported from packages specifically
+                        require.resolve(plugin);
                 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
                 // @ts-ignore
-                return typeof __webpack_require__ === 'function'
-                    ? // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-                        // @ts-ignore
-                        __non_webpack_require__(absoltePluginPath)
-                    : require(absoltePluginPath);
+                if (typeof __webpack_require__ === 'function') {
+                    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+                    // @ts-ignore
+                    return __non_webpack_require__(absolutePluginPath);
+                }
+                else {
+                    // you can import both cjs and mjs
+                    const mod = await _importDynamic(absolutePluginPath);
+                    return mod.default || mod;
+                }
             }
             catch (e) {
                 if (e instanceof SyntaxError) {
@@ -105,16 +107,37 @@ function resolvePlugins(plugins, configPath = '') {
         return plugin;
     };
     const seenPluginIds = new Map();
-    return plugins
-        .map((p) => {
-        if ((0, utils_3.isString)(p) && (0, ref_utils_1.isAbsoluteUrl)(p)) {
-            throw new Error(logger_1.colorize.red(`We don't support remote plugins yet.`));
+    /**
+     * Include the default plugin automatically if it's not in configuration
+     */
+    const defaultPluginPath = getDefaultPluginPath(configPath);
+    if (defaultPluginPath) {
+        plugins.push(defaultPluginPath);
+    }
+    const resolvedPlugins = new Set();
+    const instances = await Promise.all(plugins.map(async (p) => {
+        if ((0, utils_1.isString)(p)) {
+            if ((0, ref_utils_1.isAbsoluteUrl)(p)) {
+                throw new Error(logger_1.colorize.red(`We don't support remote plugins yet.`));
+            }
+            if (resolvedPlugins.has(p)) {
+                return;
+            }
+            resolvedPlugins.add(p);
         }
-        // TODO: resolve npm packages similar to eslint
-        const pluginModule = requireFunc(p);
+        const requiredPlugin = await requireFunc(p);
+        const pluginCreatorOptions = { contentDir: path.dirname(configPath) };
+        const pluginModule = (0, utils_2.isDeprecatedPluginFormat)(requiredPlugin)
+            ? requiredPlugin
+            : (0, utils_2.isCommonJsPlugin)(requiredPlugin)
+                ? await requiredPlugin(pluginCreatorOptions)
+                : await requiredPlugin?.default?.(pluginCreatorOptions);
         if (!pluginModule) {
             return;
         }
+        if ((0, utils_1.isString)(p) && pluginModule.id && (0, utils_2.isDeprecatedPluginFormat)(requiredPlugin)) {
+            logger_1.logger.info(`Deprecated plugin format detected: ${pluginModule.id}\n`);
+        }
         const id = pluginModule.id;
         if (typeof id !== 'string') {
             throw new Error(logger_1.colorize.red(`Plugin must define \`id\` property in ${logger_1.colorize.blue(p.toString())}.`));
@@ -124,10 +147,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 +166,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 +177,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 +191,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 +202,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 +216,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);
             }
@@ -189,80 +227,85 @@ function resolvePlugins(plugins, configPath = '') {
             plugin.assertions = pluginModule.assertions;
         }
         return plugin;
-    })
-        .filter(utils_3.isDefined);
+    }));
+    return instances.filter(utils_1.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_1.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)(await resolvePlugins([...(styleguideConfig?.plugins || []), builtIn_1.defaultPlugin], configPath));
+    const pluginPaths = styleguideConfig?.plugins
+        ?.filter(utils_1.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 +313,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;
-        }
-        catch (error) {
-            throw new Error(`Failed to load "${filePath}": ${error.message}`);
+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}"`);
         }
-    });
+        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 +393,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
@@ -326,7 +409,7 @@ function groupStyleguideAssertionRules({ rules, plugins, }) {
     return transformedRules;
 }
 function registerCustomAssertions(plugins, assertion) {
-    for (const field of (0, utils_3.keysOf)(assertion.assertions)) {
+    for (const field of (0, utils_1.keysOf)(assertion.assertions)) {
         const [pluginId, fn] = field.split('/');
         if (!pluginId || !fn)
             continue;

package/lib/config/config.d.ts

@@ -1,5 +1,6 @@
-import { NormalizedProblem } from '../walk';
-import { SpecVersion, SpecMajorVersion, Oas2RuleSet, Oas3RuleSet, Async2RuleSet, ArazzoRuleSet } from '../oas-types';
+import { SpecVersion, SpecMajorVersion } from '../oas-types';
+import type { NormalizedProblem } from '../walk';
+import type { 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 +32,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;