@redocly/openapi-core 1.9.0 → 1.10.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @redocly/openapi-core
 
+## 1.10.0
+
+### Minor Changes
+
+- Users can run the CLI tool behind a proxy by using `HTTP_PROXY` or `HTTPS_PROXY` environment variables to configure the proxy settings.
+
+## 1.9.1
+
+### Patch Changes
+
+- Fixed a bug with resolving $refs to file names that contain the hash symbol.
+
 ## 1.9.0
 
 ### Minor 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): "responses" | "parameters" | "examples" | "headers" | "schemas" | "requestBodies" | "securitySchemes" | "links" | "callbacks" | "definitions" | null;
+export declare function mapTypeToComponent(typeName: string, version: SpecMajorVersion): "parameters" | "examples" | "headers" | "schemas" | "responses" | "requestBodies" | "securitySchemes" | "links" | "callbacks" | "definitions" | 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 redocly_1 = require("./redocly");
+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");
@@ -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, redocly_1.isRedoclyRegistryURL)(node.$ref)) {
+                if (skipRedoclyRegistryRefs && (0, domains_1.isRedoclyRegistryURL)(node.$ref)) {
                     return;
                 }
                 if (keepUrlRefs && (0, ref_utils_1.isAbsoluteUrl)(node.$ref)) {

package/lib/config/config.d.ts

@@ -3,12 +3,6 @@ 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.AVAILABLE_REGIONS = exports.DOMAINS = exports.DEFAULT_REGION = exports.IGNORE_FILE = void 0;
+exports.Config = exports.StyleguideConfig = exports.IGNORE_FILE = void 0;
 const fs = require("fs");
 const path = require("path");
 const js_yaml_1 = require("../js-yaml");
@@ -12,22 +12,6 @@ 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)
@@ -38,8 +22,6 @@ 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 = config_1.DOMAINS[item.region];
+                const domain = domains_1.DOMAINS[item.region];
                 rawConfig.resolve.http.headers.push({
                     matches: `https://api.${domain}/registry/**`,
                     name: 'Authorization',

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RegistryDependencies = void 0;
-const redocly_1 = require("../../redocly");
+const domains_1 = require("../../redocly/domains");
 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, redocly_1.isRedoclyRegistryURL)(link)) {
+                if ((0, domains_1.isRedoclyRegistryURL)(link)) {
                     registryDependencies.add(link);
                 }
             }

package/lib/index.d.ts

@@ -1,4 +1,4 @@
-export { BundleOutputFormat, readFileFromUrl, slash, doesYamlFileExist, isTruthy } from './utils';
+export { BundleOutputFormat, readFileFromUrl, slash, doesYamlFileExist, isTruthy, getProxyAgent, } from './utils';
 export { Oas3_1Types } from './types/oas3_1';
 export { Oas3Types } from './types/oas3';
 export { Oas2Types } from './types/oas2';
@@ -10,7 +10,8 @@ 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, isRedoclyRegistryURL } from './redocly';
+export { RedoclyClient } from './redocly';
+export * from './redocly/domains';
 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,12 +1,27 @@
 "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.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.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.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");
@@ -34,7 +49,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; } });
-Object.defineProperty(exports, "isRedoclyRegistryURL", { enumerable: true, get: function () { return redocly_1.isRedoclyRegistryURL; } });
+__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/lint.d.ts

@@ -25,4 +25,5 @@ export declare function lintConfig(opts: {
     resolvedRefMap?: ResolvedRefMap;
     severity?: ProblemSeverity;
     externalRefResolver?: BaseResolver;
+    externalConfigTypes?: Record<string, NodeType>;
 }): Promise<import("./walk").NormalizedProblem[]>;

package/lib/lint.js

@@ -96,7 +96,7 @@ function lintConfig(opts) {
             plugins,
             rules: { spec: 'error' },
         });
-        const types = (0, types_1.normalizeTypes)(redocly_yaml_1.ConfigTypes, config);
+        const types = (0, types_1.normalizeTypes)(opts.externalConfigTypes || redocly_yaml_1.ConfigTypes, config);
         const rules = [
             {
                 severity: severity || 'error',

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>;
+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>;

package/lib/redocly/domains.d.ts

@@ -0,0 +1,14 @@
+import { 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

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isRedoclyRegistryURL = exports.getRedoclyDomain = exports.setRedoclyDomain = exports.getDomains = exports.AVAILABLE_REGIONS = exports.DOMAINS = exports.DEFAULT_REGION = void 0;
+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 === null || domain === void 0 ? void 0 : domain.endsWith('.redocly.host')) {
+        domains[domain.split('.')[0]] = domain;
+    }
+    if (domain === 'redoc.online') {
+        domains[domain] = domain;
+    }
+    return domains;
+}
+exports.getDomains = getDomains;
+function setRedoclyDomain(domain) {
+    redoclyDomain = domain;
+}
+exports.setRedoclyDomain = setRedoclyDomain;
+function getRedoclyDomain() {
+    return redoclyDomain;
+}
+exports.getRedoclyDomain = getRedoclyDomain;
+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;
+}
+exports.isRedoclyRegistryURL = isRedoclyRegistryURL;

package/lib/redocly/index.d.ts

@@ -21,11 +21,10 @@ export declare class RedoclyClient {
     isAuthorizedWithRedoclyByRegion(): Promise<boolean>;
     isAuthorizedWithRedocly(): Promise<boolean>;
     readCredentialsFile(credentialsPath: string): any;
-    verifyToken(accessToken: string, region: Region, verbose?: boolean): Promise<{
+    verifyToken(accessToken: string, 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.isRedoclyRegistryURL = exports.RedoclyClient = exports.TOKEN_FILENAME = void 0;
+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 ? 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.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 && !config_1.DOMAINS[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 (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);
+        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 || config_1.DEFAULT_REGION;
+        return region || domains_1.DEFAULT_REGION;
     }
     getRegion() {
         return this.region;
@@ -71,13 +71,13 @@ class RedoclyClient {
     }
     getAllTokens() {
         return Object.entries(this.accessTokens)
-            .filter(([region]) => config_1.AVAILABLE_REGIONS.includes(region))
+            .filter(([region]) => domains_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, region }) => this.verifyToken(token, region)));
+            const verifiedTokens = yield Promise.allSettled(allTokens.map(({ token }) => this.verifyToken(token)));
             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, this.region);
+                yield this.verifyToken(accessToken);
                 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, region, verbose = false) {
+    verifyToken(accessToken, verbose = false) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.registryApi.authStatus(accessToken, region, verbose);
+            return this.registryApi.authStatus(accessToken, 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, this.region, verbose);
+                yield this.verifyToken(accessToken, verbose);
             }
             catch (err) {
                 throw new Error('Authorization failed. Please check if you entered a valid API key.');
@@ -142,13 +142,3 @@ 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(region?: Region): string;
+    getBaseUrl(): string;
     setAccessTokens(accessTokens: AccessTokens): this;
     private request;
-    authStatus(accessToken: string, region: Region, verbose?: boolean): Promise<{
+    authStatus(accessToken: string, 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(region = config_1.DEFAULT_REGION) {
-        return `https://api.${config_1.DOMAINS[region]}/registry`;
+    getBaseUrl() {
+        return `https://api.${(0, domains_1.getRedoclyDomain)()}/registry`;
     }
     setAccessTokens(accessTokens) {
         this.accessTokens = accessTokens;
         return this;
     }
-    request(path = '', options = {}, region) {
+    request(path = '', options = {}) {
         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(region)}${path}`, Object.assign({}, options, { headers }));
+            const response = yield (0, node_fetch_1.default)(`${this.getBaseUrl()}${path}`, Object.assign({}, options, { headers, agent: (0, utils_1.getProxyAgent)() }));
             if (response.status === 401) {
                 throw new Error('Unauthorized');
             }
@@ -52,10 +52,10 @@ class RegistryApi {
             return response;
         });
     }
-    authStatus(accessToken, region, verbose = false) {
+    authStatus(accessToken, verbose = false) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const response = yield this.request('', { headers: { authorization: accessToken } }, region);
+                const response = yield this.request('', { headers: { authorization: accessToken } });
                 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/ref-utils.js

@@ -39,9 +39,9 @@ function escapePointer(fragment) {
 }
 exports.escapePointer = escapePointer;
 function parseRef(ref) {
-    const [uri, pointer = ''] = ref.split('#');
+    const [uri, pointer = ''] = ref.split('#/');
     return {
-        uri: uri || null,
+        uri: (uri.endsWith('#') ? uri.slice(0, -1) : uri) || null,
         pointer: parsePointer(pointer),
     };
 }

package/lib/resolve.js

@@ -211,8 +211,16 @@ function resolveDocument(opts) {
                     if (itemsType === undefined && type !== unknownType && type !== types_1.SpecExtension) {
                         return;
                     }
+                    const isTypeAFunction = typeof itemsType === 'function';
                     for (let i = 0; i < node.length; i++) {
-                        walk(node[i], itemsType || unknownType, (0, ref_utils_1.joinPointer)(nodeAbsoluteRef, i));
+                        const itemType = isTypeAFunction
+                            ? itemsType(node[i], (0, ref_utils_1.joinPointer)(nodeAbsoluteRef, i))
+                            : itemsType;
+                        // we continue resolving unknown types, but stop early on known scalars
+                        if (itemType === undefined && type !== unknownType && type !== types_1.SpecExtension) {
+                            continue;
+                        }
+                        walk(node[i], (0, types_1.isNamedType)(itemType) ? itemType : unknownType, (0, ref_utils_1.joinPointer)(nodeAbsoluteRef, i));
                     }
                     return;
                 }

package/lib/types/index.d.ts

@@ -19,26 +19,26 @@ export type NormalizedScalarSchema = {
 export type NodeType = {
     properties: Record<string, PropType | ResolveTypeFn>;
     additionalProperties?: PropType | ResolveTypeFn;
-    items?: string;
+    items?: PropType | ResolveTypeFn;
     required?: string[] | ((value: any, key: string | number | undefined) => string[]);
     requiredOneOf?: string[];
     allowed?: (value: any) => string[] | undefined;
     extensionsPrefix?: string;
 };
-type PropType = string | NodeType | ScalarSchema | undefined | null;
-type ResolveTypeFn = (value: any, key: string) => string | PropType;
+export type PropType = string | NodeType | ScalarSchema | undefined | null;
+export type ResolveTypeFn = (value: any, key: string) => string | PropType;
 export type NormalizedNodeType = {
     name: string;
     properties: Record<string, NormalizedPropType | NormalizedResolveTypeFn>;
     additionalProperties?: NormalizedPropType | NormalizedResolveTypeFn;
-    items?: NormalizedNodeType;
+    items?: NormalizedPropType | NormalizedResolveTypeFn;
     required?: string[] | ((value: any, key: string | number | undefined) => string[]);
     requiredOneOf?: string[];
     allowed?: (value: any) => string[] | undefined;
     extensionsPrefix?: string;
 };
-type NormalizedPropType = NormalizedNodeType | NormalizedScalarSchema | undefined | null;
-type NormalizedResolveTypeFn = (value: any, key: string) => NormalizedNodeType | NormalizedScalarSchema | undefined | null;
+type NormalizedPropType = NormalizedNodeType | NormalizedScalarSchema | null | undefined;
+type NormalizedResolveTypeFn = (value: any, key: string) => NormalizedPropType;
 export declare function listOf(typeName: string): {
     name: string;
     properties: {};
@@ -53,5 +53,5 @@ export declare const SpecExtension: NormalizedNodeType;
 export declare function normalizeTypes(types: Record<string, NodeType>, options?: {
     doNotResolveExamples?: boolean;
 }): Record<string, NormalizedNodeType>;
-export declare function isNamedType(t: NormalizedNodeType | NormalizedScalarSchema | null | undefined): t is NormalizedNodeType;
+export declare function isNamedType(t: NormalizedPropType): t is NormalizedNodeType;
 export {};

package/lib/types/json-schema-adapter.d.ts

@@ -0,0 +1,3 @@
+import type { NodeType } from '.';
+import type { JSONSchema } from 'json-schema-to-ts';
+export declare function getNodeTypesFromJSONSchema(schemaName: string, entrySchema: JSONSchema): Record<string, NodeType>;