refactor(overmind): add nested charts on explicit chart property because of typing

Author: christianalfoni

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

@@ -1,7 +1,7 @@
 import { IAction, createOvermind } from '../'
 import { Statechart, statechart } from './'
 
-describe.only('Statecharts', () => {
+describe('Statecharts', () => {
   test('should wrap configs', () => {
     const config = {}
 
@@ -203,7 +203,7 @@ describe.only('Statecharts', () => {
     })
     expect(instance.state.matches('bar')).toEqual(true)
   })
-  test.only('should allow nesting', () => {
+  test('should allow nesting', () => {
     const fooEntry: Action = ({ state }) => {
       state.transitions.push('fooEntry')
     }
@@ -262,7 +262,7 @@ describe.only('Statecharts', () => {
           on: {
             changeToBar: 'bar',
           },
-          ...nestedChart,
+          chart: nestedChart,
         },
         bar: {},
       },

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

@@ -1,19 +1,20 @@
 import {
-  IConfiguration,
   IConfig,
-  pipe,
-  filter,
-  mutate,
+  IConfiguration,
   IDerive,
+  filter,
   map,
+  mutate,
+  pipe,
 } from '../'
 
 export interface Statechart<C extends IConfiguration, S extends string> {
   initial: S
   states: {
-    [N in S]: Partial<Statechart<C, any>> & {
+    [N in S]: {
       entry?: keyof C['actions']
       exit?: keyof C['actions']
+      chart?: Statechart<C, any>
       on?: {
         [N in keyof C['actions']]?:
           | S
@@ -33,7 +34,6 @@ function getActionTransition(
   state: { state: string[] }
 ) {
   const path = state.state.slice()
-  let canTransition = false
 
   while (path.length) {
     const target = getStateTarget(chart, path)
@@ -61,8 +61,8 @@ function getCanTransitionActions(actions, chart, state) {
 
 function getInitialState(chart, path = []) {
   const newPath = path.concat(chart.initial)
-  if (chart.states[chart.initial].initial) {
-    return getInitialState(chart.states[chart.initial], newPath)
+  if (chart.states[chart.initial].chart) {
+    return getInitialState(chart.states[chart.initial].chart, newPath)
   }
   return newPath
 }
@@ -92,7 +92,7 @@ function createNewStatePath(
   const stateTarget = getStateTarget(chart, newStatePath)
 
   // If we have more nested state, go grab the initial states
-  if (stateTarget.initial) {
+  if (stateTarget.chart) {
     return newStatePath.concat(getInitialState(stateTarget))
   }
 
@@ -104,7 +104,11 @@ function getTarget(source, path) {
 }
 
 function getStateTarget(chart, path) {
-  return path.reduce((aggr, key) => aggr.states[key], chart)
+  return path.reduce(
+    (aggr, key, index) =>
+      index === path.length - 1 ? aggr[key] : aggr[key].chart.states,
+    chart.states
+  )
 }
 
 export function statechart<C extends IConfiguration, S extends string>(