@redocly/openapi-core 1.10.2 → 1.10.4

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @redocly/openapi-core
 
+## 1.10.4
+
+### Patch Changes
+
+- Added a platform check so `@redocly/openapi-core` can support running inside a worker.
+- Allowed additional properties in `theme.openapi` config schema to enable libraries that use `@redocly/openapi-core` for configuration linting to extend this part of the schema.
+
+## 1.10.3
+
+### Patch Changes
+
+- Reverted "Users can run the CLI tool behind a proxy by using HTTP_PROXY or HTTPS_PROXY environment variables to configure the proxy settings" temporary.
+
 ## 1.10.2
 
 ### Patch Changes

package/lib/bundle.d.ts

@@ -47,4 +47,4 @@ export declare function bundleDocument(opts: {
     removeUnusedComponents?: boolean;
     keepUrlRefs?: boolean;
 }): Promise<BundleResult>;
-export declare function mapTypeToComponent(typeName: string, version: SpecMajorVersion): "parameters" | "examples" | "headers" | "schemas" | "responses" | "requestBodies" | "securitySchemes" | "links" | "callbacks" | "definitions" | null;
+export declare function mapTypeToComponent(typeName: string, version: SpecMajorVersion): "definitions" | "examples" | "links" | "responses" | "parameters" | "headers" | "schemas" | "requestBodies" | "securitySchemes" | "callbacks" | null;

package/lib/bundle.js

@@ -20,7 +20,7 @@ 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 redocly_1 = require("./redocly");
 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");
@@ -234,7 +234,7 @@ function makeBundleVisitor(version, dereference, skipRedoclyRegistryRefs, rootDo
                     return;
                 }
                 // do not bundle registry URL before push, otherwise we can't record dependencies
-                if (skipRedoclyRegistryRefs && (0, domains_1.isRedoclyRegistryURL)(node.$ref)) {
+                if (skipRedoclyRegistryRefs && (0, redocly_1.isRedoclyRegistryURL)(node.$ref)) {
                     return;
                 }
                 if (keepUrlRefs && (0, ref_utils_1.isAbsoluteUrl)(node.$ref)) {

package/lib/config/config.d.ts

@@ -3,6 +3,12 @@ import { SpecVersion, SpecMajorVersion, Oas2RuleSet, Oas3RuleSet, Async2RuleSet
 import type { NodeType } from '../types';
 import type { DecoratorConfig, Plugin, PreprocessorConfig, Region, ResolveConfig, ResolvedApi, ResolvedConfig, ResolvedStyleguideConfig, RuleConfig, RuleSettings, Telemetry, ThemeRawConfig } from './types';
 export declare const IGNORE_FILE = ".redocly.lint-ignore.yaml";
+export declare const DEFAULT_REGION = "us";
+export declare const DOMAINS: {
+    us: string;
+    eu: string;
+};
+export declare const AVAILABLE_REGIONS: Region[];
 export declare class StyleguideConfig {
     rawConfig: ResolvedStyleguideConfig;
     configFile?: string | undefined;

package/lib/config/config.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Config = exports.StyleguideConfig = exports.IGNORE_FILE = void 0;
+exports.Config = exports.StyleguideConfig = exports.AVAILABLE_REGIONS = exports.DOMAINS = exports.DEFAULT_REGION = exports.IGNORE_FILE = void 0;
 const fs = require("fs");
 const path = require("path");
 const js_yaml_1 = require("../js-yaml");
@@ -12,6 +12,22 @@ const ref_utils_1 = require("../ref-utils");
 exports.IGNORE_FILE = '.redocly.lint-ignore.yaml';
 const IGNORE_BANNER = `# This file instructs Redocly's linter to ignore the rules contained for specific parts of your API.\n` +
     `# See https://redoc.ly/docs/cli/ for more information.\n`;
+exports.DEFAULT_REGION = 'us';
+function getDomains() {
+    const domains = {
+        us: 'redocly.com',
+        eu: 'eu.redocly.com',
+    };
+    // FIXME: temporary fix for our lab environments
+    const domain = env_1.env.REDOCLY_DOMAIN;
+    if (domain === null || domain === void 0 ? void 0 : domain.endsWith('.redocly.host')) {
+        domains[domain.split('.')[0]] = domain;
+    }
+    if (domain === 'redoc.online') {
+        domains[domain] = domain;
+    }
+    return domains;
+}
 function getIgnoreFilePath(configFile) {
     if (configFile) {
         return (0, utils_1.doesYamlFileExist)(configFile)
@@ -22,6 +38,8 @@ function getIgnoreFilePath(configFile) {
         return env_1.isBrowser ? undefined : path.join(process.cwd(), exports.IGNORE_FILE);
     }
 }
+exports.DOMAINS = getDomains();
+exports.AVAILABLE_REGIONS = Object.keys(exports.DOMAINS);
 class StyleguideConfig {
     constructor(rawConfig, configFile) {
         this.rawConfig = rawConfig;

package/lib/config/load.js

@@ -15,10 +15,10 @@ const path = require("path");
 const redocly_1 = require("../redocly");
 const utils_1 = require("../utils");
 const js_yaml_1 = require("../js-yaml");
+const config_1 = require("./config");
 const utils_2 = require("./utils");
 const config_resolvers_1 = require("./config-resolvers");
 const bundle_1 = require("../bundle");
-const domains_1 = require("../redocly/domains");
 function addConfigMetadata({ rawConfig, customExtends, configPath, tokens, files, region, }) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
@@ -36,7 +36,7 @@ function addConfigMetadata({ rawConfig, customExtends, configPath, tokens, files
                 rawConfig.resolve.http = {};
             rawConfig.resolve.http.headers = [...((_a = rawConfig.resolve.http.headers) !== null && _a !== void 0 ? _a : [])];
             for (const item of tokens) {
-                const domain = domains_1.DOMAINS[item.region];
+                const domain = config_1.DOMAINS[item.region];
                 rawConfig.resolve.http.headers.push({
                     matches: `https://api.${domain}/registry/**`,
                     name: 'Authorization',

package/lib/config/types.d.ts

@@ -157,14 +157,4 @@ export type ThemeRawConfig = {
     mockServer?: Record<string, any>;
 };
 export type RulesFields = 'rules' | 'oas2Rules' | 'oas3_0Rules' | 'oas3_1Rules' | 'async2Rules' | 'preprocessors' | 'oas2Preprocessors' | 'oas3_0Preprocessors' | 'oas3_1Preprocessors' | 'async2Preprocessors' | 'decorators' | 'oas2Decorators' | 'oas3_0Decorators' | 'oas3_1Decorators' | 'async2Decorators';
-export declare enum AuthProviderType {
-    OIDC = "OIDC",
-    SAML2 = "SAML2",
-    BASIC = "BASIC"
-}
-export declare enum ApigeeDevOnboardingIntegrationAuthType {
-    SERVICE_ACCOUNT = "SERVICE_ACCOUNT",
-    OAUTH2 = "OAUTH2"
-}
-export declare const DEFAULT_TEAM_CLAIM_NAME = "https://redocly.com/sso/teams";
 export {};

package/lib/config/types.js

@@ -1,15 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_TEAM_CLAIM_NAME = exports.ApigeeDevOnboardingIntegrationAuthType = exports.AuthProviderType = void 0;
-var AuthProviderType;
-(function (AuthProviderType) {
-    AuthProviderType["OIDC"] = "OIDC";
-    AuthProviderType["SAML2"] = "SAML2";
-    AuthProviderType["BASIC"] = "BASIC";
-})(AuthProviderType || (exports.AuthProviderType = AuthProviderType = {}));
-var ApigeeDevOnboardingIntegrationAuthType;
-(function (ApigeeDevOnboardingIntegrationAuthType) {
-    ApigeeDevOnboardingIntegrationAuthType["SERVICE_ACCOUNT"] = "SERVICE_ACCOUNT";
-    ApigeeDevOnboardingIntegrationAuthType["OAUTH2"] = "OAUTH2";
-})(ApigeeDevOnboardingIntegrationAuthType || (exports.ApigeeDevOnboardingIntegrationAuthType = ApigeeDevOnboardingIntegrationAuthType = {}));
-exports.DEFAULT_TEAM_CLAIM_NAME = 'https://redocly.com/sso/teams';

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RegistryDependencies = void 0;
-const domains_1 = require("../../redocly/domains");
+const redocly_1 = require("../../redocly");
 const RegistryDependencies = () => {
     const registryDependencies = new Set();
     return {
@@ -14,7 +14,7 @@ const RegistryDependencies = () => {
         ref(node) {
             if (node.$ref) {
                 const link = node.$ref.split('#/')[0];
-                if ((0, domains_1.isRedoclyRegistryURL)(link)) {
+                if ((0, redocly_1.isRedoclyRegistryURL)(link)) {
                     registryDependencies.add(link);
                 }
             }

package/lib/env.js

@@ -4,5 +4,7 @@ exports.env = exports.isBrowser = void 0;
 exports.isBrowser = 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
-typeof window !== 'undefined' || typeof process === 'undefined'; // main and worker thread
+typeof window !== 'undefined' ||
+    typeof process === 'undefined' ||
+    (process === null || process === void 0 ? void 0 : process.platform) === 'browser'; // main and worker thread
 exports.env = exports.isBrowser ? {} : process.env || {};

package/lib/index.d.ts

@@ -1,4 +1,4 @@
-export { BundleOutputFormat, readFileFromUrl, slash, doesYamlFileExist, isTruthy, getProxyAgent, } from './utils';
+export { BundleOutputFormat, readFileFromUrl, slash, doesYamlFileExist, isTruthy } from './utils';
 export { Oas3_1Types } from './types/oas3_1';
 export { Oas3Types } from './types/oas3';
 export { Oas2Types } from './types/oas2';
@@ -10,8 +10,7 @@ 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 { RedoclyClient, isRedoclyRegistryURL } from './redocly';
 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,27 +1,12 @@
 "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.lintConfig = exports.lintFromString = 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.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.AsyncApi2Types = exports.Oas2Types = exports.Oas3Types = exports.Oas3_1Types = exports.getProxyAgent = exports.isTruthy = exports.doesYamlFileExist = exports.slash = exports.readFileFromUrl = void 0;
+exports.lintConfig = exports.lintFromString = 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.isRedoclyRegistryURL = 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.AsyncApi2Types = exports.Oas2Types = exports.Oas3Types = exports.Oas3_1Types = exports.isTruthy = exports.doesYamlFileExist = exports.slash = exports.readFileFromUrl = void 0;
 exports.bundleFromString = exports.mapTypeToComponent = exports.bundleDocument = exports.bundle = 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; } });
 Object.defineProperty(exports, "doesYamlFileExist", { enumerable: true, get: function () { return utils_1.doesYamlFileExist; } });
 Object.defineProperty(exports, "isTruthy", { enumerable: true, get: function () { return utils_1.isTruthy; } });
-Object.defineProperty(exports, "getProxyAgent", { enumerable: true, get: function () { return utils_1.getProxyAgent; } });
 var oas3_1_1 = require("./types/oas3_1");
 Object.defineProperty(exports, "Oas3_1Types", { enumerable: true, get: function () { return oas3_1_1.Oas3_1Types; } });
 var oas3_1 = require("./types/oas3");
@@ -49,7 +34,7 @@ Object.defineProperty(exports, "CONFIG_FILE_NAMES", { enumerable: true, get: fun
 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);
+Object.defineProperty(exports, "isRedoclyRegistryURL", { enumerable: true, get: function () { return redocly_1.isRedoclyRegistryURL; } });
 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/oas-types.d.ts

@@ -24,4 +24,4 @@ export type Oas2DecoratorsSet = Record<string, Oas2Preprocessor>;
 export type Async2DecoratorsSet = Record<string, Async2Preprocessor>;
 export declare function detectSpec(root: any): SpecVersion;
 export declare function getMajorSpecVersion(version: SpecVersion): SpecMajorVersion;
-export declare function getTypes(spec: SpecVersion): Record<string, import("./types").NodeType> | Record<"Root" | "Tag" | "ExternalDocs" | "SecurityRequirement" | "Info" | "Contact" | "License" | "Paths" | "PathItem" | "Parameter" | "Operation" | "Example" | "Header" | "Responses" | "Response" | "Schema" | "Xml" | "SchemaProperties" | "NamedSchemas" | "NamedResponses" | "NamedParameters" | "NamedSecuritySchemes" | "SecurityScheme" | "Examples" | "ExamplesMap" | "TagList" | "SecurityRequirementList" | "ParameterList" | "ParameterItems" | "TagGroup" | "TagGroups" | "EnumDescriptions" | "Logo" | "XCodeSample" | "XCodeSampleList" | "XServer" | "XServerList", import("./types").NodeType> | Record<"Root" | "Tag" | "ExternalDocs" | "Server" | "ServerVariable" | "SecurityRequirement" | "Info" | "Contact" | "License" | "Paths" | "PathItem" | "Callback" | "CallbacksMap" | "Parameter" | "Operation" | "RequestBody" | "MediaTypesMap" | "MediaType" | "Example" | "Encoding" | "Header" | "Responses" | "Response" | "Link" | "Schema" | "Xml" | "SchemaProperties" | "DiscriminatorMapping" | "Discriminator" | "Components" | "NamedSchemas" | "NamedResponses" | "NamedParameters" | "NamedExamples" | "NamedRequestBodies" | "NamedHeaders" | "NamedSecuritySchemes" | "NamedLinks" | "NamedCallbacks" | "ImplicitFlow" | "PasswordFlow" | "ClientCredentials" | "AuthorizationCode" | "OAuth2Flows" | "SecurityScheme" | "ServerVariablesMap" | "ExamplesMap" | "EncodingMap" | "HeadersMap" | "LinksMap" | "WebhooksMap" | "TagList" | "SecurityRequirementList" | "ParameterList" | "TagGroup" | "TagGroups" | "EnumDescriptions" | "Logo" | "XCodeSample" | "XCodeSampleList" | "ServerList" | "XUsePkce", import("./types").NodeType> | Record<"Root" | "Info" | "License" | "Operation" | "Schema" | "SchemaProperties" | "Components" | "SecurityScheme" | "NamedPathItems", import("./types").NodeType>;
+export declare function getTypes(spec: SpecVersion): Record<string, import("./types").NodeType> | Record<"Root" | "Tag" | "ExternalDocs" | "SecurityRequirement" | "Info" | "Contact" | "License" | "Paths" | "PathItem" | "Parameter" | "Operation" | "Example" | "Header" | "Responses" | "Response" | "Schema" | "Xml" | "SchemaProperties" | "NamedSchemas" | "NamedResponses" | "NamedParameters" | "NamedSecuritySchemes" | "SecurityScheme" | "Examples" | "ExamplesMap" | "TagList" | "SecurityRequirementList" | "ParameterList" | "ParameterItems" | "TagGroup" | "TagGroups" | "EnumDescriptions" | "Logo" | "XCodeSample" | "XCodeSampleList" | "XServer" | "XServerList", import("./types").NodeType> | Record<"Root" | "Tag" | "ExternalDocs" | "Server" | "ServerVariable" | "SecurityRequirement" | "Info" | "Contact" | "License" | "Paths" | "PathItem" | "Callback" | "CallbacksMap" | "Parameter" | "Operation" | "RequestBody" | "MediaTypesMap" | "MediaType" | "Example" | "Encoding" | "Header" | "Responses" | "Response" | "Link" | "Schema" | "Xml" | "SchemaProperties" | "DiscriminatorMapping" | "Discriminator" | "Components" | "NamedSchemas" | "NamedResponses" | "NamedParameters" | "NamedExamples" | "NamedRequestBodies" | "NamedHeaders" | "NamedSecuritySchemes" | "NamedLinks" | "NamedCallbacks" | "ImplicitFlow" | "PasswordFlow" | "ClientCredentials" | "AuthorizationCode" | "OAuth2Flows" | "SecurityScheme" | "ServerVariablesMap" | "ExamplesMap" | "EncodingMap" | "HeadersMap" | "LinksMap" | "TagList" | "SecurityRequirementList" | "ParameterList" | "TagGroup" | "TagGroups" | "EnumDescriptions" | "Logo" | "XCodeSample" | "XCodeSampleList" | "ServerList" | "XUsePkce" | "WebhooksMap", import("./types").NodeType> | Record<"Root" | "Info" | "License" | "Operation" | "Schema" | "SchemaProperties" | "Components" | "SecurityScheme" | "NamedPathItems", import("./types").NodeType>;

package/lib/redocly/index.d.ts

@@ -21,10 +21,11 @@ export declare class RedoclyClient {
     isAuthorizedWithRedoclyByRegion(): Promise<boolean>;
     isAuthorizedWithRedocly(): Promise<boolean>;
     readCredentialsFile(credentialsPath: string): any;
-    verifyToken(accessToken: string, verbose?: boolean): Promise<{
+    verifyToken(accessToken: string, region: Region, verbose?: boolean): Promise<{
         viewerId: string;
         organizations: string[];
     }>;
     login(accessToken: string, verbose?: boolean): Promise<void>;
     logout(): void;
 }
+export declare function isRedoclyRegistryURL(link: string): boolean;

package/lib/redocly/index.js

@@ -9,33 +9,33 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RedoclyClient = exports.TOKEN_FILENAME = void 0;
+exports.isRedoclyRegistryURL = 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 config_1 = require("../config/config");
 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.domain = region ? config_1.DOMAINS[region] : env_1.env.REDOCLY_DOMAIN || config_1.DOMAINS[config_1.DEFAULT_REGION];
+        env_1.env.REDOCLY_DOMAIN = this.domain; // isRedoclyRegistryURL depends on the value to be set
         this.registryApi = new registry_api_1.RegistryApi(this.accessTokens, this.region);
     }
     loadRegion(region) {
-        if (region && !domains_1.DOMAINS[region]) {
+        if (region && !config_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);
+        if (env_1.env.REDOCLY_DOMAIN) {
+            return (config_1.AVAILABLE_REGIONS.find((region) => config_1.DOMAINS[region] === env_1.env.REDOCLY_DOMAIN) || config_1.DEFAULT_REGION);
         }
-        return region || domains_1.DEFAULT_REGION;
+        return region || config_1.DEFAULT_REGION;
     }
     getRegion() {
         return this.region;
@@ -71,13 +71,13 @@ class RedoclyClient {
     }
     getAllTokens() {
         return Object.entries(this.accessTokens)
-            .filter(([region]) => domains_1.AVAILABLE_REGIONS.includes(region))
+            .filter(([region]) => config_1.AVAILABLE_REGIONS.includes(region))
             .map(([region, token]) => ({ region, token }));
     }
     getValidTokens() {
         return __awaiter(this, void 0, void 0, function* () {
             const allTokens = this.getAllTokens();
-            const verifiedTokens = yield Promise.allSettled(allTokens.map(({ token }) => this.verifyToken(token)));
+            const verifiedTokens = yield Promise.allSettled(allTokens.map(({ token, region }) => this.verifyToken(token, region)));
             return allTokens
                 .filter((_, index) => verifiedTokens[index].status === 'fulfilled')
                 .map(({ token, region }) => ({ token, region, valid: true }));
@@ -98,7 +98,7 @@ class RedoclyClient {
                 return false;
             }
             try {
-                yield this.verifyToken(accessToken);
+                yield this.verifyToken(accessToken, this.region);
                 return true;
             }
             catch (err) {
@@ -114,16 +114,16 @@ class RedoclyClient {
     readCredentialsFile(credentialsPath) {
         return (0, fs_1.existsSync)(credentialsPath) ? JSON.parse((0, fs_1.readFileSync)(credentialsPath, 'utf-8')) : {};
     }
-    verifyToken(accessToken, verbose = false) {
+    verifyToken(accessToken, region, verbose = false) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.registryApi.authStatus(accessToken, verbose);
+            return this.registryApi.authStatus(accessToken, region, verbose);
         });
     }
     login(accessToken, verbose = false) {
         return __awaiter(this, void 0, void 0, function* () {
             const credentialsPath = (0, path_1.resolve)((0, os_1.homedir)(), exports.TOKEN_FILENAME);
             try {
-                yield this.verifyToken(accessToken, verbose);
+                yield this.verifyToken(accessToken, this.region, verbose);
             }
             catch (err) {
                 throw new Error('Authorization failed. Please check if you entered a valid API key.');
@@ -142,3 +142,13 @@ class RedoclyClient {
     }
 }
 exports.RedoclyClient = RedoclyClient;
+function isRedoclyRegistryURL(link) {
+    const domain = env_1.env.REDOCLY_DOMAIN || config_1.DOMAINS[config_1.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;
+}
+exports.isRedoclyRegistryURL = isRedoclyRegistryURL;

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

@@ -5,10 +5,10 @@ export declare class RegistryApi {
     private region;
     constructor(accessTokens: AccessTokens, region: Region);
     get accessToken(): string | false | undefined;
-    getBaseUrl(): string;
+    getBaseUrl(region?: Region): string;
     setAccessTokens(accessTokens: AccessTokens): this;
     private request;
-    authStatus(accessToken: string, verbose?: boolean): Promise<{
+    authStatus(accessToken: string, region: Region, verbose?: boolean): Promise<{
         viewerId: string;
         organizations: string[];
     }>;

package/lib/redocly/registry-api.js

@@ -11,8 +11,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RegistryApi = void 0;
 const node_fetch_1 = require("node-fetch");
+const config_1 = require("../config/config");
 const utils_1 = require("../utils");
-const domains_1 = require("./domains");
 const version = require('../../package.json').version;
 class RegistryApi {
     constructor(accessTokens, region) {
@@ -22,14 +22,14 @@ class RegistryApi {
     get accessToken() {
         return (0, utils_1.isNotEmptyObject)(this.accessTokens) && this.accessTokens[this.region];
     }
-    getBaseUrl() {
-        return `https://api.${(0, domains_1.getRedoclyDomain)()}/registry`;
+    getBaseUrl(region = config_1.DEFAULT_REGION) {
+        return `https://api.${config_1.DOMAINS[region]}/registry`;
     }
     setAccessTokens(accessTokens) {
         this.accessTokens = accessTokens;
         return this;
     }
-    request(path = '', options = {}) {
+    request(path = '', options = {}, region) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             const currentCommand = typeof process !== 'undefined' ? ((_a = process.env) === null || _a === void 0 ? void 0 : _a.REDOCLY_CLI_COMMAND) || '' : '';
@@ -41,7 +41,7 @@ class RegistryApi {
             if (!headers.hasOwnProperty('authorization')) {
                 throw new Error('Unauthorized');
             }
-            const response = yield (0, node_fetch_1.default)(`${this.getBaseUrl()}${path}`, Object.assign({}, options, { headers, agent: (0, utils_1.getProxyAgent)() }));
+            const response = yield (0, node_fetch_1.default)(`${this.getBaseUrl(region)}${path}`, Object.assign({}, options, { headers }));
             if (response.status === 401) {
                 throw new Error('Unauthorized');
             }
@@ -52,10 +52,10 @@ class RegistryApi {
             return response;
         });
     }
-    authStatus(accessToken, verbose = false) {
+    authStatus(accessToken, region, verbose = false) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const response = yield this.request('', { headers: { authorization: accessToken } });
+                const response = yield this.request('', { headers: { authorization: accessToken } }, region);
                 return yield response.json();
             }
             catch (error) {
@@ -79,7 +79,7 @@ class RegistryApi {
                     filename,
                     isUpsert,
                 }),
-            });
+            }, this.region);
             if (response.ok) {
                 return response.json();
             }
@@ -103,7 +103,7 @@ class RegistryApi {
                     batchId,
                     batchSize,
                 }),
-            });
+            }, this.region);
             if (response.ok) {
                 return;
             }

package/lib/types/redocly-yaml.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConfigTypes = exports.createConfigTypes = void 0;
-const portal_config_schema_1 = require("./portal-config-schema");
+const config_1 = require("@redocly/config");
 const _1 = require(".");
 const utils_1 = require("../utils");
 const json_schema_adapter_1 = require("./json-schema-adapter");
@@ -888,7 +888,7 @@ const ConfigReferenceDocs = {
         preserveOriginalExtensionsName: { type: 'boolean' },
         markdownHeadingsAnchorLevel: { type: 'number' },
     },
-    additionalProperties: { type: 'string' },
+    additionalProperties: {},
 };
 const ConfigMockServer = {
     properties: {
@@ -964,4 +964,4 @@ const CoreConfigTypes = {
     AssertionDefinitionAssertions,
     AssertionDefinitionSubject,
 };
-exports.ConfigTypes = (0, exports.createConfigTypes)(portal_config_schema_1.rootRedoclyConfigSchema);
+exports.ConfigTypes = (0, exports.createConfigTypes)(config_1.rootRedoclyConfigSchema);

package/lib/utils.d.ts

@@ -1,6 +1,5 @@
 import { UserContext } from './walk';
 import { HttpResolveConfig } from './config';
-import { HttpsProxyAgent } from 'https-proxy-agent';
 export { parseYaml, stringifyYaml } from './js-yaml';
 export type StackFrame<T> = {
     prev: StackFrame<T> | null;
@@ -51,4 +50,3 @@ export declare function identity<T>(value: T): T;
 export declare function keysOf<T>(obj: T): (keyof T)[];
 export declare function pickDefined<T extends Record<string, unknown>>(obj?: T): Record<string, unknown> | undefined;
 export declare function nextTick(): void;
-export declare function getProxyAgent(): HttpsProxyAgent<string> | undefined;

package/lib/utils.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getProxyAgent = exports.nextTick = exports.pickDefined = exports.keysOf = exports.identity = exports.isTruthy = exports.showErrorForDeprecatedField = exports.showWarningForDeprecatedField = exports.doesYamlFileExist = exports.isCustomRuleId = exports.getMatchingStatusCodeRange = exports.assignExisting = exports.isNotString = exports.isString = exports.isNotEmptyObject = exports.slash = exports.isPathParameter = exports.yamlAndJsonSyncReader = exports.readFileAsStringSync = exports.isSingular = exports.validateMimeTypeOAS3 = exports.validateMimeType = exports.splitCamelCaseIntoWords = exports.omitObjectProps = exports.pickObjectProps = exports.readFileFromUrl = exports.isEmptyArray = exports.isEmptyObject = exports.isPlainObject = exports.isDefined = exports.loadYaml = exports.popStack = exports.pushStack = exports.stringifyYaml = exports.parseYaml = void 0;
+exports.nextTick = exports.pickDefined = exports.keysOf = exports.identity = exports.isTruthy = exports.showErrorForDeprecatedField = exports.showWarningForDeprecatedField = exports.doesYamlFileExist = exports.isCustomRuleId = exports.getMatchingStatusCodeRange = exports.assignExisting = exports.isNotString = exports.isString = exports.isNotEmptyObject = exports.slash = exports.isPathParameter = exports.yamlAndJsonSyncReader = exports.readFileAsStringSync = exports.isSingular = exports.validateMimeTypeOAS3 = exports.validateMimeType = exports.splitCamelCaseIntoWords = exports.omitObjectProps = exports.pickObjectProps = exports.readFileFromUrl = exports.isEmptyArray = exports.isEmptyObject = exports.isPlainObject = exports.isDefined = exports.loadYaml = exports.popStack = exports.pushStack = exports.stringifyYaml = exports.parseYaml = void 0;
 const fs = require("fs");
 const path_1 = require("path");
 const minimatch = require("minimatch");
@@ -18,7 +18,6 @@ const pluralize = require("pluralize");
 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");
 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; } });
@@ -240,8 +239,3 @@ exports.nextTick = nextTick;
 function getUpdatedFieldName(updatedField, updatedObject) {
     return `${typeof updatedObject !== 'undefined' ? `${updatedObject}.` : ''}${updatedField}`;
 }
-function getProxyAgent() {
-    const proxy = process.env.HTTPS_PROXY || process.env.HTTP_PROXY;
-    return proxy ? new https_proxy_agent_1.HttpsProxyAgent(proxy) : undefined;
-}
-exports.getProxyAgent = getProxyAgent;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redocly/openapi-core",
-  "version": "1.10.2",
+  "version": "1.10.4",
   "description": "",
   "main": "lib/index.js",
   "engines": {
@@ -18,8 +18,7 @@
     "path": "path-browserify",
     "os": false,
     "node-fetch": false,
-    "colorette": false,
-    "https-proxy-agent": false
+    "colorette": false
   },
   "homepage": "https://github.com/Redocly/redocly-cli",
   "keywords": [
@@ -36,8 +35,8 @@
   ],
   "dependencies": {
     "@redocly/ajv": "^8.11.0",
+    "@redocly/config": "^0.1.1",
     "colorette": "^1.2.0",
-    "https-proxy-agent": "^7.0.4",
     "js-levenshtein": "^1.1.6",
     "js-yaml": "^4.1.0",
     "lodash.isequal": "^4.5.0",

package/src/__tests__/lint.test.ts

@@ -6,7 +6,7 @@ import { BaseResolver } from '../resolve';
 import { loadConfig } from '../config/load';
 import { parseYamlToDocument, replaceSourceWithRef, makeConfig } from '../../__tests__/utils';
 import { detectSpec } from '../oas-types';
-import { themeConfigSchema } from '../types/theme-config';
+import { rootRedoclyConfigSchema } from '@redocly/config';
 import { createConfigTypes } from '../types/redocly-yaml';
 
 const testPortalConfig = parseYamlToDocument(
@@ -1124,20 +1124,6 @@ describe('lint', () => {
           "severity": "error",
           "suggest": [],
         },
-        {
-          "from": undefined,
-          "location": [
-            {
-              "pointer": "#/theme/footer/items/0/items/0/href",
-              "reportOnKey": true,
-              "source": "",
-            },
-          ],
-          "message": "Property \`href\` is not expected here.",
-          "ruleId": "configuration spec",
-          "severity": "error",
-          "suggest": [],
-        },
         {
           "from": undefined,
           "location": [
@@ -1204,7 +1190,7 @@ describe('lint', () => {
       document,
       externalConfigTypes: createConfigTypes({
         type: 'object',
-        properties: { theme: themeConfigSchema },
+        properties: { theme: rootRedoclyConfigSchema.properties.theme },
         additionalProperties: false,
       }),
     });
@@ -1379,20 +1365,6 @@ describe('lint', () => {
           "severity": "error",
           "suggest": [],
         },
-        {
-          "from": undefined,
-          "location": [
-            {
-              "pointer": "#/theme/footer/items/0/items/0/href",
-              "reportOnKey": true,
-              "source": "",
-            },
-          ],
-          "message": "Property \`href\` is not expected here.",
-          "ruleId": "configuration spec",
-          "severity": "error",
-          "suggest": [],
-        },
         {
           "from": undefined,
           "location": [

package/src/bundle.ts

@@ -14,7 +14,7 @@ import { isAbsoluteUrl, isRef, Location, refBaseName } from './ref-utils';
 import { initRules } from './config/rules';
 import { reportUnresolvedRef } from './rules/no-unresolved-refs';
 import { isPlainObject, isTruthy } from './utils';
-import { isRedoclyRegistryURL } from './redocly/domains';
+import { isRedoclyRegistryURL } from './redocly';
 import { RemoveUnusedComponents as RemoveUnusedComponentsOas2 } from './decorators/oas2/remove-unused-components';
 import { RemoveUnusedComponents as RemoveUnusedComponentsOas3 } from './decorators/oas3/remove-unused-components';
 import { ConfigTypes } from './types/redocly-yaml';