Keeping non-empty nested objects (#161)

schmidt-sebastian · web-flow · commit dde2233a7e6e · 2018-03-21T11:12:58.000-07:00
* Keeping non-empty nested objects
diff --git a/src/document.js b/src/document.js
@@ -217,7 +217,6 @@ class DocumentSnapshot {
   static fromObject(ref, obj) {
     return new DocumentSnapshot(ref, DocumentSnapshot.encodeFields(obj));
   }
-
   /**
    * Creates a DocumentSnapshot from an UpdateMap.
    *
@@ -272,7 +271,7 @@ class DocumentSnapshot {
             target[key] = childNode;
             return target;
           } else {
-            return null;
+            return !is.empty(target) ? target : null;
           }
         }
       } else {
diff --git a/test/document.js b/test/document.js
@@ -1455,31 +1455,47 @@ describe('update document', function() {
       requestEquals(
         request,
         update(
-          document('foo', {
+          document('a', {
             mapValue: {
               fields: {
-                bar: {
-                  stringValue: 'include',
-                  valueType: 'stringValue',
+                b: {
+                  valueType: 'mapValue',
+                  mapValue: {
+                    fields: {
+                      keep: {
+                        stringValue: 'keep',
+                        valueType: 'stringValue',
+                      },
+                    },
+                  },
+                },
+                c: {
+                  valueType: 'mapValue',
+                  mapValue: {
+                    fields: {
+                      keep: {
+                        stringValue: 'keep',
+                        valueType: 'stringValue',
+                      },
+                    },
+                  },
                 },
               },
             },
             valueType: 'mapValue',
           }),
-          updateMask('foo.bar', 'foo.delete')
+          updateMask('a.b.delete', 'a.b.keep', 'a.c.delete', 'a.c.keep')
         )
       );
 
       callback(null, writeResult(1));
     };
-    return firestore
-      .doc('collectionId/documentId')
-      .update(
-        'foo.bar',
-        'include',
-        'foo.delete',
-        Firestore.FieldValue.delete()
-      );
+    return firestore.doc('collectionId/documentId').update({
+      'a.b.delete': Firestore.FieldValue.delete(),
+      'a.b.keep': 'keep',
+      'a.c.delete': Firestore.FieldValue.delete(),
+      'a.c.keep': 'keep',
+    });
   });
 
   it('with field with dot ', function() {
diff --git a/test/order.js b/test/order.js
@@ -177,7 +177,7 @@ describe('Order', function() {
       [resource('projects/p1/databases/d1/documents/c10/doc1')],
       [resource('projects/p1/databases/dkkkkklkjnjkkk1/documents/c2/doc1')],
       [resource('projects/p2/databases/d2/documents/c1/doc1')],
-      [resource('projects/p2/databases/d2/documents/cl-/doc1')],
+      [resource('projects/p2/databases/d2/documents/c1-/doc1')],
 
       // geo points
       [geopoint(-90, -180)],

Original file line number	Diff line number	Diff line change
`@@ -217,7 +217,6 @@ class DocumentSnapshot {`
`217`	`217`	`static fromObject(ref, obj) {`
`218`	`218`	`return new DocumentSnapshot(ref, DocumentSnapshot.encodeFields(obj));`
`219`	`219`	`}`
`220`		`-`
`221`	`220`	`/**`
`222`	`221`	`* Creates a DocumentSnapshot from an UpdateMap.`
`223`	`222`	`*`
`@@ -272,7 +271,7 @@ class DocumentSnapshot {`
`272`	`271`	`target[key] = childNode;`
`273`	`272`	`return target;`
`274`	`273`	`} else {`
`275`		`- return null;`
	`274`	`+ return !is.empty(target) ? target : null;`
`276`	`275`	`}`
`277`	`276`	`}`
`278`	`277`	`} else {`