@redocly/cli 1.3.0 → 1.4.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @redocly/cli
 
+## 1.4.0
+
+### Minor Changes
+
+- Added `recommended-strict` ruleset which uses the same rules as `recommended` but with the severity level set to `error` for all rules.
+- Add JSON output support to the `split` and `join` commands.
+
+### Patch Changes
+
+- The `--host/-h` argument in the `preview-docs` command is now also used by the WebSocket server for hot reloading.
+- Updated @redocly/openapi-core to v1.4.0.
+
 ## 1.3.0
 
 ### Minor Changes

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

@@ -63,6 +63,7 @@ export declare const bundleDocument: jest.Mock<Promise<{
 }>, []>;
 export declare const detectSpec: jest.Mock<any, any>;
 export declare const isAbsoluteUrl: jest.Mock<any, any>;
+export declare const stringifyYaml: jest.Mock<any, [data: any]>;
 export declare class BaseResolver {
     cache: Map<string, Promise<Document | ResolveError>>;
     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.SpecVersion = exports.YamlParseError = exports.ResolveError = exports.BaseResolver = exports.isAbsoluteUrl = exports.detectSpec = 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.SpecVersion = exports.YamlParseError = exports.ResolveError = exports.BaseResolver = exports.stringifyYaml = exports.isAbsoluteUrl = exports.detectSpec = 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 = {
@@ -30,6 +30,7 @@ exports.doesYamlFileExist = jest.fn();
 exports.bundleDocument = jest.fn(() => Promise.resolve({ problems: {} }));
 exports.detectSpec = jest.fn();
 exports.isAbsoluteUrl = jest.fn();
+exports.stringifyYaml = jest.fn((data) => data);
 class BaseResolver {
     constructor() {
         this.cache = new Map();
@@ -66,7 +67,7 @@ var SpecVersion;
     SpecVersion["OAS3_0"] = "oas3_0";
     SpecVersion["OAS3_1"] = "oas3_1";
     SpecVersion["Async2"] = "async2";
-})(SpecVersion = exports.SpecVersion || (exports.SpecVersion = {}));
+})(SpecVersion || (exports.SpecVersion = SpecVersion = {}));
 var Oas3Operations;
 (function (Oas3Operations) {
     Oas3Operations["get"] = "get";
@@ -77,4 +78,4 @@ var Oas3Operations;
     Oas3Operations["head"] = "head";
     Oas3Operations["patch"] = "patch";
     Oas3Operations["trace"] = "trace";
-})(Oas3Operations = exports.Oas3Operations || (exports.Oas3Operations = {}));
+})(Oas3Operations || (exports.Oas3Operations = Oas3Operations = {}));

package/lib/__mocks__/utils.d.ts

@@ -37,3 +37,5 @@ export declare const loadConfigAndHandleErrors: jest.Mock<{
 }, []>;
 export declare const checkIfRulesetExist: jest.Mock<any, any>;
 export declare const sortTopLevelKeysForOas: jest.Mock<any, [document: any]>;
+export declare const getAndValidateFileExtension: jest.Mock<string | undefined, [fileName: string]>;
+export declare const writeToFileByExtension: jest.Mock<any, any>;

package/lib/__mocks__/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sortTopLevelKeysForOas = exports.checkIfRulesetExist = 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;
+exports.writeToFileByExtension = exports.getAndValidateFileExtension = exports.sortTopLevelKeysForOas = exports.checkIfRulesetExist = 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(() => '');
@@ -17,3 +17,5 @@ exports.writeYaml = jest.fn();
 exports.loadConfigAndHandleErrors = jest.fn(() => config_1.ConfigFixture);
 exports.checkIfRulesetExist = jest.fn();
 exports.sortTopLevelKeysForOas = jest.fn((document) => document);
+exports.getAndValidateFileExtension = jest.fn((fileName) => fileName.split('.').pop());
+exports.writeToFileByExtension = jest.fn();

package/lib/__tests__/commands/build-docs.test.js

@@ -33,14 +33,14 @@ jest.mock('handlebars', () => ({
 }));
 describe('build-docs', () => {
     it('should return correct html and call function for ssr', () => __awaiter(void 0, void 0, void 0, function* () {
-        const result = yield utils_1.getPageHTML({}, '../some-path/openapi.yaml', Object.assign(Object.assign({}, config), { redocCurrentVersion: '2.0.0' }));
+        const result = yield (0, utils_1.getPageHTML)({}, '../some-path/openapi.yaml', Object.assign(Object.assign({}, config), { redocCurrentVersion: '2.0.0' }));
         expect(server_1.renderToString).toBeCalledTimes(1);
         expect(redoc_1.createStore).toBeCalledTimes(1);
         expect(result).toBe('<html></html>');
     }));
     it('should work correctly when calling handlerBuildCommand', () => __awaiter(void 0, void 0, void 0, function* () {
         const processExitMock = jest.spyOn(process, 'exit').mockImplementation();
-        yield build_docs_1.handlerBuildCommand({
+        yield (0, build_docs_1.handlerBuildCommand)({
             o: '',
             title: 'test',
             disableGoogleFont: false,

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

@@ -34,7 +34,7 @@ describe('bundle', () => {
     });
     it('bundles definitions w/o linting', () => __awaiter(void 0, void 0, void 0, function* () {
         const apis = ['foo.yaml', 'bar.yaml'];
-        yield wrapper_1.commandWrapper(bundle_1.handleBundle)({
+        yield (0, wrapper_1.commandWrapper)(bundle_1.handleBundle)({
             apis,
             ext: 'yaml',
             format: 'codeframe',
@@ -44,7 +44,7 @@ describe('bundle', () => {
     }));
     it('exits with code 0 when bundles definitions', () => __awaiter(void 0, void 0, void 0, function* () {
         const apis = ['foo.yaml', 'bar.yaml', 'foobar.yaml'];
-        yield wrapper_1.commandWrapper(bundle_1.handleBundle)({
+        yield (0, wrapper_1.commandWrapper)(bundle_1.handleBundle)({
             apis,
             ext: 'yaml',
             format: 'codeframe',
@@ -59,7 +59,7 @@ describe('bundle', () => {
             warnings: 0,
             ignored: 0,
         });
-        yield wrapper_1.commandWrapper(bundle_1.handleBundle)({
+        yield (0, wrapper_1.commandWrapper)(bundle_1.handleBundle)({
             apis,
             ext: 'yaml',
             format: 'codeframe',
@@ -70,7 +70,7 @@ describe('bundle', () => {
     }));
     it('exits with code 0 when bundles definitions w/linting w/o errors', () => __awaiter(void 0, void 0, void 0, function* () {
         const apis = ['foo.yaml', 'bar.yaml', 'foobar.yaml'];
-        yield wrapper_1.commandWrapper(bundle_1.handleBundle)({
+        yield (0, wrapper_1.commandWrapper)(bundle_1.handleBundle)({
             apis,
             ext: 'yaml',
             format: 'codeframe',
@@ -86,7 +86,7 @@ describe('bundle', () => {
             warnings: 0,
             ignored: 0,
         });
-        yield wrapper_1.commandWrapper(bundle_1.handleBundle)({
+        yield (0, wrapper_1.commandWrapper)(bundle_1.handleBundle)({
             apis,
             ext: 'yaml',
             format: 'codeframe',
@@ -101,7 +101,7 @@ describe('bundle', () => {
         openapi_core_1.bundle.mockImplementationOnce(() => {
             throw new Error('Invalid definition');
         });
-        yield wrapper_1.commandWrapper(bundle_1.handleBundle)({
+        yield (0, wrapper_1.commandWrapper)(bundle_1.handleBundle)({
             apis,
             ext: 'json',
             format: 'codeframe',
@@ -117,7 +117,7 @@ describe('bundle', () => {
             warnings: 0,
             ignored: 0,
         });
-        yield wrapper_1.commandWrapper(bundle_1.handleBundle)({
+        yield (0, wrapper_1.commandWrapper)(bundle_1.handleBundle)({
             apis,
             ext: 'yaml',
             format: 'codeframe',

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

@@ -21,11 +21,11 @@ describe('handleJoin fails', () => {
     const colloreteYellowMock = colorette_1.yellow;
     colloreteYellowMock.mockImplementation((string) => string);
     it('should call exitWithError because only one entrypoint', () => __awaiter(void 0, void 0, void 0, function* () {
-        yield join_1.handleJoin({ apis: ['first.yaml'] }, {}, 'cli-version');
+        yield (0, join_1.handleJoin)({ apis: ['first.yaml'] }, {}, 'cli-version');
         expect(utils_1.exitWithError).toHaveBeenCalledWith(`At least 2 apis should be provided. \n\n`);
     }));
     it('should call exitWithError because passed all 3 options for tags', () => __awaiter(void 0, void 0, void 0, function* () {
-        yield join_1.handleJoin({
+        yield (0, join_1.handleJoin)({
             apis: ['first.yaml', 'second.yaml'],
             'prefix-tags-with-info-prop': 'something',
             'without-x-tag-groups': true,
@@ -34,7 +34,7 @@ describe('handleJoin fails', () => {
         expect(utils_1.exitWithError).toHaveBeenCalledWith(`You use prefix-tags-with-filename, prefix-tags-with-info-prop, without-x-tag-groups together.\nPlease choose only one! \n\n`);
     }));
     it('should call exitWithError because passed all 2 options for tags', () => __awaiter(void 0, void 0, void 0, function* () {
-        yield join_1.handleJoin({
+        yield (0, join_1.handleJoin)({
             apis: ['first.yaml', 'second.yaml'],
             'without-x-tag-groups': true,
             'prefix-tags-with-filename': true,
@@ -42,7 +42,7 @@ describe('handleJoin fails', () => {
         expect(utils_1.exitWithError).toHaveBeenCalledWith(`You use prefix-tags-with-filename, without-x-tag-groups together.\nPlease choose only one! \n\n`);
     }));
     it('should call exitWithError because Only OpenAPI 3.0 and OpenAPI 3.1 are supported', () => __awaiter(void 0, void 0, void 0, function* () {
-        yield join_1.handleJoin({
+        yield (0, join_1.handleJoin)({
             apis: ['first.yaml', 'second.yaml'],
         }, config_1.ConfigFixture, 'cli-version');
         expect(utils_1.exitWithError).toHaveBeenCalledWith('Only OpenAPI 3.0 and OpenAPI 3.1 are supported: undefined \n\n');
@@ -51,50 +51,57 @@ describe('handleJoin fails', () => {
         openapi_core_1.detectSpec
             .mockImplementationOnce(() => 'oas3_0')
             .mockImplementationOnce(() => 'oas3_1');
-        yield join_1.handleJoin({
+        yield (0, join_1.handleJoin)({
             apis: ['first.yaml', 'second.yaml'],
         }, config_1.ConfigFixture, 'cli-version');
         expect(utils_1.exitWithError).toHaveBeenCalledWith('All APIs must use the same OpenAPI version: undefined \n\n');
     }));
-    it('should call writeYaml function', () => __awaiter(void 0, void 0, void 0, function* () {
+    it('should call writeToFileByExtension function', () => __awaiter(void 0, void 0, void 0, function* () {
         openapi_core_1.detectSpec.mockReturnValue('oas3_0');
-        yield join_1.handleJoin({
+        yield (0, join_1.handleJoin)({
             apis: ['first.yaml', 'second.yaml'],
         }, config_1.ConfigFixture, 'cli-version');
-        expect(utils_1.writeYaml).toHaveBeenCalledWith(expect.any(Object), 'openapi.yaml', expect.any(Boolean));
+        expect(utils_1.writeToFileByExtension).toHaveBeenCalledWith(expect.any(Object), 'openapi.yaml', expect.any(Boolean));
     }));
-    it('should call writeYaml function for OpenAPI 3.1', () => __awaiter(void 0, void 0, void 0, function* () {
+    it('should call writeToFileByExtension function for OpenAPI 3.1', () => __awaiter(void 0, void 0, void 0, function* () {
         openapi_core_1.detectSpec.mockReturnValue('oas3_1');
-        yield join_1.handleJoin({
+        yield (0, join_1.handleJoin)({
             apis: ['first.yaml', 'second.yaml'],
         }, config_1.ConfigFixture, 'cli-version');
-        expect(utils_1.writeYaml).toHaveBeenCalledWith(expect.any(Object), 'openapi.yaml', expect.any(Boolean));
+        expect(utils_1.writeToFileByExtension).toHaveBeenCalledWith(expect.any(Object), 'openapi.yaml', expect.any(Boolean));
     }));
-    it('should call writeYaml function with custom output file', () => __awaiter(void 0, void 0, void 0, function* () {
+    it('should call writeToFileByExtension function with custom output file', () => __awaiter(void 0, void 0, void 0, function* () {
         openapi_core_1.detectSpec.mockReturnValue('oas3_0');
-        yield join_1.handleJoin({
+        yield (0, join_1.handleJoin)({
             apis: ['first.yaml', 'second.yaml'],
             output: 'output.yml',
         }, config_1.ConfigFixture, 'cli-version');
-        expect(utils_1.writeYaml).toHaveBeenCalledWith(expect.any(Object), 'output.yml', expect.any(Boolean));
+        expect(utils_1.writeToFileByExtension).toHaveBeenCalledWith(expect.any(Object), 'output.yml', expect.any(Boolean));
+    }));
+    it('should call writeToFileByExtension function with json file extension', () => __awaiter(void 0, void 0, void 0, function* () {
+        openapi_core_1.detectSpec.mockReturnValue('oas3_0');
+        yield (0, join_1.handleJoin)({
+            apis: ['first.json', 'second.yaml'],
+        }, config_1.ConfigFixture, 'cli-version');
+        expect(utils_1.writeToFileByExtension).toHaveBeenCalledWith(expect.any(Object), 'openapi.json', expect.any(Boolean));
     }));
     it('should call skipDecorators and skipPreprocessors', () => __awaiter(void 0, void 0, void 0, function* () {
         openapi_core_1.detectSpec.mockReturnValue('oas3_0');
-        yield join_1.handleJoin({
+        yield (0, join_1.handleJoin)({
             apis: ['first.yaml', 'second.yaml'],
         }, config_1.ConfigFixture, 'cli-version');
-        const config = openapi_core_2.loadConfig();
+        const config = (0, openapi_core_2.loadConfig)();
         expect(config.styleguide.skipDecorators).toHaveBeenCalled();
         expect(config.styleguide.skipPreprocessors).toHaveBeenCalled();
     }));
     it('should not call skipDecorators and skipPreprocessors', () => __awaiter(void 0, void 0, void 0, function* () {
         openapi_core_1.detectSpec.mockReturnValue('oas3_0');
-        yield join_1.handleJoin({
+        yield (0, join_1.handleJoin)({
             apis: ['first.yaml', 'second.yaml'],
             decorate: true,
             preprocess: true,
         }, config_1.ConfigFixture, 'cli-version');
-        const config = openapi_core_2.loadConfig();
+        const config = (0, openapi_core_2.loadConfig)();
         expect(config.styleguide.skipDecorators).not.toHaveBeenCalled();
         expect(config.styleguide.skipPreprocessors).not.toHaveBeenCalled();
     }));

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

@@ -47,11 +47,11 @@ describe('handleLint', () => {
     });
     describe('loadConfig and getEnrtypoints stage', () => {
         it('should fail if config file does not exist', () => __awaiter(void 0, void 0, void 0, function* () {
-            yield wrapper_1.commandWrapper(lint_1.handleLint)(Object.assign(Object.assign({}, argvMock), { config: 'config.yaml' }));
+            yield (0, wrapper_1.commandWrapper)(lint_1.handleLint)(Object.assign(Object.assign({}, argvMock), { config: 'config.yaml' }));
             expect(utils_1.exitWithError).toHaveBeenCalledWith('Please, provide valid path to the configuration file');
         }));
         it('should call loadConfigAndHandleErrors and getFallbackApisOrExit', () => __awaiter(void 0, void 0, void 0, function* () {
-            yield wrapper_1.commandWrapper(lint_1.handleLint)(argvMock);
+            yield (0, wrapper_1.commandWrapper)(lint_1.handleLint)(argvMock);
             expect(utils_1.loadConfigAndHandleErrors).toHaveBeenCalledWith({
                 configPath: undefined,
                 customExtends: undefined,
@@ -60,7 +60,7 @@ describe('handleLint', () => {
             expect(utils_1.getFallbackApisOrExit).toHaveBeenCalled();
         }));
         it('should call loadConfig with args if such exist', () => __awaiter(void 0, void 0, void 0, function* () {
-            yield wrapper_1.commandWrapper(lint_1.handleLint)(Object.assign(Object.assign({}, argvMock), { config: 'redocly.yaml', extends: ['some/path'] }));
+            yield (0, wrapper_1.commandWrapper)(lint_1.handleLint)(Object.assign(Object.assign({}, argvMock), { config: 'redocly.yaml', extends: ['some/path'] }));
             expect(utils_1.loadConfigAndHandleErrors).toHaveBeenCalledWith({
                 configPath: 'redocly.yaml',
                 customExtends: ['some/path'],
@@ -68,35 +68,35 @@ describe('handleLint', () => {
             });
         }));
         it('should call mergedConfig with clear ignore if `generate-ignore-file` argv', () => __awaiter(void 0, void 0, void 0, function* () {
-            yield wrapper_1.commandWrapper(lint_1.handleLint)(Object.assign(Object.assign({}, argvMock), { 'generate-ignore-file': true }));
+            yield (0, wrapper_1.commandWrapper)(lint_1.handleLint)(Object.assign(Object.assign({}, argvMock), { 'generate-ignore-file': true }));
             expect(getMergedConfigMock).toHaveBeenCalled();
         }));
         it('should check if ruleset exist', () => __awaiter(void 0, void 0, void 0, function* () {
-            yield wrapper_1.commandWrapper(lint_1.handleLint)(argvMock);
+            yield (0, wrapper_1.commandWrapper)(lint_1.handleLint)(argvMock);
             expect(utils_1.checkIfRulesetExist).toHaveBeenCalledTimes(1);
         }));
         it('should fail if apis not provided', () => __awaiter(void 0, void 0, void 0, function* () {
-            yield wrapper_1.commandWrapper(lint_1.handleLint)(Object.assign(Object.assign({}, argvMock), { apis: [] }));
+            yield (0, wrapper_1.commandWrapper)(lint_1.handleLint)(Object.assign(Object.assign({}, argvMock), { apis: [] }));
             expect(utils_1.getFallbackApisOrExit).toHaveBeenCalledTimes(1);
             expect(utils_1.exitWithError).toHaveBeenCalledWith('No APIs were provided');
         }));
     });
     describe('loop through entrypoints and lint stage', () => {
         it('should call getMergedConfig and lint ', () => __awaiter(void 0, void 0, void 0, function* () {
-            yield wrapper_1.commandWrapper(lint_1.handleLint)(argvMock);
+            yield (0, wrapper_1.commandWrapper)(lint_1.handleLint)(argvMock);
             expect(perf_hooks_1.performance.now).toHaveBeenCalled();
             expect(getMergedConfigMock).toHaveBeenCalled();
             expect(openapi_core_1.lint).toHaveBeenCalled();
         }));
         it('should call skipRules,skipPreprocessors and addIgnore with argv', () => __awaiter(void 0, void 0, void 0, function* () {
             openapi_core_1.lint.mockResolvedValueOnce(['problem']);
-            yield wrapper_1.commandWrapper(lint_1.handleLint)(Object.assign(Object.assign({}, argvMock), { 'skip-preprocessor': ['preprocessor'], 'skip-rule': ['rule'], 'generate-ignore-file': true }));
+            yield (0, wrapper_1.commandWrapper)(lint_1.handleLint)(Object.assign(Object.assign({}, argvMock), { 'skip-preprocessor': ['preprocessor'], 'skip-rule': ['rule'], 'generate-ignore-file': true }));
             expect(config_1.ConfigFixture.styleguide.skipRules).toHaveBeenCalledWith(['rule']);
             expect(config_1.ConfigFixture.styleguide.skipPreprocessors).toHaveBeenCalledWith(['preprocessor']);
         }));
         it('should call formatProblems and getExecutionTime with argv', () => __awaiter(void 0, void 0, void 0, function* () {
             openapi_core_1.lint.mockResolvedValueOnce(['problem']);
-            yield wrapper_1.commandWrapper(lint_1.handleLint)(Object.assign(Object.assign({}, argvMock), { 'max-problems': 2, format: 'stylish' }));
+            yield (0, wrapper_1.commandWrapper)(lint_1.handleLint)(Object.assign(Object.assign({}, argvMock), { 'max-problems': 2, format: 'stylish' }));
             expect(openapi_core_1.getTotals).toHaveBeenCalledWith(['problem']);
             expect(openapi_core_1.formatProblems).toHaveBeenCalledWith(['problem'], {
                 format: 'stylish',
@@ -108,26 +108,26 @@ describe('handleLint', () => {
         }));
         it('should catch error in handleError if something fails', () => __awaiter(void 0, void 0, void 0, function* () {
             openapi_core_1.lint.mockRejectedValueOnce('error');
-            yield wrapper_1.commandWrapper(lint_1.handleLint)(argvMock);
+            yield (0, wrapper_1.commandWrapper)(lint_1.handleLint)(argvMock);
             expect(utils_1.handleError).toHaveBeenCalledWith('error', 'openapi.yaml');
         }));
     });
     describe('erros and warning handle after lint stage', () => {
         it('should call printLintTotals and printLintTotals', () => __awaiter(void 0, void 0, void 0, function* () {
-            yield wrapper_1.commandWrapper(lint_1.handleLint)(argvMock);
+            yield (0, wrapper_1.commandWrapper)(lint_1.handleLint)(argvMock);
             expect(utils_1.printUnusedWarnings).toHaveBeenCalled();
         }));
         it('should call exit with 0 if no errors', () => __awaiter(void 0, void 0, void 0, function* () {
             utils_1.loadConfigAndHandleErrors.mockImplementation(() => {
                 return Object.assign({}, config_1.ConfigFixture);
             });
-            yield wrapper_1.commandWrapper(lint_1.handleLint)(argvMock);
+            yield (0, wrapper_1.commandWrapper)(lint_1.handleLint)(argvMock);
             yield (exitCb === null || exitCb === void 0 ? void 0 : exitCb());
             expect(processExitMock).toHaveBeenCalledWith(0);
         }));
         it('should exit with 1 if total errors > 0', () => __awaiter(void 0, void 0, void 0, function* () {
             openapi_core_1.getTotals.mockReturnValueOnce({ errors: 1 });
-            yield wrapper_1.commandWrapper(lint_1.handleLint)(argvMock);
+            yield (0, wrapper_1.commandWrapper)(lint_1.handleLint)(argvMock);
             yield (exitCb === null || exitCb === void 0 ? void 0 : exitCb());
             expect(processExitMock).toHaveBeenCalledWith(1);
         }));
@@ -142,8 +142,8 @@ describe('handleLint', () => {
                     },
                 };
             });
-            yield wrapper_1.commandWrapper(lint_1.handleLint)(argvMock);
-            expect(process.stderr.write).toHaveBeenCalledWith(`No configurations were provided -- using built in ${colorette_1.blue('recommended')} configuration by default.\n\n`);
+            yield (0, wrapper_1.commandWrapper)(lint_1.handleLint)(argvMock);
+            expect(process.stderr.write).toHaveBeenCalledWith(`No configurations were provided -- using built in ${(0, colorette_1.blue)('recommended')} configuration by default.\n\n`);
         }));
     });
 });

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

@@ -33,7 +33,7 @@ describe('push-with-region', () => {
     });
     it('should call login with default domain when region is US', () => __awaiter(void 0, void 0, void 0, function* () {
         redoclyClient.domain = 'redoc.ly';
-        yield push_1.handlePush({
+        yield (0, push_1.handlePush)({
             upsert: true,
             api: 'spec.json',
             destination: '@org/my-api@1.0.0',
@@ -44,7 +44,7 @@ describe('push-with-region', () => {
     }));
     it('should call login with EU domain when region is EU', () => __awaiter(void 0, void 0, void 0, function* () {
         redoclyClient.domain = 'eu.redocly.com';
-        yield push_1.handlePush({
+        yield (0, push_1.handlePush)({
             upsert: true,
             api: 'spec.json',
             destination: '@org/my-api@1.0.0',

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

@@ -31,7 +31,7 @@ describe('push', () => {
         jest.spyOn(process.stdout, 'write').mockImplementation(() => true);
     });
     it('pushes definition', () => __awaiter(void 0, void 0, void 0, function* () {
-        yield push_1.handlePush({
+        yield (0, push_1.handlePush)({
             upsert: true,
             api: 'spec.json',
             destination: '@org/my-api@1.0.0',
@@ -56,7 +56,7 @@ describe('push', () => {
         });
     }));
     it('fails if jobId value is an empty string', () => __awaiter(void 0, void 0, void 0, function* () {
-        yield push_1.handlePush({
+        yield (0, push_1.handlePush)({
             upsert: true,
             api: 'spec.json',
             destination: '@org/my-api@1.0.0',
@@ -68,7 +68,7 @@ describe('push', () => {
         expect(utils_1.exitWithError).toBeCalledTimes(1);
     }));
     it('fails if batchSize value is less than 2', () => __awaiter(void 0, void 0, void 0, function* () {
-        yield push_1.handlePush({
+        yield (0, push_1.handlePush)({
             upsert: true,
             api: 'spec.json',
             destination: '@org/my-api@1.0.0',
@@ -84,7 +84,7 @@ describe('push', () => {
         fs.statSync.mockImplementation(() => {
             return { isDirectory: () => false, size: 10 };
         });
-        yield push_1.handlePush({
+        yield (0, push_1.handlePush)({
             upsert: true,
             api: 'spec.json',
             destination: '@org/my-api@1.0.0',
@@ -103,7 +103,7 @@ describe('push', () => {
         expect(redoclyClient.registryApi.prepareFileUpload).toBeCalledTimes(3);
     }));
     it('push should fail if organization not provided', () => __awaiter(void 0, void 0, void 0, function* () {
-        yield push_1.handlePush({
+        yield (0, push_1.handlePush)({
             upsert: true,
             api: 'spec.json',
             destination: 'test@v1',
@@ -117,7 +117,7 @@ describe('push', () => {
     }));
     it('push should work with organization in config', () => __awaiter(void 0, void 0, void 0, function* () {
         const mockConfig = Object.assign(Object.assign({}, config_1.ConfigFixture), { organization: 'test_org' });
-        yield push_1.handlePush({
+        yield (0, push_1.handlePush)({
             upsert: true,
             api: 'spec.json',
             destination: 'my-api@1.0.0',
@@ -142,7 +142,7 @@ describe('push', () => {
     }));
     it('push should work if destination not provided but api in config is provided', () => __awaiter(void 0, void 0, void 0, function* () {
         const mockConfig = Object.assign(Object.assign({}, config_1.ConfigFixture), { organization: 'test_org', apis: { 'my-api@1.0.0': { root: 'path' } } });
-        yield push_1.handlePush({
+        yield (0, push_1.handlePush)({
             upsert: true,
             branchName: 'test',
             public: true,
@@ -153,7 +153,7 @@ describe('push', () => {
     }));
     it('push should fail if apis not provided', () => __awaiter(void 0, void 0, void 0, function* () {
         const mockConfig = { organization: 'test_org', apis: {} };
-        yield push_1.handlePush({
+        yield (0, push_1.handlePush)({
             upsert: true,
             branchName: 'test',
             public: true,
@@ -165,7 +165,7 @@ describe('push', () => {
     }));
     it('push should fail if destination not provided', () => __awaiter(void 0, void 0, void 0, function* () {
         const mockConfig = { organization: 'test_org', apis: {} };
-        yield push_1.handlePush({
+        yield (0, push_1.handlePush)({
             upsert: true,
             api: 'api.yaml',
             branchName: 'test',
@@ -178,7 +178,7 @@ describe('push', () => {
     }));
     it('push should fail if destination format is not valid', () => __awaiter(void 0, void 0, void 0, function* () {
         const mockConfig = { organization: 'test_org', apis: {} };
-        yield push_1.handlePush({
+        yield (0, push_1.handlePush)({
             upsert: true,
             destination: 'name/v1',
             branchName: 'test',
@@ -186,12 +186,12 @@ describe('push', () => {
             'job-id': '123',
             'batch-size': 2,
         }, mockConfig);
-        expect(utils_1.exitWithError).toHaveBeenCalledWith(`Destination argument value is not valid, please use the right format: ${colorette_1.yellow('<api-name@api-version>')}`);
+        expect(utils_1.exitWithError).toHaveBeenCalledWith(`Destination argument value is not valid, please use the right format: ${(0, colorette_1.yellow)('<api-name@api-version>')}`);
     }));
     it('push should work and encode name with spaces', () => __awaiter(void 0, void 0, void 0, function* () {
         const encodeURIComponentSpy = jest.spyOn(global, 'encodeURIComponent');
         const mockConfig = Object.assign(Object.assign({}, config_1.ConfigFixture), { organization: 'test_org', apis: { 'my test api@v1': { root: 'path' } } });
-        yield push_1.handlePush({
+        yield (0, push_1.handlePush)({
             upsert: true,
             destination: 'my test api@v1',
             branchName: 'test',
@@ -206,7 +206,7 @@ describe('push', () => {
 describe('transformPush', () => {
     it('should adapt the existing syntax', () => {
         const cb = jest.fn();
-        push_1.transformPush(cb)({
+        (0, push_1.transformPush)(cb)({
             api: 'openapi.yaml',
             maybeDestination: '@testing_org/main@v1',
         }, {});
@@ -217,7 +217,7 @@ describe('transformPush', () => {
     });
     it('should adapt the existing syntax (including branchName)', () => {
         const cb = jest.fn();
-        push_1.transformPush(cb)({
+        (0, push_1.transformPush)(cb)({
             api: 'openapi.yaml',
             maybeDestination: '@testing_org/main@v1',
             maybeBranchName: 'other',
@@ -230,7 +230,7 @@ describe('transformPush', () => {
     });
     it('should use --branch option firstly', () => {
         const cb = jest.fn();
-        push_1.transformPush(cb)({
+        (0, push_1.transformPush)(cb)({
             api: 'openapi.yaml',
             maybeDestination: '@testing_org/main@v1',
             maybeBranchName: 'other',
@@ -244,7 +244,7 @@ describe('transformPush', () => {
     });
     it('should work for a destination only', () => {
         const cb = jest.fn();
-        push_1.transformPush(cb)({
+        (0, push_1.transformPush)(cb)({
             api: '@testing_org/main@v1',
         }, {});
         expect(cb).toBeCalledWith({
@@ -253,7 +253,7 @@ describe('transformPush', () => {
     });
     it('should work for a api only', () => {
         const cb = jest.fn();
-        push_1.transformPush(cb)({
+        (0, push_1.transformPush)(cb)({
             api: 'test.yaml',
         }, {});
         expect(cb).toBeCalledWith({
@@ -262,7 +262,7 @@ describe('transformPush', () => {
     });
     it('should accept aliases for the old syntax', () => {
         const cb = jest.fn();
-        push_1.transformPush(cb)({
+        (0, push_1.transformPush)(cb)({
             api: 'alias',
             maybeDestination: '@testing_org/main@v1',
         }, {});
@@ -273,7 +273,7 @@ describe('transformPush', () => {
     });
     it('should use --job-id option firstly', () => {
         const cb = jest.fn();
-        push_1.transformPush(cb)({
+        (0, push_1.transformPush)(cb)({
             'batch-id': 'b-123',
             'job-id': 'j-123',
             api: 'test',
@@ -290,60 +290,60 @@ describe('transformPush', () => {
     });
     it('should accept no arguments at all', () => {
         const cb = jest.fn();
-        push_1.transformPush(cb)({}, {});
+        (0, push_1.transformPush)(cb)({}, {});
         expect(cb).toBeCalledWith({}, {});
     });
 });
 describe('getDestinationProps', () => {
     it('should get valid destination props for the full destination syntax', () => {
-        expect(push_1.getDestinationProps('@testing_org/main@v1', 'org-from-config')).toEqual({
+        expect((0, push_1.getDestinationProps)('@testing_org/main@v1', 'org-from-config')).toEqual({
             organizationId: 'testing_org',
             name: 'main',
             version: 'v1',
         });
     });
     it('should fallback the organizationId from a config for the short destination syntax', () => {
-        expect(push_1.getDestinationProps('main@v1', 'org-from-config')).toEqual({
+        expect((0, push_1.getDestinationProps)('main@v1', 'org-from-config')).toEqual({
             organizationId: 'org-from-config',
             name: 'main',
             version: 'v1',
         });
     });
     it('should fallback the organizationId from a config if no destination provided', () => {
-        expect(push_1.getDestinationProps(undefined, 'org-from-config')).toEqual({
+        expect((0, push_1.getDestinationProps)(undefined, 'org-from-config')).toEqual({
             organizationId: 'org-from-config',
         });
     });
     it('should return empty organizationId if there is no one found', () => {
-        expect(push_1.getDestinationProps('main@v1', undefined)).toEqual({
+        expect((0, push_1.getDestinationProps)('main@v1', undefined)).toEqual({
             organizationId: undefined,
             name: 'main',
             version: 'v1',
         });
     });
     it('should return organizationId from destination string', () => {
-        expect(push_1.getDestinationProps('@test-org/main@main-v1', undefined)).toEqual({
+        expect((0, push_1.getDestinationProps)('@test-org/main@main-v1', undefined)).toEqual({
             organizationId: 'test-org',
             name: 'main',
             version: 'main-v1',
         });
     });
     it('should return organizationId, version and empty name from destination string', () => {
-        expect(push_1.getDestinationProps('@test_org/@main_v1', undefined)).toEqual({
+        expect((0, push_1.getDestinationProps)('@test_org/@main_v1', undefined)).toEqual({
             organizationId: 'test_org',
             name: '',
             version: 'main_v1',
         });
     });
     it('should validate organizationId with space and version with dot', () => {
-        expect(push_1.getDestinationProps('@test org/simple_name@main.v1', undefined)).toEqual({
+        expect((0, push_1.getDestinationProps)('@test org/simple_name@main.v1', undefined)).toEqual({
             organizationId: 'test org',
             name: 'simple_name',
             version: 'main.v1',
         });
     });
     it('should not work with "@" in destination name', () => {
-        expect(push_1.getDestinationProps('@test org/simple@name@main.v1', undefined)).toEqual({
+        expect((0, push_1.getDestinationProps)('@test org/simple@name@main.v1', undefined)).toEqual({
             organizationId: undefined,
             name: undefined,
             version: undefined,
@@ -362,9 +362,9 @@ describe('getApiRoot', () => {
         },
     };
     it('should resolve the correct api for a valid name & version', () => {
-        expect(push_1.getApiRoot({ name: 'main', version: 'v1', config })).toEqual('openapi.yaml');
+        expect((0, push_1.getApiRoot)({ name: 'main', version: 'v1', config })).toEqual('openapi.yaml');
     });
     it('should resolve the latest version of api if there is no matching version', () => {
-        expect(push_1.getApiRoot({ name: 'main', version: 'latest', config })).toEqual('latest.yaml');
+        expect((0, push_1.getApiRoot)({ name: 'main', version: 'latest', config })).toEqual('latest.yaml');
     });
 });