@redocly/cli 1.3.0 → 1.4.1

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

@@ -20,7 +20,7 @@ function previewDocs(argv, configFromFile) {
         let isAuthorizedWithRedocly = false;
         let redocOptions = {};
         let config = yield reloadConfig(configFromFile);
-        const apis = yield utils_1.getFallbackApisOrExit(argv.api ? [argv.api] : [], config);
+        const apis = yield (0, utils_1.getFallbackApisOrExit)(argv.api ? [argv.api] : [], config);
         const api = apis[0];
         let cachedBundle;
         const deps = new Set();
@@ -33,7 +33,7 @@ function previewDocs(argv, configFromFile) {
             return __awaiter(this, void 0, void 0, function* () {
                 process.stdout.write('\nBundling...\n\n');
                 try {
-                    const { bundle: openapiBundle, problems, fileDependencies, } = yield openapi_core_1.bundle({
+                    const { bundle: openapiBundle, problems, fileDependencies, } = yield (0, openapi_core_1.bundle)({
                         ref: api.path,
                         config,
                     });
@@ -42,7 +42,7 @@ function previewDocs(argv, configFromFile) {
                     watcher.add([...fileDependencies]);
                     deps.clear();
                     fileDependencies.forEach(deps.add, deps);
-                    const fileTotals = openapi_core_1.getTotals(problems);
+                    const fileTotals = (0, openapi_core_1.getTotals)(problems);
                     if (fileTotals.errors === 0) {
                         process.stdout.write(fileTotals.errors === 0
                             ? `Created a bundle for ${api.alias || api.path} ${fileTotals.warnings > 0 ? 'with warnings' : 'successfully'}\n`
@@ -51,7 +51,7 @@ function previewDocs(argv, configFromFile) {
                     return openapiBundle.parsed;
                 }
                 catch (e) {
-                    utils_1.handleError(e, api.path);
+                    (0, utils_1.handleError)(e, api.path);
                 }
             });
         }
@@ -62,7 +62,7 @@ function previewDocs(argv, configFromFile) {
         if (!isAuthorized) {
             process.stderr.write(`Using Redoc community edition.\nLogin with redocly ${colorette.blue('login')} or use an enterprise license key to preview with the premium docs.\n\n`);
         }
-        const hotClients = yield preview_server_1.default(argv.port, argv.host, {
+        const hotClients = yield (0, preview_server_1.default)(argv.port, argv.host, {
             getBundle,
             getOptions: () => redocOptions,
             useRedocPro: isAuthorized && !redocOptions.useCommunityEdition,
@@ -97,7 +97,7 @@ function previewDocs(argv, configFromFile) {
             return __awaiter(this, void 0, void 0, function* () {
                 if (!config) {
                     try {
-                        config = (yield utils_1.loadConfigAndHandleErrors({ configPath: argv.config }));
+                        config = (yield (0, utils_1.loadConfigAndHandleErrors)({ configPath: argv.config }));
                     }
                     catch (err) {
                         config = new openapi_core_1.Config({ apis: {}, styleguide: {} });
@@ -105,7 +105,7 @@ function previewDocs(argv, configFromFile) {
                 }
                 const redoclyClient = new openapi_core_1.RedoclyClient();
                 isAuthorizedWithRedocly = yield redoclyClient.isAuthorizedWithRedocly();
-                const resolvedConfig = openapi_core_1.getMergedConfig(config, argv.api);
+                const resolvedConfig = (0, openapi_core_1.getMergedConfig)(config, argv.api);
                 const { styleguide } = resolvedConfig;
                 styleguide.skipPreprocessors(argv['skip-preprocessor']);
                 styleguide.skipDecorators(argv['skip-decorator']);

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

@@ -1,13 +1,29 @@
 (function run() {
   const Socket = window.SimpleWebsocket;
   const port = window.__OPENAPI_CLI_WS_PORT;
+  const host = window.__OPENAPI_CLI_WS_HOST;
 
   let socket;
 
   reconnect();
 
+  function getFormattedHost() {
+    // Use localhost when bound to all interfaces
+    if (host === '::' || host === '0.0.0.0') {
+      return 'localhost';
+    }
+
+    // Other IPv6 addresses must be wrapped in brackets
+    if (host.includes('::')) {
+      return `[${host}]`;
+    }
+
+    // Otherwise return as-is
+    return host;
+  }
+
   function reconnect() {
-    socket = new Socket(`ws://127.0.0.1:${port}`);
+    socket = new Socket(`ws://${getFormattedHost()}:${port}`);
     socket.on('connect', () => {
       socket.send('{"type": "ping"}');
     });
@@ -29,13 +45,14 @@
 
     socket.on('close', () => {
       socket.destroy();
-      console.log('Connection lost, trying to reconnect in 4s');
+      console.log('[hot] Connection lost, trying to reconnect in 4s');
       setTimeout(() => {
         reconnect();
       }, 4000);
     });
 
     socket.on('error', () => {
+      console.log('[hot] Error connecting to hot reloading server');
       socket.destroy();
     });
   }

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

@@ -16,18 +16,19 @@ const fs_1 = require("fs");
 const path = require("path");
 const server_1 = require("./server");
 const utils_1 = require("../../../utils");
-function getPageHTML(htmlTemplate, redocOptions = {}, useRedocPro, wsPort) {
-    let templateSrc = fs_1.readFileSync(htmlTemplate, 'utf-8');
+function getPageHTML(htmlTemplate, redocOptions = {}, useRedocPro, wsPort, host) {
+    let templateSrc = (0, fs_1.readFileSync)(htmlTemplate, 'utf-8');
     // fix template for backward compatibility
     templateSrc = templateSrc
         .replace(/{?{{redocHead}}}?/, '{{{redocHead}}}')
         .replace('{{redocBody}}', '{{{redocHTML}}}');
-    const template = handlebars_1.compile(templateSrc);
+    const template = (0, handlebars_1.compile)(templateSrc);
     return template({
         redocHead: `
   <script>
     window.__REDOC_EXPORT = '${useRedocPro ? 'RedoclyReferenceDocs' : 'Redoc'}';
     window.__OPENAPI_CLI_WS_PORT = ${wsPort};
+    window.__OPENAPI_CLI_WS_HOST = "${host}";
   </script>
   <script src="/simplewebsocket.min.js"></script>
   <script src="/hot.js"></script>
@@ -54,14 +55,14 @@ function startPreviewServer(port, host, { getBundle, getOptions, useRedocPro, })
             console.time(colorette.dim(`GET ${request.url}`));
             const { htmlTemplate } = getOptions() || {};
             if (((_a = request.url) === null || _a === void 0 ? void 0 : _a.endsWith('/')) || path.extname(request.url) === '') {
-                server_1.respondWithGzip(getPageHTML(htmlTemplate || defaultTemplate, getOptions(), useRedocPro, wsPort), request, response, {
+                (0, server_1.respondWithGzip)(getPageHTML(htmlTemplate || defaultTemplate, getOptions(), useRedocPro, wsPort, host), request, response, {
                     'Content-Type': 'text/html',
                 });
             }
             else if (request.url === '/openapi.json') {
                 const bundle = yield getBundle();
                 if (bundle === undefined) {
-                    server_1.respondWithGzip(JSON.stringify({
+                    (0, server_1.respondWithGzip)(JSON.stringify({
                         openapi: '3.0.0',
                         info: {
                             description: '<code> Failed to generate bundle: check out console output for more details </code>',
@@ -72,7 +73,7 @@ function startPreviewServer(port, host, { getBundle, getOptions, useRedocPro, })
                     });
                 }
                 else {
-                    server_1.respondWithGzip(JSON.stringify(bundle), request, response, {
+                    (0, server_1.respondWithGzip)(JSON.stringify(bundle), request, response, {
                         'Content-Type': 'application/json',
                     });
                 }
@@ -89,8 +90,8 @@ function startPreviewServer(port, host, { getBundle, getOptions, useRedocPro, })
                 if (!filePath) {
                     const basePath = htmlTemplate ? path.dirname(htmlTemplate) : process.cwd();
                     filePath = path.resolve(basePath, `.${request.url}`);
-                    if (!utils_1.isSubdir(basePath, filePath)) {
-                        server_1.respondWithGzip('404 Not Found', request, response, { 'Content-Type': 'text/html' }, 404);
+                    if (!(0, utils_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;
                     }
@@ -98,27 +99,27 @@ function startPreviewServer(port, host, { getBundle, getOptions, useRedocPro, })
                 const extname = String(path.extname(filePath)).toLowerCase();
                 const contentType = server_1.mimeTypes[extname] || 'application/octet-stream';
                 try {
-                    server_1.respondWithGzip(yield fs_1.promises.readFile(filePath), request, response, {
+                    (0, server_1.respondWithGzip)(yield fs_1.promises.readFile(filePath), request, response, {
                         'Content-Type': contentType,
                     });
                 }
                 catch (e) {
                     if (e.code === 'ENOENT') {
-                        server_1.respondWithGzip('404 Not Found', request, response, { 'Content-Type': 'text/html' }, 404);
+                        (0, server_1.respondWithGzip)('404 Not Found', request, response, { 'Content-Type': 'text/html' }, 404);
                     }
                     else {
-                        server_1.respondWithGzip(`Something went wrong: ${e.code || e.message}...\n`, request, response, {}, 500);
+                        (0, server_1.respondWithGzip)(`Something went wrong: ${e.code || e.message}...\n`, request, response, {}, 500);
                     }
                 }
             }
             console.timeEnd(colorette.dim(`GET ${request.url}`));
         });
-        const wsPort = yield get_port_please_1.getPort({ portRange: [32201, 32301] });
-        const server = server_1.startHttpServer(port, host, handler);
+        const wsPort = yield (0, get_port_please_1.getPort)({ port: 32201, portRange: [32201, 32301], host });
+        const server = (0, server_1.startHttpServer)(port, host, handler);
         server.on('listening', () => {
             process.stdout.write(`\n  🔎  Preview server running at ${colorette.blue(`http://${host}:${port}\n`)}`);
         });
-        return server_1.startWsServer(wsPort);
+        return (0, server_1.startWsServer)(wsPort, host);
     });
 }
 exports.default = startPreviewServer;

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

@@ -1,4 +1,6 @@
 /// <reference types="node" />
+/// <reference types="node" />
+/// <reference types="node" />
 import * as http from 'http';
 import { ReadStream } from 'fs';
 export declare const mimeTypes: {
@@ -20,4 +22,4 @@ export declare const mimeTypes: {
 };
 export declare function respondWithGzip(contents: string | Buffer | ReadStream, request: http.IncomingMessage, response: http.ServerResponse, headers?: {}, code?: number): void;
 export declare function startHttpServer(port: number, host: string, handler: http.RequestListener): http.Server<typeof http.IncomingMessage, typeof http.ServerResponse>;
-export declare function startWsServer(port: number): any;
+export declare function startWsServer(port: number, host: string): any;

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

@@ -58,8 +58,8 @@ function startHttpServer(port, host, handler) {
     return http.createServer(handler).listen(port, host);
 }
 exports.startHttpServer = startHttpServer;
-function startWsServer(port) {
-    const socketServer = new SocketServer({ port, clientTracking: true });
+function startWsServer(port, host) {
+    const socketServer = new SocketServer({ port, host, clientTracking: true });
     socketServer.on('connection', (socket) => {
         socket.on('data', (data) => {
             const message = JSON.parse(data);

package/lib/commands/push.d.ts

@@ -1,6 +1,6 @@
 import { Config, Region } from '@redocly/openapi-core';
 export declare const DESTINATION_REGEX: RegExp;
-export declare type PushOptions = {
+export type PushOptions = {
     api?: string;
     destination?: string;
     branchName?: string;
@@ -20,7 +20,7 @@ export declare function getDestinationProps(destination: string | undefined, org
     name: string | undefined;
     version: string | undefined;
 };
-declare type BarePushArgs = Omit<PushOptions, 'destination' | 'branchName'> & {
+type BarePushArgs = Omit<PushOptions, 'destination' | 'branchName'> & {
     maybeDestination?: string;
     maybeBranchName?: string;
     branch?: string;

package/lib/commands/push.js

@@ -37,7 +37,7 @@ function handlePush(argv, config) {
         const client = new openapi_core_1.RedoclyClient(config.region);
         const isAuthorized = yield client.isAuthorizedWithRedoclyByRegion();
         if (!isAuthorized) {
-            const clientToken = yield login_1.promptClientToken(client.domain);
+            const clientToken = yield (0, login_1.promptClientToken)(client.domain);
             yield client.login(clientToken);
         }
         const startedAt = perf_hooks_1.performance.now();
@@ -45,34 +45,34 @@ function handlePush(argv, config) {
         const jobId = argv['job-id'];
         const batchSize = argv['batch-size'];
         if (destination && !exports.DESTINATION_REGEX.test(destination)) {
-            utils_1.exitWithError(`Destination argument value is not valid, please use the right format: ${colorette_1.yellow('<api-name@api-version>')}`);
+            (0, utils_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 utils_1.exitWithError(`No organization provided, please use --organization option or specify the 'organization' field in the config file.`);
+            return (0, utils_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) {
-            utils_1.exitWithError(`No api found that matches ${colorette_1.blue(`${name}@${version}`)}. Please make sure you have provided the correct data in the config file.`);
+            (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.`);
         }
         // Ensure that a destination for the api is provided.
         if (!name && api) {
-            return utils_1.exitWithError(`No destination provided, please use --destination option to provide destination.`);
+            return (0, utils_1.exitWithError)(`No destination provided, please use --destination option to provide destination.`);
         }
         if (jobId && !jobId.trim()) {
-            utils_1.exitWithError(`The ${colorette_1.blue(`job-id`)} option value is not valid, please avoid using an empty string.`);
+            (0, utils_1.exitWithError)(`The ${(0, colorette_1.blue)(`job-id`)} option value is not valid, please avoid using an empty string.`);
         }
         if (batchSize && batchSize < 2) {
-            utils_1.exitWithError(`The ${colorette_1.blue(`batch-size`)} option value is not valid, please use the integer bigger than 1.`);
+            (0, utils_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) {
-            utils_1.exitWithError(`Api not found. Please make sure you have provided the correct data in the config file.`);
+            (0, utils_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 = openapi_core_1.getMergedConfig(config, apiNameAndVersion);
+            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);
@@ -81,7 +81,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} ${utils_1.pluralize('file', filesToUpload.files.length)}:\n`);
+                process.stdout.write(`Uploading ${filesToUpload.files.length} ${(0, utils_1.pluralize)('file', filesToUpload.files.length)}:\n`);
                 let uploaded = 0;
                 for (const file of filesToUpload.files) {
                     const { signedUploadUrl, filePath } = yield client.registryApi.prepareFileUpload({
@@ -96,13 +96,13 @@ function handlePush(argv, config) {
                         rootFilePath = filePath;
                     }
                     filePaths.push(filePath);
-                    process.stdout.write(`Uploading ${file.contents ? 'bundle for ' : ''}${colorette_1.blue(file.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) {
-                        utils_1.exitWithError(`✗ ${fileCounter}\nFile upload failed\n`);
+                        (0, utils_1.exitWithError)(`✗ ${fileCounter}\nFile upload failed\n`);
                     }
-                    process.stdout.write(colorette_1.green(`✓ ${fileCounter}\n`));
+                    process.stdout.write((0, colorette_1.green)(`✓ ${fileCounter}\n`));
                 }
                 process.stdout.write('\n');
                 yield client.registryApi.pushApi({
@@ -120,16 +120,16 @@ function handlePush(argv, config) {
             }
             catch (error) {
                 if (error.message === 'ORGANIZATION_NOT_FOUND') {
-                    utils_1.exitWithError(`Organization ${colorette_1.blue(organizationId)} not found`);
+                    (0, utils_1.exitWithError)(`Organization ${(0, colorette_1.blue)(organizationId)} not found`);
                 }
                 if (error.message === 'API_VERSION_NOT_FOUND') {
-                    utils_1.exitWithError(`The definition version ${colorette_1.blue(`${name}@${version}`)} does not exist in organization ${colorette_1.blue(organizationId)}!\n${colorette_1.yellow('Suggestion:')} please use ${colorette_1.blue('-u')} or ${colorette_1.blue('--upsert')} to create definition.\n\n`);
+                    (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`);
                 }
                 throw error;
             }
-            process.stdout.write(`Definition: ${colorette_1.blue(api)} is successfully pushed to Redocly API Registry \n`);
+            process.stdout.write(`Definition: ${(0, colorette_1.blue)(api)} is successfully pushed to Redocly API Registry \n`);
         }
-        utils_1.printExecutionTime('push', startedAt, api || `apis in organization ${organizationId}`);
+        (0, utils_1.printExecutionTime)('push', startedAt, api || `apis in organization ${organizationId}`);
     });
 }
 exports.handlePush = handlePush;
@@ -151,22 +151,22 @@ function collectFilesToUpload(api, config) {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
         const files = [];
-        const [{ path: apiPath }] = yield utils_1.getFallbackApisOrExit([api], config);
+        const [{ path: apiPath }] = yield (0, utils_1.getFallbackApisOrExit)([api], config);
         process.stdout.write('Bundling definition\n');
-        const { bundle: openapiBundle, problems } = yield openapi_core_1.bundle({
+        const { bundle: openapiBundle, problems } = yield (0, openapi_core_1.bundle)({
             config,
             ref: apiPath,
             skipRedoclyRegistryRefs: true,
         });
-        const fileTotals = openapi_core_1.getTotals(problems);
+        const fileTotals = (0, openapi_core_1.getTotals)(problems);
         if (fileTotals.errors === 0) {
-            process.stdout.write(`Created a bundle for ${colorette_1.blue(api)} ${fileTotals.warnings > 0 ? 'with warnings' : ''}\n`);
+            process.stdout.write(`Created a bundle for ${(0, colorette_1.blue)(api)} ${fileTotals.warnings > 0 ? 'with warnings' : ''}\n`);
         }
         else {
-            utils_1.exitWithError(`Failed to create a bundle for ${colorette_1.blue(api)}\n`);
+            (0, utils_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, utils_1.dumpBundle(openapiBundle.parsed, fileExt)));
+        files.push(getFileEntry(apiPath, (0, utils_1.dumpBundle)(openapiBundle.parsed, fileExt)));
         if (fs.existsSync('package.json')) {
             files.push(getFileEntry('package.json'));
         }
@@ -217,8 +217,8 @@ function collectFilesToUpload(api, config) {
             return {
                 filePath: path.resolve(filename),
                 keyOnS3: config.configFile
-                    ? openapi_core_1.slash(path.relative(path.dirname(config.configFile), filename))
-                    : openapi_core_1.slash(path.basename(filename)),
+                    ? (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,
             };
         }
@@ -228,7 +228,7 @@ function getFolder(filePath) {
     return path.resolve(path.dirname(filePath));
 }
 function hashFiles(filePaths) {
-    const sum = crypto_1.createHash('sha256');
+    const sum = (0, crypto_1.createHash)('sha256');
     filePaths.forEach((file) => sum.update(fs.readFileSync(file.filePath)));
     return sum.digest('hex');
 }
@@ -253,19 +253,19 @@ exports.getDestinationProps = getDestinationProps;
 const transformPush = (callback) => (_a, config) => {
     var { api: maybeApiOrDestination, maybeDestination, maybeBranchName, branch, 'batch-id': batchId, 'job-id': jobId } = _a, rest = __rest(_a, ["api", "maybeDestination", "maybeBranchName", "branch", 'batch-id', 'job-id']);
     if (batchId) {
-        process.stderr.write(colorette_1.yellow(`The ${colorette_1.red('batch-id')} option is deprecated. Please use ${colorette_1.green('job-id')} instead.\n\n`));
+        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`));
     }
     if (maybeBranchName) {
-        process.stderr.write(colorette_1.yellow('Deprecation warning: Do not use the third parameter as a branch name. Please use a separate --branch option instead.\n\n'));
+        process.stderr.write((0, colorette_1.yellow)('Deprecation warning: Do not use the third parameter as a branch name. Please use a separate --branch option instead.\n\n'));
     }
     let apiFile, destination;
     if (maybeDestination) {
-        process.stderr.write(colorette_1.yellow('Deprecation warning: Do not use the second parameter as a destination. Please use a separate --destination and --organization instead.\n\n'));
+        process.stderr.write((0, colorette_1.yellow)('Deprecation warning: Do not use the second parameter as a destination. Please use a separate --destination and --organization instead.\n\n'));
         apiFile = maybeApiOrDestination;
         destination = maybeDestination;
     }
     else if (maybeApiOrDestination && exports.DESTINATION_REGEX.test(maybeApiOrDestination)) {
-        process.stderr.write(colorette_1.yellow('Deprecation warning: Do not use the first parameter as a destination. Please use a separate --destination and --organization options instead.\n\n'));
+        process.stderr.write((0, colorette_1.yellow)('Deprecation warning: Do not use the first parameter as a destination. Please use a separate --destination and --organization options instead.\n\n'));
         destination = maybeApiOrDestination;
     }
     else if (maybeApiOrDestination && !exports.DESTINATION_REGEX.test(maybeApiOrDestination)) {
@@ -285,7 +285,7 @@ function uploadFileToS3(url, filePathOrBuffer) {
         ? fs.statSync(filePathOrBuffer).size
         : filePathOrBuffer.byteLength;
     const readStream = typeof filePathOrBuffer === 'string' ? fs.createReadStream(filePathOrBuffer) : filePathOrBuffer;
-    return node_fetch_1.default(url, {
+    return (0, node_fetch_1.default)(url, {
         method: 'PUT',
         headers: {
             'Content-Length': fileSizeInBytes.toString(),

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

@@ -14,7 +14,7 @@ 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')), { writeYaml: jest.fn() })));
+jest.mock('../../../utils', () => (Object.assign(Object.assign({}, jest.requireActual('../../../utils')), { 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';
@@ -22,20 +22,20 @@ describe('#split', () => {
     it('should split the file and show the success message', () => __awaiter(void 0, void 0, void 0, function* () {
         const filePath = 'packages/cli/src/commands/split/__tests__/fixtures/spec.json';
         jest.spyOn(process.stderr, 'write').mockImplementation(() => true);
-        yield index_1.handleSplit({
+        yield (0, index_1.handleSplit)({
             api: filePath,
             outDir: openapiDir,
             separator: '_',
         });
         expect(process.stderr.write).toBeCalledTimes(2);
-        expect(process.stderr.write.mock.calls[0][0]).toBe(`🪓 Document: ${colorette_1.blue(filePath)} ${colorette_1.green('is successfully split')}
-    and all related files are saved to the directory: ${colorette_1.blue(openapiDir)} \n`);
+        expect(process.stderr.write.mock.calls[0][0]).toBe(`🪓 Document: ${(0, colorette_1.blue)(filePath)} ${(0, colorette_1.green)('is successfully split')}
+    and all related files are saved to the directory: ${(0, colorette_1.blue)(openapiDir)} \n`);
         expect(process.stderr.write.mock.calls[1][0]).toContain(`${filePath}: split processed in <test>ms`);
     }));
     it('should use the correct separator', () => __awaiter(void 0, void 0, void 0, function* () {
         const filePath = 'packages/cli/src/commands/split/__tests__/fixtures/spec.json';
         jest.spyOn(utils, 'pathToFilename').mockImplementation(() => 'newFilePath');
-        yield index_1.handleSplit({
+        yield (0, index_1.handleSplit)({
             api: filePath,
             outDir: openapiDir,
             separator: '_',
@@ -47,7 +47,7 @@ describe('#split', () => {
         const openapi = require('./fixtures/spec.json');
         jest.spyOn(openapiCore, 'slash').mockImplementation(() => 'paths/test.yaml');
         jest.spyOn(path, 'relative').mockImplementation(() => 'paths/test.yaml');
-        index_1.iteratePathItems(openapi.paths, openapiDir, path.join(openapiDir, 'paths'), componentsFiles, '_');
+        (0, index_1.iteratePathItems)(openapi.paths, openapiDir, path.join(openapiDir, 'paths'), componentsFiles, '_', undefined, 'yaml');
         expect(openapiCore.slash).toHaveBeenCalledWith('paths/test.yaml');
         expect(path.relative).toHaveBeenCalledWith('test', 'test/paths/test.yaml');
     });
@@ -55,7 +55,7 @@ describe('#split', () => {
         const openapi = require('./fixtures/webhooks.json');
         jest.spyOn(openapiCore, 'slash').mockImplementation(() => 'webhooks/test.yaml');
         jest.spyOn(path, 'relative').mockImplementation(() => 'webhooks/test.yaml');
-        index_1.iteratePathItems(openapi.webhooks, openapiDir, path.join(openapiDir, 'webhooks'), componentsFiles, 'webhook_');
+        (0, index_1.iteratePathItems)(openapi.webhooks, openapiDir, path.join(openapiDir, 'webhooks'), componentsFiles, 'webhook_', undefined, 'yaml');
         expect(openapiCore.slash).toHaveBeenCalledWith('webhooks/test.yaml');
         expect(path.relative).toHaveBeenCalledWith('test', 'test/webhooks/test.yaml');
     });
@@ -63,7 +63,7 @@ describe('#split', () => {
         const openapi = require('./fixtures/spec.json');
         jest.spyOn(openapiCore, 'slash').mockImplementation(() => 'webhooks/test.yaml');
         jest.spyOn(path, 'relative').mockImplementation(() => 'webhooks/test.yaml');
-        index_1.iteratePathItems(openapi['x-webhooks'], openapiDir, path.join(openapiDir, 'webhooks'), componentsFiles, 'webhook_');
+        (0, index_1.iteratePathItems)(openapi['x-webhooks'], openapiDir, path.join(openapiDir, 'webhooks'), componentsFiles, 'webhook_', undefined, 'yaml');
         expect(openapiCore.slash).toHaveBeenCalledWith('webhooks/test.yaml');
         expect(path.relative).toHaveBeenCalledWith('test', 'test/webhooks/test.yaml');
     });
@@ -72,7 +72,7 @@ describe('#split', () => {
         const fs = require('fs');
         jest.spyOn(fs, 'writeFileSync').mockImplementation(() => { });
         jest.spyOn(utils, 'escapeLanguageName');
-        index_1.iteratePathItems(openapi.paths, openapiDir, path.join(openapiDir, 'paths'), componentsFiles, '_');
+        (0, index_1.iteratePathItems)(openapi.paths, openapiDir, path.join(openapiDir, 'paths'), componentsFiles, '_', undefined, 'yaml');
         expect(utils.escapeLanguageName).nthCalledWith(1, 'C#');
         expect(utils.escapeLanguageName).nthReturnedWith(1, 'C_sharp');
         expect(utils.escapeLanguageName).nthCalledWith(2, 'C/AL');

package/lib/commands/split/index.d.ts

@@ -1,10 +1,10 @@
 import { Oas3PathItem, Referenced } from './types';
-export declare type SplitOptions = {
+export type SplitOptions = {
     api: string;
     outDir: string;
     separator: string;
     config?: string;
 };
 export declare function handleSplit(argv: SplitOptions): Promise<void>;
-declare function iteratePathItems(pathItems: Record<string, Referenced<Oas3PathItem>> | undefined, openapiDir: string, outDir: string, componentsFiles: object, pathSeparator: string, codeSamplesPathPrefix?: string): void;
+declare function iteratePathItems(pathItems: Record<string, Referenced<Oas3PathItem>> | undefined, openapiDir: string, outDir: string, componentsFiles: object, pathSeparator: string, codeSamplesPathPrefix: string | undefined, ext: string): void;
 export { iteratePathItems };