Fixes a subtle bug where mutation on and off flag isn't in the transa…

…ction (#93)

* Fixes a subtle bug where mutation on and off flag isn't in the transaction

package.json

@@ -1,6 +1,6 @@
 {
     "name": "satcheljs",
-    "version": "3.1.0",
+    "version": "3.1.1",
     "description": "Store implementation for functional reactive flux.",
     "lint-staged": {
         "*.{ts,tsx}": [

src/index.ts

@@ -12,10 +12,14 @@ export { default as applyMiddleware } from './applyMiddleware';
 export { default as createStore } from './createStore';
 export { dispatch } from './dispatcher';
 export { default as mutator } from './mutator';
-export { default as orchestrator } from './orchestrator';
+import { default as orchestrator } from './orchestrator';
 export { default as getRootStore } from './getRootStore';
 export { mutatorAction, orchestratorAction } from './simpleSubscribers';
 export { useStrict };
 
+// exporting an alias for orchestrator called "flow"
+export const flow = orchestrator;
+export { orchestrator };
+
 // Default to MobX strict mode
 useStrict(true);

src/mutator.ts

@@ -17,19 +17,19 @@ export default function mutator<T extends ActionMessage>(
     }
 
     // Wrap the callback in a MobX action so it can modify the store
-    let wrappedTarget = action(target);
-
-    // Subscribe to the action
-    subscribe(actionId, (actionMessage: T) => {
+    let wrappedTarget = action((actionMessage: T) => {
         try {
             getGlobalContext().inMutator = true;
-            if (wrappedTarget(actionMessage)) {
+            if (target(actionMessage)) {
                 throw new Error('Mutators cannot return a value and cannot be async.');
             }
         } finally {
             getGlobalContext().inMutator = false;
         }
     });
 
+    // Subscribe to the action
+    subscribe(actionId, wrappedTarget);
+
     return target;
 }

test/mutatorTests.ts

@@ -47,7 +47,7 @@ describe('mutator', () => {
         mutator(actionCreator, callback);
 
         // Assert
-        expect(mobx.action).toHaveBeenCalledWith(callback);
+        expect(mobx.action).toHaveBeenCalled();
     });
 
     it('returns the target function', () => {