@redocly/openapi-core 1.0.0-beta.119 → 1.0.0-beta.121

package/lib/config/config.d.ts

@@ -1,7 +1,7 @@
 import { NormalizedProblem } from '../walk';
 import { OasVersion, OasMajorVersion, Oas2RuleSet, Oas3RuleSet } from '../oas-types';
 import type { NodeType } from '../types';
-import type { DecoratorConfig, Plugin, PreprocessorConfig, Region, ResolveConfig, ResolvedApi, ResolvedConfig, ResolvedStyleguideConfig, RuleConfig, RuleSettings } from './types';
+import type { DecoratorConfig, Plugin, PreprocessorConfig, Region, ResolveConfig, ResolvedApi, ResolvedConfig, ResolvedStyleguideConfig, RuleConfig, RuleSettings, ThemeRawConfig } from './types';
 export declare const IGNORE_FILE = ".redocly.lint-ignore.yaml";
 export declare const DEFAULT_REGION = "us";
 export declare const DOMAINS: {
@@ -50,8 +50,7 @@ export declare class Config {
     resolve: ResolveConfig;
     licenseKey?: string;
     region?: Region;
-    'features.openapi': Record<string, any>;
-    'features.mockServer'?: Record<string, any>;
+    theme: ThemeRawConfig;
     organization?: string;
     files: string[];
     constructor(rawConfig: ResolvedConfig, configFile?: string | undefined);

package/lib/config/config.js

@@ -244,8 +244,7 @@ class Config {
         this.configFile = configFile;
         this.apis = rawConfig.apis || {};
         this.styleguide = new StyleguideConfig(rawConfig.styleguide || {}, configFile);
-        this['features.openapi'] = rawConfig['features.openapi'] || {};
-        this['features.mockServer'] = rawConfig['features.mockServer'] || {};
+        this.theme = rawConfig.theme || {};
         this.resolve = utils_2.getResolveConfig(rawConfig === null || rawConfig === void 0 ? void 0 : rawConfig.resolve);
         this.region = rawConfig.region;
         this.organization = rawConfig.organization;

package/lib/config/types.d.ts

@@ -102,14 +102,14 @@ export declare type DeprecatedInRawConfig = {
     styleguide?: StyleguideRawConfig;
     referenceDocs?: Record<string, any>;
     apis?: Record<string, Api & DeprecatedInApi>;
-};
+} & DeprecatedFeaturesConfig;
 export declare type Api = {
     root: string;
     styleguide?: ApiStyleguideRawConfig;
-} & FeaturesConfig;
+} & ThemeConfig;
 export declare type DeprecatedInApi = {
     lint?: ApiStyleguideRawConfig;
-};
+} & DeprecatedFeaturesConfig;
 export declare type ResolvedApi = Omit<Api, 'styleguide'> & {
     styleguide: ResolvedStyleguideConfig;
     files?: string[];
@@ -121,19 +121,26 @@ export declare type RawConfig = {
     region?: Region;
     organization?: string;
     files?: string[];
-} & FeaturesConfig;
+} & ThemeConfig;
 export declare type FlatApi = Omit<Api, 'styleguide'> & Omit<ApiStyleguideRawConfig, 'doNotResolveExamples'>;
 export declare type FlatRawConfig = Omit<RawConfig, 'styleguide' | 'resolve' | 'apis'> & Omit<StyleguideRawConfig, 'doNotResolveExamples'> & {
     resolve?: RawResolveConfig;
     apis?: Record<string, FlatApi>;
-};
+} & ThemeRawConfig;
 export declare type ResolvedConfig = Omit<RawConfig, 'apis' | 'styleguide'> & {
     apis: Record<string, ResolvedApi>;
     styleguide: ResolvedStyleguideConfig;
 };
-declare type FeaturesConfig = {
+declare type DeprecatedFeaturesConfig = {
     'features.openapi'?: Record<string, any>;
     'features.mockServer'?: Record<string, any>;
 };
+export declare type ThemeConfig = {
+    theme?: ThemeRawConfig;
+};
+export declare type ThemeRawConfig = {
+    openapi?: Record<string, any>;
+    mockServer?: Record<string, any>;
+};
 export declare type RulesFields = 'rules' | 'oas2Rules' | 'oas3_0Rules' | 'oas3_1Rules' | 'preprocessors' | 'oas2Preprocessors' | 'oas3_0Preprocessors' | 'oas3_1Preprocessors' | 'decorators' | 'oas2Decorators' | 'oas3_0Decorators' | 'oas3_1Decorators';
 export {};

package/lib/config/utils.d.ts

@@ -8,6 +8,7 @@ export declare function transformApiDefinitionsToApis(apiDefinitions?: Deprecate
 export declare function prefixRules<T extends Record<string, any>>(rules: T, prefix: string): any;
 export declare function mergeExtends(rulesConfList: ResolvedStyleguideConfig[]): Omit<ResolvedStyleguideConfig, RulesFields> & Required<Pick<ResolvedStyleguideConfig, RulesFields>>;
 export declare function getMergedConfig(config: Config, apiName?: string): Config;
+export declare function checkForDeprecatedFields(deprecatedField: keyof (DeprecatedInRawConfig & RawConfig), updatedField: keyof FlatRawConfig | undefined, rawConfig: DeprecatedInRawConfig & RawConfig & FlatRawConfig, updatedObject: keyof FlatRawConfig | undefined): void;
 export declare function transformConfig(rawConfig: DeprecatedInRawConfig & RawConfig & FlatRawConfig): RawConfig;
 export declare function getResolveConfig(resolve?: RawResolveConfig): ResolveConfig;
 export declare function getUniquePlugins(plugins: Plugin[]): Plugin[];

package/lib/config/utils.js

@@ -11,7 +11,7 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUniquePlugins = exports.getResolveConfig = exports.transformConfig = exports.getMergedConfig = exports.mergeExtends = exports.prefixRules = exports.transformApiDefinitionsToApis = exports.parsePresetName = void 0;
+exports.getUniquePlugins = exports.getResolveConfig = exports.transformConfig = exports.checkForDeprecatedFields = exports.getMergedConfig = exports.mergeExtends = exports.prefixRules = exports.transformApiDefinitionsToApis = exports.parsePresetName = void 0;
 const utils_1 = require("../utils");
 const config_1 = require("./config");
 const logger_1 = require("../logger");
@@ -139,7 +139,7 @@ function mergeExtends(rulesConfList) {
 }
 exports.mergeExtends = mergeExtends;
 function getMergedConfig(config, apiName) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     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,11 +156,11 @@ 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']), 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)
+                pluginPaths }), theme: Object.assign(Object.assign({}, config.rawConfig.theme), (_e = config.apis[apiName]) === null || _e === void 0 ? void 0 : _e.theme), files: [...config.files, ...((_h = (_g = (_f = config.apis) === null || _f === void 0 ? void 0 : _f[apiName]) === null || _g === void 0 ? void 0 : _g.files) !== null && _h !== void 0 ? _h : [])] }), config.configFile)
         : config;
 }
 exports.getMergedConfig = getMergedConfig;
-function checkForDeprecatedFields(deprecatedField, updatedField, rawConfig) {
+function checkForDeprecatedFields(deprecatedField, updatedField, rawConfig, updatedObject) {
     const isDeprecatedFieldInApis = rawConfig.apis &&
         Object.values(rawConfig.apis).some((api) => api[deprecatedField]);
     if (rawConfig[deprecatedField] && updatedField === null) {
@@ -169,23 +169,32 @@ function checkForDeprecatedFields(deprecatedField, updatedField, rawConfig) {
     if (rawConfig[deprecatedField] && updatedField && rawConfig[updatedField]) {
         utils_1.showErrorForDeprecatedField(deprecatedField, updatedField);
     }
+    if (rawConfig[deprecatedField] && updatedObject && rawConfig[updatedObject]) {
+        utils_1.showErrorForDeprecatedField(deprecatedField, updatedField, updatedObject);
+    }
     if (rawConfig[deprecatedField] || isDeprecatedFieldInApis) {
-        utils_1.showWarningForDeprecatedField(deprecatedField, updatedField);
+        utils_1.showWarningForDeprecatedField(deprecatedField, updatedField, updatedObject);
     }
 }
+exports.checkForDeprecatedFields = checkForDeprecatedFields;
 function transformConfig(rawConfig) {
+    var _a, _b;
     const migratedFields = [
-        ['apiDefinitions', 'apis'],
-        ['referenceDocs', 'features.openapi'],
-        ['lint', undefined],
-        ['styleguide', undefined],
+        ['apiDefinitions', 'apis', undefined],
+        ['referenceDocs', 'openapi', 'theme'],
+        ['lint', undefined, undefined],
+        ['styleguide', undefined, undefined],
+        ['features.openapi', 'openapi', 'theme'],
     ];
-    for (const [deprecatedField, updatedField] of migratedFields) {
-        checkForDeprecatedFields(deprecatedField, updatedField, rawConfig);
+    for (const [deprecatedField, updatedField, updatedObject] of migratedFields) {
+        checkForDeprecatedFields(deprecatedField, updatedField, rawConfig, updatedObject);
     }
     const { apis, apiDefinitions, referenceDocs, lint } = rawConfig, rest = __rest(rawConfig, ["apis", "apiDefinitions", "referenceDocs", "lint"]);
     const { styleguideConfig, rawConfigRest } = extractFlatConfig(rest);
-    return Object.assign({ 'features.openapi': referenceDocs, apis: transformApis(apis) || transformApiDefinitionsToApis(apiDefinitions), styleguide: styleguideConfig || lint }, rawConfigRest);
+    return Object.assign({ theme: {
+            openapi: Object.assign(Object.assign(Object.assign({}, referenceDocs), rawConfig['features.openapi']), (_a = rawConfig.theme) === null || _a === void 0 ? void 0 : _a.openapi),
+            mockServer: Object.assign(Object.assign({}, rawConfig['features.mockServer']), (_b = rawConfig.theme) === null || _b === void 0 ? void 0 : _b.mockServer),
+        }, apis: transformApis(apis) || transformApiDefinitionsToApis(apiDefinitions), styleguide: styleguideConfig || lint }, rawConfigRest);
 }
 exports.transformConfig = transformConfig;
 function getResolveConfig(resolve) {

package/lib/decorators/common/info-override.d.ts

@@ -0,0 +1,2 @@
+import { Oas3Decorator, Oas2Decorator } from '../../visitors';
+export declare const InfoOverride: Oas3Decorator | Oas2Decorator;

package/lib/decorators/common/info-override.js

@@ -0,0 +1,28 @@
+"use strict";
+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.InfoOverride = void 0;
+const InfoOverride = (newInfo) => {
+    return {
+        Info: {
+            leave(info) {
+                if (typeof newInfo !== 'object' || Array.isArray(newInfo) || newInfo === null) {
+                    throw new Error(`"info-override" decorator should be called with an object`);
+                }
+                const { severity: _ } = newInfo, rest = __rest(newInfo, ["severity"]);
+                Object.assign(info, rest);
+            },
+        },
+    };
+};
+exports.InfoOverride = InfoOverride;

package/lib/decorators/oas2/index.d.ts

@@ -4,6 +4,7 @@ export declare const decorators: {
     'operation-description-override': Oas2Decorator;
     'tag-description-override': Oas2Decorator;
     'info-description-override': Oas2Decorator;
+    'info-override': Oas2Decorator;
     'remove-x-internal': Oas2Decorator;
     'filter-in': Oas2Decorator;
     'filter-out': Oas2Decorator;

package/lib/decorators/oas2/index.js

@@ -5,6 +5,7 @@ const registry_dependencies_1 = require("../common/registry-dependencies");
 const operation_description_override_1 = require("../common/operation-description-override");
 const tag_description_override_1 = require("../common/tag-description-override");
 const info_description_override_1 = require("../common/info-description-override");
+const info_override_1 = require("../common/info-override");
 const remove_x_internal_1 = require("../common/remove-x-internal");
 const filter_in_1 = require("../common/filters/filter-in");
 const filter_out_1 = require("../common/filters/filter-out");
@@ -13,6 +14,7 @@ exports.decorators = {
     'operation-description-override': operation_description_override_1.OperationDescriptionOverride,
     'tag-description-override': tag_description_override_1.TagDescriptionOverride,
     'info-description-override': info_description_override_1.InfoDescriptionOverride,
+    'info-override': info_override_1.InfoOverride,
     'remove-x-internal': remove_x_internal_1.RemoveXInternal,
     'filter-in': filter_in_1.FilterIn,
     'filter-out': filter_out_1.FilterOut,

package/lib/decorators/oas3/index.d.ts

@@ -4,6 +4,7 @@ export declare const decorators: {
     'operation-description-override': Oas3Decorator;
     'tag-description-override': Oas3Decorator;
     'info-description-override': Oas3Decorator;
+    'info-override': Oas3Decorator;
     'remove-x-internal': Oas3Decorator;
     'filter-in': Oas3Decorator;
     'filter-out': Oas3Decorator;

package/lib/decorators/oas3/index.js

@@ -5,6 +5,7 @@ const registry_dependencies_1 = require("../common/registry-dependencies");
 const operation_description_override_1 = require("../common/operation-description-override");
 const tag_description_override_1 = require("../common/tag-description-override");
 const info_description_override_1 = require("../common/info-description-override");
+const info_override_1 = require("../common/info-override");
 const remove_x_internal_1 = require("../common/remove-x-internal");
 const filter_in_1 = require("../common/filters/filter-in");
 const filter_out_1 = require("../common/filters/filter-out");
@@ -14,6 +15,7 @@ exports.decorators = {
     'operation-description-override': operation_description_override_1.OperationDescriptionOverride,
     'tag-description-override': tag_description_override_1.TagDescriptionOverride,
     'info-description-override': info_description_override_1.InfoDescriptionOverride,
+    'info-override': info_override_1.InfoOverride,
     'remove-x-internal': remove_x_internal_1.RemoveXInternal,
     'filter-in': filter_in_1.FilterIn,
     'filter-out': filter_out_1.FilterOut,

package/lib/resolve.js

@@ -221,7 +221,9 @@ function resolveDocument(opts) {
                         propType = propType(propValue, propName);
                     if (propType === undefined)
                         propType = unknownType;
-                    if (type.extensionsPrefix && propName.startsWith(type.extensionsPrefix)) {
+                    if (type.extensionsPrefix &&
+                        propName.startsWith(type.extensionsPrefix) &&
+                        propType === unknownType) {
                         propType = types_1.SpecExtension;
                     }
                     if (!types_1.isNamedType(propType) && (propType === null || propType === void 0 ? void 0 : propType.directResolveAs)) {

package/lib/rules/common/operation-2xx-response.js

@@ -1,16 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Operation2xxResponse = void 0;
-const Operation2xxResponse = () => {
+const utils_1 = require("../utils");
+const Operation2xxResponse = ({ validateWebhooks }) => {
     return {
-        Responses(responses, { report }) {
-            const codes = Object.keys(responses || {});
-            if (!codes.some((code) => code === 'default' || /2[Xx0-9]{2}/.test(code))) {
-                report({
-                    message: 'Operation must have at least one `2XX` response.',
-                    location: { reportOnKey: true },
-                });
-            }
+        Paths: {
+            Responses(responses, { report }) {
+                const codes = Object.keys(responses || {});
+                utils_1.validateResponseCodes(codes, '2XX', { report });
+            },
+        },
+        WebhooksMap: {
+            Responses(responses, { report }) {
+                if (!validateWebhooks)
+                    return;
+                const codes = Object.keys(responses || {});
+                utils_1.validateResponseCodes(codes, '2XX', { report });
+            },
         },
     };
 };

package/lib/rules/common/operation-4xx-response.js

@@ -1,16 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Operation4xxResponse = void 0;
-const Operation4xxResponse = () => {
+const utils_1 = require("../utils");
+const Operation4xxResponse = ({ validateWebhooks }) => {
     return {
-        Responses(responses, { report }) {
-            const codes = Object.keys(responses || {});
-            if (!codes.some((code) => /4[Xx0-9]{2}/.test(code))) {
-                report({
-                    message: 'Operation must have at least one `4XX` response.',
-                    location: { reportOnKey: true },
-                });
-            }
+        Paths: {
+            Responses(responses, { report }) {
+                const codes = Object.keys(responses || {});
+                utils_1.validateResponseCodes(codes, '4XX', { report });
+            },
+        },
+        WebhooksMap: {
+            Responses(responses, { report }) {
+                if (!validateWebhooks)
+                    return;
+                const codes = Object.keys(responses || {});
+                utils_1.validateResponseCodes(codes, '4XX', { report });
+            },
         },
     };
 };

package/lib/rules/utils.d.ts

@@ -17,3 +17,4 @@ export declare function getSuggest(given: string, variants: string[]): string[];
 export declare function validateExample(example: any, schema: Referenced<Oas3Schema>, dataLoc: Location, { resolve, location, report }: UserContext, allowAdditionalProperties: boolean): void;
 export declare function getAdditionalPropertiesOption(opts: Record<string, any>): boolean;
 export declare function validateSchemaEnumType(schemaEnum: string[], propertyValue: string, propName: string, refLocation: Location | undefined, { report, location }: UserContext): void;
+export declare function validateResponseCodes(responseCodes: string[], codeRange: string, { report }: UserContext): void;

package/lib/rules/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateSchemaEnumType = exports.getAdditionalPropertiesOption = exports.validateExample = exports.getSuggest = exports.validateDefinedAndNonEmpty = exports.fieldNonEmpty = exports.missingRequiredField = exports.matchesJsonSchemaType = exports.oasTypeOf = void 0;
+exports.validateResponseCodes = exports.validateSchemaEnumType = exports.getAdditionalPropertiesOption = exports.validateExample = exports.getSuggest = exports.validateDefinedAndNonEmpty = exports.fieldNonEmpty = exports.missingRequiredField = exports.matchesJsonSchemaType = exports.oasTypeOf = void 0;
 const levenshtein = require("js-levenshtein");
 const ref_utils_1 = require("../ref-utils");
 const ajv_1 = require("./ajv");
@@ -117,7 +117,7 @@ function getAdditionalPropertiesOption(opts) {
         return opts.allowAdditionalProperties;
     }
     if (opts.allowAdditionalProperties !== undefined) {
-        utils_1.showErrorForDeprecatedField('disallowAdditionalProperties', 'allowAdditionalProperties');
+        utils_1.showErrorForDeprecatedField('disallowAdditionalProperties', 'allowAdditionalProperties', undefined);
     }
     utils_1.showWarningForDeprecatedField('disallowAdditionalProperties', 'allowAdditionalProperties');
     return !opts.disallowAdditionalProperties;
@@ -139,3 +139,15 @@ function validateSchemaEnumType(schemaEnum, propertyValue, propName, refLocation
     }
 }
 exports.validateSchemaEnumType = validateSchemaEnumType;
+function validateResponseCodes(responseCodes, codeRange, { report }) {
+    const responseCodeRegexp = new RegExp(`^${codeRange[0]}[0-9Xx]{2}$`);
+    const containsNeededCode = responseCodes.some((code) => (codeRange === '2XX' && code === 'default') || // It's OK to replace 2xx codes with the default
+        responseCodeRegexp.test(code));
+    if (!containsNeededCode) {
+        report({
+            message: `Operation must have at least one \`${codeRange}\` response.`,
+            location: { reportOnKey: true },
+        });
+    }
+}
+exports.validateResponseCodes = validateResponseCodes;

package/lib/types/index.js

@@ -21,7 +21,7 @@ exports.SpecExtension = {
     name: 'SpecExtension',
     properties: {},
     // skip validation of additional properties for unknown extensions
-    additionalProperties: null,
+    additionalProperties: { resolvable: true },
 };
 function normalizeTypes(types, options = {}) {
     const normalizedTypes = {};

package/lib/types/redocly-yaml.js

@@ -146,7 +146,7 @@ const RootConfigStyleguide = {
         } }, ConfigStyleguide.properties),
 };
 const ConfigRoot = {
-    properties: Object.assign(Object.assign({ organization: { type: 'string' }, apis: 'ConfigApis' }, RootConfigStyleguide.properties), { 'features.openapi': 'ConfigReferenceDocs', 'features.mockServer': 'ConfigMockServer', region: { enum: ['us', 'eu'] }, resolve: {
+    properties: Object.assign(Object.assign({ organization: { type: 'string' }, apis: 'ConfigApis' }, RootConfigStyleguide.properties), { theme: 'ConfigRootTheme', 'features.openapi': 'ConfigReferenceDocs', 'features.mockServer': 'ConfigMockServer', region: { enum: ['us', 'eu'] }, resolve: {
             properties: {
                 http: 'ConfigHTTP',
                 doNotResolveExamples: { type: 'boolean' },
@@ -168,7 +168,7 @@ const ConfigApisProperties = {
             items: {
                 type: 'string',
             },
-        }, lint: 'ConfigStyleguide', styleguide: 'ConfigStyleguide' }, ConfigStyleguide.properties), { 'features.openapi': 'ConfigReferenceDocs', 'features.mockServer': 'ConfigMockServer', files: {
+        }, lint: 'ConfigStyleguide', styleguide: 'ConfigStyleguide' }, ConfigStyleguide.properties), { 'features.openapi': 'ConfigReferenceDocs', 'features.mockServer': 'ConfigMockServer', theme: 'ConfigRootTheme', files: {
             type: 'array',
             items: {
                 type: 'string',
@@ -186,6 +186,12 @@ const ConfigHTTP = {
         },
     },
 };
+const ConfigRootTheme = {
+    properties: {
+        openapi: 'ConfigReferenceDocs',
+        mockServer: 'ConfigMockServer',
+    },
+};
 const Rules = {
     properties: {},
     additionalProperties: (value, key) => {
@@ -815,6 +821,7 @@ exports.ConfigTypes = {
     ConfigSidebarLinks,
     CommonConfigSidebarLinks,
     ConfigTheme,
+    ConfigRootTheme,
     AssertDefinition,
     ThemeColors,
     CommonThemeColors,

package/lib/utils.d.ts

@@ -42,8 +42,8 @@ export declare function assignExisting<T>(target: Record<string, T>, obj: Record
 export declare function getMatchingStatusCodeRange(code: number | string): string;
 export declare function isCustomRuleId(id: string): boolean;
 export declare function doesYamlFileExist(filePath: string): boolean;
-export declare function showWarningForDeprecatedField(deprecatedField: string, updatedField?: string): void;
-export declare function showErrorForDeprecatedField(deprecatedField: string, updatedField?: string): void;
+export declare function showWarningForDeprecatedField(deprecatedField: string, updatedField?: string, updatedObject?: string): void;
+export declare function showErrorForDeprecatedField(deprecatedField: string, updatedField?: string, updatedObject?: string): void;
 export declare type Falsy = undefined | null | false | '' | 0;
 export declare function isTruthy<Truthy>(value: Truthy | Falsy): value is Truthy;
 export declare function identity<T>(value: T): T;

package/lib/utils.js

@@ -194,12 +194,14 @@ function doesYamlFileExist(filePath) {
         fs.existsSync(filePath));
 }
 exports.doesYamlFileExist = doesYamlFileExist;
-function showWarningForDeprecatedField(deprecatedField, updatedField) {
-    logger_1.logger.warn(`The '${logger_1.colorize.red(deprecatedField)}' field is deprecated. ${updatedField ? `Use ${logger_1.colorize.green(updatedField)} instead. ` : ''}Read more about this change: https://redocly.com/docs/api-registry/guides/migration-guide-config-file/#changed-properties\n`);
+function showWarningForDeprecatedField(deprecatedField, updatedField, updatedObject) {
+    logger_1.logger.warn(`The '${logger_1.colorize.red(deprecatedField)}' field is deprecated. ${updatedField
+        ? `Use ${logger_1.colorize.green(getUpdatedFieldName(updatedField, updatedObject))} instead. `
+        : ''}Read more about this change: https://redocly.com/docs/api-registry/guides/migration-guide-config-file/#changed-properties\n`);
 }
 exports.showWarningForDeprecatedField = showWarningForDeprecatedField;
-function showErrorForDeprecatedField(deprecatedField, updatedField) {
-    throw new Error(`Do not use '${deprecatedField}' field. ${updatedField ? `Use '${updatedField}' instead. ` : ''}\n`);
+function showErrorForDeprecatedField(deprecatedField, updatedField, updatedObject) {
+    throw new Error(`Do not use '${deprecatedField}' field. ${updatedField ? `Use '${getUpdatedFieldName(updatedField, updatedObject)}' instead. ` : ''}\n`);
 }
 exports.showErrorForDeprecatedField = showErrorForDeprecatedField;
 function isTruthy(value) {
@@ -234,3 +236,6 @@ function nextTick() {
     });
 }
 exports.nextTick = nextTick;
+function getUpdatedFieldName(updatedField, updatedObject) {
+    return `${typeof updatedObject !== 'undefined' ? `${updatedObject}.` : ''}${updatedField}`;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redocly/openapi-core",
-  "version": "1.0.0-beta.119",
+  "version": "1.0.0-beta.121",
   "description": "",
   "main": "lib/index.js",
   "engines": {

package/src/__tests__/lint.test.ts

@@ -68,17 +68,8 @@ describe('lint', () => {
             assertions:
               local/checkWordsCount: 
                 min: 3
-      features.openapi:
-        showConsole: true
-        layout:
-          scope: section
-        routingStrategy: browser
-        theme:
-          rightPanel:
-            backgroundColor: '#263238'
-          links:
-            color: '#6CC496'
-        features.openapi:
+      theme:
+        openapi:
           showConsole: true
           layout:
             scope: section
@@ -88,6 +79,17 @@ describe('lint', () => {
               backgroundColor: '#263238'
             links:
               color: '#6CC496'
+            theme:
+              openapi:
+              showConsole: true
+              layout:
+                scope: section
+              routingStrategy: browser
+              theme:
+                rightPanel:
+                  backgroundColor: '#263238'
+                links:
+                  color: '#6CC496'
       `,
       ''
     );
@@ -99,70 +101,28 @@ describe('lint', () => {
           "from": undefined,
           "location": Array [
             Object {
-              "pointer": "#/atures.openapi",
+              "pointer": "#/eme",
               "reportOnKey": true,
               "source": "",
             },
           ],
-          "message": "Property \`atures.openapi\` is not expected here.",
+          "message": "Property \`eme\` is not expected here.",
           "ruleId": "configuration spec",
           "severity": "error",
           "suggest": Array [
-            "features.openapi",
+            "theme",
           ],
         },
         Object {
           "from": undefined,
           "location": Array [
             Object {
-              "pointer": "#/showConsole",
+              "pointer": "#/openapi",
               "reportOnKey": true,
               "source": "",
             },
           ],
-          "message": "Property \`showConsole\` is not expected here.",
-          "ruleId": "configuration spec",
-          "severity": "error",
-          "suggest": Array [],
-        },
-        Object {
-          "from": undefined,
-          "location": Array [
-            Object {
-              "pointer": "#/layout",
-              "reportOnKey": true,
-              "source": "",
-            },
-          ],
-          "message": "Property \`layout\` is not expected here.",
-          "ruleId": "configuration spec",
-          "severity": "error",
-          "suggest": Array [],
-        },
-        Object {
-          "from": undefined,
-          "location": Array [
-            Object {
-              "pointer": "#/routingStrategy",
-              "reportOnKey": true,
-              "source": "",
-            },
-          ],
-          "message": "Property \`routingStrategy\` is not expected here.",
-          "ruleId": "configuration spec",
-          "severity": "error",
-          "suggest": Array [],
-        },
-        Object {
-          "from": undefined,
-          "location": Array [
-            Object {
-              "pointer": "#/theme",
-              "reportOnKey": true,
-              "source": "",
-            },
-          ],
-          "message": "Property \`theme\` is not expected here.",
+          "message": "Property \`openapi\` is not expected here.",
           "ruleId": "configuration spec",
           "severity": "error",
           "suggest": Array [],
@@ -181,20 +141,6 @@ describe('lint', () => {
           "severity": "error",
           "suggest": Array [],
         },
-        Object {
-          "from": undefined,
-          "location": Array [
-            Object {
-              "pointer": "#/features.openapi/layout",
-              "reportOnKey": false,
-              "source": "",
-            },
-          ],
-          "message": "\`layout\` can be one of the following only: \\"stacked\\", \\"three-panel\\".",
-          "ruleId": "configuration spec",
-          "severity": "error",
-          "suggest": Array [],
-        },
       ]
     `);
   });
@@ -234,7 +180,7 @@ describe('lint', () => {
     `);
   });
 
-  it('lintConfig should work with legacy fields', async () => {
+  it('lintConfig should work with legacy fields - referenceDocs', async () => {
     const document = parseYamlToDocument(
       outdent`
         apis: