Call toFirestore() only once (#3755)

firebase · Sep 11, 2020 · e81c429 · e81c429
1 parent 35d1c0d
commit e81c429
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/.changeset/tame-donuts-relate.md b/.changeset/tame-donuts-relate.md
@@ -0,0 +1,5 @@
+---
+'@firebase/firestore': patch
+---
+
+Fixed a bug where CollectionReference.add() called FirestoreDataConverter.toFirestore() twice intead of once (#3742).
diff --git a/packages/firestore/lite/src/api/field_value.ts b/packages/firestore/lite/src/api/field_value.ts
@@ -30,7 +30,8 @@ import { ParseContext } from '../../../src/api/user_data_reader';
 import { FieldTransform } from '../../../src/model/mutation';
 
 /** The public FieldValue class of the lite API. */
-export abstract class FieldValue extends SerializableFieldValue
+export abstract class FieldValue
+  extends SerializableFieldValue
   implements firestore.FieldValue {}
 
 /**

diff --git a/packages/firestore/src/api/database.ts b/packages/firestore/src/api/database.ts
@@ -2379,8 +2379,17 @@ export class CollectionReference<T = DocumentData>
       ? this._converter.toFirestore(value)
       : value;
     validateArgType('CollectionReference.add', 'object', 1, convertedValue);
+
     const docRef = this.doc();
-    return docRef.set(value).then(() => docRef);
+
+    // Call set() with the converted value directly to avoid calling toFirestore() a second time.
+    return new DocumentReference(
+      (docRef as DocumentReference<T>)._key,
+      this.firestore,
+      null
+    )
+      .set(convertedValue)
+      .then(() => docRef);
   }
 
   withConverter<U>(