@redocly/cli 1.7.0 → 1.8.0

package/lib/commands/bundle.js

@@ -22,17 +22,17 @@ var __rest = (this && this.__rest) || function (s, e) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleBundle = void 0;
 const openapi_core_1 = require("@redocly/openapi-core");
-const utils_1 = require("../utils");
+const miscellaneous_1 = require("../utils/miscellaneous");
 const perf_hooks_1 = require("perf_hooks");
 const colorette_1 = require("colorette");
 const fs_1 = require("fs");
-const utils_2 = require("../utils");
+const miscellaneous_2 = require("../utils/miscellaneous");
 function handleBundle(argv, config, version) {
     var _a, _b, _c, _d, _e;
     return __awaiter(this, void 0, void 0, function* () {
         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 (0, utils_1.getFallbackApisOrExit)(argv.apis, config);
+        const apis = yield (0, miscellaneous_1.getFallbackApisOrExit)(argv.apis, config);
         const totals = { errors: 0, warnings: 0, ignored: 0 };
         const maxProblems = argv['max-problems'];
         const deprecatedOptions = [
@@ -42,7 +42,7 @@ function handleBundle(argv, config, version) {
             'extends',
             'max-problems',
         ];
-        (0, utils_2.checkForDeprecatedOptions)(argv, deprecatedOptions);
+        (0, miscellaneous_2.checkForDeprecatedOptions)(argv, deprecatedOptions);
         for (const { path, alias } of apis) {
             try {
                 const startedAt = perf_hooks_1.performance.now();
@@ -52,7 +52,7 @@ function handleBundle(argv, config, version) {
                 styleguide.skipPreprocessors(argv['skip-preprocessor']);
                 styleguide.skipDecorators(argv['skip-decorator']);
                 if (argv.lint) {
-                    (0, utils_1.checkIfRulesetExist)(styleguide.rules);
+                    (0, miscellaneous_1.checkIfRulesetExist)(styleguide.rules);
                     if (config.styleguide.recommendedFallback) {
                         process.stderr.write(`No configurations were provided -- using built in ${(0, colorette_1.blue)('recommended')} configuration by default.\n\n`);
                     }
@@ -70,7 +70,7 @@ function handleBundle(argv, config, version) {
                         version,
                         maxProblems: maxProblems,
                     });
-                    (0, utils_1.printLintTotals)(fileLintTotals, 2);
+                    (0, miscellaneous_1.printLintTotals)(fileLintTotals, 2);
                 }
                 process.stderr.write((0, colorette_1.gray)(`bundling ${path}...\n`));
                 const _f = yield (0, openapi_core_1.bundle)({
@@ -81,15 +81,15 @@ function handleBundle(argv, config, version) {
                     keepUrlRefs: argv['keep-url-references'],
                 }), { bundle: result, problems } = _f, meta = __rest(_f, ["bundle", "problems"]);
                 const fileTotals = (0, openapi_core_1.getTotals)(problems);
-                const { outputFile, ext } = (0, utils_1.getOutputFileName)(path, apis.length, argv.output, argv.ext);
+                const { outputFile, ext } = (0, miscellaneous_1.getOutputFileName)(path, apis.length, argv.output, argv.ext);
                 if (fileTotals.errors === 0 || argv.force) {
                     if (!argv.output) {
-                        const output = (0, utils_1.dumpBundle)((0, utils_1.sortTopLevelKeysForOas)(result.parsed), argv.ext || 'yaml', argv.dereferenced);
+                        const output = (0, miscellaneous_1.dumpBundle)((0, miscellaneous_1.sortTopLevelKeysForOas)(result.parsed), argv.ext || 'yaml', argv.dereferenced);
                         process.stdout.write(output);
                     }
                     else {
-                        const output = (0, utils_1.dumpBundle)((0, utils_1.sortTopLevelKeysForOas)(result.parsed), ext, argv.dereferenced);
-                        (0, utils_1.saveBundle)(outputFile, output);
+                        const output = (0, miscellaneous_1.dumpBundle)((0, miscellaneous_1.sortTopLevelKeysForOas)(result.parsed), ext, argv.dereferenced);
+                        (0, miscellaneous_1.saveBundle)(outputFile, output);
                     }
                 }
                 totals.errors += fileTotals.errors;
@@ -109,7 +109,7 @@ function handleBundle(argv, config, version) {
                         (0, fs_1.writeFileSync)(argv.metafile, JSON.stringify(meta), 'utf-8');
                     }
                 }
-                const elapsed = (0, utils_1.getExecutionTime)(startedAt);
+                const elapsed = (0, miscellaneous_1.getExecutionTime)(startedAt);
                 if (fileTotals.errors > 0) {
                     if (argv.force) {
                         process.stderr.write(`❓ Created a bundle for ${(0, colorette_1.blue)(path)} at ${(0, colorette_1.blue)(outputFile)} with errors ${(0, colorette_1.green)(elapsed)}.\n${(0, colorette_1.yellow)('Errors ignored because of --force')}.\n`);
@@ -127,10 +127,10 @@ function handleBundle(argv, config, version) {
                 }
             }
             catch (e) {
-                (0, utils_1.handleError)(e, path);
+                (0, miscellaneous_1.handleError)(e, path);
             }
         }
-        (0, utils_1.printUnusedWarnings)(config.styleguide);
+        (0, miscellaneous_1.printUnusedWarnings)(config.styleguide);
         if (!(totals.errors === 0 || argv.force)) {
             throw new Error('Bundle failed.');
         }

package/lib/commands/join.js

@@ -15,8 +15,8 @@ const colorette_1 = require("colorette");
 const perf_hooks_1 = require("perf_hooks");
 const isEqual = require('lodash.isequal');
 const openapi_core_1 = require("@redocly/openapi-core");
-const utils_1 = require("../utils");
-const js_utils_1 = require("../js-utils");
+const miscellaneous_1 = require("../utils/miscellaneous");
+const js_utils_1 = require("../utils/js-utils");
 const types_1 = require("./split/types");
 const COMPONENTS = 'components';
 const Tags = 'tags';
@@ -26,10 +26,10 @@ 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) {
-            return (0, utils_1.exitWithError)(`At least 2 apis should be provided. \n\n`);
+            return (0, miscellaneous_1.exitWithError)(`At least 2 apis should be provided. \n\n`);
         }
-        (0, utils_1.checkForDeprecatedOptions)(argv, ['lint']);
-        const fileExtension = (0, utils_1.getAndValidateFileExtension)(argv.output || argv.apis[0]);
+        (0, miscellaneous_1.checkForDeprecatedOptions)(argv, ['lint']);
+        const fileExtension = (0, miscellaneous_1.getAndValidateFileExtension)(argv.output || argv.apis[0]);
         const { 'prefix-components-with-info-prop': prefixComponentsWithInfoProp, 'prefix-tags-with-filename': prefixTagsWithFilename, 'prefix-tags-with-info-prop': prefixTagsWithInfoProp, 'without-x-tag-groups': withoutXTagGroups, output: specFilename = `openapi.${fileExtension}`, } = argv;
         const usedTagsOptions = [
             prefixTagsWithFilename && 'prefix-tags-with-filename',
@@ -37,9 +37,9 @@ function handleJoin(argv, config, packageVersion) {
             withoutXTagGroups && 'without-x-tag-groups',
         ].filter(Boolean);
         if (usedTagsOptions.length > 1) {
-            return (0, utils_1.exitWithError)(`You use ${(0, colorette_1.yellow)(usedTagsOptions.join(', '))} together.\nPlease choose only one! \n\n`);
+            return (0, miscellaneous_1.exitWithError)(`You use ${(0, colorette_1.yellow)(usedTagsOptions.join(', '))} together.\nPlease choose only one! \n\n`);
         }
-        const apis = yield (0, utils_1.getFallbackApisOrExit)(argv.apis, config);
+        const apis = yield (0, miscellaneous_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)));
         if (!argv.decorate) {
@@ -63,7 +63,7 @@ function handleJoin(argv, config, packageVersion) {
             config: config.styleguide,
             externalRefResolver: new openapi_core_1.BaseResolver(config.resolve),
         }).catch((e) => {
-            (0, utils_1.exitWithError)(`${e.message}: ${(0, colorette_1.blue)(document.source.absoluteRef)}`);
+            (0, miscellaneous_1.exitWithError)(`${e.message}: ${(0, colorette_1.blue)(document.source.absoluteRef)}`);
         })));
         for (const { problems, bundle: document } of bundleResults) {
             const fileTotals = (0, openapi_core_1.getTotals)(problems);
@@ -72,7 +72,7 @@ function handleJoin(argv, config, packageVersion) {
                     totals: fileTotals,
                     version: document.parsed.version,
                 });
-                (0, utils_1.exitWithError)(`❌ Errors encountered while bundling ${(0, colorette_1.blue)(document.source.absoluteRef)}: join will not proceed.\n`);
+                (0, miscellaneous_1.exitWithError)(`❌ Errors encountered while bundling ${(0, colorette_1.blue)(document.source.absoluteRef)}: join will not proceed.\n`);
             }
         }
         let oasVersion = null;
@@ -80,15 +80,15 @@ function handleJoin(argv, config, packageVersion) {
             try {
                 const version = (0, openapi_core_1.detectSpec)(document.parsed);
                 if (version !== openapi_core_1.SpecVersion.OAS3_0 && version !== openapi_core_1.SpecVersion.OAS3_1) {
-                    return (0, utils_1.exitWithError)(`Only OpenAPI 3.0 and OpenAPI 3.1 are supported: ${(0, colorette_1.blue)(document.source.absoluteRef)} \n\n`);
+                    return (0, miscellaneous_1.exitWithError)(`Only OpenAPI 3.0 and OpenAPI 3.1 are supported: ${(0, colorette_1.blue)(document.source.absoluteRef)} \n\n`);
                 }
                 oasVersion = oasVersion !== null && oasVersion !== void 0 ? oasVersion : version;
                 if (oasVersion !== version) {
-                    return (0, utils_1.exitWithError)(`All APIs must use the same OpenAPI version: ${(0, colorette_1.blue)(document.source.absoluteRef)} \n\n`);
+                    return (0, miscellaneous_1.exitWithError)(`All APIs must use the same OpenAPI version: ${(0, colorette_1.blue)(document.source.absoluteRef)} \n\n`);
                 }
             }
             catch (e) {
-                return (0, utils_1.exitWithError)(`${e.message}: ${(0, colorette_1.blue)(document.source.absoluteRef)}`);
+                return (0, miscellaneous_1.exitWithError)(`${e.message}: ${(0, colorette_1.blue)(document.source.absoluteRef)}`);
             }
         }
         if (argv.lint) {
@@ -140,10 +140,10 @@ function handleJoin(argv, config, packageVersion) {
         iteratePotentialConflicts(potentialConflicts, withoutXTagGroups);
         const noRefs = true;
         if (potentialConflictsTotal) {
-            return (0, utils_1.exitWithError)(`Please fix conflicts before running ${(0, colorette_1.yellow)('join')}.`);
+            return (0, miscellaneous_1.exitWithError)(`Please fix conflicts before running ${(0, colorette_1.yellow)('join')}.`);
         }
-        (0, utils_1.writeToFileByExtension)((0, utils_1.sortTopLevelKeysForOas)(joinedDef), specFilename, noRefs);
-        (0, utils_1.printExecutionTime)('join', startedAt, specFilename);
+        (0, miscellaneous_1.writeToFileByExtension)((0, miscellaneous_1.sortTopLevelKeysForOas)(joinedDef), specFilename, noRefs);
+        (0, miscellaneous_1.printExecutionTime)('join', startedAt, specFilename);
         function populateTags({ api, apiFilename, tags, potentialConflicts, tagsPrefix, componentsPrefix, }) {
             if (!joinedDef.hasOwnProperty(Tags)) {
                 joinedDef[Tags] = [];
@@ -297,7 +297,7 @@ function handleJoin(argv, config, packageVersion) {
                     for (const pathServer of joinedDef.paths[path].servers) {
                         if (pathServer.url === server.url) {
                             if (!isServersEqual(pathServer, server)) {
-                                (0, utils_1.exitWithError)(`Different server values for (${server.url}) in ${path}`);
+                                (0, miscellaneous_1.exitWithError)(`Different server values for (${server.url}) in ${path}`);
                             }
                             isFoundServer = true;
                         }
@@ -328,7 +328,7 @@ function handleJoin(argv, config, packageVersion) {
                         if (!(0, openapi_core_1.isRef)(pathParameter) && !(0, openapi_core_1.isRef)(parameter)) {
                             if (pathParameter.name === parameter.name && pathParameter.in === parameter.in) {
                                 if (!isEqual(pathParameter.schema, parameter.schema)) {
-                                    (0, utils_1.exitWithError)(`Different parameter schemas for (${parameter.name}) in ${path}`);
+                                    (0, miscellaneous_1.exitWithError)(`Different parameter schemas for (${parameter.name}) in ${path}`);
                                 }
                                 isFoundParameter = true;
                             }
@@ -459,9 +459,9 @@ function handleJoin(argv, config, packageVersion) {
             const openapi = firstApi.parsed;
             const componentsPrefix = getInfoPrefix(openapi.info, prefixComponentsWithInfoProp, COMPONENTS);
             if (!openapi.openapi)
-                (0, utils_1.exitWithError)('Version of specification is not found in. \n');
+                (0, miscellaneous_1.exitWithError)('Version of specification is not found in. \n');
             if (!openapi.info)
-                (0, utils_1.exitWithError)('Info section is not found in specification. \n');
+                (0, miscellaneous_1.exitWithError)('Info section is not found in specification. \n');
             if ((_a = openapi.info) === null || _a === void 0 ? void 0 : _a.description) {
                 openapi.info.description = addComponentsPrefix(openapi.info.description, componentsPrefix);
             }
@@ -557,13 +557,13 @@ function getInfoPrefix(info, prefixArg, type) {
     if (!prefixArg)
         return '';
     if (!info)
-        (0, utils_1.exitWithError)('Info section is not found in specification. \n');
+        (0, miscellaneous_1.exitWithError)('Info section is not found in specification. \n');
     if (!info[prefixArg])
-        (0, utils_1.exitWithError)(`${(0, colorette_1.yellow)(`prefix-${type}-with-info-prop`)} argument value is not found in info section. \n`);
+        (0, miscellaneous_1.exitWithError)(`${(0, colorette_1.yellow)(`prefix-${type}-with-info-prop`)} argument value is not found in info section. \n`);
     if (!(0, js_utils_1.isString)(info[prefixArg]))
-        (0, utils_1.exitWithError)(`${(0, colorette_1.yellow)(`prefix-${type}-with-info-prop`)} argument value should be string. \n\n`);
+        (0, miscellaneous_1.exitWithError)(`${(0, colorette_1.yellow)(`prefix-${type}-with-info-prop`)} argument value should be string. \n\n`);
     if (info[prefixArg].length > 50)
-        (0, utils_1.exitWithError)(`${(0, colorette_1.yellow)(`prefix-${type}-with-info-prop`)} argument value length should not exceed 50 characters. \n\n`);
+        (0, miscellaneous_1.exitWithError)(`${(0, colorette_1.yellow)(`prefix-${type}-with-info-prop`)} argument value length should not exceed 50 characters. \n\n`);
     return info[prefixArg];
 }
 function validateApi(document, config, externalRefResolver, packageVersion) {
@@ -572,10 +572,10 @@ function validateApi(document, config, externalRefResolver, packageVersion) {
             const results = yield (0, openapi_core_1.lintDocument)({ document, config, externalRefResolver });
             const fileTotals = (0, openapi_core_1.getTotals)(results);
             (0, openapi_core_1.formatProblems)(results, { format: 'stylish', totals: fileTotals, version: packageVersion });
-            (0, utils_1.printLintTotals)(fileTotals, 2);
+            (0, miscellaneous_1.printLintTotals)(fileTotals, 2);
         }
         catch (err) {
-            (0, utils_1.handleError)(err, document.parsed);
+            (0, miscellaneous_1.handleError)(err, document.parsed);
         }
     });
 }

package/lib/commands/lint.js

@@ -12,14 +12,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.lintConfigCallback = exports.handleLint = void 0;
 const openapi_core_1 = require("@redocly/openapi-core");
 const config_1 = require("@redocly/openapi-core/lib/config");
-const utils_1 = require("../utils");
+const miscellaneous_1 = require("../utils/miscellaneous");
 const colorette_1 = require("colorette");
 const perf_hooks_1 = require("perf_hooks");
 function handleLint(argv, config, version) {
     return __awaiter(this, void 0, void 0, function* () {
-        const apis = yield (0, utils_1.getFallbackApisOrExit)(argv.apis, config);
+        const apis = yield (0, miscellaneous_1.getFallbackApisOrExit)(argv.apis, config);
         if (!apis.length) {
-            (0, utils_1.exitWithError)('No APIs were provided');
+            (0, miscellaneous_1.exitWithError)('No APIs were provided');
         }
         if (argv['generate-ignore-file']) {
             config.styleguide.ignore = {}; // clear ignore
@@ -32,7 +32,7 @@ function handleLint(argv, config, version) {
                 const startedAt = perf_hooks_1.performance.now();
                 const resolvedConfig = (0, openapi_core_1.getMergedConfig)(config, alias);
                 const { styleguide } = resolvedConfig;
-                (0, utils_1.checkIfRulesetExist)(styleguide.rules);
+                (0, miscellaneous_1.checkIfRulesetExist)(styleguide.rules);
                 styleguide.skipRules(argv['skip-rule']);
                 styleguide.skipPreprocessors(argv['skip-preprocessor']);
                 if (styleguide.recommendedFallback) {
@@ -61,21 +61,21 @@ function handleLint(argv, config, version) {
                         version,
                     });
                 }
-                const elapsed = (0, utils_1.getExecutionTime)(startedAt);
+                const elapsed = (0, miscellaneous_1.getExecutionTime)(startedAt);
                 process.stderr.write((0, colorette_1.gray)(`${path.replace(process.cwd(), '')}: validated in ${elapsed}\n\n`));
             }
             catch (e) {
-                (0, utils_1.handleError)(e, path);
+                (0, miscellaneous_1.handleError)(e, path);
             }
         }
         if (argv['generate-ignore-file']) {
             config.styleguide.saveIgnore();
-            process.stderr.write(`Generated ignore file with ${totalIgnored} ${(0, utils_1.pluralize)('problem', totalIgnored)}.\n\n`);
+            process.stderr.write(`Generated ignore file with ${totalIgnored} ${(0, miscellaneous_1.pluralize)('problem', totalIgnored)}.\n\n`);
         }
         else {
-            (0, utils_1.printLintTotals)(totals, apis.length);
+            (0, miscellaneous_1.printLintTotals)(totals, apis.length);
         }
-        (0, utils_1.printUnusedWarnings)(config.styleguide);
+        (0, miscellaneous_1.printUnusedWarnings)(config.styleguide);
         if (!(totals.errors === 0 || argv['generate-ignore-file'])) {
             throw new Error('Lint failed.');
         }
@@ -103,7 +103,7 @@ function lintConfigCallback(argv, version) {
             totals: fileTotals,
             version,
         });
-        (0, utils_1.printConfigLintTotals)(fileTotals);
+        (0, miscellaneous_1.printConfigLintTotals)(fileTotals);
         if (fileTotals.errors > 0) {
             throw new config_1.ConfigValidationError();
         }

package/lib/commands/login.js

@@ -12,9 +12,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleLogin = exports.promptClientToken = void 0;
 const openapi_core_1 = require("@redocly/openapi-core");
 const colorette_1 = require("colorette");
-const utils_1 = require("../utils");
+const miscellaneous_1 = require("../utils/miscellaneous");
 function promptClientToken(domain) {
-    return (0, utils_1.promptUser)((0, colorette_1.green)(`\n  🔑 Copy your API key from ${(0, colorette_1.blue)(`https://app.${domain}/profile`)} and paste it below`), true);
+    return (0, miscellaneous_1.promptUser)((0, colorette_1.green)(`\n  🔑 Copy your API key from ${(0, colorette_1.blue)(`https://app.${domain}/profile`)} and paste it below`), true);
 }
 exports.promptClientToken = promptClientToken;
 function handleLogin(argv, config) {

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

@@ -13,14 +13,14 @@ exports.debounce = exports.previewDocs = void 0;
 const colorette = require("colorette");
 const chockidar = require("chokidar");
 const openapi_core_1 = require("@redocly/openapi-core");
-const utils_1 = require("../../utils");
+const miscellaneous_1 = require("../../utils/miscellaneous");
 const preview_server_1 = require("./preview-server/preview-server");
 function previewDocs(argv, configFromFile) {
     return __awaiter(this, void 0, void 0, function* () {
         let isAuthorizedWithRedocly = false;
         let redocOptions = {};
         let config = yield reloadConfig(configFromFile);
-        const apis = yield (0, utils_1.getFallbackApisOrExit)(argv.api ? [argv.api] : [], config);
+        const apis = yield (0, miscellaneous_1.getFallbackApisOrExit)(argv.api ? [argv.api] : [], config);
         const api = apis[0];
         let cachedBundle;
         const deps = new Set();
@@ -51,7 +51,7 @@ function previewDocs(argv, configFromFile) {
                     return openapiBundle.parsed;
                 }
                 catch (e) {
-                    (0, utils_1.handleError)(e, api.path);
+                    (0, miscellaneous_1.handleError)(e, api.path);
                 }
             });
         }
@@ -97,7 +97,7 @@ function previewDocs(argv, configFromFile) {
             return __awaiter(this, void 0, void 0, function* () {
                 if (!config) {
                     try {
-                        config = (yield (0, utils_1.loadConfigAndHandleErrors)({ configPath: argv.config }));
+                        config = (yield (0, miscellaneous_1.loadConfigAndHandleErrors)({ configPath: argv.config }));
                     }
                     catch (err) {
                         config = new openapi_core_1.Config({ apis: {}, styleguide: {} });

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

@@ -15,7 +15,7 @@ const get_port_please_1 = require("get-port-please");
 const fs_1 = require("fs");
 const path = require("path");
 const server_1 = require("./server");
-const utils_1 = require("../../../utils");
+const miscellaneous_1 = require("../../../utils/miscellaneous");
 function getPageHTML(htmlTemplate, redocOptions = {}, useRedocPro, wsPort, host) {
     let templateSrc = (0, fs_1.readFileSync)(htmlTemplate, 'utf-8');
     // fix template for backward compatibility
@@ -90,7 +90,7 @@ function startPreviewServer(port, host, { getBundle, getOptions, useRedocPro, })
                 if (!filePath) {
                     const basePath = htmlTemplate ? path.dirname(htmlTemplate) : process.cwd();
                     filePath = path.resolve(basePath, `.${request.url}`);
-                    if (!(0, utils_1.isSubdir)(basePath, filePath)) {
+                    if (!(0, miscellaneous_1.isSubdir)(basePath, filePath)) {
                         (0, server_1.respondWithGzip)('404 Not Found', request, response, { 'Content-Type': 'text/html' }, 404);
                         console.timeEnd(colorette.dim(`GET ${request.url}`));
                         return;

package/lib/commands/preview-project/types.d.ts

@@ -6,5 +6,5 @@ export type PreviewProjectOptions = {
     plan: ProductPlan | string;
     port?: number;
     'source-dir': string;
-    config: string | undefined;
+    config?: string;
 };

package/lib/commands/push.d.ts

@@ -1,4 +1,5 @@
 import { Config, Region } from '@redocly/openapi-core';
+import { handlePush as handleCMSPush } from '../cms/commands/push';
 export declare const DESTINATION_REGEX: RegExp;
 export type PushOptions = {
     api?: string;
@@ -14,6 +15,10 @@ export type PushOptions = {
     organization?: string;
     config?: string;
 };
+export declare function commonPushHandler({ project, 'mount-path': mountPath, }: {
+    project?: string;
+    'mount-path'?: string;
+}): typeof handleCMSPush | typeof handlePush;
 export declare function handlePush(argv: PushOptions, config: Config): Promise<void>;
 export declare function getDestinationProps(destination: string | undefined, organization: string | undefined): {
     organizationId: string | undefined;

package/lib/commands/push.js

@@ -20,7 +20,7 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getApiRoot = exports.transformPush = exports.getDestinationProps = exports.handlePush = exports.DESTINATION_REGEX = void 0;
+exports.getApiRoot = exports.transformPush = exports.getDestinationProps = exports.handlePush = exports.commonPushHandler = exports.DESTINATION_REGEX = void 0;
 const fs = require("fs");
 const path = require("path");
 const node_fetch_1 = require("node-fetch");
@@ -28,10 +28,18 @@ const perf_hooks_1 = require("perf_hooks");
 const colorette_1 = require("colorette");
 const crypto_1 = require("crypto");
 const openapi_core_1 = require("@redocly/openapi-core");
-const utils_1 = require("../utils");
+const miscellaneous_1 = require("../utils/miscellaneous");
 const login_1 = require("./login");
+const push_1 = require("../cms/commands/push");
 const DEFAULT_VERSION = 'latest';
 exports.DESTINATION_REGEX = /^(@(?<organizationId>[\w\-\s]+)\/)?(?<name>[^@]*)@(?<version>[\w\.\-]+)$/;
+function commonPushHandler({ project, 'mount-path': mountPath, }) {
+    if (project && mountPath) {
+        return push_1.handlePush;
+    }
+    return handlePush;
+}
+exports.commonPushHandler = commonPushHandler;
 function handlePush(argv, config) {
     return __awaiter(this, void 0, void 0, function* () {
         const client = new openapi_core_1.RedoclyClient(config.region);
@@ -45,31 +53,31 @@ function handlePush(argv, config) {
         const jobId = argv['job-id'];
         const batchSize = argv['batch-size'];
         if (destination && !exports.DESTINATION_REGEX.test(destination)) {
-            (0, utils_1.exitWithError)(`Destination argument value is not valid, please use the right format: ${(0, colorette_1.yellow)('<api-name@api-version>')}`);
+            (0, miscellaneous_1.exitWithError)(`Destination argument value is not valid, please use the right format: ${(0, colorette_1.yellow)('<api-name@api-version>')}`);
         }
         const destinationProps = getDestinationProps(destination, config.organization);
         const organizationId = argv.organization || destinationProps.organizationId;
         const { name, version } = destinationProps;
         if (!organizationId) {
-            return (0, utils_1.exitWithError)(`No organization provided, please use --organization option or specify the 'organization' field in the config file.`);
+            return (0, miscellaneous_1.exitWithError)(`No organization provided, please use --organization option or specify the 'organization' field in the config file.`);
         }
         const api = argv.api || (name && version && getApiRoot({ name, version, config }));
         if (name && version && !api) {
-            (0, utils_1.exitWithError)(`No api found that matches ${(0, colorette_1.blue)(`${name}@${version}`)}. Please make sure you have provided the correct data in the config file.`);
+            (0, miscellaneous_1.exitWithError)(`No api found that matches ${(0, colorette_1.blue)(`${name}@${version}`)}. Please make sure you have provided the correct data in the config file.`);
         }
         // Ensure that a destination for the api is provided.
         if (!name && api) {
-            return (0, utils_1.exitWithError)(`No destination provided, please use --destination option to provide destination.`);
+            return (0, miscellaneous_1.exitWithError)(`No destination provided, please use --destination option to provide destination.`);
         }
         if (jobId && !jobId.trim()) {
-            (0, utils_1.exitWithError)(`The ${(0, colorette_1.blue)(`job-id`)} option value is not valid, please avoid using an empty string.`);
+            (0, miscellaneous_1.exitWithError)(`The ${(0, colorette_1.blue)(`job-id`)} option value is not valid, please avoid using an empty string.`);
         }
         if (batchSize && batchSize < 2) {
-            (0, utils_1.exitWithError)(`The ${(0, colorette_1.blue)(`batch-size`)} option value is not valid, please use the integer bigger than 1.`);
+            (0, miscellaneous_1.exitWithError)(`The ${(0, colorette_1.blue)(`batch-size`)} option value is not valid, please use the integer bigger than 1.`);
         }
         const apis = api ? { [`${name}@${version}`]: { root: api } } : config.apis;
         if (!Object.keys(apis).length) {
-            (0, utils_1.exitWithError)(`Api not found. Please make sure you have provided the correct data in the config file.`);
+            (0, miscellaneous_1.exitWithError)(`Api not found. Please make sure you have provided the correct data in the config file.`);
         }
         for (const [apiNameAndVersion, { root: api }] of Object.entries(apis)) {
             const resolvedConfig = (0, openapi_core_1.getMergedConfig)(config, apiNameAndVersion);
@@ -81,7 +89,7 @@ function handlePush(argv, config) {
                 const filePaths = [];
                 const filesToUpload = yield collectFilesToUpload(api, resolvedConfig);
                 const filesHash = hashFiles(filesToUpload.files);
-                process.stdout.write(`Uploading ${filesToUpload.files.length} ${(0, utils_1.pluralize)('file', filesToUpload.files.length)}:\n`);
+                process.stdout.write(`Uploading ${filesToUpload.files.length} ${(0, miscellaneous_1.pluralize)('file', filesToUpload.files.length)}:\n`);
                 let uploaded = 0;
                 for (const file of filesToUpload.files) {
                     const { signedUploadUrl, filePath } = yield client.registryApi.prepareFileUpload({
@@ -100,7 +108,7 @@ function handlePush(argv, config) {
                     const uploadResponse = yield uploadFileToS3(signedUploadUrl, file.contents || file.filePath);
                     const fileCounter = `(${++uploaded}/${filesToUpload.files.length})`;
                     if (!uploadResponse.ok) {
-                        (0, utils_1.exitWithError)(`✗ ${fileCounter}\nFile upload failed\n`);
+                        (0, miscellaneous_1.exitWithError)(`✗ ${fileCounter}\nFile upload failed\n`);
                     }
                     process.stdout.write((0, colorette_1.green)(`✓ ${fileCounter}\n`));
                 }
@@ -120,16 +128,16 @@ function handlePush(argv, config) {
             }
             catch (error) {
                 if (error.message === 'ORGANIZATION_NOT_FOUND') {
-                    (0, utils_1.exitWithError)(`Organization ${(0, colorette_1.blue)(organizationId)} not found`);
+                    (0, miscellaneous_1.exitWithError)(`Organization ${(0, colorette_1.blue)(organizationId)} not found`);
                 }
                 if (error.message === 'API_VERSION_NOT_FOUND') {
-                    (0, utils_1.exitWithError)(`The definition version ${(0, colorette_1.blue)(`${name}@${version}`)} does not exist in organization ${(0, colorette_1.blue)(organizationId)}!\n${(0, colorette_1.yellow)('Suggestion:')} please use ${(0, colorette_1.blue)('-u')} or ${(0, colorette_1.blue)('--upsert')} to create definition.\n\n`);
+                    (0, miscellaneous_1.exitWithError)(`The definition version ${(0, colorette_1.blue)(`${name}@${version}`)} does not exist in organization ${(0, colorette_1.blue)(organizationId)}!\n${(0, colorette_1.yellow)('Suggestion:')} please use ${(0, colorette_1.blue)('-u')} or ${(0, colorette_1.blue)('--upsert')} to create definition.\n\n`);
                 }
                 throw error;
             }
             process.stdout.write(`Definition: ${(0, colorette_1.blue)(api)} is successfully pushed to Redocly API Registry \n`);
         }
-        (0, utils_1.printExecutionTime)('push', startedAt, api || `apis in organization ${organizationId}`);
+        (0, miscellaneous_1.printExecutionTime)('push', startedAt, api || `apis in organization ${organizationId}`);
     });
 }
 exports.handlePush = handlePush;
@@ -151,7 +159,7 @@ function collectFilesToUpload(api, config) {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
         const files = [];
-        const [{ path: apiPath }] = yield (0, utils_1.getFallbackApisOrExit)([api], config);
+        const [{ path: apiPath }] = yield (0, miscellaneous_1.getFallbackApisOrExit)([api], config);
         process.stdout.write('Bundling definition\n');
         const { bundle: openapiBundle, problems } = yield (0, openapi_core_1.bundle)({
             config,
@@ -163,10 +171,10 @@ function collectFilesToUpload(api, config) {
             process.stdout.write(`Created a bundle for ${(0, colorette_1.blue)(api)} ${fileTotals.warnings > 0 ? 'with warnings' : ''}\n`);
         }
         else {
-            (0, utils_1.exitWithError)(`Failed to create a bundle for ${(0, colorette_1.blue)(api)}\n`);
+            (0, miscellaneous_1.exitWithError)(`Failed to create a bundle for ${(0, colorette_1.blue)(api)}\n`);
         }
         const fileExt = path.extname(apiPath).split('.').pop();
-        files.push(getFileEntry(apiPath, (0, utils_1.dumpBundle)(openapiBundle.parsed, fileExt)));
+        files.push(getFileEntry(apiPath, (0, miscellaneous_1.dumpBundle)(openapiBundle.parsed, fileExt)));
         if (fs.existsSync('package.json')) {
             files.push(getFileEntry('package.json'));
         }

package/lib/commands/split/__tests__/index.test.js

@@ -13,8 +13,8 @@ const index_1 = require("../index");
 const path = require("path");
 const openapiCore = require("@redocly/openapi-core");
 const colorette_1 = require("colorette");
-const utils = require('../../../utils');
-jest.mock('../../../utils', () => (Object.assign(Object.assign({}, jest.requireActual('../../../utils')), { writeToFileByExtension: jest.fn() })));
+const utils = require('../../../utils/miscellaneous');
+jest.mock('../../../utils/miscellaneous', () => (Object.assign(Object.assign({}, jest.requireActual('../../../utils/miscellaneous')), { writeToFileByExtension: jest.fn() })));
 jest.mock('@redocly/openapi-core', () => (Object.assign(Object.assign({}, jest.requireActual('@redocly/openapi-core')), { isRef: jest.fn() })));
 describe('#split', () => {
     const openapiDir = 'test';