fix(fetch): optimized code segmentation

StephanGerbeth · StephanGerbeth · commit 9bcd2f317b8e · 2024-10-25T14:13:02.000+02:00
diff --git a/packages/operators/src/fetch/autoPagination.js b/packages/operators/src/fetch/autoPagination.js
@@ -1,17 +1,17 @@
 import { concatMap, expand, filter, from, map } from 'rxjs';
 
-import { download } from './download';
+import { request } from './request';
 
 export const autoPagination = ({ resolveRoute }) => {
   return source =>
     source.pipe(
       concatMap(({ url }) => {
         return from(resolveRoute(url)).pipe(
-          download(),
+          request(),
           expand(resp =>
             from(resolveRoute(url, resp)).pipe(
               filter(url => !!url),
-              download()
+              request()
             )
           )
         );
diff --git a/packages/operators/src/fetch/autoPagination.test.js b/packages/operators/src/fetch/autoPagination.test.js
@@ -3,7 +3,7 @@ import { beforeEach, describe, expect, test } from 'vitest';
 
 import { log } from '../log';
 import { autoPagination } from './autoPagination';
-import { resolveJSON } from './resolve';
+import { resolveJSON } from './response';
 
 describe('auto pagination', function () {
   beforeEach(function () {
diff --git a/packages/operators/src/fetch/concurrentDownload.js b/packages/operators/src/fetch/concurrentDownload.js
@@ -1,7 +1,7 @@
 import { mergeMap, of } from 'rxjs';
 
-import { download } from './download';
+import { request } from './request';
 
 export const concurrentDownload = (concurrent = 1) => {
-  return source => source.pipe(mergeMap(url => of(url).pipe(download()), concurrent));
+  return source => source.pipe(mergeMap(url => of(url).pipe(request()), concurrent));
 };
diff --git a/packages/operators/src/fetch/concurrentDownload.test.js b/packages/operators/src/fetch/concurrentDownload.test.js
@@ -3,7 +3,7 @@ import { beforeEach, describe, expect, test } from 'vitest';
 
 import { log } from '../log';
 import { concurrentDownload } from './concurrentDownload';
-import { resolveJSON } from './resolve';
+import { resolveJSON } from './response';
 
 describe('multi fetch', function () {
   beforeEach(function () {
diff --git a/packages/operators/src/fetch/download.js b/packages/operators/src/fetch/download.js
diff --git a/packages/operators/src/fetch/download.test.js b/packages/operators/src/fetch/download.test.js
diff --git a/packages/operators/src/fetch/lazyPagination.test.js b/packages/operators/src/fetch/lazyPagination.test.js
@@ -3,7 +3,7 @@ import { beforeEach, describe, expect, test } from 'vitest';
 
 import { log } from '../log';
 import { lazyPagination } from './lazyPagination';
-import { resolveJSON } from './resolve';
+import { resolveJSON } from './response';
 
 describe('lazy pagination operator', function () {
   beforeEach(function () {
diff --git a/packages/operators/src/fetch/polling.js b/packages/operators/src/fetch/polling.js
@@ -1,13 +1,13 @@
 import { delay, expand, of } from 'rxjs';
 
-import { download } from './download';
+import { request } from './request';
 import { distinctUntilResponseChanged } from './response';
 
 export const polling = (timeout = 1000) => {
   return source =>
     source.pipe(
-      download(),
-      expand(resp => of(resp.url).pipe(delay(timeout), download())),
+      request(),
+      expand(resp => of(resp.url).pipe(delay(timeout), request())),
       distinctUntilResponseChanged()
     );
 };
diff --git a/packages/operators/src/fetch/polling.test.js b/packages/operators/src/fetch/polling.test.js
@@ -4,7 +4,7 @@ import { afterEach, beforeEach, describe, expect, test } from 'vitest';
 
 import { log } from '../log';
 import { polling } from './polling';
-import { resolveJSON } from './resolve';
+import { resolveJSON } from './response';
 
 describe('polling', function () {
   beforeEach(function () {
diff --git a/packages/operators/src/fetch/request.js b/packages/operators/src/fetch/request.js
@@ -1,5 +1,6 @@
 import { concatMap } from 'rxjs';
 
+import { resolveBlob, resolveJSON, resolveText } from './response';
 import { networkRetry } from './retry';
 
 export const request = () => {
@@ -9,3 +10,15 @@ export const request = () => {
       networkRetry()
     );
 };
+
+export const requestJSON = () => {
+  return source => source.pipe(request(), resolveJSON());
+};
+
+export const requestText = () => {
+  return source => source.pipe(request(), resolveText());
+};
+
+export const requestBlob = () => {
+  return source => source.pipe(request(), resolveBlob());
+};
diff --git a/packages/operators/src/fetch/request.test.js b/packages/operators/src/fetch/request.test.js
@@ -1,9 +1,46 @@
 import fetchMock from 'fetch-mock';
+import { readFile } from 'node:fs/promises';
 import { of } from 'rxjs';
 import { afterEach, test, describe, beforeEach, expect } from 'vitest';
 
 import { log } from '../log.js';
-import { request } from './request.js';
+import { request, requestJSON } from './request.js';
+import { resolveJSON } from './response.js';
+
+describe('request observable with default ', function () {
+  test('successfull upload', async () => {
+    const formData = new FormData();
+    formData.set(
+      'file',
+      new File(
+        [
+          new Blob([await readFile('./packages/operators/fixtures/images/test_image.jpg')], {
+            type: 'image/jpeg'
+          })
+        ],
+        'test_image.jpg'
+      )
+    );
+
+    const req = new Request(new URL('https://api.escuelajs.co/api/v1/files/upload'), {
+      method: 'POST',
+      body: formData
+    });
+
+    return new Promise(done => {
+      of(req)
+        .pipe(request(), log(false), resolveJSON(), log(true))
+        .subscribe({
+          next: e => {
+            expect(e)
+              .deep.includes({ originalname: 'test_image.jpg' })
+              .have.all.keys('filename', 'location');
+          },
+          complete: () => done()
+        });
+    });
+  });
+});
 
 describe('request observable with default operators', function () {
   beforeEach(function () {
@@ -18,6 +55,17 @@ describe('request observable with default operators', function () {
       },
       { delay: 0, repeat: 4 }
     );
+
+    fetchMock.get(
+      'https://awesome.mock/delayed-response',
+      () => {
+        return new Response(JSON.stringify({ hello: 'fast world' }), {
+          status: 200,
+          headers: { 'Content-type': 'application/json' }
+        });
+      },
+      { delay: 1000 }
+    );
   });
 
   afterEach(function () {
@@ -33,4 +81,24 @@ describe('request observable with default operators', function () {
           complete: () => done()
         });
     }));
+
+  test('successfull request - indirect json resolve', () =>
+    new Promise(done => {
+      of('https://awesome.mock/delayed-response')
+        .pipe(request(), log(false), resolveJSON(), log(false))
+        .subscribe({
+          next: data => expect(data).deep.equal({ hello: 'fast world' }),
+          complete: () => done()
+        });
+    }));
+
+  test('successfull request - direct json resolve', () =>
+    new Promise(done => {
+      of('https://awesome.mock/delayed-response')
+        .pipe(requestJSON(), log(false))
+        .subscribe({
+          next: data => expect(data).deep.equal({ hello: 'fast world' }),
+          complete: () => done()
+        });
+    }));
 });
diff --git a/packages/operators/src/fetch/resolve.js b/packages/operators/src/fetch/resolve.js
