fix(overmind): lazy loading modules fixed

Author: christianalfoni

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

@@ -1,4 +1,5 @@
 import { IConfiguration, IAction } from '../'
+import { processState } from '../utils'
 
 type SubType<Base, Condition> = Pick<
   Base,
@@ -112,17 +113,35 @@ export function merge(...configurations: IConfiguration[]): IConfiguration {
 
   const reducedConfigurations = configurations.reduce(
     (aggr, config) => {
-      const stateDuplicates = aggr.state ? Object.keys(aggr.state).some( key => config.state ? Object.keys(config.state).includes(key) : false) : false;
-      const actionsDuplicates = aggr.actions ? Object.keys(aggr.actions).some( key => config.actions ? Object.keys(config.actions).includes(key) : false) : false;
-      const effectsDuplicates = aggr.effects ? Object.keys(aggr.effects).some( key => config.effects ? Object.keys(config.effects).includes(key) : false) : false;
-      if (stateDuplicates){
-        throw new Error("Merge conflict: at least one state definition contains a duplicate key")
+      const stateDuplicates = aggr.state
+        ? Object.keys(aggr.state).some((key) =>
+            config.state ? Object.keys(config.state).includes(key) : false
+          )
+        : false
+      const actionsDuplicates = aggr.actions
+        ? Object.keys(aggr.actions).some((key) =>
+            config.actions ? Object.keys(config.actions).includes(key) : false
+          )
+        : false
+      const effectsDuplicates = aggr.effects
+        ? Object.keys(aggr.effects).some((key) =>
+            config.effects ? Object.keys(config.effects).includes(key) : false
+          )
+        : false
+      if (stateDuplicates) {
+        throw new Error(
+          'Merge conflict: at least one state definition contains a duplicate key'
+        )
       }
       if (actionsDuplicates) {
-        throw new Error("Merge conflict: at least one actions definition contains a duplicate key")
+        throw new Error(
+          'Merge conflict: at least one actions definition contains a duplicate key'
+        )
       }
       if (effectsDuplicates) {
-        throw new Error("Merge conflict: at least one effects definition contains a duplicate key")
+        throw new Error(
+          'Merge conflict: at least one effects definition contains a duplicate key'
+        )
       }
       return {
         onInitialize: aggr.onInitialize,
@@ -290,13 +309,14 @@ export function lazy<T extends LazyConfiguration, B = T>(
       lazy: {
         loadConfig({ state, ...rest }, key) {
           const configToLoad = configurations[key]
-          configToLoad().then((loadedConfig) => {
+
+          return configToLoad().then((loadedConfig) => {
             const newConfig = namespaced({
               [key]: loadedConfig,
             })
 
             if (newConfig.state && newConfig.state[key])
-              state[key] = newConfig.state[key]
+              state[key] = processState(newConfig.state[key])
             if (newConfig.effects && newConfig.effects[key])
               app.effects[key] = newConfig.effects[key]
             if (newConfig.actions && newConfig.actions[key])

packages/node_modules/overmind/src/index.ts

@@ -44,6 +44,7 @@ import {
   getActionPaths,
   createActionsProxy,
   EXECUTION,
+  processState,
 } from './utils'
 import {
   operatorStarted,
@@ -773,41 +774,16 @@ export class Overmind<ThisConfig extends IConfiguration>
   private getState(configuration: IConfiguration) {
     let state = {}
     if (configuration.state) {
-      state = this.processState(configuration.state)
+      state = processState(
+        configuration.state,
+        process.env.NODE_ENV === 'development'
+          ? this.derivedReferences
+          : undefined
+      )
     }
 
     return state
   }
-  private processState(state: {}) {
-    return Object.keys(state).reduce((aggr, key) => {
-      if (key === '__esModule') {
-        return aggr
-      }
-      const originalDescriptor = Object.getOwnPropertyDescriptor(state, key)
-
-      if (originalDescriptor && 'get' in originalDescriptor) {
-        Object.defineProperty(aggr, key, originalDescriptor as any)
-
-        return aggr
-      }
-
-      const value = state[key]
-
-      if (isPlainObject(value)) {
-        aggr[key] = this.processState(value)
-      } else if (typeof value === 'function') {
-        aggr[key] = new Derived(value)
-
-        if (process.env.NODE_ENV === 'development') {
-          this.derivedReferences.push(aggr[key])
-        }
-      } else {
-        Object.defineProperty(aggr, key, originalDescriptor as any)
-      }
-
-      return aggr
-    }, {})
-  }
   private getActions(actions: any = {}, path: string[] = []) {
     return Object.keys(actions).reduce((aggr, name) => {
       if (typeof actions[name] === 'function') {

packages/node_modules/overmind/src/utils.ts

@@ -1,6 +1,7 @@
 import isPlainObject from 'is-plain-obj'
 import { IMutation } from 'proxy-state-tree'
 import { safeValues } from './Devtools'
+import { Derived } from './derived'
 
 export const IS_TEST = process.env.NODE_ENV === 'test'
 export const IS_OPERATOR = Symbol('operator')
@@ -15,6 +16,37 @@ export class MockedEventEmitter {
   addListener() {}
 }
 
+export function processState(state: {}, derivedReferences?: any[]) {
+  return Object.keys(state).reduce((aggr, key) => {
+    if (key === '__esModule') {
+      return aggr
+    }
+    const originalDescriptor = Object.getOwnPropertyDescriptor(state, key)
+
+    if (originalDescriptor && 'get' in originalDescriptor) {
+      Object.defineProperty(aggr, key, originalDescriptor as any)
+
+      return aggr
+    }
+
+    const value = state[key]
+
+    if (isPlainObject(value)) {
+      aggr[key] = this.processState(value)
+    } else if (typeof value === 'function') {
+      aggr[key] = new Derived(value)
+
+      if (derivedReferences) {
+        derivedReferences.push(aggr[key])
+      }
+    } else {
+      Object.defineProperty(aggr, key, originalDescriptor as any)
+    }
+
+    return aggr
+  }, {})
+}
+
 export function getFunctionName(func: Function) {
   return func.name || (func as any).displayName || ''
 }