refactor: extract InternalStateOperations for creation of StateContext

ngxs · Apr 24, 2018 · 4d6f6b4 · 4d6f6b4
1 parent 456c6d9
commit 4d6f6b4
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 66 deletions.
diff --git a/packages/store/src/internals.ts b/packages/store/src/internals.ts
@@ -17,9 +17,11 @@ export interface ActionHandlerMetaData {
   type: string;
 }
 
-export type GetStateFn<T> = () => T;
-export type SetStateFn<T> = (newState: T) => void;
-export type DispatchFn = (actions: any | any[]) => Observable<any>;
+export interface InternalStateOperations<T> {
+  getState(): T;
+  setState(val: T);
+  dispatch(actions: any | any[]): Observable<void>;
+}
 
 export interface MetaDataModel {
   name: string;

diff --git a/packages/store/src/module.ts b/packages/store/src/module.ts
@@ -35,21 +35,11 @@ export class NgxsRootModule {
       stateStream.next({ ...cur, ...results.defaults });
     }
 
-    factory.connectActionHandlers(
-      () => stateStream.getValue(),
-      newState => stateStream.next(newState),
-      actions => store.dispatch(actions),
-      results.states
-    );
+    factory.connectActionHandlers(results.states);
 
     store.dispatch(new InitState()).subscribe(() => {
       if (results) {
-        factory.invokeInit(
-          () => stateStream.getValue(),
-          newState => stateStream.next(newState),
-          actions => store.dispatch(actions),
-          results.states
-        );
+        factory.invokeInit(results.states);
       }
     });
   }
@@ -83,21 +73,11 @@ export class NgxsFeatureModule {
       stateStream.next({ ...cur, ...results.defaults });
     }
 
-    factory.connectActionHandlers(
-      () => stateStream.getValue(),
-      newState => stateStream.next(newState),
-      actions => store.dispatch(actions),
-      results.states
-    );
+    factory.connectActionHandlers(results.states);
 
     store.dispatch(new UpdateState()).subscribe(() => {
       if (results) {
-        factory.invokeInit(
-          () => stateStream.getValue(),
-          newState => stateStream.next(newState),
-          actions => store.dispatch(actions),
-          results.states
-        );
+        factory.invokeInit(results.states);
       }
     });
   }

diff --git a/packages/store/src/state-factory.ts b/packages/store/src/state-factory.ts
@@ -10,15 +10,14 @@ import {
   nameToState,
   isObject,
   StateClass,
-  GetStateFn,
-  SetStateFn,
-  DispatchFn,
+  InternalStateOperations,
   MappedStore
 } from './internals';
 import { getActionTypeFromInstance, setValue, getValue } from './utils';
 import { ofActionDispatched } from './of-action';
 import { InternalActions, ActionStatus, ActionContext } from './actions-stream';
-import { InternalDispatchedActionResults } from './dispatcher';
+import { InternalDispatchedActionResults, InternalDispatcher } from './dispatcher';
+import { StateStream } from './state-stream';
 
 /**
  * State factory class
@@ -39,7 +38,9 @@ export class StateFactory {
     @SkipSelf()
     private _parentFactory: StateFactory,
     private _actions: InternalActions,
-    private _actionResults: InternalDispatchedActionResults
+    private _actionResults: InternalDispatchedActionResults,
+    private _stateStream: StateStream,
+    private _dispatcher: InternalDispatcher
   ) {}
 
   /**
@@ -118,18 +119,13 @@ export class StateFactory {
     }
   }
 
-  connectActionHandlers(
-    getState: GetStateFn<any>,
-    setState: SetStateFn<any>,
-    dispatch: DispatchFn,
-    mappedStores: MappedStore[]
-  ): any {
+  connectActionHandlers(mappedStores: MappedStore[]): any {
     if (this._connected) return;
     this._actions
       .pipe(
         filter((ctx: ActionContext) => ctx.status === ActionStatus.Dispatched),
         mergeMap(({ action }) => {
-          return this.invokeActions(getState, setState, dispatch, this._actions, action).pipe(
+          return this.invokeActions(this._actions, action).pipe(
             map(() => {
               return <ActionContext>{ action, status: ActionStatus.Completed };
             }),
@@ -146,20 +142,22 @@ export class StateFactory {
     this._connected = true;
   }
 
+  private get rootStateOperations(): InternalStateOperations<any> {
+    return {
+      getState: () => this._stateStream.getValue(),
+      setState: newState => this._stateStream.next(newState),
+      dispatch: actions => this._dispatcher.dispatch(actions)
+    };
+  }
   /**
    * Invoke the init function on the states.
    */
-  invokeInit(
-    getState: GetStateFn<any>,
-    setState: SetStateFn<any>,
-    dispatch: DispatchFn,
-    stateMetadatas: MappedStore[]
-  ) {
+  invokeInit(stateMetadatas: MappedStore[]) {
     for (const metadata of stateMetadatas) {
       const instance: NgxsLifeCycle = metadata.instance;
 
       if (instance.ngxsOnInit) {
-        const stateContext = this.createStateContext(getState, setState, dispatch, metadata);
+        const stateContext = this.createStateContext(metadata);
 
         instance.ngxsOnInit(stateContext);
       }
@@ -169,13 +167,7 @@ export class StateFactory {
   /**
    * Invoke actions on the states.
    */
-  invokeActions(
-    getState: GetStateFn<any>,
-    setState: SetStateFn<any>,
-    dispatch: DispatchFn,
-    actions$: InternalActions,
-    action
-  ) {
+  invokeActions(actions$: InternalActions, action) {
     const results = [];
 
     for (const metadata of this.states) {
@@ -184,7 +176,7 @@ export class StateFactory {
 
       if (actionMetas) {
         for (const actionMeta of actionMetas) {
-          const stateContext = this.createStateContext(getState, setState, dispatch, metadata);
+          const stateContext = this.createStateContext(metadata);
           let result = metadata.instance[actionMeta.fn](stateContext, action);
 
           if (result instanceof Promise) {
@@ -214,39 +206,35 @@ export class StateFactory {
   /**
    * Create the state context
    */
-  createStateContext(
-    getState: GetStateFn<any>,
-    setState: SetStateFn<any>,
-    dispatch: DispatchFn,
-    metadata: MappedStore
-  ): StateContext<any> {
+  createStateContext(metadata: MappedStore): StateContext<any> {
+    const root = this.rootStateOperations;
     return {
       getState(): any {
-        const state = getState();
+        const state = root.getState();
         return getValue(state, metadata.depth);
       },
       patchState(val: any): void {
         if (Array.isArray(val)) {
           throw new Error('Patching arrays is not supported.');
         }
 
-        let state = getState();
+        let state = root.getState();
         const local = getValue(state, metadata.depth);
         for (const k in val) {
           local[k] = val[k];
         }
         state = setValue(state, metadata.depth, { ...local });
-        setState(state);
+        root.setState(state);
         return state;
       },
       setState(val: any): any {
-        let state = getState();
+        let state = root.getState();
         state = setValue(state, metadata.depth, val);
-        setState(state);
+        root.setState(state);
         return state;
       },
       dispatch(actions: any | any[]): Observable<any> {
-        return dispatch(actions);
+        return root.dispatch(actions);
       }
     };
   }