fix: fixed trigger order

andrewcourtice · Sep 8, 2021 · 4d4d26e · 4d4d26e
1 parent c886f3f
commit 4d4d26e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/core/src/store.ts b/core/src/store.ts
@@ -175,21 +175,22 @@ export default class Store<TState extends BaseState = any> implements InternalSt
             throw new Error('Circular mutation reference detected. Avoid calling mutations inside other mutations to prevent circular references.');
         }
 
-        const providedState = this.providers.write(this.writeState) ?? this.writeState;
-        const providedPayload = this.providers.payload(payload) ?? payload;
+        this.stack.add(name);
 
         let result: TResult;
 
         const emit = (event: string) => this.emit(event, sender, {
             mutation: name,
-            payload: providedPayload,
+            payload,
             result,
         } as MutationEventData<TPayload, TResult>);
 
-        this.stack.add(name);
         emit(EVENTS.mutation.before);
 
         try {
+            const providedState = this.providers.write(this.writeState) ?? this.writeState;
+            const providedPayload = this.providers.payload(payload) ?? payload;
+
             result = mutator(providedState, providedPayload);
 
             emit(EVENTS.mutation.success);

diff --git a/extensions/action/src/index.ts b/extensions/action/src/index.ts
@@ -105,7 +105,6 @@ export default function actionsExtension<TState extends BaseState>() {
 
                 const task = new Task<TResult>(async (resolve, reject, controller, onAbort) => {
                     const id = Symbol(name);
-                    const providedPayload = _store.providers.payload(payload) ?? payload;
 
                     const complete = () => (tasks.delete(task), removeInstance(name, id));
                     const fail = () => reject(new ActionAbortError(name, id));
@@ -114,7 +113,7 @@ export default function actionsExtension<TState extends BaseState>() {
 
                     const emit = (event: string) => _store.emit(event, SENDER, {
                         action: name,
-                        payload: providedPayload,
+                        payload,
                         result,
                     } as ActionEventData);
 
@@ -124,6 +123,8 @@ export default function actionsExtension<TState extends BaseState>() {
                     emit(EVENTS.action.before);
 
                     try {
+                        const providedPayload = _store.providers.payload(payload) ?? payload;
+
                         result = await body(providedPayload, mutate, controller, onAbort);
 
                         emit(EVENTS.action.success);

diff --git a/extensions/transaction/src/index.ts b/extensions/transaction/src/index.ts
@@ -29,17 +29,15 @@ export default function transactionExtension<TState extends BaseState>() {
             mutationName: '$transaction-rollback',
         })(store);
 
-
         function transaction<TPayload>(name: string, transactor: Transactor<TState, TPayload>): Transaction<TPayload> {
             const mutate = (mutator: Mutator<TState, undefined, void>) => store.write(name, SENDER, mutator);
 
             return ((payload: TPayload) => {
                 const snap = snapshot();
-                const providedPayload = store.providers.payload(payload) ?? payload;
 
                 const emit = (event: string) => store.emit(event, SENDER, {
                     transaction: name,
-                    payload: providedPayload,
+                    payload,
                 } as TransactionEventData);
 
                 emit(EVENTS.transaction.before);