Merge pull request #1 from sandangel/memoized-selectors

refactor: address all issue in #14

Author: albyrock87

package-lock.json

@@ -5,7 +5,7 @@
   "main": "dist/index.js",
   "scripts": {
     "build": "ng-packagr -p package.json",
-    "test": "ngc -p tsconfig.json && jasmine dist/*.spec.js",
+    "test": "ngc -p tsconfig.spec.json && jasmine dist/spec/*.spec.js",
     "publish": "npm publish dist",
     "precommit": "lint-staged",
     "lint": "tslint -c tslint.json 'src/**/*.ts'",
@@ -51,7 +51,7 @@
     "rxjs": "^5.5.6",
     "tsickle": "^0.26.0",
     "tslint": "^5.8.0",
-    "typescript": "~2.5.3"
+    "typescript": "^2.6.2"
   },
   "ngPackage": {
     "lib": {

package.json

@@ -1,8 +1,2 @@
 import 'reflect-metadata';
-export * from './module';
-export * from './action';
-export * from './of-action';
-export * from './store';
-export * from './select';
-export * from './symbols';
-export * from './factory';
+export * from './public_api';

src/index.ts

@@ -1,4 +1,3 @@
-import { Action } from '@ngrx/store';
 import { ActionType } from './symbols';
 
 export interface ActionMeta {

src/internals.ts

@@ -1,9 +1,7 @@
 import { Action } from '@ngrx/store';
-import { Actions } from '@ngrx/effects';
 import { filter } from 'rxjs/operators';
-import { Observable } from 'rxjs/Observable';
 import { OperatorFunction } from 'rxjs/interfaces';
-import { ActionType } from '.';
+import { ActionType } from './symbols';
 
 export function ofAction<T extends Action>(allowedType: ActionType<T>): OperatorFunction<Action, T>;
 export function ofAction<T extends Action>(...allowedTypes: ActionType[]): OperatorFunction<Action, T>;

src/of-action.ts

@@ -0,0 +1,6 @@
+export { NgrxActionsModule } from './module';
+export { Action } from './action';
+export { ofAction } from './of-action';
+export { Store } from './store';
+export { Select, NgrxSelect } from './select';
+export { createReducer } from './factory';

src/public_api.ts

@@ -1,10 +1,9 @@
 import { Injectable } from '@angular/core';
 import { Store, Selector } from '@ngrx/store';
-import { Observable } from 'rxjs/Observable';
 
 @Injectable()
 export class NgrxSelect {
-  static store: Store<any> = undefined;
+  static store: Store<any> | undefined = undefined;
   connect(store: Store<any>) {
     NgrxSelect.store = store;
   }
@@ -18,21 +17,19 @@ export function Select<TState = any, TValue = any>(
   ...paths: string[]
 ): (target: any, name: string) => void;
 export function Select<TState = any, TValue = any>(
-  selectorOrFeature: string | Selector<TState, TValue>,
+  selectorOrFeature?: string | Selector<TState, TValue>,
   ...paths: string[]
 ) {
   return function(target: any, name: string): void {
     let fn: Selector<TState, TValue>;
     // Nothing here? Use propery name as selector
-    if (typeof selectorOrFeature === 'undefined') {
+    if (!selectorOrFeature) {
       selectorOrFeature = name;
     }
     // Handle string vs Selector<TState, TValue>
     if (typeof selectorOrFeature === 'string') {
-      if (paths.length) {
-        selectorOrFeature = [selectorOrFeature, ...paths].join('.');
-      }
-      fn = fastPropGetter(selectorOrFeature);
+      const propsArray = paths.length ? [selectorOrFeature, ...paths] : selectorOrFeature.split('.');
+      fn = fastPropGetter(propsArray);
     } else {
       fn = selectorOrFeature;
     }
@@ -55,21 +52,21 @@ export function Select<TState = any, TValue = any>(
 }
 
 /**
- * The generated function is faster then:
+ * The generated function is faster than:
  * - pluck (Observable operator)
  * - memoize (old ngrx-actions implementation)
  * - MemoizedSelector (ngrx)
  * @param path
  */
-function fastPropGetter(path: string): (x: any) => any {
-  const segments = path.split('.');
+export function fastPropGetter(paths: string[]): (x: any) => any {
+  const segments = paths;
   let seg = 'store.' + segments[0],
-    i = 0,
-    l = segments.length;
+    i = 0;
+  const l = segments.length;
   let expr = seg;
   while (++i < l) {
     expr = expr + ' && ' + (seg = seg + '.' + segments[i]);
   }
-  const fn = new Function('store', 'return ' + expr + '');
+  const fn = new Function('store', 'return ' + expr + ';');
   return <(x: any) => any>fn;
 }

src/select.ts

@@ -1,5 +1,5 @@
-import { Store, createReducer, Action, ofAction, Select, NgrxSelect } from './index';
-import { Action as NgRxAction, Store as NgRxStore, createFeatureSelector, createSelector } from '@ngrx/store';
+import { Store, createReducer, Action, ofAction, Select, NgrxSelect } from '../index';
+import { Action as NgRxAction, createFeatureSelector, createSelector, Store as NgRxStore } from '@ngrx/store';
 import { Observable } from 'rxjs/Observable';
 import { of } from 'rxjs/observable/of';
 
@@ -26,9 +26,9 @@ describe('actions', () => {
       }
     }
 
-    const reducer = createReducer<FooState>(Bar);
+    const reducer = createReducer<FooState | undefined>(Bar);
     const res = reducer(undefined, new MyAction());
-    expect(res.foo).toBe(true);
+    expect(res && res.foo).toBe(true);
   });
 
   it('adds defaults', () => {
@@ -146,7 +146,7 @@ describe('actions', () => {
       action2 = new MyAction2(),
       action3 = new MyAction3('a', 0);
     const actions = of<NgRxAction>(action, action2, action3);
-    let tappedActions: NgRxAction[] = [];
+    const tappedActions: NgRxAction[] = [];
     actions.pipe(ofAction<MyAction | MyAction2>(MyAction, MyAction2)).subscribe(a => {
       tappedActions.push(a);
     });
@@ -157,7 +157,7 @@ describe('actions', () => {
   });
 
   it('selects sub state', () => {
-    const state: {
+    const globalState: {
       myFeature: FooState;
     } = {
       myFeature: {
@@ -183,7 +183,7 @@ describe('actions', () => {
       @Select(msBar) bar$: Observable<any>; // using MemoizedSelector
     }
 
-    const store = new NgRxStore(of(state), undefined, undefined);
+    const store = new NgRxStore(of(globalState), undefined, undefined);
 
     try {
       NgrxSelect.store = store;
@@ -195,11 +195,11 @@ describe('actions', () => {
       });
 
       mss.myFeature.subscribe(n => {
-        expect(n).toBe(state.myFeature);
+        expect(n).toBe(globalState.myFeature);
       });
 
       mss.bar$.subscribe(n => {
-        expect(n).toBe(state.myFeature.bar);
+        expect(n).toBe(globalState.myFeature.bar);
       });
     } finally {
       NgrxSelect.store = undefined;

src/index.spec.ts src/spec/index.spec.ts

@@ -0,0 +1,4 @@
+/* This file is for IDE only */
+{
+    "extends": "../../tsconfig.spec.json"
+}

src/spec/tsconfig.json

@@ -1,5 +1,4 @@
 import { INITIAL_STATE_KEY } from './keys';
-import { Action } from '@ngrx/store';
 
 export function Store<TState>(initialState?: TState): (target: Function) => void;
 export function Store(initialState?: any): (target: Function) => void;

src/store.ts

@@ -14,6 +14,9 @@
     "rootDir": "src/",
     "skipDefaultLibCheck": true,
     "skipLibCheck": true,
+    "noImplicitAny": false,
+    "noUnusedLocals": true,
+    "strict": true,
     "sourceMap": true,
     "target": "es5",
     "types": [
@@ -23,5 +26,8 @@
   },
   "include": [
     "src/**/*"
+  ],
+  "exclude": [
+    "src/spec/**/*"
   ]
 }

tsconfig.json

@@ -0,0 +1,7 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "strictNullChecks": false
+  },
+  "files": ["src/spec/index.spec.ts"]
+}