@redocly/openapi-core 1.0.0-beta.87 → 1.0.0-beta.90

package/__tests__/codeframes.test.ts

@@ -85,6 +85,28 @@ describe('Location', () => {
     expect(preciseLocation.end).toEqual({ line: 5, col: 28 });
   });
 
+  it('should correctly fallback to the closest parent node if node value is null', () => {
+    const loc = {
+      reportOnKey: false,
+      pointer: '#/servers',
+      source: new Source(
+        'foobar.yaml',
+        outdent`
+          openapi: 3.0.2
+          servers:
+          info:
+            license:
+              name: MIT
+              url: https://google.com
+        `,
+      ),
+    };
+    const preciseLocation = getLineColLocation(loc);
+    expect(preciseLocation.start).toEqual({ line: 2, col: 1 });
+    expect(preciseLocation.end).toEqual({ line: 2, col: 9 });
+  });
+
+
   it('should return first line for empty doc', () => {
     const loc = {
       reportOnKey: false,

package/lib/config/config.d.ts

@@ -78,12 +78,27 @@ export declare const DOMAINS: {
     [region in Region]: string;
 };
 export declare const AVAILABLE_REGIONS: Region[];
-export declare type RawConfig = {
-    referenceDocs?: any;
+export declare type DeprecatedRawConfig = {
     apiDefinitions?: Record<string, string>;
     lint?: LintRawConfig;
     resolve?: RawResolveConfig;
     region?: Region;
+    referenceDocs?: Record<string, any>;
+};
+export declare type Api = {
+    root: string;
+    lint?: Omit<LintRawConfig, 'plugins'>;
+    'features.openapi'?: Record<string, any>;
+    'features.mockServer'?: Record<string, any>;
+};
+export declare type RawConfig = {
+    apis?: Record<string, Api>;
+    lint?: LintRawConfig;
+    resolve?: RawResolveConfig;
+    region?: Region;
+    'features.openapi'?: Record<string, any>;
+    'features.mockServer'?: Record<string, any>;
+    organization?: string;
 };
 export declare class LintConfig {
     rawConfig: LintRawConfig;
@@ -124,11 +139,38 @@ export declare class LintConfig {
 export declare class Config {
     rawConfig: RawConfig;
     configFile?: string | undefined;
-    referenceDocs: any;
-    apiDefinitions: Record<string, string>;
+    apis: Record<string, Api>;
     lint: LintConfig;
     resolve: ResolveConfig;
     licenseKey?: string;
     region?: Region;
+    'features.openapi': Record<string, any>;
+    'features.mockServer'?: Record<string, any>;
+    organization?: string;
     constructor(rawConfig: RawConfig, configFile?: string | undefined);
 }
+export declare function getMergedConfig(config: Config, entrypointAlias?: string): Config;
+export declare function getMergedLintConfig(config: Config, entrypointAlias?: string): {
+    rules: {
+        [x: string]: RuleConfig;
+    };
+    preprocessors: {
+        [x: string]: PreprocessorConfig;
+    };
+    decorators: {
+        [x: string]: PreprocessorConfig;
+    };
+    extends?: string[] | undefined;
+    doNotResolveExamples?: boolean | undefined;
+    oas2Rules?: Record<string, RuleConfig> | undefined;
+    oas3_0Rules?: Record<string, RuleConfig> | undefined;
+    oas3_1Rules?: Record<string, RuleConfig> | undefined;
+    oas2Preprocessors?: Record<string, PreprocessorConfig> | undefined;
+    oas3_0Preprocessors?: Record<string, PreprocessorConfig> | undefined;
+    oas3_1Preprocessors?: Record<string, PreprocessorConfig> | undefined;
+    oas2Decorators?: Record<string, PreprocessorConfig> | undefined;
+    oas3_0Decorators?: Record<string, PreprocessorConfig> | undefined;
+    oas3_1Decorators?: Record<string, PreprocessorConfig> | undefined;
+    plugins?: (string | Plugin)[] | undefined;
+};
+export declare function transformConfig(rawConfig: DeprecatedRawConfig | RawConfig): RawConfig;

package/lib/config/config.js

@@ -1,6 +1,17 @@
 "use strict";
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Config = exports.LintConfig = exports.AVAILABLE_REGIONS = exports.DOMAINS = exports.DEFAULT_REGION = exports.IGNORE_FILE = void 0;
+exports.transformConfig = exports.getMergedLintConfig = exports.getMergedConfig = exports.Config = exports.LintConfig = exports.AVAILABLE_REGIONS = exports.DOMAINS = exports.DEFAULT_REGION = exports.IGNORE_FILE = void 0;
 const fs = require("fs");
 const path = require("path");
 const path_1 = require("path");
@@ -18,7 +29,6 @@ exports.DOMAINS = {
     us: 'redocly.com',
     eu: 'eu.redocly.com',
 };
-exports.AVAILABLE_REGIONS = Object.keys(exports.DOMAINS);
 // FIXME: temporary fix for our lab environments
 if (REDOCLY_DOMAIN === null || REDOCLY_DOMAIN === void 0 ? void 0 : REDOCLY_DOMAIN.endsWith('.redocly.host')) {
     exports.DOMAINS[REDOCLY_DOMAIN.split('.')[0]] = REDOCLY_DOMAIN;
@@ -26,6 +36,7 @@ if (REDOCLY_DOMAIN === null || REDOCLY_DOMAIN === void 0 ? void 0 : REDOCLY_DOMA
 if (REDOCLY_DOMAIN === 'redoc.online') {
     exports.DOMAINS[REDOCLY_DOMAIN] = REDOCLY_DOMAIN;
 }
+exports.AVAILABLE_REGIONS = Object.keys(exports.DOMAINS);
 class LintConfig {
     constructor(rawConfig, configFile) {
         this.rawConfig = rawConfig;
@@ -65,7 +76,9 @@ class LintConfig {
             [oas_types_1.OasVersion.Version3_0]: Object.assign(Object.assign({}, merged.decorators), merged.oas3_0Decorators),
             [oas_types_1.OasVersion.Version3_1]: Object.assign(Object.assign({}, merged.decorators), merged.oas3_1Decorators),
         };
-        const dir = this.configFile ? path.dirname(this.configFile) : (typeof process !== 'undefined' && process.cwd() || '');
+        const dir = this.configFile
+            ? path.dirname(this.configFile)
+            : (typeof process !== 'undefined' && process.cwd()) || '';
         const ignoreFile = path.join(dir, exports.IGNORE_FILE);
         /* no crash when using it on the client */
         if (fs.hasOwnProperty('existsSync') && fs.existsSync(ignoreFile)) {
@@ -87,7 +100,8 @@ class LintConfig {
         const ignoreFile = path.join(dir, exports.IGNORE_FILE);
         const mapped = {};
         for (const absFileName of Object.keys(this.ignore)) {
-            const ignoredRules = (mapped[utils_1.slash(path.relative(dir, absFileName))] = this.ignore[absFileName]);
+            const ignoredRules = (mapped[utils_1.slash(path.relative(dir, absFileName))] =
+                this.ignore[absFileName]);
             for (const ruleId of Object.keys(ignoredRules)) {
                 ignoredRules[ruleId] = Array.from(ignoredRules[ruleId]);
             }
@@ -238,9 +252,10 @@ class Config {
         var _a, _b, _c;
         this.rawConfig = rawConfig;
         this.configFile = configFile;
-        this.apiDefinitions = rawConfig.apiDefinitions || {};
+        this.apis = rawConfig.apis || {};
         this.lint = new LintConfig(rawConfig.lint || {}, configFile);
-        this.referenceDocs = rawConfig.referenceDocs || {};
+        this['features.openapi'] = rawConfig['features.openapi'] || {};
+        this['features.mockServer'] = rawConfig['features.mockServer'] || {};
         this.resolve = {
             http: {
                 headers: (_c = (_b = (_a = rawConfig === null || rawConfig === void 0 ? void 0 : rawConfig.resolve) === null || _a === void 0 ? void 0 : _a.http) === null || _b === void 0 ? void 0 : _b.headers) !== null && _c !== void 0 ? _c : [],
@@ -248,6 +263,7 @@ class Config {
             },
         };
         this.region = rawConfig.region;
+        this.organization = rawConfig.organization;
     }
 }
 exports.Config = Config;
@@ -398,3 +414,47 @@ function assignExisting(target, obj) {
         }
     }
 }
+function getMergedConfig(config, entrypointAlias) {
+    var _a, _b;
+    return entrypointAlias
+        ? new Config(Object.assign(Object.assign({}, config.rawConfig), { lint: getMergedLintConfig(config, entrypointAlias), 'features.openapi': Object.assign(Object.assign({}, config['features.openapi']), (_a = config.apis[entrypointAlias]) === null || _a === void 0 ? void 0 : _a['features.openapi']), 'features.mockServer': Object.assign(Object.assign({}, config['features.mockServer']), (_b = config.apis[entrypointAlias]) === null || _b === void 0 ? void 0 : _b['features.mockServer']) }))
+        : config;
+}
+exports.getMergedConfig = getMergedConfig;
+function getMergedLintConfig(config, entrypointAlias) {
+    var _a, _b, _c, _d;
+    const apiLint = entrypointAlias ? (_a = config.apis[entrypointAlias]) === null || _a === void 0 ? void 0 : _a.lint : {};
+    const mergedLint = Object.assign(Object.assign(Object.assign({}, config.rawConfig.lint), apiLint), { rules: Object.assign(Object.assign({}, (_b = config.rawConfig.lint) === null || _b === void 0 ? void 0 : _b.rules), apiLint === null || apiLint === void 0 ? void 0 : apiLint.rules), preprocessors: Object.assign(Object.assign({}, (_c = config.rawConfig.lint) === null || _c === void 0 ? void 0 : _c.preprocessors), apiLint === null || apiLint === void 0 ? void 0 : apiLint.preprocessors), decorators: Object.assign(Object.assign({}, (_d = config.rawConfig.lint) === null || _d === void 0 ? void 0 : _d.decorators), apiLint === null || apiLint === void 0 ? void 0 : apiLint.decorators) });
+    return mergedLint;
+}
+exports.getMergedLintConfig = getMergedLintConfig;
+function transformApiDefinitionsToApis(apiDefinitions = {}) {
+    let apis = {};
+    for (const [apiName, apiPath] of Object.entries(apiDefinitions)) {
+        apis[apiName] = { root: apiPath };
+    }
+    return apis;
+}
+function transformConfig(rawConfig) {
+    if (rawConfig.apis && rawConfig.apiDefinitions) {
+        throw new Error("Do not use 'apiDefinitions' field. Use 'apis' instead.\n");
+    }
+    if (rawConfig['features.openapi'] &&
+        rawConfig.referenceDocs) {
+        throw new Error("Do not use 'referenceDocs' field. Use 'features.openapi' instead.\n");
+    }
+    const _a = rawConfig, { apiDefinitions, referenceDocs } = _a, rest = __rest(_a, ["apiDefinitions", "referenceDocs"]);
+    // TODO: put links to the changelog and uncomment this after successful release of ReferenceDocs/Redoc, Portal and Workflows
+    // if (apiDefinitions) {
+    //   process.stderr.write(
+    //     `The ${yellow('apiDefinitions')} field is deprecated. Use ${green('apis')} instead, see changelog: <link>\n`
+    //   );
+    // }
+    // if (referenceDocs) {
+    //   process.stderr.write(
+    //     `The ${yellow('referenceDocs')} field is deprecated. Use ${green('features.openapi')} instead, see changelog: <link>\n`
+    //   );
+    // }
+    return Object.assign({ 'features.openapi': referenceDocs, apis: transformApiDefinitionsToApis(apiDefinitions) }, rest);
+}
+exports.transformConfig = transformConfig;

package/lib/config/load.d.ts

@@ -1,4 +1,5 @@
-import { Config } from './config';
-export declare function loadConfig(configPath?: string, customExtends?: string[]): Promise<Config>;
+import { Config, RawConfig } from './config';
+export declare function loadConfig(configPath?: string | undefined, customExtends?: string[]): Promise<Config>;
 export declare const CONFIG_FILE_NAMES: string[];
-export declare function findConfig(): string | undefined;
+export declare function findConfig(dir?: string): string | undefined;
+export declare function getConfig(configPath?: string | undefined): Promise<RawConfig>;

package/lib/config/load.js

@@ -9,27 +9,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findConfig = exports.CONFIG_FILE_NAMES = exports.loadConfig = void 0;
+exports.getConfig = exports.findConfig = exports.CONFIG_FILE_NAMES = exports.loadConfig = void 0;
 const fs = require("fs");
+const path = require("path");
 const redocly_1 = require("../redocly");
 const utils_1 = require("../utils");
 const config_1 = require("./config");
 const builtIn_1 = require("./builtIn");
-function loadConfig(configPath, customExtends) {
+function loadConfig(configPath = findConfig(), customExtends) {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
-        if (configPath === undefined) {
-            configPath = findConfig();
-        }
-        let rawConfig = {};
-        if (configPath !== undefined) {
-            try {
-                rawConfig = (yield utils_1.loadYaml(configPath));
-            }
-            catch (e) {
-                throw new Error(`Error parsing config file at \`${configPath}\`: ${e.message}`);
-            }
-        }
+        const rawConfig = yield getConfig(configPath);
         if (customExtends !== undefined) {
             rawConfig.lint = rawConfig.lint || {};
             rawConfig.lint.extends = customExtends;
@@ -64,10 +54,12 @@ function loadConfig(configPath, customExtends) {
 }
 exports.loadConfig = loadConfig;
 exports.CONFIG_FILE_NAMES = ['redocly.yaml', 'redocly.yml', '.redocly.yaml', '.redocly.yml'];
-function findConfig() {
+function findConfig(dir) {
     if (!fs.hasOwnProperty('existsSync'))
         return;
-    const existingConfigFiles = exports.CONFIG_FILE_NAMES.map((name) => fs.existsSync(name) && name).filter(Boolean);
+    const existingConfigFiles = exports.CONFIG_FILE_NAMES
+        .map(name => dir ? path.resolve(dir, name) : name)
+        .filter(fs.existsSync);
     if (existingConfigFiles.length > 1) {
         throw new Error(`
       Multiple configuration files are not allowed. 
@@ -78,3 +70,17 @@ function findConfig() {
     return existingConfigFiles[0];
 }
 exports.findConfig = findConfig;
+function getConfig(configPath = findConfig()) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (!configPath)
+            return {};
+        try {
+            const rawConfig = ((yield utils_1.loadYaml(configPath)) || {});
+            return config_1.transformConfig(rawConfig);
+        }
+        catch (e) {
+            throw new Error(`Error parsing config file at '${configPath}': ${e.message}`);
+        }
+    });
+}
+exports.getConfig = getConfig;

package/lib/format/codeframes.js

@@ -142,9 +142,12 @@ function getAstNodeByPointer(root, pointer, reportOnKey) {
     for (const key of pointerSegments) {
         if (currentNode.kind === yamlAst.Kind.MAP) {
             const mapping = currentNode.mappings.find((m) => m.key.value === key);
-            if (!(mapping === null || mapping === void 0 ? void 0 : mapping.value))
+            if (!mapping)
                 break;
-            currentNode = mapping === null || mapping === void 0 ? void 0 : mapping.value;
+            currentNode = mapping;
+            if (!(mapping === null || mapping === void 0 ? void 0 : mapping.value))
+                break; // If node has value - return value, if not - return node itself
+            currentNode = mapping.value;
         }
         else if (currentNode.kind === yamlAst.Kind.SEQ) {
             const elem = currentNode.items[parseInt(key, 10)];

package/lib/index.d.ts

@@ -3,13 +3,13 @@ export { Oas3_1Types } from './types/oas3_1';
 export { Oas3Types } from './types/oas3';
 export { Oas2Types } from './types/oas2';
 export { ConfigTypes } from './types/redocly-yaml';
-export { Oas3Definition, Oas3_1Definition, Oas3Components, Oas3PathItem, Oas3Paths, Oas3ComponentName, Oas3Schema, Oas3_1Schema, Oas3Tag, Oas3_1Webhooks, Referenced } from './typings/openapi';
+export { Oas3Definition, Oas3_1Definition, Oas3Components, Oas3PathItem, Oas3Paths, Oas3ComponentName, Oas3Schema, Oas3_1Schema, Oas3Tag, Oas3_1Webhooks, Referenced, } from './typings/openapi';
 export { Oas2Definition } from './typings/swagger';
 export { StatsAccumulator, StatsName } from './typings/common';
 export { normalizeTypes } from './types';
 export { Stats } from './rules/other/stats';
-export { Config, LintConfig, RawConfig, IGNORE_FILE, Region } from './config/config';
-export { loadConfig, findConfig, CONFIG_FILE_NAMES } from './config/load';
+export { Config, LintConfig, RawConfig, IGNORE_FILE, Region, getMergedConfig, transformConfig, } from './config/config';
+export { loadConfig, getConfig, findConfig, CONFIG_FILE_NAMES } from './config/load';
 export { RedoclyClient, isRedoclyRegistryURL } from './redocly';
 export { Source, BaseResolver, Document, resolveDocument, ResolveError, YamlParseError, makeDocumentFromString, } from './resolve';
 export { parseYaml, stringifyYaml } from './js-yaml';

package/lib/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mapTypeToComponent = exports.bundleDocument = exports.bundle = exports.lintConfig = exports.lintFromString = exports.lintDocument = exports.validate = exports.lint = exports.getTotals = exports.formatProblems = exports.getLineColLocation = exports.getAstNodeByPointer = exports.walkDocument = exports.normalizeVisitors = exports.OasVersion = exports.openAPIMajor = exports.OasMajorVersion = exports.detectOpenAPI = 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.CONFIG_FILE_NAMES = exports.findConfig = exports.loadConfig = exports.IGNORE_FILE = exports.LintConfig = exports.Config = exports.Stats = exports.normalizeTypes = exports.ConfigTypes = exports.Oas2Types = exports.Oas3Types = exports.Oas3_1Types = exports.slash = exports.readFileFromUrl = void 0;
+exports.mapTypeToComponent = exports.bundleDocument = exports.bundle = exports.lintConfig = exports.lintFromString = exports.lintDocument = exports.validate = exports.lint = exports.getTotals = exports.formatProblems = exports.getLineColLocation = exports.getAstNodeByPointer = exports.walkDocument = exports.normalizeVisitors = exports.OasVersion = exports.openAPIMajor = exports.OasMajorVersion = exports.detectOpenAPI = 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.CONFIG_FILE_NAMES = exports.findConfig = exports.getConfig = exports.loadConfig = exports.transformConfig = exports.getMergedConfig = exports.IGNORE_FILE = exports.LintConfig = exports.Config = exports.Stats = exports.normalizeTypes = exports.ConfigTypes = exports.Oas2Types = exports.Oas3Types = exports.Oas3_1Types = exports.slash = exports.readFileFromUrl = 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; } });
@@ -20,8 +20,11 @@ var config_1 = require("./config/config");
 Object.defineProperty(exports, "Config", { enumerable: true, get: function () { return config_1.Config; } });
 Object.defineProperty(exports, "LintConfig", { enumerable: true, get: function () { return config_1.LintConfig; } });
 Object.defineProperty(exports, "IGNORE_FILE", { enumerable: true, get: function () { return config_1.IGNORE_FILE; } });
+Object.defineProperty(exports, "getMergedConfig", { enumerable: true, get: function () { return config_1.getMergedConfig; } });
+Object.defineProperty(exports, "transformConfig", { enumerable: true, get: function () { return config_1.transformConfig; } });
 var load_1 = require("./config/load");
 Object.defineProperty(exports, "loadConfig", { enumerable: true, get: function () { return load_1.loadConfig; } });
+Object.defineProperty(exports, "getConfig", { enumerable: true, get: function () { return load_1.getConfig; } });
 Object.defineProperty(exports, "findConfig", { enumerable: true, get: function () { return load_1.findConfig; } });
 Object.defineProperty(exports, "CONFIG_FILE_NAMES", { enumerable: true, get: function () { return load_1.CONFIG_FILE_NAMES; } });
 var redocly_1 = require("./redocly");

package/lib/redocly/index.d.ts

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

package/lib/redocly/index.js

@@ -24,9 +24,7 @@ class RedoclyClient {
         this.accessTokens = {};
         this.region = this.loadRegion(region);
         this.loadTokens();
-        this.domain = region
-            ? config_1.DOMAINS[region]
-            : process.env.REDOCLY_DOMAIN || config_1.DOMAINS[config_1.DEFAULT_REGION];
+        this.domain = region ? config_1.DOMAINS[region] : process.env.REDOCLY_DOMAIN || config_1.DOMAINS[config_1.DEFAULT_REGION];
         /*
          * We can't use process.env here because it is replaced by a const in some client-side bundles,
          * which breaks assignment.
@@ -73,8 +71,9 @@ class RedoclyClient {
         const credentialsPath = path_1.resolve(os_1.homedir(), TOKEN_FILENAME);
         const credentials = this.readCredentialsFile(credentialsPath);
         if (utils_1.isNotEmptyObject(credentials)) {
-            this.setAccessTokens(Object.assign(Object.assign({}, credentials), (credentials.token && !credentials[this.region] && {
-                [this.region]: credentials.token
+            this.setAccessTokens(Object.assign(Object.assign({}, credentials), (credentials.token &&
+                !credentials[this.region] && {
+                [this.region]: credentials.token,
             })));
         }
         if (process.env.REDOCLY_AUTHORIZATION) {
@@ -82,17 +81,17 @@ class RedoclyClient {
         }
     }
     getAllTokens() {
-        return Object.entries(this.accessTokens).filter(([region]) => config_1.AVAILABLE_REGIONS.includes(region)).map(([region, token]) => ({ region, token }));
+        return Object.entries(this.accessTokens)
+            .filter(([region]) => config_1.AVAILABLE_REGIONS.includes(region))
+            .map(([region, token]) => ({ region, token }));
     }
     getValidTokens() {
         return __awaiter(this, void 0, void 0, function* () {
-            const validTokens = [];
-            for (const { token, region } of this.getAllTokens()) {
-                if (yield this.verifyToken(token, region)) {
-                    validTokens.push({ token, region, valid: true });
-                }
-            }
-            return validTokens;
+            const allTokens = this.getAllTokens();
+            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 }));
         });
     }
     getTokens() {
@@ -102,10 +101,20 @@ class RedoclyClient {
     }
     isAuthorizedWithRedoclyByRegion() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!this.hasTokens())
+            if (!this.hasTokens()) {
                 return false;
+            }
             const accessToken = this.accessTokens[this.region];
-            return !!accessToken && (yield this.verifyToken(accessToken, this.region));
+            if (!accessToken) {
+                return false;
+            }
+            try {
+                yield this.verifyToken(accessToken, this.region);
+                return true;
+            }
+            catch (err) {
+                return false;
+            }
         });
     }
     isAuthorizedWithRedocly() {
@@ -118,8 +127,6 @@ class RedoclyClient {
     }
     verifyToken(accessToken, region, verbose = false) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!accessToken)
-                return false;
             return this.registryApi.authStatus(accessToken, region, verbose);
         });
     }
@@ -127,8 +134,10 @@ class RedoclyClient {
         return __awaiter(this, void 0, void 0, function* () {
             const credentialsPath = path_1.resolve(os_1.homedir(), TOKEN_FILENAME);
             process.stdout.write(colorette_1.gray('\n  Logging in...\n'));
-            const authorized = yield this.verifyToken(accessToken, this.region, verbose);
-            if (!authorized) {
+            try {
+                yield this.verifyToken(accessToken, this.region, verbose);
+            }
+            catch (err) {
                 process.stdout.write(colorette_1.red('Authorization failed. Please check if you entered a valid API key.\n'));
                 process.exit(1);
             }

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

@@ -8,7 +8,10 @@ export declare class RegistryApi {
     getBaseUrl(region?: Region): string;
     setAccessTokens(accessTokens: AccessTokens): this;
     private request;
-    authStatus(accessToken: string, region: Region, verbose?: boolean): Promise<boolean>;
+    authStatus(accessToken: string, region: Region, verbose?: boolean): Promise<{
+        viewerId: string;
+        organizations: string[];
+    }>;
     prepareFileUpload({ organizationId, name, version, filesHash, filename, isUpsert, }: RegistryApiTypes.PrepareFileuploadParams): Promise<RegistryApiTypes.PrepareFileuploadOKResponse>;
     pushApi({ organizationId, name, version, rootFilePath, filePaths, branch, isUpsert, }: RegistryApiTypes.PushApiParams): Promise<void>;
 }

package/lib/redocly/registry-api.js

@@ -50,13 +50,13 @@ class RegistryApi {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const response = yield this.request('', { headers: { authorization: accessToken } }, region);
-                return response.ok;
+                return yield response.json();
             }
             catch (error) {
                 if (verbose) {
                     console.log(error);
                 }
-                return false;
+                throw error;
             }
         });
     }
@@ -86,7 +86,7 @@ class RegistryApi {
                 method: 'PUT',
                 headers: {
                     'content-type': 'application/json',
-                    authorization: this.accessToken
+                    authorization: this.accessToken,
                 },
                 body: JSON.stringify({
                     rootFilePath,

package/lib/rules/oas3/no-empty-servers.js

@@ -4,9 +4,10 @@ exports.NoEmptyServers = void 0;
 const NoEmptyServers = () => {
     return {
         DefinitionRoot(root, { report, location }) {
-            if (!root.servers) {
+            if (!root.hasOwnProperty('servers')) {
                 report({
                     message: 'Servers must be present.',
+                    location: location.child(['openapi']).key()
                 });
                 return;
             }

package/lib/types/redocly-yaml.js

@@ -5,13 +5,22 @@ const _1 = require(".");
 const utils_1 = require("../utils");
 const ConfigRoot = {
     properties: {
-        apiDefinitions: {
-            type: 'object',
-            properties: {},
-            additionalProperties: { properties: { type: 'string' } },
-        },
+        organization: { type: 'string' },
+        apis: 'ConfigApis',
+        lint: 'RootConfigLint',
+        'features.openapi': 'ConfigReferenceDocs',
+        'features.mockServer': 'ConfigMockServer',
+    },
+};
+const ConfigApis = {
+    properties: {},
+    additionalProperties: 'ConfigApisProperties',
+};
+const ConfigApisProperties = {
+    properties: {
+        root: { type: 'string' },
         lint: 'ConfigLint',
-        referenceDocs: 'ConfigReferenceDocs',
+        'features.openapi': 'ConfigReferenceDocs',
     },
 };
 const ConfigHTTP = {
@@ -26,10 +35,6 @@ const ConfigHTTP = {
 };
 const ConfigLint = {
     properties: {
-        plugins: {
-            type: 'array',
-            items: { type: 'string' },
-        },
         extends: {
             type: 'array',
             items: {
@@ -56,6 +61,12 @@ const ConfigLint = {
         },
     },
 };
+const RootConfigLint = {
+    properties: Object.assign({ plugins: {
+            type: 'array',
+            items: { type: 'string' },
+        } }, ConfigLint.properties),
+};
 const ConfigLanguage = {
     properties: {
         label: { type: 'string' },
@@ -445,10 +456,20 @@ const ConfigReferenceDocs = {
     },
     additionalProperties: { type: 'string' },
 };
+const ConfigMockServer = {
+    properties: {
+        strictExamples: { type: 'boolean' },
+        errorIfForcedExampleNotFound: { type: 'boolean' },
+    },
+};
 exports.ConfigTypes = {
     ConfigRoot,
+    ConfigApis,
+    ConfigApisProperties,
+    RootConfigLint,
     ConfigLint,
     ConfigReferenceDocs,
+    ConfigMockServer,
     ConfigHTTP,
     ConfigLanguage,
     ConfigLabels,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redocly/openapi-core",
-  "version": "1.0.0-beta.87",
+  "version": "1.0.0-beta.90",
   "description": "",
   "main": "lib/index.js",
   "engines": {