fix(refs): resolve the promise when all resolve are called

Author: posva

src/index.js

@@ -25,13 +25,25 @@ function subscribeToRefs ({
     subs[refKey].unsub()
     delete subs[refKey]
   })
-  if (!refKeys.length) return resolve()
+  if (!refKeys.length) return resolve(path)
   // TODO max depth param, default to 1?
   if (++depth > 3) throw new Error('more than 5 nested refs')
 
+  let resolvedCount = 0
+  const totalToResolve = refKeys.length
+  const validResolves = Object.create(null)
+  function deepResolve (key) {
+    if (key in validResolves) {
+      if (++resolvedCount >= totalToResolve) resolve(path)
+    }
+  }
+
   refKeys.forEach(refKey => {
     const sub = subs[refKey]
     const ref = refs[refKey]
+    const docPath = `${path}.${refKey}`
+
+    validResolves[docPath] = true
 
     // unsubscribe if bound to a different ref
     if (sub) {
@@ -44,9 +56,9 @@ function subscribeToRefs ({
       unsub: subscribeToDocument({
         ref,
         target,
-        path: `${path}.${refKey}`,
+        path: docPath,
         depth,
-        resolve
+        resolve: deepResolve.bind(null, docPath)
       }),
       path: ref.path
     }
@@ -177,7 +189,7 @@ function subscribeToDocument ({ ref, target, path, depth, resolve }) {
       })
     } else {
       walkSet(target, path, null)
-      resolve()
+      resolve(path)
     }
   })
 

test/bind.spec.js

@@ -2,6 +2,7 @@ import Vuefire from '../src'
 import {
   db,
   tick,
+  delayUpdate,
   Vue
 } from './helpers'
 
@@ -84,3 +85,106 @@ test('unbinds previously bound refs', async () => {
   expect(vm.$firestoreRefs.item).toBe(doc2)
   expect(vm.item).toEqual({ bar: 'bar' })
 })
+
+test('waits for all refs in document', async () => {
+  const a = db.collection().doc()
+  const b = db.collection().doc()
+  delayUpdate(b)
+  await document.update({ a, b })
+
+  await vm.$bind('item', document)
+
+  expect(vm.item).toEqual({
+    a: null,
+    b: null
+  })
+})
+
+test('waits for all refs in collection', async () => {
+  const a = db.collection().doc()
+  const b = db.collection().doc()
+  delayUpdate(b)
+  await collection.add({ a })
+  await collection.add({ b })
+
+  await vm.$bind('items', collection)
+
+  expect(vm.items).toEqual([
+    { a: null },
+    { b: null }
+  ])
+})
+
+test('waits for nested refs in document', async () => {
+  const a = db.collection().doc()
+  const b = db.collection().doc()
+  const c = db.collection().doc()
+  await b.update({ c })
+  delayUpdate(b)
+  delayUpdate(c, 5)
+  await document.update({ a, b })
+
+  await vm.$bind('item', document)
+
+  expect(vm.item).toEqual({
+    a: null,
+    b: { c: null }
+  })
+})
+
+test('waits for nested refs with data in document', async () => {
+  const a = db.collection().doc()
+  const b = db.collection().doc()
+  const c = db.collection().doc()
+  await a.update({ isA: true })
+  await c.update({ isC: true })
+  await b.update({ c })
+  delayUpdate(b)
+  delayUpdate(c, 5)
+  await document.update({ a, b })
+
+  await vm.$bind('item', document)
+
+  expect(vm.item).toEqual({
+    a: { isA: true },
+    b: { c: { isC: true }}
+  })
+})
+
+test('waits for nested refs in collections', async () => {
+  const a = db.collection().doc()
+  const b = db.collection().doc()
+  const c = db.collection().doc()
+  await b.update({ c })
+  delayUpdate(b)
+  delayUpdate(c, 5)
+  await collection.add({ a })
+  await collection.add({ b })
+
+  await vm.$bind('items', collection)
+
+  expect(vm.items).toEqual([
+    { a: null },
+    { b: { c: null }}
+  ])
+})
+
+test('waits for nested refs with data in collections', async () => {
+  const a = db.collection().doc()
+  const b = db.collection().doc()
+  const c = db.collection().doc()
+  await a.update({ isA: true })
+  await c.update({ isC: true })
+  await b.update({ c })
+  delayUpdate(b)
+  delayUpdate(c, 5)
+  await collection.add({ a })
+  await collection.add({ b })
+
+  await vm.$bind('items', collection)
+
+  expect(vm.items).toEqual([
+    { a: { isA: true }},
+    { b: { c: { isC: true }}}
+  ])
+})