fix(overmind): general fixes on parallel statecharts

Author: christianalfoni

packages/node_modules/overmind/src/config/statechart.test.ts

@@ -2,7 +2,7 @@ import { IAction, createOvermind } from '../'
 import { Statechart, statechart } from './'
 
 describe('Statecharts', () => {
-  test.only('should wrap configs', () => {
+  test('should wrap configs', () => {
     const config = {}
 
     const chart: Statechart<typeof config, 'foo'> = {
@@ -369,7 +369,7 @@ describe('Statecharts', () => {
       statechart(config, [parallelChartA, parallelChartB])
     )
 
-    expect(instance.state.states).toEqual([['bar'], ['foo']])
+    expect(instance.state.states).toEqual([[0, 'bar'], [1, 'foo']])
     expect(instance.state.actions).toEqual({
       increaseCount: true,
       changeToBar: true,
@@ -386,10 +386,10 @@ describe('Statecharts', () => {
 
     instance.actions.changeToBar()
 
-    expect(instance.state.states).toEqual([['foo'], ['bar']])
+    expect(instance.state.states).toEqual([[0, 'foo'], [1, 'bar']])
     expect(instance.state.actions).toEqual({
-      increaseCount: true,
-      changeToBar: true,
+      increaseCount: false,
+      changeToBar: false,
     })
     expect(instance.state.matches('foo')).toEqual(true)
     expect(instance.state.matches('bar')).toEqual(true)
@@ -455,7 +455,7 @@ describe('Statecharts', () => {
       statechart(config, [parallelChartA, parallelChartB])
     )
 
-    expect(instance.state.states).toEqual([['bar'], ['foo', 'foo']])
+    expect(instance.state.states).toEqual([[0, 'bar'], [1, 'foo', 'foo']])
     expect(instance.state.actions).toEqual({
       increaseCount: true,
       changeToBar: true,
@@ -472,10 +472,10 @@ describe('Statecharts', () => {
 
     instance.actions.changeToBar()
 
-    expect(instance.state.states).toEqual([['foo'], ['bar']])
+    expect(instance.state.states).toEqual([[0, 'foo'], [1, 'bar']])
     expect(instance.state.actions).toEqual({
-      increaseCount: true,
-      changeToBar: true,
+      increaseCount: false,
+      changeToBar: false,
     })
     expect(instance.state.matches('foo')).toEqual(true)
     expect(instance.state.matches('bar', 'foo')).toEqual(false)
@@ -533,13 +533,13 @@ describe('Statecharts', () => {
 
     const instance = createOvermind(statechart(config, mainChart))
 
-    expect(instance.state.states).toEqual([['foo', 'baz'], ['foo', 'baz']])
-    expect(instance.state.actions).toEqual({ increaseCount: true })
+    expect(instance.state.states).toEqual([['foo', 0, 'baz'], ['foo', 1, 'baz']])
+    expect(instance.state.actions).toEqual({ increaseCount: true, changeToBar: true })
     expect(instance.state.matches('foo', 'baz')).toEqual(true)
     expect(instance.state.count).toBe(2)
     instance.actions.changeToBar()
     expect(instance.state.states).toEqual([['bar']])
-    expect(instance.state.actions).toEqual({ increaseCount: false })
+    expect(instance.state.actions).toEqual({ increaseCount: false, changeToBar: false })
     expect(instance.state.matches('foo', 'baz')).toEqual(false)
     expect(instance.state.count).toBe(3)
   })

packages/node_modules/overmind/src/config/statechart.ts

@@ -54,6 +54,11 @@ function getActionTransitions(
         return
       }
       if (target.on && typeof target.on[key] === 'string') {
+        // If we have already transition to this path it means
+        // we are moving away from multiple paths (parallel)
+        if (transitions.includes(target.on[key])) {
+          return
+        }
         transitions.push(target.on[key])
         return
       }
@@ -99,9 +104,6 @@ function getInitialStates(chart, paths: Array<(string | number)[]> = [[]]) {
     if (chart.states[chart.initial].chart) {
       getInitialStates(chart.states[chart.initial].chart, paths)
     }
-    if (Array.isArray(chart.states[chart.initial])) {
-      getInitialStates(chart.states[chart.initial], paths)
-    }
   }
 
   return paths
@@ -198,6 +200,10 @@ export function statechart<C extends IConfiguration>(
 
   return {
     onInitialize: ((context, instance) => {
+      if (config.onInitialize) {
+        config.onInitialize(context, instance)
+      }
+      
       currentInstance = instance
       const stateTarget = getTarget(
         context.state,
@@ -242,8 +248,10 @@ export function statechart<C extends IConfiguration>(
       matches: (state) => (...args) => {
         return state.states.reduce((aggr, path) => {
           if (aggr) return aggr
+
+          const cleanPath = path.filter((pathKey) => typeof pathKey !== 'number')
           for (let x = 0; x < args.length; x++) {
-            if (args[x] !== path[x]) {
+            if (args[x] !== cleanPath[x]) {
               return false
             }
           }
@@ -276,12 +284,18 @@ export function statechart<C extends IConfiguration>(
           )
           const newStates: Array<(string | number)[]> = []
 
+          if (transitions.includes('entry') || transitions.includes('exit')) {
+            actions[key](context, payload)
+          }
+
           transitions.forEach((transition, index) => {
+            const oldStatePath = stateTarget.states[index].slice()
+
             if (transition === 'entry' || transition === 'exit') {
-              return actions[key](context, payload)
+              newStates.push(oldStatePath)
+              return  
             }
-
-            const oldStatePath = stateTarget.states[index].slice()
+            
             const currentStatePath = stateTarget.states[index].slice()
             const stateTransitions = currentStatePath.map(() => null)
 
@@ -342,6 +356,7 @@ export function statechart<C extends IConfiguration>(
             return actions[key](context, payload)
           })
 
+          // Actually change what has changed
           stateTarget.states = newStates
 
           if (process.env.NODE_ENV === 'development' && currentInstance.devtools) {