chore: fix types after upgrades

posva · posva · commit f94e892f5f52 · 2023-07-06T16:38:18.000+02:00
diff --git a/tests/database/list.spec.ts b/tests/database/list.spec.ts
@@ -7,7 +7,15 @@ import {
   _RefDatabase,
 } from '../../src'
 import { expectType, tds, setupDatabaseRefs, database } from '../utils'
-import { computed, nextTick, ref, unref, watch, type Ref } from 'vue'
+import {
+  computed,
+  nextTick,
+  ref,
+  unref,
+  watch,
+  type Ref,
+  defineComponent,
+} from 'vue'
 import {
   DatabaseReference,
   orderByChild,
@@ -31,14 +39,16 @@ describe('Database lists', () => {
   } = {}) {
     let data!: _RefDatabase<VueDatabaseQueryData<T>>
 
-    const wrapper = mount({
-      template: 'no',
-      setup() {
-        data = useDatabaseList(ref, options)
-        const { data: list, pending, error, promise, stop } = data
-        return { list, pending, error, promise, stop }
-      },
-    })
+    const wrapper = mount(
+      defineComponent({
+        template: 'no',
+        setup() {
+          data = useDatabaseList(ref, options)
+          const { data: list, pending, error, promise, stop } = data
+          return { list, pending, error, promise, stop }
+        },
+      })
+    )
 
     return {
       wrapper,
diff --git a/tests/database/objects.spec.ts b/tests/database/objects.spec.ts
@@ -14,7 +14,15 @@ import {
   database,
   firebaseApp,
 } from '../utils'
-import { computed, nextTick, ref, shallowRef, unref, type Ref } from 'vue'
+import {
+  computed,
+  nextTick,
+  ref,
+  shallowRef,
+  unref,
+  type Ref,
+  defineComponent,
+} from 'vue'
 import { DatabaseReference, get, ref as _databaseRef } from 'firebase/database'
 import { _MaybeRef, _Nullable } from '../../src/shared'
 import { mockWarn } from '../vitest-mock-warn'
@@ -33,14 +41,16 @@ describe('Database objects', () => {
   } = {}) {
     let data!: _RefDatabase<VueDatabaseDocumentData<T> | undefined>
 
-    const wrapper = mount({
-      template: 'no',
-      setup() {
-        data = useDatabaseObject(ref, options)
-        const { data: item, pending, error, promise, stop } = data
-        return { item, pending, error, promise, stop }
-      },
-    })
+    const wrapper = mount(
+      defineComponent({
+        template: 'no',
+        setup() {
+          data = useDatabaseObject(ref, options)
+          const { data: item, pending, error, promise, stop } = data
+          return { item, pending, error, promise, stop }
+        },
+      })
+    )
 
     return {
       wrapper,
diff --git a/tests/firestore/collection.spec.ts b/tests/firestore/collection.spec.ts
@@ -9,7 +9,15 @@ import {
   where,
 } from 'firebase/firestore'
 import { expectType, setupFirestoreRefs, tds, firestore } from '../utils'
-import { computed, nextTick, ref, unref, watch, type Ref } from 'vue'
+import {
+  computed,
+  nextTick,
+  ref,
+  unref,
+  watch,
+  type Ref,
+  defineComponent,
+} from 'vue'
 import { _RefFirestore } from '../../src/firestore'
 import {
   useCollection,
@@ -36,17 +44,19 @@ describe(
     } = {}) {
       let data!: _RefFirestore<VueFirestoreQueryData<T>>
 
-      const wrapper = mount({
-        template: 'no',
-        setup() {
-          // @ts-expect-error: generic forced
-          data =
-            // split for ts
-            useCollection(ref, options)
-          const { data: list, pending, error, promise, stop } = data
-          return { list, pending, error, promise, stop }
-        },
-      })
+      const wrapper = mount(
+        defineComponent({
+          template: 'no',
+          setup() {
+            // @ts-expect-error: generic forced
+            data =
+              // split for ts
+              useCollection(ref, options)
+            const { data: list, pending, error, promise, stop } = data
+            return { list, pending, error, promise, stop }
+          },
+        })
+      )
 
       return {
         wrapper,
@@ -70,19 +80,21 @@ describe(
     } = {}) {
       let data!: _RefFirestore<VueFirestoreQueryData<T>>
 
-      const wrapper = mount({
-        template: 'no',
-        setup() {
-          // @ts-expect-error: generic forced
-          data = useCollection(
-            // split for ts
-            ref,
-            options
-          )
-          const { data: list, pending, error, promise, stop } = data
-          return { list, pending, error, promise, stop }
-        },
-      })
+      const wrapper = mount(
+        defineComponent({
+          template: 'no',
+          setup() {
+            // @ts-expect-error: generic forced
+            data = useCollection(
+              // split for ts
+              ref,
+              options
+            )
+            const { data: list, pending, error, promise, stop } = data
+            return { list, pending, error, promise, stop }
+          },
+        })
+      )
 
       return {
         wrapper,
diff --git a/tests/firestore/document.spec.ts b/tests/firestore/document.spec.ts
@@ -14,7 +14,14 @@ import {
   firestore,
   firebaseApp,
 } from '../utils'
-import { nextTick, ref, shallowRef, unref, type Ref } from 'vue'
+import {
+  nextTick,
+  ref,
+  shallowRef,
+  unref,
+  type Ref,
+  defineComponent,
+} from 'vue'
 import { isPOJO, _MaybeRef, _Nullable } from '../../src/shared'
 import {
   useDocument,
@@ -43,17 +50,19 @@ describe(
     } = {}) {
       let data!: _RefFirestore<VueFirestoreDocumentData<T>>
 
-      const wrapper = mount({
-        template: 'no',
-        setup() {
-          // @ts-expect-error: stricter type
-          data =
-            // split for ts
-            useDocument(ref, options)
-          const { data: item, pending, error, promise, stop } = data
-          return { item, pending, error, promise, stop }
-        },
-      })
+      const wrapper = mount(
+        defineComponent({
+          template: 'no',
+          setup() {
+            // @ts-expect-error: stricter type
+            data =
+              // split for ts
+              useDocument(ref, options)
+            const { data: item, pending, error, promise, stop } = data
+            return { item, pending, error, promise, stop }
+          },
+        })
+      )
 
       return {
         wrapper,
diff --git a/tests/firestore/refs-in-collections.spec.ts b/tests/firestore/refs-in-collections.spec.ts
@@ -6,7 +6,7 @@ import {
   DocumentData,
 } from 'firebase/firestore'
 import { setupFirestoreRefs, sleep } from '../utils'
-import { unref } from 'vue'
+import { defineComponent, unref } from 'vue'
 import { _RefFirestore } from '../../src/firestore'
 import {
   useCollection,
@@ -28,17 +28,19 @@ describe('Firestore refs in collections', async () => {
   } = {}) {
     let data!: _RefFirestore<VueFirestoreQueryData<T>>
 
-    const wrapper = mount({
-      template: 'no',
-      setup() {
-        // @ts-expect-error: generic forced
-        data =
-          // split for ts
-          useCollection(ref, options)
-        const { data: list, pending, error, promise, stop } = data
-        return { list, pending, error, promise, stop }
-      },
-    })
+    const wrapper = mount(
+      defineComponent({
+        template: 'no',
+        setup() {
+          // @ts-expect-error: generic forced
+          data =
+            // split for ts
+            useCollection(ref, options)
+          const { data: list, pending, error, promise, stop } = data
+          return { list, pending, error, promise, stop }
+        },
+      })
+    )
 
     return {
       wrapper,
diff --git a/tests/firestore/refs-in-documents.spec.ts b/tests/firestore/refs-in-documents.spec.ts
@@ -6,7 +6,7 @@ import {
   DocumentReference,
 } from 'firebase/firestore'
 import { setupFirestoreRefs, sleep } from '../utils'
-import { unref } from 'vue'
+import { defineComponent, unref } from 'vue'
 import { VueFirestoreDocumentData, _RefFirestore } from '../../src/firestore'
 import {
   UseDocumentOptions,
@@ -28,17 +28,19 @@ describe('Firestore refs in documents', async () => {
   } = {}) {
     let data!: _RefFirestore<VueFirestoreDocumentData<T>>
 
-    const wrapper = mount({
-      template: 'no',
-      setup() {
-        // @ts-expect-error: generic forced
-        data =
-          // split for ts
-          useDocument(ref, options)
-        const { data: list, pending, error, promise, stop } = data
-        return { list, pending, error, promise, stop }
-      },
-    })
+    const wrapper = mount(
+      defineComponent({
+        template: 'no',
+        setup() {
+          // @ts-expect-error: generic forced
+          data =
+            // split for ts
+            useDocument(ref, options)
+          const { data: list, pending, error, promise, stop } = data
+          return { list, pending, error, promise, stop }
+        },
+      })
+    )
 
     return {
       wrapper,
diff --git a/tests/storage/index.spec.ts b/tests/storage/index.spec.ts
@@ -1,7 +1,7 @@
 import { mount } from '@vue/test-utils'
 import { it, describe, expect } from 'vitest'
 import { uploadString } from 'firebase/storage'
-import { nextTick, ref } from 'vue'
+import { defineComponent, nextTick, ref } from 'vue'
 import {
   useFirebaseStorage,
   useStorageFileMetadata,
@@ -16,14 +16,16 @@ describe('Storage', () => {
   it('generates a URL', async () => {
     const objectRef = storageRef('my-url.jpg')
     await uploadString(objectRef, 'test', 'raw')
-    const wrapper = mount({
-      template: 'no',
-      setup() {
-        const { url, promise } = useStorageFileUrl(objectRef)
+    const wrapper = mount(
+      defineComponent({
+        template: 'no',
+        setup() {
+          const { url, promise } = useStorageFileUrl(objectRef)
 
-        return { url, promise }
-      },
-    })
+          return { url, promise }
+        },
+      })
+    )
 
     await wrapper.vm.promise
 
@@ -34,14 +36,16 @@ describe('Storage', () => {
   it('generates the metadata', async () => {
     const objectRef = storageRef('my-url.jpg')
     await uploadString(objectRef, 'test', 'raw')
-    const wrapper = mount({
-      template: 'no',
-      setup() {
-        const { metadata, promise } = useStorageFileMetadata(objectRef)
+    const wrapper = mount(
+      defineComponent({
+        template: 'no',
+        setup() {
+          const { metadata, promise } = useStorageFileMetadata(objectRef)
 
-        return { metadata, promise }
-      },
-    })
+          return { metadata, promise }
+        },
+      })
+    )
 
     await wrapper.vm.promise
 
@@ -54,14 +58,17 @@ describe('Storage', () => {
   it('can create upload tasks', async () => {
     const objectRef = storageRef('my-url.jpg')
     await uploadString(objectRef, 'test', 'raw')
-    const wrapper = mount({
-      template: 'no',
-      setup() {
-        const { uploadTask, upload, uploadProgress } = useStorageFile(objectRef)
+    const wrapper = mount(
+      defineComponent({
+        template: 'no',
+        setup() {
+          const { uploadTask, upload, uploadProgress } =
+            useStorageFile(objectRef)
 
-        return { uploadTask, upload, uploadProgress }
-      },
-    })
+          return { uploadTask, upload, uploadProgress }
+        },
+      })
+    )
 
     await nextTick()
 
diff --git a/tests/vitest-mock-warn.ts b/tests/vitest-mock-warn.ts
@@ -107,12 +107,13 @@ export function mockWarn() {
   })
 }
 
-declare global {
-  namespace Vi {
-    interface JestAssertion<T = any> {
-      toHaveBeenWarned(): void
-      toHaveBeenWarnedLast(): void
-      toHaveBeenWarnedTimes(n: number): void
-    }
-  }
+interface MockWarnMatcher<R = unknown> {
+  toHaveBeenWarned(): void
+  toHaveBeenWarnedLast(): void
+  toHaveBeenWarnedTimes(n: number): void
+}
+
+declare module 'vitest' {
+  interface Assertion<T = any> extends MockWarnMatcher<T> {}
+  interface AsymmetricMatchersContaining extends MockWarnMatcher {}
 }
