Merge pull request cerebral#33 from cerebral/ac-ref

refactor(action-chain): use private keyword in constructor argument list

Author: christianalfoni

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

@@ -6,22 +6,13 @@ export class StopExecution {
     this.value = value
   }
 }
-export class ActionBase<Effects, InitialValue, Value = InitialValue> {
+export class ActionBase<Effects> {
   static nextActionId: number = 0
-  private initialActionId: number
-  private actionChain: ActionChain<Effects>
-  private runOperators: (
-    value: any,
-    executionContext: {
-      __execution: Execution
-      __path: string[]
-    },
-    newPath?: string
-  ) => any | Promise<any>
+  private currentExecutionId = 0
   constructor(
-    actionChain: ActionChain<Effects>,
-    initialActionId: number = ActionBase.nextActionId++,
-    runOperators?: (
+    private actionChain: ActionChain<Effects>,
+    private initialActionId: number = ActionBase.nextActionId++,
+    private runOperators?: (
       value: any,
       executionContext: {
         __execution: Execution
@@ -30,20 +21,20 @@ export class ActionBase<Effects, InitialValue, Value = InitialValue> {
       newPath?: string
     ) => any | Promise<any>
   ) {
-    this.actionChain = actionChain
-    this.runOperators = runOperators
-    this.initialActionId = initialActionId
+    interface I extends ActionBase<Effects> {
+      (value: string): string
+      displayName: string
+    }
 
-    let currentExecutionId = 0
-    const func = Object.assign(function(value) {
+    const instance: I = Object.assign(function(value) {
       const initialOperator = typeof arguments[1] === 'undefined'
       const newPath = typeof arguments[2] === 'undefined' ? null : arguments[2]
       const executionContext: ExecutionContext = initialOperator
         ? {
             __execution: {
               operatorId: -1,
               actionId: initialActionId,
-              executionId: currentExecutionId++,
+              executionId: instance.currentExecutionId++,
             },
             __path: [],
           }
@@ -52,7 +43,7 @@ export class ActionBase<Effects, InitialValue, Value = InitialValue> {
         actionChain.emit('action:start', {
           actionId: executionContext.__execution.actionId,
           executionId: executionContext.__execution.executionId,
-          actionName: func.displayName,
+          actionName: instance.displayName,
           value,
         })
       }
@@ -65,21 +56,21 @@ export class ActionBase<Effects, InitialValue, Value = InitialValue> {
           actionChain.emit('action:end', {
             actionId: executionContext.__execution.actionId,
             executionId: executionContext.__execution.executionId,
-            actionName: func.displayName,
+            actionName: instance.displayName,
           })
         })
       } else if (initialOperator) {
         actionChain.emit('action:end', {
           actionId: executionContext.__execution.actionId,
           executionId: executionContext.__execution.executionId,
-          actionName: func.displayName,
+          actionName: instance.displayName,
         })
       }
 
       return returnValue
     }, this) as any
 
-    return func
+    return instance
   }
   getActionChain = () => {
     return this.actionChain

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

@@ -11,9 +11,7 @@ interface INoValueAction<Context, InitialValue, Value = InitialValue>
 }
 
 class Action<Context, InitialValue, Value = InitialValue> extends ActionBase<
-  Context,
-  InitialValue,
-  Value
+  Context
 > {
   test: (
     cb: (context: Context, value: Value) => void

packages/node_modules/overmind/src/Action.ts

@@ -29,7 +29,7 @@ export default class Action<
   Effects,
   InitialValue,
   Value = InitialValue
-> extends ActionBase<Effects, InitialValue, Value> {
+> extends ActionBase<Effects> {
   private proxyStateTree: ProxyStateTree
   constructor(proxyStateTree, actionChain, initialActionId?, runOperators?) {
     super(actionChain, initialActionId, runOperators)