miel.truyen/nx
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

refactor(nx): rxjs lettable operators

Browse Source
This commit is contained in:
Manduro 2017-11-01 10:14:15 +01:00 committed by vsavkin
parent 058c8995f3
commit 715efa4b22
6 changed files with 41 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -49,7 +49,7 @@
"karma-jasmine": "~1.1.0", "karma-jasmine": "~1.1.0",
"karma-webpack": "2.0.4", "karma-webpack": "2.0.4",
"prettier": "1.7.4", "prettier": "1.7.4",
"rxjs": "5.4.3", "rxjs": "5.5.2",
"tslint": "5.7.0", "tslint": "5.7.0",
"typescript": "2.5.3" "typescript": "2.5.3"
}, },

6
packages/nx/package.json
View File

@ -4,10 +4,12 @@
"description": "Nrwl Extensions for Angular", "description": "Nrwl Extensions for Angular",
"main": "index.js", "main": "index.js",
"types": "index.d.js", "types": "index.d.js",
"dependencies" :{ "dependencies": {
"jasmine-marbles": "0.1.0" "jasmine-marbles": "0.1.0"
}, },
"peerDependencies" :{}, "peerDependencies": {
"rxjs": "^5.5.0"
},
"author": "Victor Savkin", "author": "Victor Savkin",
"license": "MIT" "license": "MIT"
} }

8
packages/nx/spec/data-persistence.spec.ts
View File

@ -1,5 +1,3 @@
import 'rxjs/add/operator/delay';
import { Component, Injectable } from '@angular/core'; import { Component, Injectable } from '@angular/core';
import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing'; import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
import { ActivatedRouteSnapshot, Router } from '@angular/router'; import { ActivatedRouteSnapshot, Router } from '@angular/router';
@ -11,7 +9,7 @@ import { Store, StoreModule } from '@ngrx/store';
import { Observable } from 'rxjs/Observable'; import { Observable } from 'rxjs/Observable';
import { of } from 'rxjs/observable/of'; import { of } from 'rxjs/observable/of';
import { _throw } from 'rxjs/observable/throw'; import { _throw } from 'rxjs/observable/throw';
import { delay } from 'rxjs/operator/delay'; import { delay } from 'rxjs/operators';
import { Subject } from 'rxjs/Subject'; import { Subject } from 'rxjs/Subject';
import { DataPersistence } from '../index'; import { DataPersistence } from '../index';
@ -249,7 +247,7 @@ describe('DataPersistence', () => {
return of({ return of({
type: 'TODOS', type: 'TODOS',
payload: { user: state.user, todos: 'some todos' } payload: { user: state.user, todos: 'some todos' }
}).delay(1); }).pipe(delay(1));
}, },
onError: (a, e: any) => null onError: (a, e: any) => null
@ -295,7 +293,7 @@ describe('DataPersistence', () => {
@Effect() @Effect()
loadTodo = this.s.fetch<GetTodo>('GET_TODO', { loadTodo = this.s.fetch<GetTodo>('GET_TODO', {
id: (a, state) => a.payload.id, id: (a, state) => a.payload.id,
run: (a, state) => of({ type: 'TODO', payload: a.payload }).delay(1), run: (a, state) => of({ type: 'TODO', payload: a.payload }).pipe(delay(1)),
onError: (a, e: any) => null onError: (a, e: any) => null
}); });

70
packages/nx/src/data-persistence.ts
View File

@ -5,14 +5,7 @@ import { ROUTER_NAVIGATION, RouterNavigationAction } from '@ngrx/router-store';
import { Action, State, Store } from '@ngrx/store'; import { Action, State, Store } from '@ngrx/store';
import { Observable } from 'rxjs/Observable'; import { Observable } from 'rxjs/Observable';
import { of } from 'rxjs/observable/of'; import { of } from 'rxjs/observable/of';
import { _catch } from 'rxjs/operator/catch'; import { catchError, concatMap, filter, groupBy, map, mergeMap, switchMap, withLatestFrom } from 'rxjs/operators';
import { concatMap } from 'rxjs/operator/concatMap';
import { filter } from 'rxjs/operator/filter';
import { groupBy } from 'rxjs/operator/groupBy';
import { map } from 'rxjs/operator/map';
import { mergeMap } from 'rxjs/operator/mergeMap';
import { switchMap } from 'rxjs/operator/switchMap';
import { withLatestFrom } from 'rxjs/operator/withLatestFrom';
/** /**
* See {@link DataPersistence.pessimisticUpdate} for more information. * See {@link DataPersistence.pessimisticUpdate} for more information.
@ -46,8 +39,6 @@ export interface HandleNavigationOpts<T> {
onError?(a: ActivatedRouteSnapshot, e: any): Observable<any> | any; onError?(a: ActivatedRouteSnapshot, e: any): Observable<any> | any;
} }
type Pair = [Action, any];
/** /**
* @whatItDoes Provides convenience methods for implementing common operations of persisting data. * @whatItDoes Provides convenience methods for implementing common operations of persisting data.
*/ */
@ -91,10 +82,10 @@ export class DataPersistence<T> {
* } * }
* ``` * ```
*/ */
pessimisticUpdate<A = Action>(actionType: string, opts: PessimisticUpdateOpts<T, A>): Observable<any> { pessimisticUpdate<A extends Action = Action>(actionType: string, opts: PessimisticUpdateOpts<T, A>): Observable<any> {
const nav = this.actions.ofType(actionType); const nav = this.actions.ofType<A>(actionType);
const pairs = withLatestFrom.call(nav, this.store); const pairs = nav.pipe(withLatestFrom(this.store));
return concatMap.call(pairs, this.runWithErrorHandling(opts.run, opts.onError)); return pairs.pipe(concatMap(this.runWithErrorHandling(opts.run, opts.onError)));
} }
/** /**
@ -133,10 +124,10 @@ export class DataPersistence<T> {
* } * }
* ``` * ```
*/ */
optimisticUpdate<A = Action>(actionType: string, opts: OptimisticUpdateOpts<T, A>): Observable<any> { optimisticUpdate<A extends Action = Action>(actionType: string, opts: OptimisticUpdateOpts<T, A>): Observable<any> {
const nav = this.actions.ofType(actionType); const nav = this.actions.ofType<A>(actionType);
const pairs = withLatestFrom.call(nav, this.store); const pairs = nav.pipe(withLatestFrom(this.store));
return concatMap.call(pairs, this.runWithErrorHandling(opts.run, opts.undoAction)); return pairs.pipe(concatMap(this.runWithErrorHandling(opts.run, opts.undoAction)));
} }
/** /**
@ -206,17 +197,17 @@ export class DataPersistence<T> {
* In addition, if DataPersistence notices that there are multiple requests for Todo 1 scheduled, * In addition, if DataPersistence notices that there are multiple requests for Todo 1 scheduled,
* it will only run the last one. * it will only run the last one.
*/ */
fetch<A = Action>(actionType: string, opts: FetchOpts<T, A>): Observable<any> { fetch<A extends Action = Action>(actionType: string, opts: FetchOpts<T, A>): Observable<any> {
const nav = this.actions.ofType(actionType); const nav = this.actions.ofType<A>(actionType);
const allPairs = withLatestFrom.call(nav, this.store); const allPairs = nav.pipe(withLatestFrom(this.store));
if (opts.id) { if (opts.id) {
const groupedFetches: Observable<Observable<Pair>> = groupBy.call(allPairs, p => opts.id(p[0], p[1])); const groupedFetches = allPairs.pipe(groupBy(([action, store]) => opts.id(action, store)));
return mergeMap.call(groupedFetches, (pairs: Observable<Pair>) => return groupedFetches.pipe(
switchMap.call(pairs, this.runWithErrorHandling(opts.run, opts.onError)) mergeMap(pairs => pairs.pipe(switchMap(this.runWithErrorHandling(opts.run, opts.onError))))
); );
} else { } else {
return concatMap.call(allPairs, this.runWithErrorHandling(opts.run, opts.onError)); return allPairs.pipe(concatMap(this.runWithErrorHandling(opts.run, opts.onError)));
} }
} }
@ -255,24 +246,21 @@ export class DataPersistence<T> {
* *
*/ */
navigation(component: Type<any>, opts: HandleNavigationOpts<T>): Observable<any> { navigation(component: Type<any>, opts: HandleNavigationOpts<T>): Observable<any> {
const nav = filter.call( const nav = this.actions
map.call(this.actions.ofType(ROUTER_NAVIGATION), (a: RouterNavigationAction<RouterStateSnapshot>) => .ofType<RouterNavigationAction<RouterStateSnapshot>>(ROUTER_NAVIGATION)
findSnapshot(component, a.payload.routerState.root) .pipe(map(a => findSnapshot(component, a.payload.routerState.root)), filter(s => !!s));
),
s => !!s
);
const pairs = withLatestFrom.call(nav, this.store); const pairs = nav.pipe(withLatestFrom(this.store));
return switchMap.call(pairs, this.runWithErrorHandling(opts.run, opts.onError)); return pairs.pipe(switchMap(this.runWithErrorHandling(opts.run, opts.onError)));
} }
private runWithErrorHandling(run: any, onError: any) { private runWithErrorHandling<A, R>(run: (a: A, state?: T) => Observable<R> | R | void, onError: any) {
return a => { return ([action, state]: [A, T]): Observable<R> => {
try { try {
const r = wrapIntoObservable(run(a[0], a[1])); const r = wrapIntoObservable(run(action, state));
return _catch.call(r, e => wrapIntoObservable(onError(a[0], e))); return r.pipe(catchError(e => wrapIntoObservable(onError(action, e))));
} catch (e) { } catch (e) {
return wrapIntoObservable(onError(a[0], e)); return wrapIntoObservable(onError(action, e));
} }
}; };
} }
@ -291,12 +279,12 @@ function findSnapshot(component: Type<any>, s: ActivatedRouteSnapshot): Activate
return null; return null;
} }
function wrapIntoObservable(obj: any): Observable<any> { function wrapIntoObservable<O>(obj: Observable<O> | O | void): Observable<O> {
if (!!obj && typeof obj.subscribe === 'function') { if (!!obj && obj instanceof Observable) {
return obj; return obj;
} else if (!obj) { } else if (!obj) {
return of(); return of();
} else { } else {
return of(obj); return of(obj as O);
} }
} }

8
packages/nx/src/testing-utils.ts
View File

@ -1,7 +1,5 @@
import { Observable } from 'rxjs/Observable'; import { Observable } from 'rxjs/Observable';
import { first } from 'rxjs/operator/first'; import { first, toArray } from 'rxjs/operators';
import { toArray } from 'rxjs/operator/toArray';
import { toPromise } from 'rxjs/operator/toPromise';
/** /**
* @whatItDoes reads all the values from an observable and returns a promise * @whatItDoes reads all the values from an observable and returns a promise
@ -16,7 +14,7 @@ import { toPromise } from 'rxjs/operator/toPromise';
* ``` * ```
*/ */
export function readAll<T>(o: Observable<T>): Promise<T[]> { export function readAll<T>(o: Observable<T>): Promise<T[]> {
return toPromise.call(toArray.call(o)); return o.pipe(toArray()).toPromise();
} }
/** /**
@ -32,5 +30,5 @@ export function readAll<T>(o: Observable<T>): Promise<T[]> {
* ``` * ```
*/ */
export function readFirst<T>(o: Observable<T>): Promise<T> { export function readFirst<T>(o: Observable<T>): Promise<T> {
return toPromise.call(first.call(o)); return o.pipe(first()).toPromise();
} }

8
yarn.lock
View File

@ -5149,13 +5149,7 @@ run-queue@^1.0.0, run-queue@^1.0.3:
dependencies: dependencies:
aproba "^1.1.1" aproba "^1.1.1"
rxjs@5.4.3: rxjs@5.5.2, rxjs@^5.5.2:
version "5.4.3"
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.4.3.tgz#0758cddee6033d68e0fd53676f0f3596ce3d483f"
dependencies:
symbol-observable "^1.0.1"
rxjs@^5.5.2:
version "5.5.2" version "5.5.2"
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.2.tgz#28d403f0071121967f18ad665563255d54236ac3" resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.2.tgz#28d403f0071121967f18ad665563255d54236ac3"
dependencies: dependencies: