facebook · captbaritone · Oct 30, 2024
diff --git a/packages/relay-runtime/store/RelayReader.js b/packages/relay-runtime/store/RelayReader.js
@@ -217,7 +217,7 @@ class RelayReader {
     }
   }
 
-  _markDataAsMissing(): void {
+  _markDataAsMissing(fieldName: string): void {
     if (this._isWithinUnmatchedTypeRefinement) {
       return;
     }
@@ -226,18 +226,17 @@ class RelayReader {
     }
 
     // we will add the path later
-    const fieldPath = '';
     const owner = this._fragmentName;
 
     this._errorResponseFields.push(
       this._selector.node.metadata?.throwOnFieldError ?? false
         ? {
             kind: 'missing_expected_data.throw',
             owner,
-            fieldPath,
+            fieldPath: fieldName,
             handled: false,
           }
-        : {kind: 'missing_expected_data.log', owner, fieldPath},
+        : {kind: 'missing_expected_data.log', owner, fieldPath: fieldName},
     );
 
     this._isMissingData = true;
@@ -266,7 +265,7 @@ class RelayReader {
     this._seenRecords.add(dataID);
     if (record == null) {
       if (record === undefined) {
-        this._markDataAsMissing();
+        this._markDataAsMissing('<record>');
       }
       return record;
     }
@@ -489,12 +488,15 @@ class RelayReader {
           this._createFragmentPointer(selection, record, data);
           break;
         case 'AliasedInlineFragmentSpread': {
+          const prevErrors = this._errorResponseFields;
+          this._errorResponseFields = null;
           let fieldValue = this._readInlineFragment(
             selection.fragment,
             record,
             {},
             true,
           );
+          this._prependPreviousErrors(prevErrors, selection.name);
           if (fieldValue === false) {
             fieldValue = null;
           }
@@ -601,9 +603,12 @@ class RelayReader {
     data: SelectorData,
   ): mixed {
     const parentRecordID = RelayModernRecord.getDataID(record);
+    const prevErrors = this._errorResponseFields;
+    this._errorResponseFields = null;
     const result = this._readResolverFieldImpl(field, parentRecordID);
 
     const fieldName = field.alias ?? field.name;
+    this._prependPreviousErrors(prevErrors, fieldName);
     data[fieldName] = result;
     return result;
   }
@@ -982,12 +987,15 @@ class RelayReader {
         RelayModernRecord.getDataID(record),
         prevData,
       );
+      const prevErrors = this._errorResponseFields;
+      this._errorResponseFields = null;
       const edgeValue = this._traverse(
         field.linkedField,
         storeID,
         // $FlowFixMe[incompatible-variance]
         prevData,
       );
+      this._prependPreviousErrors(prevErrors, fieldName);
       this._clientEdgeTraversalPath.pop();
       data[fieldName] = edgeValue;
       return edgeValue;
@@ -1005,7 +1013,7 @@ class RelayReader {
     if (value === null) {
       this._maybeAddErrorResponseFields(record, storageKey);
     } else if (value === undefined) {
-      this._markDataAsMissing();
+      this._markDataAsMissing(fieldName);
     }
     data[fieldName] = value;
     return value;
@@ -1024,7 +1032,7 @@ class RelayReader {
       if (linkedID === null) {
         this._maybeAddErrorResponseFields(record, storageKey);
       } else if (linkedID === undefined) {
-        this._markDataAsMissing();
+        this._markDataAsMissing(fieldName);
       }
       return linkedID;
     }
@@ -1039,12 +1047,41 @@ class RelayReader {
       RelayModernRecord.getDataID(record),
       prevData,
     );
+    const prevErrors = this._errorResponseFields;
+    this._errorResponseFields = null;
     // $FlowFixMe[incompatible-variance]
     const value = this._traverse(field, linkedID, prevData);
+
+    this._prependPreviousErrors(prevErrors, fieldName);
     data[fieldName] = value;
     return value;
   }
 
+  _prependPreviousErrors(
+    prevErrors: ?Array<ErrorResponseField>,
+    fieldNameOrIndex: string | number,
+  ): void {
+    if (this._errorResponseFields != null) {
+      for (let i = 0; i < this._errorResponseFields.length; i++) {
+        const event = this._errorResponseFields[i];
+        if (
+          event.owner === this._fragmentName &&
+          (event.kind === 'missing_expected_data.throw' ||
+            event.kind === 'missing_expected_data.log')
+        ) {
+          event.fieldPath = `${fieldNameOrIndex}.${event.fieldPath}`;
+        }
+      }
+      if (prevErrors != null) {
+        for (let i = prevErrors.length - 1; i >= 0; i--) {
+          this._errorResponseFields.unshift(prevErrors[i]);
+        }
+      }
+    } else {
+      this._errorResponseFields = prevErrors;
+    }
+  }
+
   _readActorChange(
     field: ReaderActorChange,
     record: Record,
@@ -1060,7 +1097,7 @@ class RelayReader {
     if (externalRef == null) {
       data[fieldName] = externalRef;
       if (externalRef === undefined) {
-        this._markDataAsMissing();
+        this._markDataAsMissing(fieldName);
       } else if (externalRef === null) {
         this._maybeAddErrorResponseFields(record, storageKey);
       }
@@ -1107,7 +1144,7 @@ class RelayReader {
     if (linkedIDs == null) {
       data[fieldName] = linkedIDs;
       if (linkedIDs === undefined) {
-        this._markDataAsMissing();
+        this._markDataAsMissing(fieldName);
       }
       return linkedIDs;
     }
@@ -1121,11 +1158,13 @@ class RelayReader {
       RelayModernRecord.getDataID(record),
       prevData,
     );
+    const prevErrors = this._errorResponseFields;
+    this._errorResponseFields = null;
     const linkedArray = prevData || [];
     linkedIDs.forEach((linkedID, nextIndex) => {
       if (linkedID == null) {
         if (linkedID === undefined) {
-          this._markDataAsMissing();
+          this._markDataAsMissing(String(nextIndex));
         }
         // $FlowFixMe[cannot-write]
         linkedArray[nextIndex] = linkedID;
@@ -1140,10 +1179,14 @@ class RelayReader {
         RelayModernRecord.getDataID(record),
         prevItem,
       );
+      const prevErrors = this._errorResponseFields;
+      this._errorResponseFields = null;
       // $FlowFixMe[cannot-write]
       // $FlowFixMe[incompatible-variance]
       linkedArray[nextIndex] = this._traverse(field, linkedID, prevItem);
+      this._prependPreviousErrors(prevErrors, nextIndex);
     });
+    this._prependPreviousErrors(prevErrors, fieldName);
     data[fieldName] = linkedArray;
     return linkedArray;
   }
@@ -1166,7 +1209,7 @@ class RelayReader {
       RelayModernRecord.getValue(record, componentKey);
     if (component == null) {
       if (component === undefined) {
-        this._markDataAsMissing();
+        this._markDataAsMissing('<module-import>');
       }
       return;
     }
@@ -1398,7 +1441,7 @@ class RelayReader {
       // fetched the `__is[AbstractType]` flag for this concrete type. In this
       // case we need to report that we are missing data, in case that field is
       // still in flight.
-      this._markDataAsMissing();
+      this._markDataAsMissing('<abstract-type-hint>');
     }
     // $FlowFixMe Casting record value
     return implementsInterface;

diff --git a/packages/relay-runtime/store/RelayStoreTypes.js b/packages/relay-runtime/store/RelayStoreTypes.js
@@ -1274,7 +1274,7 @@ export type MissingFieldHandler =
 export type MissingExpectedDataLogEvent = {
   +kind: 'missing_expected_data.log',
   +owner: string,
-  +fieldPath: string,
+  fieldPath: string,
 };
 
 /**
@@ -1300,7 +1300,7 @@ export type MissingExpectedDataLogEvent = {
 export type MissingExpectedDataThrowEvent = {
   +kind: 'missing_expected_data.throw',
   +owner: string,
-  +fieldPath: string,
+  fieldPath: string,
   +handled: boolean,
 };
 

diff --git a/packages/relay-runtime/store/__tests__/RelayModernStore-Subscriptions-test.js b/packages/relay-runtime/store/__tests__/RelayModernStore-Subscriptions-test.js
@@ -417,12 +417,12 @@ function cloneEventWithSets(event: LogEvent) {
           isMissingData: true,
           errorResponseFields: [
             {
-              fieldPath: '',
+              fieldPath: 'profilePicture',
               kind: 'missing_expected_data.log',
               owner: 'RelayModernStoreSubscriptionsTest1Fragment',
             },
             {
-              fieldPath: '',
+              fieldPath: 'emailAddresses',
               kind: 'missing_expected_data.log',
               owner: 'RelayModernStoreSubscriptionsTest1Fragment',
             },
@@ -466,12 +466,12 @@ function cloneEventWithSets(event: LogEvent) {
           },
           errorResponseFields: [
             {
-              fieldPath: '',
+              fieldPath: 'profilePicture',
               kind: 'missing_expected_data.log',
               owner: 'RelayModernStoreSubscriptionsTest1Fragment',
             },
             {
-              fieldPath: '',
+              fieldPath: 'emailAddresses',
               kind: 'missing_expected_data.log',
               owner: 'RelayModernStoreSubscriptionsTest1Fragment',
             },

diff --git a/packages/relay-runtime/store/__tests__/RelayModernStore-test.js b/packages/relay-runtime/store/__tests__/RelayModernStore-test.js
@@ -728,12 +728,12 @@ function cloneEventWithSets(event: LogEvent) {
             {
               owner: 'RelayModernStoreTest5Fragment',
               kind: 'missing_expected_data.log',
-              fieldPath: '',
+              fieldPath: 'profilePicture',
             },
             {
               owner: 'RelayModernStoreTest5Fragment',
               kind: 'missing_expected_data.log',
-              fieldPath: '',
+              fieldPath: 'emailAddresses',
             },
           ],
           missingLiveResolverFields: [],
@@ -782,12 +782,12 @@ function cloneEventWithSets(event: LogEvent) {
             {
               owner: 'RelayModernStoreTest5Fragment',
               kind: 'missing_expected_data.log',
-              fieldPath: '',
+              fieldPath: 'profilePicture',
             },
             {
               owner: 'RelayModernStoreTest5Fragment',
               kind: 'missing_expected_data.log',
-              fieldPath: '',
+              fieldPath: 'emailAddresses',
             },
           ],
           seenRecords: new Set(['842472']),

diff --git a/packages/relay-runtime/store/__tests__/RelayReader-AliasedFragments-test.js b/packages/relay-runtime/store/__tests__/RelayReader-AliasedFragments-test.js
@@ -1041,7 +1041,7 @@ describe('Inline Fragments', () => {
     );
     expect(errorResponseFields).toEqual([
       {
-        fieldPath: '',
+        fieldPath: 'node.aliased_fragment.name',
         kind: 'missing_expected_data.log',
         owner:
           'RelayReaderAliasedFragmentsTestRequiredBubblesOnAbstractTypeQuery',
@@ -1101,7 +1101,7 @@ describe('Inline Fragments', () => {
     );
     expect(errorResponseFields).toEqual([
       {
-        fieldPath: '',
+        fieldPath: 'node.aliased_fragment.<abstract-type-hint>',
         kind: 'missing_expected_data.log',
         owner:
           'RelayReaderAliasedFragmentsTestRequiredBubblesOnAbstractWithMissingTypeInfoQuery',

diff --git a/packages/relay-runtime/store/__tests__/RelayReader-CatchFields-test.js b/packages/relay-runtime/store/__tests__/RelayReader-CatchFields-test.js
@@ -297,7 +297,7 @@ describe('RelayReader @catch', () => {
 
       expect(errorResponseFields).toEqual([
         {
-          fieldPath: '',
+          fieldPath: 'me.firstName',
           kind: 'missing_expected_data.log',
           owner: 'RelayReaderCatchFieldsTestCatchMissingToNullErrorQuery',
         },