fix(overmind): replace actions on hot reloading instead of overriding

Author: christianalfoni

packages/node_modules/overmind/src/index.test.ts

@@ -170,7 +170,7 @@ describe('Overmind', () => {
     })
     app.eventHub.once(EventType.ACTION_START, (data) => {
       expect(toJSON(data)).toEqual({
-        actionId: 0,
+        actionId:'doThis',
         actionName: 'doThis',
         isRunning: true,
         namespacePath: [],
@@ -183,7 +183,7 @@ describe('Overmind', () => {
     })
     app.eventHub.once(EventType.ACTION_END, (data) => {
       expect(toJSON(data)).toEqual({
-        actionId: 0,
+        actionId: 'doThis',
         isRunning: false,
         executionId: 0,
         actionName: 'doThis',
@@ -204,7 +204,7 @@ describe('Overmind', () => {
     })
     app.eventHub.once(EventType.OPERATOR_START, (data) => {
       expect(toJSON(data)).toEqual({
-        actionId: 0,
+        actionId: 'doThis',
         isRunning: true,
         actionName: 'doThis',
         path: [],
@@ -216,7 +216,7 @@ describe('Overmind', () => {
     })
     app.eventHub.once(EventType.OPERATOR_END, (data) => {
       expect(toJSON(data)).toEqual({
-        actionId: 0,
+        actionId: 'doThis',
         isRunning: false,
         actionName: 'doThis',
         path: [],
@@ -234,7 +234,7 @@ describe('Overmind', () => {
     const app = createDefaultOvermind()
     app.eventHub.once(EventType.MUTATIONS, (data) => {
       expect(toJSON(data)).toEqual({
-        actionId: 2,
+        actionId: 'changeFoo',
         isRunning: true,
         actionName: 'changeFoo',
         mutations: [
@@ -260,7 +260,7 @@ describe('Overmind', () => {
     const app = createDefaultOvermind()
     app.eventHub.on(EventType.MUTATIONS, (data) => {
       expect(toJSON(data)).toEqual({
-        actionId: 5,
+        actionId: 'waitAndChangeFoo',
         isRunning: true,
         actionName: 'waitAndChangeFoo',
         mutations: [
@@ -286,7 +286,7 @@ describe('Overmind', () => {
     const app = createDefaultOvermind()
     app.eventHub.on(EventType.MUTATIONS, (data) => {
       expect(toJSON(data)).toEqual({
-        actionId: 0,
+        actionId: 'asyncChangeFoo',
         isRunning: true,
         actionName: 'asyncChangeFoo',
         mutations: [

packages/node_modules/overmind/src/index.ts

@@ -187,7 +187,7 @@ const hotReloadingCache = {}
 export class Overmind<ThisConfig extends IConfiguration>
   implements IConfiguration {
   private proxyStateTree: ProxyStateTree<object>
-  private actionReferences: Function[] = []
+  private actionReferences: { [path: string]: Function } = {}
   private nextExecutionId: number = 0
   private mode: DefaultMode | TestMode | SSRMode
   private reydrateMutationsForHotReloading: IMutation[] = []
@@ -433,7 +433,7 @@ export class Overmind<ThisConfig extends IConfiguration>
     const execution = {
       [EXECUTION]: true,
       namespacePath,
-      actionId: this.actionReferences.indexOf(action),
+      actionId: name,
       executionId: this.nextExecutionId++,
       actionName: name,
       operatorId: 0,
@@ -519,9 +519,10 @@ export class Overmind<ThisConfig extends IConfiguration>
   private addExecutionMutation(mutation: IMutation) {
     ;((this as unknown) as OvermindMock<Config>).mutations.push(mutation)
   }
-  private createAction(name, action) {
-    this.actionReferences.push(action)
+  private createAction(name, originalAction) {
+    this.actionReferences[name] = originalAction
     const actionFunc = (value?, boundExecution?: Execution) => {
+      const action = this.actionReferences[name]
       // Developer might unintentionally pass more arguments, so have to ensure
       // that it is an actual execution
       boundExecution =
@@ -882,6 +883,36 @@ export class Overmind<ThisConfig extends IConfiguration>
       })
     }, {}) as any
   }
+  /*
+    Related to hot reloading we update the existing action references and add any new
+    actions.
+  */
+  private updateActions(actions: any = {}, path: string[] = []) {
+    Object.keys(actions).forEach((name) => {
+      if (typeof actions[name] === 'function') {
+        const actionName = path.concat(name).join('.')
+        if (this.actionReferences[actionName]) {
+          this.actionReferences[actionName] = actions[name]
+        } else {
+          const target = path.reduce((aggr, key) => {
+            if (!aggr[key]) {
+              aggr[key] = {}
+            }
+
+            return aggr[key]
+          }, this.actions)
+          target[name] = this.createAction(
+            actionName,
+            actions[name]
+          ) as any
+  
+          target[name].displayName = path.concat(name).join('.')
+        }
+      } else {
+        this.updateActions(actions[name], path.concat(name))
+      }
+    }, {}) as any
+  }
   getTrackStateTree(): ITrackStateTree<any> {
     return this.proxyStateTree.getTrackStateTree()
   }
@@ -949,7 +980,8 @@ export class Overmind<ThisConfig extends IConfiguration>
   }
   reconfigure(configuration: IConfiguration) {
     const changeMutations = getChangeMutations(this.originalConfiguration.state, configuration.state || {})
-    this.actions = this.getActions(configuration.actions)
+
+    this.updateActions(configuration.actions)
     this.effects = configuration.effects || {}
 
     const mutationTree = this.proxyStateTree.getMutationTree()