relay-runtime 0.0.0-main-2c8089a3 → 0.0.0-main-6e1a5c6f

package/store/RelayModernFragmentSpecResolver.js.flow

@@ -22,7 +22,6 @@ import type {
   MissingRequiredFields,
   PluralReaderSelector,
   RelayContext,
-  RelayResolverErrors,
   SelectorData,
   SingularReaderSelector,
   Snapshot,
@@ -230,7 +229,6 @@ class SelectorResolver {
   _isMissingData: boolean;
   _missingRequiredFields: ?MissingRequiredFields;
   _errorResponseFields: ?ErrorResponseFields;
-  _relayResolverErrors: RelayResolverErrors;
   _rootIsQueryRenderer: boolean;
   _selector: SingularReaderSelector;
   _subscription: ?Disposable;
@@ -248,7 +246,6 @@ class SelectorResolver {
     this._isMissingData = snapshot.isMissingData;
     this._missingRequiredFields = snapshot.missingRequiredFields;
     this._errorResponseFields = snapshot.errorResponseFields;
-    this._relayResolverErrors = snapshot.relayResolverErrors;
     this._environment = environment;
     this._rootIsQueryRenderer = rootIsQueryRenderer;
     this._selector = selector;
@@ -332,7 +329,6 @@ class SelectorResolver {
     handlePotentialSnapshotErrors(
       this._environment,
       this._missingRequiredFields,
-      this._relayResolverErrors,
       this._errorResponseFields,
       this._selector.node.metadata?.throwOnFieldError ?? false,
     );
@@ -352,7 +348,6 @@ class SelectorResolver {
     this._isMissingData = snapshot.isMissingData;
     this._missingRequiredFields = snapshot.missingRequiredFields;
     this._errorResponseFields = snapshot.errorResponseFields;
-    this._relayResolverErrors = snapshot.relayResolverErrors;
     this._selector = selector;
     this._subscription = this._environment.subscribe(snapshot, this._onChange);
   }
@@ -390,7 +385,6 @@ class SelectorResolver {
     this._isMissingData = snapshot.isMissingData;
     this._missingRequiredFields = snapshot.missingRequiredFields;
     this._errorResponseFields = snapshot.errorResponseFields;
-    this._relayResolverErrors = snapshot.relayResolverErrors;
     this._callback();
   };
 }

package/store/RelayReader.js.flow

@@ -38,7 +38,6 @@ import type {
   MissingRequiredFields,
   Record,
   RecordSource,
-  RelayResolverErrors,
   RequestDescriptor,
   ResolverContext,
   SelectorData,
@@ -109,7 +108,6 @@ class RelayReader {
   _selector: SingularReaderSelector;
   _variables: Variables;
   _resolverCache: ResolverCache;
-  _resolverErrors: RelayResolverErrors;
   _fragmentName: string;
   _resolverContext: ?ResolverContext;
 
@@ -134,7 +132,6 @@ class RelayReader {
     this._selector = selector;
     this._variables = selector.variables;
     this._resolverCache = resolverCache;
-    this._resolverErrors = [];
     this._fragmentName = selector.node.name;
     this._updatedDataIDs = new Set();
     this._resolverContext = resolverContext;
@@ -197,7 +194,6 @@ class RelayReader {
       seenRecords: this._seenRecords,
       selector: this._selector,
       missingRequiredFields: this._missingRequiredFields,
-      relayResolverErrors: this._resolverErrors,
       errorResponseFields: this._errorResponseFields,
     };
   }
@@ -347,6 +343,10 @@ class RelayReader {
           return {
             path: error.fieldPath.split('.'),
           };
+        case 'relay_resolver.error':
+          return {
+            message: `Relay: Error in resolver for field at ${error.fieldPath} in ${error.owner}`,
+          };
         default:
           (error.kind: empty);
           invariant(
@@ -357,18 +357,6 @@ class RelayReader {
       }
     });
 
-    if (this._resolverErrors.length > 0) {
-      if (errors == null) {
-        errors = [];
-      }
-      for (let i = 0; i < this._resolverErrors.length; i++) {
-        const resolverError = this._resolverErrors[i];
-        errors.push({
-          message: `Relay: Error in resolver for field at ${resolverError.fieldPath} in ${resolverError.owner}`,
-        });
-      }
-    }
-
     // If we have a nested @required(THROW) that will throw,
     // we want to catch that error and provide it
     if (this._missingRequiredFields?.action === 'THROW') {
@@ -425,11 +413,9 @@ class RelayReader {
         case 'CatchField': {
           const previousResponseFields = this._errorResponseFields;
           const previousMissingRequiredFields = this._missingRequiredFields;
-          const previousResolverErrors = this._resolverErrors;
 
           this._errorResponseFields = null;
           this._missingRequiredFields = null;
-          this._resolverErrors = [];
 
           const catchFieldValue = this._readClientSideDirectiveField(
             selection,
@@ -443,7 +429,6 @@ class RelayReader {
 
           const childrenMissingRequiredFields = this._missingRequiredFields;
 
-          this._resolverErrors = previousResolverErrors;
           this._errorResponseFields = previousResponseFields;
           this._missingRequiredFields = previousMissingRequiredFields;
 
@@ -776,8 +761,18 @@ class RelayReader {
           this._missingLiveResolverFields.push(missingResolverField);
         }
       }
-      for (const error of cachedSnapshot.relayResolverErrors) {
-        this._resolverErrors.push(error);
+      if (cachedSnapshot.errorResponseFields != null) {
+        if (this._errorResponseFields == null) {
+          this._errorResponseFields = [];
+        }
+        for (const error of cachedSnapshot.errorResponseFields) {
+          // TODO: In reality we should propagate _all_ errors, but
+          // for now we're only propagating resolver errors for backwards
+          // compatibility with previous behavior.
+          if (error.kind === 'relay_resolver.error') {
+            this._errorResponseFields.push(error);
+          }
+        }
       }
       this._isMissingData = this._isMissingData || cachedSnapshot.isMissingData;
     }
@@ -786,12 +781,20 @@ class RelayReader {
     // the errors can be attached to this read's snapshot. This allows the error
     // to be logged.
     if (resolverError) {
-      this._resolverErrors.push({
+      const errorEvent = {
         kind: 'relay_resolver.error',
         fieldPath,
         owner: this._fragmentName,
         error: resolverError,
-      });
+        shouldThrow:
+          this._selector.node.metadata?.throwOnFieldError ??
+          RelayFeatureFlags.ENABLE_FIELD_ERROR_HANDLING_THROW_BY_DEFAULT,
+      };
+      if (this._errorResponseFields == null) {
+        this._errorResponseFields = [errorEvent];
+      } else {
+        this._errorResponseFields.push(errorEvent);
+      }
     }
 
     // The resolver itself creates a record in the store. We record that we've

package/store/RelayStoreSubscriptions.js.flow

@@ -116,7 +116,6 @@ class RelayStoreSubscriptions implements StoreSubscriptions {
           seenRecords: backup.seenRecords,
           selector: backup.selector,
           missingRequiredFields: backup.missingRequiredFields,
-          relayResolverErrors: backup.relayResolverErrors,
           errorResponseFields: backup.errorResponseFields,
         };
       } else {
@@ -188,7 +187,6 @@ class RelayStoreSubscriptions implements StoreSubscriptions {
       seenRecords: nextSnapshot.seenRecords,
       selector: nextSnapshot.selector,
       missingRequiredFields: nextSnapshot.missingRequiredFields,
-      relayResolverErrors: nextSnapshot.relayResolverErrors,
       errorResponseFields: nextSnapshot.errorResponseFields,
     }: Snapshot);
     if (__DEV__) {

package/store/RelayStoreTypes.js.flow

@@ -129,7 +129,8 @@ export type MissingRequiredFields = $ReadOnly<
 export type ErrorResponseFields = Array<
   | RelayFieldPayloadErrorEvent
   | MissingExpectedDataLogEvent
-  | MissingExpectedDataThrowEvent,
+  | MissingExpectedDataThrowEvent
+  | RelayResolverErrorEvent,
 >;
 
 export type ClientEdgeTraversalInfo = {
@@ -145,8 +146,6 @@ export type MissingClientEdgeRequestInfo = {
   +clientEdgeDestinationID: DataID,
 };
 
-export type RelayResolverErrors = Array<RelayResolverErrorEvent>;
-
 export type MissingLiveResolverField = {
   +path: string,
   +liveStateID: DataID,
@@ -163,7 +162,6 @@ export type Snapshot = {
   +seenRecords: DataIDSet,
   +selector: SingularReaderSelector,
   +missingRequiredFields: ?MissingRequiredFields,
-  +relayResolverErrors: RelayResolverErrors,
   +errorResponseFields: ?ErrorResponseFields,
 };
 
@@ -1337,6 +1335,7 @@ export type RelayResolverErrorEvent = {
   +owner: string,
   +fieldPath: string,
   +error: Error,
+  +shouldThrow: boolean,
 };
 
 /**

package/store/observeFragmentExperimental.js.flow

@@ -213,7 +213,6 @@ function snapshotToFragmentState<TFragmentType: FragmentType, TData>(
     handlePotentialSnapshotErrors(
       environment,
       snapshot.missingRequiredFields,
-      snapshot.relayResolverErrors,
       snapshot.errorResponseFields,
       snapshot.selector.node.metadata?.throwOnFieldError ?? false,
     );

package/util/handlePotentialSnapshotErrors.js.flow

@@ -16,31 +16,9 @@ import type {
   ErrorResponseFields,
   IEnvironment,
   MissingRequiredFields,
-  RelayResolverErrors,
 } from '../store/RelayStoreTypes';
 
 const {RelayFieldError} = require('../store/RelayErrorTrie');
-const RelayFeatureFlags = require('./RelayFeatureFlags');
-
-function handleResolverErrors(
-  environment: IEnvironment,
-  relayResolverErrors: RelayResolverErrors,
-  throwOnFieldError: boolean,
-) {
-  for (const resolverError of relayResolverErrors) {
-    environment.relayFieldLogger(resolverError);
-  }
-
-  if (
-    RelayFeatureFlags.ENABLE_FIELD_ERROR_HANDLING_THROW_BY_DEFAULT ||
-    throwOnFieldError
-  ) {
-    throw new RelayFieldError(
-      `Relay: Unexpected resolver exception`,
-      relayResolverErrors.map(e => ({path: e.fieldPath.split('.')})),
-    );
-  }
-}
 
 function handleFieldErrors(
   environment: IEnvironment,
@@ -68,6 +46,8 @@ function handleFieldErrors(
             return {path: event.fieldPath.split('.')};
           case 'missing_expected_data.log':
             return {path: event.fieldPath.split('.')};
+          case 'relay_resolver.error':
+            return {path: event.fieldPath.split('.')};
           default:
             (event.kind: empty);
             throw new Error('Relay: Unexpected event kind');
@@ -112,14 +92,9 @@ function handleMissingRequiredFields(
 function handlePotentialSnapshotErrors(
   environment: IEnvironment,
   missingRequiredFields: ?MissingRequiredFields,
-  relayResolverErrors: RelayResolverErrors,
   errorResponseFields: ?ErrorResponseFields,
   throwOnFieldError: boolean,
 ) {
-  if (relayResolverErrors.length > 0) {
-    handleResolverErrors(environment, relayResolverErrors, throwOnFieldError);
-  }
-
   if (missingRequiredFields != null) {
     handleMissingRequiredFields(environment, missingRequiredFields);
   }