Provide document path context for input validation errors.

packages/firestore/lite/src/api/reference.ts

@@ -307,7 +307,12 @@ export function setDoc<T>(
     ref.firestore._settings!
   );
 
-  const parsed = dataReader.parseSetData('setDoc', convertedValue, options);
+  const parsed = dataReader.parseSetData(
+    'setDoc',
+    ref._key,
+    convertedValue,
+    options
+  );
 
   return configureClient.then(datastore =>
     invokeCommitRpc(
@@ -349,12 +354,17 @@ export function updateDoc(
   ) {
     parsed = dataReader.parseUpdateVarargs(
       'updateDoc',
+      ref._key,
       fieldOrUpdateData,
       value,
       moreFieldsAndValues
     );
   } else {
-    parsed = dataReader.parseUpdateData('updateDoc', fieldOrUpdateData);
+    parsed = dataReader.parseUpdateData(
+      'updateDoc',
+      ref._key,
+      fieldOrUpdateData
+    );
   }
 
   return configureClient.then(datastore =>
@@ -406,7 +416,7 @@ export function addDoc<T>(
     collRef.firestore._databaseId,
     collRef.firestore._settings!
   );
-  const parsed = dataReader.parseSetData('addDoc', convertedValue);
+  const parsed = dataReader.parseSetData('addDoc', docRef._key, convertedValue);
 
   return configureClient
     .then(datastore =>

packages/firestore/lite/src/api/transaction.ts

@@ -108,6 +108,7 @@ export class Transaction implements firestore.Transaction {
     );
     const parsed = this._dataReader.parseSetData(
       'Transaction.set',
+      ref._key,
       convertedValue,
       options
     );
@@ -140,13 +141,15 @@ export class Transaction implements firestore.Transaction {
     ) {
       parsed = this._dataReader.parseUpdateVarargs(
         'Transaction.update',
+        ref._key,
         fieldOrUpdateData,
         value,
         moreFieldsAndValues
       );
     } else {
       parsed = this._dataReader.parseUpdateData(
         'Transaction.update',
+        ref._key,
         fieldOrUpdateData
       );
     }

packages/firestore/lite/src/api/write_batch.ts

@@ -73,6 +73,7 @@ export class WriteBatch implements firestore.WriteBatch {
 
     const parsed = this._dataReader.parseSetData(
       'WriteBatch.set',
+      ref._key,
       convertedValue,
       options
     );
@@ -109,13 +110,15 @@ export class WriteBatch implements firestore.WriteBatch {
     ) {
       parsed = this._dataReader.parseUpdateVarargs(
         'WriteBatch.update',
+        ref._key,
         fieldOrUpdateData,
         value,
         moreFieldsAndValues
       );
     } else {
       parsed = this._dataReader.parseUpdateData(
         'WriteBatch.update',
+        ref._key,
         fieldOrUpdateData
       );
     }

packages/firestore/src/api/database.ts

@@ -738,6 +738,7 @@ export class Transaction implements firestore.Transaction {
     );
     const parsed = this._firestore._dataReader.parseSetData(
       functionName,
+      ref._key,
       convertedValue,
       options
     );
@@ -776,6 +777,7 @@ export class Transaction implements firestore.Transaction {
       );
       parsed = this._firestore._dataReader.parseUpdateVarargs(
         'Transaction.update',
+        ref._key,
         fieldOrUpdateData,
         value,
         moreFieldsAndValues
@@ -789,6 +791,7 @@ export class Transaction implements firestore.Transaction {
       );
       parsed = this._firestore._dataReader.parseUpdateData(
         'Transaction.update',
+        ref._key,
         fieldOrUpdateData
       );
     }
@@ -835,6 +838,7 @@ export class WriteBatch implements firestore.WriteBatch {
     );
     const parsed = this._firestore._dataReader.parseSetData(
       functionName,
+      ref._key,
       convertedValue,
       options
     );
@@ -877,6 +881,7 @@ export class WriteBatch implements firestore.WriteBatch {
       );
       parsed = this._firestore._dataReader.parseUpdateVarargs(
         'WriteBatch.update',
+        ref._key,
         fieldOrUpdateData,
         value,
         moreFieldsAndValues
@@ -890,6 +895,7 @@ export class WriteBatch implements firestore.WriteBatch {
       );
       parsed = this._firestore._dataReader.parseUpdateData(
         'WriteBatch.update',
+        ref._key,
         fieldOrUpdateData
       );
     }
@@ -1029,6 +1035,7 @@ export class DocumentReference<T = firestore.DocumentData>
     );
     const parsed = this.firestore._dataReader.parseSetData(
       functionName,
+      this._key,
       convertedValue,
       options
     );
@@ -1057,6 +1064,7 @@ export class DocumentReference<T = firestore.DocumentData>
       validateAtLeastNumberOfArgs('DocumentReference.update', arguments, 2);
       parsed = this.firestore._dataReader.parseUpdateVarargs(
         'DocumentReference.update',
+        this._key,
         fieldOrUpdateData,
         value,
         moreFieldsAndValues
@@ -1065,6 +1073,7 @@ export class DocumentReference<T = firestore.DocumentData>
       validateExactNumberOfArgs('DocumentReference.update', arguments, 1);
       parsed = this.firestore._dataReader.parseUpdateData(
         'DocumentReference.update',
+        this._key,
         fieldOrUpdateData
       );
     }
@@ -1369,7 +1378,9 @@ export class DocumentSnapshot<T = firestore.DocumentData>
     if (this._document) {
       const value = this._document
         .data()
-        .field(fieldPathFromArgument('DocumentSnapshot.get', fieldPath));
+        .field(
+          fieldPathFromArgument('DocumentSnapshot.get', fieldPath, this._key)
+        );
       if (value !== null) {
         const userDataWriter = new UserDataWriter(
           this._firestore._databaseId,

packages/firestore/src/api/field_value.ts

@@ -83,6 +83,40 @@ export class DeleteFieldValueImpl extends SerializableFieldValue {
   }
 }
 
+/**
+ * Creates a child context for parsing SerializableFieldValues.
+ *
+ * This is different than calling `ParseContext.contextWith` because it keeps
+ * the fieldTransforms and fieldMask separate.
+ *
+ * The created context has its `dataSource` set to `UserDataSource.Argument`.
+ * Although these values are used with writes, any elements in these FieldValues
+ * are not considered writes since they cannot contain any FieldValue sentinels,
+ * etc.
+ *
+ * @param fieldValue The sentinel FieldValue for which to create a child
+ *     context.
+ * @param context The parent context.
+ * @param arrayElement Whether or not the FieldValue has an array.
+ */
+function createSentinelChildContext(
+  fieldValue: SerializableFieldValue,
+  context: ParseContext,
+  arrayElement: boolean
+): ParseContext {
+  return new ParseContext(
+    {
+      dataSource: UserDataSource.Argument,
+      targetDoc: context.settings.targetDoc,
+      methodName: fieldValue._methodName,
+      arrayElement
+    },
+    context.databaseId,
+    context.serializer,
+    context.ignoreUndefinedProperties
+  );
+}
+
 export class ServerTimestampFieldValueImpl extends SerializableFieldValue {
   constructor(readonly _methodName: string) {
     super();
@@ -106,18 +140,10 @@ export class ArrayUnionFieldValueImpl extends SerializableFieldValue {
   }
 
   _toFieldTransform(context: ParseContext): FieldTransform {
-    // Although array transforms are used with writes, the actual elements
-    // being uniomed or removed are not considered writes since they cannot
-    // contain any FieldValue sentinels, etc.
-    const parseContext = new ParseContext(
-      {
-        dataSource: UserDataSource.Argument,
-        methodName: this._methodName,
-        arrayElement: true
-      },
-      context.databaseId,
-      context.serializer,
-      context.ignoreUndefinedProperties
+    const parseContext = createSentinelChildContext(
+      this,
+      context,
+      /*array=*/ true
     );
     const parsedElements = this._elements.map(
       element => parseData(element, parseContext)!
@@ -138,18 +164,10 @@ export class ArrayRemoveFieldValueImpl extends SerializableFieldValue {
   }
 
   _toFieldTransform(context: ParseContext): FieldTransform {
-    // Although array transforms are used with writes, the actual elements
-    // being unioned or removed are not considered writes since they cannot
-    // contain any FieldValue sentinels, etc.
-    const parseContext = new ParseContext(
-      {
-        dataSource: UserDataSource.Argument,
-        methodName: this._methodName,
-        arrayElement: true
-      },
-      context.databaseId,
-      context.serializer,
-      context.ignoreUndefinedProperties
+    const parseContext = createSentinelChildContext(
+      this,
+      context,
+      /*array=*/ true
     );
     const parsedElements = this._elements.map(
       element => parseData(element, parseContext)!
@@ -170,14 +188,10 @@ export class NumericIncrementFieldValueImpl extends SerializableFieldValue {
   }
 
   _toFieldTransform(context: ParseContext): FieldTransform {
-    const parseContext = new ParseContext(
-      {
-        dataSource: UserDataSource.Argument,
-        methodName: this._methodName
-      },
-      context.databaseId,
-      context.serializer,
-      context.ignoreUndefinedProperties
+    const parseContext = createSentinelChildContext(
+      this,
+      context,
+      /*array=*/ false
     );
     const operand = parseData(this._operand, parseContext)!;
     const numericIncrement = new NumericIncrementTransformOperation(