@redocly/cli 1.18.1 → 1.19.0

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

@@ -1,48 +1,54 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const index_1 = require("../index");
 const path = require("path");
 const openapiCore = require("@redocly/openapi-core");
 const colorette_1 = require("colorette");
+const miscellaneous_1 = require("../../../utils/__mocks__/miscellaneous");
 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() })));
+jest.mock('../../../utils/miscellaneous', () => ({
+    ...jest.requireActual('../../../utils/miscellaneous'),
+    writeToFileByExtension: jest.fn(),
+}));
+jest.mock('@redocly/openapi-core', () => ({
+    ...jest.requireActual('@redocly/openapi-core'),
+    isRef: jest.fn(),
+}));
 describe('#split', () => {
     const openapiDir = 'test';
     const componentsFiles = {};
-    it('should split the file and show the success message', () => __awaiter(void 0, void 0, void 0, function* () {
+    it('should split the file and show the success message', async () => {
         const filePath = 'packages/cli/src/commands/split/__tests__/fixtures/spec.json';
         jest.spyOn(process.stderr, 'write').mockImplementation(() => true);
-        yield (0, index_1.handleSplit)({
-            api: filePath,
-            outDir: openapiDir,
-            separator: '_',
+        await (0, index_1.handleSplit)({
+            argv: {
+                api: filePath,
+                outDir: openapiDir,
+                separator: '_',
+            },
+            config: (0, miscellaneous_1.loadConfigAndHandleErrors)(),
+            version: 'cli-version',
         });
         expect(process.stderr.write).toBeCalledTimes(2);
         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* () {
+    });
+    it('should use the correct separator', async () => {
         const filePath = 'packages/cli/src/commands/split/__tests__/fixtures/spec.json';
         jest.spyOn(utils, 'pathToFilename').mockImplementation(() => 'newFilePath');
-        yield (0, index_1.handleSplit)({
-            api: filePath,
-            outDir: openapiDir,
-            separator: '_',
+        await (0, index_1.handleSplit)({
+            argv: {
+                api: filePath,
+                outDir: openapiDir,
+                separator: '_',
+            },
+            config: (0, miscellaneous_1.loadConfigAndHandleErrors)(),
+            version: 'cli-version',
         });
         expect(utils.pathToFilename).toBeCalledWith(expect.anything(), '_');
         utils.pathToFilename.mockRestore();
-    }));
+    });
     it('should have correct path with paths', () => {
         const openapi = require('./fixtures/spec.json');
         jest.spyOn(openapiCore, 'slash').mockImplementation(() => 'paths/test.yaml');
@@ -67,7 +73,7 @@ describe('#split', () => {
         expect(openapiCore.slash).toHaveBeenCalledWith('webhooks/test.yaml');
         expect(path.relative).toHaveBeenCalledWith('test', 'test/webhooks/test.yaml');
     });
-    it('should create correct folder name for code samples', () => __awaiter(void 0, void 0, void 0, function* () {
+    it('should create correct folder name for code samples', async () => {
         const openapi = require('./fixtures/samples.json');
         const fs = require('fs');
         jest.spyOn(fs, 'writeFileSync').mockImplementation(() => { });
@@ -81,5 +87,5 @@ describe('#split', () => {
         expect(utils.escapeLanguageName).nthReturnedWith(3, 'VisualBasic');
         expect(utils.escapeLanguageName).toBeCalledTimes(3);
         utils.escapeLanguageName.mockRestore();
-    }));
+    });
 });

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

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

package/lib/commands/split/index.js

@@ -1,15 +1,9 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.iteratePathItems = exports.crawl = exports.startsWithComponents = exports.handleSplit = void 0;
+exports.handleSplit = handleSplit;
+exports.startsWithComponents = startsWithComponents;
+exports.crawl = crawl;
+exports.iteratePathItems = iteratePathItems;
 const colorette_1 = require("colorette");
 const fs = require("fs");
 const openapi_core_1 = require("@redocly/openapi-core");
@@ -19,20 +13,18 @@ const perf_hooks_1 = require("perf_hooks");
 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, 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')}
+async function handleSplit({ argv, collectSpecData }) {
+    const startedAt = perf_hooks_1.performance.now();
+    const { api, outDir, separator } = argv;
+    validateDefinitionFileName(api);
+    const ext = (0, miscellaneous_1.getAndValidateFileExtension)(api);
+    const openapi = (0, miscellaneous_1.readYaml)(api);
+    collectSpecData?.(openapi);
+    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, miscellaneous_1.printExecutionTime)('split', startedAt, api);
-    });
+    (0, miscellaneous_1.printExecutionTime)('split', startedAt, api);
 }
-exports.handleSplit = handleSplit;
 function splitDefinition(openapi, openapiDir, pathSeparator, ext) {
     fs.mkdirSync(openapiDir, { recursive: true });
     const componentsFiles = {};
@@ -47,7 +39,6 @@ function splitDefinition(openapi, openapiDir, pathSeparator, ext) {
 function startsWithComponents(node) {
     return node.startsWith(`#/${types_1.COMPONENTS}/`);
 }
-exports.startsWithComponents = startsWithComponents;
 function isSupportedExtension(filename) {
     return filename.endsWith('.yaml') || filename.endsWith('.yml') || filename.endsWith('.json');
 }
@@ -98,7 +89,6 @@ function crawl(object, visitor) {
         crawl(object[key], visitor);
     }
 }
-exports.crawl = crawl;
 function replace$Refs(obj, relativeFrom, componentFiles = {}) {
     crawl(obj, (node) => {
         if (node.$ref && typeof node.$ref === 'string' && startsWithComponents(node.$ref)) {
@@ -183,10 +173,9 @@ function getFileNamePath(componentDirPath, componentName, ext) {
     return path.join(componentDirPath, componentName) + `.${ext}`;
 }
 function gatherComponentsFiles(components, componentsFiles, componentType, componentName, filename) {
-    var _a, _b;
     let inherits = [];
     if (componentType === types_1.OPENAPI3_COMPONENT.Schemas) {
-        inherits = (((_b = (_a = components === null || components === void 0 ? void 0 : components[componentType]) === null || _a === void 0 ? void 0 : _a[componentName]) === null || _b === void 0 ? void 0 : _b.allOf) || [])
+        inherits = (components?.[componentType]?.[componentName]?.allOf || [])
             .map(({ $ref }) => $ref)
             .filter(openapi_core_1.isTruthy);
     }
@@ -204,7 +193,7 @@ function iteratePathItems(pathItems, openapiDir, outDir, componentsFiles, pathSe
             continue;
         for (const method of types_1.OPENAPI3_METHOD_NAMES) {
             const methodData = pathData[method];
-            const methodDataXCode = (methodData === null || methodData === void 0 ? void 0 : methodData['x-code-samples']) || (methodData === null || methodData === void 0 ? void 0 : methodData['x-codeSamples']);
+            const methodDataXCode = methodData?.['x-code-samples'] || methodData?.['x-codeSamples'];
             if (!methodDataXCode || !Array.isArray(methodDataXCode)) {
                 continue;
             }
@@ -228,7 +217,6 @@ function iteratePathItems(pathItems, openapiDir, outDir, componentsFiles, pathSe
         traverseDirectoryDeep(outDir, traverseDirectoryDeepCallback, componentsFiles);
     }
 }
-exports.iteratePathItems = iteratePathItems;
 function iterateComponents(openapi, openapiDir, componentsFiles, ext) {
     const { components } = openapi;
     if (components) {
@@ -240,19 +228,18 @@ function iterateComponents(openapi, openapiDir, componentsFiles, ext) {
         // eslint-disable-next-line no-inner-declarations
         function iterateAndGatherComponentsFiles(componentType) {
             const componentDirPath = path.join(componentsDir, componentType);
-            for (const componentName of Object.keys((components === null || components === void 0 ? void 0 : components[componentType]) || {})) {
+            for (const componentName of Object.keys(components?.[componentType] || {})) {
                 const filename = getFileNamePath(componentDirPath, componentName, ext);
                 gatherComponentsFiles(components, componentsFiles, componentType, componentName, filename);
             }
         }
         // eslint-disable-next-line no-inner-declarations
         function iterateComponentTypes(componentType) {
-            var _a, _b, _c;
             const componentDirPath = path.join(componentsDir, componentType);
             createComponentDir(componentDirPath, componentType);
-            for (const componentName of Object.keys((components === null || components === void 0 ? void 0 : components[componentType]) || {})) {
+            for (const componentName of Object.keys(components?.[componentType] || {})) {
                 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];
+                const componentData = components?.[componentType]?.[componentName];
                 replace$Refs(componentData, path.dirname(filename), componentsFiles);
                 implicitlyReferenceDiscriminator(componentData, extractFileNameFromPath(filename), filename, componentsFiles.schemas || {});
                 if (doesFileDiffer(filename, componentData)) {
@@ -263,7 +250,7 @@ function iterateComponents(openapi, openapiDir, componentsFiles, ext) {
                 }
                 if (isNotSecurityComponentType(componentType)) {
                     // security schemas must referenced from components
-                    (_c = (_b = openapi.components) === null || _b === void 0 ? void 0 : _b[componentType]) === null || _c === void 0 ? true : delete _c[componentName];
+                    delete openapi.components?.[componentType]?.[componentName];
                 }
             }
             removeEmptyComponents(openapi, componentType);

package/lib/commands/stats.d.ts

@@ -1,8 +1,8 @@
-import { Config } from '@redocly/openapi-core';
 import type { OutputFormat } from '@redocly/openapi-core';
+import type { CommandArgs } from '../wrapper';
 export type StatsOptions = {
     api?: string;
     format: OutputFormat;
     config?: string;
 };
-export declare function handleStats(argv: StatsOptions, config: Config): Promise<void>;
+export declare function handleStats({ argv, config, collectSpecData }: CommandArgs<StatsOptions>): Promise<void>;

package/lib/commands/stats.js

@@ -1,15 +1,6 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleStats = void 0;
+exports.handleStats = handleStats;
 const perf_hooks_1 = require("perf_hooks");
 const colors = require("colorette");
 const openapi_core_1 = require("@redocly/openapi-core");
@@ -68,40 +59,38 @@ function printStats(statsAccumulator, api, startedAt, format) {
             break;
     }
 }
-function handleStats(argv, config) {
-    return __awaiter(this, void 0, void 0, function* () {
-        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;
-        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 (0, openapi_core_1.resolveDocument)({
-            rootDocument: document,
-            rootType: types.Root,
-            externalRefResolver,
-        });
-        const statsVisitor = (0, openapi_core_1.normalizeVisitors)([
-            {
-                severity: 'warn',
-                ruleId: 'stats',
-                visitor: (0, openapi_core_1.Stats)(statsAccumulator),
-            },
-        ], types);
-        (0, openapi_core_1.walkDocument)({
-            document,
-            rootType: types.Root,
-            normalizedVisitors: statsVisitor,
-            resolvedRefMap,
-            ctx,
-        });
-        printStats(statsAccumulator, path, startedAt, argv.format);
+async function handleStats({ argv, config, collectSpecData }) {
+    const [{ path }] = await (0, miscellaneous_1.getFallbackApisOrExit)(argv.api ? [argv.api] : [], config);
+    const externalRefResolver = new openapi_core_1.BaseResolver(config.resolve);
+    const { bundle: document } = await (0, openapi_core_1.bundle)({ config, ref: path });
+    collectSpecData?.(document.parsed);
+    const lintConfig = config.styleguide;
+    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 = await (0, openapi_core_1.resolveDocument)({
+        rootDocument: document,
+        rootType: types.Root,
+        externalRefResolver,
+    });
+    const statsVisitor = (0, openapi_core_1.normalizeVisitors)([
+        {
+            severity: 'warn',
+            ruleId: 'stats',
+            visitor: (0, openapi_core_1.Stats)(statsAccumulator),
+        },
+    ], types);
+    (0, openapi_core_1.walkDocument)({
+        document,
+        rootType: types.Root,
+        normalizedVisitors: statsVisitor,
+        resolvedRefMap,
+        ctx,
     });
+    printStats(statsAccumulator, path, startedAt, argv.format);
 }
-exports.handleStats = handleStats;

package/lib/index.js

@@ -1,14 +1,5 @@
 #!/usr/bin/env node
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 require("./utils/assert-node-version");
 const yargs = require("yargs");
@@ -502,51 +493,47 @@ yargs
     process.env.REDOCLY_CLI_COMMAND = 'bundle';
     (0, wrapper_1.commandWrapper)(bundle_1.handleBundle)(argv);
 })
-    .command('check-config', 'Lint the Redocly configuration file.', (yargs) => __awaiter(void 0, void 0, void 0, function* () {
-    return yargs.option({
-        config: {
-            description: 'Path to the config file.',
-            type: 'string',
-        },
-        'lint-config': {
-            description: 'Severity level for config file linting.',
-            choices: ['warn', 'error'],
-            default: 'error',
-        },
-    });
+    .command('check-config', 'Lint the Redocly configuration file.', async (yargs) => yargs.option({
+    config: {
+        description: 'Path to the config file.',
+        type: 'string',
+    },
+    'lint-config': {
+        description: 'Severity level for config file linting.',
+        choices: ['warn', 'error'],
+        default: 'error',
+    },
 }), (argv) => {
     process.env.REDOCLY_CLI_COMMAND = 'check-config';
     (0, wrapper_1.commandWrapper)()(argv);
 })
-    .command('login', 'Login to the Redocly API registry with an access token.', (yargs) => __awaiter(void 0, void 0, void 0, function* () {
-    return yargs.options({
-        verbose: {
-            description: 'Include additional output.',
-            type: 'boolean',
-        },
-        region: {
-            description: 'Specify a region.',
-            alias: 'r',
-            choices: types_1.regionChoices,
-        },
-        config: {
-            description: 'Path to the config file.',
-            requiresArg: true,
-            type: 'string',
-        },
-    });
+    .command('login', 'Login to the Redocly API registry with an access token.', async (yargs) => yargs.options({
+    verbose: {
+        description: 'Include additional output.',
+        type: 'boolean',
+    },
+    region: {
+        description: 'Specify a region.',
+        alias: 'r',
+        choices: types_1.regionChoices,
+    },
+    config: {
+        description: 'Path to the config file.',
+        requiresArg: true,
+        type: 'string',
+    },
 }), (argv) => {
     process.env.REDOCLY_CLI_COMMAND = 'login';
     (0, wrapper_1.commandWrapper)(login_1.handleLogin)(argv);
 })
-    .command('logout', 'Clear your stored credentials for the Redocly API registry.', (yargs) => yargs, (argv) => __awaiter(void 0, void 0, void 0, function* () {
+    .command('logout', 'Clear your stored credentials for the Redocly API registry.', (yargs) => yargs, async (argv) => {
     process.env.REDOCLY_CLI_COMMAND = 'logout';
-    yield (0, wrapper_1.commandWrapper)(() => __awaiter(void 0, void 0, void 0, function* () {
+    await (0, wrapper_1.commandWrapper)(async () => {
         const client = new openapi_core_1.RedoclyClient();
         client.logout();
         process.stdout.write('Logged out from the Redocly account. ✋\n');
-    }))(argv);
-}))
+    })(argv);
+})
     .command('preview', 'Preview Redocly project using one of the product NPM packages.', (yargs) => yargs.options({
     product: {
         type: 'string',
@@ -657,14 +644,13 @@ yargs
     },
 })
     .check((argv) => {
-    var _a;
-    if (argv.theme && !((_a = argv.theme) === null || _a === void 0 ? void 0 : _a.openapi))
+    if (argv.theme && !argv.theme?.openapi)
         throw Error('Invalid option: theme.openapi not set');
     return true;
-}), (argv) => __awaiter(void 0, void 0, void 0, function* () {
+}), async (argv) => {
     process.env.REDOCLY_CLI_COMMAND = 'build-docs';
     (0, wrapper_1.commandWrapper)(build_docs_1.handlerBuildCommand)(argv);
-}))
+})
     .completion('completion', 'Generate autocomplete script for `redocly` command.')
     .demandCommand(1)
     .middleware([update_version_notifier_1.notifyUpdateCliVersion])

package/lib/types.d.ts

@@ -22,9 +22,9 @@ export type Entrypoint = {
     path: string;
     alias?: string;
 };
-export declare const outputExtensions: readonly BundleOutputFormat[];
+export declare const outputExtensions: ReadonlyArray<BundleOutputFormat>;
 export type OutputExtensions = 'json' | 'yaml' | 'yml' | undefined;
-export declare const regionChoices: readonly Region[];
+export declare const regionChoices: ReadonlyArray<Region>;
 export type CommandOptions = StatsOptions | SplitOptions | JoinOptions | PushOptions | PushBhOptions | LintOptions | BundleOptions | LoginOptions | PreviewDocsOptions | BuildDocsArgv | PushStatusOptions | VerifyConfigOptions | PreviewProjectOptions;
 export type VerifyConfigOptions = {
     config?: string;

package/lib/utils/__mocks__/miscellaneous.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="jest" />
 export declare const getFallbackApisOrExit: jest.Mock<any, [entrypoints: any]>;
 export declare const dumpBundle: jest.Mock<string, []>;
 export declare const slash: jest.Mock<any, any>;

package/lib/utils/fetch-with-timeout.js

@@ -1,29 +1,24 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const node_fetch_1 = require("node-fetch");
 const abort_controller_1 = require("abort-controller");
 const openapi_core_1 = require("@redocly/openapi-core");
 const TIMEOUT = 3000;
-exports.default = (url, options = {}) => __awaiter(void 0, void 0, void 0, function* () {
+exports.default = async (url, options = {}) => {
     try {
         const controller = new abort_controller_1.default();
         const timeout = setTimeout(() => {
             controller.abort();
         }, TIMEOUT);
-        const res = yield (0, node_fetch_1.default)(url, Object.assign(Object.assign({ signal: controller.signal }, options), { agent: (0, openapi_core_1.getProxyAgent)() }));
+        const res = await (0, node_fetch_1.default)(url, {
+            signal: controller.signal,
+            ...options,
+            agent: (0, openapi_core_1.getProxyAgent)(),
+        });
         clearTimeout(timeout);
         return res;
     }
     catch (e) {
         return;
     }
-});
+};

package/lib/utils/getCommandNameFromArgs.js

@@ -1,8 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCommandNameFromArgs = void 0;
+exports.getCommandNameFromArgs = getCommandNameFromArgs;
 function getCommandNameFromArgs(argv) {
-    var _a, _b;
-    return (_b = (_a = argv === null || argv === void 0 ? void 0 : argv._) === null || _a === void 0 ? void 0 : _a[0]) !== null && _b !== void 0 ? _b : '';
+    return argv?._?.[0] ?? '';
 }
-exports.getCommandNameFromArgs = getCommandNameFromArgs;

package/lib/utils/js-utils.js

@@ -1,29 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.capitalize = exports.keysOf = exports.isString = exports.isEmptyObject = exports.isObject = void 0;
+exports.isObject = isObject;
+exports.isEmptyObject = isEmptyObject;
+exports.isString = isString;
+exports.keysOf = keysOf;
+exports.capitalize = capitalize;
 function isObject(obj) {
     const type = typeof obj;
     return type === 'function' || (type === 'object' && !!obj);
 }
-exports.isObject = isObject;
 function isEmptyObject(obj) {
     return !!obj && Object.keys(obj).length === 0;
 }
-exports.isEmptyObject = isEmptyObject;
 function isString(str) {
     return Object.prototype.toString.call(str) === '[object String]';
 }
-exports.isString = isString;
 function keysOf(obj) {
     if (!obj)
         return [];
     return Object.keys(obj);
 }
-exports.keysOf = keysOf;
 function capitalize(s) {
-    if ((s === null || s === void 0 ? void 0 : s.length) > 0) {
+    if (s?.length > 0) {
         return s[0].toUpperCase() + s.slice(1);
     }
     return s;
 }
-exports.capitalize = capitalize;

package/lib/utils/miscellaneous.d.ts

@@ -46,7 +46,7 @@ export declare function loadConfigAndHandleErrors(options?: {
 export declare function sortTopLevelKeysForOas(document: Oas3Definition | Oas2Definition): Oas3Definition | Oas2Definition;
 export declare function checkIfRulesetExist(rules: typeof StyleguideConfig.prototype.rules): void;
 export declare function cleanColors(input: string): string;
-export declare function sendTelemetry(argv: Arguments | undefined, exit_code: ExitCode, has_config: boolean | undefined): Promise<void>;
+export declare function sendTelemetry(argv: Arguments | undefined, exit_code: ExitCode, has_config: boolean | undefined, spec_version: string | undefined, spec_keyword: string | undefined, spec_full_version: string | undefined): Promise<void>;
 export type ExitCode = 0 | 1 | 2;
 export type Analytics = {
     event: string;
@@ -62,6 +62,9 @@ export type Analytics = {
     environment_ci?: string;
     raw_input: string;
     has_config?: boolean;
+    spec_version?: string;
+    spec_keyword?: string;
+    spec_full_version?: string;
 };
 export declare function cleanArgs(args: CommandOptions): Record<string, unknown>;
 export declare function cleanRawInput(argv: string[]): string;