@redocly/openapi-core 1.0.0-beta.85 → 1.0.0-beta.88

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/__tests__/utils.ts

@@ -44,7 +44,7 @@ export const yamlSerializer = {
   },
 };
 
-export function makeConfigForRuleset(rules: Oas3RuleSet, plugin?: Partial<Plugin>) {
+export function makeConfigForRuleset(rules: Oas3RuleSet, plugin?: Partial<Plugin>, version: string = 'oas3') {
   const rulesConf: Record<string, RuleConfig> = {};
   const ruleId = 'test';
   Object.keys(rules).forEach((name) => {
@@ -56,7 +56,7 @@ export function makeConfigForRuleset(rules: Oas3RuleSet, plugin?: Partial<Plugin
       {
         ...plugin,
         id: ruleId,
-        rules: { oas3: rules },
+        rules: { [version]: rules },
       },
     ],
     extends: [],

package/__tests__/walk.test.ts

@@ -143,6 +143,90 @@ describe('walk order', () => {
     `);
   });
 
+  it('should run nested visitors correctly oas2', async () => {
+    const calls: string[] = [];
+
+    const testRuleSet: Oas3RuleSet = {
+      test: jest.fn(() => {
+        return {
+          Operation: {
+            enter: jest.fn((op) => calls.push(`enter operation: ${op.operationId}`)),
+            leave: jest.fn((op) => calls.push(`leave operation: ${op.operationId}`)),
+            Parameter: {
+              enter: jest.fn((param, _ctx, parents) =>
+                calls.push(
+                  `enter operation ${parents.Operation.operationId} > param ${param.name}`,
+                ),
+              ),
+              leave: jest.fn((param, _ctx, parents) =>
+                calls.push(
+                  `leave operation ${parents.Operation.operationId} > param ${param.name}`,
+                ),
+              ),
+            },
+          },
+          Parameter: {
+            enter: jest.fn((param) => calls.push(`enter param ${param.name}`)),
+            leave: jest.fn((param) => calls.push(`leave param ${param.name}`)),
+          },
+        };
+      }),
+    };
+
+    const document = parseYamlToDocument(
+      outdent`
+        swagger: "2.0"
+        info:
+          contact: {}
+          license: {}
+        paths:
+          /pet:
+            parameters:
+              - name: path-param
+            get:
+              operationId: get
+              parameters:
+                - name: get_a
+                - name: get_b
+            post:
+              operationId: post
+              parameters:
+                - name: post_a
+
+      `,
+      '',
+    );
+
+    await lintDocument({
+      externalRefResolver: new BaseResolver(),
+      document,
+      config: makeConfigForRuleset(testRuleSet, undefined, 'oas2'),
+    });
+
+    expect(calls).toMatchInlineSnapshot(`
+      Array [
+        "enter param path-param",
+        "leave param path-param",
+        "enter operation: get",
+        "enter operation get > param get_a",
+        "enter param get_a",
+        "leave param get_a",
+        "leave operation get > param get_a",
+        "enter operation get > param get_b",
+        "enter param get_b",
+        "leave param get_b",
+        "leave operation get > param get_b",
+        "leave operation: get",
+        "enter operation: post",
+        "enter operation post > param post_a",
+        "enter param post_a",
+        "leave param post_a",
+        "leave operation post > param post_a",
+        "leave operation: post",
+      ]
+    `);
+  });
+
   it('should resolve refs', async () => {
     const calls: string[] = [];
 

package/lib/bundle.js

@@ -161,6 +161,7 @@ function makeBundleVisitor(version, dereference, skipRedoclyRegistryRefs, rootDo
                     !dereference) {
                     return;
                 }
+                // do not bundle registry URL before push, otherwise we can't record dependencies
                 if (skipRedoclyRegistryRefs && redocly_1.isRedoclyRegistryURL(node.$ref)) {
                     return;
                 }

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?: any;
+};
+export declare type Api = {
+    root: string;
+    lint?: LintRawConfig;
+    'features.openapi'?: any;
+    'features.mockServer'?: any;
+};
+export declare type RawConfig = {
+    apis?: Record<string, Api>;
+    lint?: LintRawConfig;
+    resolve?: RawResolveConfig;
+    region?: Region;
+    'features.openapi'?: any;
+    'features.mockServer'?: 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;
+    };
+    plugins?: (string | Plugin)[] | undefined;
+    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;
+};
+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");
@@ -15,10 +26,9 @@ const IGNORE_BANNER = `# This file instructs Redocly's linter to ignore the rule
 exports.DEFAULT_REGION = 'us';
 const REDOCLY_DOMAIN = process.env.REDOCLY_DOMAIN;
 exports.DOMAINS = {
-    us: 'redoc.ly',
+    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;
@@ -238,9 +249,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 +260,7 @@ class Config {
             },
         };
         this.region = rawConfig.region;
+        this.organization = rawConfig.organization;
     }
 }
 exports.Config = Config;
@@ -398,3 +411,48 @@ 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,2 +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(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.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;
@@ -52,7 +42,7 @@ function loadConfig(configPath, customExtends) {
                 }, 
                 //support redocly.com domain for future compatibility
                 ...(item.region === 'us' ? [{
-                        matches: `https://api.redocly.com/registry/**`,
+                        matches: `https://api.redoc.ly/registry/**`,
                         name: 'Authorization',
                         envVariable: undefined,
                         value: item.token,
@@ -63,12 +53,34 @@ function loadConfig(configPath, customExtends) {
     });
 }
 exports.loadConfig = loadConfig;
-function findConfig() {
-    if (fs.existsSync('.redocly.yaml')) {
-        return '.redocly.yaml';
-    }
-    else if (fs.existsSync('.redocly.yml')) {
-        return '.redocly.yml';
+exports.CONFIG_FILE_NAMES = ['redocly.yaml', 'redocly.yml', '.redocly.yaml', '.redocly.yml'];
+function findConfig(dir) {
+    if (!fs.hasOwnProperty('existsSync'))
+        return;
+    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. 
+      Found the following files: ${existingConfigFiles.join(', ')}. 
+      Please use 'redocly.yaml' instead.
+    `);
     }
-    return undefined;
+    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,14 +3,14 @@ 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 } from './config/load';
-export { RedoclyClient } from './redocly';
+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';
 export { unescapePointer, isRef } from './ref-utils';

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.RedoclyClient = 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,10 +20,16 @@ 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");
 Object.defineProperty(exports, "RedoclyClient", { enumerable: true, get: function () { return redocly_1.RedoclyClient; } });
+Object.defineProperty(exports, "isRedoclyRegistryURL", { enumerable: true, get: function () { return redocly_1.isRedoclyRegistryURL; } });
 var resolve_1 = require("./resolve");
 Object.defineProperty(exports, "Source", { enumerable: true, get: function () { return resolve_1.Source; } });
 Object.defineProperty(exports, "BaseResolver", { enumerable: true, get: function () { return resolve_1.BaseResolver; } });

package/lib/redocly/index.js

@@ -18,6 +18,7 @@ const registry_api_1 = require("./registry-api");
 const config_1 = require("../config/config");
 const utils_1 = require("../utils");
 const TOKEN_FILENAME = '.redocly-config.json';
+let REDOCLY_DOMAIN; // workaround for the isRedoclyRegistryURL, see more below
 class RedoclyClient {
     constructor(region) {
         this.accessTokens = {};
@@ -26,6 +27,11 @@ class RedoclyClient {
         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.
+         */
+        REDOCLY_DOMAIN = this.domain; // isRedoclyRegistryURL depends on the value to be set
         this.registryApi = new registry_api_1.RegistryApi(this.accessTokens, this.region);
     }
     loadRegion(region) {
@@ -143,17 +149,12 @@ class RedoclyClient {
 }
 exports.RedoclyClient = RedoclyClient;
 function isRedoclyRegistryURL(link) {
-    const domain = process.env.REDOCLY_DOMAIN || config_1.DOMAINS[config_1.DEFAULT_REGION];
-    if (!link.startsWith(`https://api.${domain}/registry/`))
-        return false;
-    const registryPath = link.replace(`https://api.${domain}/registry/`, '');
-    const pathParts = registryPath.split('/');
-    // we can be sure, that there is job UUID present
-    // (org, definition, version, bundle, branch, job, "openapi.yaml" 🤦‍♂️)
-    // so skip this link.
-    // FIXME
-    if (pathParts.length === 7)
+    const domain = REDOCLY_DOMAIN || process.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/rules/common/spec.js

@@ -8,7 +8,7 @@ const utils_2 = require("../../utils");
 const OasSpec = () => {
     return {
         any(node, { report, type, location, key, resolve, ignoreNextVisitorsOnNode }) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d;
             const nodeType = utils_1.oasTypeOf(node);
             if (type.items) {
                 if (nodeType !== 'array') {
@@ -59,7 +59,7 @@ const OasSpec = () => {
                 }
                 if (!hasProperty)
                     report({
-                        message: 'Must contain at least one of the following fields: path, components, webhooks.',
+                        message: `Must contain at least one of the following fields: ${(_b = type.requiredOneOf) === null || _b === void 0 ? void 0 : _b.join(', ')}.`,
                         location: [{ reportOnKey: true }],
                     });
             }
@@ -109,8 +109,8 @@ const OasSpec = () => {
                         location: propLocation,
                     });
                 }
-                else if (propValueType === 'array' && ((_b = propSchema.items) === null || _b === void 0 ? void 0 : _b.type)) {
-                    const itemsType = (_c = propSchema.items) === null || _c === void 0 ? void 0 : _c.type;
+                else if (propValueType === 'array' && ((_c = propSchema.items) === null || _c === void 0 ? void 0 : _c.type)) {
+                    const itemsType = (_d = propSchema.items) === null || _d === void 0 ? void 0 : _d.type;
                     for (let i = 0; i < propValue.length; i++) {
                         const item = propValue[i];
                         if (!utils_1.matchesJsonSchemaType(item, itemsType, false)) {

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/oas2.js

@@ -55,6 +55,7 @@ const PathMap = {
 const PathItem = {
     properties: {
         $ref: { type: 'string' },
+        parameters: _1.listOf('Parameter'),
         get: 'Operation',
         put: 'Operation',
         post: 'Operation',
@@ -62,7 +63,6 @@ const PathItem = {
         options: 'Operation',
         head: 'Operation',
         patch: 'Operation',
-        parameters: _1.listOf('Parameter'),
     },
 };
 const Operation = {

package/lib/types/oas3.js

@@ -125,6 +125,7 @@ const Parameter = {
         content: 'MediaTypeMap',
     },
     required: ['name', 'in'],
+    requiredOneOf: ['schema', 'content'],
 };
 const Callback = {
     properties: {},

package/package.json

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

package/src/bundle.ts

@@ -218,6 +218,7 @@ function makeBundleVisitor(
           return;
         }
 
+        // do not bundle registry URL before push, otherwise we can't record dependencies
         if (skipRedoclyRegistryRefs && isRedoclyRegistryURL(node.$ref)) {
           return;
         }