Merge pull request #68 from basics/feature/fetch-cleanup

StephanGerbeth · web-flow · commit 8b2f2ecbd117 · 2024-10-25T14:15:47.000+02:00
Feature/fetch cleanup
diff --git a/packages/observables/CHANGELOG.md b/packages/observables/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Project Changelog
 
+# [@rxjs-collection/observables-v1.0.4](https://github.com/basics/rxjs-collection/compare/@rxjs-collection/observables-v1.0.3...@rxjs-collection/observables-v1.0.4) (2024-10-24)
+
+
+### Bug Fixes
+
+* **fetch:** added fetch operators ([e248db8](https://github.com/basics/rxjs-collection/commit/e248db81cd681366c0654f30a2b0f664e1e30a5c))
+
 # [@rxjs-collection/observables-v1.0.4-beta.1](https://github.com/basics/rxjs-collection/compare/@rxjs-collection/observables-v1.0.3...@rxjs-collection/observables-v1.0.4-beta.1) (2024-10-24)
 
 
diff --git a/packages/observables/package.json b/packages/observables/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rxjs-collection/observables",
-  "version": "1.0.4-beta.1",
+  "version": "1.0.4",
   "description": "rxjs observables",
   "license": "MIT",
   "contributors": [
diff --git a/packages/operators/CHANGELOG.md b/packages/operators/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Project Changelog
 
+# [@rxjs-collection/operators-v1.0.3](https://github.com/basics/rxjs-collection/compare/@rxjs-collection/operators-v1.0.2...@rxjs-collection/operators-v1.0.3) (2024-10-24)
+
+
+### Bug Fixes
+
+* **deps:** pin dependencies ([dfd1950](https://github.com/basics/rxjs-collection/commit/dfd1950821e2a1436bcd0dfde45b5b07c63dd2b8))
+* **fetch:** added fetch operators ([e248db8](https://github.com/basics/rxjs-collection/commit/e248db81cd681366c0654f30a2b0f664e1e30a5c))
+* **fetch:** added logs and cleanup ([025ea93](https://github.com/basics/rxjs-collection/commit/025ea930df68d7eb1cc28cd64c642e51f498c69c))
+* **fetch:** added logs to test and cleanup ([3ef05aa](https://github.com/basics/rxjs-collection/commit/3ef05aa55345da1dd4dec416bb17554d5c457743))
+* **fetch:** cleanup ([522f2ca](https://github.com/basics/rxjs-collection/commit/522f2ca06ea0d1141d596f31e9b626cfb71e8f31))
+* **fetch:** cleanup ([c56babb](https://github.com/basics/rxjs-collection/commit/c56babbc77214eb589f5c0ef2e4ed8e854f0892c))
+* **fetch:** cleanup tests ([3d20b2e](https://github.com/basics/rxjs-collection/commit/3d20b2e2daa5d64b708418dc7a694ad3ec47f0be))
+* **fetch:** polling completed and cleanup of operators ([cc64c16](https://github.com/basics/rxjs-collection/commit/cc64c1631007c1ab659a4f559b4e946dc3f682ab))
+
 # [@rxjs-collection/operators-v1.0.3-beta.2](https://github.com/basics/rxjs-collection/compare/@rxjs-collection/operators-v1.0.3-beta.1...@rxjs-collection/operators-v1.0.3-beta.2) (2024-10-24)
 
 
diff --git a/packages/operators/package.json b/packages/operators/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rxjs-collection/operators",
-  "version": "1.0.3-beta.2",
+  "version": "1.0.3",
   "description": "rxjs operators",
   "license": "MIT",
   "contributors": [
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
diff --git a/packages/operators/src/fetch/resolve.test.js b/packages/operators/src/fetch/resolve.test.js
diff --git a/packages/operators/src/fetch/response.js b/packages/operators/src/fetch/response.js
@@ -1,6 +1,22 @@
 import { shallowEqual } from 'fast-equals';
 import { concatMap, distinctUntilChanged, map } from 'rxjs';
 
+export const resolve = (type = 'json') => {
+  return source => source.pipe(concatMap(e => e[String(type)]()));
+};
+
+export const resolveJSON = () => {
+  return resolve('json');
+};
+
+export const resolveText = () => {
+  return resolve('text');
+};
+
+export const resolveBlob = () => {
+  return resolve('blob');
+};
+
 export const distinctUntilResponseChanged = () => {
   return source =>
     source.pipe(
diff --git a/packages/operators/src/fetch/response.test.js b/packages/operators/src/fetch/response.test.js
diff --git a/packages/operators/src/fetch/upload.js b/packages/operators/src/fetch/upload.js
diff --git a/packages/operators/src/fetch/upload.test.js b/packages/operators/src/fetch/upload.test.js

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@rxjs-collection/observables",`
`3`		`- "version": "1.0.4-beta.1",`
	`3`	`+ "version": "1.0.4",`
`4`	`4`	`"description": "rxjs observables",`
`5`	`5`	`"license": "MIT",`
`6`	`6`	`"contributors": [`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@rxjs-collection/operators",`
`3`		`- "version": "1.0.3-beta.2",`
	`3`	`+ "version": "1.0.3",`
`4`	`4`	`"description": "rxjs operators",`
`5`	`5`	`"license": "MIT",`
`6`	`6`	`"contributors": [`