Thanks to visit codestin.com
Credit goes to github.com

Skip to content

added logging to the hold method #678

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
d-stolyar wants to merge 6 commits into
base: main
Choose a base branch
from
+89 −25
Open

added logging to the hold method #678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c26f2b2
added logging to the hold method
distoliar Apr 22, 2021
056bfc0
unit test was added
distoliar May 11, 2021
5aab5ef
ErrorHandler was added
distoliar May 14, 2021
39404eb
fix code style
distoliar May 14, 2021
8c3a9c1
comment was added
distoliar Jul 7, 2021
be81e89
Merge branch 'master' into fix/hold-log-error
BioPhoton Aug 23, 2021
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
19 changes: 18 additions & 1 deletion libs/state/spec/rx-state.service.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { ErrorHandler, Injector } from '@angular/core';
// tslint:disable-next-line:nx-enforce-module-boundaries
import { jestMatcher } from '@test-helpers';
import { fakeAsync, TestBed } from '@angular/core/testing';
Expand All @@ -10,7 +11,10 @@ import { TestScheduler } from 'rxjs/testing';
// tslint:disable-next-line:nx-enforce-module-boundaries
import { RxState, select } from '@rx-angular/state';
import { map, pluck, switchMap, take, takeUntil } from 'rxjs/operators';
import { asyncScheduler, from, interval, of, scheduled, Subject } from 'rxjs';
import { from, interval, of, Subject, throwError, asyncScheduler, from, interval, scheduled, Subject } from 'rxjs';
import {
ɵsetCurrentInjector as setCurrentInjector
} from '@angular/core';

function setupState<T extends object>(cfg: { initialState?: T }) {
const { initialState } = { ...cfg };
Expand Down Expand Up @@ -587,5 +591,18 @@ describe('RxStateService', () => {
state.hold(of(1, 2, 3), effect);
expect(calls).toBe(3);
}));

it('should invoke provided ErrorHandler', fakeAsync(() => {
const state = setupState({ initialState: initialPrimitiveState });
const customErrorHandler: ErrorHandler = {
handleError: jest.fn()
};
TestBed.overrideProvider(ErrorHandler, { useValue: customErrorHandler });
setCurrentInjector(TestBed.inject(Injector));
state.hold(throwError(new Error('something went wrong')));
expect(customErrorHandler.handleError).toHaveBeenCalledWith(
new Error('something went wrong')
);
}));
});
});
95 changes: 71 additions & 24 deletions libs/state/src/lib/rx-state.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,32 @@
import { Injectable, OnDestroy } from '@angular/core';
import { EMPTY, isObservable, Observable, OperatorFunction, Subscribable, Subscription, Unsubscribable } from 'rxjs';
import {
ErrorHandler,
inject,
Injectable,
InjectFlags,
OnDestroy,
} from '@angular/core';
import {
EMPTY,
isObservable,
Observable,
OperatorFunction,
Subscribable,
Subscription,
Unsubscribable,
} from 'rxjs';
import { catchError, map, pluck, tap } from 'rxjs/operators';
import { isKeyOf, isOperateFnArrayGuard, isStringArrayGuard, pipeFromArray, safePluck } from './core';
import { AccumulationFn, createAccumulationObservable, createSideEffectObservable } from './cdk';
import {
isKeyOf,
isOperateFnArrayGuard,
isStringArrayGuard,
pipeFromArray,
safePluck,
} from './core';
import {
AccumulationFn,
createAccumulationObservable,
createSideEffectObservable,
} from './cdk';
import { stateful } from './rxjs/operators';

type ProjectStateFn<T> = (oldState: T) => Partial<T>;
Expand Down Expand Up @@ -120,30 +144,38 @@ export class RxState<T extends object> implements OnDestroy, Subscribable<T> {
k3: K3
): T[K1][K2][K3];
/** @internal **/
get<K1 extends keyof T,
get<
K1 extends keyof T,
K2 extends keyof T[K1],
K3 extends keyof T[K1][K2],
K4 extends keyof T[K1][K2][K3]>(k1: K1, k2: K2, k3: K3, k4: K4): T[K1][K2][K3][K4];
K4 extends keyof T[K1][K2][K3]
>(k1: K1, k2: K2, k3: K3, k4: K4): T[K1][K2][K3][K4];
/** @internal **/
get<K1 extends keyof T,
get<
K1 extends keyof T,
K2 extends keyof T[K1],
K3 extends keyof T[K1][K2],
K4 extends keyof T[K1][K2][K3],
K5 extends keyof T[K1][K2][K3][K4]>(k1: K1, k2: K2, k3: K3, k4: K4, k5: K5): T[K1][K2][K3][K4][K5];
K5 extends keyof T[K1][K2][K3][K4]
>(k1: K1, k2: K2, k3: K3, k4: K4, k5: K5): T[K1][K2][K3][K4][K5];
/** @internal **/
get<K1 extends keyof T,
get<
K1 extends keyof T,
K2 extends keyof T[K1],
K3 extends keyof T[K1][K2],
K4 extends keyof T[K1][K2][K3],
K5 extends keyof T[K1][K2][K3][K4],
K6 extends keyof T[K1][K2][K3][K4][K5]>(k1: K1, k2: K2, k3: K3, k4: K4, k5: K5, k6: K6): T[K1][K2][K3][K4][K5][K6];
K6 extends keyof T[K1][K2][K3][K4][K5]
>(k1: K1, k2: K2, k3: K3, k4: K4, k5: K5, k6: K6): T[K1][K2][K3][K4][K5][K6];
/** @internal **/
get<K1 extends keyof T,
get<
K1 extends keyof T,
K2 extends keyof T[K1],
K3 extends keyof T[K1][K2],
K4 extends keyof T[K1][K2][K3],
K5 extends keyof T[K1][K2][K3][K4],
K6 extends keyof T[K1][K2][K3][K4][K5]>(
K6 extends keyof T[K1][K2][K3][K4][K5]
>(
...keys:
| [K1]
| [K1, K2]
Expand All @@ -163,9 +195,9 @@ export class RxState<T extends object> implements OnDestroy, Subscribable<T> {
if (!!keys && keys.length) {
return safePluck(this.accumulator.state, keys);
} else {
return hasStateAnyKeys ?
this.accumulator.state :
undefined as unknown as T;
return hasStateAnyKeys
? this.accumulator.state
: ((undefined as unknown) as T);
}
}

Expand Down Expand Up @@ -472,33 +504,41 @@ export class RxState<T extends object> implements OnDestroy, Subscribable<T> {
/**
* @internal
*/
select<K1 extends keyof T,
select<
K1 extends keyof T,
K2 extends keyof T[K1],
K3 extends keyof T[K1][K2]>(k1: K1, k2: K2, k3: K3): Observable<T[K1][K2][K3]>;
K3 extends keyof T[K1][K2]
>(k1: K1, k2: K2, k3: K3): Observable<T[K1][K2][K3]>;
/**
* @internal
*/
select<K1 extends keyof T,
select<
K1 extends keyof T,
K2 extends keyof T[K1],
K3 extends keyof T[K1][K2],
K4 extends keyof T[K1][K2][K3]>(k1: K1, k2: K2, k3: K3, k4: K4): Observable<T[K1][K2][K3][K4]>;
K4 extends keyof T[K1][K2][K3]
>(k1: K1, k2: K2, k3: K3, k4: K4): Observable<T[K1][K2][K3][K4]>;
/**
* @internal
*/
select<K1 extends keyof T,
select<
K1 extends keyof T,
K2 extends keyof T[K1],
K3 extends keyof T[K1][K2],
K4 extends keyof T[K1][K2][K3],
K5 extends keyof T[K1][K2][K3][K4]>(k1: K1, k2: K2, k3: K3, k4: K4, k5: K5): Observable<T[K1][K2][K3][K4][K5]>;
K5 extends keyof T[K1][K2][K3][K4]
>(k1: K1, k2: K2, k3: K3, k4: K4, k5: K5): Observable<T[K1][K2][K3][K4][K5]>;
/**
* @internal
*/
select<K1 extends keyof T,
select<
K1 extends keyof T,
K2 extends keyof T[K1],
K3 extends keyof T[K1][K2],
K4 extends keyof T[K1][K2][K3],
K5 extends keyof T[K1][K2][K3][K4],
K6 extends keyof T[K1][K2][K3][K4][K5]>(
K6 extends keyof T[K1][K2][K3][K4][K5]
>(
k1: K1,
k2: K2,
k3: K3,
Expand Down Expand Up @@ -547,7 +587,14 @@ export class RxState<T extends object> implements OnDestroy, Subscribable<T> {
obsOrObsWithSideEffect: Observable<S>,
sideEffectFn?: (arg: S) => void
): void {
const sideEffect = obsOrObsWithSideEffect.pipe(catchError(e => EMPTY))
const sideEffect = obsOrObsWithSideEffect.pipe(
catchError((e) => {
// used injector for compatibility with https://github.com/rx-angular/rx-angular/blob/master/libs/state/docs/usage.md#inherit
const errorHandler = inject(ErrorHandler, InjectFlags.Optional);
errorHandler?.handleError(e);
return EMPTY;
})
);
if (typeof sideEffectFn === 'function') {
this.effectObservable.nextEffectObservable(
sideEffect.pipe(tap(sideEffectFn))
Expand Down