@redocly/cli 1.3.0 → 1.4.0

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 };

package/lib/commands/split/index.js

@@ -24,24 +24,25 @@ function handleSplit(argv) {
         const startedAt = perf_hooks_1.performance.now();
         const { api, outDir, separator } = argv;
         validateDefinitionFileName(api);
-        const openapi = utils_1.readYaml(api);
-        splitDefinition(openapi, outDir, separator);
-        process.stderr.write(`🪓 Document: ${colorette_1.blue(api)} ${colorette_1.green('is successfully split')}
-    and all related files are saved to the directory: ${colorette_1.blue(outDir)} \n`);
-        utils_1.printExecutionTime('split', startedAt, api);
+        const ext = (0, utils_1.getAndValidateFileExtension)(api);
+        const openapi = (0, utils_1.readYaml)(api);
+        splitDefinition(openapi, outDir, separator, ext);
+        process.stderr.write(`🪓 Document: ${(0, colorette_1.blue)(api)} ${(0, colorette_1.green)('is successfully split')}
+    and all related files are saved to the directory: ${(0, colorette_1.blue)(outDir)} \n`);
+        (0, utils_1.printExecutionTime)('split', startedAt, api);
     });
 }
 exports.handleSplit = handleSplit;
-function splitDefinition(openapi, openapiDir, pathSeparator) {
+function splitDefinition(openapi, openapiDir, pathSeparator, ext) {
     fs.mkdirSync(openapiDir, { recursive: true });
     const componentsFiles = {};
-    iterateComponents(openapi, openapiDir, componentsFiles);
-    iteratePathItems(openapi.paths, openapiDir, path.join(openapiDir, 'paths'), componentsFiles, pathSeparator);
+    iterateComponents(openapi, openapiDir, componentsFiles, ext);
+    iteratePathItems(openapi.paths, openapiDir, path.join(openapiDir, 'paths'), componentsFiles, pathSeparator, undefined, ext);
     const webhooks = openapi.webhooks || openapi['x-webhooks'];
     // use webhook_ prefix for code samples to prevent potential name-clashes with paths samples
-    iteratePathItems(webhooks, openapiDir, path.join(openapiDir, 'webhooks'), componentsFiles, pathSeparator, 'webhook_');
+    iteratePathItems(webhooks, openapiDir, path.join(openapiDir, 'webhooks'), componentsFiles, pathSeparator, 'webhook_', ext);
     replace$Refs(openapi, openapiDir, componentsFiles);
-    utils_1.writeYaml(openapi, path.join(openapiDir, 'openapi.yaml'));
+    (0, utils_1.writeToFileByExtension)(openapi, path.join(openapiDir, `openapi.${ext}`));
 }
 function isStartsWithComponents(node) {
     return node.startsWith(types_1.componentsPath);
@@ -51,20 +52,20 @@ function isNotYaml(filename) {
 }
 function loadFile(fileName) {
     try {
-        return openapi_core_1.parseYaml(fs.readFileSync(fileName, 'utf8'));
+        return (0, openapi_core_1.parseYaml)(fs.readFileSync(fileName, 'utf8'));
     }
     catch (e) {
-        return utils_1.exitWithError(e.message);
+        return (0, utils_1.exitWithError)(e.message);
     }
 }
 function validateDefinitionFileName(fileName) {
     if (!fs.existsSync(fileName))
-        utils_1.exitWithError(`File ${colorette_1.blue(fileName)} does not exist \n`);
+        (0, utils_1.exitWithError)(`File ${(0, colorette_1.blue)(fileName)} does not exist \n`);
     const file = loadFile(fileName);
     if (file.swagger)
-        utils_1.exitWithError('OpenAPI 2 is not supported by this command');
+        (0, utils_1.exitWithError)('OpenAPI 2 is not supported by this command');
     if (!file.openapi)
-        utils_1.exitWithError('File does not conform to the OpenAPI Specification. OpenAPI version is not specified');
+        (0, utils_1.exitWithError)('File does not conform to the OpenAPI Specification. OpenAPI version is not specified');
     return true;
 }
 function traverseDirectoryDeep(directory, callback, componentsFiles) {
@@ -84,12 +85,12 @@ function traverseDirectoryDeep(directory, callback, componentsFiles) {
 function traverseDirectoryDeepCallback(filename, directory, componentsFiles) {
     if (isNotYaml(filename))
         return;
-    const pathData = utils_1.readYaml(filename);
+    const pathData = (0, utils_1.readYaml)(filename);
     replace$Refs(pathData, directory, componentsFiles);
-    utils_1.writeYaml(pathData, filename);
+    (0, utils_1.writeToFileByExtension)(pathData, filename);
 }
 function crawl(object, visitor) {
-    if (!js_utils_1.isObject(object))
+    if (!(0, js_utils_1.isObject)(object))
         return;
     for (const key of Object.keys(object)) {
         visitor(object, key);
@@ -98,15 +99,15 @@ function crawl(object, visitor) {
 }
 function replace$Refs(obj, relativeFrom, componentFiles = {}) {
     crawl(obj, (node) => {
-        if (node.$ref && js_utils_1.isString(node.$ref) && isStartsWithComponents(node.$ref)) {
+        if (node.$ref && (0, js_utils_1.isString)(node.$ref) && isStartsWithComponents(node.$ref)) {
             replace(node, '$ref');
         }
         else if (node.discriminator &&
             node.discriminator.mapping &&
-            js_utils_1.isObject(node.discriminator.mapping)) {
+            (0, js_utils_1.isObject)(node.discriminator.mapping)) {
             const { mapping } = node.discriminator;
             for (const name of Object.keys(mapping)) {
-                if (js_utils_1.isString(mapping[name]) && isStartsWithComponents(mapping[name])) {
+                if ((0, js_utils_1.isString)(mapping[name]) && isStartsWithComponents(mapping[name])) {
                     replace(node.discriminator.mapping, name);
                 }
             }
@@ -137,7 +138,7 @@ function implicitlyReferenceDiscriminator(obj, defName, filename, schemaFiles) {
             implicitMapping[name] = res.startsWith('.') ? res : '.' + path.sep + res;
         }
     }
-    if (js_utils_1.isEmptyObject(implicitMapping))
+    if ((0, js_utils_1.isEmptyObject)(implicitMapping))
         return;
     const discriminatorPropSchema = obj.properties[obj.discriminator.propertyName];
     const discriminatorEnum = discriminatorPropSchema && discriminatorPropSchema.enum;
@@ -147,7 +148,7 @@ function implicitlyReferenceDiscriminator(obj, defName, filename, schemaFiles) {
             continue;
         }
         if (mapping[name] && mapping[name] !== implicitMapping[name]) {
-            process.stderr.write(colorette_1.yellow(`warning: explicit mapping overlaps with local mapping entry ${colorette_1.red(name)} at ${colorette_1.blue(filename)}. Please check it.`));
+            process.stderr.write((0, colorette_1.yellow)(`warning: explicit mapping overlaps with local mapping entry ${(0, colorette_1.red)(name)} at ${(0, colorette_1.blue)(filename)}. Please check it.`));
         }
         mapping[name] = implicitMapping[name];
     }
@@ -159,13 +160,13 @@ function findComponentTypes(components) {
     return types_1.OPENAPI3_COMPONENT_NAMES.filter((item) => isNotSecurityComponentType(item) && Object.keys(components).includes(item));
 }
 function doesFileDiffer(filename, componentData) {
-    return fs.existsSync(filename) && !isEqual(utils_1.readYaml(filename), componentData);
+    return fs.existsSync(filename) && !isEqual((0, utils_1.readYaml)(filename), componentData);
 }
 function removeEmptyComponents(openapi, componentType) {
-    if (openapi.components && js_utils_1.isEmptyObject(openapi.components[componentType])) {
+    if (openapi.components && (0, js_utils_1.isEmptyObject)(openapi.components[componentType])) {
         delete openapi.components[componentType];
     }
-    if (js_utils_1.isEmptyObject(openapi.components)) {
+    if ((0, js_utils_1.isEmptyObject)(openapi.components)) {
         delete openapi.components;
     }
 }
@@ -177,8 +178,8 @@ function createComponentDir(componentDirPath, componentType) {
 function extractFileNameFromPath(filename) {
     return path.basename(filename, path.extname(filename));
 }
-function getFileNamePath(componentDirPath, componentName) {
-    return path.join(componentDirPath, componentName) + '.yaml';
+function getFileNamePath(componentDirPath, componentName, ext) {
+    return path.join(componentDirPath, componentName) + `.${ext}`;
 }
 function gatherComponentsFiles(components, componentsFiles, componentType, componentName, filename) {
     var _a, _b;
@@ -191,14 +192,14 @@ function gatherComponentsFiles(components, componentsFiles, componentType, compo
     componentsFiles[componentType] = componentsFiles[componentType] || {};
     componentsFiles[componentType][componentName] = { inherits, filename };
 }
-function iteratePathItems(pathItems, openapiDir, outDir, componentsFiles, pathSeparator, codeSamplesPathPrefix = '') {
+function iteratePathItems(pathItems, openapiDir, outDir, componentsFiles, pathSeparator, codeSamplesPathPrefix = '', ext) {
     if (!pathItems)
         return;
     fs.mkdirSync(outDir, { recursive: true });
     for (const pathName of Object.keys(pathItems)) {
-        const pathFile = `${path.join(outDir, utils_1.pathToFilename(pathName, pathSeparator))}.yaml`;
+        const pathFile = `${path.join(outDir, (0, utils_1.pathToFilename)(pathName, pathSeparator))}.${ext}`;
         const pathData = pathItems[pathName];
-        if (openapi_core_1.isRef(pathData))
+        if ((0, openapi_core_1.isRef)(pathData))
             continue;
         for (const method of types_1.OPENAPI3_METHOD_NAMES) {
             const methodData = pathData[method];
@@ -209,25 +210,25 @@ function iteratePathItems(pathItems, openapiDir, outDir, componentsFiles, pathSe
             for (const sample of methodDataXCode) {
                 if (sample.source && sample.source.$ref)
                     continue;
-                const sampleFileName = path.join(openapiDir, 'code_samples', utils_1.escapeLanguageName(sample.lang), codeSamplesPathPrefix + utils_1.pathToFilename(pathName, pathSeparator), method + utils_1.langToExt(sample.lang));
+                const sampleFileName = path.join(openapiDir, 'code_samples', (0, utils_1.escapeLanguageName)(sample.lang), codeSamplesPathPrefix + (0, utils_1.pathToFilename)(pathName, pathSeparator), method + (0, utils_1.langToExt)(sample.lang));
                 fs.mkdirSync(path.dirname(sampleFileName), { recursive: true });
                 fs.writeFileSync(sampleFileName, sample.source);
                 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
                 // @ts-ignore
                 sample.source = {
-                    $ref: openapi_core_1.slash(path.relative(outDir, sampleFileName)),
+                    $ref: (0, openapi_core_1.slash)(path.relative(outDir, sampleFileName)),
                 };
             }
         }
-        utils_1.writeYaml(pathData, pathFile);
+        (0, utils_1.writeToFileByExtension)(pathData, pathFile);
         pathItems[pathName] = {
-            $ref: openapi_core_1.slash(path.relative(openapiDir, pathFile)),
+            $ref: (0, openapi_core_1.slash)(path.relative(openapiDir, pathFile)),
         };
         traverseDirectoryDeep(outDir, traverseDirectoryDeepCallback, componentsFiles);
     }
 }
 exports.iteratePathItems = iteratePathItems;
-function iterateComponents(openapi, openapiDir, componentsFiles) {
+function iterateComponents(openapi, openapiDir, componentsFiles, ext) {
     const { components } = openapi;
     if (components) {
         const componentsDir = path.join(openapiDir, types_1.COMPONENTS);
@@ -239,7 +240,7 @@ function iterateComponents(openapi, openapiDir, componentsFiles) {
         function iterateAndGatherComponentsFiles(componentType) {
             const componentDirPath = path.join(componentsDir, componentType);
             for (const componentName of Object.keys((components === null || components === void 0 ? void 0 : components[componentType]) || {})) {
-                const filename = getFileNamePath(componentDirPath, componentName);
+                const filename = getFileNamePath(componentDirPath, componentName, ext);
                 gatherComponentsFiles(components, componentsFiles, componentType, componentName, filename);
             }
         }
@@ -249,15 +250,15 @@ function iterateComponents(openapi, openapiDir, componentsFiles) {
             const componentDirPath = path.join(componentsDir, componentType);
             createComponentDir(componentDirPath, componentType);
             for (const componentName of Object.keys((components === null || components === void 0 ? void 0 : components[componentType]) || {})) {
-                const filename = getFileNamePath(componentDirPath, componentName);
+                const filename = getFileNamePath(componentDirPath, componentName, ext);
                 const componentData = (_a = components === null || components === void 0 ? void 0 : components[componentType]) === null || _a === void 0 ? void 0 : _a[componentName];
                 replace$Refs(componentData, path.dirname(filename), componentsFiles);
                 implicitlyReferenceDiscriminator(componentData, extractFileNameFromPath(filename), filename, componentsFiles.schemas || {});
                 if (doesFileDiffer(filename, componentData)) {
-                    process.stderr.write(colorette_1.yellow(`warning: conflict for ${componentName} - file already exists with different content: ${colorette_1.blue(filename)} ... Skip.\n`));
+                    process.stderr.write((0, colorette_1.yellow)(`warning: conflict for ${componentName} - file already exists with different content: ${(0, colorette_1.blue)(filename)} ... Skip.\n`));
                 }
                 else {
-                    utils_1.writeYaml(componentData, filename);
+                    (0, utils_1.writeToFileByExtension)(componentData, filename);
                 }
                 if (isNotSecurityComponentType(componentType)) {
                     // security schemas must referenced from components

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

@@ -1,6 +1,6 @@
 import { Oas3Schema, Oas3_1Schema, Oas3Definition, Oas3_1Definition, Oas3Components, Oas3PathItem, Oas3Paths, Oas3ComponentName, Oas3_1Webhooks, Oas2Definition, Referenced } from '@redocly/openapi-core';
 export { Oas3_1Definition, Oas3Definition, Oas2Definition, Oas3Components, Oas3Paths, Oas3PathItem, Oas3ComponentName, Oas3_1Schema, Oas3Schema, Oas3_1Webhooks, Referenced, };
-export declare type Definition = Oas3_1Definition | Oas3Definition | Oas2Definition;
+export type Definition = Oas3_1Definition | Oas3Definition | Oas2Definition;
 export interface ComponentsFiles {
     [schemas: string]: any;
 }
@@ -11,7 +11,7 @@ export declare const COMPONENTS = "components";
 export declare const PATHS = "paths";
 export declare const WEBHOOKS = "webhooks";
 export declare const xWEBHOOKS = "x-webhooks";
-export declare const componentsPath: string;
+export declare const componentsPath = "#/components/";
 export declare enum OPENAPI3_METHOD {
     get = "get",
     put = "put",

package/lib/commands/split/types.js

@@ -16,7 +16,7 @@ var OPENAPI3_METHOD;
     OPENAPI3_METHOD["head"] = "head";
     OPENAPI3_METHOD["patch"] = "patch";
     OPENAPI3_METHOD["trace"] = "trace";
-})(OPENAPI3_METHOD = exports.OPENAPI3_METHOD || (exports.OPENAPI3_METHOD = {}));
+})(OPENAPI3_METHOD || (exports.OPENAPI3_METHOD = OPENAPI3_METHOD = {}));
 exports.OPENAPI3_METHOD_NAMES = [
     OPENAPI3_METHOD.get,
     OPENAPI3_METHOD.put,
@@ -38,7 +38,7 @@ var OPENAPI3_COMPONENT;
     OPENAPI3_COMPONENT["Links"] = "links";
     OPENAPI3_COMPONENT["Callbacks"] = "callbacks";
     OPENAPI3_COMPONENT["SecuritySchemes"] = "securitySchemes";
-})(OPENAPI3_COMPONENT = exports.OPENAPI3_COMPONENT || (exports.OPENAPI3_COMPONENT = {}));
+})(OPENAPI3_COMPONENT || (exports.OPENAPI3_COMPONENT = OPENAPI3_COMPONENT = {}));
 exports.OPENAPI3_COMPONENT_NAMES = [
     OPENAPI3_COMPONENT.RequestBodies,
     OPENAPI3_COMPONENT.Schemas,

package/lib/commands/stats.d.ts

@@ -1,6 +1,6 @@
 import { Config } from '@redocly/openapi-core';
 import type { OutputFormat } from '@redocly/openapi-core';
-export declare type StatsOptions = {
+export type StatsOptions = {
     api?: string;
     format: OutputFormat;
     config?: string;

package/lib/commands/stats.js

@@ -54,31 +54,31 @@ function printStats(statsAccumulator, api, format) {
 }
 function handleStats(argv, config) {
     return __awaiter(this, void 0, void 0, function* () {
-        const [{ path }] = yield utils_1.getFallbackApisOrExit(argv.api ? [argv.api] : [], config);
+        const [{ path }] = yield (0, utils_1.getFallbackApisOrExit)(argv.api ? [argv.api] : [], config);
         const externalRefResolver = new openapi_core_1.BaseResolver(config.resolve);
-        const { bundle: document } = yield openapi_core_1.bundle({ config, ref: path });
+        const { bundle: document } = yield (0, openapi_core_1.bundle)({ config, ref: path });
         const lintConfig = config.styleguide;
-        const specVersion = openapi_core_1.detectSpec(document.parsed);
-        const types = openapi_core_1.normalizeTypes(lintConfig.extendTypes(openapi_core_1.getTypes(specVersion), specVersion), lintConfig);
+        const specVersion = (0, openapi_core_1.detectSpec)(document.parsed);
+        const types = (0, openapi_core_1.normalizeTypes)(lintConfig.extendTypes((0, openapi_core_1.getTypes)(specVersion), specVersion), lintConfig);
         const startedAt = perf_hooks_1.performance.now();
         const ctx = {
             problems: [],
             oasVersion: specVersion,
             visitorsData: {},
         };
-        const resolvedRefMap = yield openapi_core_1.resolveDocument({
+        const resolvedRefMap = yield (0, openapi_core_1.resolveDocument)({
             rootDocument: document,
             rootType: types.Root,
             externalRefResolver,
         });
-        const statsVisitor = openapi_core_1.normalizeVisitors([
+        const statsVisitor = (0, openapi_core_1.normalizeVisitors)([
             {
                 severity: 'warn',
                 ruleId: 'stats',
-                visitor: openapi_core_1.Stats(statsAccumulator),
+                visitor: (0, openapi_core_1.Stats)(statsAccumulator),
             },
         ], types);
-        openapi_core_1.walkDocument({
+        (0, openapi_core_1.walkDocument)({
             document,
             rootType: types.Root,
             normalizedVisitors: statsVisitor,
@@ -86,7 +86,7 @@ function handleStats(argv, config) {
             ctx,
         });
         printStats(statsAccumulator, path, argv.format);
-        utils_2.printExecutionTime('stats', startedAt, path);
+        (0, utils_2.printExecutionTime)('stats', startedAt, path);
     });
 }
 exports.handleStats = handleStats;