Application crashes when using arrayUnion from firestore #985

Author: EddyVerbruggen

demo-ng/app/tabs/firestore/firestore.component.ts

@@ -235,8 +235,8 @@ export class FirestoreComponent {
           last: "Updated From 'arrayUnion'",
           fieldToDelete: firestore.FieldValue.delete(),
           updateTs: firebase.firestore().FieldValue().serverTimestamp(),
-          // just fyi - both these work:
-          colors: firestore.FieldValue.arrayUnion(["red", "blue"])
+          // just fyi - both of these work:
+          colors: firestore.FieldValue.arrayUnion("red", "blue")
           // colors: firebase.firestore().FieldValue().arrayUnion(["red", "blue"])
         })
         .then(() => console.log("Woofie updated from 'arrayUnion'"))
@@ -248,7 +248,7 @@ export class FirestoreComponent {
         .update({
           last: "Updated From 'arrayRemove'",
           updateTs: firebase.firestore().FieldValue().serverTimestamp(),
-          colors: firebase.firestore().FieldValue().arrayRemove(["red"])
+          colors: firebase.firestore().FieldValue().arrayRemove("red")
         })
         .then(() => console.log("Woofie updated from 'arrayRemove'"))
         .catch(err => console.log("Updating Woofie from 'arrayRemove' failed, error: " + JSON.stringify(err)));

docs/FIRESTORE.md

@@ -238,9 +238,15 @@ If your document contains an array field, you can use `arrayUnion()` and `arrayR
 `arrayUnion()` adds elements to an array but only elements not already present:
 
 ```typescript
+import { firestore } from "nativescript-plugin-firebase";
+const firebase = require("nativescript-plugin-firebase/app");
+
 firebase.firestore().collection("dogs").doc("fave")
     .update({
-      colors: firebase.firestore().FieldValue().arrayUnion(["red", "blue"])
+      // you can either use this syntax:
+      colors1: firebase.firestore().FieldValue().arrayUnion("red", "blue"),
+      //.. or this one:
+      colors2: firestore.FieldValue.arrayUnion("red", "blue")
     });
 ```
 
@@ -249,7 +255,7 @@ firebase.firestore().collection("dogs").doc("fave")
 ```typescript
 firebase.firestore().collection("dogs").doc("fave")
     .update({
-      colors: firebase.firestore().FieldValue().arrayRemove(["red"])
+      colors: firebase.firestore().FieldValue().arrayRemove("red")
     });
 ```
 

src/app/firestore/index.ts

@@ -17,8 +17,8 @@ export namespace firestore {
         value: undefined,
         serverTimestamp: () => "SERVER_TIMESTAMP",
         delete: () => "DELETE_FIELD",
-        arrayUnion: (fields: Array<any>) => new firebase.firestore.FieldValue("ARRAY_UNION", fields),
-        arrayRemove: (fields: Array<any>) => new firebase.firestore.FieldValue("ARRAY_REMOVE", fields)
+        arrayUnion: (...elements: any[]) => new firebase.firestore.FieldValue("ARRAY_UNION", elements),
+        arrayRemove: (...elements: any[]) => new firebase.firestore.FieldValue("ARRAY_REMOVE", elements)
       };
     }
 

src/firebase-common.ts

@@ -16,8 +16,8 @@ export class FieldValue {
 
   static serverTimestamp = () => "SERVER_TIMESTAMP";
   static delete = () => "DELETE_FIELD";
-  static arrayUnion = (fields: Array<any>) => new FieldValue("ARRAY_UNION", fields);
-  static arrayRemove = (fields: Array<any>) => new FieldValue("ARRAY_REMOVE", fields);
+  static arrayUnion = (...elements: any[]) => new FieldValue("ARRAY_UNION", elements);
+  static arrayRemove = (...elements: any[]) => new FieldValue("ARRAY_REMOVE", elements);
 }
 
 export class GeoPoint {

src/firebase.android.ts

@@ -118,9 +118,10 @@ firebase.toHashMap = obj => {
         } else if (obj[property] instanceof FieldValue) {
           const fieldValue: FieldValue = obj[property];
           if (fieldValue.type === "ARRAY_UNION") {
-            node.put(property, com.google.firebase.firestore.FieldValue.arrayUnion(fieldValue.value));
+            // nested arrays are not allowed, so harden against wrong usage: arrayUnion(["foo", "bar"]) vs arrayUnion("foo", "bar")
+            node.put(property, com.google.firebase.firestore.FieldValue.arrayUnion(Array.isArray(fieldValue.value[0]) ? fieldValue.value[0] : fieldValue.value));
           } else if (fieldValue.type === "ARRAY_REMOVE") {
-            node.put(property, com.google.firebase.firestore.FieldValue.arrayRemove(fieldValue.value));
+            node.put(property, com.google.firebase.firestore.FieldValue.arrayRemove(Array.isArray(fieldValue.value[0]) ? fieldValue.value[0] : fieldValue.value));
           } else {
             console.log("You found a bug! Please report an issue at https://github.com/EddyVerbruggen/nativescript-plugin-firebase/issues, mention fieldValue.type = '" + fieldValue.type + "'. Thanks!");
           }

src/firebase.d.ts

@@ -726,8 +726,8 @@ export namespace firestore {
 
     static serverTimestamp: () => "SERVER_TIMESTAMP";
     static delete: () => "DELETE_FIELD";
-    static arrayUnion: (fields: Array<any>) => FieldValue;
-    static arrayRemove: (fields: Array<any>) => FieldValue;
+    static arrayUnion: (...elements: any[]) => FieldValue;
+    static arrayRemove: (...elements: any[]) => FieldValue;
   }
 
   export interface SnapshotListenOptions {

src/firebase.ios.ts

@@ -1825,9 +1825,10 @@ function fixSpecialField(item): any {
   } else if (item instanceof FieldValue) {
     const fieldValue: FieldValue = item;
     if (fieldValue.type === "ARRAY_UNION") {
-      return FIRFieldValue.fieldValueForArrayUnion(fieldValue.value);
+      // nested arrays are not allowed, so harden against wrong usage: arrayUnion(["foo", "bar"]) vs arrayUnion("foo", "bar")
+      return FIRFieldValue.fieldValueForArrayUnion(Array.isArray(fieldValue.value[0]) ? fieldValue.value[0] : fieldValue.value);
     } else if (fieldValue.type === "ARRAY_REMOVE") {
-      return FIRFieldValue.fieldValueForArrayRemove(fieldValue.value);
+      return FIRFieldValue.fieldValueForArrayRemove(Array.isArray(fieldValue.value[0]) ? fieldValue.value[0] : fieldValue.value);
     } else {
       console.log("You found a bug! Please report an issue at https://github.com/EddyVerbruggen/nativescript-plugin-firebase/issues, mention fieldValue.type = '" + fieldValue.type + "'. Thanks!");
     }