Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions packages/operators/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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)


Expand Down
2 changes: 1 addition & 1 deletion packages/operators/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@rxjs-collection/operators",
"version": "1.0.7-beta.1",
"version": "1.0.7",
"description": "rxjs operators",
"license": "MIT",
"contributors": [
Expand Down
2 changes: 1 addition & 1 deletion packages/operators/src/request/cache.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ReplaySubject, share, timer } from 'rxjs';

export const cache = ttl => {
export const cache = ({ ttl = 0 } = {}) => {
return source =>
source.pipe(
share({
Expand Down
2 changes: 1 addition & 1 deletion packages/operators/src/request/cache.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 = '-^!';
Expand Down
6 changes: 4 additions & 2 deletions packages/operators/src/request/request.js
Original file line number Diff line number Diff line change
@@ -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 => {
Expand All @@ -13,7 +14,8 @@ export const request = options => {
return throwError(() => new Error('Failed to fetch: resource not valid'));
}
}),
networkRetry(options)
networkRetry(retry),
caching(cache)
);
};

Expand Down
2 changes: 1 addition & 1 deletion packages/operators/src/request/request.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
});
Expand Down
Loading