diff --git a/packages/operators/CHANGELOG.md b/packages/operators/CHANGELOG.md index 9a80605..a004479 100644 --- a/packages/operators/CHANGELOG.md +++ b/packages/operators/CHANGELOG.md @@ -1,5 +1,12 @@ # Project Changelog +# [@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) + + +### Bug Fixes + +* **operators:** cleanup ([daec245](https://github.com/basics/rxjs-collection/commit/daec245ffb1f6c5ea9001a47cb84a26717c45502)) + # [@rxjs-collection/operators-v1.0.7-beta.1](https://github.com/basics/rxjs-collection/compare/@rxjs-collection/operators-v1.0.6...@rxjs-collection/operators-v1.0.7-beta.1) (2024-11-24) diff --git a/packages/operators/package.json b/packages/operators/package.json index 916fcde..8a7dd99 100644 --- a/packages/operators/package.json +++ b/packages/operators/package.json @@ -1,6 +1,6 @@ { "name": "@rxjs-collection/operators", - "version": "1.0.7-beta.1", + "version": "1.0.7", "description": "rxjs operators", "license": "MIT", "contributors": [ diff --git a/packages/operators/src/request/cache.js b/packages/operators/src/request/cache.js index 0ab8e88..01c7d05 100644 --- a/packages/operators/src/request/cache.js +++ b/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({ diff --git a/packages/operators/src/request/cache.test.js b/packages/operators/src/request/cache.test.js index f0af385..6287682 100644 --- a/packages/operators/src/request/cache.test.js +++ b/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 = '-^!'; diff --git a/packages/operators/src/request/request.js b/packages/operators/src/request/request.js index bd9a992..3fd8b6e 100644 --- a/packages/operators/src/request/request.js +++ b/packages/operators/src/request/request.js @@ -1,9 +1,10 @@ import { concatMap, from, throwError } from 'rxjs'; +import { cache as caching } from './cache'; import { resolveBlob, resolveJSON, resolveText } from './response'; import { networkRetry } from './retry'; -export const request = options => { +export const request = ({ retry, cache } = {}) => { 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) + networkRetry(retry), + caching(cache) ); }; diff --git a/packages/operators/src/request/request.test.js b/packages/operators/src/request/request.test.js index c20739c..e0e849c 100644 --- a/packages/operators/src/request/request.test.js +++ b/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); });