converter feedback

Author: DellaBitta

packages/firestore/src/api/reference_impl.ts

@@ -1005,10 +1005,7 @@ export function onSnapshotResume<
   let curArg = 0;
   let options: SnapshotListenOptions | undefined = undefined;
   if (typeof args[curArg] === 'object' && !isPartialObserver(args[curArg])) {
-    console.error('DEDB arg 0 is SnapsotLsitenOptions');
     options = args[curArg++] as SnapshotListenOptions;
-  } else {
-    console.error('DEDB arg 0 is NOT SnapsotLsitenOptions');
   }
 
   if (json.bundleSource === 'QuerySnapshot') {

packages/firestore/src/api/snapshot.ts

@@ -608,7 +608,7 @@ export function documentSnapshotFromJSON<
 >(
   db: Firestore,
   json: object,
-  ...args: unknown[]
+  converter?: FirestoreDataConverter<AppModelType, DbModelType>
 ): DocumentSnapshot<AppModelType, DbModelType> {
   if (validateJSON(json, DocumentSnapshot._jsonSchema)) {
     // Parse the bundle data.
@@ -638,12 +638,6 @@ export function documentSnapshotFromJSON<
       ResourcePath.fromString(json.bundleName)
     );
 
-    let converter: FirestoreDataConverter<AppModelType, DbModelType> | null =
-      null;
-    if (args[0]) {
-      converter = args[0] as FirestoreDataConverter<AppModelType, DbModelType>;
-    }
-
     // Return the external facing DocumentSnapshot.
     return new DocumentSnapshot(
       db,
@@ -654,7 +648,7 @@ export function documentSnapshotFromJSON<
         /* hasPendingWrites= */ false,
         /* fromCache= */ false
       ),
-      converter
+      converter ? converter : null
     );
   }
   throw new FirestoreError(
@@ -918,7 +912,7 @@ export function querySnapshotFromJSON<
 >(
   db: Firestore,
   json: object,
-  ...args: unknown[]
+  converter?: FirestoreDataConverter<AppModelType, DbModelType>
 ): QuerySnapshot<AppModelType, DbModelType> {
   if (validateJSON(json, QuerySnapshot._jsonSchema)) {
     // Parse the bundle data.
@@ -959,16 +953,10 @@ export function querySnapshotFromJSON<
       /* hasCachedResults= */ false
     );
 
-    let converter: FirestoreDataConverter<AppModelType, DbModelType> | null =
-      null;
-    if (args[0]) {
-      converter = args[0] as FirestoreDataConverter<AppModelType, DbModelType>;
-    }
-
     // Create an external Query object, required to construct the QuerySnapshot.
     const externalQuery = new Query<AppModelType, DbModelType>(
       db,
-      converter,
+      converter ? converter : null,
       query
     );
 

packages/firestore/src/lite-api/reference.ts

@@ -334,22 +334,12 @@ export class DocumentReference<
   >(
     firestore: Firestore,
     json: object,
-    ...args: unknown[]
+    converter?: FirestoreDataConverter<NewAppModelType, NewDbModelType>
   ): DocumentReference<NewAppModelType, NewDbModelType> {
     if (validateJSON(json, DocumentReference._jsonSchema)) {
-      let converter: FirestoreDataConverter<
-        NewAppModelType,
-        NewDbModelType
-      > | null = null;
-      if (args[0]) {
-        converter = args[0] as FirestoreDataConverter<
-          NewAppModelType,
-          NewDbModelType
-        >;
-      }
       return new DocumentReference<NewAppModelType, NewDbModelType>(
         firestore,
-        converter,
+        converter ? converter : null,
         new DocumentKey(ResourcePath.fromString(json.referencePath))
       );
     }

packages/firestore/src/util/bundle_reader_sync_impl.ts

@@ -17,6 +17,7 @@
 
 import { BundleMetadata } from '../protos/firestore_bundle_proto';
 import { JsonProtoSerializer } from '../remote/serializer';
+import { Code, FirestoreError } from '../util/error'
 
 import { BundleReaderSync, SizedBundleElement } from './bundle_reader';
 
@@ -84,7 +85,9 @@ export class BundleReaderSyncImpl implements BundleReaderSync {
    */
   private readJsonString(length: number): string {
     if (this.cursor + length > this.bundleData.length) {
-      throw new Error('Reached the end of bundle when more is expected.');
+      throw new FirestoreError(
+        Code.INTERNAL,
+        'Reached the end of bundle when more is expected.');
     }
     const result = this.bundleData.slice(this.cursor, (this.cursor += length));
     return result;