@redocly/cli 1.6.0 → 1.8.0

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

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

package/lib/commands/split/index.js

@@ -16,20 +16,20 @@ const openapi_core_1 = require("@redocly/openapi-core");
 const path = require("path");
 const perf_hooks_1 = require("perf_hooks");
 const isEqual = require('lodash.isequal');
-const utils_1 = require("../../utils");
-const js_utils_1 = require("../../js-utils");
+const miscellaneous_1 = require("../../utils/miscellaneous");
+const js_utils_1 = require("../../utils/js-utils");
 const types_1 = require("./types");
 function handleSplit(argv) {
     return __awaiter(this, void 0, void 0, function* () {
         const startedAt = perf_hooks_1.performance.now();
         const { api, outDir, separator } = argv;
         validateDefinitionFileName(api);
-        const ext = (0, utils_1.getAndValidateFileExtension)(api);
-        const openapi = (0, utils_1.readYaml)(api);
+        const ext = (0, miscellaneous_1.getAndValidateFileExtension)(api);
+        const openapi = (0, miscellaneous_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);
+        (0, miscellaneous_1.printExecutionTime)('split', startedAt, api);
     });
 }
 exports.handleSplit = handleSplit;
@@ -42,30 +42,30 @@ function splitDefinition(openapi, openapiDir, pathSeparator, ext) {
     // use webhook_ prefix for code samples to prevent potential name-clashes with paths samples
     iteratePathItems(webhooks, openapiDir, path.join(openapiDir, 'webhooks'), componentsFiles, pathSeparator, 'webhook_', ext);
     replace$Refs(openapi, openapiDir, componentsFiles);
-    (0, utils_1.writeToFileByExtension)(openapi, path.join(openapiDir, `openapi.${ext}`));
+    (0, miscellaneous_1.writeToFileByExtension)(openapi, path.join(openapiDir, `openapi.${ext}`));
 }
 function isStartsWithComponents(node) {
     return node.startsWith(types_1.componentsPath);
 }
-function isNotYaml(filename) {
-    return !(filename.endsWith('.yaml') || filename.endsWith('.yml'));
+function isSupportedExtension(filename) {
+    return filename.endsWith('.yaml') || filename.endsWith('.yml') || filename.endsWith('.json');
 }
 function loadFile(fileName) {
     try {
         return (0, openapi_core_1.parseYaml)(fs.readFileSync(fileName, 'utf8'));
     }
     catch (e) {
-        return (0, utils_1.exitWithError)(e.message);
+        return (0, miscellaneous_1.exitWithError)(e.message);
     }
 }
 function validateDefinitionFileName(fileName) {
     if (!fs.existsSync(fileName))
-        (0, utils_1.exitWithError)(`File ${(0, colorette_1.blue)(fileName)} does not exist \n`);
+        (0, miscellaneous_1.exitWithError)(`File ${(0, colorette_1.blue)(fileName)} does not exist \n`);
     const file = loadFile(fileName);
     if (file.swagger)
-        (0, utils_1.exitWithError)('OpenAPI 2 is not supported by this command');
+        (0, miscellaneous_1.exitWithError)('OpenAPI 2 is not supported by this command');
     if (!file.openapi)
-        (0, utils_1.exitWithError)('File does not conform to the OpenAPI Specification. OpenAPI version is not specified');
+        (0, miscellaneous_1.exitWithError)('File does not conform to the OpenAPI Specification. OpenAPI version is not specified');
     return true;
 }
 function traverseDirectoryDeep(directory, callback, componentsFiles) {
@@ -83,11 +83,11 @@ function traverseDirectoryDeep(directory, callback, componentsFiles) {
     }
 }
 function traverseDirectoryDeepCallback(filename, directory, componentsFiles) {
-    if (isNotYaml(filename))
+    if (!isSupportedExtension(filename))
         return;
-    const pathData = (0, utils_1.readYaml)(filename);
+    const pathData = (0, miscellaneous_1.readYaml)(filename);
     replace$Refs(pathData, directory, componentsFiles);
-    (0, utils_1.writeToFileByExtension)(pathData, filename);
+    (0, miscellaneous_1.writeToFileByExtension)(pathData, filename);
 }
 function crawl(object, visitor) {
     if (!(0, js_utils_1.isObject)(object))
@@ -160,7 +160,7 @@ 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((0, utils_1.readYaml)(filename), componentData);
+    return fs.existsSync(filename) && !isEqual((0, miscellaneous_1.readYaml)(filename), componentData);
 }
 function removeEmptyComponents(openapi, componentType) {
     if (openapi.components && (0, js_utils_1.isEmptyObject)(openapi.components[componentType])) {
@@ -197,7 +197,7 @@ function iteratePathItems(pathItems, openapiDir, outDir, componentsFiles, pathSe
         return;
     fs.mkdirSync(outDir, { recursive: true });
     for (const pathName of Object.keys(pathItems)) {
-        const pathFile = `${path.join(outDir, (0, utils_1.pathToFilename)(pathName, pathSeparator))}.${ext}`;
+        const pathFile = `${path.join(outDir, (0, miscellaneous_1.pathToFilename)(pathName, pathSeparator))}.${ext}`;
         const pathData = pathItems[pathName];
         if ((0, openapi_core_1.isRef)(pathData))
             continue;
@@ -210,7 +210,7 @@ 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', (0, utils_1.escapeLanguageName)(sample.lang), codeSamplesPathPrefix + (0, utils_1.pathToFilename)(pathName, pathSeparator), method + (0, utils_1.langToExt)(sample.lang));
+                const sampleFileName = path.join(openapiDir, 'code_samples', (0, miscellaneous_1.escapeLanguageName)(sample.lang), codeSamplesPathPrefix + (0, miscellaneous_1.pathToFilename)(pathName, pathSeparator), method + (0, miscellaneous_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
@@ -220,7 +220,7 @@ function iteratePathItems(pathItems, openapiDir, outDir, componentsFiles, pathSe
                 };
             }
         }
-        (0, utils_1.writeToFileByExtension)(pathData, pathFile);
+        (0, miscellaneous_1.writeToFileByExtension)(pathData, pathFile);
         pathItems[pathName] = {
             $ref: (0, openapi_core_1.slash)(path.relative(openapiDir, pathFile)),
         };
@@ -258,7 +258,7 @@ function iterateComponents(openapi, openapiDir, componentsFiles, ext) {
                     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 {
-                    (0, utils_1.writeToFileByExtension)(componentData, filename);
+                    (0, miscellaneous_1.writeToFileByExtension)(componentData, filename);
                 }
                 if (isNotSecurityComponentType(componentType)) {
                     // security schemas must referenced from components

package/lib/commands/stats.js

@@ -13,8 +13,8 @@ exports.handleStats = void 0;
 const perf_hooks_1 = require("perf_hooks");
 const colors = require("colorette");
 const openapi_core_1 = require("@redocly/openapi-core");
-const utils_1 = require("../utils");
-const utils_2 = require("../utils");
+const miscellaneous_1 = require("../utils/miscellaneous");
+const miscellaneous_2 = require("../utils/miscellaneous");
 const statsAccumulator = {
     refs: { metric: '🚗 References', total: 0, color: 'red', items: new Set() },
     externalDocs: { metric: '📦 External Documents', total: 0, color: 'magenta' },
@@ -54,7 +54,7 @@ function printStats(statsAccumulator, api, format) {
 }
 function handleStats(argv, config) {
     return __awaiter(this, void 0, void 0, function* () {
-        const [{ path }] = yield (0, utils_1.getFallbackApisOrExit)(argv.api ? [argv.api] : [], config);
+        const [{ path }] = yield (0, miscellaneous_1.getFallbackApisOrExit)(argv.api ? [argv.api] : [], config);
         const externalRefResolver = new openapi_core_1.BaseResolver(config.resolve);
         const { bundle: document } = yield (0, openapi_core_1.bundle)({ config, ref: path });
         const lintConfig = config.styleguide;
@@ -86,7 +86,7 @@ function handleStats(argv, config) {
             ctx,
         });
         printStats(statsAccumulator, path, argv.format);
-        (0, utils_2.printExecutionTime)('stats', startedAt, path);
+        (0, miscellaneous_2.printExecutionTime)('stats', startedAt, path);
     });
 }
 exports.handleStats = handleStats;

package/lib/index.d.ts

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-import './assert-node-version';
+import './utils/assert-node-version';

package/lib/index.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-require("./assert-node-version");
+require("./utils/assert-node-version");
 const yargs = require("yargs");
 const types_1 = require("./types");
 const openapi_core_1 = require("@redocly/openapi-core");
@@ -18,14 +18,17 @@ const preview_docs_1 = require("./commands/preview-docs");
 const stats_1 = require("./commands/stats");
 const split_1 = require("./commands/split");
 const join_1 = require("./commands/join");
-const push_1 = require("./commands/push");
+const push_status_1 = require("./cms/commands/push-status");
 const lint_1 = require("./commands/lint");
 const bundle_1 = require("./commands/bundle");
 const login_1 = require("./commands/login");
 const build_docs_1 = require("./commands/build-docs");
-const update_version_notifier_1 = require("./update-version-notifier");
+const update_version_notifier_1 = require("./utils/update-version-notifier");
 const wrapper_1 = require("./wrapper");
-const update_version_notifier_2 = require("./update-version-notifier");
+const update_version_notifier_2 = require("./utils/update-version-notifier");
+const preview_project_1 = require("./commands/preview-project");
+const constants_1 = require("./commands/preview-project/constants");
+const push_1 = require("./commands/push");
 if (!('replaceAll' in String.prototype)) {
     require('core-js/actual/string/replace-all');
 }
@@ -82,14 +85,14 @@ yargs
     process.env.REDOCLY_CLI_COMMAND = 'split';
     (0, wrapper_1.commandWrapper)(split_1.handleSplit)(argv);
 })
-    .command('join [apis...]', 'Join definitions [experimental].', (yargs) => yargs
+    .command('join [apis...]', 'Join multiple API descriptions into one [experimental].', (yargs) => yargs
     .positional('apis', {
     array: true,
     type: 'string',
     demandOption: true,
 })
     .option({
-    lint: { description: 'Lint definitions', type: 'boolean', default: false, hidden: true },
+    lint: { description: 'Lint descriptions', type: 'boolean', default: false, hidden: true },
     decorate: { description: 'Run decorators', type: 'boolean', default: false },
     preprocess: { description: 'Run preprocessors', type: 'boolean', default: false },
     'prefix-tags-with-info-prop': {
@@ -112,7 +115,7 @@ yargs
         type: 'boolean',
     },
     output: {
-        describe: 'Output file',
+        description: 'Output file.',
         alias: 'o',
         type: 'string',
     },
@@ -130,18 +133,65 @@ yargs
     process.env.REDOCLY_CLI_COMMAND = 'join';
     (0, wrapper_1.commandWrapper)(join_1.handleJoin)(argv);
 })
-    .command('push [api] [maybeDestination] [maybeBranchName]', 'Push an API description to the Redocly API registry.', (yargs) => yargs
-    .usage('push [api]')
-    .positional('api', { type: 'string' })
-    .positional('maybeDestination', { type: 'string' })
-    .hide('maybeDestination')
-    .hide('maybeBranchName')
+    .command('push-status [pushId]', false, (yargs) => yargs
+    .positional('pushId', {
+    description: 'Push id.',
+    type: 'string',
+    required: true,
+})
+    .implies('max-execution-time', 'wait')
     .option({
     organization: {
         description: 'Name of the organization to push to.',
         type: 'string',
         alias: 'o',
     },
+    project: {
+        description: 'Name of the project to push to.',
+        type: 'string',
+        alias: 'p',
+    },
+    domain: { description: 'Specify a domain.', alias: 'd', type: 'string' },
+    wait: {
+        description: 'Wait for build to finish.',
+        type: 'boolean',
+        default: false,
+    },
+    'max-execution-time': {
+        description: 'Maximum execution time in seconds.',
+        type: 'number',
+    },
+}), (argv) => {
+    process.env.REDOCLY_CLI_COMMAND = 'push-status';
+    (0, wrapper_1.commandWrapper)(push_status_1.handlePushStatus)(argv);
+})
+    .command('push [apis...]', 'Push an API description to the Redocly API registry.', (yargs) => yargs
+    .positional('apis', {
+    type: 'string',
+    array: true,
+    required: true,
+    default: [],
+})
+    .hide('project')
+    .hide('domain')
+    .hide('mount-path')
+    .hide('author')
+    .hide('message')
+    .hide('default-branch')
+    .hide('verbose')
+    .hide('commit-sha')
+    .hide('commit-url')
+    .hide('namespace')
+    .hide('repository')
+    .hide('wait-for-deployment')
+    .hide('created-at')
+    .hide('max-execution-time')
+    .deprecateOption('batch-id', 'use --job-id')
+    .implies('job-id', 'batch-size')
+    .implies('batch-id', 'batch-size')
+    .implies('batch-size', 'job-id')
+    .implies('max-execution-time', 'wait-for-deployment')
+    .option({
     destination: {
         description: 'API name and version in the format `name@version`.',
         type: 'string',
@@ -194,16 +244,81 @@ yargs
         choices: ['warn', 'error', 'off'],
         default: 'warn',
     },
-})
-    .deprecateOption('batch-id', 'use --job-id')
-    .deprecateOption('maybeDestination')
-    .implies('job-id', 'batch-size')
-    .implies('batch-id', 'batch-size')
-    .implies('batch-size', 'job-id'), (argv) => {
+    organization: {
+        description: 'Name of the organization to push to.',
+        type: 'string',
+        alias: 'o',
+    },
+    project: {
+        description: 'Name of the project to push to.',
+        type: 'string',
+        alias: 'p',
+    },
+    'mount-path': {
+        description: 'The path files should be pushed to.',
+        type: 'string',
+        alias: 'mp',
+    },
+    author: {
+        description: 'Author of the commit.',
+        type: 'string',
+        alias: 'a',
+    },
+    message: {
+        description: 'Commit message.',
+        type: 'string',
+        alias: 'm',
+    },
+    'commit-sha': {
+        description: 'Commit SHA.',
+        type: 'string',
+        alias: 'sha',
+    },
+    'commit-url': {
+        description: 'Commit URL.',
+        type: 'string',
+        alias: 'url',
+    },
+    namespace: {
+        description: 'Repository namespace.',
+        type: 'string',
+    },
+    repository: {
+        description: 'Repository name.',
+        type: 'string',
+    },
+    'created-at': {
+        description: 'Commit creation date.',
+        type: 'string',
+    },
+    domain: { description: 'Specify a domain.', alias: 'd', type: 'string' },
+    config: {
+        description: 'Path to the config file.',
+        requiresArg: true,
+        type: 'string',
+    },
+    'default-branch': {
+        type: 'string',
+        default: 'main',
+    },
+    'max-execution-time': {
+        description: 'Maximum execution time in seconds.',
+        type: 'number',
+    },
+    'wait-for-deployment': {
+        description: 'Wait for build to finish.',
+        type: 'boolean',
+        default: false,
+    },
+    verbose: {
+        type: 'boolean',
+        default: false,
+    },
+}), (argv) => {
     process.env.REDOCLY_CLI_COMMAND = 'push';
-    (0, wrapper_1.commandWrapper)((0, push_1.transformPush)(push_1.handlePush))(argv);
+    (0, wrapper_1.commandWrapper)((0, push_1.commonPushHandler)(argv))(argv);
 })
-    .command('lint [apis...]', 'Lint definition.', (yargs) => yargs.positional('apis', { array: true, type: 'string', demandOption: true }).option({
+    .command('lint [apis...]', 'Lint an API description.', (yargs) => yargs.positional('apis', { array: true, type: 'string', demandOption: true }).option({
     format: {
         description: 'Use a specific output format.',
         choices: [
@@ -256,8 +371,12 @@ yargs
     process.env.REDOCLY_CLI_COMMAND = 'lint';
     (0, wrapper_1.commandWrapper)(lint_1.handleLint)(argv);
 })
-    .command('bundle [apis...]', 'Bundle definition.', (yargs) => yargs.positional('apis', { array: true, type: 'string', demandOption: true }).options({
-    output: { type: 'string', alias: 'o' },
+    .command('bundle [apis...]', 'Bundle a multi-file API description to a single file.', (yargs) => yargs.positional('apis', { array: true, type: 'string', demandOption: true }).options({
+    output: {
+        type: 'string',
+        description: 'Output file.',
+        alias: 'o',
+    },
     format: {
         description: 'Use a specific output format.',
         choices: ['stylish', 'codeframe', 'json', 'checkstyle'],
@@ -369,7 +488,32 @@ yargs
         process.stdout.write('Logged out from the Redocly account. ✋\n');
     }))(argv);
 }))
-    .command('preview-docs [api]', 'Preview API reference docs for the specified definition.', (yargs) => yargs.positional('api', { type: 'string' }).options({
+    .command('preview', 'Preview Redocly project using one of the product NPM packages.', (yargs) => yargs.options({
+    product: {
+        type: 'string',
+        choices: ['redoc', 'revel', 'reef', 'realm', 'redoc-revel', 'redoc-reef', 'revel-reef'],
+        description: "Product used to launch preview. Default is inferred from project's package.json or 'realm' is used.",
+    },
+    plan: {
+        type: 'string',
+        choices: constants_1.PRODUCT_PLANS,
+        default: 'enterprise',
+    },
+    port: {
+        type: 'number',
+        description: 'Preview port.',
+        default: 4000,
+    },
+    'source-dir': {
+        alias: 'd',
+        type: 'string',
+        description: 'Project directory.',
+        default: '.',
+    },
+}), (argv) => {
+    (0, wrapper_1.commandWrapper)(preview_project_1.previewProject)(argv);
+})
+    .command('preview-docs [api]', 'Preview API reference docs for an API description.', (yargs) => yargs.positional('api', { type: 'string' }).options({
     port: {
         alias: 'p',
         type: 'number',
@@ -462,7 +606,7 @@ yargs
     process.env.REDOCLY_CLI_COMMAND = 'build-docs';
     (0, wrapper_1.commandWrapper)(build_docs_1.handlerBuildCommand)(argv);
 }))
-    .completion('completion', 'Generate completion script.')
+    .completion('completion', 'Generate autocomplete script for `redocly` command.')
     .demandCommand(1)
     .middleware([update_version_notifier_1.notifyUpdateCliVersion])
     .strict().argv;

package/lib/types.d.ts

@@ -1,4 +1,5 @@
 import type { BundleOutputFormat, Region, Config } from '@redocly/openapi-core';
+import type { ArgumentsCamelCase } from 'yargs';
 import type { LintOptions } from './commands/lint';
 import type { BundleOptions } from './commands/bundle';
 import type { JoinOptions } from './commands/join';
@@ -8,6 +9,10 @@ import type { StatsOptions } from './commands/stats';
 import type { SplitOptions } from './commands/split';
 import type { PreviewDocsOptions } from './commands/preview-docs';
 import type { BuildDocsArgv } from './commands/build-docs/types';
+import type { PushOptions as PushBhOptions } from './cms/commands/push';
+import type { PushStatusOptions } from './cms/commands/push-status';
+import type { PushOptions as CMSPushOptions } from './cms/commands/push';
+import type { PreviewProjectOptions } from './commands/preview-project/types';
 export type Totals = {
     errors: number;
     warnings: number;
@@ -20,10 +25,13 @@ export type Entrypoint = {
 export declare const outputExtensions: readonly BundleOutputFormat[];
 export type OutputExtensions = 'json' | 'yaml' | 'yml' | undefined;
 export declare const regionChoices: readonly Region[];
-export type CommandOptions = StatsOptions | SplitOptions | JoinOptions | PushOptions | LintOptions | BundleOptions | LoginOptions | PreviewDocsOptions | BuildDocsArgv;
+export type CommandOptions = StatsOptions | SplitOptions | JoinOptions | PushOptions | PushBhOptions | LintOptions | BundleOptions | LoginOptions | PreviewDocsOptions | BuildDocsArgv | PushStatusOptions | PreviewProjectOptions;
 export type Skips = {
     'skip-rule'?: string[];
     'skip-decorator'?: string[];
     'skip-preprocessor'?: string[];
 };
 export type ConfigApis = Pick<Config, 'apis' | 'configFile'>;
+export type PushArguments = ArgumentsCamelCase<PushOptions & CMSPushOptions & {
+    apis: string[];
+}>;

package/lib/{__mocks__/utils.js → utils/__mocks__/miscellaneous.js}

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkForDeprecatedOptions = exports.writeToFileByExtension = exports.getAndValidateFileExtension = exports.sortTopLevelKeysForOas = exports.checkIfRulesetExist = exports.loadConfigAndHandleErrors = exports.writeYaml = exports.exitWithError = exports.handleError = exports.getOutputFileName = exports.printLintTotals = exports.printUnusedWarnings = exports.printExecutionTime = exports.getExecutionTime = exports.pluralize = exports.slash = exports.dumpBundle = exports.getFallbackApisOrExit = void 0;
-const config_1 = require("../__tests__/fixtures/config");
+const config_1 = require("../../__tests__/fixtures/config");
 exports.getFallbackApisOrExit = jest.fn((entrypoints) => entrypoints.map((path) => ({ path })));
 exports.dumpBundle = jest.fn(() => '');
 exports.slash = jest.fn();

package/lib/utils/assert-node-version.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/{fetch-with-timeout.js → utils/fetch-with-timeout.js}

@@ -10,19 +10,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const node_fetch_1 = require("node-fetch");
+const abort_controller_1 = require("abort-controller");
 const TIMEOUT = 3000;
 exports.default = (url, options = {}) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        if (!global.AbortController) {
-            return (0, node_fetch_1.default)(url, options);
-        }
-        const controller = new AbortController();
+        const controller = new abort_controller_1.default();
         const timeout = setTimeout(() => {
             controller.abort();
         }, TIMEOUT);
-        // FIXME: fix this (possibly along with this issue: https://github.com/Redocly/redocly-cli/issues/1260)
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore
         const res = yield (0, node_fetch_1.default)(url, Object.assign({ signal: controller.signal }, options));
         clearTimeout(timeout);
         return res;

package/lib/{utils.d.ts → utils/miscellaneous.d.ts}

@@ -1,5 +1,5 @@
 import { BundleOutputFormat, StyleguideConfig, Region, Config, Oas3Definition, Oas2Definition } from '@redocly/openapi-core';
-import { Totals, Entrypoint, ConfigApis, CommandOptions, OutputExtensions } from './types';
+import { Totals, Entrypoint, ConfigApis, CommandOptions, OutputExtensions } from '../types';
 import { Arguments } from 'yargs';
 import type { RawConfigProcessor } from '@redocly/openapi-core/lib/config';
 export declare function getFallbackApisOrExit(argsApis: string[] | undefined, config: ConfigApis): Promise<Entrypoint[]>;

package/lib/{utils.js → utils/miscellaneous.js}

@@ -31,10 +31,10 @@ const readline = require("readline");
 const stream_1 = require("stream");
 const child_process_1 = require("child_process");
 const openapi_core_1 = require("@redocly/openapi-core");
-const types_1 = require("./types");
+const types_1 = require("../types");
 const utils_1 = require("@redocly/openapi-core/lib/utils");
 const update_version_notifier_1 = require("./update-version-notifier");
-const push_1 = require("./commands/push");
+const push_1 = require("../commands/push");
 const config_1 = require("@redocly/openapi-core/lib/config");
 function getFallbackApisOrExit(argsApis, config) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -127,6 +127,24 @@ function langToExt(lang) {
         javascript: '.js',
         js: '.js',
         python: '.py',
+        c: '.c',
+        'c++': '.cpp',
+        coffeescript: '.litcoffee',
+        dart: '.dart',
+        elixir: '.ex',
+        go: '.go',
+        groovy: '.groovy',
+        java: '.java',
+        kotlin: '.kt',
+        'objective-c': '.m',
+        perl: '.pl',
+        powershell: '.ps1',
+        ruby: '.rb',
+        rust: '.rs',
+        scala: '.sc',
+        swift: '.swift',
+        typescript: '.ts',
+        tsx: '.tsx',
     };
     return langObj[lang.toLowerCase()];
 }

package/lib/utils/spinner.d.ts

@@ -0,0 +1,10 @@
+export declare class Spinner {
+    private readonly frames;
+    private currentFrame;
+    private intervalId;
+    private message;
+    constructor();
+    private showFrame;
+    start(message: string): void;
+    stop(): void;
+}

package/lib/utils/spinner.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Spinner = void 0;
+const process = require("process");
+const SPINNER_FRAMES = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
+class Spinner {
+    constructor() {
+        this.frames = SPINNER_FRAMES;
+        this.currentFrame = 0;
+        this.intervalId = null;
+        this.message = '';
+    }
+    showFrame() {
+        process.stdout.write('\r' + this.frames[this.currentFrame] + ' ' + this.message);
+        this.currentFrame = (this.currentFrame + 1) % this.frames.length;
+    }
+    start(message) {
+        if (this.message === message) {
+            return;
+        }
+        this.message = message;
+        // If we're not in a TTY, don't display the spinner.
+        if (!process.stdout.isTTY) {
+            process.stdout.write(`${message}...\n`);
+            return;
+        }
+        if (this.intervalId === null) {
+            this.intervalId = setInterval(() => {
+                this.showFrame();
+            }, 100);
+        }
+    }
+    stop() {
+        if (this.intervalId !== null) {
+            clearInterval(this.intervalId);
+            this.intervalId = null;
+            process.stdout.write('\r');
+        }
+        this.message = '';
+    }
+}
+exports.Spinner = Spinner;

package/lib/{update-version-notifier.js → utils/update-version-notifier.js}

@@ -17,8 +17,8 @@ const fs_1 = require("fs");
 const semver_1 = require("semver");
 const fetch_with_timeout_1 = require("./fetch-with-timeout");
 const colorette_1 = require("colorette");
-const utils_1 = require("./utils");
-_a = require('../package.json'), exports.version = _a.version, exports.name = _a.name;
+const miscellaneous_1 = require("./miscellaneous");
+_a = require('../../package.json'), exports.version = _a.version, exports.name = _a.name;
 const VERSION_CACHE_FILE = 'redocly-cli-version';
 const SPACE_TO_BORDER = 4;
 const INTERVAL_TO_CHECK = 1000 * 60 * 60 * 12;
@@ -67,7 +67,7 @@ const renderUpdateBanner = (current, latest) => {
         `Update now: \`${(0, colorette_1.cyan)('npm i -g @redocly/cli@latest')}\`.`,
         `Changelog: https://redocly.com/docs/cli/changelog/`,
     ];
-    const maxLength = Math.max(...messageLines.map((line) => (0, utils_1.cleanColors)(line).length));
+    const maxLength = Math.max(...messageLines.map((line) => (0, miscellaneous_1.cleanColors)(line).length));
     const border = (0, colorette_1.yellow)('═'.repeat(maxLength + SPACE_TO_BORDER));
     const banner = `
     ${(0, colorette_1.yellow)('╔' + border + '╗')}
@@ -83,7 +83,7 @@ const renderUpdateBanner = (current, latest) => {
     process.stderr.write(banner);
 };
 const getLineWithPadding = (maxLength, line, index) => {
-    const padding = ' '.repeat(maxLength - (0, utils_1.cleanColors)(line).length);
+    const padding = ' '.repeat(maxLength - (0, miscellaneous_1.cleanColors)(line).length);
     const extraSpaces = index !== 0 ? ' '.repeat(SPACE_TO_BORDER) : '';
     return `${extraSpaces}${(0, colorette_1.yellow)('║')}  ${line}${padding}  ${(0, colorette_1.yellow)('║')}`;
 };