Merge branch 'master' into mrschmidt/removeinterface

Author: schmidt-sebastian

.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).

integration/messaging/package.json

@@ -15,7 +15,7 @@
     "express": "4.17.1",
     "geckodriver": "1.20.0",
     "mocha": "7.2.0",
-    "node-fetch": "2.6.0",
+    "node-fetch": "2.6.1",
     "selenium-assistant": "6.1.0"
   }
 }

package.json

@@ -101,7 +101,7 @@
     "find-free-port": "2.0.0",
     "firebase-functions": "3.11.0",
     "firebase-tools": "8.9.2",
-    "git-rev-sync": "2.0.0",
+    "git-rev-sync": "3.0.1",
     "glob": "7.1.6",
     "http-server": "0.12.3",
     "husky": "4.2.5",

packages/firestore/package.json

@@ -67,7 +67,7 @@
     "@firebase/webchannel-wrapper": "0.3.0",
     "@grpc/grpc-js": "^1.0.0",
     "@grpc/proto-loader": "^0.5.0",
-    "node-fetch": "2.6.0",
+    "node-fetch": "2.6.1",
     "tslib": "^1.11.1"
   },
   "peerDependencies": {

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>(

packages/firestore/src/core/query.ts

@@ -854,6 +854,11 @@ export class NotInFilter extends FieldFilter {
   }
 
   matches(doc: Document): boolean {
+    if (
+      arrayValueContains(this.value.arrayValue!, { nullValue: 'NULL_VALUE' })
+    ) {
+      return false;
+    }
     const other = doc.field(this.field);
     return other !== null && !arrayValueContains(this.value.arrayValue!, other);
   }