Validating object keys in update() (#65)

Author: schmidt-sebastian

src/document.js

@@ -1054,7 +1054,7 @@ class Precondition {
  * @returns {boolean} 'true' when the object is valid.
  * @throws {Error} when the object is invalid.
  */
-function validateDocumentData(obj, usesPaths, depth) {
+function validateDocumentData(obj, depth) {
   if (!depth) {
     depth = 1;
   } else if (depth > MAX_DEPTH) {
@@ -1070,7 +1070,7 @@ function validateDocumentData(obj, usesPaths, depth) {
   for (let prop in obj) {
     if (obj.hasOwnProperty(prop)) {
       if (isPlainObject(obj[prop])) {
-        validateDocumentData(obj[prop], false, depth + 1);
+        validateDocumentData(obj[prop], depth + 1);
       }
     }
   }

src/write-batch.js

@@ -351,6 +351,7 @@ class WriteBatch {
         validate.maxNumberOfArguments('update', arguments, 3);
 
         Object.keys(dataOrField).forEach(key => {
+          validate.isFieldPath(key, key);
           updateMap.set(FieldPath.fromArgument(key), dataOrField[key]);
         });
 

test/document.js

@@ -1376,13 +1376,11 @@ describe('update document', function() {
     ];
 
     for (let i = 0; i < invalidFields.length; ++i) {
-      try {
-        firestore.collection('col').select(invalidFields[i]);
-      } catch (err) {
-        assert.ok(
-          err.message.match(/Argument at index 0 is not a valid FieldPath. .*/)
-        );
-      }
+      assert.throws(() => {
+        const doc = {};
+        doc[invalidFields[i]] = 'foo';
+        firestore.doc('col/doc').update(doc);
+      }, /.*Argument ".*" is not a valid FieldPath.*/);
     }
   });