Merge pull request #88 from basics/beta

Beta

Author: StephanGerbeth

packages/operators/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Project Changelog
 
+# [@rxjs-collection/operators-v1.0.8-beta.2](https://github.com/basics/rxjs-collection/compare/@rxjs-collection/operators-v1.0.8-beta.1...@rxjs-collection/operators-v1.0.8-beta.2) (2024-11-24)
+
+
+### Bug Fixes
+
+* **operators:** retry cleanup ([c46cbbe](https://github.com/basics/rxjs-collection/commit/c46cbbe1f06e9ab16ea551789fd3e8a3e85c7d1b))
+
+# [@rxjs-collection/operators-v1.0.8-beta.1](https://github.com/basics/rxjs-collection/compare/@rxjs-collection/operators-v1.0.7...@rxjs-collection/operators-v1.0.8-beta.1) (2024-11-24)
+
+
+### Bug Fixes
+
+* **operators:** optimized option declaration and added cache to request ([e1a0d3e](https://github.com/basics/rxjs-collection/commit/e1a0d3ed84e3d2c44cbdc939dfac48b330138b23))
+
 # [@rxjs-collection/operators-v1.0.7](https://github.com/basics/rxjs-collection/compare/@rxjs-collection/operators-v1.0.6...@rxjs-collection/operators-v1.0.7) (2024-11-24)
 
 

packages/operators/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rxjs-collection/operators",
-  "version": "1.0.7",
+  "version": "1.0.8-beta.2",
   "description": "rxjs operators",
   "license": "MIT",
   "contributors": [

packages/operators/src/request/cache.js

@@ -1,6 +1,6 @@
 import { ReplaySubject, share, timer } from 'rxjs';
 
-export const cache = ttl => {
+export const cache = ({ ttl = 0 } = {}) => {
   return source =>
     source.pipe(
       share({

packages/operators/src/request/cache.test.js

@@ -22,7 +22,7 @@ describe('cache', () => {
     testScheduler.run(({ cold, expectObservable }) => {
       const stream = cold('a', { a: () => triggerVal.shift() }).pipe(
         map(fn => fn()),
-        cache(2)
+        cache({ ttl: 2 })
       );
 
       const unsubA = '-^!';

packages/operators/src/request/request.js

@@ -1,9 +1,10 @@
 import { concatMap, from, throwError } from 'rxjs';
 
+import { cache } from './cache';
 import { resolveBlob, resolveJSON, resolveText } from './response';
-import { networkRetry } from './retry';
+import { retryWhenError } from './retry';
 
-export const request = options => {
+export const request = ({ retry, cache: cacheOptions } = {}) => {
   return source =>
     source.pipe(
       concatMap(req => {
@@ -13,7 +14,8 @@ export const request = options => {
           return throwError(() => new Error('Failed to fetch: resource not valid'));
         }
       }),
-      networkRetry(options)
+      retryWhenError(retry),
+      cache(cacheOptions)
     );
 };
 

packages/operators/src/request/request.test.js

@@ -67,7 +67,7 @@ describe('request', () => {
 
     testScheduler.run(({ cold, expectObservable }) => {
       const stream = cold('a|', { a: () => triggerVal.shift()() }).pipe(
-        request({ timeout: () => 5 })
+        request({ retry: { timeout: () => 5 } })
       );
       expectObservable(stream).toBe('----------c|', expectedVal);
     });

packages/operators/src/request/retry.js

@@ -16,7 +16,7 @@ import { connectionObservable } from '../../../observables/src/dom/window.js';
 
 const defaultTimeout = count => Math.min(60000, Math.pow(count, 2) * 1000);
 
-export const networkRetry = ({ timeout = defaultTimeout, count } = {}) => {
+export const retryWhenError = ({ timeout = defaultTimeout, count } = {}) => {
   let counter = 0;
 
   return source => {

packages/operators/src/request/retry.test.js

@@ -3,7 +3,7 @@ import { TestScheduler } from 'rxjs/testing';
 import { beforeEach, describe, expect, test } from 'vitest';
 
 import { log } from '../log';
-import { networkRetry } from './retry';
+import { retryWhenError } from './retry';
 
 describe('request retry', () => {
   let testScheduler;
@@ -26,7 +26,7 @@ describe('request retry', () => {
       // if you define a delay, you have to add the delay to the subscribe multiple times (num retries)
       const stream = cold('a|', { a: () => triggerVal.shift() }).pipe(
         map(fn => fn()),
-        networkRetry({ timeout: () => 5 }),
+        retryWhenError({ timeout: () => 5 }),
         log('marble:result')
       );