@redocly/openapi-core 1.0.0-beta.109 → 1.0.0-beta.111

package/README.md

@@ -10,7 +10,7 @@ See https://github.com/Redocly/redocly-cli
 import { formatProblems, lint, loadConfig } from '@redocly/openapi-core';
 
 const pathToApi = 'openapi.yaml';
-const config = loadConfig('optional/path/to/.redocly.yaml');
+const config = loadConfig({ configPath: 'optional/path/to/.redocly.yaml' });
 const lintResults = await lint({ ref: pathToApi, config });
 ```
 
@@ -20,6 +20,6 @@ const lintResults = await lint({ ref: pathToApi, config });
 import { formatProblems, bundle, loadConfig } from '@redocly/openapi-core';
 
 const pathToApi = 'openapi.yaml';
-const config = loadConfig('optional/path/to/.redocly.yaml');
+const config = loadConfig({ configPath: 'optional/path/to/.redocly.yaml' });
 const { bundle, problems } = await bundle({ ref: pathToApi, config });
 ```

package/lib/config/config-resolvers.js

@@ -23,20 +23,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolvePreset = exports.resolveStyleguideConfig = exports.resolveApis = exports.resolvePlugins = exports.resolveConfig = void 0;
 const path = require("path");
 const ref_utils_1 = require("../ref-utils");
+const utils_1 = require("../utils");
 const resolve_1 = require("../resolve");
 const builtIn_1 = require("./builtIn");
-const utils_1 = require("./utils");
+const utils_2 = require("./utils");
 const env_1 = require("../env");
-const utils_2 = require("../utils");
+const utils_3 = require("../utils");
 const config_1 = require("./config");
 const logger_1 = require("../logger");
+const asserts_1 = require("../rules/common/assertions/asserts");
 function resolveConfig(rawConfig, configPath) {
     var _a, _b, _c, _d, _e;
     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_2.isNotString)) {
+        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 = new resolve_1.BaseResolver(utils_1.getResolveConfig(rawConfig.resolve));
+        const resolver = new resolve_1.BaseResolver(utils_2.getResolveConfig(rawConfig.resolve));
         const configExtends = (_d = (_c = rawConfig === null || rawConfig === void 0 ? void 0 : rawConfig.styleguide) === null || _c === void 0 ? void 0 : _c.extends) !== null && _d !== void 0 ? _d : ['recommended'];
         const recommendedFallback = !((_e = rawConfig === null || rawConfig === void 0 ? void 0 : rawConfig.styleguide) === null || _e === void 0 ? void 0 : _e.extends);
         const styleguideConfig = Object.assign(Object.assign({}, rawConfig === null || rawConfig === void 0 ? void 0 : rawConfig.styleguide), { extends: configExtends, recommendedFallback });
@@ -60,11 +62,11 @@ function resolvePlugins(plugins, configPath = '') {
         return [];
     // TODO: implement or reuse Resolver approach so it will work in node and browser envs
     const requireFunc = (plugin) => {
-        if (env_1.isBrowser && utils_2.isString(plugin)) {
+        if (env_1.isBrowser && utils_3.isString(plugin)) {
             logger_1.logger.error(`Cannot load ${plugin}. Plugins aren't supported in browser yet.`);
             return undefined;
         }
-        if (utils_2.isString(plugin)) {
+        if (utils_3.isString(plugin)) {
             const absoltePluginPath = path.resolve(path.dirname(configPath), plugin);
             // eslint-disable-next-line @typescript-eslint/ban-ts-comment
             // @ts-ignore
@@ -79,7 +81,7 @@ function resolvePlugins(plugins, configPath = '') {
     const seenPluginIds = new Map();
     return plugins
         .map((p) => {
-        if (utils_2.isString(p) && ref_utils_1.isAbsoluteUrl(p)) {
+        if (utils_3.isString(p) && ref_utils_1.isAbsoluteUrl(p)) {
             throw new Error(logger_1.colorize.red(`We don't support remote plugins yet.`));
         }
         // TODO: resolve npm packages similar to eslint
@@ -103,10 +105,10 @@ function resolvePlugins(plugins, configPath = '') {
             }
             plugin.rules = {};
             if (pluginModule.rules.oas3) {
-                plugin.rules.oas3 = utils_1.prefixRules(pluginModule.rules.oas3, id);
+                plugin.rules.oas3 = utils_2.prefixRules(pluginModule.rules.oas3, id);
             }
             if (pluginModule.rules.oas2) {
-                plugin.rules.oas2 = utils_1.prefixRules(pluginModule.rules.oas2, id);
+                plugin.rules.oas2 = utils_2.prefixRules(pluginModule.rules.oas2, id);
             }
         }
         if (pluginModule.preprocessors) {
@@ -115,10 +117,10 @@ function resolvePlugins(plugins, configPath = '') {
             }
             plugin.preprocessors = {};
             if (pluginModule.preprocessors.oas3) {
-                plugin.preprocessors.oas3 = utils_1.prefixRules(pluginModule.preprocessors.oas3, id);
+                plugin.preprocessors.oas3 = utils_2.prefixRules(pluginModule.preprocessors.oas3, id);
             }
             if (pluginModule.preprocessors.oas2) {
-                plugin.preprocessors.oas2 = utils_1.prefixRules(pluginModule.preprocessors.oas2, id);
+                plugin.preprocessors.oas2 = utils_2.prefixRules(pluginModule.preprocessors.oas2, id);
             }
         }
         if (pluginModule.decorators) {
@@ -127,15 +129,18 @@ function resolvePlugins(plugins, configPath = '') {
             }
             plugin.decorators = {};
             if (pluginModule.decorators.oas3) {
-                plugin.decorators.oas3 = utils_1.prefixRules(pluginModule.decorators.oas3, id);
+                plugin.decorators.oas3 = utils_2.prefixRules(pluginModule.decorators.oas3, id);
             }
             if (pluginModule.decorators.oas2) {
-                plugin.decorators.oas2 = utils_1.prefixRules(pluginModule.decorators.oas2, id);
+                plugin.decorators.oas2 = utils_2.prefixRules(pluginModule.decorators.oas2, id);
             }
         }
+        if (pluginModule.assertions) {
+            plugin.assertions = pluginModule.assertions;
+        }
         return plugin;
     })
-        .filter(utils_2.isDefined);
+        .filter(utils_3.isDefined);
 }
 exports.resolvePlugins = resolvePlugins;
 function resolveApis({ rawConfig, configPath = '', resolver, }) {
@@ -144,7 +149,7 @@ function resolveApis({ rawConfig, configPath = '', resolver, }) {
         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_2.isNotString)) {
+            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);
@@ -165,8 +170,8 @@ function resolveAndMergeNestedStyleguideConfig({ styleguideConfig, configPath =
         if (parentConfigPaths.includes(configPath)) {
             throw new Error(`Circular dependency in config file: "${configPath}"`);
         }
-        const plugins = utils_1.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_2.isString).map((p) => path.resolve(path.dirname(configPath), p));
+        const plugins = 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 = ref_utils_1.isAbsoluteUrl(configPath)
             ? configPath
             : configPath && path.resolve(configPath);
@@ -186,24 +191,23 @@ function resolveAndMergeNestedStyleguideConfig({ styleguideConfig, configPath =
                 resolver: resolver,
             }, [...parentConfigPaths, resolvedConfigPath], extendPaths);
         }))) || []);
-        const _d = utils_1.mergeExtends([
+        const _d = 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 && !ref_utils_1.isAbsoluteUrl(path)), plugins: utils_1.getUniquePlugins(mergedPlugins), recommendedFallback: styleguideConfig === null || styleguideConfig === void 0 ? void 0 : styleguideConfig.recommendedFallback, doNotResolveExamples: styleguideConfig === null || styleguideConfig === void 0 ? void 0 : styleguideConfig.doNotResolveExamples });
+        return Object.assign(Object.assign({}, styleguide), { extendPaths: (_c = styleguide.extendPaths) === null || _c === void 0 ? void 0 : _c.filter((path) => path && !ref_utils_1.isAbsoluteUrl(path)), plugins: utils_2.getUniquePlugins(mergedPlugins), recommendedFallback: styleguideConfig === null || styleguideConfig === void 0 ? void 0 : styleguideConfig.recommendedFallback, doNotResolveExamples: styleguideConfig === null || styleguideConfig === void 0 ? void 0 : 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.rules) });
+        return Object.assign(Object.assign({}, resolvedStyleguideConfig), { rules: resolvedStyleguideConfig.rules && groupStyleguideAssertionRules(resolvedStyleguideConfig) });
     });
 }
 exports.resolveStyleguideConfig = resolveStyleguideConfig;
 function resolvePreset(presetName, plugins) {
     var _a;
-    const { pluginId, configName } = utils_1.parsePresetName(presetName);
+    const { pluginId, configName } = 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.`);
@@ -221,7 +225,7 @@ function loadExtendStyleguideConfig(filePath, resolver) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
             const fileSource = yield resolver.loadExternalRef(filePath);
-            const rawConfig = utils_1.transformConfig(utils_2.parseYaml(fileSource.body));
+            const rawConfig = utils_2.transformConfig(utils_3.parseYaml(fileSource.body));
             if (!rawConfig.styleguide) {
                 throw new Error(`Styleguide configuration format not detected: "${filePath}"`);
             }
@@ -233,12 +237,12 @@ function loadExtendStyleguideConfig(filePath, resolver) {
     });
 }
 function getMergedRawStyleguideConfig(rootStyleguideConfig, apiStyleguideConfig) {
-    const resultLint = Object.assign(Object.assign(Object.assign({}, rootStyleguideConfig), 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), 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 = Object.assign(Object.assign(Object.assign({}, rootStyleguideConfig), 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), 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)
             ? false
             : rootStyleguideConfig.recommendedFallback });
     return resultLint;
 }
-function groupStyleguideAssertionRules(rules) {
+function groupStyleguideAssertionRules({ rules, plugins, }) {
     if (!rules) {
         return rules;
     }
@@ -249,6 +253,21 @@ function groupStyleguideAssertionRules(rules) {
     for (const [ruleKey, rule] of Object.entries(rules)) {
         if (ruleKey.startsWith('assert/') && typeof rule === 'object' && rule !== null) {
             const assertion = rule;
+            if (plugins) {
+                for (const field of Object.keys(assertion)) {
+                    const [pluginId, fn] = field.split('/');
+                    if (!pluginId || !fn)
+                        continue;
+                    const plugin = plugins.find((plugin) => plugin.id === pluginId);
+                    if (!plugin) {
+                        throw Error(logger_1.colorize.red(`Plugin ${logger_1.colorize.blue(pluginId)} isn't found.`));
+                    }
+                    if (!plugin.assertions || !plugin.assertions[fn]) {
+                        throw Error(`Plugin ${logger_1.colorize.red(pluginId)} doesn't export assertions function with name ${logger_1.colorize.red(fn)}.`);
+                    }
+                    asserts_1.asserts[field] = asserts_1.buildAssertCustomFunction(plugin.assertions[fn]);
+                }
+            }
             assertions.push(Object.assign(Object.assign({}, assertion), { assertionId: ruleKey.replace('assert/', '') }));
         }
         else {

package/lib/config/config.d.ts

@@ -59,5 +59,6 @@ export declare class Config {
     'features.openapi': Record<string, any>;
     'features.mockServer'?: Record<string, any>;
     organization?: string;
+    files: string[];
     constructor(rawConfig: ResolvedConfig, configFile?: string | undefined);
 }

package/lib/config/config.js

@@ -249,6 +249,7 @@ class Config {
         this.resolve = utils_2.getResolveConfig(rawConfig === null || rawConfig === void 0 ? void 0 : rawConfig.resolve);
         this.region = rawConfig.region;
         this.organization = rawConfig.organization;
+        this.files = rawConfig.files || [];
     }
 }
 exports.Config = Config;

package/lib/config/load.d.ts

@@ -1,7 +1,13 @@
 import { Config } from './config';
-import type { RawConfig } from './types';
+import type { RawConfig, Region } from './types';
 import { RegionalTokenWithValidity } from '../redocly/redocly-client-types';
-export declare function loadConfig(configPath?: string | undefined, customExtends?: string[], processRawConfig?: (rawConfig: RawConfig) => void | Promise<void>): Promise<Config>;
+export declare function loadConfig(options?: {
+    configPath?: string;
+    customExtends?: string[];
+    processRawConfig?: (rawConfig: RawConfig) => void | Promise<void>;
+    files?: string[];
+    region?: Region;
+}): Promise<Config>;
 export declare const CONFIG_FILE_NAMES: string[];
 export declare function findConfig(dir?: string): string | undefined;
 export declare function getConfig(configPath?: string | undefined): Promise<RawConfig>;

package/lib/config/load.js

@@ -59,9 +59,11 @@ function addConfigMetadata({ rawConfig, customExtends, configPath, tokens, }) {
         return config_resolvers_1.resolveConfig(rawConfig, configPath);
     });
 }
-function loadConfig(configPath = findConfig(), customExtends, processRawConfig) {
+function loadConfig(options = {}) {
     return __awaiter(this, void 0, void 0, function* () {
-        const rawConfig = yield getConfig(configPath);
+        const { configPath = findConfig(), customExtends, processRawConfig, files, region } = options;
+        const config = yield getConfig(configPath);
+        const rawConfig = Object.assign(Object.assign({}, config), { files: files !== null && files !== void 0 ? files : config.files, region: region !== null && region !== void 0 ? region : config.region });
         if (typeof processRawConfig === 'function') {
             yield processRawConfig(rawConfig);
         }

package/lib/config/types.d.ts

@@ -1,6 +1,7 @@
 import type { ProblemSeverity } from '../walk';
 import type { Oas3PreprocessorsSet, OasMajorVersion, Oas3DecoratorsSet, Oas2RuleSet, Oas2PreprocessorsSet, Oas2DecoratorsSet, Oas3RuleSet, OasVersion } from '../oas-types';
 import type { NodeType } from '../types';
+import { Location } from '../ref-utils';
 export declare type RuleSeverity = ProblemSeverity | 'off';
 export declare type PreprocessorSeverity = RuleSeverity | 'on';
 export declare type RuleConfig = RuleSeverity | ({
@@ -50,6 +51,12 @@ export declare type CustomRulesConfig = {
     oas3?: Oas3RuleSet;
     oas2?: Oas2RuleSet;
 };
+export declare type AssertResult = {
+    message?: string;
+    location?: Location;
+};
+export declare type CustomFunction = (value: any, options: unknown, baseLocation: Location) => AssertResult[];
+export declare type AssertionsConfig = Record<string, CustomFunction>;
 export declare type Plugin = {
     id: string;
     configs?: Record<string, PluginStyleguideConfig>;
@@ -57,6 +64,7 @@ export declare type Plugin = {
     preprocessors?: PreprocessorsConfig;
     decorators?: DecoratorsConfig;
     typeExtension?: TypeExtensionsConfig;
+    assertions?: AssertionsConfig;
 };
 export declare type PluginStyleguideConfig = Omit<StyleguideRawConfig, 'plugins' | 'extends'>;
 export declare type ResolveHeader = {
@@ -101,6 +109,7 @@ export declare type DeprecatedInApi = {
 };
 export declare type ResolvedApi = Omit<Api, 'styleguide'> & {
     styleguide: ResolvedStyleguideConfig;
+    files?: string[];
 };
 export declare type RawConfig = {
     apis?: Record<string, Api>;
@@ -108,6 +117,7 @@ export declare type RawConfig = {
     resolve?: RawResolveConfig;
     region?: Region;
     organization?: string;
+    files?: string[];
 } & FeaturesConfig;
 export declare type FlatApi = Omit<Api, 'styleguide'> & Omit<ApiStyleguideRawConfig, 'doNotResolveExamples'>;
 export declare type FlatRawConfig = Omit<RawConfig, 'styleguide' | 'resolve' | 'apis'> & Omit<StyleguideRawConfig, 'doNotResolveExamples'> & {

package/lib/config/utils.js

@@ -139,7 +139,7 @@ function mergeExtends(rulesConfList) {
 }
 exports.mergeExtends = mergeExtends;
 function getMergedConfig(config, apiName) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     const extendPaths = [
         ...Object.values(config.apis).map((api) => { var _a; return (_a = api === null || api === void 0 ? void 0 : api.styleguide) === null || _a === void 0 ? void 0 : _a.extendPaths; }),
         (_b = (_a = config.rawConfig) === null || _a === void 0 ? void 0 : _a.styleguide) === null || _b === void 0 ? void 0 : _b.extendPaths,
@@ -156,7 +156,7 @@ function getMergedConfig(config, apiName) {
         ? new config_1.Config(Object.assign(Object.assign({}, config.rawConfig), { styleguide: Object.assign(Object.assign({}, (config.apis[apiName]
                 ? config.apis[apiName].styleguide
                 : config.rawConfig.styleguide)), { extendPaths,
-                pluginPaths }), 'features.openapi': Object.assign(Object.assign({}, config['features.openapi']), (_e = config.apis[apiName]) === null || _e === void 0 ? void 0 : _e['features.openapi']), 'features.mockServer': Object.assign(Object.assign({}, config['features.mockServer']), (_f = config.apis[apiName]) === null || _f === void 0 ? void 0 : _f['features.mockServer']) }), config.configFile)
+                pluginPaths }), 'features.openapi': Object.assign(Object.assign({}, config['features.openapi']), (_e = config.apis[apiName]) === null || _e === void 0 ? void 0 : _e['features.openapi']), 'features.mockServer': Object.assign(Object.assign({}, config['features.mockServer']), (_f = config.apis[apiName]) === null || _f === void 0 ? void 0 : _f['features.mockServer']), files: [...config.files, ...((_j = (_h = (_g = config.apis) === null || _g === void 0 ? void 0 : _g[apiName]) === null || _h === void 0 ? void 0 : _h.files) !== null && _j !== void 0 ? _j : [])] }), config.configFile)
         : config;
 }
 exports.getMergedConfig = getMergedConfig;

package/lib/rules/ajv.d.ts

@@ -1,4 +1,4 @@
-import { ErrorObject } from '@redocly/ajv';
+import { ErrorObject } from '@redocly/ajv/dist/2020';
 import { Location } from '../ref-utils';
 import { ResolveFn } from '../walk';
 export declare function releaseAjvInstance(): void;

package/lib/rules/ajv.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateJsonSchema = exports.releaseAjvInstance = void 0;
-const ajv_1 = require("@redocly/ajv");
+const _2020_1 = require("@redocly/ajv/dist/2020");
 const ref_utils_1 = require("../ref-utils");
 let ajvInstance = null;
 function releaseAjvInstance() {
@@ -10,7 +10,7 @@ function releaseAjvInstance() {
 exports.releaseAjvInstance = releaseAjvInstance;
 function getAjv(resolve, allowAdditionalProperties) {
     if (!ajvInstance) {
-        ajvInstance = new ajv_1.default({
+        ajvInstance = new _2020_1.default({
             schemaId: '$id',
             meta: true,
             allErrors: true,
@@ -20,7 +20,7 @@ function getAjv(resolve, allowAdditionalProperties) {
             discriminator: true,
             allowUnionTypes: true,
             validateFormats: false,
-            defaultAdditionalProperties: allowAdditionalProperties,
+            defaultUnevaluatedProperties: allowAdditionalProperties,
             loadSchemaSync(base, $ref) {
                 const resolvedRef = resolve({ $ref }, base.split('#')[0]);
                 if (!resolvedRef || !resolvedRef.location)
@@ -68,8 +68,8 @@ function validateJsonSchema(data, schema, schemaLoc, instancePath, resolve, allo
         if (propName) {
             message = `\`${propName}\` property ${message}`;
         }
-        if (error.keyword === 'additionalProperties') {
-            const property = error.params.additionalProperty;
+        if (error.keyword === 'additionalProperties' || error.keyword === 'unevaluatedProperties') {
+            const property = error.params.additionalProperty || error.params.unevaluatedProperty;
             message = `${message} \`${property}\``;
             error.instancePath += '/' + ref_utils_1.escapePointer(property);
         }

package/lib/rules/common/assertions/asserts.d.ts

@@ -1,10 +1,8 @@
+import { AssertResult, CustomFunction } from 'core/src/config/types';
 import { Location } from '../../../ref-utils';
-declare type AssertResult = {
-    isValid: boolean;
-    location?: Location;
-};
-declare type Asserts = Record<string, (value: any, condition: any, baseLocation: Location, rawValue?: any) => AssertResult>;
+declare type Asserts = Record<string, (value: any, condition: any, baseLocation: Location, rawValue?: any) => AssertResult[]>;
 export declare const runOnKeysSet: Set<string>;
 export declare const runOnValuesSet: Set<string>;
 export declare const asserts: Asserts;
+export declare function buildAssertCustomFunction(fn: CustomFunction): (value: string[], options: any, baseLocation: Location) => any;
 export {};