fix: unwrap promise $databaseBind()

Fix #1275
vuejs · Jan 6, 2023 · 4e6d32f · 4e6d32f
1 parent bf076cb
commit 4e6d32f
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 4 deletions.
diff --git a/src/database/optionsApi.ts b/src/database/optionsApi.ts
@@ -119,7 +119,7 @@ export function databasePlugin(
     ;(this.$firebaseRefs as Mutable<Record<string, DatabaseReference>>)[key] =
       source.ref
 
-    return promise
+    return promise.value
   }
 
   // handle firebase option

diff --git a/src/firestore/optionsApi.ts b/src/firestore/optionsApi.ts
@@ -121,6 +121,7 @@ export const firestorePlugin = function firestorePlugin(
     this.$firestoreRefs[key] =
       // ts
       docOrCollectionRef
+
     return promise.value
   }
 

diff --git a/tests/database/options.spec.ts b/tests/database/options.spec.ts
@@ -35,13 +35,24 @@ describe('RTDB: plugin options', () => {
       expect(typeof (wrapper.vm as any).$myUnbind).toBe('function')
     })
 
+    it('returns a promise', async () => {
+      const serialize = vi.fn(() => ({ id: '2', foo: 'bar' }))
+      const { vm } = factory({ serialize })
+      const itemListRef = databaseRef()
+
+      const p = vm.$databaseBind('itemList', itemListRef)
+      expect(p).toBeInstanceOf(Promise)
+      await expect(p).resolves.toHaveLength(0)
+    })
+
     it('calls custom serialize function with a ref', async () => {
       const serialize = vi.fn(() => ({ id: '2', foo: 'bar' }))
       const { vm } = factory({ serialize })
 
       const itemListRef = databaseRef()
 
       const p = vm.$databaseBind('itemList', itemListRef)
+      await p
       await push(itemListRef, { text: 'foo' })
 
       expect(serialize).toHaveBeenCalledTimes(1)

diff --git a/tests/firestore/options.spec.ts b/tests/firestore/options.spec.ts
@@ -38,10 +38,19 @@ describe('Firestore: Options API', () => {
       expect(wrapper.vm.$myUnbind).toBeTypeOf('function')
     })
 
+    it('returns a promise', async () => {
+      const { vm } = factory()
+
+      const itemListRef = collection()
+      await addDoc(itemListRef, {})
+
+      const p = vm.$firestoreBind('itemList', itemListRef)
+      expect(p).toBeInstanceOf(Promise)
+      await expect(p).resolves.toHaveLength(1)
+    })
+
     it('calls custom serialize function with collection', async () => {
-      const fromFirestore = vi.fn(() => ({
-        foo: 'bar',
-      }))
+      const fromFirestore = vi.fn(() => ({ foo: 'bar' }))
       const wrapper = factory({
         converter: {
           fromFirestore,