test(firestore): more document tests

Author: posva

old_tests/core/firestore/document.spec.ts

@@ -24,7 +24,12 @@ import {
   _RefWithState,
 } from '../shared'
 import { firestoreUnbinds } from './optionsApi'
-import { bindCollection, bindDocument, FirestoreOptions } from './subscribe'
+import {
+  bindCollection,
+  bindDocument,
+  firestoreOptions,
+  FirestoreOptions,
+} from './subscribe'
 
 export const ops: OperationsType = {
   set: (target, key, value) => walkSet(target, key, value),
@@ -47,9 +52,10 @@ export function _useFirestoreRef(
   docOrCollectionRef: _MaybeRef<
     DocumentReference<unknown> | Query<unknown> | CollectionReference<unknown>
   >,
-  options: _UseFirestoreRefOptions = {}
+  localOptions?: _UseFirestoreRefOptions
 ) {
   let _unbind!: UnbindType
+  const options = Object.assign({}, firestoreOptions, localOptions)
 
   // TODO: allow passing pending and error refs as option for when this is called using the options api
   const data = options.target || ref<unknown | null>(options.initialValue)
@@ -62,7 +68,14 @@ export function _useFirestoreRef(
 
   function bindFirestoreRef() {
     const p = new Promise<unknown | null>((resolve, reject) => {
-      const docRefValue = unref(docOrCollectionRef)
+      let docRefValue = unref(docOrCollectionRef)
+      if (!docRefValue.converter) {
+        docRefValue = docRefValue.withConverter(
+          // @ts-expect-error: seems like a ts error
+          options.converter as FirestoreDataConverter<T>
+        )
+      }
+
       _unbind = (isDocumentRef(docRefValue) ? bindDocument : bindCollection)(
         data,
         // @ts-expect-error: the type is good because of the ternary

src/firestore/index.ts

@@ -223,20 +223,13 @@ export function bindCollection<T = unknown>(
   ops: CommonBindOptionsParameter['ops'],
   resolve: CommonBindOptionsParameter['resolve'],
   reject: CommonBindOptionsParameter['reject'],
-  extraOptions: FirestoreOptions = DEFAULT_OPTIONS
+  extraOptions?: FirestoreOptions
 ) {
+  // FIXME: can be removed now
   const options = Object.assign({}, DEFAULT_OPTIONS, extraOptions) // fill default values
 
   const { snapshotListenOptions, snapshotOptions, wait } = options
 
-  if (!collection.converter) {
-    // @ts-expect-error: seems like a ts error
-    collection = collection.withConverter(
-      // @ts-expect-error: seems like a ts error
-      options.converter as FirestoreDataConverter<T>
-    )
-  }
-
   const key = 'value'
   if (!wait) ops.set(target, key, [])
   let arrayRef = ref(wait ? [] : target[key])
@@ -379,7 +372,7 @@ export function bindDocument<T>(
   ops: BindDocumentParameter['ops'],
   resolve: BindDocumentParameter['resolve'],
   reject: BindDocumentParameter['reject'],
-  extraOptions: FirestoreOptions = DEFAULT_OPTIONS
+  extraOptions?: FirestoreOptions
 ) {
   const options = Object.assign({}, DEFAULT_OPTIONS, extraOptions) // fill default values
   const key = 'value'