@redocly/openapi-core 1.18.1 → 1.20.0

package/lib/config/utils.d.ts

@@ -1,5 +1,5 @@
 import { Config } from './config';
-import type { Api, DeprecatedInRawConfig, FlatRawConfig, Plugin, RawConfig, RawResolveConfig, ResolveConfig, ResolvedStyleguideConfig, RulesFields } from './types';
+import type { Api, DeprecatedInRawConfig, ImportedPlugin, FlatRawConfig, RawConfig, RawResolveConfig, ResolveConfig, ResolvedStyleguideConfig, RulesFields, Plugin, PluginCreator } from './types';
 export declare function parsePresetName(presetName: string): {
     pluginId: string;
     configName: string;
@@ -15,3 +15,5 @@ export declare function getUniquePlugins(plugins: Plugin[]): Plugin[];
 export declare class ConfigValidationError extends Error {
 }
 export declare function deepCloneMapWithJSON<K, V>(originalMap: Map<K, V>): Map<K, V>;
+export declare function isDeprecatedPluginFormat(plugin: ImportedPlugin | undefined): plugin is Plugin;
+export declare function isCommonJsPlugin(plugin: ImportedPlugin | undefined): plugin is PluginCreator;

package/lib/config/utils.js

@@ -1,17 +1,18 @@
 "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.deepCloneMapWithJSON = exports.ConfigValidationError = exports.getUniquePlugins = exports.getResolveConfig = exports.transformConfig = exports.checkForDeprecatedFields = exports.getMergedConfig = exports.mergeExtends = exports.prefixRules = exports.transformApiDefinitionsToApis = exports.parsePresetName = void 0;
+exports.ConfigValidationError = void 0;
+exports.parsePresetName = parsePresetName;
+exports.transformApiDefinitionsToApis = transformApiDefinitionsToApis;
+exports.prefixRules = prefixRules;
+exports.mergeExtends = mergeExtends;
+exports.getMergedConfig = getMergedConfig;
+exports.checkForDeprecatedFields = checkForDeprecatedFields;
+exports.transformConfig = transformConfig;
+exports.getResolveConfig = getResolveConfig;
+exports.getUniquePlugins = getUniquePlugins;
+exports.deepCloneMapWithJSON = deepCloneMapWithJSON;
+exports.isDeprecatedPluginFormat = isDeprecatedPluginFormat;
+exports.isCommonJsPlugin = isCommonJsPlugin;
 const utils_1 = require("../utils");
 const config_1 = require("./config");
 const logger_1 = require("../logger");
@@ -24,7 +25,6 @@ function parsePresetName(presetName) {
         return { pluginId: '', configName: presetName };
     }
 }
-exports.parsePresetName = parsePresetName;
 function transformApiDefinitionsToApis(apiDefinitions) {
     if (!apiDefinitions)
         return undefined;
@@ -34,10 +34,7 @@ function transformApiDefinitionsToApis(apiDefinitions) {
     }
     return apis;
 }
-exports.transformApiDefinitionsToApis = transformApiDefinitionsToApis;
-function extractFlatConfig(_a) {
-    var _b;
-    var { plugins, extends: _extends, rules, oas2Rules, oas3_0Rules, oas3_1Rules, async2Rules, arazzoRules, preprocessors, oas2Preprocessors, oas3_0Preprocessors, oas3_1Preprocessors, async2Preprocessors, arazzoPreprocessors, decorators, oas2Decorators, oas3_0Decorators, oas3_1Decorators, async2Decorators, arazzoDecorators } = _a, rawConfigRest = __rest(_a, ["plugins", "extends", "rules", "oas2Rules", "oas3_0Rules", "oas3_1Rules", "async2Rules", "arazzoRules", "preprocessors", "oas2Preprocessors", "oas3_0Preprocessors", "oas3_1Preprocessors", "async2Preprocessors", "arazzoPreprocessors", "decorators", "oas2Decorators", "oas3_0Decorators", "oas3_1Decorators", "async2Decorators", "arazzoDecorators"]);
+function extractFlatConfig({ plugins, extends: _extends, rules, oas2Rules, oas3_0Rules, oas3_1Rules, async2Rules, async3Rules, arazzoRules, preprocessors, oas2Preprocessors, oas3_0Preprocessors, oas3_1Preprocessors, async2Preprocessors, async3Preprocessors, arazzoPreprocessors, decorators, oas2Decorators, oas3_0Decorators, oas3_1Decorators, async2Decorators, async3Decorators, arazzoDecorators, ...rawConfigRest }) {
     const styleguideConfig = {
         plugins,
         extends: _extends,
@@ -46,20 +43,23 @@ function extractFlatConfig(_a) {
         oas3_0Rules,
         oas3_1Rules,
         async2Rules,
+        async3Rules,
         arazzoRules,
         preprocessors,
         oas2Preprocessors,
         oas3_0Preprocessors,
         oas3_1Preprocessors,
         async2Preprocessors,
+        async3Preprocessors,
         arazzoPreprocessors,
         decorators,
         oas2Decorators,
         oas3_0Decorators,
         oas3_1Decorators,
         async2Decorators,
+        async3Decorators,
         arazzoDecorators,
-        doNotResolveExamples: (_b = rawConfigRest.resolve) === null || _b === void 0 ? void 0 : _b.doNotResolveExamples,
+        doNotResolveExamples: rawConfigRest.resolve?.doNotResolveExamples,
     };
     if ((rawConfigRest.lint && rawConfigRest.styleguide) ||
         (Object.values(styleguideConfig).some(utils_1.isDefined) &&
@@ -77,10 +77,12 @@ function transformApis(legacyApis) {
     if (!legacyApis)
         return undefined;
     const apis = {};
-    for (let _a of Object.entries(legacyApis)) {
-        const [apiName, _b] = _a, { lint } = _b, apiContent = __rest(_b, ["lint"]);
+    for (const [apiName, { lint, ...apiContent }] of Object.entries(legacyApis)) {
         const { styleguideConfig, rawConfigRest } = extractFlatConfig(apiContent);
-        apis[apiName] = Object.assign({ styleguide: styleguideConfig || lint }, rawConfigRest);
+        apis[apiName] = {
+            styleguide: styleguideConfig || lint,
+            ...rawConfigRest,
+        };
     }
     return apis;
 }
@@ -93,7 +95,6 @@ function prefixRules(rules, prefix) {
     }
     return res;
 }
-exports.prefixRules = prefixRules;
 function mergeExtends(rulesConfList) {
     const result = {
         rules: {},
@@ -101,18 +102,21 @@ function mergeExtends(rulesConfList) {
         oas3_0Rules: {},
         oas3_1Rules: {},
         async2Rules: {},
+        async3Rules: {},
         arazzoRules: {},
         preprocessors: {},
         oas2Preprocessors: {},
         oas3_0Preprocessors: {},
         oas3_1Preprocessors: {},
         async2Preprocessors: {},
+        async3Preprocessors: {},
         arazzoPreprocessors: {},
         decorators: {},
         oas2Decorators: {},
         oas3_0Decorators: {},
         oas3_1Decorators: {},
         async2Decorators: {},
+        async3Decorators: {},
         arazzoDecorators: {},
         plugins: [],
         pluginPaths: [],
@@ -131,6 +135,8 @@ function mergeExtends(rulesConfList) {
         (0, utils_1.assignExisting)(result.oas3_1Rules, rulesConf.rules || {});
         Object.assign(result.async2Rules, rulesConf.async2Rules);
         (0, utils_1.assignExisting)(result.async2Rules, rulesConf.rules || {});
+        Object.assign(result.async3Rules, rulesConf.async3Rules);
+        (0, utils_1.assignExisting)(result.async3Rules, rulesConf.rules || {});
         Object.assign(result.arazzoRules, rulesConf.arazzoRules);
         (0, utils_1.assignExisting)(result.arazzoRules, rulesConf.rules || {});
         Object.assign(result.preprocessors, rulesConf.preprocessors);
@@ -142,6 +148,8 @@ function mergeExtends(rulesConfList) {
         (0, utils_1.assignExisting)(result.oas3_1Preprocessors, rulesConf.preprocessors || {});
         Object.assign(result.async2Preprocessors, rulesConf.async2Preprocessors);
         (0, utils_1.assignExisting)(result.async2Preprocessors, rulesConf.preprocessors || {});
+        Object.assign(result.async3Preprocessors, rulesConf.async3Preprocessors);
+        (0, utils_1.assignExisting)(result.async3Preprocessors, rulesConf.preprocessors || {});
         Object.assign(result.arazzoPreprocessors, rulesConf.arazzoPreprocessors);
         (0, utils_1.assignExisting)(result.arazzoPreprocessors, rulesConf.preprocessors || {});
         Object.assign(result.decorators, rulesConf.decorators);
@@ -153,6 +161,8 @@ function mergeExtends(rulesConfList) {
         (0, utils_1.assignExisting)(result.oas3_1Decorators, rulesConf.decorators || {});
         Object.assign(result.async2Decorators, rulesConf.async2Decorators);
         (0, utils_1.assignExisting)(result.async2Decorators, rulesConf.decorators || {});
+        Object.assign(result.async3Decorators, rulesConf.async3Decorators);
+        (0, utils_1.assignExisting)(result.async3Decorators, rulesConf.decorators || {});
         Object.assign(result.arazzoDecorators, rulesConf.arazzoDecorators);
         (0, utils_1.assignExisting)(result.arazzoDecorators, rulesConf.decorators || {});
         result.plugins.push(...(rulesConf.plugins || []));
@@ -161,29 +171,38 @@ function mergeExtends(rulesConfList) {
     }
     return result;
 }
-exports.mergeExtends = mergeExtends;
 function getMergedConfig(config, apiName) {
-    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,
+        ...Object.values(config.apis).map((api) => api?.styleguide?.extendPaths),
+        config.rawConfig?.styleguide?.extendPaths,
     ]
         .flat()
         .filter(utils_1.isTruthy);
     const pluginPaths = [
-        ...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.pluginPaths; }),
-        (_d = (_c = config.rawConfig) === null || _c === void 0 ? void 0 : _c.styleguide) === null || _d === void 0 ? void 0 : _d.pluginPaths,
+        ...Object.values(config.apis).map((api) => api?.styleguide?.pluginPaths),
+        config.rawConfig?.styleguide?.pluginPaths,
     ]
         .flat()
         .filter(utils_1.isTruthy);
     return 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 }), 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)
+        ? new config_1.Config({
+            ...config.rawConfig,
+            styleguide: {
+                ...(config.apis[apiName]
+                    ? config.apis[apiName].styleguide
+                    : config.rawConfig.styleguide),
+                extendPaths,
+                pluginPaths,
+            },
+            theme: {
+                ...config.rawConfig.theme,
+                ...config.apis[apiName]?.theme,
+            },
+            files: [...config.files, ...(config.apis?.[apiName]?.files ?? [])],
+            // TODO: merge everything else here
+        }, config.configFile)
         : config;
 }
-exports.getMergedConfig = getMergedConfig;
 function checkForDeprecatedFields(deprecatedField, updatedField, rawConfig, updatedObject) {
     const isDeprecatedFieldInApis = rawConfig.apis &&
         Object.values(rawConfig.apis).some((api) => api[deprecatedField]);
@@ -200,9 +219,7 @@ function checkForDeprecatedFields(deprecatedField, updatedField, rawConfig, upda
         (0, utils_1.showWarningForDeprecatedField)(deprecatedField, updatedField, updatedObject);
     }
 }
-exports.checkForDeprecatedFields = checkForDeprecatedFields;
 function transformConfig(rawConfig) {
-    var _a, _b;
     const migratedFields = [
         ['apiDefinitions', 'apis', undefined],
         ['referenceDocs', 'openapi', 'theme'],
@@ -213,21 +230,31 @@ function transformConfig(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 { apis, apiDefinitions, referenceDocs, lint, ...rest } = rawConfig;
     const { styleguideConfig, rawConfigRest } = extractFlatConfig(rest);
-    const transformedConfig = 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);
+    const transformedConfig = {
+        theme: {
+            openapi: {
+                ...referenceDocs,
+                ...rawConfig['features.openapi'],
+                ...rawConfig.theme?.openapi,
+            },
+            mockServer: {
+                ...rawConfig['features.mockServer'],
+                ...rawConfig.theme?.mockServer,
+            },
+        },
+        apis: transformApis(apis) || transformApiDefinitionsToApis(apiDefinitions),
+        styleguide: styleguideConfig || lint,
+        ...rawConfigRest,
+    };
     showDeprecationMessages(transformedConfig);
     return transformedConfig;
 }
-exports.transformConfig = transformConfig;
 function showDeprecationMessages(config) {
-    var _a, _b;
-    let allRules = Object.assign({}, (_a = config.styleguide) === null || _a === void 0 ? void 0 : _a.rules);
+    let allRules = { ...config.styleguide?.rules };
     for (const api of Object.values(config.apis || {})) {
-        allRules = Object.assign(Object.assign({}, allRules), (_b = api === null || api === void 0 ? void 0 : api.styleguide) === null || _b === void 0 ? void 0 : _b.rules);
+        allRules = { ...allRules, ...api?.styleguide?.rules };
     }
     for (const ruleKey of Object.keys(allRules)) {
         if (ruleKey.startsWith('assert/')) {
@@ -236,15 +263,13 @@ function showDeprecationMessages(config) {
     }
 }
 function getResolveConfig(resolve) {
-    var _a, _b;
     return {
         http: {
-            headers: (_b = (_a = resolve === null || resolve === void 0 ? void 0 : resolve.http) === null || _a === void 0 ? void 0 : _a.headers) !== null && _b !== void 0 ? _b : [],
+            headers: resolve?.http?.headers ?? [],
             customFetch: undefined,
         },
     };
 }
-exports.getResolveConfig = getResolveConfig;
 function getUniquePlugins(plugins) {
     const seen = new Set();
     const results = [];
@@ -259,11 +284,15 @@ function getUniquePlugins(plugins) {
     }
     return results;
 }
-exports.getUniquePlugins = getUniquePlugins;
 class ConfigValidationError extends Error {
 }
 exports.ConfigValidationError = ConfigValidationError;
 function deepCloneMapWithJSON(originalMap) {
     return new Map(JSON.parse(JSON.stringify([...originalMap])));
 }
-exports.deepCloneMapWithJSON = deepCloneMapWithJSON;
+function isDeprecatedPluginFormat(plugin) {
+    return plugin !== undefined && typeof plugin === 'object' && 'id' in plugin;
+}
+function isCommonJsPlugin(plugin) {
+    return typeof plugin === 'function';
+}

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

@@ -0,0 +1 @@
+export declare const decorators: {};

package/lib/decorators/async3/index.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.decorators = void 0;
+exports.decorators = {};

package/lib/decorators/common/filters/filter-helper.d.ts

@@ -1,3 +1,3 @@
-import { UserContext } from '../../../walk';
+import type { UserContext } from '../../../walk';
 export declare function filter(node: any, ctx: UserContext, criteria: (item: any) => boolean): void;
 export declare function checkIfMatchByStrategy(nodeValue: any, decoratorValue: any, strategy: 'all' | 'any'): boolean;

package/lib/decorators/common/filters/filter-helper.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkIfMatchByStrategy = exports.filter = void 0;
+exports.filter = filter;
+exports.checkIfMatchByStrategy = checkIfMatchByStrategy;
 const ref_utils_1 = require("../../../ref-utils");
 const utils_1 = require("../../../utils");
 function filter(node, ctx, criteria) {
@@ -43,7 +44,6 @@ function filter(node, ctx, criteria) {
         delete parent[key];
     }
 }
-exports.filter = filter;
 function checkIfMatchByStrategy(nodeValue, decoratorValue, strategy) {
     if (nodeValue === undefined || decoratorValue === undefined) {
         return false;
@@ -61,7 +61,6 @@ function checkIfMatchByStrategy(nodeValue, decoratorValue, strategy) {
     }
     return false;
 }
-exports.checkIfMatchByStrategy = checkIfMatchByStrategy;
 function toArrayIfNeeded(value) {
     return Array.isArray(value) ? value : [value];
 }

package/lib/decorators/common/filters/filter-in.d.ts

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

package/lib/decorators/common/filters/filter-in.js

@@ -5,7 +5,7 @@ const filter_helper_1 = require("./filter-helper");
 const DEFAULT_STRATEGY = 'any';
 const FilterIn = ({ property, value, matchStrategy }) => {
     const strategy = matchStrategy || DEFAULT_STRATEGY;
-    const filterInCriteria = (item) => (item === null || item === void 0 ? void 0 : item[property]) && !(0, filter_helper_1.checkIfMatchByStrategy)(item === null || item === void 0 ? void 0 : item[property], value, strategy);
+    const filterInCriteria = (item) => item?.[property] && !(0, filter_helper_1.checkIfMatchByStrategy)(item?.[property], value, strategy);
     return {
         any: {
             enter: (node, ctx) => {

package/lib/decorators/common/filters/filter-out.d.ts

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

package/lib/decorators/common/filters/filter-out.js

@@ -5,7 +5,7 @@ const filter_helper_1 = require("./filter-helper");
 const DEFAULT_STRATEGY = 'any';
 const FilterOut = ({ property, value, matchStrategy }) => {
     const strategy = matchStrategy || DEFAULT_STRATEGY;
-    const filterOutCriteria = (item) => (0, filter_helper_1.checkIfMatchByStrategy)(item === null || item === void 0 ? void 0 : item[property], value, strategy);
+    const filterOutCriteria = (item) => (0, filter_helper_1.checkIfMatchByStrategy)(item?.[property], value, strategy);
     return {
         any: {
             enter: (node, ctx) => {

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

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

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

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

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

@@ -1,15 +1,4 @@
 "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) => {
@@ -19,7 +8,7 @@ const InfoOverride = (newInfo) => {
                 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"]);
+                const { severity: _, ...rest } = newInfo;
                 Object.assign(info, rest);
             },
         },

package/lib/decorators/common/media-type-examples-override.d.ts

@@ -1,2 +1,2 @@
-import { Oas3Decorator } from '../../visitors';
+import type { Oas3Decorator } from '../../visitors';
 export declare const MediaTypeExamplesOverride: Oas3Decorator;

package/lib/decorators/common/media-type-examples-override.js

@@ -23,7 +23,10 @@ const MediaTypeExamplesOverride = ({ operationIds }) => {
                         }
                         resolvedResponse.content = resolvedResponse.content ? resolvedResponse.content : {};
                         Object.keys(properties.responses[responseCode]).forEach((mimeType) => {
-                            resolvedResponse.content[mimeType] = Object.assign(Object.assign({}, resolvedResponse.content[mimeType]), { examples: (0, utils_1.yamlAndJsonSyncReader)(properties.responses[responseCode][mimeType]) });
+                            resolvedResponse.content[mimeType] = {
+                                ...resolvedResponse.content[mimeType],
+                                examples: (0, utils_1.yamlAndJsonSyncReader)(properties.responses[responseCode][mimeType]),
+                            };
                         });
                         operation.responses[responseCode] = resolvedResponse;
                     }
@@ -35,7 +38,10 @@ const MediaTypeExamplesOverride = ({ operationIds }) => {
                     }
                     resolvedRequest.content = resolvedRequest.content ? resolvedRequest.content : {};
                     Object.keys(properties.request).forEach((mimeType) => {
-                        resolvedRequest.content[mimeType] = Object.assign(Object.assign({}, resolvedRequest.content[mimeType]), { examples: (0, utils_1.yamlAndJsonSyncReader)(properties.request[mimeType]) });
+                        resolvedRequest.content[mimeType] = {
+                            ...resolvedRequest.content[mimeType],
+                            examples: (0, utils_1.yamlAndJsonSyncReader)(properties.request[mimeType]),
+                        };
                     });
                     operation.requestBody = resolvedRequest;
                 }

package/lib/decorators/common/operation-description-override.d.ts

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

package/lib/decorators/common/registry-dependencies.d.ts

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

package/lib/decorators/common/remove-x-internal.d.ts

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

package/lib/decorators/common/remove-x-internal.js

@@ -7,20 +7,19 @@ const DEFAULT_INTERNAL_PROPERTY_NAME = 'x-internal';
 const RemoveXInternal = ({ internalFlagProperty }) => {
     const hiddenTag = internalFlagProperty || DEFAULT_INTERNAL_PROPERTY_NAME;
     function removeInternal(node, ctx) {
-        var _a, _b, _c, _d;
         const { parent, key } = ctx;
         let didDelete = false;
         if (Array.isArray(node)) {
             for (let i = 0; i < node.length; i++) {
                 if ((0, ref_utils_1.isRef)(node[i])) {
                     const resolved = ctx.resolve(node[i]);
-                    if ((_a = resolved.node) === null || _a === void 0 ? void 0 : _a[hiddenTag]) {
+                    if (resolved.node?.[hiddenTag]) {
                         node.splice(i, 1);
                         didDelete = true;
                         i--;
                     }
                 }
-                if ((_b = node[i]) === null || _b === void 0 ? void 0 : _b[hiddenTag]) {
+                if (node[i]?.[hiddenTag]) {
                     node.splice(i, 1);
                     didDelete = true;
                     i--;
@@ -32,12 +31,12 @@ const RemoveXInternal = ({ internalFlagProperty }) => {
                 node = node;
                 if ((0, ref_utils_1.isRef)(node[key])) {
                     const resolved = ctx.resolve(node[key]);
-                    if ((_c = resolved.node) === null || _c === void 0 ? void 0 : _c[hiddenTag]) {
+                    if (resolved.node?.[hiddenTag]) {
                         delete node[key];
                         didDelete = true;
                     }
                 }
-                if ((_d = node[key]) === null || _d === void 0 ? void 0 : _d[hiddenTag]) {
+                if (node[key]?.[hiddenTag]) {
                     delete node[key];
                     didDelete = true;
                 }

package/lib/decorators/common/tag-description-override.d.ts

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

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

@@ -1,4 +1,4 @@
-import { Oas2Decorator } from '../../visitors';
+import type { Oas2Decorator } from '../../visitors';
 export declare const decorators: {
     'registry-dependencies': Oas2Decorator;
     'operation-description-override': Oas2Decorator;

package/lib/decorators/oas2/remove-unused-components.js

@@ -5,9 +5,8 @@ const utils_1 = require("../../utils");
 const RemoveUnusedComponents = () => {
     const components = new Map();
     function registerComponent(location, componentType, name) {
-        var _a, _b;
         components.set(location.absolutePointer, {
-            usedIn: (_b = (_a = components.get(location.absolutePointer)) === null || _a === void 0 ? void 0 : _a.usedIn) !== null && _b !== void 0 ? _b : [],
+            usedIn: components.get(location.absolutePointer)?.usedIn ?? [],
             componentType,
             name,
         });

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

@@ -1,4 +1,4 @@
-import { Oas3Decorator } from '../../visitors';
+import type { Oas3Decorator } from '../../visitors';
 export declare const decorators: {
     'registry-dependencies': Oas3Decorator;
     'operation-description-override': Oas3Decorator;

package/lib/decorators/oas3/remove-unused-components.js

@@ -5,9 +5,8 @@ const utils_1 = require("../../utils");
 const RemoveUnusedComponents = () => {
     const components = new Map();
     function registerComponent(location, componentType, name) {
-        var _a, _b;
         components.set(location.absolutePointer, {
-            usedIn: (_b = (_a = components.get(location.absolutePointer)) === null || _a === void 0 ? void 0 : _a.usedIn) !== null && _b !== void 0 ? _b : [],
+            usedIn: components.get(location.absolutePointer)?.usedIn ?? [],
             componentType,
             name,
         });

package/lib/env.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="node" />
 export declare const isBrowser: boolean;
 export declare const env: NodeJS.ProcessEnv;

package/lib/env.js

@@ -3,5 +3,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.env = exports.isBrowser = void 0;
 exports.isBrowser = typeof window !== 'undefined' ||
     typeof process === 'undefined' ||
-    (process === null || process === void 0 ? void 0 : process.platform) === 'browser'; // main and worker thread
+    process?.platform === 'browser'; // main and worker thread
 exports.env = exports.isBrowser ? {} : process.env || {};

package/lib/format/codeframes.d.ts

@@ -1,5 +1,5 @@
 import * as yamlAst from 'yaml-ast-parser';
-import { LineColLocationObject, LocationObject } from '../walk';
+import type { LineColLocationObject, LocationObject } from '../walk';
 type YAMLMapping = yamlAst.YAMLMapping & {
     kind: yamlAst.Kind.MAPPING;
 };

package/lib/format/codeframes.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAstNodeByPointer = exports.getLineColLocation = exports.getCodeframe = void 0;
+exports.getCodeframe = getCodeframe;
+exports.getLineColLocation = getLineColLocation;
+exports.getAstNodeByPointer = getAstNodeByPointer;
 const yamlAst = require("yaml-ast-parser");
 const ref_utils_1 = require("../ref-utils");
 const logger_1 = require("../logger");
@@ -66,7 +68,6 @@ function getCodeframe(location, color) {
         return (line.substr(0, startIdx) + variant(line.substring(startIdx, endIdx)) + line.substr(endIdx));
     }
 }
-exports.getCodeframe = getCodeframe;
 function printPrefixedLines(lines) {
     const existingLines = lines.filter(([_, line]) => line !== undefined);
     const padLen = Math.max(...existingLines.map(([prefix]) => prefix.length));
@@ -107,15 +108,17 @@ function padSize(line) {
     return line.length;
 }
 function getLineColLocation(location) {
-    var _a, _b;
     if (location.pointer === undefined)
         return location;
     const { source, pointer, reportOnKey } = location;
     const ast = source.getAst(yamlAst.safeLoad);
     const astNode = getAstNodeByPointer(ast, pointer, !!reportOnKey);
-    return Object.assign(Object.assign(Object.assign({}, location), { pointer: undefined }), positionsToLoc(source.body, (_a = astNode === null || astNode === void 0 ? void 0 : astNode.startPosition) !== null && _a !== void 0 ? _a : 1, (_b = astNode === null || astNode === void 0 ? void 0 : astNode.endPosition) !== null && _b !== void 0 ? _b : 1));
+    return {
+        ...location,
+        pointer: undefined,
+        ...positionsToLoc(source.body, astNode?.startPosition ?? 1, astNode?.endPosition ?? 1),
+    };
 }
-exports.getLineColLocation = getLineColLocation;
 function positionsToLoc(source, startPos, endPos) {
     let currentLine = 1;
     let currentCol = 1;
@@ -136,7 +139,7 @@ function positionsToLoc(source, startPos, endPos) {
         }
         currentCol++;
     }
-    const end = startPos === endPos ? Object.assign({}, start) : { line: currentLine, col: currentCol + 1 };
+    const end = startPos === endPos ? { ...start } : { line: currentLine, col: currentCol + 1 };
     return { start, end };
 }
 function getAstNodeByPointer(root, pointer, reportOnKey) {
@@ -151,7 +154,7 @@ function getAstNodeByPointer(root, pointer, reportOnKey) {
             if (!mapping)
                 break;
             currentNode = mapping;
-            if (!(mapping === null || mapping === void 0 ? void 0 : mapping.value))
+            if (!mapping?.value)
                 break; // If node has value - return value, if not - return node itself
             currentNode = mapping.value;
         }
@@ -180,4 +183,3 @@ function getAstNodeByPointer(root, pointer, reportOnKey) {
         }
     }
 }
-exports.getAstNodeByPointer = getAstNodeByPointer;

package/lib/format/format.d.ts

@@ -1,4 +1,4 @@
-import { NormalizedProblem } from '../walk';
+import type { NormalizedProblem } from '../walk';
 export type Totals = {
     errors: number;
     warnings: number;