From 8caee71f6105e82faf3f6334e69ed5890f977a3a Mon Sep 17 00:00:00 2001
From: Jake Oliver <github@skos.ninja>
Date: Mon, 6 Jan 2020 21:25:30 +0000
Subject: [PATCH] fix: add quotes to field name to avoid ambiguity (#860)

---
 dev/src/serializer.ts |  2 +-
 dev/src/validate.ts   |  2 +-
 dev/test/document.ts  | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dev/src/serializer.ts b/dev/src/serializer.ts
index 55f0231fe..346161044 100644
--- a/dev/src/serializer.ts
+++ b/dev/src/serializer.ts
@@ -308,7 +308,7 @@ export function validateUserInput(
   level = level || 0;
   inArray = inArray || false;
 
-  const fieldPathMessage = path ? ` (found in field ${path})` : '';
+  const fieldPathMessage = path ? ` (found in field "${path}")` : '';
 
   if (Array.isArray(value)) {
     for (let i = 0; i < value.length; ++i) {
diff --git a/dev/src/validate.ts b/dev/src/validate.ts
index c7378cacd..b749e08f3 100644
--- a/dev/src/validate.ts
+++ b/dev/src/validate.ts
@@ -67,7 +67,7 @@ export function customObjectMessage(
   value: unknown,
   path?: FieldPath
 ): string {
-  const fieldPathMessage = path ? ` (found in field ${path})` : '';
+  const fieldPathMessage = path ? ` (found in field "${path}")` : '';
 
   if (isObject(value)) {
     // We use the base class name as the type name as the sentinel classes
diff --git a/dev/test/document.ts b/dev/test/document.ts
index 37bc425db..dab80e153 100644
--- a/dev/test/document.ts
+++ b/dev/test/document.ts
@@ -140,7 +140,7 @@ describe('serialize document', () => {
     expect(() => {
       firestore.doc('collectionId/documentId').set({foo: undefined});
     }).to.throw(
-      'Value for argument "data" is not a valid Firestore document. Cannot use "undefined" as a Firestore value (found in field foo).'
+      'Value for argument "data" is not a valid Firestore document. Cannot use "undefined" as a Firestore value (found in field "foo").'
     );
 
     expect(() => {
@@ -148,14 +148,14 @@ describe('serialize document', () => {
         foo: FieldPath.documentId(),
       });
     }).to.throw(
-      'Value for argument "data" is not a valid Firestore document. Cannot use object of type "FieldPath" as a Firestore value (found in field foo).'
+      'Value for argument "data" is not a valid Firestore document. Cannot use object of type "FieldPath" as a Firestore value (found in field "foo").'
     );
 
     expect(() => {
       class Foo {}
       firestore.doc('collectionId/documentId').set({foo: new Foo()});
     }).to.throw(
-      'Value for argument "data" is not a valid Firestore document. Couldn\'t serialize object of type "Foo" (found in field foo). Firestore doesn\'t support JavaScript objects with custom prototypes (i.e. objects that were created via the "new" operator).'
+      'Value for argument "data" is not a valid Firestore document. Couldn\'t serialize object of type "Foo" (found in field "foo"). Firestore doesn\'t support JavaScript objects with custom prototypes (i.e. objects that were created via the "new" operator).'
     );
 
     expect(() => {
@@ -1238,7 +1238,7 @@ describe('set document', () => {
     expect(() => {
       firestore.doc('collectionId/documentId').set({foo: FieldValue.delete()});
     }).to.throw(
-      'Value for argument "data" is not a valid Firestore document. FieldValue.delete() must appear at the top-level and can only be used in update() or set() with {merge:true} (found in field foo).'
+      'Value for argument "data" is not a valid Firestore document. FieldValue.delete() must appear at the top-level and can only be used in update() or set() with {merge:true} (found in field "foo").'
     );
   });
 
@@ -1587,7 +1587,7 @@ describe('update document', () => {
         a: {b: FieldValue.delete()},
       });
     }).to.throw(
-      'Update() requires either a single JavaScript object or an alternating list of field/value pairs that can be followed by an optional precondition. Value for argument "dataOrField" is not a valid Firestore value. FieldValue.delete() must appear at the top-level and can only be used in update() or set() with {merge:true} (found in field a.b).'
+      'Update() requires either a single JavaScript object or an alternating list of field/value pairs that can be followed by an optional precondition. Value for argument "dataOrField" is not a valid Firestore value. FieldValue.delete() must appear at the top-level and can only be used in update() or set() with {merge:true} (found in field "a.b").'
     );
 
     expect(() => {
@@ -1595,7 +1595,7 @@ describe('update document', () => {
         b: FieldValue.delete(),
       });
     }).to.throw(
-      'Update() requires either a single JavaScript object or an alternating list of field/value pairs that can be followed by an optional precondition. Element at index 1 is not a valid Firestore value. FieldValue.delete() must appear at the top-level and can only be used in update() or set() with {merge:true} (found in field a.b).'
+      'Update() requires either a single JavaScript object or an alternating list of field/value pairs that can be followed by an optional precondition. Element at index 1 is not a valid Firestore value. FieldValue.delete() must appear at the top-level and can only be used in update() or set() with {merge:true} (found in field "a.b").'
     );
 
     expect(() => {