Improved collect/ensureReady

Author: Guillaume Chau

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-apollo",
-  "version": "2.1.0-beta.4",
+  "version": "2.1.0-beta.5",
   "description": "Vue apollo integration",
   "main": "lib/index.js",
   "scripts": {

src/apollo-provider.js

@@ -3,19 +3,32 @@ export class ApolloProvider {
     if (!options) {
       throw new Error('Options argument required')
     }
-    this.clients = options.clients
-    this.defaultClient = options.defaultClient
+    this.clients = options.clients || {}
+    this.clients.defaultClient = this.defaultClient = options.defaultClient
     this._collecting = false
   }
 
   collect (options) {
     const finalOptions = Object.assign({}, {
       waitForLoaded: true,
     }, options)
+    this._ready = false
     this._promises = []
     this._collectingOptions = finalOptions
     this._isCollecting = true
-    return () => this._ensureReady()
+    this._ensureReadyPromise = null
+    return this.ensureReady
+  }
+
+  ensureReady () {
+    if (this._ready) {
+      return Promise.resolve()
+    } else {
+      if (!this._ensureReadyPromise) {
+        this._ensureReadyPromise = this._ensureReady()
+      }
+      return this._ensureReadyPromise
+    }
   }
 
   _waitFor (promise) {
@@ -26,6 +39,9 @@ export class ApolloProvider {
 
   _ensureReady () {
     this._isCollecting = false
-    return Promise.all(this._promises)
+    return Promise.all(this._promises).then((result) => {
+      this._ready = true
+      return result
+    })
   }
 }

src/dollar-apollo.js

@@ -97,16 +97,12 @@ export class DollarApollo {
 
   option (key, options) {
     const smart = this.queries[key] = new SmartQuery(this.vm, key, options, false)
-    this.vm.$nextTick(() => {
-      smart.autostart()
-    })
+    smart.autostart()
   }
 
   subscribeOption (key, options) {
     const smart = this.subscriptions[key] = new SmartSubscription(this.vm, key, options, false)
-    this.vm.$nextTick(() => {
-      smart.autostart()
-    })
+    smart.autostart()
   }
 
   defineReactiveSetter (key, func) {