@redocly/cli 1.18.1 → 1.19.0

package/lib/commands/preview-docs/preview-server/server.d.ts

@@ -1,6 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
-/// <reference types="node" />
 import * as http from 'http';
 import { ReadStream } from 'fs';
 export declare const mimeTypes: {

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

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.startWsServer = exports.startHttpServer = exports.respondWithGzip = exports.mimeTypes = void 0;
+exports.mimeTypes = void 0;
+exports.respondWithGzip = respondWithGzip;
+exports.startHttpServer = startHttpServer;
+exports.startWsServer = startWsServer;
 const http = require("http");
 const zlib = require("zlib");
 const SocketServer = require('simple-websocket/server.js');
@@ -26,11 +29,11 @@ function respondWithGzip(contents, request, response, headers = {}, code = 200)
     let compressedStream;
     const acceptEncoding = request.headers['accept-encoding'] || '';
     if (acceptEncoding.match(/\bdeflate\b/)) {
-        response.writeHead(code, Object.assign(Object.assign({}, headers), { 'content-encoding': 'deflate' }));
+        response.writeHead(code, { ...headers, 'content-encoding': 'deflate' });
         compressedStream = zlib.createDeflate();
     }
     else if (acceptEncoding.match(/\bgzip\b/)) {
-        response.writeHead(code, Object.assign(Object.assign({}, headers), { 'content-encoding': 'gzip' }));
+        response.writeHead(code, { ...headers, 'content-encoding': 'gzip' });
         compressedStream = zlib.createGzip();
     }
     else {
@@ -53,11 +56,9 @@ function respondWithGzip(contents, request, response, headers = {}, code = 200)
         contents.pipe(compressedStream).pipe(response);
     }
 }
-exports.respondWithGzip = respondWithGzip;
 function startHttpServer(port, host, handler) {
     return http.createServer(handler).listen(port, host);
 }
-exports.startHttpServer = startHttpServer;
 function startWsServer(port, host) {
     const socketServer = new SocketServer({ port, host, clientTracking: true });
     socketServer.on('connection', (socket) => {
@@ -82,4 +83,3 @@ function startWsServer(port, host) {
     };
     return socketServer;
 }
-exports.startWsServer = startWsServer;

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

@@ -1,2 +1,3 @@
 import type { PreviewProjectOptions } from './types';
-export declare const previewProject: (args: PreviewProjectOptions) => Promise<void>;
+import type { CommandArgs } from '../../wrapper';
+export declare const previewProject: ({ argv }: CommandArgs<PreviewProjectOptions>) => Promise<void>;

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

@@ -1,23 +1,14 @@
 "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.previewProject = void 0;
 const path = require("path");
 const fs_1 = require("fs");
 const child_process_1 = require("child_process");
 const constants_1 = require("./constants");
-const previewProject = (args) => __awaiter(void 0, void 0, void 0, function* () {
-    const { plan, port } = args;
-    const projectDir = args['source-dir'];
-    const product = args.product || tryGetProductFromPackageJson(projectDir);
+const previewProject = async ({ argv }) => {
+    const { plan, port } = argv;
+    const projectDir = argv['source-dir'];
+    const product = argv.product || tryGetProductFromPackageJson(projectDir);
     if (!isValidProduct(product)) {
         process.stderr.write(`Invalid product ${product}`);
         throw new Error(`Project preview launch failed`);
@@ -30,7 +21,7 @@ const previewProject = (args) => __awaiter(void 0, void 0, void 0, function* ()
         stdio: 'inherit',
         cwd: projectDir,
     });
-});
+};
 exports.previewProject = previewProject;
 const isValidProduct = (product) => {
     if (!product) {

package/lib/commands/push.d.ts

@@ -1,5 +1,6 @@
 import { Config, Region } from '@redocly/openapi-core';
 import { handlePush as handleCMSPush } from '../cms/commands/push';
+import type { CommandArgs } from '../wrapper';
 export declare const DESTINATION_REGEX: RegExp;
 export type PushOptions = {
     api?: string;
@@ -18,14 +19,10 @@ export type PushOptions = {
 export declare function commonPushHandler({ project, 'mount-path': mountPath, }: {
     project?: string;
     'mount-path'?: string;
-}): typeof handleCMSPush | (({ apis, branch, "batch-id": batchId, "job-id": jobId, ...rest }: Omit<PushOptions, "destination" | "branchName"> & {
-    apis?: string[] | undefined;
-    branch?: string | undefined;
-    destination?: string | undefined;
-} & {
-    'batch-id'?: string | undefined;
-}, config: Config) => Promise<void>);
-export declare function handlePush(argv: PushOptions, config: Config): Promise<void>;
+}): typeof handleCMSPush | (({ argv: { apis, branch, "batch-id": batchId, "job-id": jobId, ...rest }, config, version, }: CommandArgs<BarePushArgs & {
+    "batch-id"?: string;
+}>) => Promise<void>);
+export declare function handlePush({ argv, config }: CommandArgs<PushOptions>): Promise<void>;
 export declare function getDestinationProps(destination: string | undefined, organization: string | undefined): {
     organizationId: string | undefined;
     name: string | undefined;
@@ -36,9 +33,9 @@ type BarePushArgs = Omit<PushOptions, 'destination' | 'branchName'> & {
     branch?: string;
     destination?: string;
 };
-export declare const transformPush: (callback: typeof handlePush) => ({ apis, branch, "batch-id": batchId, "job-id": jobId, ...rest }: BarePushArgs & {
-    'batch-id'?: string;
-}, config: Config) => Promise<void>;
+export declare const transformPush: (callback: typeof handlePush) => ({ argv: { apis, branch, "batch-id": batchId, "job-id": jobId, ...rest }, config, version, }: CommandArgs<BarePushArgs & {
+    "batch-id"?: string;
+}>) => Promise<void>;
 export declare function getApiRoot({ name, version, config: { apis }, }: {
     name: string;
     version: string;

package/lib/commands/push.js

@@ -1,26 +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());
-    });
-};
-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.getApiRoot = exports.transformPush = exports.getDestinationProps = exports.handlePush = exports.commonPushHandler = exports.DESTINATION_REGEX = void 0;
+exports.transformPush = exports.DESTINATION_REGEX = void 0;
+exports.commonPushHandler = commonPushHandler;
+exports.handlePush = handlePush;
+exports.getDestinationProps = getDestinationProps;
+exports.getApiRoot = getApiRoot;
 const fs = require("fs");
 const path = require("path");
 const node_fetch_1 = require("node-fetch");
@@ -39,113 +23,109 @@ function commonPushHandler({ project, 'mount-path': mountPath, }) {
     }
     return (0, exports.transformPush)(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);
-        const isAuthorized = yield client.isAuthorizedWithRedoclyByRegion();
-        if (!isAuthorized) {
-            try {
-                const clientToken = yield (0, login_1.promptClientToken)(client.domain);
-                yield client.login(clientToken);
-            }
-            catch (e) {
-                (0, miscellaneous_1.exitWithError)(e);
-            }
-        }
-        const startedAt = perf_hooks_1.performance.now();
-        const { destination, branchName, upsert } = argv;
-        const jobId = argv['job-id'];
-        const batchSize = argv['batch-size'];
-        if (destination && !exports.DESTINATION_REGEX.test(destination)) {
-            (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, 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, 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, miscellaneous_1.exitWithError)(`No destination provided, please use --destination option to provide destination.`);
-        }
-        if (jobId && !jobId.trim()) {
-            (0, miscellaneous_1.exitWithError)(`The ${(0, colorette_1.blue)(`job-id`)} option value is not valid, please avoid using an empty string.`);
+async function handlePush({ argv, config }) {
+    const client = new openapi_core_1.RedoclyClient(config.region);
+    const isAuthorized = await client.isAuthorizedWithRedoclyByRegion();
+    if (!isAuthorized) {
+        try {
+            const clientToken = await (0, login_1.promptClientToken)(client.domain);
+            await client.login(clientToken);
         }
-        if (batchSize && batchSize < 2) {
-            (0, miscellaneous_1.exitWithError)(`The ${(0, colorette_1.blue)(`batch-size`)} option value is not valid, please use the integer bigger than 1.`);
+        catch (e) {
+            (0, miscellaneous_1.exitWithError)(e);
         }
-        const apis = api ? { [`${name}@${version}`]: { root: api } } : config.apis;
-        if (!Object.keys(apis).length) {
-            (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);
-            resolvedConfig.styleguide.skipDecorators(argv['skip-decorator']);
-            const [name, version = DEFAULT_VERSION] = apiNameAndVersion.split('@');
-            const encodedName = encodeURIComponent(name);
-            try {
-                let rootFilePath = '';
-                const filePaths = [];
-                const filesToUpload = yield collectFilesToUpload(api, resolvedConfig);
-                const filesHash = hashFiles(filesToUpload.files);
-                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({
-                        organizationId,
-                        name: encodedName,
-                        version,
-                        filesHash,
-                        filename: file.keyOnS3,
-                        isUpsert: upsert,
-                    });
-                    if (file.filePath === filesToUpload.root) {
-                        rootFilePath = filePath;
-                    }
-                    filePaths.push(filePath);
-                    process.stdout.write(`Uploading ${file.contents ? 'bundle for ' : ''}${(0, colorette_1.blue)(file.filePath)}...`);
-                    const uploadResponse = yield uploadFileToS3(signedUploadUrl, file.contents || file.filePath);
-                    const fileCounter = `(${++uploaded}/${filesToUpload.files.length})`;
-                    if (!uploadResponse.ok) {
-                        (0, miscellaneous_1.exitWithError)(`✗ ${fileCounter}\nFile upload failed.`);
-                    }
-                    process.stdout.write((0, colorette_1.green)(`✓ ${fileCounter}\n`));
-                }
-                process.stdout.write('\n');
-                yield client.registryApi.pushApi({
+    }
+    const startedAt = perf_hooks_1.performance.now();
+    const { destination, branchName, upsert } = argv;
+    const jobId = argv['job-id'];
+    const batchSize = argv['batch-size'];
+    if (destination && !exports.DESTINATION_REGEX.test(destination)) {
+        (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, 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, 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, miscellaneous_1.exitWithError)(`No destination provided, please use --destination option to provide destination.`);
+    }
+    if (jobId && !jobId.trim()) {
+        (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, 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, 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);
+        resolvedConfig.styleguide.skipDecorators(argv['skip-decorator']);
+        const [name, version = DEFAULT_VERSION] = apiNameAndVersion.split('@');
+        const encodedName = encodeURIComponent(name);
+        try {
+            let rootFilePath = '';
+            const filePaths = [];
+            const filesToUpload = await collectFilesToUpload(api, resolvedConfig);
+            const filesHash = hashFiles(filesToUpload.files);
+            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 } = await client.registryApi.prepareFileUpload({
                     organizationId,
                     name: encodedName,
                     version,
-                    rootFilePath,
-                    filePaths,
-                    branch: branchName,
+                    filesHash,
+                    filename: file.keyOnS3,
                     isUpsert: upsert,
-                    isPublic: argv['public'],
-                    batchId: jobId,
-                    batchSize: batchSize,
                 });
-            }
-            catch (error) {
-                if (error.message === 'ORGANIZATION_NOT_FOUND') {
-                    (0, miscellaneous_1.exitWithError)(`Organization ${(0, colorette_1.blue)(organizationId)} not found.`);
+                if (file.filePath === filesToUpload.root) {
+                    rootFilePath = filePath;
                 }
-                if (error.message === 'API_VERSION_NOT_FOUND') {
-                    (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.`);
+                filePaths.push(filePath);
+                process.stdout.write(`Uploading ${file.contents ? 'bundle for ' : ''}${(0, colorette_1.blue)(file.filePath)}...`);
+                const uploadResponse = await uploadFileToS3(signedUploadUrl, file.contents || file.filePath);
+                const fileCounter = `(${++uploaded}/${filesToUpload.files.length})`;
+                if (!uploadResponse.ok) {
+                    (0, miscellaneous_1.exitWithError)(`✗ ${fileCounter}\nFile upload failed.`);
                 }
-                throw error;
+                process.stdout.write((0, colorette_1.green)(`✓ ${fileCounter}\n`));
             }
-            process.stdout.write(`Definition: ${(0, colorette_1.blue)(api)} is successfully pushed to Redocly API Registry.\n`);
+            process.stdout.write('\n');
+            await client.registryApi.pushApi({
+                organizationId,
+                name: encodedName,
+                version,
+                rootFilePath,
+                filePaths,
+                branch: branchName,
+                isUpsert: upsert,
+                isPublic: argv['public'],
+                batchId: jobId,
+                batchSize: batchSize,
+            });
         }
-        (0, miscellaneous_1.printExecutionTime)('push', startedAt, api || `apis in organization ${organizationId}`);
-    });
+        catch (error) {
+            if (error.message === 'ORGANIZATION_NOT_FOUND') {
+                (0, miscellaneous_1.exitWithError)(`Organization ${(0, colorette_1.blue)(organizationId)} not found.`);
+            }
+            if (error.message === 'API_VERSION_NOT_FOUND') {
+                (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.`);
+            }
+            throw error;
+        }
+        process.stdout.write(`Definition: ${(0, colorette_1.blue)(api)} is successfully pushed to Redocly API Registry.\n`);
+    }
+    (0, miscellaneous_1.printExecutionTime)('push', startedAt, api || `apis in organization ${organizationId}`);
 }
-exports.handlePush = handlePush;
 function getFilesList(dir, files) {
     files = files || [];
     const filesAndDirs = fs.readdirSync(dir);
@@ -160,82 +140,79 @@ function getFilesList(dir, files) {
     }
     return files;
 }
-function collectFilesToUpload(api, config) {
-    var _a, _b;
-    return __awaiter(this, void 0, void 0, function* () {
-        const files = [];
-        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,
-            ref: apiPath,
-            skipRedoclyRegistryRefs: true,
-        });
-        const fileTotals = (0, openapi_core_1.getTotals)(problems);
-        if (fileTotals.errors === 0) {
-            process.stdout.write(`Created a bundle for ${(0, colorette_1.blue)(api)} ${fileTotals.warnings > 0 ? 'with warnings' : ''}\n`);
-        }
-        else {
-            (0, miscellaneous_1.exitWithError)(`Failed to create a bundle for ${(0, colorette_1.blue)(api)}.`);
-        }
-        const fileExt = path.extname(apiPath).split('.').pop();
-        files.push(getFileEntry(apiPath, (0, miscellaneous_1.dumpBundle)(openapiBundle.parsed, fileExt)));
-        if (fs.existsSync('package.json')) {
-            files.push(getFileEntry('package.json'));
+async function collectFilesToUpload(api, config) {
+    const files = [];
+    const [{ path: apiPath }] = await (0, miscellaneous_1.getFallbackApisOrExit)([api], config);
+    process.stdout.write('Bundling definition\n');
+    const { bundle: openapiBundle, problems } = await (0, openapi_core_1.bundle)({
+        config,
+        ref: apiPath,
+        skipRedoclyRegistryRefs: true,
+    });
+    const fileTotals = (0, openapi_core_1.getTotals)(problems);
+    if (fileTotals.errors === 0) {
+        process.stdout.write(`Created a bundle for ${(0, colorette_1.blue)(api)} ${fileTotals.warnings > 0 ? 'with warnings' : ''}\n`);
+    }
+    else {
+        (0, miscellaneous_1.exitWithError)(`Failed to create a bundle for ${(0, colorette_1.blue)(api)}.`);
+    }
+    const fileExt = path.extname(apiPath).split('.').pop();
+    files.push(getFileEntry(apiPath, (0, miscellaneous_1.dumpBundle)(openapiBundle.parsed, fileExt)));
+    if (fs.existsSync('package.json')) {
+        files.push(getFileEntry('package.json'));
+    }
+    if (fs.existsSync(openapi_core_1.IGNORE_FILE)) {
+        files.push(getFileEntry(openapi_core_1.IGNORE_FILE));
+    }
+    if (config.configFile) {
+        // All config file paths including the root one
+        files.push(...[...new Set(config.styleguide.extendPaths)].map((f) => getFileEntry(f)));
+        if (config.theme?.openapi?.htmlTemplate) {
+            const dir = getFolder(config.theme.openapi.htmlTemplate);
+            const fileList = getFilesList(dir, []);
+            files.push(...fileList.map((f) => getFileEntry(f)));
         }
-        if (fs.existsSync(openapi_core_1.IGNORE_FILE)) {
-            files.push(getFileEntry(openapi_core_1.IGNORE_FILE));
+        const pluginFiles = new Set();
+        for (const plugin of config.styleguide.pluginPaths) {
+            if (typeof plugin !== 'string')
+                continue;
+            const fileList = getFilesList(getFolder(plugin), []);
+            fileList.forEach((f) => pluginFiles.add(f));
         }
-        if (config.configFile) {
-            // All config file paths including the root one
-            files.push(...[...new Set(config.styleguide.extendPaths)].map((f) => getFileEntry(f)));
-            if ((_b = (_a = config.theme) === null || _a === void 0 ? void 0 : _a.openapi) === null || _b === void 0 ? void 0 : _b.htmlTemplate) {
-                const dir = getFolder(config.theme.openapi.htmlTemplate);
-                const fileList = getFilesList(dir, []);
-                files.push(...fileList.map((f) => getFileEntry(f)));
-            }
-            const pluginFiles = new Set();
-            for (const plugin of config.styleguide.pluginPaths) {
-                if (typeof plugin !== 'string')
-                    continue;
-                const fileList = getFilesList(getFolder(plugin), []);
-                fileList.forEach((f) => pluginFiles.add(f));
+        files.push(...filterPluginFilesByExt(Array.from(pluginFiles)).map((f) => getFileEntry(f)));
+    }
+    if (config.files) {
+        const otherFiles = new Set();
+        for (const file of config.files) {
+            if (fs.statSync(file).isDirectory()) {
+                const fileList = getFilesList(file, []);
+                fileList.forEach((f) => otherFiles.add(f));
             }
-            files.push(...filterPluginFilesByExt(Array.from(pluginFiles)).map((f) => getFileEntry(f)));
-        }
-        if (config.files) {
-            const otherFiles = new Set();
-            for (const file of config.files) {
-                if (fs.statSync(file).isDirectory()) {
-                    const fileList = getFilesList(file, []);
-                    fileList.forEach((f) => otherFiles.add(f));
-                }
-                else {
-                    otherFiles.add(file);
-                }
+            else {
+                otherFiles.add(file);
             }
-            files.push(...Array.from(otherFiles).map((f) => getFileEntry(f)));
         }
+        files.push(...Array.from(otherFiles).map((f) => getFileEntry(f)));
+    }
+    return {
+        files,
+        root: path.resolve(apiPath),
+    };
+    function filterPluginFilesByExt(files) {
+        return files.filter((file) => {
+            const fileExt = path.extname(file).toLowerCase();
+            return fileExt === '.js' || fileExt === '.ts' || fileExt === '.mjs' || fileExt === 'json';
+        });
+    }
+    function getFileEntry(filename, contents) {
         return {
-            files,
-            root: path.resolve(apiPath),
+            filePath: path.resolve(filename),
+            keyOnS3: config.configFile
+                ? (0, openapi_core_1.slash)(path.relative(path.dirname(config.configFile), filename))
+                : (0, openapi_core_1.slash)(path.basename(filename)),
+            contents: (contents && Buffer.from(contents, 'utf-8')) || undefined,
         };
-        function filterPluginFilesByExt(files) {
-            return files.filter((file) => {
-                const fileExt = path.extname(file).toLowerCase();
-                return fileExt === '.js' || fileExt === '.ts' || fileExt === '.mjs' || fileExt === 'json';
-            });
-        }
-        function getFileEntry(filename, contents) {
-            return {
-                filePath: path.resolve(filename),
-                keyOnS3: config.configFile
-                    ? (0, openapi_core_1.slash)(path.relative(path.dirname(config.configFile), filename))
-                    : (0, openapi_core_1.slash)(path.basename(filename)),
-                contents: (contents && Buffer.from(contents, 'utf-8')) || undefined,
-            };
-        }
-    });
+    }
 }
 function getFolder(filePath) {
     return path.resolve(path.dirname(filePath));
@@ -246,8 +223,7 @@ function hashFiles(filePaths) {
     return sum.digest('hex');
 }
 function parseDestination(destination) {
-    var _a;
-    return (_a = destination === null || destination === void 0 ? void 0 : destination.match(exports.DESTINATION_REGEX)) === null || _a === void 0 ? void 0 : _a.groups;
+    return destination?.match(exports.DESTINATION_REGEX)?.groups;
 }
 function getDestinationProps(destination, organization) {
     const groups = destination && parseDestination(destination);
@@ -262,10 +238,7 @@ function getDestinationProps(destination, organization) {
         return { organizationId: organization, name: undefined, version: undefined };
     }
 }
-exports.getDestinationProps = getDestinationProps;
-const transformPush = (callback) => (_a, config) => {
-    var _b;
-    var { apis, branch, 'batch-id': batchId, 'job-id': jobId } = _a, rest = __rest(_a, ["apis", "branch", 'batch-id', 'job-id']);
+const transformPush = (callback) => ({ argv: { apis, branch, 'batch-id': batchId, 'job-id': jobId, ...rest }, config, version, }) => {
     const [maybeApiOrDestination, maybeDestination, maybeBranchName] = apis || [];
     if (batchId) {
         process.stderr.write((0, colorette_1.yellow)(`The ${(0, colorette_1.red)('batch-id')} option is deprecated. Please use ${(0, colorette_1.green)('job-id')} instead.\n\n`));
@@ -286,14 +259,23 @@ const transformPush = (callback) => (_a, config) => {
     else if (maybeApiOrDestination && !exports.DESTINATION_REGEX.test(maybeApiOrDestination)) {
         apiFile = maybeApiOrDestination;
     }
-    return callback(Object.assign(Object.assign({}, rest), { destination: (_b = rest.destination) !== null && _b !== void 0 ? _b : destination, api: apiFile, branchName: branch !== null && branch !== void 0 ? branch : maybeBranchName, 'job-id': jobId || batchId }), config);
+    return callback({
+        argv: {
+            ...rest,
+            destination: rest.destination ?? destination,
+            api: apiFile,
+            branchName: branch ?? maybeBranchName,
+            'job-id': jobId || batchId,
+        },
+        config,
+        version,
+    });
 };
 exports.transformPush = transformPush;
 function getApiRoot({ name, version, config: { apis }, }) {
-    const api = (apis === null || apis === void 0 ? void 0 : apis[`${name}@${version}`]) || (version === DEFAULT_VERSION && (apis === null || apis === void 0 ? void 0 : apis[name]));
-    return api === null || api === void 0 ? void 0 : api.root;
+    const api = apis?.[`${name}@${version}`] || (version === DEFAULT_VERSION && apis?.[name]);
+    return api?.root;
 }
-exports.getApiRoot = getApiRoot;
 function uploadFileToS3(url, filePathOrBuffer) {
     const fileSizeInBytes = typeof filePathOrBuffer === 'string'
         ? fs.statSync(filePathOrBuffer).size