fix(action-chain): pass operatorId and path correctly

Author: christianalfoni

packages/node_modules/action-chain/src/ActionBase.ts

@@ -61,7 +61,7 @@ export class ActionBase<Context, InitialValue, Value = InitialValue> {
         : value
 
       if (initialOperator && returnValue instanceof Promise) {
-        returnValue.then((promiseValue) => {
+        returnValue.then(() => {
           actionChain.emit('action:end', {
             actionId: executionContext.__execution.actionId,
             executionId: executionContext.__execution.executionId,
@@ -99,26 +99,34 @@ export class ActionBase<Context, InitialValue, Value = InitialValue> {
             ? executionContext.__path.concat(newPath)
             : executionContext.__path.slice(),
         }
-        const path = executionContextWithPath.__path
         const prevResult = this.runOperators
           ? this.runOperators(props, executionContextWithPath)
           : props
 
-        const operatorId = ++executionContextWithPath.__execution.operatorId
-
         const produceResult = (currentValue) => {
           if (currentValue instanceof StopExecution) {
             return currentValue
           }
 
-          const context = this.actionChain.getContext(executionContextWithPath)
+          const thisExecution = {
+            ...executionContextWithPath.__execution,
+            operatorId: executionContextWithPath.__execution.operatorId + 1,
+          }
+
+          executionContextWithPath.__execution.operatorId++
+
+          const path = executionContextWithPath.__path
+
+          const context = this.actionChain.getContext(
+            thisExecution,
+            executionContextWithPath
+          )
 
           this.actionChain.emit('operator:start', {
             type,
             name,
             path,
-            ...context.__execution,
-            operatorId,
+            ...thisExecution,
           })
           const result = cb(context, currentValue)
 
@@ -128,18 +136,16 @@ export class ActionBase<Context, InitialValue, Value = InitialValue> {
               name,
               path,
               isAsync: true,
-              ...context.__execution,
-              operatorId,
+              ...thisExecution,
             })
             return result.then((promiseResult) => {
               this.actionChain.emit('operator:end', {
                 type,
                 name,
                 path,
-                ...context.__execution,
+                ...thisExecution,
                 isAsync: true,
                 result: promiseResult,
-                operatorId,
               })
               return promiseResult
             })
@@ -149,10 +155,9 @@ export class ActionBase<Context, InitialValue, Value = InitialValue> {
             type,
             name,
             path,
-            ...context.__execution,
+            ...thisExecution,
             isAsync: false,
             result: result,
-            operatorId,
           })
 
           return result

packages/node_modules/action-chain/src/ActionChain.ts

@@ -65,7 +65,7 @@ export class ActionChain<Context> extends EventEmitter<ActionChainEvents> {
     this.options.providerExceptions = options.providerExceptions || []
   }
 
-  getContext(executionContext: ExecutionContext) {
+  getContext(thisExecution: Execution, executionContext: ExecutionContext) {
     const instance = this
     const providers = Object.keys(this.context).reduce(
       (currentContext, key) => {
@@ -81,15 +81,15 @@ export class ActionChain<Context> extends EventEmitter<ActionChainEvents> {
                   if (result instanceof Promise) {
                     result.then((promisedResult) => {
                       instance.emit('provider', {
-                        ...executionContext.__execution,
+                        ...thisExecution,
                         name: key,
                         method: prop,
                         result: promisedResult,
                       })
                     })
                   } else {
                     instance.emit('provider', {
-                      ...executionContext.__execution,
+                      ...thisExecution,
                       name: key,
                       method: prop,
                       result,

packages/node_modules/action-chain/src/index.test.ts

@@ -140,7 +140,7 @@ describe('PROVIDER', () => {
     })
     fn()
   })
-  test('should track execution of clas instance providers', () => {
+  test('should track execution of class instance providers', () => {
     expect.assertions(2)
     const fn = action().test(({ test }) => {
       expect(test.foo()).toBe('bar')