relay-runtime 0.0.0-main-1fcce07e → 0.0.0-main-40a2fce7

package/experimental.js

@@ -1,5 +1,5 @@
 /**
- * Relay v0.0.0-main-1fcce07e
+ * Relay v0.0.0-main-40a2fce7
  *
  * Copyright (c) Meta Platforms, Inc. and affiliates.
  *

package/index.js

@@ -1,5 +1,5 @@
 /**
- * Relay v0.0.0-main-1fcce07e
+ * Relay v0.0.0-main-40a2fce7
  *
  * Copyright (c) Meta Platforms, Inc. and affiliates.
  *

package/lib/store/RelayReader.js

@@ -629,69 +629,90 @@ var RelayReader = /*#__PURE__*/function () {
     }
     if (field.linkedField.plural) {
       !Array.isArray(clientEdgeResolverResponse) ? process.env.NODE_ENV !== "production" ? invariant(false, 'Expected plural Client Edge Relay Resolver at `%s` in `%s` to return an array containing IDs or objects with shape {id}.', backingField.path, this._owner.identifier) : invariant(false) : void 0;
-      var storeIDs;
       !(field.kind === 'ClientEdgeToClientObject') ? process.env.NODE_ENV !== "production" ? invariant(false, 'Unexpected Client Edge to plural server type `%s`. This should be prevented by the compiler.', field.kind) : invariant(false) : void 0;
+      var storeIDs;
+      var perItemEdges;
       if (field.backingField.normalizationInfo == null) {
-        storeIDs = clientEdgeResolverResponse.map(function (itemResponse) {
+        storeIDs = [];
+        perItemEdges = [];
+        for (var i = 0; i < clientEdgeResolverResponse.length; i++) {
           var _field$concreteType;
+          var itemResponse = clientEdgeResolverResponse[i];
           if (itemResponse == null) {
-            return null;
+            storeIDs.push(null);
+            perItemEdges.push(null);
+            continue;
           }
           var concreteType = (_field$concreteType = field.concreteType) !== null && _field$concreteType !== void 0 ? _field$concreteType : itemResponse.__typename;
-          !(typeof concreteType === 'string') ? process.env.NODE_ENV !== "production" ? invariant(false, 'Expected resolver for field at `%s` in `%s` modeling an edge to an abstract type to return an object with a `__typename` property.', backingField.path, _this3._owner.identifier) : invariant(false) : void 0;
-          var localId = extractIdFromResponse(itemResponse, backingField.path, _this3._owner.identifier);
+          !(typeof concreteType === 'string') ? process.env.NODE_ENV !== "production" ? invariant(false, 'Expected resolver for field at `%s` in `%s` modeling an edge to an abstract type to return an object with a `__typename` property.', backingField.path, this._owner.identifier) : invariant(false) : void 0;
+          var localId = extractIdFromResponse(itemResponse, backingField.path, this._owner.identifier);
           var modelResolvers = field.modelResolvers;
           if (modelResolvers != null) {
             var modelResolver = modelResolvers[concreteType];
             if (modelResolver !== undefined) {
-              var _id = _this3._resolverCache.ensureClientRecord(localId, concreteType);
-              var model = _this3._readResolverFieldImpl(modelResolver, _id);
-              return model != null ? _id : null;
+              var id = this._resolverCache.ensureClientRecord(localId, concreteType);
+              var model = this._readResolverFieldImpl(modelResolver, id);
+              storeIDs.push(model != null ? id : null);
+              perItemEdges.push(null);
             } else {
-              return localId;
+              var _field$serverObjectOp, _field$serverObjectOp2;
+              storeIDs.push(localId);
+              var serverOperation = (_field$serverObjectOp = (_field$serverObjectOp2 = field.serverObjectOperations) === null || _field$serverObjectOp2 === void 0 ? void 0 : _field$serverObjectOp2[concreteType]) !== null && _field$serverObjectOp !== void 0 ? _field$serverObjectOp : null;
+              if (serverOperation != null) {
+                perItemEdges.push({
+                  clientEdgeDestinationID: localId,
+                  readerClientEdge: {
+                    operation: serverOperation
+                  }
+                });
+              } else {
+                perItemEdges.push(null);
+              }
             }
+          } else {
+            storeIDs.push(this._resolverCache.ensureClientRecord(localId, concreteType));
+            perItemEdges.push(null);
           }
-          var id = _this3._resolverCache.ensureClientRecord(localId, concreteType);
-          return id;
-        });
+        }
       } else {
         storeIDs = clientEdgeResolverResponse.map(function (obj) {
           return extractIdFromResponse(obj, backingField.path, _this3._owner.identifier);
         });
+        perItemEdges = null;
       }
       var prevParentClientEdge = this._parentClientEdge;
       this._parentClientEdge = null;
-      var edgeValues = this._readLinkedIds(field.linkedField, storeIDs, record, data);
+      var edgeValues = this._readLinkedIds(field.linkedField, storeIDs, record, data, perItemEdges);
       this._parentClientEdge = prevParentClientEdge;
       data[fieldName] = edgeValues;
       return edgeValues;
     } else {
       var _field$concreteType2;
-      var id = extractIdFromResponse(clientEdgeResolverResponse, backingField.path, this._owner.identifier);
+      var _id = extractIdFromResponse(clientEdgeResolverResponse, backingField.path, this._owner.identifier);
       var storeID;
-      var concreteType = (_field$concreteType2 = field.concreteType) !== null && _field$concreteType2 !== void 0 ? _field$concreteType2 : clientEdgeResolverResponse.__typename;
+      var _concreteType = (_field$concreteType2 = field.concreteType) !== null && _field$concreteType2 !== void 0 ? _field$concreteType2 : clientEdgeResolverResponse.__typename;
       var traversalPathSegment;
       if (field.kind === 'ClientEdgeToClientObject') {
         if (field.backingField.normalizationInfo == null) {
-          !(typeof concreteType === 'string') ? process.env.NODE_ENV !== "production" ? invariant(false, 'Expected resolver for field at `%s` in `%s` modeling an edge to an abstract type to return an object with a `__typename` property.', backingField.path, this._owner.identifier) : invariant(false) : void 0;
-          var modelResolvers = field.modelResolvers;
-          if (modelResolvers != null) {
-            var modelResolver = modelResolvers[concreteType];
-            if (modelResolver !== undefined) {
-              storeID = this._resolverCache.ensureClientRecord(id, concreteType);
-              var model = this._readResolverFieldImpl(modelResolver, storeID);
-              if (model == null) {
+          !(typeof _concreteType === 'string') ? process.env.NODE_ENV !== "production" ? invariant(false, 'Expected resolver for field at `%s` in `%s` modeling an edge to an abstract type to return an object with a `__typename` property.', backingField.path, this._owner.identifier) : invariant(false) : void 0;
+          var _modelResolvers = field.modelResolvers;
+          if (_modelResolvers != null) {
+            var _modelResolver = _modelResolvers[_concreteType];
+            if (_modelResolver !== undefined) {
+              storeID = this._resolverCache.ensureClientRecord(_id, _concreteType);
+              var _model = this._readResolverFieldImpl(_modelResolver, storeID);
+              if (_model == null) {
                 data[fieldName] = null;
                 return null;
               }
               traversalPathSegment = null;
             } else {
-              storeID = id;
+              storeID = _id;
               var serverObjectOperations = field.serverObjectOperations;
-              var serverOp = serverObjectOperations != null ? serverObjectOperations[concreteType] : null;
+              var serverOp = serverObjectOperations != null ? serverObjectOperations[_concreteType] : null;
               if (serverOp != null) {
                 traversalPathSegment = {
-                  clientEdgeDestinationID: id,
+                  clientEdgeDestinationID: _id,
                   readerClientEdge: {
                     operation: serverOp
                   }
@@ -701,17 +722,17 @@ var RelayReader = /*#__PURE__*/function () {
               }
             }
           } else {
-            storeID = this._resolverCache.ensureClientRecord(id, concreteType);
+            storeID = this._resolverCache.ensureClientRecord(_id, _concreteType);
             traversalPathSegment = null;
           }
         } else {
-          storeID = id;
+          storeID = _id;
           traversalPathSegment = null;
         }
       } else {
-        storeID = id;
+        storeID = _id;
         traversalPathSegment = {
-          clientEdgeDestinationID: id,
+          clientEdgeDestinationID: _id,
           readerClientEdge: field
         };
       }
@@ -825,7 +846,7 @@ var RelayReader = /*#__PURE__*/function () {
     }
     return this._readLinkedIds(field, linkedIDs, record, data);
   };
-  _proto._readLinkedIds = function _readLinkedIds(field, linkedIDs, record, data) {
+  _proto._readLinkedIds = function _readLinkedIds(field, linkedIDs, record, data, perItemEdges) {
     var _this4 = this;
     var _field$alias6;
     var fieldName = (_field$alias6 = field.alias) !== null && _field$alias6 !== void 0 ? _field$alias6 : field.name;
@@ -853,7 +874,13 @@ var RelayReader = /*#__PURE__*/function () {
       !(prevItem == null || typeof prevItem === 'object') ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayReader(): Expected data for field `%s` on record `%s` ' + 'to be an object, got `%s`.', fieldName, RelayModernRecord.getDataID(record), prevItem) : invariant(false) : void 0;
       var prevErrors = _this4._fieldErrors;
       _this4._fieldErrors = null;
+      var prevParentClientEdge = _this4._parentClientEdge;
+      if (perItemEdges != null) {
+        var _perItemEdges$nextInd;
+        _this4._parentClientEdge = (_perItemEdges$nextInd = perItemEdges[nextIndex]) !== null && _perItemEdges$nextInd !== void 0 ? _perItemEdges$nextInd : null;
+      }
       linkedArray[nextIndex] = _this4._traverse(field, linkedID, prevItem);
+      _this4._parentClientEdge = prevParentClientEdge;
       _this4._prependPreviousErrors(prevErrors, nextIndex);
     });
     this._prependPreviousErrors(prevErrors, fieldName);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "relay-runtime",
   "description": "A core runtime for building GraphQL-driven applications.",
-  "version": "0.0.0-main-1fcce07e",
+  "version": "0.0.0-main-40a2fce7",
   "keywords": [
     "graphql",
     "relay"

package/store/RelayReader.js.flow

@@ -1073,20 +1073,28 @@ class RelayReader {
         backingField.path,
         this._owner.identifier,
       );
-      let storeIDs: ReadonlyArray<DataID>;
       invariant(
         field.kind === 'ClientEdgeToClientObject',
         'Unexpected Client Edge to plural server type `%s`. This should be prevented by the compiler.',
         field.kind,
       );
+      let storeIDs: Array<?DataID>;
+      let perItemEdges: ?Array<ClientEdgeTraversalInfo | null>;
       if (field.backingField.normalizationInfo == null) {
-        // @edgeTo case where we need to ensure that the record has `id` field
-        storeIDs = clientEdgeResolverResponse.map(itemResponse => {
+        // @edgeTo case: compute storeIDs and per-item traversal segments.
+        // Server-type items get a segment so that missing data in their
+        // sub-tree triggers a waterfall refetch; all other items get null.
+        storeIDs = [];
+        perItemEdges = [];
+        for (let i = 0; i < clientEdgeResolverResponse.length; i++) {
+          const itemResponse = clientEdgeResolverResponse[i];
           // A plural resolver (e.g. a plural magic fragment) may return a list
           // with nullish items — a nullable list element. Read those through as a
           // null edge rather than dereferencing `__typename` on a nullish value.
           if (itemResponse == null) {
-            return null;
+            storeIDs.push(null);
+            perItemEdges.push(null);
+            continue;
           }
           const concreteType = field.concreteType ?? itemResponse.__typename;
           invariant(
@@ -1100,7 +1108,6 @@ class RelayReader {
             backingField.path,
             this._owner.identifier,
           );
-
           const modelResolvers = field.modelResolvers;
           if (modelResolvers != null) {
             const modelResolver = modelResolvers[concreteType];
@@ -1111,24 +1118,39 @@ class RelayReader {
                 concreteType,
               );
               const model = this._readResolverFieldImpl(modelResolver, id);
-              return model != null ? id : null;
+              storeIDs.push(model != null ? id : null);
+              perItemEdges.push(null);
             } else {
-              // Server/CSE type: use the original ID directly.
-              return localId;
+              storeIDs.push(localId);
+
+              // Server/CLient Schema Extension type: check for a refetch operation so that
+              // missing data in this item's sub-tree triggers a waterfall.
+              const serverOperation =
+                field.serverObjectOperations?.[concreteType] ?? null;
+              if (serverOperation != null) {
+                perItemEdges.push({
+                  clientEdgeDestinationID: localId,
+                  readerClientEdge: {operation: serverOperation},
+                });
+              } else {
+                perItemEdges.push(null);
+              }
             }
+          } else {
+            // No model resolvers — concrete client object edge.
+            storeIDs.push(
+              this._resolverCache.ensureClientRecord(localId, concreteType),
+            );
+            perItemEdges.push(null);
           }
-          // No model resolvers — concrete client object edge.
-          const id = this._resolverCache.ensureClientRecord(
-            localId,
-            concreteType,
-          );
-          return id;
-        });
+        }
       } else {
-        // The normalization process in LiveResolverCache should take care of generating the correct ID.
+        // The normalization process in LiveResolverCache should take care of
+        // generating the correct ID.
         storeIDs = clientEdgeResolverResponse.map(obj =>
           extractIdFromResponse(obj, backingField.path, this._owner.identifier),
         );
+        perItemEdges = null;
       }
       const prevParentClientEdge = this._parentClientEdge;
       this._parentClientEdge = null;
@@ -1137,6 +1159,7 @@ class RelayReader {
         storeIDs,
         record,
         data,
+        perItemEdges,
       );
       this._parentClientEdge = prevParentClientEdge;
       data[fieldName] = edgeValues;
@@ -1447,6 +1470,7 @@ class RelayReader {
     linkedIDs: ?ReadonlyArray<?DataID>,
     record: Record,
     data: SelectorData,
+    perItemEdges?: ?ReadonlyArray<ClientEdgeTraversalInfo | null>,
   ): ?unknown {
     const fieldName = field.alias ?? field.name;
 
@@ -1490,9 +1514,14 @@ class RelayReader {
       );
       const prevErrors = this._fieldErrors;
       this._fieldErrors = null;
+      const prevParentClientEdge = this._parentClientEdge;
+      if (perItemEdges != null) {
+        this._parentClientEdge = perItemEdges[nextIndex] ?? null;
+      }
       // $FlowFixMe[cannot-write]
       // $FlowFixMe[incompatible-variance]
       linkedArray[nextIndex] = this._traverse(field, linkedID, prevItem);
+      this._parentClientEdge = prevParentClientEdge;
       this._prependPreviousErrors(prevErrors, nextIndex);
     });
     this._prependPreviousErrors(prevErrors, fieldName);