Bug fixes and improved resolving

Author: TriPSs

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-esc-resolver",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "description": "Easy to use Client and Server Resolver",
   "homepage": "https://github.com/TriPSs/react-esc-resolver",
   "bugs": {

src/Resolver.js

@@ -145,33 +145,17 @@ export default class Resolver extends React.Component {
   }
 
   computeState(thisProps, state) {
-    const { resolve, props } = thisProps
-    let nextState            = state
+    const { resolve } = thisProps
+    let nextState     = state
 
-    Object.keys(resolve).forEach(name => {
+    Object.keys(resolve).forEach((name) => {
       const cached = this.cached(name)
 
       if (!state.resolved.hasOwnProperty(name) && !state.pending.hasOwnProperty(name) && !cached) {
-        const factory = resolve[name]
-
-        nextState = {
-          ...state,
-          pending: {
-            ...state.pending,
-            [name]: factory(props),
-          }
-
-        }
+        nextState.pending[name] = resolve[name]
 
       } else if (cached) {
-        nextState = {
-          ...state,
-          resolved: {
-            ...state.resolved,
-            [name]: cached
-          }
-
-        }
+        nextState.resolved[name] = true
       }
     })
 
@@ -226,23 +210,21 @@ export default class Resolver extends React.Component {
   }
 
   resolve(state) {
-    const pending = Object.keys(state.pending).map(name => {
-      const promise = state.pending[name]
+    const { props } = this.props
 
-      return { name, promise }
-    })
+    const pending = Object.keys(state.pending).map((name) => {
+      const func = state.pending[name]
 
-    const promises = pending.map(({ promise }) => promise)
+      return { name, func }
+    })
 
-    let resolving = Promise.all(promises).then((values) => {
-      return values.reduce((resolved, value, i) => {
-        const { name } = pending[i]
+    const promises = pending.map(({ func }) => func(props))
 
-        resolved[name] = value
+    let resolving = Promise.all(promises).then((values) => values.reduce((resolved, value, i) => {
+      resolved[pending[i].name] = true
 
-        return resolved
-      }, {})
-    })
+      return resolved
+    }, {}))
 
     // Resolve listeners get the current resolved
     resolving = this.onResolve(resolving)
@@ -272,8 +254,6 @@ export default class Resolver extends React.Component {
 
     // Prevent rendering until pending values are resolved
     if (this.isPending(nextState)) {
-      this.resolve(nextState)
-
       return false
     }
 
@@ -288,4 +268,5 @@ export default class Resolver extends React.Component {
 
     this.setState(nextState)
   }
+
 }

src/resolve.js

@@ -7,16 +7,17 @@ const capitalize = (word) => {
 
 export default (prop, promise, cache = true) => {
 
-  const asyncProps = (arguments.length === 1) ? prop : { [prop]: promise }
-  const asyncNames = Object.keys(asyncProps).map(capitalize).join("")
+  const asyncProps   = (typeof prop === 'object') ? prop : { [prop]: promise }
+  const asyncNames   = Object.keys(asyncProps).map(capitalize).join('')
+  const cacheEnabled = (typeof prop === 'object' && typeof promise === 'boolean') ? promise : cache
 
   return Component => class extends React.Component {
 
     static displayName = `${asyncNames}Resolver`
 
     render() {
       return (
-        <Resolver props={this.props} resolve={asyncProps} cache={cache}>
+        <Resolver props={this.props} resolve={asyncProps} cache={cacheEnabled}>
           {(resolved) => <Component {...resolved} />}
         </Resolver>
       )