@redocly/cli 1.18.0 → 1.19.0

package/lib/cms/commands/push.js

@@ -1,76 +1,66 @@
 "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 });
-exports.handlePush = void 0;
+exports.handlePush = handlePush;
 const fs = require("fs");
 const path = require("path");
 const openapi_core_1 = require("@redocly/openapi-core");
 const colorette_1 = require("colorette");
-const pluralize = require("pluralize");
 const miscellaneous_1 = require("../../utils/miscellaneous");
 const push_status_1 = require("./push-status");
 const api_1 = require("../api");
-function handlePush(argv, config) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const startedAt = performance.now(); // for printing execution time
-        const startTime = Date.now(); // for push-status command
-        const { organization, project: projectId, 'mount-path': mountPath, verbose } = argv;
-        const orgId = organization || config.organization;
-        if (!argv.message || !argv.author || !argv.branch) {
-            (0, miscellaneous_1.exitWithError)('Error: message, author and branch are required for push to the CMS.');
-        }
-        if (!orgId) {
-            return (0, miscellaneous_1.exitWithError)(`No organization provided, please use --organization option or specify the 'organization' field in the config file.`);
-        }
-        const domain = argv.domain || (0, api_1.getDomain)();
-        if (!domain) {
-            return (0, miscellaneous_1.exitWithError)(`No domain provided, please use --domain option or environment variable REDOCLY_AUTHORIZATION.`);
+async function handlePush({ argv, config, version, }) {
+    const startedAt = performance.now(); // for printing execution time
+    const startTime = Date.now(); // for push-status command
+    const { organization, project: projectId, 'mount-path': mountPath, verbose } = argv;
+    const orgId = organization || config.organization;
+    if (!argv.message || !argv.author || !argv.branch) {
+        (0, miscellaneous_1.exitWithError)('Error: message, author and branch are required for push to the CMS.');
+    }
+    if (!orgId) {
+        return (0, miscellaneous_1.exitWithError)(`No organization provided, please use --organization option or specify the 'organization' field in the config file.`);
+    }
+    const domain = argv.domain || (0, api_1.getDomain)();
+    if (!domain) {
+        return (0, miscellaneous_1.exitWithError)(`No domain provided, please use --domain option or environment variable REDOCLY_AUTHORIZATION.`);
+    }
+    try {
+        const { 'commit-sha': commitSha, 'commit-url': commitUrl, 'default-branch': defaultBranch, 'wait-for-deployment': waitForDeployment, 'max-execution-time': maxExecutionTime, } = argv;
+        const author = parseCommitAuthor(argv.author);
+        const apiKey = (0, api_1.getApiKeys)(domain);
+        const filesToUpload = collectFilesToPush(argv.files || argv.apis);
+        if (!filesToUpload.length) {
+            return (0, miscellaneous_1.printExecutionTime)('push', startedAt, `No files to upload`);
         }
-        try {
-            const { 'commit-sha': commitSha, 'commit-url': commitUrl, 'default-branch': defaultBranch, 'wait-for-deployment': waitForDeployment, 'max-execution-time': maxExecutionTime, } = argv;
-            const author = parseCommitAuthor(argv.author);
-            const apiKey = (0, api_1.getApiKeys)(domain);
-            const filesToUpload = collectFilesToPush(argv.files || argv.apis);
-            if (!filesToUpload.length) {
-                return (0, miscellaneous_1.printExecutionTime)('push', startedAt, `No files to upload`);
-            }
-            const client = new api_1.ReuniteApiClient(domain, apiKey);
-            const projectDefaultBranch = yield client.remotes.getDefaultBranch(orgId, projectId);
-            const remote = yield client.remotes.upsert(orgId, projectId, {
-                mountBranchName: projectDefaultBranch,
-                mountPath,
-            });
-            process.stderr.write(`Uploading to ${remote.mountPath} ${filesToUpload.length} ${pluralize('file', filesToUpload.length)}:\n`);
-            const { id } = yield client.remotes.push(orgId, projectId, {
-                remoteId: remote.id,
-                commit: {
-                    message: argv.message,
-                    branchName: argv.branch,
-                    sha: commitSha,
-                    url: commitUrl,
-                    createdAt: argv['created-at'],
-                    namespace: argv.namespace,
-                    repository: argv.repository,
-                    author,
-                },
-                isMainBranch: defaultBranch === argv.branch,
-            }, filesToUpload.map((f) => ({ path: (0, openapi_core_1.slash)(f.name), stream: fs.createReadStream(f.path) })));
-            filesToUpload.forEach((f) => {
-                process.stderr.write((0, colorette_1.green)(`✓ ${f.name}\n`));
-            });
+        const client = new api_1.ReuniteApiClient(domain, apiKey);
+        const projectDefaultBranch = await client.remotes.getDefaultBranch(orgId, projectId);
+        const remote = await client.remotes.upsert(orgId, projectId, {
+            mountBranchName: projectDefaultBranch,
+            mountPath,
+        });
+        process.stderr.write(`Uploading to ${remote.mountPath} ${filesToUpload.length} ${(0, miscellaneous_1.pluralize)('file', filesToUpload.length)}:\n`);
+        const { id } = await client.remotes.push(orgId, projectId, {
+            remoteId: remote.id,
+            commit: {
+                message: argv.message,
+                branchName: argv.branch,
+                sha: commitSha,
+                url: commitUrl,
+                createdAt: argv['created-at'],
+                namespace: argv.namespace,
+                repository: argv.repository,
+                author,
+            },
+            isMainBranch: defaultBranch === argv.branch,
+        }, filesToUpload.map((f) => ({ path: (0, openapi_core_1.slash)(f.name), stream: fs.createReadStream(f.path) })));
+        filesToUpload.forEach((f) => {
+            process.stderr.write((0, colorette_1.green)(`✓ ${f.name}\n`));
+        });
+        process.stdout.write('\n');
+        process.stdout.write(`Push ID: ${id}\n`);
+        if (waitForDeployment) {
             process.stdout.write('\n');
-            process.stdout.write(`Push ID: ${id}\n`);
-            if (waitForDeployment) {
-                process.stdout.write('\n');
-                yield (0, push_status_1.handlePushStatus)({
+            await (0, push_status_1.handlePushStatus)({
+                argv: {
                     organization: orgId,
                     project: projectId,
                     pushId: id,
@@ -79,21 +69,22 @@ function handlePush(argv, config) {
                     'max-execution-time': maxExecutionTime,
                     'start-time': startTime,
                     'continue-on-deploy-failures': argv['continue-on-deploy-failures'],
-                }, config);
-            }
-            verbose &&
-                (0, miscellaneous_1.printExecutionTime)('push', startedAt, `${pluralize('file', filesToUpload.length)} uploaded to organization ${orgId}, project ${projectId}. Push ID: ${id}.`);
-            return {
-                pushId: id,
-            };
-        }
-        catch (err) {
-            const message = err instanceof miscellaneous_1.HandledError ? '' : `✗ File upload failed. Reason: ${err.message}`;
-            (0, miscellaneous_1.exitWithError)(message);
+                },
+                config,
+                version,
+            });
         }
-    });
+        verbose &&
+            (0, miscellaneous_1.printExecutionTime)('push', startedAt, `${(0, miscellaneous_1.pluralize)('file', filesToUpload.length)} uploaded to organization ${orgId}, project ${projectId}. Push ID: ${id}.`);
+        return {
+            pushId: id,
+        };
+    }
+    catch (err) {
+        const message = err instanceof miscellaneous_1.HandledError ? '' : `✗ File upload failed. Reason: ${err.message}`;
+        (0, miscellaneous_1.exitWithError)(message);
+    }
 }
-exports.handlePush = handlePush;
 function parseCommitAuthor(author) {
     // Author Name <author@email.com>
     const reg = /^.+\s<[^<>]+>$/;

package/lib/cms/commands/utils.js

@@ -1,15 +1,6 @@
 "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 });
-exports.retryUntilConditionMet = void 0;
+exports.retryUntilConditionMet = retryUntilConditionMet;
 const openapi_core_1 = require("@redocly/openapi-core");
 /**
  * This function retries an operation until a condition is met or a timeout is exceeded.
@@ -23,31 +14,26 @@ const openapi_core_1 = require("@redocly/openapi-core");
  * @param retryTimeoutMs The maximum time to retry the operation. Default is 10 minutes.
  * @param retryIntervalMs The interval between retries. Default is 5 seconds.
  */
-function retryUntilConditionMet({ operation, condition, onConditionNotMet, onRetry, startTime = Date.now(), retryTimeoutMs = 600000, // 10 min
+async function retryUntilConditionMet({ operation, condition, onConditionNotMet, onRetry, startTime = Date.now(), retryTimeoutMs = 600000, // 10 min
 retryIntervalMs = 5000, // 5 sec
  }) {
-    return __awaiter(this, void 0, void 0, function* () {
-        function attempt() {
-            return __awaiter(this, void 0, void 0, function* () {
-                const result = yield operation();
-                if (!condition) {
-                    return result;
-                }
-                if (condition(result)) {
-                    return result;
-                }
-                else if (Date.now() - startTime > retryTimeoutMs) {
-                    throw new Error('Timeout exceeded');
-                }
-                else {
-                    onConditionNotMet === null || onConditionNotMet === void 0 ? void 0 : onConditionNotMet(result);
-                    yield (0, openapi_core_1.pause)(retryIntervalMs);
-                    yield (onRetry === null || onRetry === void 0 ? void 0 : onRetry(result));
-                    return attempt();
-                }
-            });
+    async function attempt() {
+        const result = await operation();
+        if (!condition) {
+            return result;
+        }
+        if (condition(result)) {
+            return result;
+        }
+        else if (Date.now() - startTime > retryTimeoutMs) {
+            throw new Error('Timeout exceeded');
         }
-        return attempt();
-    });
+        else {
+            onConditionNotMet?.(result);
+            await (0, openapi_core_1.pause)(retryIntervalMs);
+            await onRetry?.(result);
+            return attempt();
+        }
+    }
+    return attempt();
 }
-exports.retryUntilConditionMet = retryUntilConditionMet;

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

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

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

@@ -1,27 +1,17 @@
 "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 });
 exports.handlerBuildCommand = void 0;
 const redoc_1 = require("redoc");
 const path_1 = require("path");
 const fs_1 = require("fs");
 const perf_hooks_1 = require("perf_hooks");
-const utils_1 = require("./utils");
 const openapi_core_1 = require("@redocly/openapi-core");
+const utils_1 = require("./utils");
 const miscellaneous_1 = require("../../utils/miscellaneous");
-const handlerBuildCommand = (argv, configFromFile) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a;
+const handlerBuildCommand = async ({ argv, config: configFromFile, collectSpecData, }) => {
     const startedAt = perf_hooks_1.performance.now();
     const config = (0, openapi_core_1.getMergedConfig)(configFromFile, argv.api);
-    const apis = yield (0, miscellaneous_1.getFallbackApisOrExit)(argv.api ? [argv.api] : [], config);
+    const apis = await (0, miscellaneous_1.getFallbackApisOrExit)(argv.api ? [argv.api] : [], config);
     const { path: pathToApi } = apis[0];
     const options = {
         output: argv.o,
@@ -29,13 +19,14 @@ const handlerBuildCommand = (argv, configFromFile) => __awaiter(void 0, void 0,
         disableGoogleFont: argv.disableGoogleFont,
         templateFileName: argv.template,
         templateOptions: argv.templateOptions || {},
-        redocOptions: (0, utils_1.getObjectOrJSON)((_a = argv.theme) === null || _a === void 0 ? void 0 : _a.openapi, config),
+        redocOptions: (0, utils_1.getObjectOrJSON)(argv.theme?.openapi, config),
     };
     const redocCurrentVersion = require('../../../package.json').dependencies.redoc.substring(1); // remove ~
     try {
         const elapsed = (0, miscellaneous_1.getExecutionTime)(startedAt);
-        const api = yield (0, redoc_1.loadAndBundleSpec)((0, openapi_core_1.isAbsoluteUrl)(pathToApi) ? pathToApi : (0, path_1.resolve)(pathToApi));
-        const pageHTML = yield (0, utils_1.getPageHTML)(api, pathToApi, Object.assign(Object.assign({}, options), { redocCurrentVersion }), argv.config);
+        const api = await (0, redoc_1.loadAndBundleSpec)((0, openapi_core_1.isAbsoluteUrl)(pathToApi) ? pathToApi : (0, path_1.resolve)(pathToApi));
+        collectSpecData?.(api);
+        const pageHTML = await (0, utils_1.getPageHTML)(api, pathToApi, { ...options, redocCurrentVersion }, argv.config);
         (0, fs_1.mkdirSync)((0, path_1.dirname)(options.output), { recursive: true });
         (0, fs_1.writeFileSync)(options.output, pageHTML);
         const sizeInKiB = Math.ceil(Buffer.byteLength(pageHTML) / 1024);
@@ -44,5 +35,5 @@ const handlerBuildCommand = (argv, configFromFile) => __awaiter(void 0, void 0,
     catch (e) {
         (0, miscellaneous_1.exitWithError)(e);
     }
-});
+};
 exports.handlerBuildCommand = handlerBuildCommand;

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

@@ -1,15 +1,10 @@
 "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 });
-exports.escapeUnicode = exports.escapeClosingScriptTag = exports.sanitizeJSONString = exports.getPageHTML = exports.getObjectOrJSON = void 0;
+exports.getObjectOrJSON = getObjectOrJSON;
+exports.getPageHTML = getPageHTML;
+exports.sanitizeJSONString = sanitizeJSONString;
+exports.escapeClosingScriptTag = escapeClosingScriptTag;
+exports.escapeUnicode = escapeUnicode;
 const react_1 = require("react");
 const redoc_1 = require("redoc");
 const openapi_core_1 = require("@redocly/openapi-core");
@@ -48,24 +43,22 @@ function getObjectOrJSON(openapiOptions, config) {
     }
     return {};
 }
-exports.getObjectOrJSON = getObjectOrJSON;
-function getPageHTML(api, pathToApi, { title, disableGoogleFont, templateFileName, templateOptions, redocOptions = {}, redocCurrentVersion, }, configPath) {
-    return __awaiter(this, void 0, void 0, function* () {
-        process.stderr.write('Prerendering docs\n');
-        const apiUrl = redocOptions.specUrl || ((0, openapi_core_1.isAbsoluteUrl)(pathToApi) ? pathToApi : undefined);
-        const store = yield (0, redoc_1.createStore)(api, apiUrl, redocOptions);
-        const sheet = new styled_components_1.ServerStyleSheet();
-        const html = (0, server_1.renderToString)(sheet.collectStyles((0, react_1.createElement)(redoc_1.Redoc, { store })));
-        const state = yield store.toJS();
-        const css = sheet.getStyleTags();
-        templateFileName = templateFileName
-            ? templateFileName
-            : (redocOptions === null || redocOptions === void 0 ? void 0 : redocOptions.htmlTemplate)
-                ? (0, path_1.resolve)(configPath ? (0, path_1.dirname)(configPath) : '', redocOptions.htmlTemplate)
-                : (0, path_1.join)(__dirname, './template.hbs');
-        const template = (0, handlebars_1.compile)((0, fs_1.readFileSync)(templateFileName).toString());
-        return template({
-            redocHTML: `
+async function getPageHTML(api, pathToApi, { title, disableGoogleFont, templateFileName, templateOptions, redocOptions = {}, redocCurrentVersion, }, configPath) {
+    process.stderr.write('Prerendering docs\n');
+    const apiUrl = redocOptions.specUrl || ((0, openapi_core_1.isAbsoluteUrl)(pathToApi) ? pathToApi : undefined);
+    const store = await (0, redoc_1.createStore)(api, apiUrl, redocOptions);
+    const sheet = new styled_components_1.ServerStyleSheet();
+    const html = (0, server_1.renderToString)(sheet.collectStyles((0, react_1.createElement)(redoc_1.Redoc, { store })));
+    const state = await store.toJS();
+    const css = sheet.getStyleTags();
+    templateFileName = templateFileName
+        ? templateFileName
+        : redocOptions?.htmlTemplate
+            ? (0, path_1.resolve)(configPath ? (0, path_1.dirname)(configPath) : '', redocOptions.htmlTemplate)
+            : (0, path_1.join)(__dirname, './template.hbs');
+    const template = (0, handlebars_1.compile)((0, fs_1.readFileSync)(templateFileName).toString());
+    return template({
+        redocHTML: `
       <div id="redoc">${html || ''}</div>
       <script>
       ${`const __redoc_state = ${sanitizeJSONString(JSON.stringify(state))};` || ''}
@@ -74,26 +67,21 @@ function getPageHTML(api, pathToApi, { title, disableGoogleFont, templateFileNam
       Redoc.${'hydrate(__redoc_state, container)'};
 
       </script>`,
-            redocHead: `<script src="https://cdn.redoc.ly/redoc/v${redocCurrentVersion}/bundles/redoc.standalone.js"></script>` +
-                css,
-            title: title || api.info.title || 'ReDoc documentation',
-            disableGoogleFont,
-            templateOptions,
-        });
+        redocHead: `<script src="https://cdn.redoc.ly/redoc/v${redocCurrentVersion}/bundles/redoc.standalone.js"></script>` +
+            css,
+        title: title || api.info.title || 'ReDoc documentation',
+        disableGoogleFont,
+        templateOptions,
     });
 }
-exports.getPageHTML = getPageHTML;
 function sanitizeJSONString(str) {
     return escapeClosingScriptTag(escapeUnicode(str));
 }
-exports.sanitizeJSONString = sanitizeJSONString;
 // see http://www.thespanner.co.uk/2011/07/25/the-json-specification-is-now-wrong/
 function escapeClosingScriptTag(str) {
     return str.replace(/<\/script>/g, '<\\/script>');
 }
-exports.escapeClosingScriptTag = escapeClosingScriptTag;
 // see http://www.thespanner.co.uk/2011/07/25/the-json-specification-is-now-wrong/
 function escapeUnicode(str) {
     return str.replace(/\u2028|\u2029/g, (m) => '\\u202' + (m === '\u2028' ? '8' : '9'));
 }
-exports.escapeUnicode = escapeUnicode;

package/lib/commands/bundle.d.ts

@@ -1,5 +1,5 @@
-import { Config } from '@redocly/openapi-core';
 import type { OutputExtensions, Skips } from '../types';
+import type { CommandArgs } from '../wrapper';
 export type BundleOptions = {
     apis?: string[];
     extends?: string[];
@@ -12,4 +12,4 @@ export type BundleOptions = {
     'remove-unused-components'?: boolean;
     'keep-url-references'?: boolean;
 } & Skips;
-export declare function handleBundle(argv: BundleOptions, config: Config, version: string): Promise<void>;
+export declare function handleBundle({ argv, config, version, collectSpecData, }: CommandArgs<BundleOptions>): Promise<void>;

package/lib/commands/bundle.js

@@ -1,109 +1,85 @@
 "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());
-    });
-};
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleBundle = void 0;
-const openapi_core_1 = require("@redocly/openapi-core");
-const miscellaneous_1 = require("../utils/miscellaneous");
+exports.handleBundle = handleBundle;
 const perf_hooks_1 = require("perf_hooks");
 const colorette_1 = require("colorette");
 const fs_1 = require("fs");
-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, miscellaneous_1.getFallbackApisOrExit)(argv.apis, config);
-        const totals = { errors: 0, warnings: 0, ignored: 0 };
-        const deprecatedOptions = [];
-        (0, miscellaneous_2.checkForDeprecatedOptions)(argv, deprecatedOptions);
-        for (const { path, alias } of apis) {
-            try {
-                const startedAt = perf_hooks_1.performance.now();
-                const resolvedConfig = (0, openapi_core_1.getMergedConfig)(config, alias);
-                const { styleguide } = resolvedConfig;
-                styleguide.skipPreprocessors(argv['skip-preprocessor']);
-                styleguide.skipDecorators(argv['skip-decorator']);
-                process.stderr.write((0, colorette_1.gray)(`bundling ${path}...\n`));
-                const _f = yield (0, openapi_core_1.bundle)({
-                    config: resolvedConfig,
-                    ref: path,
-                    dereference: argv.dereferenced,
-                    removeUnusedComponents,
-                    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, miscellaneous_1.getOutputFileName)(path, apis.length, argv.output, argv.ext);
-                if (fileTotals.errors === 0 || argv.force) {
-                    if (!argv.output) {
-                        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, miscellaneous_1.dumpBundle)((0, miscellaneous_1.sortTopLevelKeysForOas)(result.parsed), ext, argv.dereferenced);
-                        (0, miscellaneous_1.saveBundle)(outputFile, output);
-                    }
+const openapi_core_1 = require("@redocly/openapi-core");
+const miscellaneous_1 = require("../utils/miscellaneous");
+async function handleBundle({ argv, config, version, collectSpecData, }) {
+    const removeUnusedComponents = argv['remove-unused-components'] ||
+        config.rawConfig?.styleguide?.decorators?.hasOwnProperty('remove-unused-components');
+    const apis = await (0, miscellaneous_1.getFallbackApisOrExit)(argv.apis, config);
+    const totals = { errors: 0, warnings: 0, ignored: 0 };
+    const deprecatedOptions = [];
+    (0, miscellaneous_1.checkForDeprecatedOptions)(argv, deprecatedOptions);
+    for (const { path, alias } of apis) {
+        try {
+            const startedAt = perf_hooks_1.performance.now();
+            const resolvedConfig = (0, openapi_core_1.getMergedConfig)(config, alias);
+            const { styleguide } = resolvedConfig;
+            styleguide.skipPreprocessors(argv['skip-preprocessor']);
+            styleguide.skipDecorators(argv['skip-decorator']);
+            process.stderr.write((0, colorette_1.gray)(`bundling ${path}...\n`));
+            const { bundle: result, problems, ...meta } = await (0, openapi_core_1.bundle)({
+                config: resolvedConfig,
+                ref: path,
+                dereference: argv.dereferenced,
+                removeUnusedComponents,
+                keepUrlRefs: argv['keep-url-references'],
+                collectSpecData,
+            });
+            const fileTotals = (0, openapi_core_1.getTotals)(problems);
+            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, miscellaneous_1.dumpBundle)((0, miscellaneous_1.sortTopLevelKeysForOas)(result.parsed), argv.ext || 'yaml', argv.dereferenced);
+                    process.stdout.write(output);
+                }
+                else {
+                    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;
-                totals.warnings += fileTotals.warnings;
-                totals.ignored += fileTotals.ignored;
-                (0, openapi_core_1.formatProblems)(problems, {
-                    format: 'codeframe',
-                    totals: fileTotals,
-                    version,
-                });
-                if (argv.metafile) {
-                    if (apis.length > 1) {
-                        process.stderr.write((0, colorette_1.yellow)(`[WARNING] "--metafile" cannot be used with multiple apis. Skipping...`));
-                    }
-                    {
-                        (0, fs_1.writeFileSync)(argv.metafile, JSON.stringify(meta), 'utf-8');
-                    }
+            }
+            totals.errors += fileTotals.errors;
+            totals.warnings += fileTotals.warnings;
+            totals.ignored += fileTotals.ignored;
+            (0, openapi_core_1.formatProblems)(problems, {
+                format: 'codeframe',
+                totals: fileTotals,
+                version,
+            });
+            if (argv.metafile) {
+                if (apis.length > 1) {
+                    process.stderr.write((0, colorette_1.yellow)(`[WARNING] "--metafile" cannot be used with multiple apis. Skipping...`));
                 }
-                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`);
-                    }
-                    else {
-                        process.stderr.write(`❌ Errors encountered while bundling ${(0, colorette_1.blue)(path)}: bundle not created (use --force to ignore errors).\n`);
-                    }
+                {
+                    (0, fs_1.writeFileSync)(argv.metafile, JSON.stringify(meta), 'utf-8');
                 }
-                else {
-                    process.stderr.write(`📦 Created a bundle for ${(0, colorette_1.blue)(path)} at ${(0, colorette_1.blue)(outputFile)} ${(0, colorette_1.green)(elapsed)}.\n`);
+            }
+            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`);
                 }
-                const removedCount = (_e = (_d = meta.visitorsData) === null || _d === void 0 ? void 0 : _d['remove-unused-components']) === null || _e === void 0 ? void 0 : _e.removedCount;
-                if (removedCount) {
-                    process.stderr.write((0, colorette_1.gray)(`🧹 Removed ${removedCount} unused components.\n`));
+                else {
+                    process.stderr.write(`❌ Errors encountered while bundling ${(0, colorette_1.blue)(path)}: bundle not created (use --force to ignore errors).\n`);
                 }
             }
-            catch (e) {
-                (0, miscellaneous_1.handleError)(e, path);
+            else {
+                process.stderr.write(`📦 Created a bundle for ${(0, colorette_1.blue)(path)} at ${(0, colorette_1.blue)(outputFile)} ${(0, colorette_1.green)(elapsed)}.\n`);
+            }
+            const removedCount = meta.visitorsData?.['remove-unused-components']?.removedCount;
+            if (removedCount) {
+                process.stderr.write((0, colorette_1.gray)(`🧹 Removed ${removedCount} unused components.\n`));
             }
         }
-        (0, miscellaneous_1.printUnusedWarnings)(config.styleguide);
-        if (!(totals.errors === 0 || argv.force)) {
-            throw new Error('Bundle failed.');
+        catch (e) {
+            (0, miscellaneous_1.handleError)(e, path);
         }
-    });
+    }
+    (0, miscellaneous_1.printUnusedWarnings)(config.styleguide);
+    if (!(totals.errors === 0 || argv.force)) {
+        throw new Error('Bundle failed.');
+    }
 }
-exports.handleBundle = handleBundle;

package/lib/commands/join.d.ts

@@ -1,5 +1,5 @@
-import { Config } from '@redocly/openapi-core';
 import type { RuleSeverity } from '@redocly/openapi-core';
+import type { CommandArgs } from '../wrapper';
 export type JoinOptions = {
     apis: string[];
     'prefix-tags-with-info-prop'?: string;
@@ -10,4 +10,4 @@ export type JoinOptions = {
     config?: string;
     'lint-config'?: RuleSeverity;
 };
-export declare function handleJoin(argv: JoinOptions, config: Config, packageVersion: string): Promise<void>;
+export declare function handleJoin({ argv, config, version: packageVersion, }: CommandArgs<JoinOptions>): Promise<void>;