relay-runtime 0.0.0-main-f16f5613 → 0.0.0-main-df676950

package/store/RelayErrorTrie.js.flow

@@ -15,6 +15,7 @@ import type {PayloadError} from '../network/RelayNetworkTypes';
 
 const RelayFeatureFlags = require('../util/RelayFeatureFlags');
 
+// $FlowFixMe[recursive-definition]
 const SELF: Self = Symbol('$SELF');
 
 class RelayFieldError extends Error {

package/store/RelayPublishQueue.js.flow

@@ -210,6 +210,7 @@ class RelayPublishQueue implements PublishQueue {
     sourceOperation?: OperationDescriptor,
   ): $ReadOnlyArray<RequestDescriptor> {
     const runWillClearGcHold =
+      // $FlowFixMe[incompatible-type]
       this._appliedOptimisticUpdates === 0 && !!this._gcHold;
     const runIsANoop =
       // this._pendingBackupRebase is true if an applied optimistic

package/store/RelayReader.js.flow

@@ -353,12 +353,12 @@ class RelayReader {
   ) {
     const {to} = selection;
     const field = selection.field?.backingField ?? selection.field;
-    const applicationName = field?.alias ?? field?.name;
+    const fieldName = field?.alias ?? field?.name;
 
     // ReaderClientExtension doesn't have `alias` or `name`
     // so we don't support this yet
     invariant(
-      applicationName != null,
+      fieldName != null,
       "Couldn't determine field name for this field. It might be a ReaderClientExtension - which is not yet supported.",
     );
 
@@ -399,14 +399,14 @@ class RelayReader {
     if (this._errorResponseFields != null) {
       const errors = this._errorResponseFields.map(error => error.error);
 
-      data[applicationName] = {
+      data[fieldName] = {
         ok: false,
         errors,
       };
       return;
     }
 
-    data[applicationName] = {
+    data[fieldName] = {
       ok: true,
       value,
     };
@@ -662,8 +662,8 @@ class RelayReader {
     const parentRecordID = RelayModernRecord.getDataID(record);
     const result = this._readResolverFieldImpl(field, parentRecordID);
 
-    const applicationName = field.alias ?? field.name;
-    data[applicationName] = result;
+    const fieldName = field.alias ?? field.name;
+    data[fieldName] = result;
     return result;
   }
 
@@ -856,24 +856,24 @@ class RelayReader {
     const backingField = field.backingField;
 
     // Because ReaderClientExtension doesn't have `alias` or `name` and so I don't know
-    // how to get its applicationName or storageKey yet:
+    // how to get its fieldName or storageKey yet:
     invariant(
       backingField.kind !== 'ClientExtension',
       'Client extension client edges are not yet implemented.',
     );
 
-    const applicationName = backingField.alias ?? backingField.name;
+    const fieldName = backingField.alias ?? backingField.name;
     const backingFieldData = {};
     this._traverseSelections([backingField], record, backingFieldData);
-    // At this point, backingFieldData is an object with a single key (applicationName)
+    // At this point, backingFieldData is an object with a single key (fieldName)
     // whose value is the value returned from the resolver, or a suspense sentinel.
 
-    const clientEdgeResolverResponse = backingFieldData[applicationName];
+    const clientEdgeResolverResponse = backingFieldData[fieldName];
     if (
       clientEdgeResolverResponse == null ||
       isSuspenseSentinel(clientEdgeResolverResponse)
     ) {
-      data[applicationName] = clientEdgeResolverResponse;
+      data[fieldName] = clientEdgeResolverResponse;
       return clientEdgeResolverResponse;
     }
 
@@ -925,7 +925,7 @@ class RelayReader {
         data,
       );
       this._clientEdgeTraversalPath.pop();
-      data[applicationName] = edgeValues;
+      data[fieldName] = edgeValues;
       return edgeValues;
     } else {
       const id = extractIdFromResponse(clientEdgeResolverResponse);
@@ -970,18 +970,18 @@ class RelayReader {
         if (model == null) {
           // If the model resolver returns undefined, we should still return null
           // to match GQL behavior.
-          data[applicationName] = null;
+          data[fieldName] = null;
           return null;
         }
       }
       this._clientEdgeTraversalPath.push(traversalPathSegment);
 
-      const prevData = data[applicationName];
+      const prevData = data[fieldName];
       invariant(
         prevData == null || typeof prevData === 'object',
         'RelayReader(): Expected data for field `%s` on record `%s` ' +
           'to be an object, got `%s`.',
-        applicationName,
+        fieldName,
         RelayModernRecord.getDataID(record),
         prevData,
       );
@@ -992,7 +992,7 @@ class RelayReader {
         prevData,
       );
       this._clientEdgeTraversalPath.pop();
-      data[applicationName] = edgeValue;
+      data[fieldName] = edgeValue;
       return edgeValue;
     }
   }
@@ -1002,7 +1002,7 @@ class RelayReader {
     record: Record,
     data: SelectorData,
   ): ?mixed {
-    const applicationName = field.alias ?? field.name;
+    const fieldName = field.alias ?? field.name;
     const storageKey = getStorageKey(field, this._variables);
     const value = RelayModernRecord.getValue(record, storageKey);
     if (value === null) {
@@ -1010,7 +1010,7 @@ class RelayReader {
     } else if (value === undefined) {
       this._markDataAsMissing();
     }
-    data[applicationName] = value;
+    data[fieldName] = value;
     return value;
   }
 
@@ -1019,11 +1019,11 @@ class RelayReader {
     record: Record,
     data: SelectorData,
   ): ?mixed {
-    const applicationName = field.alias ?? field.name;
+    const fieldName = field.alias ?? field.name;
     const storageKey = getStorageKey(field, this._variables);
     const linkedID = RelayModernRecord.getLinkedRecordID(record, storageKey);
     if (linkedID == null) {
-      data[applicationName] = linkedID;
+      data[fieldName] = linkedID;
       if (linkedID === null) {
         this._maybeAddErrorResponseFields(record, storageKey);
       } else if (linkedID === undefined) {
@@ -1032,18 +1032,18 @@ class RelayReader {
       return linkedID;
     }
 
-    const prevData = data[applicationName];
+    const prevData = data[fieldName];
     invariant(
       prevData == null || typeof prevData === 'object',
       'RelayReader(): Expected data for field `%s` on record `%s` ' +
         'to be an object, got `%s`.',
-      applicationName,
+      fieldName,
       RelayModernRecord.getDataID(record),
       prevData,
     );
     // $FlowFixMe[incompatible-variance]
     const value = this._traverse(field, linkedID, prevData);
-    data[applicationName] = value;
+    data[fieldName] = value;
     return value;
   }
 
@@ -1052,7 +1052,7 @@ class RelayReader {
     record: Record,
     data: SelectorData,
   ): ?mixed {
-    const applicationName = field.alias ?? field.name;
+    const fieldName = field.alias ?? field.name;
     const storageKey = getStorageKey(field, this._variables);
     const externalRef = RelayModernRecord.getActorLinkedRecordID(
       record,
@@ -1060,13 +1060,13 @@ class RelayReader {
     );
 
     if (externalRef == null) {
-      data[applicationName] = externalRef;
+      data[fieldName] = externalRef;
       if (externalRef === undefined) {
         this._markDataAsMissing();
       } else if (externalRef === null) {
         this._maybeAddErrorResponseFields(record, storageKey);
       }
-      return data[applicationName];
+      return data[fieldName];
     }
     const [actorIdentifier, dataID] = externalRef;
 
@@ -1078,11 +1078,11 @@ class RelayReader {
       }),
       fragmentRef,
     );
-    data[applicationName] = {
+    data[fieldName] = {
       __fragmentRef: fragmentRef,
       __viewer: actorIdentifier,
     };
-    return data[applicationName];
+    return data[fieldName];
   }
 
   _readPluralLink(
@@ -1104,22 +1104,22 @@ class RelayReader {
     record: Record,
     data: SelectorData,
   ): ?mixed {
-    const applicationName = field.alias ?? field.name;
+    const fieldName = field.alias ?? field.name;
 
     if (linkedIDs == null) {
-      data[applicationName] = linkedIDs;
+      data[fieldName] = linkedIDs;
       if (linkedIDs === undefined) {
         this._markDataAsMissing();
       }
       return linkedIDs;
     }
 
-    const prevData = data[applicationName];
+    const prevData = data[fieldName];
     invariant(
       prevData == null || Array.isArray(prevData),
       'RelayReader(): Expected data for field `%s` on record `%s` ' +
         'to be an array, got `%s`.',
-      applicationName,
+      fieldName,
       RelayModernRecord.getDataID(record),
       prevData,
     );
@@ -1138,7 +1138,7 @@ class RelayReader {
         prevItem == null || typeof prevItem === 'object',
         'RelayReader(): Expected data for field `%s` on record `%s` ' +
           'to be an object, got `%s`.',
-        applicationName,
+        fieldName,
         RelayModernRecord.getDataID(record),
         prevItem,
       );
@@ -1146,7 +1146,7 @@ class RelayReader {
       // $FlowFixMe[incompatible-variance]
       linkedArray[nextIndex] = this._traverse(field, linkedID, prevItem);
     });
-    data[applicationName] = linkedArray;
+    data[fieldName] = linkedArray;
     return linkedArray;
   }
 

package/store/ResolverCache.js.flow

@@ -26,6 +26,7 @@ import type {
 
 const recycleNodesInto = require('../util/recycleNodesInto');
 const {RELAY_LIVE_RESOLVER} = require('../util/RelayConcreteNode');
+const RelayFeatureFlags = require('../util/RelayFeatureFlags');
 const shallowFreeze = require('../util/shallowFreeze');
 const {generateClientID} = require('./ClientID');
 const RelayModernRecord = require('./RelayModernRecord');
@@ -325,6 +326,22 @@ class RecordResolverCache implements ResolverCache {
     if (recycled !== originalInputs) {
       return true;
     }
+
+    if (RelayFeatureFlags.MARK_RESOLVER_VALUES_AS_CLEAN_AFTER_FRAGMENT_REREAD) {
+      // This record does not need to be recomputed, we can reuse the cached value.
+      // For subsequent reads we can mark this record as "clean" so that they will
+      // not need to re-read the fragment.
+      const nextRecord = RelayModernRecord.clone(record);
+      RelayModernRecord.setValue(
+        nextRecord,
+        RELAY_RESOLVER_INVALIDATION_KEY,
+        false,
+      );
+
+      const recordSource = this._getRecordSource();
+      recordSource.set(RelayModernRecord.getDataID(record), nextRecord);
+    }
+
     return false;
   }
 

package/store/experimental-live-resolvers/LiveResolverCache.js.flow

@@ -35,6 +35,7 @@ import type {LiveState} from 'relay-runtime';
 
 const recycleNodesInto = require('../../util/recycleNodesInto');
 const {RELAY_LIVE_RESOLVER} = require('../../util/RelayConcreteNode');
+const RelayFeatureFlags = require('../../util/RelayFeatureFlags');
 const shallowFreeze = require('../../util/shallowFreeze');
 const {generateClientID, generateClientObjectClientID} = require('../ClientID');
 const RelayModernRecord = require('../RelayModernRecord');
@@ -699,6 +700,22 @@ class LiveResolverCache implements ResolverCache {
     if (recycled !== originalInputs) {
       return true;
     }
+
+    if (RelayFeatureFlags.MARK_RESOLVER_VALUES_AS_CLEAN_AFTER_FRAGMENT_REREAD) {
+      // This record does not need to be recomputed, we can reuse the cached value.
+      // For subsequent reads we can mark this record as "clean" so that they will
+      // not need to re-read the fragment.
+      const nextRecord = RelayModernRecord.clone(record);
+      RelayModernRecord.setValue(
+        nextRecord,
+        RELAY_RESOLVER_INVALIDATION_KEY,
+        false,
+      );
+
+      const recordSource = this._getRecordSource();
+      recordSource.set(RelayModernRecord.getDataID(record), nextRecord);
+    }
+
     return false;
   }
 

package/util/RelayFeatureFlags.js.flow

@@ -48,6 +48,9 @@ export type FeatureFlags = {
   ENABLE_FIELD_ERROR_HANDLING_CATCH_DIRECTIVE: boolean,
 
   PROCESS_OPTIMISTIC_UPDATE_BEFORE_SUBSCRIPTION: boolean,
+
+  // Temporary flag to enable a gradual rollout of the fix for T185969900
+  MARK_RESOLVER_VALUES_AS_CLEAN_AFTER_FRAGMENT_REREAD: boolean,
 };
 
 const RelayFeatureFlags: FeatureFlags = {
@@ -71,6 +74,7 @@ const RelayFeatureFlags: FeatureFlags = {
   ENABLE_FIELD_ERROR_HANDLING_THROW_BY_DEFAULT: false,
   ENABLE_FIELD_ERROR_HANDLING_CATCH_DIRECTIVE: false,
   PROCESS_OPTIMISTIC_UPDATE_BEFORE_SUBSCRIPTION: false,
+  MARK_RESOLVER_VALUES_AS_CLEAN_AFTER_FRAGMENT_REREAD: false,
 };
 
 module.exports = RelayFeatureFlags;