@redocly/openapi-core 1.18.1 → 1.19.0

package/lib/js-yaml/index.js

@@ -9,7 +9,7 @@ const DEFAULT_SCHEMA_WITHOUT_TIMESTAMP = js_yaml_1.JSON_SCHEMA.extend({
     implicit: [js_yaml_1.types.merge],
     explicit: [js_yaml_1.types.binary, js_yaml_1.types.omap, js_yaml_1.types.pairs, js_yaml_1.types.set],
 });
-const parseYaml = (str, opts) => (0, js_yaml_1.load)(str, Object.assign({ schema: DEFAULT_SCHEMA_WITHOUT_TIMESTAMP }, opts));
+const parseYaml = (str, opts) => (0, js_yaml_1.load)(str, { schema: DEFAULT_SCHEMA_WITHOUT_TIMESTAMP, ...opts });
 exports.parseYaml = parseYaml;
 const stringifyYaml = (obj, opts) => (0, js_yaml_1.dump)(obj, opts);
 exports.stringifyYaml = stringifyYaml;

package/lib/lint.d.ts

@@ -3,10 +3,12 @@ import { StyleguideConfig, Config } from './config';
 import type { Document, ResolvedRefMap } from './resolve';
 import type { ProblemSeverity } from './walk';
 import type { NodeType } from './types';
+import type { CollectFn } from './utils';
 export declare function lint(opts: {
     ref: string;
     config: Config;
     externalRefResolver?: BaseResolver;
+    collectSpecData?: CollectFn;
 }): Promise<import("./walk").NormalizedProblem[]>;
 export declare function lintFromString(opts: {
     source: string;

package/lib/lint.js

@@ -1,125 +1,118 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.lintConfig = exports.lintDocument = exports.lintFromString = exports.lint = void 0;
+exports.lint = lint;
+exports.lintFromString = lintFromString;
+exports.lintDocument = lintDocument;
+exports.lintConfig = lintConfig;
+const config_1 = require("@redocly/config");
 const resolve_1 = require("./resolve");
 const visitors_1 = require("./visitors");
 const walk_1 = require("./walk");
-const config_1 = require("./config");
+const config_2 = require("./config");
 const types_1 = require("./types");
 const ajv_1 = require("./rules/ajv");
 const oas_types_1 = require("./oas-types");
 const redocly_yaml_1 = require("./types/redocly-yaml");
 const spec_1 = require("./rules/common/spec");
 const no_unresolved_refs_1 = require("./rules/no-unresolved-refs");
-const config_2 = require("@redocly/config");
-function lint(opts) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { ref, externalRefResolver = new resolve_1.BaseResolver(opts.config.resolve) } = opts;
-        const document = (yield externalRefResolver.resolveDocument(null, ref, true));
-        return lintDocument(Object.assign(Object.assign({ document }, opts), { externalRefResolver, config: opts.config.styleguide }));
+async function lint(opts) {
+    const { ref, externalRefResolver = new resolve_1.BaseResolver(opts.config.resolve) } = opts;
+    const document = (await externalRefResolver.resolveDocument(null, ref, true));
+    opts.collectSpecData?.(document.parsed);
+    return lintDocument({
+        document,
+        ...opts,
+        externalRefResolver,
+        config: opts.config.styleguide,
     });
 }
-exports.lint = lint;
-function lintFromString(opts) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { source, absoluteRef, externalRefResolver = new resolve_1.BaseResolver(opts.config.resolve) } = opts;
-        const document = (0, resolve_1.makeDocumentFromString)(source, absoluteRef || '/');
-        return lintDocument(Object.assign(Object.assign({ document }, opts), { externalRefResolver, config: opts.config.styleguide }));
+async function lintFromString(opts) {
+    const { source, absoluteRef, externalRefResolver = new resolve_1.BaseResolver(opts.config.resolve) } = opts;
+    const document = (0, resolve_1.makeDocumentFromString)(source, absoluteRef || '/');
+    return lintDocument({
+        document,
+        ...opts,
+        externalRefResolver,
+        config: opts.config.styleguide,
     });
 }
-exports.lintFromString = lintFromString;
-function lintDocument(opts) {
-    return __awaiter(this, void 0, void 0, function* () {
-        (0, ajv_1.releaseAjvInstance)(); // FIXME: preprocessors can modify nodes which are then cached to ajv-instance by absolute path
-        const { document, customTypes, externalRefResolver, config } = opts;
-        const specVersion = (0, oas_types_1.detectSpec)(document.parsed);
-        const specMajorVersion = (0, oas_types_1.getMajorSpecVersion)(specVersion);
-        const rules = config.getRulesForOasVersion(specMajorVersion);
-        const types = (0, types_1.normalizeTypes)(config.extendTypes(customTypes !== null && customTypes !== void 0 ? customTypes : (0, oas_types_1.getTypes)(specVersion), specVersion), config);
-        const ctx = {
-            problems: [],
-            oasVersion: specVersion,
-            visitorsData: {},
-        };
-        const preprocessors = (0, config_1.initRules)(rules, config, 'preprocessors', specVersion);
-        const regularRules = (0, config_1.initRules)(rules, config, 'rules', specVersion);
-        let resolvedRefMap = yield (0, resolve_1.resolveDocument)({
-            rootDocument: document,
-            rootType: types.Root,
-            externalRefResolver,
-        });
-        if (preprocessors.length > 0) {
-            // Make additional pass to resolve refs defined in preprocessors.
-            (0, walk_1.walkDocument)({
-                document,
-                rootType: types.Root,
-                normalizedVisitors: (0, visitors_1.normalizeVisitors)(preprocessors, types),
-                resolvedRefMap,
-                ctx,
-            });
-            resolvedRefMap = yield (0, resolve_1.resolveDocument)({
-                rootDocument: document,
-                rootType: types.Root,
-                externalRefResolver,
-            });
-        }
-        const normalizedVisitors = (0, visitors_1.normalizeVisitors)(regularRules, types);
+async function lintDocument(opts) {
+    (0, ajv_1.releaseAjvInstance)(); // FIXME: preprocessors can modify nodes which are then cached to ajv-instance by absolute path
+    const { document, customTypes, externalRefResolver, config } = opts;
+    const specVersion = (0, oas_types_1.detectSpec)(document.parsed);
+    const specMajorVersion = (0, oas_types_1.getMajorSpecVersion)(specVersion);
+    const rules = config.getRulesForOasVersion(specMajorVersion);
+    const types = (0, types_1.normalizeTypes)(config.extendTypes(customTypes ?? (0, oas_types_1.getTypes)(specVersion), specVersion), config);
+    const ctx = {
+        problems: [],
+        oasVersion: specVersion,
+        visitorsData: {},
+    };
+    const preprocessors = (0, config_2.initRules)(rules, config, 'preprocessors', specVersion);
+    const regularRules = (0, config_2.initRules)(rules, config, 'rules', specVersion);
+    let resolvedRefMap = await (0, resolve_1.resolveDocument)({
+        rootDocument: document,
+        rootType: types.Root,
+        externalRefResolver,
+    });
+    if (preprocessors.length > 0) {
+        // Make additional pass to resolve refs defined in preprocessors.
         (0, walk_1.walkDocument)({
             document,
             rootType: types.Root,
-            normalizedVisitors,
+            normalizedVisitors: (0, visitors_1.normalizeVisitors)(preprocessors, types),
             resolvedRefMap,
             ctx,
         });
-        return ctx.problems.map((problem) => config.addProblemToIgnore(problem));
+        resolvedRefMap = await (0, resolve_1.resolveDocument)({
+            rootDocument: document,
+            rootType: types.Root,
+            externalRefResolver,
+        });
+    }
+    const normalizedVisitors = (0, visitors_1.normalizeVisitors)(regularRules, types);
+    (0, walk_1.walkDocument)({
+        document,
+        rootType: types.Root,
+        normalizedVisitors,
+        resolvedRefMap,
+        ctx,
     });
+    return ctx.problems.map((problem) => config.addProblemToIgnore(problem));
 }
-exports.lintDocument = lintDocument;
-function lintConfig(opts) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { document, severity, externalRefResolver = new resolve_1.BaseResolver(), config } = opts;
-        const ctx = {
-            problems: [],
-            oasVersion: oas_types_1.SpecVersion.OAS3_0,
-            visitorsData: {},
-        };
-        const types = (0, types_1.normalizeTypes)(opts.externalConfigTypes || (0, redocly_yaml_1.createConfigTypes)(config_2.rootRedoclyConfigSchema, config), { doNotResolveExamples: config.styleguide.doNotResolveExamples });
-        const rules = [
-            {
-                severity: severity || 'error',
-                ruleId: 'configuration spec',
-                visitor: (0, spec_1.Spec)({ severity: 'error' }),
-            },
-            {
-                severity: severity || 'error',
-                ruleId: 'configuration no-unresolved-refs',
-                visitor: (0, no_unresolved_refs_1.NoUnresolvedRefs)({ severity: 'error' }),
-            },
-        ];
-        const normalizedVisitors = (0, visitors_1.normalizeVisitors)(rules, types);
-        const resolvedRefMap = opts.resolvedRefMap ||
-            (yield (0, resolve_1.resolveDocument)({
-                rootDocument: document,
-                rootType: types.ConfigRoot,
-                externalRefResolver,
-            }));
-        (0, walk_1.walkDocument)({
-            document,
+async function lintConfig(opts) {
+    const { document, severity, externalRefResolver = new resolve_1.BaseResolver(), config } = opts;
+    const ctx = {
+        problems: [],
+        oasVersion: oas_types_1.SpecVersion.OAS3_0,
+        visitorsData: {},
+    };
+    const types = (0, types_1.normalizeTypes)(opts.externalConfigTypes || (0, redocly_yaml_1.createConfigTypes)(config_1.rootRedoclyConfigSchema, config), { doNotResolveExamples: config.styleguide.doNotResolveExamples });
+    const rules = [
+        {
+            severity: severity || 'error',
+            ruleId: 'configuration spec',
+            visitor: (0, spec_1.Spec)({ severity: 'error' }),
+        },
+        {
+            severity: severity || 'error',
+            ruleId: 'configuration no-unresolved-refs',
+            visitor: (0, no_unresolved_refs_1.NoUnresolvedRefs)({ severity: 'error' }),
+        },
+    ];
+    const normalizedVisitors = (0, visitors_1.normalizeVisitors)(rules, types);
+    const resolvedRefMap = opts.resolvedRefMap ||
+        (await (0, resolve_1.resolveDocument)({
+            rootDocument: document,
             rootType: types.ConfigRoot,
-            normalizedVisitors,
-            resolvedRefMap,
-            ctx,
-        });
-        return ctx.problems;
+            externalRefResolver,
+        }));
+    (0, walk_1.walkDocument)({
+        document,
+        rootType: types.ConfigRoot,
+        normalizedVisitors,
+        resolvedRefMap,
+        ctx,
     });
+    return ctx.problems;
 }
-exports.lintConfig = lintConfig;

package/lib/oas-types.d.ts

@@ -1,32 +1,36 @@
-import { Oas3Rule, Oas3Preprocessor, Oas2Rule, Oas2Preprocessor, Async2Preprocessor, Async2Rule, ArazzoPreprocessor, ArazzoRule } from './visitors';
-import { BuiltInAsync2RuleId, BuiltInCommonOASRuleId, BuiltInArazzoRuleId, BuiltInOAS2RuleId, BuiltInOAS3RuleId } from './types/redocly-yaml';
-export type RuleSet<T> = Record<string, T>;
+import type { Oas3Rule, Oas3Preprocessor, Oas2Rule, Oas2Preprocessor, Async2Preprocessor, Async2Rule, Async3Preprocessor, Async3Rule, ArazzoPreprocessor, ArazzoRule } from './visitors';
+import type { BuiltInAsync2RuleId, BuiltInAsync3RuleId, BuiltInCommonOASRuleId, BuiltInArazzoRuleId, BuiltInOAS2RuleId, BuiltInOAS3RuleId } from './types/redocly-yaml';
 export declare enum SpecVersion {
     OAS2 = "oas2",
     OAS3_0 = "oas3_0",
     OAS3_1 = "oas3_1",
     Async2 = "async2",
+    Async3 = "async3",
     Arazzo = "arazzo"
 }
 export declare enum SpecMajorVersion {
     OAS2 = "oas2",
     OAS3 = "oas3",
     Async2 = "async2",
+    Async3 = "async3",
     Arazzo = "arazzo"
 }
 export type RuleMap<Key extends string, RuleConfig, T> = Record<T extends 'built-in' ? Key : string, RuleConfig>;
 export type Oas3RuleSet<T = undefined> = RuleMap<BuiltInCommonOASRuleId | BuiltInOAS3RuleId | 'assertions', Oas3Rule, T>;
 export type Oas2RuleSet<T = undefined> = RuleMap<BuiltInCommonOASRuleId | BuiltInOAS2RuleId | 'assertions', Oas2Rule, T>;
 export type Async2RuleSet<T = undefined> = RuleMap<BuiltInAsync2RuleId | 'assertions', Async2Rule, T>;
+export type Async3RuleSet<T = undefined> = RuleMap<BuiltInAsync3RuleId | 'assertions', Async3Rule, T>;
 export type ArazzoRuleSet<T = undefined> = RuleMap<BuiltInArazzoRuleId | 'assertions', ArazzoRule, T>;
 export type Oas3PreprocessorsSet = Record<string, Oas3Preprocessor>;
 export type Oas2PreprocessorsSet = Record<string, Oas2Preprocessor>;
 export type Async2PreprocessorsSet = Record<string, Async2Preprocessor>;
+export type Async3PreprocessorsSet = Record<string, Async3Preprocessor>;
 export type ArazzoPreprocessorsSet = Record<string, ArazzoPreprocessor>;
 export type Oas3DecoratorsSet = Record<string, Oas3Preprocessor>;
 export type Oas2DecoratorsSet = Record<string, Oas2Preprocessor>;
 export type Async2DecoratorsSet = Record<string, Async2Preprocessor>;
+export type Async3DecoratorsSet = Record<string, Async3Preprocessor>;
 export type ArazzoDecoratorsSet = Record<string, ArazzoPreprocessor>;
-export declare function detectSpec(root: any): SpecVersion;
+export declare function detectSpec(root: unknown): 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" | "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" | "DependentRequired", 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" | "PatternProperties" | "NamedPathItems" | "DependentRequired", import("./types").NodeType>;

package/lib/oas-types.js

@@ -1,17 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTypes = exports.getMajorSpecVersion = exports.detectSpec = exports.SpecMajorVersion = exports.SpecVersion = void 0;
+exports.SpecMajorVersion = exports.SpecVersion = void 0;
+exports.detectSpec = detectSpec;
+exports.getMajorSpecVersion = getMajorSpecVersion;
+exports.getTypes = getTypes;
 const oas2_1 = require("./types/oas2");
 const oas3_1 = require("./types/oas3");
 const oas3_1_1 = require("./types/oas3_1");
-const asyncapi_1 = require("./types/asyncapi");
+const asyncapi2_1 = require("./types/asyncapi2");
+const asyncapi3_1 = require("./types/asyncapi3");
 const arazzo_1 = require("./types/arazzo");
+const utils_1 = require("./utils");
 var SpecVersion;
 (function (SpecVersion) {
     SpecVersion["OAS2"] = "oas2";
     SpecVersion["OAS3_0"] = "oas3_0";
     SpecVersion["OAS3_1"] = "oas3_1";
     SpecVersion["Async2"] = "async2";
+    SpecVersion["Async3"] = "async3";
     SpecVersion["Arazzo"] = "arazzo";
 })(SpecVersion || (exports.SpecVersion = SpecVersion = {}));
 var SpecMajorVersion;
@@ -19,47 +25,50 @@ var SpecMajorVersion;
     SpecMajorVersion["OAS2"] = "oas2";
     SpecMajorVersion["OAS3"] = "oas3";
     SpecMajorVersion["Async2"] = "async2";
+    SpecMajorVersion["Async3"] = "async3";
     SpecMajorVersion["Arazzo"] = "arazzo";
 })(SpecMajorVersion || (exports.SpecMajorVersion = SpecMajorVersion = {}));
 const typesMap = {
     [SpecVersion.OAS2]: oas2_1.Oas2Types,
     [SpecVersion.OAS3_0]: oas3_1.Oas3Types,
     [SpecVersion.OAS3_1]: oas3_1_1.Oas3_1Types,
-    [SpecVersion.Async2]: asyncapi_1.AsyncApi2Types,
+    [SpecVersion.Async2]: asyncapi2_1.AsyncApi2Types,
+    [SpecVersion.Async3]: asyncapi3_1.AsyncApi3Types,
     [SpecVersion.Arazzo]: arazzo_1.ArazzoTypes,
 };
 function detectSpec(root) {
-    if (typeof root !== 'object') {
+    if (!(0, utils_1.isPlainObject)(root)) {
         throw new Error(`Document must be JSON object, got ${typeof root}`);
     }
     if (root.openapi && typeof root.openapi !== 'string') {
         throw new Error(`Invalid OpenAPI version: should be a string but got "${typeof root.openapi}"`);
     }
-    if (root.openapi && root.openapi.startsWith('3.0')) {
+    if (typeof root.openapi === 'string' && root.openapi.startsWith('3.0')) {
         return SpecVersion.OAS3_0;
     }
-    if (root.openapi && root.openapi.startsWith('3.1')) {
+    if (typeof root.openapi === 'string' && root.openapi.startsWith('3.1')) {
         return SpecVersion.OAS3_1;
     }
     if (root.swagger && root.swagger === '2.0') {
         return SpecVersion.OAS2;
     }
-    // if not detected yet
     if (root.openapi || root.swagger) {
         throw new Error(`Unsupported OpenAPI version: ${root.openapi || root.swagger}`);
     }
-    if (root.asyncapi && root.asyncapi.startsWith('2.')) {
+    if (typeof root.asyncapi === 'string' && root.asyncapi.startsWith('2.')) {
         return SpecVersion.Async2;
     }
+    if (typeof root.asyncapi === 'string' && root.asyncapi.startsWith('3.')) {
+        return SpecVersion.Async3;
+    }
     if (root.asyncapi) {
         throw new Error(`Unsupported AsyncAPI version: ${root.asyncapi}`);
     }
-    if (root.arazzo && root.arazzo.startsWith('1.')) {
+    if (typeof root.arazzo === 'string' && root.arazzo.startsWith('1.')) {
         return SpecVersion.Arazzo;
     }
     throw new Error(`Unsupported specification`);
 }
-exports.detectSpec = detectSpec;
 function getMajorSpecVersion(version) {
     if (version === SpecVersion.OAS2) {
         return SpecMajorVersion.OAS2;
@@ -67,6 +76,9 @@ function getMajorSpecVersion(version) {
     else if (version === SpecVersion.Async2) {
         return SpecMajorVersion.Async2;
     }
+    else if (version === SpecVersion.Async3) {
+        return SpecMajorVersion.Async3;
+    }
     else if (version === SpecVersion.Arazzo) {
         return SpecMajorVersion.Arazzo;
     }
@@ -74,8 +86,6 @@ function getMajorSpecVersion(version) {
         return SpecMajorVersion.OAS3;
     }
 }
-exports.getMajorSpecVersion = getMajorSpecVersion;
 function getTypes(spec) {
     return typesMap[spec];
 }
-exports.getTypes = getTypes;

package/lib/redocly/domains.js

@@ -1,6 +1,10 @@
 "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;
+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();
@@ -12,7 +16,7 @@ function getDomains() {
     };
     // FIXME: temporary fix for our lab environments
     const domain = redoclyDomain;
-    if (domain === null || domain === void 0 ? void 0 : domain.endsWith('.redocly.host')) {
+    if (domain?.endsWith('.redocly.host')) {
         domains[domain.split('.')[0]] = domain;
     }
     if (domain === 'redoc.online') {
@@ -20,15 +24,12 @@ function getDomains() {
     }
     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;
@@ -38,4 +39,3 @@ function isRedoclyRegistryURL(link) {
     }
     return true;
 }
-exports.isRedoclyRegistryURL = isRedoclyRegistryURL;

package/lib/redocly/index.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RedoclyClient = exports.TOKEN_FILENAME = void 0;
 const fs_1 = require("fs");
@@ -47,10 +38,8 @@ class RedoclyClient {
     hasToken() {
         return !!this.accessTokens[this.region];
     }
-    getAuthorizationHeader() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.accessTokens[this.region];
-        });
+    async getAuthorizationHeader() {
+        return this.accessTokens[this.region];
     }
     // </backward compatibility: portal>
     setAccessTokens(accessTokens) {
@@ -60,13 +49,19 @@ class RedoclyClient {
         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(Object.assign(Object.assign({}, credentials), (credentials.token &&
-                !credentials[this.region] && {
-                [this.region]: credentials.token,
-            })));
+            this.setAccessTokens({
+                ...credentials,
+                ...(credentials.token &&
+                    !credentials[this.region] && {
+                    [this.region]: credentials.token,
+                }),
+            });
         }
         if (env_1.env.REDOCLY_AUTHORIZATION) {
-            this.setAccessTokens(Object.assign(Object.assign({}, this.accessTokens), { [this.region]: env_1.env.REDOCLY_AUTHORIZATION }));
+            this.setAccessTokens({
+                ...this.accessTokens,
+                [this.region]: env_1.env.REDOCLY_AUTHORIZATION,
+            });
         }
     }
     getAllTokens() {
@@ -74,65 +69,57 @@ class RedoclyClient {
             .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 }) => this.verifyToken(token)));
-            return allTokens
-                .filter((_, index) => verifiedTokens[index].status === 'fulfilled')
-                .map(({ token, region }) => ({ token, region, valid: true }));
-        });
-    }
-    getTokens() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.hasTokens() ? yield this.getValidTokens() : [];
-        });
-    }
-    isAuthorizedWithRedoclyByRegion() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.hasTokens()) {
-                return false;
-            }
-            const accessToken = this.accessTokens[this.region];
-            if (!accessToken) {
-                return false;
-            }
-            try {
-                yield this.verifyToken(accessToken);
-                return true;
-            }
-            catch (err) {
-                return false;
-            }
-        });
-    }
-    isAuthorizedWithRedocly() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.hasTokens() && (0, utils_1.isNotEmptyObject)(yield this.getValidTokens());
-        });
+    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.isNotEmptyObject)(await this.getValidTokens());
     }
     readCredentialsFile(credentialsPath) {
         return (0, fs_1.existsSync)(credentialsPath) ? JSON.parse((0, fs_1.readFileSync)(credentialsPath, 'utf-8')) : {};
     }
-    verifyToken(accessToken, verbose = false) {
-        return __awaiter(this, void 0, void 0, function* () {
-            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, verbose);
-            }
-            catch (err) {
-                throw new Error('Authorization failed. Please check if you entered a valid API key.');
-            }
-            const credentials = Object.assign(Object.assign({}, this.readCredentialsFile(credentialsPath)), { [this.region]: accessToken, token: accessToken });
-            this.accessTokens = credentials;
-            this.registryApi.setAccessTokens(credentials);
-            (0, fs_1.writeFileSync)(credentialsPath, JSON.stringify(credentials, null, 2));
-        });
+    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);