@redocly/cli 1.22.1 → 1.23.1

package/lib/cms/api/api-client.js

@@ -1,63 +1,89 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ReuniteApiClient = void 0;
-const node_fetch_1 = require("node-fetch");
+exports.ReuniteApiClient = exports.ReuniteApiError = void 0;
 const FormData = require("form-data");
-const openapi_core_1 = require("@redocly/openapi-core");
 const fetch_with_timeout_1 = require("../../utils/fetch-with-timeout");
-class RemotesApiClient {
-    constructor(domain, apiKey) {
-        this.domain = domain;
-        this.apiKey = apiKey;
+class ReuniteApiError extends Error {
+    constructor(message, status) {
+        super(message);
+        this.status = status;
+    }
+}
+exports.ReuniteApiError = ReuniteApiError;
+class ReuniteBaseApiClient {
+    constructor(version, command) {
+        this.version = version;
+        this.command = command;
     }
     async getParsedResponse(response) {
         const responseBody = await response.json();
         if (response.ok) {
             return responseBody;
         }
-        throw new Error(responseBody.title || response.statusText);
+        throw new ReuniteApiError(`${responseBody.title || response.statusText || 'Unknown error'}.`, response.status);
     }
-    async getDefaultBranch(organizationId, projectId) {
-        const response = await (0, fetch_with_timeout_1.default)(`${this.domain}/api/orgs/${organizationId}/projects/${projectId}/source`, {
-            method: 'GET',
-            headers: {
-                'Content-Type': 'application/json',
-                Authorization: `Bearer ${this.apiKey}`,
-            },
+    request(url, options) {
+        const headers = {
+            ...options.headers,
+            'user-agent': `redocly-cli/${this.version.trim()} ${this.command}`,
+        };
+        return (0, fetch_with_timeout_1.default)(url, {
+            ...options,
+            headers,
         });
-        if (!response) {
-            throw new Error(`Failed to get default branch.`);
-        }
+    }
+}
+class RemotesApiClient extends ReuniteBaseApiClient {
+    constructor(domain, apiKey, version, command) {
+        super(version, command);
+        this.domain = domain;
+        this.apiKey = apiKey;
+    }
+    async getDefaultBranch(organizationId, projectId) {
         try {
+            const response = await this.request(`${this.domain}/api/orgs/${organizationId}/projects/${projectId}/source`, {
+                timeout: fetch_with_timeout_1.DEFAULT_FETCH_TIMEOUT,
+                method: 'GET',
+                headers: {
+                    'Content-Type': 'application/json',
+                    Authorization: `Bearer ${this.apiKey}`,
+                },
+            });
             const source = await this.getParsedResponse(response);
             return source.branchName;
         }
         catch (err) {
-            throw new Error(`Failed to fetch default branch: ${err.message || 'Unknown error'}`);
+            const message = `Failed to fetch default branch. ${err.message}`;
+            if (err instanceof ReuniteApiError) {
+                throw new ReuniteApiError(message, err.status);
+            }
+            throw new Error(message);
         }
     }
     async upsert(organizationId, projectId, remote) {
-        const response = await (0, fetch_with_timeout_1.default)(`${this.domain}/api/orgs/${organizationId}/projects/${projectId}/remotes`, {
-            method: 'POST',
-            headers: {
-                'Content-Type': 'application/json',
-                Authorization: `Bearer ${this.apiKey}`,
-            },
-            body: JSON.stringify({
-                mountPath: remote.mountPath,
-                mountBranchName: remote.mountBranchName,
-                type: 'CICD',
-                autoMerge: true,
-            }),
-        });
-        if (!response) {
-            throw new Error(`Failed to upsert.`);
-        }
         try {
+            const response = await this.request(`${this.domain}/api/orgs/${organizationId}/projects/${projectId}/remotes`, {
+                timeout: fetch_with_timeout_1.DEFAULT_FETCH_TIMEOUT,
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json',
+                    Authorization: `Bearer ${this.apiKey}`,
+                },
+                body: JSON.stringify({
+                    mountPath: remote.mountPath,
+                    mountBranchName: remote.mountBranchName,
+                    type: 'CICD',
+                    autoMerge: true,
+                }),
+            });
             return await this.getParsedResponse(response);
         }
         catch (err) {
-            throw new Error(`Failed to upsert remote: ${err.message || 'Unknown error'}`);
+            const message = `Failed to upsert remote. ${err.message}`;
+            if (err instanceof ReuniteApiError) {
+                throw new ReuniteApiError(message, err.status);
+            }
+            throw new Error(message);
         }
     }
     async push(organizationId, projectId, payload, files) {
@@ -76,63 +102,68 @@ class RemotesApiClient {
             formData.append(`files[${file.path}]`, file.stream);
         }
         payload.isMainBranch && formData.append('isMainBranch', 'true');
-        const response = await (0, node_fetch_1.default)(`${this.domain}/api/orgs/${organizationId}/projects/${projectId}/pushes`, {
-            method: 'POST',
-            headers: {
-                Authorization: `Bearer ${this.apiKey}`,
-            },
-            body: formData,
-            agent: (0, openapi_core_1.getProxyAgent)(),
-        });
         try {
+            const response = await this.request(`${this.domain}/api/orgs/${organizationId}/projects/${projectId}/pushes`, {
+                method: 'POST',
+                headers: {
+                    Authorization: `Bearer ${this.apiKey}`,
+                },
+                body: formData,
+            });
             return await this.getParsedResponse(response);
         }
         catch (err) {
-            throw new Error(`Failed to push: ${err.message || 'Unknown error'}`);
+            const message = `Failed to push. ${err.message}`;
+            if (err instanceof ReuniteApiError) {
+                throw new ReuniteApiError(message, err.status);
+            }
+            throw new Error(message);
         }
     }
-    async getRemotesList(organizationId, projectId, mountPath) {
-        const response = await (0, fetch_with_timeout_1.default)(`${this.domain}/api/orgs/${organizationId}/projects/${projectId}/remotes?filter=mountPath:/${mountPath}/`, {
-            method: 'GET',
-            headers: {
-                'Content-Type': 'application/json',
-                Authorization: `Bearer ${this.apiKey}`,
-            },
-        });
-        if (!response) {
-            throw new Error(`Failed to get remotes list.`);
-        }
+    async getRemotesList({ organizationId, projectId, mountPath, }) {
         try {
+            const response = await this.request(`${this.domain}/api/orgs/${organizationId}/projects/${projectId}/remotes?filter=mountPath:/${mountPath}/`, {
+                timeout: fetch_with_timeout_1.DEFAULT_FETCH_TIMEOUT,
+                method: 'GET',
+                headers: {
+                    'Content-Type': 'application/json',
+                    Authorization: `Bearer ${this.apiKey}`,
+                },
+            });
             return await this.getParsedResponse(response);
         }
         catch (err) {
-            throw new Error(`Failed to get remote list: ${err.message || 'Unknown error'}`);
+            const message = `Failed to get remote list. ${err.message}`;
+            if (err instanceof ReuniteApiError) {
+                throw new ReuniteApiError(message, err.status);
+            }
+            throw new Error(message);
         }
     }
     async getPush({ organizationId, projectId, pushId, }) {
-        const response = await (0, fetch_with_timeout_1.default)(`${this.domain}/api/orgs/${organizationId}/projects/${projectId}/pushes/${pushId}`, {
-            method: 'GET',
-            headers: {
-                'Content-Type': 'application/json',
-                Authorization: `Bearer ${this.apiKey}`,
-            },
-        });
-        if (!response) {
-            throw new Error(`Failed to get push status.`);
-        }
         try {
+            const response = await this.request(`${this.domain}/api/orgs/${organizationId}/projects/${projectId}/pushes/${pushId}`, {
+                timeout: fetch_with_timeout_1.DEFAULT_FETCH_TIMEOUT,
+                method: 'GET',
+                headers: {
+                    'Content-Type': 'application/json',
+                    Authorization: `Bearer ${this.apiKey}`,
+                },
+            });
             return await this.getParsedResponse(response);
         }
         catch (err) {
-            throw new Error(`Failed to get push status: ${err.message || 'Unknown error'}`);
+            const message = `Failed to get push status. ${err.message}`;
+            if (err instanceof ReuniteApiError) {
+                throw new ReuniteApiError(message, err.status);
+            }
+            throw new Error(message);
         }
     }
 }
 class ReuniteApiClient {
-    constructor(domain, apiKey) {
-        this.domain = domain;
-        this.apiKey = apiKey;
-        this.remotes = new RemotesApiClient(this.domain, this.apiKey);
+    constructor({ domain, apiKey, version, command, }) {
+        this.remotes = new RemotesApiClient(domain, apiKey, version, command);
     }
 }
 exports.ReuniteApiClient = ReuniteApiClient;

package/lib/cms/commands/__tests__/push-status.test.js

@@ -554,7 +554,7 @@ describe('handlePushStatus()', () => {
                 config: mockConfig,
                 version: 'cli-version',
             })).rejects.toThrowErrorMatchingInlineSnapshot(`
-        "✗ Failed to get push status. Reason: Timeout exceeded
+        "✗ Failed to get push status. Reason: Timeout exceeded.
         "
       `);
         });

package/lib/cms/commands/__tests__/push.test.js

@@ -269,6 +269,46 @@ describe('handlePush()', () => {
             config: mockConfig,
             version: 'cli-version',
         });
-        expect(api_1.ReuniteApiClient).toBeCalledWith('test-domain-from-env', 'test-api-key');
+        expect(api_1.ReuniteApiClient).toBeCalledWith({
+            domain: 'test-domain-from-env',
+            apiKey: 'test-api-key',
+            version: 'cli-version',
+            command: 'push',
+        });
+    });
+    it('should print error message', async () => {
+        const mockConfig = { apis: {} };
+        process.env.REDOCLY_AUTHORIZATION = 'test-api-key';
+        remotes.push.mockRestore();
+        remotes.push.mockRejectedValueOnce(new api_1.ReuniteApiError('Deprecated.', 412));
+        fsStatSyncSpy.mockReturnValueOnce({
+            isDirectory() {
+                return false;
+            },
+        });
+        pathResolveSpy.mockImplementationOnce((p) => p);
+        pathRelativeSpy.mockImplementationOnce((_, p) => p);
+        pathDirnameSpy.mockImplementation((_) => '.');
+        expect((0, push_1.handlePush)({
+            argv: {
+                domain: 'test-domain',
+                'mount-path': 'test-mount-path',
+                organization: 'test-org',
+                project: 'test-project',
+                branch: 'test-branch',
+                namespace: 'test-namespace',
+                repository: 'test-repository',
+                'commit-sha': 'test-commit-sha',
+                'commit-url': 'test-commit-url',
+                'default-branch': 'test-branch',
+                'created-at': 'test-created-at',
+                author: 'TestAuthor <test-author@mail.com>',
+                message: 'Test message',
+                files: ['test-file'],
+                'max-execution-time': 10,
+            },
+            config: mockConfig,
+            version: 'cli-version',
+        })).rejects.toThrow('✗ File upload failed. Reason: Deprecated.');
     });
 });

package/lib/cms/commands/__tests__/utils.test.js

@@ -26,7 +26,7 @@ describe('retryUntilConditionMet()', () => {
             condition: (result) => result?.status === 'done',
             retryIntervalMs: 100,
             retryTimeoutMs: 1000,
-        })).rejects.toThrow('Timeout exceeded');
+        })).rejects.toThrow('Timeout exceeded.');
     });
     it('should call "onConditionNotMet" and "onRetry" callbacks', async () => {
         const operation = jest

package/lib/cms/commands/push-status.d.ts

@@ -20,4 +20,4 @@ export interface PushStatusSummary {
     production: DeploymentStatusResponse | null;
     commit: PushResponse['commit'];
 }
-export declare function handlePushStatus({ argv, config, }: CommandArgs<PushStatusOptions>): Promise<PushStatusSummary | undefined>;
+export declare function handlePushStatus({ argv, config, version, }: CommandArgs<PushStatusOptions>): Promise<PushStatusSummary | void>;

package/lib/cms/commands/push-status.js

@@ -9,7 +9,7 @@ const api_1 = require("../api");
 const js_utils_1 = require("../../utils/js-utils");
 const utils_2 = require("./utils");
 const RETRY_INTERVAL_MS = 5000; // 5 sec
-async function handlePushStatus({ argv, config, }) {
+async function handlePushStatus({ argv, config, version, }) {
     const startedAt = performance.now();
     const spinner = new spinner_1.Spinner();
     const { organization, project: projectId, pushId, wait } = argv;
@@ -28,7 +28,7 @@ async function handlePushStatus({ argv, config, }) {
     const continueOnDeployFailures = argv['continue-on-deploy-failures'] || false;
     try {
         const apiKey = (0, api_1.getApiKeys)(domain);
-        const client = new api_1.ReuniteApiClient(domain, apiKey);
+        const client = new api_1.ReuniteApiClient({ domain, apiKey, version, command: 'push-status' });
         let pushResponse;
         pushResponse = await (0, utils_2.retryUntilConditionMet)({
             operation: () => client.remotes.getPush({
@@ -128,11 +128,7 @@ async function handlePushStatus({ argv, config, }) {
     }
     catch (err) {
         spinner.stop(); // Spinner can block process exit, so we need to stop it explicitly.
-        const message = err instanceof utils_1.DeploymentError
-            ? err.message
-            : `✗ Failed to get push status. Reason: ${err.message}\n`;
-        (0, miscellaneous_1.exitWithError)(message);
-        return;
+        (0, utils_2.handleReuniteError)('✗ Failed to get push status.', err);
     }
     finally {
         spinner.stop(); // Spinner can block process exit, so we need to stop it explicitly.

package/lib/cms/commands/push.js

@@ -9,13 +9,14 @@ const colorette_1 = require("colorette");
 const miscellaneous_1 = require("../../utils/miscellaneous");
 const push_status_1 = require("./push-status");
 const api_1 = require("../api");
+const utils_2 = require("./utils");
 async function handlePush({ argv, config, version, }) {
     const startedAt = performance.now(); // for printing execution time
     const startTime = Date.now(); // for push-status command
     const { organization, project: projectId, 'mount-path': mountPath, verbose } = argv;
     const orgId = organization || config.organization;
     if (!argv.message || !argv.author || !argv.branch) {
-        (0, miscellaneous_1.exitWithError)('Error: message, author and branch are required for push to the CMS.');
+        (0, miscellaneous_1.exitWithError)('Error: message, author and branch are required for push to the Reunite.');
     }
     if (!orgId) {
         return (0, miscellaneous_1.exitWithError)(`No organization provided, please use --organization option or specify the 'organization' field in the config file.`);
@@ -32,7 +33,7 @@ async function handlePush({ argv, config, version, }) {
         if (!filesToUpload.length) {
             return (0, miscellaneous_1.printExecutionTime)('push', startedAt, `No files to upload`);
         }
-        const client = new api_1.ReuniteApiClient(domain, apiKey);
+        const client = new api_1.ReuniteApiClient({ domain, apiKey, version, command: 'push' });
         const projectDefaultBranch = await client.remotes.getDefaultBranch(orgId, projectId);
         const remote = await client.remotes.upsert(orgId, projectId, {
             mountBranchName: projectDefaultBranch,
@@ -82,8 +83,7 @@ async function handlePush({ argv, config, version, }) {
         };
     }
     catch (err) {
-        const message = err instanceof miscellaneous_1.HandledError ? '' : `✗ File upload failed. Reason: ${err.message}`;
-        (0, miscellaneous_1.exitWithError)(message);
+        (0, utils_2.handleReuniteError)('✗ File upload failed.', err);
     }
 }
 function parseCommitAuthor(author) {

package/lib/cms/commands/utils.d.ts

@@ -1,3 +1,5 @@
+import { DeploymentError } from '../utils';
+import type { ReuniteApiError } from '../api';
 /**
  * This function retries an operation until a condition is met or a timeout is exceeded.
  * If the condition is not met within the timeout, an error is thrown.
@@ -20,3 +22,4 @@ retryIntervalMs, }: {
     retryTimeoutMs?: number;
     retryIntervalMs?: number;
 }): Promise<T>;
+export declare function handleReuniteError(message: string, error: ReuniteApiError | DeploymentError | Error): void;

package/lib/cms/commands/utils.js

@@ -1,7 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.retryUntilConditionMet = retryUntilConditionMet;
+exports.handleReuniteError = handleReuniteError;
 const openapi_core_1 = require("@redocly/openapi-core");
+const utils_1 = require("../utils");
+const miscellaneous_1 = require("../../utils/miscellaneous");
 /**
  * This function retries an operation until a condition is met or a timeout is exceeded.
  * If the condition is not met within the timeout, an error is thrown.
@@ -26,7 +29,7 @@ retryIntervalMs = 5000, // 5 sec
             return result;
         }
         else if (Date.now() - startTime > retryTimeoutMs) {
-            throw new Error('Timeout exceeded');
+            throw new Error('Timeout exceeded.');
         }
         else {
             onConditionNotMet?.(result);
@@ -37,3 +40,7 @@ retryIntervalMs = 5000, // 5 sec
     }
     return attempt();
 }
+function handleReuniteError(message, error) {
+    const errorMessage = error instanceof utils_1.DeploymentError ? error.message : `${message} Reason: ${error.message}\n`;
+    return (0, miscellaneous_1.exitWithError)(errorMessage);
+}

package/lib/commands/bundle.d.ts

@@ -4,7 +4,7 @@ export type BundleOptions = {
     apis?: string[];
     extends?: string[];
     output?: string;
-    ext: OutputExtensions;
+    ext?: OutputExtensions;
     dereferenced?: boolean;
     force?: boolean;
     metafile?: string;

package/lib/commands/bundle.js

@@ -13,7 +13,7 @@ async function handleBundle({ argv, config, version, collectSpecData, }) {
     const totals = { errors: 0, warnings: 0, ignored: 0 };
     const deprecatedOptions = [];
     (0, miscellaneous_1.checkForDeprecatedOptions)(argv, deprecatedOptions);
-    for (const { path, alias } of apis) {
+    for (const { path, alias, output } of apis) {
         try {
             const startedAt = perf_hooks_1.performance.now();
             const resolvedConfig = (0, openapi_core_1.getMergedConfig)(config, alias);
@@ -30,15 +30,21 @@ async function handleBundle({ argv, config, version, collectSpecData, }) {
                 collectSpecData,
             });
             const fileTotals = (0, openapi_core_1.getTotals)(problems);
-            const { outputFile, ext } = (0, miscellaneous_1.getOutputFileName)(path, apis.length, argv.output, argv.ext);
+            const { outputFile, ext } = (0, miscellaneous_1.getOutputFileName)({
+                entrypoint: path,
+                output,
+                argvOutput: argv.output,
+                ext: argv.ext,
+                entries: argv?.apis?.length || 0,
+            });
             if (fileTotals.errors === 0 || argv.force) {
-                if (!argv.output) {
-                    const output = (0, miscellaneous_1.dumpBundle)((0, miscellaneous_1.sortTopLevelKeysForOas)(result.parsed), argv.ext || 'yaml', argv.dereferenced);
-                    process.stdout.write(output);
+                if (!outputFile) {
+                    const bundled = (0, miscellaneous_1.dumpBundle)((0, miscellaneous_1.sortTopLevelKeysForOas)(result.parsed), argv.ext || 'yaml', argv.dereferenced);
+                    process.stdout.write(bundled);
                 }
                 else {
-                    const output = (0, miscellaneous_1.dumpBundle)((0, miscellaneous_1.sortTopLevelKeysForOas)(result.parsed), ext, argv.dereferenced);
-                    (0, miscellaneous_1.saveBundle)(outputFile, output);
+                    const bundled = (0, miscellaneous_1.dumpBundle)((0, miscellaneous_1.sortTopLevelKeysForOas)(result.parsed), ext, argv.dereferenced);
+                    (0, miscellaneous_1.saveBundle)(outputFile, bundled);
                 }
             }
             totals.errors += fileTotals.errors;
@@ -60,14 +66,14 @@ async function handleBundle({ argv, config, version, collectSpecData, }) {
             const elapsed = (0, miscellaneous_1.getExecutionTime)(startedAt);
             if (fileTotals.errors > 0) {
                 if (argv.force) {
-                    process.stderr.write(`❓ Created a bundle for ${(0, colorette_1.blue)(path)} at ${(0, colorette_1.blue)(outputFile)} with errors ${(0, colorette_1.green)(elapsed)}.\n${(0, colorette_1.yellow)('Errors ignored because of --force')}.\n`);
+                    process.stderr.write(`❓ Created a bundle for ${(0, colorette_1.blue)(path)} at ${(0, colorette_1.blue)(outputFile || 'stdout')} with errors ${(0, colorette_1.green)(elapsed)}.\n${(0, colorette_1.yellow)('Errors ignored because of --force')}.\n`);
                 }
                 else {
                     process.stderr.write(`❌ Errors encountered while bundling ${(0, colorette_1.blue)(path)}: bundle not created (use --force to ignore errors).\n`);
                 }
             }
             else {
-                process.stderr.write(`📦 Created a bundle for ${(0, colorette_1.blue)(path)} at ${(0, colorette_1.blue)(outputFile)} ${(0, colorette_1.green)(elapsed)}.\n`);
+                process.stderr.write(`📦 Created a bundle for ${(0, colorette_1.blue)(path)} at ${(0, colorette_1.blue)(outputFile || 'stdout')} ${(0, colorette_1.green)(elapsed)}.\n`);
             }
             const removedCount = meta.visitorsData?.['remove-unused-components']?.removedCount;
             if (removedCount) {

package/lib/commands/eject.d.ts

@@ -2,7 +2,7 @@ import type { CommandArgs } from '../wrapper';
 import type { VerifyConfigOptions } from '../types';
 export type EjectOptions = {
     type: 'component';
-    path: string;
+    path?: string;
     'project-dir'?: string;
     force: boolean;
 } & VerifyConfigOptions;

package/lib/commands/eject.js

@@ -10,7 +10,7 @@ const handleEject = async ({ argv }) => {
         '@redocly/realm',
         'eject',
         `${argv.type}`,
-        `${argv.path}`,
+        `${argv.path ?? ''}`,
         `-d=${argv['project-dir']}`,
         argv.force ? `--force=${argv.force}` : '',
     ], { stdio: 'inherit' });

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

@@ -17,7 +17,7 @@ const previewProject = async ({ argv }) => {
     const packageName = constants_1.PRODUCT_PACKAGES[product];
     process.stdout.write(`\nLaunching preview of ${productName} ${plan} using NPX.\n\n`);
     const npxExecutableName = process.platform === 'win32' ? 'npx.cmd' : 'npx';
-    (0, child_process_1.spawn)(npxExecutableName, ['-y', packageName, 'develop', `--plan=${plan}`, `--port=${port || 4000}`], {
+    (0, child_process_1.spawn)(npxExecutableName, ['-y', packageName, 'preview', `--plan=${plan}`, `--port=${port || 4000}`], {
         stdio: 'inherit',
         cwd: projectDir,
     });

package/lib/index.js

@@ -688,7 +688,7 @@ yargs
     process.env.REDOCLY_CLI_COMMAND = 'translate';
     (0, wrapper_1.commandWrapper)(translations_1.handleTranslations)(argv);
 })
-    .command('eject <type> <path>', 'Helper function to eject project elements for customization.', (yargs) => yargs
+    .command('eject <type> [path]', 'Helper function to eject project elements for customization.', (yargs) => yargs
     .positional('type', {
     description: 'Specifies what type of project element to eject. Currently, it could be only `component`.',
     demandOption: true,
@@ -697,7 +697,6 @@ yargs
     .positional('path', {
     description: 'Filepath to a component or filepath with glob pattern.',
     type: 'string',
-    demandOption: true,
 })
     .options({
     'project-dir': {

package/lib/types.d.ts

@@ -22,6 +22,7 @@ export type Totals = {
 export type Entrypoint = {
     path: string;
     alias?: string;
+    output?: string;
 };
 export declare const outputExtensions: ReadonlyArray<BundleOutputFormat>;
 export type OutputExtensions = 'json' | 'yaml' | 'yml' | undefined;

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

@@ -39,3 +39,4 @@ export declare const sortTopLevelKeysForOas: jest.Mock<any, [document: any]>;
 export declare const getAndValidateFileExtension: jest.Mock<string | undefined, [fileName: string]>;
 export declare const writeToFileByExtension: jest.Mock<any, any>;
 export declare const checkForDeprecatedOptions: jest.Mock<any, any>;
+export declare const saveBundle: jest.Mock<any, any>;

package/lib/utils/__mocks__/miscellaneous.js

@@ -1,6 +1,6 @@
 "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;
+exports.saveBundle = 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");
 exports.getFallbackApisOrExit = jest.fn((entrypoints) => entrypoints.map((path) => ({ path })));
 exports.dumpBundle = jest.fn(() => '');
@@ -20,3 +20,4 @@ exports.sortTopLevelKeysForOas = jest.fn((document) => document);
 exports.getAndValidateFileExtension = jest.fn((fileName) => fileName.split('.').pop());
 exports.writeToFileByExtension = jest.fn();
 exports.checkForDeprecatedOptions = jest.fn();
+exports.saveBundle = jest.fn();

package/lib/utils/fetch-with-timeout.d.ts

@@ -1,2 +1,7 @@
-declare const _default: (url: string, options?: {}) => Promise<import("node-fetch").Response | undefined>;
+import { type RequestInit } from 'node-fetch';
+export declare const DEFAULT_FETCH_TIMEOUT = 3000;
+export type FetchWithTimeoutOptions = RequestInit & {
+    timeout?: number;
+};
+declare const _default: (url: string, { timeout, ...options }?: FetchWithTimeoutOptions) => Promise<import("node-fetch").Response>;
 export default _default;

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

@@ -1,24 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.DEFAULT_FETCH_TIMEOUT = void 0;
 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 = async (url, options = {}) => {
-    try {
-        const controller = new abort_controller_1.default();
-        const timeout = setTimeout(() => {
-            controller.abort();
-        }, TIMEOUT);
-        const res = await (0, node_fetch_1.default)(url, {
-            signal: controller.signal,
+exports.DEFAULT_FETCH_TIMEOUT = 3000;
+exports.default = async (url, { timeout, ...options } = {}) => {
+    if (!timeout) {
+        return (0, node_fetch_1.default)(url, {
             ...options,
             agent: (0, openapi_core_1.getProxyAgent)(),
         });
-        clearTimeout(timeout);
-        return res;
-    }
-    catch (e) {
-        return;
     }
+    const controller = new abort_controller_1.default();
+    const timeoutId = setTimeout(() => {
+        controller.abort();
+    }, timeout);
+    const res = await (0, node_fetch_1.default)(url, {
+        signal: controller.signal,
+        ...options,
+        agent: (0, openapi_core_1.getProxyAgent)(),
+    });
+    clearTimeout(timeoutId);
+    return res;
 };

package/lib/utils/miscellaneous.d.ts

@@ -25,7 +25,16 @@ export declare class HandledError extends Error {
 }
 export declare function printLintTotals(totals: Totals, definitionsCount: number): void;
 export declare function printConfigLintTotals(totals: Totals, command?: string | number): void;
-export declare function getOutputFileName(entrypoint: string, entries: number, output?: string, ext?: BundleOutputFormat): {
+export declare function getOutputFileName({ entrypoint, output, argvOutput, ext, entries, }: {
+    entrypoint: string;
+    output?: string;
+    argvOutput?: string;
+    ext?: BundleOutputFormat;
+    entries: number;
+}): {
+    ext: BundleOutputFormat;
+    outputFile?: undefined;
+} | {
     outputFile: string;
     ext: BundleOutputFormat;
 };