@redocly/cli 0.0.0-snapshot.1737556585 → 0.0.0-snapshot.1737627998

package/lib/__tests__/commands/push-region.test.js

@@ -4,59 +4,26 @@ const openapi_core_1 = require("@redocly/openapi-core");
 const push_1 = require("../../commands/push");
 const login_1 = require("../../commands/login");
 const config_1 = require("../fixtures/config");
-const node_stream_1 = require("node:stream");
-// Mock fs operations
-jest.mock('fs', () => ({
-    ...jest.requireActual('fs'),
-    createReadStream: () => {
-        const readable = new node_stream_1.Readable();
-        readable.push('test data');
-        readable.push(null);
-        return readable;
-    },
-    statSync: () => ({ size: 9 }),
-    readFileSync: () => Buffer.from('test data'),
-    existsSync: () => false,
-    readdirSync: () => [],
+jest.mock('fs');
+jest.mock('node-fetch', () => ({
+    default: jest.fn(() => ({
+        ok: true,
+        json: jest.fn().mockResolvedValue({}),
+    })),
 }));
-openapi_core_1.getMergedConfig.mockImplementation((config) => config);
-// Mock OpenAPI core
 jest.mock('@redocly/openapi-core');
 jest.mock('../../commands/login');
 jest.mock('../../utils/miscellaneous');
+openapi_core_1.getMergedConfig.mockImplementation((config) => config);
 const mockPromptClientToken = login_1.promptClientToken;
 describe('push-with-region', () => {
     const redoclyClient = require('@redocly/openapi-core').__redoclyClient;
     redoclyClient.isAuthorizedWithRedoclyByRegion = jest.fn().mockResolvedValue(false);
-    const originalFetch = fetch;
     beforeAll(() => {
-        // Mock global fetch
-        global.fetch = jest.fn(() => Promise.resolve({
-            ok: true,
-            status: 200,
-            json: () => Promise.resolve({}),
-            headers: new Headers(),
-            statusText: 'OK',
-            redirected: false,
-            type: 'default',
-            url: '',
-            clone: () => ({}),
-            body: new ReadableStream(),
-            bodyUsed: false,
-            arrayBuffer: async () => new ArrayBuffer(0),
-            blob: async () => new Blob(),
-            formData: async () => new FormData(),
-            text: async () => '',
-        }));
-    });
-    afterAll(() => {
-        global.fetch = originalFetch;
-    });
-    beforeEach(() => {
         jest.spyOn(process.stdout, 'write').mockImplementation(() => true);
     });
     it('should call login with default domain when region is US', async () => {
-        redoclyClient.domain = 'redocly.com';
+        redoclyClient.domain = 'redoc.ly';
         await (0, push_1.handlePush)({
             argv: {
                 upsert: true,
@@ -72,8 +39,6 @@ describe('push-with-region', () => {
     });
     it('should call login with EU domain when region is EU', async () => {
         redoclyClient.domain = 'eu.redocly.com';
-        // Update config for EU region
-        const euConfig = { ...config_1.ConfigFixture, region: 'eu' };
         await (0, push_1.handlePush)({
             argv: {
                 upsert: true,
@@ -81,7 +46,7 @@ describe('push-with-region', () => {
                 destination: '@org/my-api@1.0.0',
                 branchName: 'test',
             },
-            config: euConfig,
+            config: config_1.ConfigFixture,
             version: 'cli-version',
         });
         expect(mockPromptClientToken).toBeCalledTimes(1);

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

@@ -6,54 +6,21 @@ const miscellaneous_1 = require("../../utils/miscellaneous");
 const push_1 = require("../../commands/push");
 const config_1 = require("../fixtures/config");
 const colorette_1 = require("colorette");
-const node_stream_1 = require("node:stream");
-// Mock fs operations
-jest.mock('fs', () => ({
-    ...jest.requireActual('fs'),
-    createReadStream: jest.fn(() => {
-        const readable = new node_stream_1.Readable();
-        readable.push('test data');
-        readable.push(null);
-        return readable;
-    }),
-    statSync: jest.fn(() => ({ isDirectory: () => false, size: 10 })),
-    readFileSync: jest.fn(() => Buffer.from('test data')),
-    existsSync: jest.fn(() => false),
-    readdirSync: jest.fn(() => []),
+jest.mock('fs');
+jest.mock('node-fetch', () => ({
+    default: jest.fn(() => ({
+        ok: true,
+        json: jest.fn().mockResolvedValue({}),
+    })),
 }));
 jest.mock('@redocly/openapi-core');
 jest.mock('../../utils/miscellaneous');
-// Mock fetch
-const mockFetch = jest.fn(() => Promise.resolve({
-    ok: true,
-    status: 200,
-    json: () => Promise.resolve({}),
-    headers: new Headers(),
-    statusText: 'OK',
-    redirected: false,
-    type: 'default',
-    url: '',
-    clone: () => ({}),
-    body: null,
-    bodyUsed: false,
-    arrayBuffer: async () => new ArrayBuffer(0),
-    blob: async () => new Blob(),
-    formData: async () => new FormData(),
-    text: async () => '',
-}));
-const originalFetch = global.fetch;
 openapi_core_1.getMergedConfig.mockImplementation((config) => config);
 describe('push', () => {
     const redoclyClient = require('@redocly/openapi-core').__redoclyClient;
-    beforeAll(() => {
-        global.fetch = mockFetch;
-    });
     beforeEach(() => {
         jest.spyOn(process.stdout, 'write').mockImplementation(() => true);
     });
-    afterAll(() => {
-        global.fetch = originalFetch;
-    });
     it('pushes definition', async () => {
         await (0, push_1.handlePush)({
             argv: {

package/lib/__tests__/fetch-with-timeout.test.js

@@ -2,31 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const abort_controller_1 = require("abort-controller");
 const fetch_with_timeout_1 = require("../utils/fetch-with-timeout");
+const node_fetch_1 = require("node-fetch");
 const openapi_core_1 = require("@redocly/openapi-core");
 const https_proxy_agent_1 = require("https-proxy-agent");
+jest.mock('node-fetch');
 jest.mock('@redocly/openapi-core');
-const signalInstance = new abort_controller_1.default().signal;
-const mockFetch = jest.fn(() => Promise.resolve({
-    ok: true,
-    status: 200,
-    json: () => Promise.resolve({}),
-    headers: new Headers(),
-    statusText: 'OK',
-    redirected: false,
-    type: 'default',
-    url: '',
-    clone: () => ({}),
-    body: null,
-    bodyUsed: false,
-    arrayBuffer: async () => new ArrayBuffer(0),
-    blob: async () => new Blob(),
-    formData: async () => new FormData(),
-    text: async () => '',
-    signal: signalInstance,
-    dispatcher: undefined,
-}));
-const originalFetch = global.fetch;
-global.fetch = mockFetch;
 describe('fetchWithTimeout', () => {
     beforeAll(() => {
         // @ts-ignore
@@ -36,29 +16,29 @@ describe('fetchWithTimeout', () => {
     beforeEach(() => {
         openapi_core_1.getProxyAgent.mockReturnValueOnce(undefined);
     });
-    afterAll(() => {
-        global.fetch = originalFetch;
+    afterEach(() => {
+        jest.clearAllMocks();
     });
-    it('should call fetch with signal', async () => {
+    it('should call node-fetch with signal', async () => {
         await (0, fetch_with_timeout_1.default)('url', { timeout: 1000 });
         expect(global.setTimeout).toHaveBeenCalledTimes(1);
-        expect(global.fetch).toHaveBeenCalledWith('url', expect.objectContaining({
-            signal: expect.any(AbortSignal),
-            dispatcher: undefined,
-        }));
+        expect(node_fetch_1.default).toHaveBeenCalledWith('url', {
+            signal: new abort_controller_1.default().signal,
+            agent: undefined,
+        });
         expect(global.clearTimeout).toHaveBeenCalledTimes(1);
     });
-    it('should call fetch with proxy agent', async () => {
+    it('should call node-fetch with proxy agent', async () => {
         openapi_core_1.getProxyAgent.mockRestore();
         const proxyAgent = new https_proxy_agent_1.HttpsProxyAgent('http://localhost');
         openapi_core_1.getProxyAgent.mockReturnValueOnce(proxyAgent);
         await (0, fetch_with_timeout_1.default)('url');
-        expect(global.fetch).toHaveBeenCalledWith('url', { dispatcher: proxyAgent });
+        expect(node_fetch_1.default).toHaveBeenCalledWith('url', { agent: proxyAgent });
     });
-    it('should call fetch without signal when timeout is not passed', async () => {
+    it('should call node-fetch without signal when timeout is not passed', async () => {
         await (0, fetch_with_timeout_1.default)('url');
         expect(global.setTimeout).not.toHaveBeenCalled();
-        expect(global.fetch).toHaveBeenCalledWith('url', { agent: undefined });
+        expect(node_fetch_1.default).toHaveBeenCalledWith('url', { agent: undefined });
         expect(global.clearTimeout).not.toHaveBeenCalled();
     });
 });

package/lib/__tests__/wrapper.test.js

@@ -6,19 +6,11 @@ const wrapper_1 = require("../wrapper");
 const lint_1 = require("../commands/lint");
 const push_1 = require("../commands/push");
 const openapi_core_1 = require("@redocly/openapi-core");
-const mockFetch = jest.fn();
-const originalFetch = global.fetch;
+jest.mock('node-fetch');
 jest.mock('../utils/miscellaneous', () => ({
     sendTelemetry: jest.fn(),
     loadConfigAndHandleErrors: jest.fn(),
 }));
-beforeAll(() => {
-    global.fetch = mockFetch;
-});
-afterAll(() => {
-    jest.resetAllMocks();
-    global.fetch = originalFetch;
-});
 jest.mock('../commands/lint', () => ({
     handleLint: jest.fn().mockImplementation(({ collectSpecData }) => {
         collectSpecData({ openapi: '3.1.0' });

package/lib/cms/api/__tests__/api.client.test.js

@@ -1,18 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const node_fetch_1 = require("node-fetch");
+const FormData = require("form-data");
 const colorette_1 = require("colorette");
 const api_client_1 = require("../api-client");
-const originalFetch = global.fetch;
-beforeAll(() => {
-    // Reset fetch mock before each test
-    global.fetch = jest.fn();
-});
-afterAll(() => {
-    // Restore original fetch after each test
-    global.fetch = originalFetch;
-});
+jest.mock('node-fetch', () => ({
+    default: jest.fn(),
+}));
 function mockFetchResponse(response) {
-    global.fetch.mockResolvedValue(response);
+    node_fetch_1.default.mockResolvedValue(response);
 }
 describe('ApiClient', () => {
     const testToken = 'test-token';
@@ -35,7 +31,7 @@ describe('ApiClient', () => {
                 }),
             });
             const result = await apiClient.remotes.getDefaultBranch(testOrg, testProject);
-            expect(global.fetch).toHaveBeenCalledWith(`${testDomain}/api/orgs/${testOrg}/projects/${testProject}/source`, {
+            expect(node_fetch_1.default).toHaveBeenCalledWith(`${testDomain}/api/orgs/${testOrg}/projects/${testProject}/source`, {
                 method: 'GET',
                 headers: {
                     'Content-Type': 'application/json',
@@ -93,7 +89,7 @@ describe('ApiClient', () => {
                 json: jest.fn().mockResolvedValue(responseMock),
             });
             const result = await apiClient.remotes.upsert(testOrg, testProject, remotePayload);
-            expect(global.fetch).toHaveBeenCalledWith(`${testDomain}/api/orgs/${testOrg}/projects/${testProject}/remotes`, {
+            expect(node_fetch_1.default).toHaveBeenCalledWith(`${testDomain}/api/orgs/${testOrg}/projects/${testProject}/remotes`, {
                 method: 'POST',
                 headers: {
                     'Content-Type': 'application/json',
@@ -171,29 +167,29 @@ describe('ApiClient', () => {
         });
         it('should push to remote', async () => {
             let passedFormData = new FormData();
-            fetch.mockImplementationOnce(async (_, options) => {
+            node_fetch_1.default.mockImplementationOnce(async (_, options) => {
                 passedFormData = options.body;
                 return {
                     ok: true,
                     json: jest.fn().mockResolvedValue(responseMock),
                 };
             });
-            const formData = new globalThis.FormData();
+            const formData = new FormData();
             formData.append('remoteId', testRemoteId);
             formData.append('commit[message]', pushPayload.commit.message);
             formData.append('commit[author][name]', pushPayload.commit.author.name);
             formData.append('commit[author][email]', pushPayload.commit.author.email);
             formData.append('commit[branchName]', pushPayload.commit.branchName);
-            formData.append('files[some-file.yaml]', new Blob([filesMock[0].stream]));
+            formData.append('files[some-file.yaml]', filesMock[0].stream);
             const result = await apiClient.remotes.push(testOrg, testProject, pushPayload, filesMock);
-            expect(fetch).toHaveBeenCalledWith(`${testDomain}/api/orgs/${testOrg}/projects/${testProject}/pushes`, expect.objectContaining({
+            expect(node_fetch_1.default).toHaveBeenCalledWith(`${testDomain}/api/orgs/${testOrg}/projects/${testProject}/pushes`, expect.objectContaining({
                 method: 'POST',
                 headers: {
                     Authorization: `Bearer ${testToken}`,
                     'user-agent': expectedUserAgent,
                 },
             }));
-            expect(passedFormData).toEqual(formData);
+            expect(JSON.stringify(passedFormData).replace(new RegExp(passedFormData.getBoundary(), 'g'), '')).toEqual(JSON.stringify(formData).replace(new RegExp(formData.getBoundary(), 'g'), ''));
             expect(result).toEqual(responseMock);
         });
         it('should throw parsed error if response is not ok', async () => {

package/lib/cms/api/api-client.d.ts

@@ -1,6 +1,6 @@
 import { type FetchWithTimeoutOptions } from '../../utils/fetch-with-timeout';
+import type { Response } from 'node-fetch';
 import type { ReadStream } from 'fs';
-import type { Readable } from 'node:stream';
 import type { ListRemotesResponse, PushResponse, UpsertRemoteResponse } from './types';
 interface BaseApiClient {
     request(url: string, options: FetchWithTimeoutOptions): Promise<Response>;
@@ -72,5 +72,4 @@ export type PushPayload = {
     };
     isMainBranch?: boolean;
 };
-export declare function streamToBuffer(stream: ReadStream | Readable): Promise<Buffer>;
 export {};

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

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ReuniteApi = exports.ReuniteApiError = void 0;
-exports.streamToBuffer = streamToBuffer;
 const colorette_1 = require("colorette");
+const FormData = require("form-data");
 const fetch_with_timeout_1 = require("../../utils/fetch-with-timeout");
 class ReuniteApiError extends Error {
     constructor(message, status) {
@@ -120,7 +120,7 @@ class RemotesApi {
         }
     }
     async push(organizationId, projectId, payload, files) {
-        const formData = new globalThis.FormData();
+        const formData = new FormData();
         formData.append('remoteId', payload.remoteId);
         formData.append('commit[message]', payload.commit.message);
         formData.append('commit[author][name]', payload.commit.author.name);
@@ -132,10 +132,7 @@ class RemotesApi {
         payload.commit.repository && formData.append('commit[repositoryId]', payload.commit.repository);
         payload.commit.createdAt && formData.append('commit[createdAt]', payload.commit.createdAt);
         for (const file of files) {
-            const blob = Buffer.isBuffer(file.stream)
-                ? new Blob([file.stream])
-                : new Blob([await streamToBuffer(file.stream)]);
-            formData.append(`files[${file.path}]`, blob, file.path);
+            formData.append(`files[${file.path}]`, file.stream);
         }
         payload.isMainBranch && formData.append('isMainBranch', 'true');
         try {
@@ -226,10 +223,3 @@ class ReuniteApi {
     }
 }
 exports.ReuniteApi = ReuniteApi;
-async function streamToBuffer(stream) {
-    const chunks = [];
-    for await (const chunk of stream) {
-        chunks.push(chunk);
-    }
-    return Buffer.concat(chunks);
-}

package/lib/commands/push.js

@@ -7,6 +7,7 @@ exports.getDestinationProps = getDestinationProps;
 exports.getApiRoot = getApiRoot;
 const fs = require("fs");
 const path = require("path");
+const node_fetch_1 = require("node-fetch");
 const perf_hooks_1 = require("perf_hooks");
 const colorette_1 = require("colorette");
 const crypto_1 = require("crypto");
@@ -15,7 +16,6 @@ const utils_1 = require("@redocly/openapi-core/lib/utils");
 const miscellaneous_1 = require("../utils/miscellaneous");
 const login_1 = require("./login");
 const push_1 = require("../cms/commands/push");
-const api_client_1 = require("../cms/api/api-client");
 const DEFAULT_VERSION = 'latest';
 exports.DESTINATION_REGEX = 
 // eslint-disable-next-line no-useless-escape
@@ -279,23 +279,17 @@ function getApiRoot({ name, version, config: { apis }, }) {
     const api = apis?.[`${name}@${version}`] || (version === DEFAULT_VERSION && apis?.[name]);
     return api?.root;
 }
-async function uploadFileToS3(url, filePathOrBuffer) {
+function uploadFileToS3(url, filePathOrBuffer) {
     const fileSizeInBytes = typeof filePathOrBuffer === 'string'
         ? fs.statSync(filePathOrBuffer).size
         : filePathOrBuffer.byteLength;
     const readStream = typeof filePathOrBuffer === 'string' ? fs.createReadStream(filePathOrBuffer) : filePathOrBuffer;
-    const requestOptions = {
+    return (0, node_fetch_1.default)(url, {
         method: 'PUT',
         headers: {
             'Content-Length': fileSizeInBytes.toString(),
         },
-        body: Buffer.isBuffer(readStream)
-            ? new Blob([readStream])
-            : new Blob([await (0, api_client_1.streamToBuffer)(readStream)]),
-    };
-    const proxyAgent = (0, openapi_core_1.getProxyAgent)();
-    if (proxyAgent) {
-        requestOptions.dispatcher = proxyAgent;
-    }
-    return fetch(url, requestOptions);
+        body: readStream,
+        agent: (0, openapi_core_1.getProxyAgent)(),
+    });
 }

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

@@ -1,6 +1,7 @@
+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<Response>;
+declare const _default: (url: string, { timeout, ...options }?: FetchWithTimeoutOptions) => Promise<import("node-fetch").Response>;
 export default _default;

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

@@ -1,23 +1,25 @@
 "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");
 exports.DEFAULT_FETCH_TIMEOUT = 3000;
 exports.default = async (url, { timeout, ...options } = {}) => {
     if (!timeout) {
-        return fetch(url, {
+        return (0, node_fetch_1.default)(url, {
             ...options,
-            dispatcher: (0, openapi_core_1.getProxyAgent)(),
+            agent: (0, openapi_core_1.getProxyAgent)(),
         });
     }
-    const controller = new globalThis.AbortController();
+    const controller = new abort_controller_1.default();
     const timeoutId = setTimeout(() => {
         controller.abort();
     }, timeout);
-    const res = await fetch(url, {
+    const res = await (0, node_fetch_1.default)(url, {
         signal: controller.signal,
         ...options,
-        dispatcher: (0, openapi_core_1.getProxyAgent)(),
+        agent: (0, openapi_core_1.getProxyAgent)(),
     });
     clearTimeout(timeoutId);
     return res;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redocly/cli",
-  "version": "0.0.0-snapshot.1737556585",
+  "version": "0.0.0-snapshot.1737627998",
   "description": "",
   "license": "MIT",
   "bin": {
@@ -8,8 +8,8 @@
     "redocly": "bin/cli.js"
   },
   "engines": {
-    "node": ">=18.17.0",
-    "npm": ">=10.8.2"
+    "node": ">=14.19.0",
+    "npm": ">=7.0.0"
   },
   "engineStrict": true,
   "scripts": {
@@ -36,7 +36,7 @@
     "Roman Hotsiy <roman@redocly.com> (https://redocly.com/)"
   ],
   "dependencies": {
-    "@redocly/openapi-core": "0.0.0-snapshot.1737556585",
+    "@redocly/openapi-core": "0.0.0-snapshot.1737627998",
     "abort-controller": "^3.0.0",
     "chokidar": "^3.5.1",
     "colorette": "^1.2.0",
@@ -46,6 +46,7 @@
     "glob": "^7.1.6",
     "handlebars": "^4.7.6",
     "mobx": "^6.0.4",
+    "node-fetch": "^2.6.1",
     "pluralize": "^8.0.0",
     "react": "^17.0.0 || ^18.2.0",
     "react-dom": "^17.0.0 || ^18.2.0",