@redocly/cli 1.0.0-beta.116 → 1.0.0-beta.118

package/lib/__mocks__/@redocly/openapi-core.d.ts

@@ -52,6 +52,7 @@ export declare const bundleDocument: jest.Mock<Promise<{
     problems: {};
 }>, []>;
 export declare const detectOpenAPI: jest.Mock<any, any>;
+export declare const isAbsoluteUrl: jest.Mock<any, any>;
 export declare class BaseResolver {
     cache: Map<string, Promise<ResolveError | Document>>;
     getFiles: jest.Mock<any, any>;

package/lib/__mocks__/@redocly/openapi-core.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Oas3Operations = exports.OasVersion = exports.BaseResolver = exports.detectOpenAPI = exports.bundleDocument = exports.doesYamlFileExist = exports.findConfig = exports.slash = exports.formatProblems = exports.getTotals = exports.bundle = exports.lint = exports.getMergedConfig = exports.loadConfig = exports.RedoclyClient = exports.__redoclyClient = void 0;
+exports.Oas3Operations = exports.OasVersion = exports.BaseResolver = exports.isAbsoluteUrl = exports.detectOpenAPI = exports.bundleDocument = exports.doesYamlFileExist = exports.findConfig = exports.slash = exports.formatProblems = exports.getTotals = exports.bundle = exports.lint = exports.getMergedConfig = exports.loadConfig = exports.RedoclyClient = exports.__redoclyClient = void 0;
 const config_1 = require("./../../__tests__/fixtures/config");
 const documents_1 = require("../documents");
 exports.__redoclyClient = {
@@ -29,6 +29,7 @@ exports.findConfig = jest.fn();
 exports.doesYamlFileExist = jest.fn();
 exports.bundleDocument = jest.fn(() => Promise.resolve({ problems: {} }));
 exports.detectOpenAPI = jest.fn();
+exports.isAbsoluteUrl = jest.fn();
 class BaseResolver {
     constructor() {
         this.cache = new Map();

package/lib/__mocks__/utils.d.ts

@@ -14,3 +14,14 @@ export declare const getOutputFileName: jest.Mock<{
 export declare const handleError: jest.Mock<any, any>;
 export declare const exitWithError: jest.Mock<any, any>;
 export declare const writeYaml: jest.Mock<any, any>;
+export declare const loadConfigAndHandleErrors: jest.Mock<{
+    configFile: null;
+    styleguide: {
+        addIgnore: jest.Mock<any, any>;
+        skipRules: jest.Mock<any, any>;
+        skipPreprocessors: jest.Mock<any, any>;
+        saveIgnore: jest.Mock<any, any>;
+        skipDecorators: jest.Mock<any, any>;
+        ignore: null;
+    };
+}, []>;

package/lib/__mocks__/utils.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.writeYaml = exports.exitWithError = exports.handleError = exports.getOutputFileName = exports.printLintTotals = exports.printUnusedWarnings = exports.printExecutionTime = exports.getExecutionTime = exports.pluralize = exports.slash = exports.dumpBundle = exports.getFallbackApisOrExit = void 0;
+exports.loadConfigAndHandleErrors = exports.writeYaml = exports.exitWithError = exports.handleError = exports.getOutputFileName = exports.printLintTotals = exports.printUnusedWarnings = exports.printExecutionTime = exports.getExecutionTime = exports.pluralize = exports.slash = exports.dumpBundle = exports.getFallbackApisOrExit = void 0;
+const config_1 = require("../__tests__/fixtures/config");
 exports.getFallbackApisOrExit = jest.fn((entrypoints) => entrypoints.map((path) => ({ path })));
 exports.dumpBundle = jest.fn(() => '');
 exports.slash = jest.fn();
@@ -13,3 +14,4 @@ exports.getOutputFileName = jest.fn(() => ({ outputFile: 'test.yaml', ext: 'yaml
 exports.handleError = jest.fn();
 exports.exitWithError = jest.fn();
 exports.writeYaml = jest.fn();
+exports.loadConfigAndHandleErrors = jest.fn(() => config_1.ConfigFixture);

package/lib/__tests__/commands/lint.test.js

@@ -45,11 +45,11 @@ describe('handleLint', () => {
         it('should fail if config file does not exist', () => __awaiter(void 0, void 0, void 0, function* () {
             yield lint_1.handleLint(Object.assign(Object.assign({}, argvMock), { config: 'config.yaml' }), versionMock);
             expect(utils_1.exitWithError).toHaveBeenCalledWith('Please, provide valid path to the configuration file');
-            expect(openapi_core_1.loadConfig).toHaveBeenCalledTimes(0);
+            expect(utils_1.loadConfigAndHandleErrors).toHaveBeenCalledTimes(0);
         }));
-        it('should call loadConfig and getFallbackApisOrExit', () => __awaiter(void 0, void 0, void 0, function* () {
+        it('should call loadConfigAndHandleErrors and getFallbackApisOrExit', () => __awaiter(void 0, void 0, void 0, function* () {
             yield lint_1.handleLint(argvMock, versionMock);
-            expect(openapi_core_1.loadConfig).toHaveBeenCalledWith({
+            expect(utils_1.loadConfigAndHandleErrors).toHaveBeenCalledWith({
                 configPath: undefined,
                 customExtends: undefined,
                 processRawConfig: undefined,
@@ -58,7 +58,7 @@ describe('handleLint', () => {
         }));
         it('should call loadConfig with args if such exist', () => __awaiter(void 0, void 0, void 0, function* () {
             yield lint_1.handleLint(Object.assign(Object.assign({}, argvMock), { config: 'redocly.yaml', extends: ['some/path'] }), versionMock);
-            expect(openapi_core_1.loadConfig).toHaveBeenCalledWith({
+            expect(utils_1.loadConfigAndHandleErrors).toHaveBeenCalledWith({
                 configPath: 'redocly.yaml',
                 customExtends: ['some/path'],
                 processRawConfig: undefined,

package/lib/__tests__/commands/push.test.js

@@ -79,7 +79,7 @@ describe('push', () => {
         expect(utils_1.exitWithError).toBeCalledTimes(1);
     }));
     it('push with --files', () => __awaiter(void 0, void 0, void 0, function* () {
-        openapi_core_1.loadConfig.mockImplementation(({ files }) => {
+        utils_1.loadConfigAndHandleErrors.mockImplementation(({ files }) => {
             return Object.assign(Object.assign({}, config_1.ConfigFixture), { files });
         });
         //@ts-ignore

package/lib/__tests__/utils.test.js

@@ -10,9 +10,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../utils");
+const openapi_core_1 = require("@redocly/openapi-core");
 const colorette_1 = require("colorette");
+const fs_1 = require("fs");
+const path = require("path");
 jest.mock('os');
 jest.mock('colorette');
+jest.mock('fs');
 describe('isSubdir', () => {
     it('can correctly determine if subdir', () => {
         [
@@ -52,6 +56,7 @@ describe('pathToFilename', () => {
 });
 describe('getFallbackApisOrExit', () => {
     it('should find alias by filename', () => __awaiter(void 0, void 0, void 0, function* () {
+        fs_1.existsSync.mockImplementationOnce(() => true);
         const entry = yield utils_1.getFallbackApisOrExit(['./test.yaml'], {
             apis: {
                 main: {
@@ -98,3 +103,96 @@ describe('printConfigLintTotals', () => {
         expect(redColoretteMocks).toHaveBeenCalledTimes(0);
     });
 });
+describe('getFallbackApisOrExit', () => {
+    const redColoretteMocks = colorette_1.red;
+    const yellowColoretteMocks = colorette_1.yellow;
+    const apis = {
+        main: {
+            root: 'someFile.yaml',
+            styleguide: {},
+        },
+    };
+    const config = { apis };
+    beforeEach(() => {
+        yellowColoretteMocks.mockImplementation((text) => text);
+        redColoretteMocks.mockImplementation((text) => text);
+        jest.spyOn(process.stderr, 'write').mockImplementation(() => true);
+        jest.spyOn(process, 'exit').mockImplementation();
+    });
+    it('should exit with error because no path provided', () => __awaiter(void 0, void 0, void 0, function* () {
+        const apisConfig = {
+            apis: {},
+        };
+        yield utils_1.getFallbackApisOrExit([''], apisConfig);
+        expect(process.exit).toHaveBeenCalledWith(1);
+    }));
+    it('should error if file from config do not exist', () => __awaiter(void 0, void 0, void 0, function* () {
+        fs_1.existsSync.mockImplementationOnce(() => false);
+        yield utils_1.getFallbackApisOrExit(undefined, config);
+        expect(process.stderr.write).toHaveBeenCalledWith('\n someFile.yaml does not exist or is invalid. Please provide a valid path. \n\n');
+        expect(process.exit).toHaveBeenCalledWith(1);
+    }));
+    it('should return valid array with results if such file exist', () => __awaiter(void 0, void 0, void 0, function* () {
+        fs_1.existsSync.mockImplementationOnce(() => true);
+        jest.spyOn(path, 'resolve').mockImplementationOnce((_, path) => path);
+        const result = yield utils_1.getFallbackApisOrExit(undefined, config);
+        expect(process.stderr.write).toHaveBeenCalledTimes(0);
+        expect(process.exit).toHaveBeenCalledTimes(0);
+        expect(result).toStrictEqual([
+            {
+                alias: 'main',
+                path: 'someFile.yaml',
+            },
+        ]);
+    }));
+    it('should exit with error in case if invalid path provided as args', () => __awaiter(void 0, void 0, void 0, function* () {
+        const apisConfig = {
+            apis: {},
+        };
+        fs_1.existsSync.mockImplementationOnce(() => false);
+        yield utils_1.getFallbackApisOrExit(['someFile.yaml'], apisConfig);
+        expect(process.stderr.write).toHaveBeenCalledWith('\n someFile.yaml does not exist or is invalid. Please provide a valid path. \n\n');
+        expect(process.exit).toHaveBeenCalledWith(1);
+    }));
+    it('should exit with error in case if invalid 2 path provided as args', () => __awaiter(void 0, void 0, void 0, function* () {
+        const apisConfig = {
+            apis: {},
+        };
+        fs_1.existsSync.mockImplementationOnce(() => false);
+        yield utils_1.getFallbackApisOrExit(['someFile.yaml', 'someFile2.yaml'], apisConfig);
+        expect(process.stderr.write).lastCalledWith('\n someFile2.yaml does not exist or is invalid. Please provide a valid path. \n\n');
+        expect(process.exit).toHaveBeenCalledWith(1);
+    }));
+    it('should exit with error if only one file exist ', () => __awaiter(void 0, void 0, void 0, function* () {
+        const apisStub = Object.assign(Object.assign({}, apis), { notExist: {
+                root: 'notExist.yaml',
+                styleguide: {},
+            } });
+        const configStub = { apis: apisStub };
+        fs_1.existsSync.mockImplementationOnce((path) => path === 'someFile.yaml');
+        yield utils_1.getFallbackApisOrExit(undefined, configStub);
+        expect(process.stderr.write).toBeCalledWith('\n notExist.yaml does not exist or is invalid. Please provide a valid path. \n\n');
+        expect(process.exit).toHaveBeenCalledWith(1);
+    }));
+    it('should work ok if it is url passed', () => __awaiter(void 0, void 0, void 0, function* () {
+        fs_1.existsSync.mockImplementationOnce(() => false);
+        openapi_core_1.isAbsoluteUrl.mockImplementation(() => true);
+        const apisConfig = {
+            apis: {
+                main: {
+                    root: 'https://someLinkt/petstore.yaml?main',
+                    styleguide: {},
+                },
+            },
+        };
+        const result = yield utils_1.getFallbackApisOrExit(undefined, apisConfig);
+        expect(process.stderr.write).toHaveBeenCalledTimes(0);
+        expect(process.exit).toHaveBeenCalledTimes(0);
+        expect(result).toStrictEqual([
+            {
+                alias: 'main',
+                path: 'https://someLinkt/petstore.yaml?main',
+            },
+        ]);
+    }));
+});

package/lib/commands/build-docs/index.js

@@ -15,12 +15,12 @@ const path_1 = require("path");
 const fs_1 = require("fs");
 const perf_hooks_1 = require("perf_hooks");
 const utils_1 = require("./utils");
-const utils_2 = require("../../utils");
 const openapi_core_1 = require("@redocly/openapi-core");
+const utils_2 = require("../../utils");
 const handlerBuildCommand = (argv) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
     const startedAt = perf_hooks_1.performance.now();
-    const configFromFile = yield openapi_core_1.loadConfig({ configPath: argv.config });
+    const configFromFile = yield utils_2.loadConfigAndHandleErrors({ configPath: argv.config });
     const config = openapi_core_1.getMergedConfig(configFromFile, argv.api);
     const apis = yield utils_2.getFallbackApisOrExit(argv.api ? [argv.api] : [], config);
     const { path: pathToApi } = apis[0];
@@ -36,7 +36,9 @@ const handlerBuildCommand = (argv) => __awaiter(void 0, void 0, void 0, function
     const redocCurrentVersion = require('../../../package.json').dependencies.redoc.substring(1); // remove ~
     try {
         const elapsed = utils_2.getExecutionTime(startedAt);
-        const api = yield redoc_1.loadAndBundleSpec(utils_1.isURL(pathToApi) ? pathToApi : path_1.resolve(argv.config ? path_1.dirname(argv.config) : '', pathToApi));
+        const api = yield redoc_1.loadAndBundleSpec(openapi_core_1.isAbsoluteUrl(pathToApi)
+            ? pathToApi
+            : path_1.resolve(argv.config ? path_1.dirname(argv.config) : '', pathToApi));
         const pageHTML = yield utils_1.getPageHTML(api, pathToApi, Object.assign(Object.assign({}, options), { redocCurrentVersion }));
         fs_1.mkdirSync(path_1.dirname(options.output), { recursive: true });
         fs_1.writeFileSync(options.output, pageHTML);

package/lib/commands/build-docs/utils.d.ts

@@ -1,8 +1,7 @@
+import { Config } from '@redocly/openapi-core';
 import type { BuildDocsOptions } from './types';
-import type { Config } from '@redocly/openapi-core';
 export declare function getObjectOrJSON(openapiOptions: string | Record<string, unknown>, config: Config): JSON | Record<string, unknown> | Config;
 export declare function getPageHTML(api: any, pathToApi: string, { cdn, title, disableGoogleFont, templateFileName, templateOptions, redocOptions, redocCurrentVersion, }: BuildDocsOptions): Promise<string>;
-export declare function isURL(str: string): boolean;
 export declare function sanitizeJSONString(str: string): string;
 export declare function escapeClosingScriptTag(str: string): string;
 export declare function escapeUnicode(str: string): string;

package/lib/commands/build-docs/utils.js

@@ -9,9 +9,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.escapeUnicode = exports.escapeClosingScriptTag = exports.sanitizeJSONString = exports.isURL = exports.getPageHTML = exports.getObjectOrJSON = void 0;
+exports.escapeUnicode = exports.escapeClosingScriptTag = exports.sanitizeJSONString = exports.getPageHTML = exports.getObjectOrJSON = void 0;
 const React = require("react");
 const redoc_1 = require("redoc");
+const openapi_core_1 = require("@redocly/openapi-core");
 const server_1 = require("react-dom/server");
 const styled_components_1 = require("styled-components");
 const handlebars_1 = require("handlebars");
@@ -51,7 +52,7 @@ exports.getObjectOrJSON = getObjectOrJSON;
 function getPageHTML(api, pathToApi, { cdn, title, disableGoogleFont, templateFileName, templateOptions, redocOptions = {}, redocCurrentVersion, }) {
     return __awaiter(this, void 0, void 0, function* () {
         process.stderr.write('Prerendering docs');
-        const apiUrl = redocOptions.specUrl || (isURL(pathToApi) ? pathToApi : undefined);
+        const apiUrl = redocOptions.specUrl || (openapi_core_1.isAbsoluteUrl(pathToApi) ? pathToApi : undefined);
         const store = yield redoc_1.createStore(api, apiUrl, redocOptions);
         const sheet = new styled_components_1.ServerStyleSheet();
         const html = server_1.renderToString(sheet.collectStyles(React.createElement(redoc_1.Redoc, { store })));
@@ -80,10 +81,6 @@ function getPageHTML(api, pathToApi, { cdn, title, disableGoogleFont, templateFi
     });
 }
 exports.getPageHTML = getPageHTML;
-function isURL(str) {
-    return /^(https?:)\/\//m.test(str);
-}
-exports.isURL = isURL;
 function sanitizeJSONString(str) {
     return escapeClosingScriptTag(escapeUnicode(str));
 }

package/lib/commands/bundle.js

@@ -27,11 +27,14 @@ const perf_hooks_1 = require("perf_hooks");
 const colorette_1 = require("colorette");
 const fs_1 = require("fs");
 function handleBundle(argv, version) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     return __awaiter(this, void 0, void 0, function* () {
-        const config = yield openapi_core_1.loadConfig({ configPath: argv.config, customExtends: argv.extends });
-        const removeUnusedComponents = argv['remove-unused-components'] &&
-            !((_b = (_a = config.rawConfig.styleguide) === null || _a === void 0 ? void 0 : _a.decorators) === null || _b === void 0 ? void 0 : _b.hasOwnProperty('remove-unused-components'));
+        const config = yield utils_1.loadConfigAndHandleErrors({
+            configPath: argv.config,
+            customExtends: argv.extends,
+        });
+        const removeUnusedComponents = argv['remove-unused-components'] ||
+            ((_c = (_b = (_a = config.rawConfig) === null || _a === void 0 ? void 0 : _a.styleguide) === null || _b === void 0 ? void 0 : _b.decorators) === null || _c === void 0 ? void 0 : _c.hasOwnProperty('remove-unused-components'));
         const apis = yield utils_1.getFallbackApisOrExit(argv.apis, config);
         const totals = { errors: 0, warnings: 0, ignored: 0 };
         const maxProblems = argv['max-problems'];
@@ -64,13 +67,13 @@ function handleBundle(argv, version) {
                     utils_1.printLintTotals(fileLintTotals, 2);
                 }
                 process.stderr.write(colorette_1.gray(`bundling ${path}...\n`));
-                const _e = yield openapi_core_1.bundle({
+                const _f = yield openapi_core_1.bundle({
                     config: resolvedConfig,
                     ref: path,
                     dereference: argv.dereferenced,
                     removeUnusedComponents,
                     keepUrlRefs: argv['keep-url-references'],
-                }), { bundle: result, problems } = _e, meta = __rest(_e, ["bundle", "problems"]);
+                }), { bundle: result, problems } = _f, meta = __rest(_f, ["bundle", "problems"]);
                 const fileTotals = openapi_core_1.getTotals(problems);
                 const { outputFile, ext } = utils_1.getOutputFileName(path, apis.length, argv.output, argv.ext);
                 if (fileTotals.errors === 0 || argv.force) {
@@ -112,7 +115,7 @@ function handleBundle(argv, version) {
                 else {
                     process.stderr.write(`📦 Created a bundle for ${colorette_1.blue(path)} at ${colorette_1.blue(outputFile)} ${colorette_1.green(elapsed)}.\n`);
                 }
-                const removedCount = (_d = (_c = meta.visitorsData) === null || _c === void 0 ? void 0 : _c['remove-unused-components']) === null || _d === void 0 ? void 0 : _d.removedCount;
+                const removedCount = (_e = (_d = meta.visitorsData) === null || _d === void 0 ? void 0 : _d['remove-unused-components']) === null || _e === void 0 ? void 0 : _e.removedCount;
                 if (removedCount) {
                     process.stderr.write(colorette_1.gray(`🧹 Removed ${removedCount} unused components.\n`));
                 }

package/lib/commands/join.js

@@ -37,7 +37,7 @@ function handleJoin(argv, packageVersion) {
         if (usedTagsOptions.length > 1) {
             return utils_1.exitWithError(`You use ${colorette_1.yellow(usedTagsOptions.join(', '))} together.\nPlease choose only one! \n\n`);
         }
-        const config = yield openapi_core_1.loadConfig();
+        const config = yield utils_1.loadConfigAndHandleErrors();
         const apis = yield utils_1.getFallbackApisOrExit(argv.apis, config);
         const externalRefResolver = new openapi_core_1.BaseResolver(config.resolve);
         const documents = yield Promise.all(apis.map(({ path }) => externalRefResolver.resolveDocument(null, path, true)));

package/lib/commands/lint.js

@@ -19,7 +19,7 @@ function handleLint(argv, version) {
         if (argv.config && !openapi_core_1.doesYamlFileExist(argv.config)) {
             return utils_1.exitWithError('Please, provide valid path to the configuration file');
         }
-        const config = yield openapi_core_1.loadConfig({
+        const config = yield utils_1.loadConfigAndHandleErrors({
             configPath: argv.config,
             customExtends: argv.extends,
             processRawConfig: lintConfigCallback(argv, version),

package/lib/commands/login.js

@@ -19,7 +19,7 @@ function promptClientToken(domain) {
 exports.promptClientToken = promptClientToken;
 function handleLogin(argv) {
     return __awaiter(this, void 0, void 0, function* () {
-        const region = argv.region || (yield openapi_core_1.loadConfig()).region;
+        const region = argv.region || (yield utils_1.loadConfigAndHandleErrors()).region;
         const client = new openapi_core_1.RedoclyClient(region);
         const clientToken = yield promptClientToken(client.domain);
         process.stdout.write(colorette_1.gray('\n  Logging in...\n'));

package/lib/commands/preview-docs/index.js

@@ -94,7 +94,7 @@ function previewDocs(argv) {
         });
         function reloadConfig() {
             return __awaiter(this, void 0, void 0, function* () {
-                const config = yield openapi_core_1.loadConfig({ configPath: argv.config });
+                const config = yield utils_1.loadConfigAndHandleErrors({ configPath: argv.config });
                 const redoclyClient = new openapi_core_1.RedoclyClient();
                 isAuthorizedWithRedocly = yield redoclyClient.isAuthorizedWithRedocly();
                 const resolvedConfig = openapi_core_1.getMergedConfig(config, argv.api);

package/lib/commands/push.js

@@ -33,7 +33,7 @@ const login_1 = require("./login");
 const DEFAULT_VERSION = 'latest';
 function handlePush(argv) {
     return __awaiter(this, void 0, void 0, function* () {
-        const config = yield openapi_core_1.loadConfig({ region: argv.region, files: argv.files });
+        const config = yield utils_1.loadConfigAndHandleErrors({ region: argv.region, files: argv.files });
         const client = new openapi_core_1.RedoclyClient(config.region);
         const isAuthorized = yield client.isAuthorizedWithRedoclyByRegion();
         if (!isAuthorized) {

package/lib/commands/stats.js

@@ -54,7 +54,7 @@ function printStats(statsAccumulator, api, format) {
 }
 function handleStats(argv) {
     return __awaiter(this, void 0, void 0, function* () {
-        const config = yield openapi_core_1.loadConfig({ configPath: argv.config });
+        const config = yield utils_1.loadConfigAndHandleErrors({ configPath: argv.config });
         const [{ path }] = yield utils_1.getFallbackApisOrExit(argv.api ? [argv.api] : [], config);
         const externalRefResolver = new openapi_core_1.BaseResolver(config.resolve);
         const { bundle: document } = yield openapi_core_1.bundle({ config, ref: path });

package/lib/types.d.ts

@@ -1,4 +1,4 @@
-import type { BundleOutputFormat, OutputFormat, Region } from '@redocly/openapi-core';
+import type { BundleOutputFormat, OutputFormat, Region, Config } from '@redocly/openapi-core';
 export declare type Totals = {
     errors: number;
     warnings: number;
@@ -23,3 +23,4 @@ export declare type Skips = {
     'skip-decorator'?: string[];
     'skip-preprocessor'?: string[];
 };
+export declare type ConfigApis = Pick<Config, 'apis' | 'configFile'>;

package/lib/utils.d.ts

@@ -1,6 +1,6 @@
-import { BundleOutputFormat, Config, StyleguideConfig } from '@redocly/openapi-core';
-import { Totals, Entrypoint } from './types';
-export declare function getFallbackApisOrExit(argsApis: string[] | undefined, config: Config): Promise<Entrypoint[]>;
+import { BundleOutputFormat, StyleguideConfig, RawConfig, Region, Config } from '@redocly/openapi-core';
+import { Totals, Entrypoint, ConfigApis } from './types';
+export declare function getFallbackApisOrExit(argsApis: string[] | undefined, config: ConfigApis): Promise<Entrypoint[]>;
 export declare function getExecutionTime(startedAt: number): string;
 export declare function printExecutionTime(commandName: string, startedAt: number, api: string): void;
 export declare function pathToFilename(path: string, pathSeparator: string): string;
@@ -28,3 +28,10 @@ export declare function exitWithError(message: string): void;
  * Checks if dir is subdir of parent
  */
 export declare function isSubdir(parent: string, dir: string): boolean;
+export declare function loadConfigAndHandleErrors(options?: {
+    configPath?: string;
+    customExtends?: string[];
+    processRawConfig?: (rawConfig: RawConfig) => void | Promise<void>;
+    files?: string[];
+    region?: Region;
+}): Promise<Config>;

package/lib/utils.js

@@ -9,13 +9,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isSubdir = exports.exitWithError = exports.printUnusedWarnings = exports.getOutputFileName = exports.printConfigLintTotals = exports.printLintTotals = exports.handleError = exports.pluralize = exports.writeYaml = exports.readYaml = exports.promptUser = exports.saveBundle = exports.dumpBundle = exports.CircularJSONNotSupportedError = exports.escapeLanguageName = exports.pathToFilename = exports.printExecutionTime = exports.getExecutionTime = exports.getFallbackApisOrExit = void 0;
+exports.loadConfigAndHandleErrors = exports.isSubdir = exports.exitWithError = exports.printUnusedWarnings = exports.getOutputFileName = exports.printConfigLintTotals = exports.printLintTotals = exports.handleError = exports.pluralize = exports.writeYaml = exports.readYaml = exports.promptUser = exports.saveBundle = exports.dumpBundle = exports.CircularJSONNotSupportedError = exports.escapeLanguageName = exports.pathToFilename = exports.printExecutionTime = exports.getExecutionTime = exports.getFallbackApisOrExit = void 0;
 const path_1 = require("path");
 const colorette_1 = require("colorette");
 const perf_hooks_1 = require("perf_hooks");
 const glob = require("glob-promise");
 const fs = require("fs");
-const path = require("path");
 const readline = require("readline");
 const stream_1 = require("stream");
 const openapi_core_1 = require("@redocly/openapi-core");
@@ -25,13 +24,13 @@ function getFallbackApisOrExit(argsApis, config) {
         const { apis } = config;
         const shouldFallbackToAllDefinitions = !isNotEmptyArray(argsApis) && apis && Object.keys(apis).length > 0;
         const res = shouldFallbackToAllDefinitions
-            ? Object.entries(apis).map(([alias, { root }]) => ({
-                path: path_1.resolve(getConfigDirectory(config), root),
-                alias,
-            }))
+            ? fallbackToAllDefinitions(apis, config)
             : yield expandGlobsInEntrypoints(argsApis, config);
-        if (!isNotEmptyArray(res)) {
-            process.stderr.write('error: missing required argument `apis`.\n');
+        const filteredInvalidEntrypoints = res.filter(({ path }) => !isApiPathValid(path));
+        if (isNotEmptyArray(filteredInvalidEntrypoints)) {
+            for (const { path } of filteredInvalidEntrypoints) {
+                process.stderr.write(colorette_1.yellow(`\n ${path_1.relative(process.cwd(), path)} ${colorette_1.red(`does not exist or is invalid. Please provide a valid path. \n\n`)}`));
+            }
             process.exit(1);
         }
         return res;
@@ -44,6 +43,19 @@ function getConfigDirectory(config) {
 function isNotEmptyArray(args) {
     return Array.isArray(args) && !!args.length;
 }
+function isApiPathValid(apiPath) {
+    if (!apiPath.trim()) {
+        exitWithError('Path cannot be empty.');
+        return;
+    }
+    return fs.existsSync(apiPath) || openapi_core_1.isAbsoluteUrl(apiPath) ? apiPath : undefined;
+}
+function fallbackToAllDefinitions(apis, config) {
+    return Object.entries(apis).map(([alias, { root }]) => ({
+        path: openapi_core_1.isAbsoluteUrl(root) ? root : path_1.resolve(getConfigDirectory(config), root),
+        alias,
+    }));
+}
 function getAliasOrPath(config, aliasOrPath) {
     var _a, _b, _c;
     return config.apis[aliasOrPath]
@@ -52,14 +64,14 @@ function getAliasOrPath(config, aliasOrPath) {
             path: aliasOrPath,
             // find alias by path, take the first match
             alias: (_c = (_b = Object.entries(config.apis).find(([_alias, api]) => {
-                return path.resolve(api.root) === path.resolve(aliasOrPath);
+                return path_1.resolve(api.root) === path_1.resolve(aliasOrPath);
             })) === null || _b === void 0 ? void 0 : _b[0]) !== null && _c !== void 0 ? _c : undefined,
         };
 }
 function expandGlobsInEntrypoints(args, config) {
     return __awaiter(this, void 0, void 0, function* () {
         return (yield Promise.all(args.map((aliasOrPath) => __awaiter(this, void 0, void 0, function* () {
-            return glob.hasMagic(aliasOrPath)
+            return glob.hasMagic(aliasOrPath) && !openapi_core_1.isAbsoluteUrl(aliasOrPath)
                 ? (yield glob(aliasOrPath)).map((g) => getAliasOrPath(config, g))
                 : getAliasOrPath(config, aliasOrPath);
         })))).flat();
@@ -118,7 +130,7 @@ function dumpBundle(obj, format, dereference) {
 }
 exports.dumpBundle = dumpBundle;
 function saveBundle(filename, output) {
-    fs.mkdirSync(path.dirname(filename), { recursive: true });
+    fs.mkdirSync(path_1.dirname(filename), { recursive: true });
     fs.writeFileSync(filename, output);
 }
 exports.saveBundle = saveBundle;
@@ -277,7 +289,19 @@ exports.exitWithError = exitWithError;
  * Checks if dir is subdir of parent
  */
 function isSubdir(parent, dir) {
-    const relative = path.relative(parent, dir);
-    return !!relative && !/^..($|\/)/.test(relative) && !path.isAbsolute(relative);
+    const relativePath = path_1.relative(parent, dir);
+    return !!relativePath && !/^..($|\/)/.test(relativePath) && !path_1.isAbsolute(relativePath);
 }
 exports.isSubdir = isSubdir;
+function loadConfigAndHandleErrors(options = {}) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            return yield openapi_core_1.loadConfig(options);
+        }
+        catch (e) {
+            exitWithError(e.message);
+            return new openapi_core_1.Config({ apis: {}, styleguide: {} });
+        }
+    });
+}
+exports.loadConfigAndHandleErrors = loadConfigAndHandleErrors;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redocly/cli",
-  "version": "1.0.0-beta.116",
+  "version": "1.0.0-beta.118",
   "description": "",
   "license": "MIT",
   "bin": {
@@ -33,7 +33,7 @@
     "Roman Hotsiy <roman@redoc.ly> (https://redoc.ly/)"
   ],
   "dependencies": {
-    "@redocly/openapi-core": "1.0.0-beta.116",
+    "@redocly/openapi-core": "1.0.0-beta.118",
     "assert-node-version": "^1.0.3",
     "chokidar": "^3.5.1",
     "colorette": "^1.2.0",

package/src/__mocks__/@redocly/openapi-core.ts

@@ -29,6 +29,7 @@ export const findConfig = jest.fn();
 export const doesYamlFileExist = jest.fn();
 export const bundleDocument = jest.fn(() => Promise.resolve({ problems: {} }));
 export const detectOpenAPI = jest.fn();
+export const isAbsoluteUrl = jest.fn();
 
 export class BaseResolver {
   cache = new Map<string, Promise<Document | ResolveError>>();

package/src/__mocks__/utils.ts

@@ -1,3 +1,5 @@
+import { ConfigFixture } from '../__tests__/fixtures/config';
+
 export const getFallbackApisOrExit = jest.fn((entrypoints) =>
   entrypoints.map((path: string) => ({ path }))
 );
@@ -12,3 +14,4 @@ export const getOutputFileName = jest.fn(() => ({ outputFile: 'test.yaml', ext:
 export const handleError = jest.fn();
 export const exitWithError = jest.fn();
 export const writeYaml = jest.fn();
+export const loadConfigAndHandleErrors = jest.fn(() => ConfigFixture);

package/src/__tests__/commands/lint.test.ts

@@ -1,6 +1,5 @@
 import { handleLint, LintOptions } from '../../commands/lint';
 import {
-  loadConfig,
   getMergedConfig,
   lint,
   getTotals,
@@ -13,6 +12,7 @@ import {
   printUnusedWarnings,
   handleError,
   exitWithError,
+  loadConfigAndHandleErrors,
 } from '../../utils';
 import { ConfigFixture } from '../fixtures/config';
 import { performance } from 'perf_hooks';
@@ -58,12 +58,12 @@ describe('handleLint', () => {
       expect(exitWithError).toHaveBeenCalledWith(
         'Please, provide valid path to the configuration file'
       );
-      expect(loadConfig).toHaveBeenCalledTimes(0);
+      expect(loadConfigAndHandleErrors).toHaveBeenCalledTimes(0);
     });
 
-    it('should call loadConfig and getFallbackApisOrExit', async () => {
+    it('should call loadConfigAndHandleErrors and getFallbackApisOrExit', async () => {
       await handleLint(argvMock, versionMock);
-      expect(loadConfig).toHaveBeenCalledWith({
+      expect(loadConfigAndHandleErrors).toHaveBeenCalledWith({
         configPath: undefined,
         customExtends: undefined,
         processRawConfig: undefined,
@@ -76,7 +76,7 @@ describe('handleLint', () => {
         { ...argvMock, config: 'redocly.yaml', extends: ['some/path'] },
         versionMock
       );
-      expect(loadConfig).toHaveBeenCalledWith({
+      expect(loadConfigAndHandleErrors).toHaveBeenCalledWith({
         configPath: 'redocly.yaml',
         customExtends: ['some/path'],
         processRawConfig: undefined,

package/src/__tests__/commands/push.test.ts

@@ -1,6 +1,6 @@
 import * as fs from 'fs';
-import { Config, getMergedConfig, loadConfig } from '@redocly/openapi-core';
-import { exitWithError } from '../../utils';
+import { Config, getMergedConfig } from '@redocly/openapi-core';
+import { exitWithError, loadConfigAndHandleErrors } from '../../utils';
 import { getApiRoot, getDestinationProps, handlePush, transformPush } from '../../commands/push';
 import { ConfigFixture } from '../fixtures/config';
 
@@ -79,7 +79,7 @@ describe('push', () => {
   });
 
   it('push with --files', async () => {
-    (loadConfig as jest.Mock).mockImplementation(({ files }) => {
+    (loadConfigAndHandleErrors as jest.Mock).mockImplementation(({ files }) => {
       return { ...ConfigFixture, files };
     });