4/n - Add logging on seeing relayFieldErrors

Reviewed By: tyao1 Differential Revision: D51944687 fbshipit-source-id: 8c1db06d9cabf0d4174d15327035dd7f0fb1784f
facebook · Jan 16, 2024 · 12d169f · 12d169f
1 parent dde8048
commit 12d169f
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 0 deletions.
diff --git a/packages/react-relay/relay-hooks/FragmentResource.js b/packages/react-relay/relay-hooks/FragmentResource.js
@@ -566,13 +566,15 @@ class FragmentResourceImpl {
           this._environment,
           s.missingRequiredFields,
           s.relayResolverErrors,
+          s.errorResponseFields,
         );
       });
     } else {
       handlePotentialSnapshotErrors(
         this._environment,
         snapshot.missingRequiredFields,
         snapshot.relayResolverErrors,
+        snapshot.errorResponseFields,
       );
     }
   }

diff --git a/packages/react-relay/relay-hooks/experimental/readFragmentInternal_EXPERIMENTAL.js b/packages/react-relay/relay-hooks/experimental/readFragmentInternal_EXPERIMENTAL.js
@@ -87,13 +87,15 @@ function handlePotentialSnapshotErrorsForState(
       environment,
       state.snapshot.missingRequiredFields,
       state.snapshot.relayResolverErrors,
+      state.snapshot.errorResponseFields,
     );
   } else if (state.kind === 'plural') {
     for (const snapshot of state.snapshots) {
       handlePotentialSnapshotErrors(
         environment,
         snapshot.missingRequiredFields,
         snapshot.relayResolverErrors,
+        snapshot.errorResponseFields,
       );
     }
   }

diff --git a/packages/react-relay/relay-hooks/experimental/useFragmentInternal_EXPERIMENTAL.js b/packages/react-relay/relay-hooks/experimental/useFragmentInternal_EXPERIMENTAL.js
@@ -117,13 +117,15 @@ function handlePotentialSnapshotErrorsForState(
       environment,
       state.snapshot.missingRequiredFields,
       state.snapshot.relayResolverErrors,
+      state.snapshot.errorResponseFields,
     );
   } else if (state.kind === 'plural') {
     for (const snapshot of state.snapshots) {
       handlePotentialSnapshotErrors(
         environment,
         snapshot.missingRequiredFields,
         snapshot.relayResolverErrors,
+        snapshot.errorResponseFields,
       );
     }
   }

diff --git a/packages/relay-runtime/query/fetchQuery.js b/packages/relay-runtime/query/fetchQuery.js
@@ -140,6 +140,7 @@ function fetchQuery<TVariables: Variables, TData, TRawResponse>(
       environment,
       snapshot.missingRequiredFields,
       snapshot.relayResolverErrors,
+      snapshot.errorResponseFields,
     );
     /* $FlowFixMe[incompatible-return] we assume readData returns the right
      * data just having written it from network or checked availability. */

diff --git a/packages/relay-runtime/store/RelayModernFragmentSpecResolver.js b/packages/relay-runtime/store/RelayModernFragmentSpecResolver.js
@@ -333,6 +333,7 @@ class SelectorResolver {
       this._environment,
       this._missingRequiredFields,
       this._relayResolverErrors,
+      this._errorResponseFields,
     );
     return this._data;
   }

diff --git a/packages/relay-runtime/store/RelayStoreTypes.js b/packages/relay-runtime/store/RelayStoreTypes.js
@@ -1207,6 +1207,12 @@ export type RelayFieldLoggerEvent =
       +owner: string,
       +fieldPath: string,
       +error: Error,
+    }
+  | {
+      +kind: 'relay_field_payload.error',
+      +owner: string,
+      +fieldPath: string,
+      +error: TRelayFieldError,
     };
 
 /**

diff --git a/packages/relay-runtime/util/RelayFeatureFlags.js b/packages/relay-runtime/util/RelayFeatureFlags.js
@@ -46,6 +46,8 @@ export type FeatureFlags = {
   ENABLE_FIELD_ERROR_HANDLING: boolean,
 
   ENABLE_STRICT_EQUAL_SELECTORS: boolean,
+  ENABLE_FIELD_ERROR_HANDLING_THROW_BY_DEFAULT: boolean,
+  ENABLE_FIELD_ERROR_HANDLING_CATCH_DIRECTIVE: boolean,
 };
 
 const RelayFeatureFlags: FeatureFlags = {
@@ -66,6 +68,8 @@ const RelayFeatureFlags: FeatureFlags = {
   ENABLE_OPERATION_TRACKER_OPTIMISTIC_UPDATES: false,
   ENABLE_RELAY_OPERATION_TRACKER_SUSPENSE: false,
   ENABLE_FIELD_ERROR_HANDLING: false,
+  ENABLE_FIELD_ERROR_HANDLING_THROW_BY_DEFAULT: false,
+  ENABLE_FIELD_ERROR_HANDLING_CATCH_DIRECTIVE: false,
   ENABLE_SHALLOW_FREEZE_RESOLVER_VALUES: true,
   ENABLE_STRICT_EQUAL_SELECTORS: false,
 };

diff --git a/packages/relay-runtime/util/handlePotentialSnapshotErrors.js b/packages/relay-runtime/util/handlePotentialSnapshotErrors.js
@@ -12,15 +12,19 @@
 'use strict';
 
 import type {
+  ErrorResponseFields,
   IEnvironment,
   MissingRequiredFields,
   RelayResolverErrors,
 } from '../store/RelayStoreTypes';
 
+import RelayFeatureFlags from './RelayFeatureFlags';
+
 function handlePotentialSnapshotErrors(
   environment: IEnvironment,
   missingRequiredFields: ?MissingRequiredFields,
   relayResolverErrors: RelayResolverErrors,
+  errorResponseFields: ?ErrorResponseFields,
 ) {
   for (const resolverError of relayResolverErrors) {
     environment.relayFieldLogger({
@@ -30,6 +34,21 @@ function handlePotentialSnapshotErrors(
       error: resolverError.error,
     });
   }
+  if (RelayFeatureFlags.ENABLE_FIELD_ERROR_HANDLING) {
+    if (errorResponseFields != null) {
+      for (const fieldError of errorResponseFields) {
+        const {path, owner, error} = fieldError;
+
+        environment.relayFieldLogger({
+          kind: 'relay_field_payload.error',
+          owner: owner,
+          fieldPath: path,
+          error,
+        });
+      }
+    }
+  }
+
   if (missingRequiredFields != null) {
     switch (missingRequiredFields.action) {
       case 'THROW': {