@redocly/cli 1.0.0-beta.127 → 1.0.0-beta.129

package/lib/__tests__/utils.test.js

@@ -120,18 +120,32 @@ describe('getFallbackApisOrExit', () => {
         jest.spyOn(process.stderr, 'write').mockImplementation(() => true);
         jest.spyOn(process, 'exit').mockImplementation();
     });
+    afterEach(() => {
+        jest.clearAllMocks();
+    });
     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);
+        expect.assertions(1);
+        try {
+            yield utils_1.getFallbackApisOrExit([''], apisConfig);
+        }
+        catch (e) {
+            expect(e.message).toEqual('Path cannot be empty.');
+        }
     }));
     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);
+        expect.assertions(3);
+        try {
+            yield utils_1.getFallbackApisOrExit(undefined, config);
+        }
+        catch (e) {
+            expect(process.stderr.write).toHaveBeenCalledWith('\nsomeFile.yaml does not exist or is invalid.\n\n');
+            expect(process.stderr.write).toHaveBeenCalledWith('Please provide a valid path.\n\n');
+            expect(e.message).toEqual('Please provide a valid path.');
+        }
     }));
     it('should return valid array with results if such file exist', () => __awaiter(void 0, void 0, void 0, function* () {
         fs_1.existsSync.mockImplementationOnce(() => true);
@@ -151,18 +165,30 @@ describe('getFallbackApisOrExit', () => {
             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);
+        expect.assertions(3);
+        try {
+            yield utils_1.getFallbackApisOrExit(['someFile.yaml'], apisConfig);
+        }
+        catch (e) {
+            expect(process.stderr.write).toHaveBeenCalledWith('\nsomeFile.yaml does not exist or is invalid.\n\n');
+            expect(process.stderr.write).toHaveBeenCalledWith('Please provide a valid path.\n\n');
+            expect(e.message).toEqual('Please provide a valid path.');
+        }
     }));
     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);
+        expect.assertions(3);
+        try {
+            yield utils_1.getFallbackApisOrExit(['someFile.yaml', 'someFile2.yaml'], apisConfig);
+        }
+        catch (e) {
+            expect(process.stderr.write).toHaveBeenCalledWith('\nsomeFile.yaml does not exist or is invalid.\n\n');
+            expect(process.stderr.write).toHaveBeenCalledWith('Please provide a valid path.\n\n');
+            expect(e.message).toEqual('Please provide a valid path.');
+        }
     }));
     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: {
@@ -170,10 +196,18 @@ describe('getFallbackApisOrExit', () => {
                 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);
+        const existSyncMock = fs_1.existsSync.mockImplementation((path) => path.endsWith('someFile.yaml'));
+        expect.assertions(4);
+        try {
+            yield utils_1.getFallbackApisOrExit(undefined, configStub);
+        }
+        catch (e) {
+            expect(process.stderr.write).toHaveBeenCalledWith('\nnotExist.yaml does not exist or is invalid.\n\n');
+            expect(process.stderr.write).toHaveBeenCalledWith('Please provide a valid path.\n\n');
+            expect(process.stderr.write).toHaveBeenCalledTimes(2);
+            expect(e.message).toEqual('Please provide a valid path.');
+        }
+        existSyncMock.mockClear();
     }));
     it('should work ok if it is url passed', () => __awaiter(void 0, void 0, void 0, function* () {
         fs_1.existsSync.mockImplementationOnce(() => false);
@@ -188,7 +222,6 @@ describe('getFallbackApisOrExit', () => {
         };
         const result = yield utils_1.getFallbackApisOrExit(undefined, apisConfig);
         expect(process.stderr.write).toHaveBeenCalledTimes(0);
-        expect(process.exit).toHaveBeenCalledTimes(0);
         expect(result).toStrictEqual([
             {
                 alias: 'main',
@@ -291,43 +324,43 @@ describe('sorTopLevelKeysForOas', () => {
 describe('handleErrors', () => {
     const ref = 'openapi/test.yaml';
     const redColoretteMocks = colorette_1.red;
+    const blueColoretteMocks = colorette_1.blue;
     beforeEach(() => {
         jest.spyOn(process.stderr, 'write').mockImplementation(() => true);
         jest.spyOn(process, 'exit').mockImplementation((code) => code);
         redColoretteMocks.mockImplementation((text) => text);
+        blueColoretteMocks.mockImplementation((text) => text);
     });
     afterEach(() => {
         jest.clearAllMocks();
     });
     it('should handle ResolveError', () => {
         const resolveError = new openapi_core_1.ResolveError(new Error('File not found'));
-        utils_1.handleError(resolveError, ref);
+        expect(() => utils_1.handleError(resolveError, ref)).toThrowError(utils_1.HandledError);
         expect(redColoretteMocks).toHaveBeenCalledTimes(1);
-        expect(process.exit).toHaveBeenCalledWith(1);
         expect(process.stderr.write).toHaveBeenCalledWith(`Failed to resolve api definition at openapi/test.yaml:\n\n  - File not found.\n\n`);
     });
     it('should handle YamlParseError', () => {
         const yamlParseError = new openapi_core_1.YamlParseError(new Error('Invalid yaml'), {});
-        utils_1.handleError(yamlParseError, ref);
+        expect(() => utils_1.handleError(yamlParseError, ref)).toThrowError(utils_1.HandledError);
         expect(redColoretteMocks).toHaveBeenCalledTimes(1);
-        expect(process.exit).toHaveBeenCalledWith(1);
         expect(process.stderr.write).toHaveBeenCalledWith(`Failed to parse api definition at openapi/test.yaml:\n\n  - Invalid yaml.\n\n`);
     });
     it('should handle CircularJSONNotSupportedError', () => {
         const circularError = new utils_1.CircularJSONNotSupportedError(new Error('Circular json'));
-        utils_1.handleError(circularError, ref);
-        expect(process.exit).toHaveBeenCalledWith(1);
+        expect(() => utils_1.handleError(circularError, ref)).toThrowError(utils_1.HandledError);
         expect(process.stderr.write).toHaveBeenCalledWith(`Detected circular reference which can't be converted to JSON.\n` +
             `Try to use ${colorette_1.blue('yaml')} output or remove ${colorette_1.blue('--dereferenced')}.\n\n`);
     });
+    it('should handle SyntaxError', () => {
+        const testError = new SyntaxError('Unexpected identifier');
+        testError.stack = 'test stack';
+        expect(() => utils_1.handleError(testError, ref)).toThrowError(utils_1.HandledError);
+        expect(process.stderr.write).toHaveBeenCalledWith('Syntax error: Unexpected identifier test stack\n\n');
+    });
     it('should throw unknown error', () => {
         const testError = new Error('Test error');
-        try {
-            utils_1.handleError(testError, ref);
-        }
-        catch (e) {
-            expect(e).toEqual(testError);
-        }
+        expect(() => utils_1.handleError(testError, ref)).toThrowError(utils_1.HandledError);
         expect(process.stderr.write).toHaveBeenCalledWith(`Something went wrong when processing openapi/test.yaml:\n\n  - Test error.\n\n`);
     });
 });
@@ -338,23 +371,21 @@ describe('checkIfRulesetExist', () => {
     afterEach(() => {
         jest.clearAllMocks();
     });
-    it('should exit if rules not provided', () => {
+    it('should throw an error if rules are not provided', () => {
         const rules = {
             oas2: {},
             oas3_0: {},
             oas3_1: {},
         };
-        utils_1.checkIfRulesetExist(rules);
-        expect(process.exit).toHaveBeenCalledWith(1);
+        expect(() => utils_1.checkIfRulesetExist(rules)).toThrowError('⚠️ No rules were configured. Learn how to configure rules: https://redocly.com/docs/cli/rules/');
     });
-    it('should not exit if rules provided', () => {
+    it('should not throw an error if rules are provided', () => {
         const rules = {
             oas2: { 'operation-4xx-response': 'error' },
             oas3_0: {},
             oas3_1: {},
         };
         utils_1.checkIfRulesetExist(rules);
-        expect(process.exit).not.toHaveBeenCalled();
     });
 });
 describe('cleanColors', () => {
@@ -364,3 +395,44 @@ describe('cleanColors', () => {
         expect(result).not.toMatch(/\x1b\[\d+m/g);
     });
 });
+describe('cleanArgs', () => {
+    beforeEach(() => {
+        // @ts-ignore
+        openapi_core_1.isAbsoluteUrl = jest.requireActual('@redocly/openapi-core').isAbsoluteUrl;
+    });
+    it('should remove potentially sensitive data from args', () => {
+        const testArgs = {
+            config: 'some-folder/redocly.yaml',
+            apis: ['main@v1', 'openapi.yaml', 'http://some.url/openapi.yaml'],
+            format: 'codeframe',
+        };
+        expect(utils_1.cleanArgs(testArgs)).toEqual({
+            config: '***.yaml',
+            apis: ['main@v1', '***.yaml', 'http://***'],
+            format: 'codeframe',
+        });
+    });
+    it('should remove potentially sensitive data from a push destination', () => {
+        const testArgs = {
+            destination: '@org/name@version',
+        };
+        expect(utils_1.cleanArgs(testArgs)).toEqual({
+            destination: '@***/name@version',
+        });
+    });
+});
+describe('cleanRawInput', () => {
+    it('should remove  potentially sensitive data from raw CLI input', () => {
+        // @ts-ignore
+        openapi_core_1.isAbsoluteUrl = jest.requireActual('@redocly/openapi-core').isAbsoluteUrl;
+        const rawInput = [
+            'redocly',
+            'lint',
+            'main@v1',
+            'openapi.yaml',
+            'http://some.url/openapi.yaml',
+            '--config=some-folder/redocly.yaml',
+        ];
+        expect(utils_1.cleanRawInput(rawInput)).toEqual('redocly lint main@v1 ***.yaml http://*** --config=***.yaml');
+    });
+});

package/lib/__tests__/wrapper.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/__tests__/wrapper.test.js

@@ -0,0 +1,47 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils_1 = require("../utils");
+const process = require("process");
+const wrapper_1 = require("../wrapper");
+const lint_1 = require("../commands/lint");
+jest.mock('node-fetch');
+jest.mock('../utils', () => ({
+    sendTelemetry: jest.fn(),
+    loadConfigAndHandleErrors: jest.fn(),
+}));
+jest.mock('../commands/lint', () => ({
+    handleLint: jest.fn(),
+    lintConfigCallback: jest.fn(),
+}));
+describe('commandWrapper', () => {
+    it('should send telemetry if there is "telemetry: on" in the config', () => __awaiter(void 0, void 0, void 0, function* () {
+        utils_1.loadConfigAndHandleErrors.mockImplementation(() => {
+            return { telemetry: 'on', styleguide: { recommendedFallback: true } };
+        });
+        process.env.REDOCLY_TELEMETRY = 'on';
+        const wrappedHandler = wrapper_1.commandWrapper(lint_1.handleLint);
+        yield wrappedHandler({});
+        expect(lint_1.handleLint).toHaveBeenCalledTimes(1);
+        expect(utils_1.sendTelemetry).toHaveBeenCalledTimes(1);
+        expect(utils_1.sendTelemetry).toHaveBeenCalledWith({}, 0, false);
+    }));
+    it('should NOT send telemetry if there is "telemetry: off" in the config', () => __awaiter(void 0, void 0, void 0, function* () {
+        utils_1.loadConfigAndHandleErrors.mockImplementation(() => {
+            return { telemetry: 'off', styleguide: { recommendedFallback: true } };
+        });
+        process.env.REDOCLY_TELEMETRY = 'on';
+        const wrappedHandler = wrapper_1.commandWrapper(lint_1.handleLint);
+        yield wrappedHandler({});
+        expect(lint_1.handleLint).toHaveBeenCalledTimes(1);
+        expect(utils_1.sendTelemetry).toHaveBeenCalledTimes(0);
+    }));
+});

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

@@ -1,2 +1,3 @@
 import type { BuildDocsArgv } from './types';
-export declare const handlerBuildCommand: (argv: BuildDocsArgv) => Promise<void>;
+import { Config } from '@redocly/openapi-core';
+export declare const handlerBuildCommand: (argv: BuildDocsArgv, configFromFile: Config) => Promise<void>;

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

@@ -17,10 +17,9 @@ const perf_hooks_1 = require("perf_hooks");
 const utils_1 = 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* () {
+const handlerBuildCommand = (argv, configFromFile) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
     const startedAt = perf_hooks_1.performance.now();
-    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];

package/lib/commands/bundle.d.ts

@@ -1,5 +1,11 @@
-import type { CommonOptions, OutputExtensions, Skips } from '../types';
-export declare type BundleOptions = CommonOptions & Skips & {
+import { Config, OutputFormat } from '@redocly/openapi-core';
+import type { OutputExtensions, Skips } from '../types';
+export declare type BundleOptions = {
+    apis?: string[];
+    'max-problems': number;
+    extends?: string[];
+    config?: string;
+    format: OutputFormat;
     output?: string;
     ext: OutputExtensions;
     dereferenced?: boolean;
@@ -8,5 +14,5 @@ export declare type BundleOptions = CommonOptions & Skips & {
     metafile?: string;
     'remove-unused-components'?: boolean;
     'keep-url-references'?: boolean;
-};
-export declare function handleBundle(argv: BundleOptions, version: string): Promise<void>;
+} & Skips;
+export declare function handleBundle(argv: BundleOptions, config: Config, version: string): Promise<void>;

package/lib/commands/bundle.js

@@ -26,13 +26,9 @@ const utils_1 = require("../utils");
 const perf_hooks_1 = require("perf_hooks");
 const colorette_1 = require("colorette");
 const fs_1 = require("fs");
-function handleBundle(argv, version) {
+function handleBundle(argv, config, version) {
     var _a, _b, _c, _d, _e;
     return __awaiter(this, void 0, void 0, function* () {
-        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);
@@ -126,9 +122,9 @@ function handleBundle(argv, version) {
             }
         }
         utils_1.printUnusedWarnings(config.styleguide);
-        // defer process exit to allow STDOUT pipe to flush
-        // see https://github.com/nodejs/node-v0.x-archive/issues/3737#issuecomment-19156072
-        process.once('exit', () => process.exit(totals.errors === 0 || argv.force ? 0 : 1));
+        if (!(totals.errors === 0 || argv.force)) {
+            throw new Error('Bundle failed.');
+        }
     });
 }
 exports.handleBundle = handleBundle;

package/lib/commands/join.d.ts

@@ -1,4 +1,5 @@
-declare type JoinArgv = {
+import { Config } from '@redocly/openapi-core';
+export declare type JoinOptions = {
     apis: string[];
     lint?: boolean;
     decorate?: boolean;
@@ -8,6 +9,8 @@ declare type JoinArgv = {
     'prefix-components-with-info-prop'?: string;
     'without-x-tag-groups'?: boolean;
     output?: string;
+    config?: string;
+    extends?: undefined;
+    'lint-config'?: undefined;
 };
-export declare function handleJoin(argv: JoinArgv, packageVersion: string): Promise<void>;
-export {};
+export declare function handleJoin(argv: JoinOptions, config: Config, packageVersion: string): Promise<void>;

package/lib/commands/join.js

@@ -22,7 +22,7 @@ const COMPONENTS = 'components';
 const Tags = 'tags';
 const xTagGroups = 'x-tagGroups';
 let potentialConflictsTotal = 0;
-function handleJoin(argv, packageVersion) {
+function handleJoin(argv, config, packageVersion) {
     return __awaiter(this, void 0, void 0, function* () {
         const startedAt = perf_hooks_1.performance.now();
         if (argv.apis.length < 2) {
@@ -37,7 +37,6 @@ 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 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.d.ts

@@ -1,7 +1,14 @@
-import { RuleSeverity } from '@redocly/openapi-core';
-import type { CommonOptions, Skips } from '../types';
-export declare type LintOptions = CommonOptions & Omit<Skips, 'skip-decorator'> & {
+import { Config } from '@redocly/openapi-core';
+import type { OutputFormat, RawConfig, RuleSeverity } from '@redocly/openapi-core';
+import type { CommandOptions, Skips } from '../types';
+export declare type LintOptions = {
+    apis?: string[];
+    'max-problems': number;
+    extends?: string[];
+    config?: string;
+    format: OutputFormat;
     'generate-ignore-file'?: boolean;
-    'lint-config': RuleSeverity;
-};
-export declare function handleLint(argv: LintOptions, version: string): Promise<void>;
+    'lint-config'?: RuleSeverity;
+} & Omit<Skips, 'skip-decorator'>;
+export declare function handleLint(argv: LintOptions, config: Config, version: string): Promise<void>;
+export declare function lintConfigCallback(argv: CommandOptions & Record<string, undefined>, version: string): ((config: RawConfig) => Promise<void>) | undefined;

package/lib/commands/lint.js

@@ -9,24 +9,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleLint = void 0;
+exports.lintConfigCallback = exports.handleLint = void 0;
 const openapi_core_1 = require("@redocly/openapi-core");
 const utils_1 = require("../utils");
 const colorette_1 = require("colorette");
 const perf_hooks_1 = require("perf_hooks");
-function handleLint(argv, version) {
+function handleLint(argv, config, version) {
     return __awaiter(this, void 0, void 0, function* () {
-        if (argv.config && !openapi_core_1.doesYamlFileExist(argv.config)) {
-            return utils_1.exitWithError('Please, provide valid path to the configuration file');
-        }
-        const config = yield utils_1.loadConfigAndHandleErrors({
-            configPath: argv.config,
-            customExtends: argv.extends,
-            processRawConfig: lintConfigCallback(argv, version),
-        });
         const apis = yield utils_1.getFallbackApisOrExit(argv.apis, config);
         if (!apis.length) {
-            return utils_1.exitWithError('No APIs were provided');
+            utils_1.exitWithError('No APIs were provided');
         }
         if (argv['generate-ignore-file']) {
             config.styleguide.ignore = {}; // clear ignore
@@ -83,9 +75,9 @@ function handleLint(argv, version) {
             utils_1.printLintTotals(totals, apis.length);
         }
         utils_1.printUnusedWarnings(config.styleguide);
-        // defer process exit to allow STDOUT pipe to flush
-        // see https://github.com/nodejs/node-v0.x-archive/issues/3737#issuecomment-19156072
-        process.once('exit', () => process.exit(totals.errors === 0 || argv['generate-ignore-file'] ? 0 : 1));
+        if (!(totals.errors === 0 || argv['generate-ignore-file'])) {
+            throw new Error('Lint failed.');
+        }
     });
 }
 exports.handleLint = handleLint;
@@ -98,7 +90,6 @@ function lintConfigCallback(argv, version) {
         return;
     }
     return (config) => __awaiter(this, void 0, void 0, function* () {
-        const { 'max-problems': maxProblems, format } = argv;
         const configPath = openapi_core_1.findConfig(argv.config) || '';
         const stringYaml = openapi_core_1.stringifyYaml(config);
         const configContent = openapi_core_1.makeDocumentFromString(stringYaml, configPath);
@@ -108,11 +99,12 @@ function lintConfigCallback(argv, version) {
         });
         const fileTotals = openapi_core_1.getTotals(problems);
         openapi_core_1.formatProblems(problems, {
-            format,
-            maxProblems,
+            format: argv.format,
+            maxProblems: argv['max-problems'],
             totals: fileTotals,
             version,
         });
         utils_1.printConfigLintTotals(fileTotals);
     });
 }
+exports.lintConfigCallback = lintConfigCallback;

package/lib/commands/login.d.ts

@@ -1,6 +1,8 @@
-import { Region } from '@redocly/openapi-core';
+import { Region, Config } from '@redocly/openapi-core';
 export declare function promptClientToken(domain: string): Promise<string>;
-export declare function handleLogin(argv: {
+export declare type LoginOptions = {
     verbose?: boolean;
     region?: Region;
-}): Promise<void>;
+    config?: string;
+};
+export declare function handleLogin(argv: LoginOptions, config: Config): Promise<void>;

package/lib/commands/login.js

@@ -17,9 +17,9 @@ function promptClientToken(domain) {
     return utils_1.promptUser(colorette_1.green(`\n  🔑 Copy your API key from ${colorette_1.blue(`https://app.${domain}/profile`)} and paste it below`), true);
 }
 exports.promptClientToken = promptClientToken;
-function handleLogin(argv) {
+function handleLogin(argv, config) {
     return __awaiter(this, void 0, void 0, function* () {
-        const region = argv.region || (yield utils_1.loadConfigAndHandleErrors()).region;
+        const region = argv.region || config.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.d.ts

@@ -1,10 +1,12 @@
+import { Config } from '@redocly/openapi-core';
 import type { Skips } from '../../types';
-export declare function previewDocs(argv: {
+export declare type PreviewDocsOptions = {
     port: number;
     host: string;
     'use-community-edition'?: boolean;
     config?: string;
     api?: string;
     force?: boolean;
-} & Omit<Skips, 'skip-rule'>): Promise<void>;
+} & Omit<Skips, 'skip-rule'>;
+export declare function previewDocs(argv: PreviewDocsOptions, configFromFile: Config): Promise<void>;
 export declare function debounce(func: Function, wait: number, immediate?: boolean): (...args: any[]) => void;

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

@@ -15,11 +15,11 @@ const chockidar = require("chokidar");
 const openapi_core_1 = require("@redocly/openapi-core");
 const utils_1 = require("../../utils");
 const preview_server_1 = require("./preview-server/preview-server");
-function previewDocs(argv) {
+function previewDocs(argv, configFromFile) {
     return __awaiter(this, void 0, void 0, function* () {
         let isAuthorizedWithRedocly = false;
         let redocOptions = {};
-        let config = yield reloadConfig();
+        let config = yield reloadConfig(configFromFile);
         const apis = yield utils_1.getFallbackApisOrExit(argv.api ? [argv.api] : [], config);
         const api = apis[0];
         let cachedBundle;
@@ -92,10 +92,17 @@ function previewDocs(argv) {
         watcher.on('ready', () => {
             process.stdout.write(`\n  👀  Watching ${colorette.blue(api.path)} and all related resources for changes\n\n`);
         });
-        function reloadConfig() {
+        function reloadConfig(config) {
             var _a;
             return __awaiter(this, void 0, void 0, function* () {
-                const config = yield utils_1.loadConfigAndHandleErrors({ configPath: argv.config });
+                if (!config) {
+                    try {
+                        config = (yield utils_1.loadConfigAndHandleErrors({ configPath: argv.config }));
+                    }
+                    catch (err) {
+                        config = new openapi_core_1.Config({ apis: {}, styleguide: {} });
+                    }
+                }
                 const redoclyClient = new openapi_core_1.RedoclyClient();
                 isAuthorizedWithRedocly = yield redoclyClient.isAuthorizedWithRedocly();
                 const resolvedConfig = openapi_core_1.getMergedConfig(config, argv.api);

package/lib/commands/push.d.ts

@@ -1,29 +1,34 @@
 import { Config, Region } from '@redocly/openapi-core';
-declare type PushArgs = {
+export declare const DESTINATION_REGEX: RegExp;
+export declare type PushOptions = {
     api?: string;
     destination?: string;
     branchName?: string;
     upsert?: boolean;
-    'batch-id'?: string;
+    'job-id'?: string;
     'batch-size'?: number;
     region?: Region;
     'skip-decorator'?: string[];
     public?: boolean;
     files?: string[];
+    organization?: string;
+    config?: string;
 };
-export declare function handlePush(argv: PushArgs): Promise<void>;
+export declare function handlePush(argv: PushOptions, config: Config): Promise<void>;
 export declare function getDestinationProps(destination: string | undefined, organization: string | undefined): {
     organizationId: string | undefined;
     name: string | undefined;
     version: string | undefined;
 };
-declare type BarePushArgs = Omit<PushArgs, 'api' | 'destination' | 'branchName'> & {
-    maybeApiOrDestination?: string;
+declare type BarePushArgs = Omit<PushOptions, 'destination' | 'branchName'> & {
     maybeDestination?: string;
     maybeBranchName?: string;
     branch?: string;
+    destination?: string;
 };
-export declare const transformPush: (callback: typeof handlePush) => ({ maybeApiOrDestination, maybeDestination, maybeBranchName, branch, ...rest }: BarePushArgs) => Promise<void>;
+export declare const transformPush: (callback: typeof handlePush) => ({ api: maybeApiOrDestination, maybeDestination, maybeBranchName, branch, "batch-id": batchId, "job-id": jobId, ...rest }: BarePushArgs & {
+    'batch-id'?: string;
+}, config: Config) => Promise<void>;
 export declare function getApiRoot({ name, version, config: { apis }, }: {
     name: string;
     version: string;