@redocly/openapi-core 0.0.0-snapshot.1741951669 → 0.0.0-snapshot.1742384755

package/lib/bundle.d.ts

@@ -15,7 +15,6 @@ export type BundleOptions = {
     config: Config;
     dereference?: boolean;
     base?: string | null;
-    skipRedoclyRegistryRefs?: boolean;
     removeUnusedComponents?: boolean;
     keepUrlRefs?: boolean;
 };
@@ -43,7 +42,6 @@ export declare function bundleDocument(opts: {
     customTypes?: Record<string, NodeType>;
     externalRefResolver: BaseResolver;
     dereference?: boolean;
-    skipRedoclyRegistryRefs?: boolean;
     removeUnusedComponents?: boolean;
     keepUrlRefs?: boolean;
 }): Promise<BundleResult>;

package/lib/bundle.js

@@ -15,7 +15,6 @@ const ref_utils_1 = require("./ref-utils");
 const rules_1 = require("./config/rules");
 const no_unresolved_refs_1 = require("./rules/no-unresolved-refs");
 const utils_1 = require("./utils");
-const domains_1 = require("./redocly/domains");
 const remove_unused_components_1 = require("./decorators/oas2/remove-unused-components");
 const remove_unused_components_2 = require("./decorators/oas3/remove-unused-components");
 const redocly_yaml_1 = require("./types/redocly-yaml");
@@ -83,7 +82,7 @@ async function bundleFromString(opts) {
     });
 }
 async function bundleDocument(opts) {
-    const { document, config, customTypes, externalRefResolver, dereference = false, skipRedoclyRegistryRefs = false, removeUnusedComponents = false, keepUrlRefs = false, } = opts;
+    const { document, config, customTypes, externalRefResolver, dereference = false, removeUnusedComponents = false, keepUrlRefs = false, } = opts;
     const specVersion = (0, oas_types_1.detectSpec)(document.parsed);
     const specMajorVersion = (0, oas_types_1.getMajorSpecVersion)(specVersion);
     const rules = config.getRulesForSpecVersion(specMajorVersion);
@@ -129,7 +128,7 @@ async function bundleDocument(opts) {
         {
             severity: 'error',
             ruleId: 'bundler',
-            visitor: makeBundleVisitor(specMajorVersion, dereference, skipRedoclyRegistryRefs, document, resolvedRefMap, keepUrlRefs),
+            visitor: makeBundleVisitor(specMajorVersion, dereference, document, resolvedRefMap, keepUrlRefs),
         },
         ...decorators,
     ], types);
@@ -231,7 +230,7 @@ function replaceRef(ref, resolved, ctx) {
     }
 }
 // function oas3Move
-function makeBundleVisitor(version, dereference, skipRedoclyRegistryRefs, rootDocument, resolvedRefMap, keepUrlRefs) {
+function makeBundleVisitor(version, dereference, rootDocument, resolvedRefMap, keepUrlRefs) {
     let components;
     let rootLocation;
     const visitor = {
@@ -247,10 +246,6 @@ function makeBundleVisitor(version, dereference, skipRedoclyRegistryRefs, rootDo
                     !dereference) {
                     return;
                 }
-                // do not bundle registry URL before push, otherwise we can't record dependencies
-                if (skipRedoclyRegistryRefs && (0, domains_1.isRedoclyRegistryURL)(node.$ref)) {
-                    return;
-                }
                 if (keepUrlRefs && (0, ref_utils_1.isAbsoluteUrl)(node.$ref)) {
                     return;
                 }

package/lib/config/builtIn.js

@@ -24,9 +24,6 @@ exports.builtInConfigs = {
     minimal: minimal_1.default,
     all: all_1.default,
     spec: spec_1.default,
-    'redocly-registry': {
-        decorators: { 'registry-dependencies': 'on' },
-    },
 };
 exports.defaultPlugin = {
     id: '', // default plugin doesn't have id

package/lib/config/config-resolvers.js

@@ -91,18 +91,24 @@ async function resolvePlugins(plugins, configDir = '') {
                 if (!pluginsCache.has(absolutePluginPath)) {
                     let requiredPlugin;
                     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-                    // @ts-ignore
+                    // @ts-ignore FIXME: remove?
                     if (typeof __webpack_require__ === 'function') {
                         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-                        // @ts-ignore
+                        // @ts-ignore FIXME: remove?
                         requiredPlugin = __non_webpack_require__(absolutePluginPath);
                     }
                     else {
-                        // Workaround for dynamic imports being transpiled to require by Typescript: https://github.com/microsoft/TypeScript/issues/43329#issuecomment-811606238
-                        const _importDynamic = new Function('modulePath', 'return import(modulePath)');
-                        // you can import both cjs and mjs
-                        const mod = await _importDynamic((0, url_1.pathToFileURL)(absolutePluginPath).href);
-                        requiredPlugin = mod.default || mod;
+                        // FIXME: fix this mess after we migrate to ESM
+                        try {
+                            // Workaround for dynamic imports being transpiled to require by Typescript: https://github.com/microsoft/TypeScript/issues/43329#issuecomment-811606238
+                            const _importDynamic = new Function('modulePath', 'return import(modulePath)');
+                            const mod = await _importDynamic((0, url_1.pathToFileURL)(absolutePluginPath).href);
+                            requiredPlugin = mod.default || mod;
+                        }
+                        catch (e) {
+                            const mod = await Promise.resolve(`${(0, url_1.pathToFileURL)(absolutePluginPath).href}`).then(s => require(s));
+                            requiredPlugin = mod.default || mod;
+                        }
                     }
                     const pluginCreatorOptions = { contentDir: configDir };
                     const pluginModule = (0, utils_2.isDeprecatedPluginFormat)(requiredPlugin)

package/lib/config/config.d.ts

@@ -2,7 +2,7 @@ import { SpecVersion, SpecMajorVersion } from '../oas-types';
 import type { NormalizedProblem } from '../walk';
 import type { Oas2RuleSet, Oas3RuleSet, Async3RuleSet, Arazzo1RuleSet, Overlay1RuleSet } from '../oas-types';
 import type { NodeType } from '../types';
-import type { DecoratorConfig, Plugin, PreprocessorConfig, Region, ResolveConfig, ResolvedApi, ResolvedConfig, ResolvedStyleguideConfig, RuleConfig, RuleSettings, Telemetry, ThemeRawConfig } from './types';
+import type { DecoratorConfig, Plugin, PreprocessorConfig, ResolveConfig, ResolvedApi, ResolvedConfig, ResolvedStyleguideConfig, RuleConfig, RuleSettings, Telemetry, ThemeRawConfig } from './types';
 export declare const IGNORE_FILE = ".redocly.lint-ignore.yaml";
 export declare class StyleguideConfig {
     rawConfig: ResolvedStyleguideConfig;
@@ -44,10 +44,7 @@ export declare class Config {
     styleguide: StyleguideConfig;
     resolve: ResolveConfig;
     licenseKey?: string;
-    region?: Region;
     theme: ThemeRawConfig;
-    organization?: string;
-    files: string[];
     telemetry?: Telemetry;
     constructor(rawConfig: ResolvedConfig, configFile?: string | undefined);
 }

package/lib/config/config.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Config = exports.StyleguideConfig = exports.IGNORE_FILE = void 0;
-const fs = require("fs");
-const path = require("path");
+const fs = require("node:fs");
+const path = require("node:path");
 const js_yaml_1 = require("../js-yaml");
 const utils_1 = require("../utils");
 const oas_types_1 = require("../oas-types");
@@ -79,7 +79,7 @@ class StyleguideConfig {
             return;
         this.ignore =
             (0, js_yaml_1.parseYaml)(fs.readFileSync(ignoreFile, 'utf-8')) || {};
-        replaceSpecWithStruct(Object.keys(this.ignore), this.ignore);
+        replaceSpecWithStruct(Object.keys(this.ignore), this.ignore); // FIXME: remove this
         // resolve ignore paths
         for (const fileName of Object.keys(this.ignore)) {
             this.ignore[(0, ref_utils_1.isAbsoluteUrl)(fileName) ? fileName : path.resolve(path.dirname(ignoreFile), fileName)] = this.ignore[fileName];
@@ -325,11 +325,8 @@ class Config {
         this.configFile = configFile;
         this.apis = rawConfig.apis || {};
         this.styleguide = new StyleguideConfig(rawConfig.styleguide || {}, configFile);
-        this.theme = rawConfig.theme || {};
+        this.theme = rawConfig.theme || {}; // FIXME: theme is deprecated
         this.resolve = (0, utils_2.getResolveConfig)(rawConfig?.resolve);
-        this.region = rawConfig.region;
-        this.organization = rawConfig.organization;
-        this.files = rawConfig.files || [];
         this.telemetry = rawConfig.telemetry;
     }
 }

package/lib/config/load.d.ts

@@ -1,8 +1,7 @@
 import { BaseResolver } from '../resolve';
 import type { Config } from './config';
 import type { Document, ResolvedRefMap } from '../resolve';
-import type { RegionalTokenWithValidity } from '../redocly/redocly-client-types';
-import type { RawConfig, RawUniversalConfig, Region } from './types';
+import type { RawConfig, RawUniversalConfig } from './types';
 export type RawConfigProcessor = (params: {
     document: Document;
     resolvedRefMap: ResolvedRefMap;
@@ -14,8 +13,6 @@ export declare function loadConfig(options?: {
     customExtends?: string[];
     processRawConfig?: RawConfigProcessor;
     externalRefResolver?: BaseResolver;
-    files?: string[];
-    region?: Region;
 }): Promise<Config>;
 export declare const CONFIG_FILE_NAMES: string[];
 export declare function findConfig(dir?: string): string | undefined;
@@ -30,7 +27,6 @@ export declare function getConfig(options?: {
 }>;
 type CreateConfigOptions = {
     extends?: string[];
-    tokens?: RegionalTokenWithValidity[];
     configPath?: string;
     externalRefResolver?: BaseResolver;
 };

package/lib/config/load.js

@@ -7,16 +7,13 @@ exports.getConfig = getConfig;
 exports.createConfig = createConfig;
 const fs = require("fs");
 const path = require("path");
-const redocly_1 = require("../redocly");
 const utils_1 = require("../utils");
 const js_yaml_1 = require("../js-yaml");
 const utils_2 = require("./utils");
 const config_resolvers_1 = require("./config-resolvers");
 const bundle_1 = require("../bundle");
 const resolve_1 = require("../resolve");
-const env_1 = require("../env");
-const domains_1 = require("../redocly/domains");
-async function addConfigMetadata({ rawConfig, customExtends, configPath, tokens, files, region, externalRefResolver, }) {
+async function addConfigMetadata({ rawConfig, customExtends, configPath, externalRefResolver, }) {
     if (customExtends !== undefined) {
         rawConfig.styleguide = rawConfig.styleguide || {};
         rawConfig.styleguide.extends = customExtends;
@@ -24,58 +21,22 @@ async function addConfigMetadata({ rawConfig, customExtends, configPath, tokens,
     else if ((0, utils_1.isEmptyObject)(rawConfig)) {
         rawConfig.styleguide = { extends: ['recommended'], recommendedFallback: true };
     }
-    if (tokens?.length) {
-        if (!rawConfig.resolve)
-            rawConfig.resolve = {};
-        if (!rawConfig.resolve.http)
-            rawConfig.resolve.http = {};
-        rawConfig.resolve.http.headers = [...(rawConfig.resolve.http.headers ?? [])];
-        for (const item of tokens) {
-            const domain = domains_1.DOMAINS[item.region];
-            rawConfig.resolve.http.headers.push({
-                matches: `https://api.${domain}/registry/**`,
-                name: 'Authorization',
-                envVariable: undefined,
-                value: item.token,
-            }, 
-            //support redocly.com domain for future compatibility
-            ...(item.region === 'us'
-                ? [
-                    {
-                        matches: `https://api.redoc.ly/registry/**`,
-                        name: 'Authorization',
-                        envVariable: undefined,
-                        value: item.token,
-                    },
-                ]
-                : []));
-        }
-    }
     return (0, config_resolvers_1.resolveConfig)({
-        rawConfig: {
-            ...rawConfig,
-            files: files ?? rawConfig.files,
-            region: region ?? rawConfig.region,
-        },
+        rawConfig,
         configPath,
         externalRefResolver,
     });
 }
 async function loadConfig(options = {}) {
-    const { configPath = findConfig(), customExtends, processRawConfig, files, region, externalRefResolver, } = options;
+    const { configPath = findConfig(), customExtends, processRawConfig, externalRefResolver, } = options;
     const { rawConfig, document, parsed, resolvedRefMap } = await getConfig({
         configPath,
         externalRefResolver,
     });
-    const redoclyClient = env_1.isBrowser ? undefined : new redocly_1.RedoclyClient();
-    const tokens = redoclyClient && redoclyClient.hasTokens() ? redoclyClient.getAllTokens() : [];
     const config = await addConfigMetadata({
         rawConfig,
         customExtends,
         configPath,
-        tokens,
-        files,
-        region,
         externalRefResolver,
     });
     if (document && parsed && resolvedRefMap && typeof processRawConfig === 'function') {
@@ -98,7 +59,7 @@ async function loadConfig(options = {}) {
 }
 exports.CONFIG_FILE_NAMES = ['redocly.yaml', 'redocly.yml', '.redocly.yaml', '.redocly.yml'];
 function findConfig(dir) {
-    if (!fs?.hasOwnProperty?.('existsSync'))
+    if (!fs?.existsSync)
         return;
     const existingConfigFiles = exports.CONFIG_FILE_NAMES.map((name) => dir ? path.resolve(dir, name) : name).filter(fs.existsSync);
     if (existingConfigFiles.length > 1) {

package/lib/config/types.d.ts

@@ -137,11 +137,7 @@ export type HttpResolveConfig = {
 export type ResolveConfig = {
     http: HttpResolveConfig;
 };
-export type Region = 'us' | 'eu';
 export type Telemetry = 'on' | 'off';
-export type AccessTokens = {
-    [region in Region]?: string;
-};
 export type DeprecatedInRawConfig = {
     apiDefinitions?: Record<string, string>;
     lint?: StyleguideRawConfig;
@@ -159,15 +155,11 @@ export type DeprecatedInApi = {
 } & DeprecatedFeaturesConfig;
 export type ResolvedApi = Omit<Api, 'styleguide'> & {
     styleguide: ResolvedStyleguideConfig;
-    files?: string[];
 };
 export type RawConfig = {
     apis?: Record<string, Api>;
     styleguide?: StyleguideRawConfig;
     resolve?: RawResolveConfig;
-    region?: Region;
-    organization?: string;
-    files?: string[];
     telemetry?: Telemetry;
 } & ThemeConfig;
 export type RawUniversalConfig = Omit<RawConfig, 'styleguide'> & StyleguideRawConfig;

package/lib/config/utils.js

@@ -206,11 +206,11 @@ function getMergedConfig(config, apiName) {
                 extendPaths,
                 pluginPaths,
             },
+            // FIXME: theme is deprecated
             theme: {
                 ...config.rawConfig.theme,
                 ...config.apis[apiName]?.theme,
             },
-            files: [...config.files, ...(config.apis?.[apiName]?.files ?? [])],
             // TODO: merge everything else here
         }, config.configFile)
         : config;
@@ -255,6 +255,7 @@ function transformConfig(rawConfig) {
     const { apis, apiDefinitions, referenceDocs, lint, ...rest } = rawConfig;
     const { styleguideConfig, rawConfigRest } = extractFlatConfig(rest);
     const transformedConfig = {
+        // FIXME: ? theme is deprecated
         theme: {
             openapi: {
                 ...referenceDocs,

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

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

package/lib/decorators/oas2/index.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.decorators = void 0;
-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");
@@ -10,7 +9,6 @@ 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");
 exports.decorators = {
-    'registry-dependencies': registry_dependencies_1.RegistryDependencies,
     'operation-description-override': operation_description_override_1.OperationDescriptionOverride,
     'tag-description-override': tag_description_override_1.TagDescriptionOverride,
     'info-description-override': info_description_override_1.InfoDescriptionOverride,

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

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

package/lib/decorators/oas3/index.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.decorators = void 0;
-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");
@@ -11,7 +10,6 @@ const filter_in_1 = require("../common/filters/filter-in");
 const filter_out_1 = require("../common/filters/filter-out");
 const media_type_examples_override_1 = require("../common/media-type-examples-override");
 exports.decorators = {
-    'registry-dependencies': registry_dependencies_1.RegistryDependencies,
     'operation-description-override': operation_description_override_1.OperationDescriptionOverride,
     'tag-description-override': tag_description_override_1.TagDescriptionOverride,
     'info-description-override': info_description_override_1.InfoDescriptionOverride,

package/lib/index.d.ts

@@ -11,9 +11,7 @@ export type { Oas2Definition } from './typings/swagger';
 export type { StatsAccumulator, StatsName } from './typings/common';
 export { normalizeTypes } from './types';
 export { Stats } from './rules/other/stats';
-export { Config, StyleguideConfig, RawConfig, RawUniversalConfig, IGNORE_FILE, Region, getMergedConfig, transformConfig, loadConfig, getConfig, findConfig, CONFIG_FILE_NAMES, RuleSeverity, createConfig, ResolvedApi, } from './config';
-export { RedoclyClient } from './redocly';
-export * from './redocly/domains';
+export { Config, StyleguideConfig, RawConfig, RawUniversalConfig, IGNORE_FILE, getMergedConfig, transformConfig, loadConfig, getConfig, findConfig, CONFIG_FILE_NAMES, RuleSeverity, createConfig, ResolvedApi, } from './config';
 export { Source, BaseResolver, Document, resolveDocument, ResolveError, YamlParseError, makeDocumentFromString, } from './resolve';
 export { parseYaml, stringifyYaml } from './js-yaml';
 export { unescapePointer, isRef, isAbsoluteUrl } from './ref-utils';

package/lib/index.js

@@ -1,21 +1,7 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validate = exports.lint = exports.getTotals = exports.formatProblems = exports.getLineColLocation = exports.getAstNodeByPointer = exports.walkDocument = exports.normalizeVisitors = exports.getTypes = exports.detectSpec = exports.SpecVersion = exports.getMajorSpecVersion = exports.SpecMajorVersion = exports.isAbsoluteUrl = exports.isRef = exports.unescapePointer = exports.stringifyYaml = exports.parseYaml = exports.makeDocumentFromString = exports.YamlParseError = exports.ResolveError = exports.resolveDocument = exports.BaseResolver = exports.Source = exports.RedoclyClient = exports.createConfig = exports.CONFIG_FILE_NAMES = exports.findConfig = exports.getConfig = exports.loadConfig = exports.transformConfig = exports.getMergedConfig = exports.IGNORE_FILE = exports.StyleguideConfig = exports.Config = exports.Stats = exports.normalizeTypes = exports.ConfigTypes = exports.AsyncApi3Types = exports.AsyncApi2Types = exports.Oas2Types = exports.Oas3Types = exports.Arazzo1Types = exports.Oas3_1Types = exports.pause = exports.getProxyAgent = exports.isTruthy = exports.doesYamlFileExist = exports.slash = exports.readFileFromUrl = void 0;
-exports.bundleFromString = exports.mapTypeToComponent = exports.bundleDocument = exports.bundle = exports.lintConfig = exports.lintFromString = exports.lintDocument = void 0;
+exports.lintDocument = exports.validate = exports.lint = exports.getTotals = exports.formatProblems = exports.getLineColLocation = exports.getAstNodeByPointer = exports.walkDocument = exports.normalizeVisitors = exports.getTypes = exports.detectSpec = exports.SpecVersion = exports.getMajorSpecVersion = exports.SpecMajorVersion = exports.isAbsoluteUrl = exports.isRef = exports.unescapePointer = exports.stringifyYaml = exports.parseYaml = exports.makeDocumentFromString = exports.YamlParseError = exports.ResolveError = exports.resolveDocument = exports.BaseResolver = exports.Source = exports.createConfig = exports.CONFIG_FILE_NAMES = exports.findConfig = exports.getConfig = exports.loadConfig = exports.transformConfig = exports.getMergedConfig = exports.IGNORE_FILE = exports.StyleguideConfig = exports.Config = exports.Stats = exports.normalizeTypes = exports.ConfigTypes = exports.AsyncApi3Types = exports.AsyncApi2Types = exports.Oas2Types = exports.Oas3Types = exports.Arazzo1Types = exports.Oas3_1Types = exports.pause = exports.getProxyAgent = exports.isTruthy = exports.doesYamlFileExist = exports.slash = exports.readFileFromUrl = void 0;
+exports.bundleFromString = exports.mapTypeToComponent = exports.bundleDocument = exports.bundle = exports.lintConfig = exports.lintFromString = void 0;
 var utils_1 = require("./utils");
 Object.defineProperty(exports, "readFileFromUrl", { enumerable: true, get: function () { return utils_1.readFileFromUrl; } });
 Object.defineProperty(exports, "slash", { enumerable: true, get: function () { return utils_1.slash; } });
@@ -52,9 +38,6 @@ Object.defineProperty(exports, "getConfig", { enumerable: true, get: function ()
 Object.defineProperty(exports, "findConfig", { enumerable: true, get: function () { return config_1.findConfig; } });
 Object.defineProperty(exports, "CONFIG_FILE_NAMES", { enumerable: true, get: function () { return config_1.CONFIG_FILE_NAMES; } });
 Object.defineProperty(exports, "createConfig", { enumerable: true, get: function () { return config_1.createConfig; } });
-var redocly_1 = require("./redocly");
-Object.defineProperty(exports, "RedoclyClient", { enumerable: true, get: function () { return redocly_1.RedoclyClient; } });
-__exportStar(require("./redocly/domains"), exports);
 var resolve_1 = require("./resolve");
 Object.defineProperty(exports, "Source", { enumerable: true, get: function () { return resolve_1.Source; } });
 Object.defineProperty(exports, "BaseResolver", { enumerable: true, get: function () { return resolve_1.BaseResolver; } });

package/lib/rules/async3/no-channel-trailing-slash.js

@@ -4,7 +4,7 @@ exports.NoChannelTrailingSlash = void 0;
 const NoChannelTrailingSlash = () => {
     return {
         Channel(channel, { report, location }) {
-            if (channel.address.endsWith('/') && channel.address !== '/') {
+            if (channel?.address?.endsWith('/') && channel?.address !== '/') {
                 report({
                     message: `\`${channel.address}\` should not have a trailing slash.`,
                     location: location.key(),

package/lib/types/redocly-yaml.js

@@ -307,8 +307,6 @@ const createConfigRoot = (nodeTypes) => ({
         apis: 'ConfigApis', // Override apis with internal format
         'features.openapi': 'ConfigReferenceDocs', // deprecated
         'features.mockServer': 'ConfigMockServer', // deprecated
-        organization: { type: 'string' },
-        region: { enum: ['us', 'eu'] },
         telemetry: { enum: ['on', 'off'] },
         resolve: {
             properties: {
@@ -316,12 +314,6 @@ const createConfigRoot = (nodeTypes) => ({
                 doNotResolveExamples: { type: 'boolean' },
             },
         },
-        files: {
-            type: 'array',
-            items: {
-                type: 'string',
-            },
-        },
     },
 });
 const ConfigApis = {
@@ -341,12 +333,6 @@ const createConfigApisProperties = (nodeTypes) => ({
         ...ConfigStyleguide.properties,
         'features.openapi': 'ConfigReferenceDocs', // deprecated
         'features.mockServer': 'ConfigMockServer', // deprecated
-        files: {
-            type: 'array',
-            items: {
-                type: 'string',
-            },
-        },
     },
 });
 const ConfigHTTP = {
@@ -474,7 +460,7 @@ const AssertionDefinitionAssertions = {
     },
     additionalProperties: (_value, key) => {
         if (/^\w+\/\w+$/.test(key))
-            return { type: 'object' };
+            return {};
         return;
     },
 };
@@ -925,7 +911,7 @@ const GenerateCodeSamples = {
 // TODO: deprecated
 const ConfigReferenceDocs = {
     properties: {
-        theme: 'ConfigTheme',
+        theme: 'ConfigTheme', // FIXME: ? theme is deprecated
         corsProxyUrl: { type: 'string' },
         ctrlFHijack: { type: 'boolean' },
         defaultSampleLanguage: { type: 'string' },

package/lib/utils.js

@@ -37,14 +37,15 @@ exports.nextTick = nextTick;
 exports.pause = pause;
 exports.getProxyAgent = getProxyAgent;
 exports.dequal = dequal;
-const fs = require("fs");
-const path_1 = require("path");
-const minimatch = require("minimatch");
+const fs = require("node:fs");
+const node_path_1 = require("node:path");
+const minimatch_1 = require("minimatch");
 const js_yaml_1 = require("./js-yaml");
 const env_1 = require("./env");
 const logger_1 = require("./logger");
 const https_proxy_agent_1 = require("https-proxy-agent");
-const pluralizeOne = require("pluralize");
+const pluralize1 = require("pluralize"); // FIXME: use correct import after migration to ESM
+const pluralizeOne = pluralize1.default || pluralize1; // FIXME: use correct import after migration to ESM
 var js_yaml_2 = require("./js-yaml");
 Object.defineProperty(exports, "parseYaml", { enumerable: true, get: function () { return js_yaml_2.parseYaml; } });
 Object.defineProperty(exports, "stringifyYaml", { enumerable: true, get: function () { return js_yaml_2.stringifyYaml; } });
@@ -103,7 +104,7 @@ function match(url, pattern) {
         // if pattern doesn't specify protocol directly, do not match against it
         url = url.replace(/^https?:\/\//, '');
     }
-    return minimatch(url, pattern);
+    return (0, minimatch_1.minimatch)(url, pattern);
 }
 function pickObjectProps(object, keys) {
     return Object.fromEntries(keys.filter((key) => key in object).map((key) => [key, object[key]]));
@@ -213,9 +214,7 @@ function isCustomRuleId(id) {
     return id.includes('/');
 }
 function doesYamlFileExist(filePath) {
-    return (((0, path_1.extname)(filePath) === '.yaml' || (0, path_1.extname)(filePath) === '.yml') &&
-        fs?.hasOwnProperty?.('existsSync') &&
-        fs.existsSync(filePath));
+    return (((0, node_path_1.extname)(filePath) === '.yaml' || (0, node_path_1.extname)(filePath) === '.yml') && !!fs?.existsSync?.(filePath));
 }
 function showWarningForDeprecatedField(deprecatedField, updatedField, updatedObject, link) {
     const readMoreText = link ? `Read more about this change: ${link}` : '';

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@redocly/openapi-core",
-  "version": "0.0.0-snapshot.1741951669",
+  "version": "0.0.0-snapshot.1742384755",
   "description": "",
   "main": "lib/index.js",
   "engines": {
-    "node": ">=18.17.0",
-    "npm": ">=9.5.0"
+    "node": ">=18.20.7",
+    "npm": ">=10.8.2"
   },
   "engineStrict": true,
   "license": "MIT",
@@ -17,6 +17,9 @@
     "fs": false,
     "path": "path-browserify",
     "os": false,
+    "node:fs": false,
+    "node:path": "path-browserify",
+    "node:os": false,
     "colorette": false,
     "https-proxy-agent": false
   },
@@ -41,14 +44,14 @@
     "https-proxy-agent": "^7.0.5",
     "js-levenshtein": "^1.1.6",
     "js-yaml": "^4.1.0",
-    "minimatch": "^5.0.1",
+    "minimatch": "^10.0.1",
     "pluralize": "^8.0.0",
     "yaml-ast-parser": "0.0.43"
   },
   "devDependencies": {
     "@types/js-levenshtein": "^1.1.0",
     "@types/js-yaml": "^4.0.3",
-    "@types/minimatch": "^3.0.5",
+    "@types/minimatch": "^5.1.2",
     "@types/pluralize": "^0.0.29",
     "json-schema-to-ts": "^3.1.0",
     "typescript": "5.5.3"

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

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

package/lib/decorators/common/registry-dependencies.js

@@ -1,24 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RegistryDependencies = void 0;
-const domains_1 = require("../../redocly/domains");
-const RegistryDependencies = () => {
-    const registryDependencies = new Set();
-    return {
-        Root: {
-            leave(_, ctx) {
-                const data = ctx.getVisitorData();
-                data.links = Array.from(registryDependencies);
-            },
-        },
-        ref(node) {
-            if (node.$ref) {
-                const link = node.$ref.split('#/')[0];
-                if ((0, domains_1.isRedoclyRegistryURL)(link)) {
-                    registryDependencies.add(link);
-                }
-            }
-        },
-    };
-};
-exports.RegistryDependencies = RegistryDependencies;

package/lib/redocly/domains.d.ts

@@ -1,14 +0,0 @@
-import type { Region } from '../config/types';
-export declare const DEFAULT_REGION = "us";
-export declare const DOMAINS: {
-    us: string;
-    eu: string;
-};
-export declare const AVAILABLE_REGIONS: Region[];
-export declare function getDomains(): {
-    us: string;
-    eu: string;
-};
-export declare function setRedoclyDomain(domain: string): void;
-export declare function getRedoclyDomain(): string;
-export declare function isRedoclyRegistryURL(link: string): boolean;

package/lib/redocly/domains.js

@@ -1,41 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AVAILABLE_REGIONS = exports.DOMAINS = exports.DEFAULT_REGION = void 0;
-exports.getDomains = getDomains;
-exports.setRedoclyDomain = setRedoclyDomain;
-exports.getRedoclyDomain = getRedoclyDomain;
-exports.isRedoclyRegistryURL = isRedoclyRegistryURL;
-let redoclyDomain = 'redocly.com';
-exports.DEFAULT_REGION = 'us';
-exports.DOMAINS = getDomains();
-exports.AVAILABLE_REGIONS = Object.keys(exports.DOMAINS);
-function getDomains() {
-    const domains = {
-        us: 'redocly.com',
-        eu: 'eu.redocly.com',
-    };
-    // FIXME: temporary fix for our lab environments
-    const domain = redoclyDomain;
-    if (domain?.endsWith('.redocly.host')) {
-        domains[domain.split('.')[0]] = domain;
-    }
-    if (domain === 'redoc.online') {
-        domains[domain] = domain;
-    }
-    return domains;
-}
-function setRedoclyDomain(domain) {
-    redoclyDomain = domain;
-}
-function getRedoclyDomain() {
-    return redoclyDomain;
-}
-function isRedoclyRegistryURL(link) {
-    const domain = getRedoclyDomain() || exports.DOMAINS[exports.DEFAULT_REGION];
-    const legacyDomain = domain === 'redocly.com' ? 'redoc.ly' : domain;
-    if (!link.startsWith(`https://api.${domain}/registry/`) &&
-        !link.startsWith(`https://api.${legacyDomain}/registry/`)) {
-        return false;
-    }
-    return true;
-}

package/lib/redocly/index.d.ts

@@ -1,30 +0,0 @@
-import { RegistryApi } from './registry-api';
-import type { RegionalToken, RegionalTokenWithValidity } from './redocly-client-types';
-import type { AccessTokens, Region } from '../config/types';
-export declare const TOKEN_FILENAME = ".redocly-config.json";
-export declare class RedoclyClient {
-    private accessTokens;
-    private region;
-    domain: string;
-    registryApi: RegistryApi;
-    constructor(region?: Region);
-    loadRegion(region?: Region): Region;
-    getRegion(): Region;
-    hasTokens(): boolean;
-    hasToken(): boolean;
-    getAuthorizationHeader(): Promise<string | undefined>;
-    setAccessTokens(accessTokens: AccessTokens): void;
-    loadTokens(): void;
-    getAllTokens(): RegionalToken[];
-    getValidTokens(): Promise<RegionalTokenWithValidity[]>;
-    getTokens(): Promise<RegionalTokenWithValidity[]>;
-    isAuthorizedWithRedoclyByRegion(): Promise<boolean>;
-    isAuthorizedWithRedocly(): Promise<boolean>;
-    readCredentialsFile(credentialsPath: string): any;
-    verifyToken(accessToken: string, verbose?: boolean): Promise<{
-        viewerId: string;
-        organizations: string[];
-    }>;
-    login(accessToken: string, verbose?: boolean): Promise<void>;
-    logout(): void;
-}

package/lib/redocly/index.js

@@ -1,131 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RedoclyClient = exports.TOKEN_FILENAME = void 0;
-const fs_1 = require("fs");
-const path_1 = require("path");
-const os_1 = require("os");
-const registry_api_1 = require("./registry-api");
-const env_1 = require("../env");
-const utils_1 = require("../utils");
-const logger_1 = require("../logger");
-const domains_1 = require("./domains");
-exports.TOKEN_FILENAME = '.redocly-config.json';
-class RedoclyClient {
-    constructor(region) {
-        this.accessTokens = {};
-        this.region = this.loadRegion(region);
-        this.loadTokens();
-        this.domain = region ? domains_1.DOMAINS[region] : env_1.env.REDOCLY_DOMAIN || domains_1.DOMAINS[domains_1.DEFAULT_REGION];
-        (0, domains_1.setRedoclyDomain)(this.domain);
-        this.registryApi = new registry_api_1.RegistryApi(this.accessTokens, this.region);
-    }
-    loadRegion(region) {
-        if (region && !domains_1.DOMAINS[region]) {
-            throw new Error(`Invalid argument: region in config file.\nGiven: ${logger_1.colorize.green(region)}, choices: "us", "eu".`);
-        }
-        if ((0, domains_1.getRedoclyDomain)()) {
-            return (domains_1.AVAILABLE_REGIONS.find((region) => domains_1.DOMAINS[region] === (0, domains_1.getRedoclyDomain)()) || domains_1.DEFAULT_REGION);
-        }
-        return region || domains_1.DEFAULT_REGION;
-    }
-    getRegion() {
-        return this.region;
-    }
-    hasTokens() {
-        return (0, utils_1.isNotEmptyObject)(this.accessTokens);
-    }
-    // <backward compatibility: old versions of portal>
-    hasToken() {
-        return !!this.accessTokens[this.region];
-    }
-    async getAuthorizationHeader() {
-        return this.accessTokens[this.region];
-    }
-    // </backward compatibility: portal>
-    setAccessTokens(accessTokens) {
-        this.accessTokens = accessTokens;
-    }
-    loadTokens() {
-        const credentialsPath = (0, path_1.resolve)((0, os_1.homedir)(), exports.TOKEN_FILENAME);
-        const credentials = this.readCredentialsFile(credentialsPath);
-        if ((0, utils_1.isNotEmptyObject)(credentials)) {
-            this.setAccessTokens({
-                ...credentials,
-                ...(credentials.token &&
-                    !credentials[this.region] && {
-                    [this.region]: credentials.token,
-                }),
-            });
-        }
-        if (env_1.env.REDOCLY_AUTHORIZATION) {
-            this.setAccessTokens({
-                ...this.accessTokens,
-                [this.region]: env_1.env.REDOCLY_AUTHORIZATION,
-            });
-        }
-    }
-    getAllTokens() {
-        return Object.entries(this.accessTokens)
-            .filter(([region]) => domains_1.AVAILABLE_REGIONS.includes(region))
-            .map(([region, token]) => ({ region, token }));
-    }
-    async getValidTokens() {
-        const allTokens = this.getAllTokens();
-        const verifiedTokens = await Promise.allSettled(allTokens.map(({ token }) => this.verifyToken(token)));
-        return allTokens
-            .filter((_, index) => verifiedTokens[index].status === 'fulfilled')
-            .map(({ token, region }) => ({ token, region, valid: true }));
-    }
-    async getTokens() {
-        return this.hasTokens() ? await this.getValidTokens() : [];
-    }
-    async isAuthorizedWithRedoclyByRegion() {
-        if (!this.hasTokens()) {
-            return false;
-        }
-        const accessToken = this.accessTokens[this.region];
-        if (!accessToken) {
-            return false;
-        }
-        try {
-            await this.verifyToken(accessToken);
-            return true;
-        }
-        catch (err) {
-            return false;
-        }
-    }
-    async isAuthorizedWithRedocly() {
-        return this.hasTokens() && (0, utils_1.isNotEmptyArray)(await this.getValidTokens());
-    }
-    readCredentialsFile(credentialsPath) {
-        return (0, fs_1.existsSync)(credentialsPath) ? JSON.parse((0, fs_1.readFileSync)(credentialsPath, 'utf-8')) : {};
-    }
-    async verifyToken(accessToken, verbose = false) {
-        return this.registryApi.authStatus(accessToken, verbose);
-    }
-    async login(accessToken, verbose = false) {
-        const credentialsPath = (0, path_1.resolve)((0, os_1.homedir)(), exports.TOKEN_FILENAME);
-        try {
-            await this.verifyToken(accessToken, verbose);
-        }
-        catch (err) {
-            throw new Error('Authorization failed. Please check if you entered a valid API key.');
-        }
-        const credentials = {
-            ...this.readCredentialsFile(credentialsPath),
-            [this.region]: accessToken,
-            token: accessToken, // FIXME: backward compatibility, remove on 1.0.0
-        };
-        this.accessTokens = credentials;
-        this.registryApi.setAccessTokens(credentials);
-        (0, fs_1.writeFileSync)(credentialsPath, JSON.stringify(credentials, null, 2));
-    }
-    logout() {
-        const credentialsPath = (0, path_1.resolve)((0, os_1.homedir)(), exports.TOKEN_FILENAME);
-        if ((0, fs_1.existsSync)(credentialsPath)) {
-            (0, fs_1.unlinkSync)(credentialsPath);
-        }
-    }
-}
-exports.RedoclyClient = RedoclyClient;

package/lib/redocly/redocly-client-types.d.ts

@@ -1,8 +0,0 @@
-import type { Region } from '../config/types';
-export interface RegionalToken {
-    region: Region;
-    token: string;
-}
-export interface RegionalTokenWithValidity extends RegionalToken {
-    valid: boolean;
-}

package/lib/redocly/redocly-client-types.js

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

package/lib/redocly/registry-api-types.d.ts

@@ -1,29 +0,0 @@
-interface VersionParams {
-    organizationId: string;
-    name: string;
-    version: string;
-}
-export interface PrepareFileuploadParams extends VersionParams {
-    filesHash: string;
-    filename: string;
-    isUpsert?: boolean;
-}
-export interface PushApiParams extends VersionParams {
-    rootFilePath: string;
-    filePaths: string[];
-    branch?: string;
-    isUpsert?: boolean;
-    isPublic?: boolean;
-    batchId?: string;
-    batchSize?: number;
-}
-export interface PrepareFileuploadOKResponse {
-    filePath: string;
-    signedUploadUrl: string;
-}
-export interface NotFoundProblemResponse {
-    status: 404;
-    title: 'Not Found';
-    code: 'ORGANIZATION_NOT_FOUND' | 'API_VERSION_NOT_FOUND';
-}
-export {};

package/lib/redocly/registry-api-types.js

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

package/lib/redocly/registry-api.d.ts

@@ -1,17 +0,0 @@
-import type { PrepareFileuploadOKResponse, PrepareFileuploadParams, PushApiParams } from './registry-api-types';
-import type { AccessTokens, Region } from '../config/types';
-export declare class RegistryApi {
-    private accessTokens;
-    private region;
-    constructor(accessTokens: AccessTokens, region: Region);
-    get accessToken(): string | false | undefined;
-    getBaseUrl(): string;
-    setAccessTokens(accessTokens: AccessTokens): this;
-    private request;
-    authStatus(accessToken: string, verbose?: boolean): Promise<{
-        viewerId: string;
-        organizations: string[];
-    }>;
-    prepareFileUpload({ organizationId, name, version, filesHash, filename, isUpsert, }: PrepareFileuploadParams): Promise<PrepareFileuploadOKResponse>;
-    pushApi({ organizationId, name, version, rootFilePath, filePaths, branch, isUpsert, isPublic, batchId, batchSize, }: PushApiParams): Promise<void>;
-}

package/lib/redocly/registry-api.js

@@ -1,100 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RegistryApi = void 0;
-const utils_1 = require("../utils");
-const domains_1 = require("./domains");
-const version = require('../../package.json').version;
-class RegistryApi {
-    constructor(accessTokens, region) {
-        this.accessTokens = accessTokens;
-        this.region = region;
-    }
-    get accessToken() {
-        return (0, utils_1.isNotEmptyObject)(this.accessTokens) && this.accessTokens[this.region];
-    }
-    getBaseUrl() {
-        return `https://api.${(0, domains_1.getRedoclyDomain)()}/registry`;
-    }
-    setAccessTokens(accessTokens) {
-        this.accessTokens = accessTokens;
-        return this;
-    }
-    async request(path = '', options = {}) {
-        const currentCommand = typeof process !== 'undefined' ? process.env?.REDOCLY_CLI_COMMAND || '' : '';
-        const redoclyEnv = typeof process !== 'undefined' ? process.env?.REDOCLY_ENVIRONMENT || '' : '';
-        const headers = Object.assign({}, options.headers || {}, {
-            'x-redocly-cli-version': version,
-            'user-agent': `redocly-cli / ${version} ${currentCommand} ${redoclyEnv}`,
-        });
-        if (!headers.hasOwnProperty('authorization')) {
-            throw new Error('Unauthorized');
-        }
-        const requestOptions = {
-            ...options,
-            headers,
-            agent: (0, utils_1.getProxyAgent)(),
-        };
-        const response = await fetch(`${this.getBaseUrl()}${path}`, requestOptions);
-        if (response.status === 401) {
-            throw new Error('Unauthorized');
-        }
-        if (response.status === 404) {
-            const body = await response.json();
-            throw new Error(body.code);
-        }
-        return response;
-    }
-    async authStatus(accessToken, verbose = false) {
-        try {
-            const response = await this.request('', { headers: { authorization: accessToken } });
-            return await response.json();
-        }
-        catch (error) {
-            if (verbose) {
-                console.log(error);
-            }
-            throw error;
-        }
-    }
-    async prepareFileUpload({ organizationId, name, version, filesHash, filename, isUpsert, }) {
-        const response = await this.request(`/${organizationId}/${name}/${version}/prepare-file-upload`, {
-            method: 'POST',
-            headers: {
-                'content-type': 'application/json',
-                authorization: this.accessToken,
-            },
-            body: JSON.stringify({
-                filesHash,
-                filename,
-                isUpsert,
-            }),
-        });
-        if (response.ok) {
-            return response.json();
-        }
-        throw new Error('Could not prepare file upload');
-    }
-    async pushApi({ organizationId, name, version, rootFilePath, filePaths, branch, isUpsert, isPublic, batchId, batchSize, }) {
-        const response = await this.request(`/${organizationId}/${name}/${version}`, {
-            method: 'PUT',
-            headers: {
-                'content-type': 'application/json',
-                authorization: this.accessToken,
-            },
-            body: JSON.stringify({
-                rootFilePath,
-                filePaths,
-                branch,
-                isUpsert,
-                isPublic,
-                batchId,
-                batchSize,
-            }),
-        });
-        if (response.ok) {
-            return;
-        }
-        throw new Error('Could not push api');
-    }
-}
-exports.RegistryApi = RegistryApi;