relay-runtime 0.0.0-main-2abce249 → 0.0.0-main-e78cd90a

package/index.js

@@ -1,5 +1,5 @@
 /**
- * Relay v0.0.0-main-2abce249
+ * Relay v0.0.0-main-e78cd90a
  *
  * Copyright (c) Meta Platforms, Inc. and affiliates.
  *

package/lib/store/RelayReader.js

@@ -508,47 +508,18 @@ var RelayReader = /*#__PURE__*/function () {
     // evaluating the resolver and it calls readFragment, or when checking if the
     // inputs have changed since a previous evaluation:
 
-    var fragmentValue;
-    var fragmentReaderSelector;
-    var fragmentMissingRequiredFields;
-    var previousMissingRequriedFields;
-    var currentResolverErrors = [];
-    var previousResolverErrors;
-    var fragmentSeenRecordIDs = new Set();
+    var snapshot;
 
     var getDataForResolverFragment = function getDataForResolverFragment(singularReaderSelector) {
-      if (fragmentValue != null) {
+      if (snapshot != null) {
         // It was already read when checking for input staleness; no need to read it again.
         // Note that the variables like fragmentSeenRecordIDs in the outer closure will have
         // already been set and will still be used in this case.
-        return fragmentValue;
+        return snapshot.data;
       }
 
-      fragmentReaderSelector = singularReaderSelector;
-      var existingSeenRecords = _this._seenRecords;
-
-      try {
-        var _resolverFragmentData;
-
-        _this._seenRecords = fragmentSeenRecordIDs;
-        var resolverFragmentData = {};
-        previousMissingRequriedFields = _this._missingRequiredFields;
-        _this._missingRequiredFields = null;
-        previousResolverErrors = _this._resolverErrors;
-        _this._resolverErrors = [];
-
-        _this._createInlineDataOrResolverFragmentPointer(singularReaderSelector.node, record, resolverFragmentData);
-
-        fragmentMissingRequiredFields = _this._missingRequiredFields;
-        currentResolverErrors = _this._resolverErrors;
-        fragmentValue = (_resolverFragmentData = resolverFragmentData[FRAGMENTS_KEY]) === null || _resolverFragmentData === void 0 ? void 0 : _resolverFragmentData[fragment.name];
-        !(typeof fragmentValue === 'object' && fragmentValue !== null) ? process.env.NODE_ENV !== "production" ? invariant(false, "Expected reader data to contain a __fragments property with a property for the fragment named ".concat(fragment.name, ", but it is missing.")) : invariant(false) : void 0;
-        return fragmentValue;
-      } finally {
-        _this._seenRecords = existingSeenRecords;
-        _this._missingRequiredFields = previousMissingRequriedFields;
-        _this._resolverErrors = previousResolverErrors;
-      }
+      snapshot = read(_this._recordSource, singularReaderSelector, _this._resolverCache);
+      return snapshot.data;
     };
 
     var resolverContext = {
@@ -563,6 +534,7 @@ var RelayReader = /*#__PURE__*/function () {
       };
       return withResolverContext(resolverContext, function () {
         var resolverResult = null;
+        var resolverError = null;
 
         try {
           // $FlowFixMe[prop-missing] - resolver module's type signature is a lie
@@ -572,23 +544,20 @@ var RelayReader = /*#__PURE__*/function () {
 
           // `field.path` is typed as nullable while we rollout compiler changes.
           var path = (_field$path = field.path) !== null && _field$path !== void 0 ? _field$path : '[UNKNOWN]';
-          currentResolverErrors.push({
+          resolverError = {
             field: {
               path: path,
               owner: _this._fragmentName
             },
             error: e
-          });
+          };
         }
 
         return {
           resolverResult: resolverResult,
-          errors: currentResolverErrors,
-          fragmentValue: fragmentValue,
+          snapshot: snapshot,
           resolverID: resolverID,
-          seenRecordIDs: fragmentSeenRecordIDs,
-          readerSelector: fragmentReaderSelector,
-          missingRequiredFields: fragmentMissingRequiredFields
+          error: resolverError
         };
       });
     };
@@ -596,26 +565,51 @@ var RelayReader = /*#__PURE__*/function () {
     var _this$_resolverCache$ = this._resolverCache.readFromCacheOrEvaluate(record, field, this._variables, evaluate, getDataForResolverFragment),
         result = _this$_resolverCache$[0],
         seenRecord = _this$_resolverCache$[1],
-        resolverErrors = _this$_resolverCache$[2],
-        missingRequiredFields = _this$_resolverCache$[3];
+        resolverError = _this$_resolverCache$[2],
+        cachedSnapshot = _this$_resolverCache$[3];
+
+    if (cachedSnapshot != null) {
+      if (cachedSnapshot.missingRequiredFields != null) {
+        this._addMissingRequiredFields(cachedSnapshot.missingRequiredFields);
+      }
+
+      if (cachedSnapshot.missingClientEdges != null) {
+        var _iterator = (0, _createForOfIteratorHelper2["default"])(cachedSnapshot.missingClientEdges),
+            _step;
+
+        try {
+          for (_iterator.s(); !(_step = _iterator.n()).done;) {
+            var missing = _step.value;
 
-    var _iterator = (0, _createForOfIteratorHelper2["default"])(resolverErrors),
-        _step;
+            this._missingClientEdges.push(missing);
+          }
+        } catch (err) {
+          _iterator.e(err);
+        } finally {
+          _iterator.f();
+        }
+      }
 
-    try {
-      for (_iterator.s(); !(_step = _iterator.n()).done;) {
-        var resolverError = _step.value;
+      var _iterator2 = (0, _createForOfIteratorHelper2["default"])(cachedSnapshot.relayResolverErrors),
+          _step2;
 
-        this._resolverErrors.push(resolverError);
+      try {
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          var error = _step2.value;
+
+          this._resolverErrors.push(error);
+        }
+      } catch (err) {
+        _iterator2.e(err);
+      } finally {
+        _iterator2.f();
       }
-    } catch (err) {
-      _iterator.e(err);
-    } finally {
-      _iterator.f();
+
+      this._isMissingData = this._isMissingData || cachedSnapshot.isMissingData;
     }
 
-    if (missingRequiredFields != null) {
-      this._addMissingRequiredFields(missingRequiredFields);
+    if (resolverError) {
+      this._resolverErrors.push(resolverError);
     }
 
     if (seenRecord != null) {

package/lib/store/RelayStoreUtils.js

@@ -209,9 +209,7 @@ var RelayStoreUtils = {
   IS_WITHIN_UNMATCHED_TYPE_REFINEMENT: '__isWithinUnmatchedTypeRefinement',
   RELAY_RESOLVER_VALUE_KEY: '__resolverValue',
   RELAY_RESOLVER_INVALIDATION_KEY: '__resolverValueMayBeInvalid',
-  RELAY_RESOLVER_INPUTS_KEY: '__resolverInputValues',
-  RELAY_RESOLVER_READER_SELECTOR_KEY: '__resolverReaderSelector',
-  RELAY_RESOLVER_MISSING_REQUIRED_FIELDS_KEY: '__resolverMissingRequiredFields',
+  RELAY_RESOLVER_SNAPSHOT_KEY: '__resolverSnapshot',
   RELAY_RESOLVER_ERROR_KEY: '__resolverError',
   formatStorageKey: formatStorageKey,
   getArgumentValue: getArgumentValue,

package/lib/store/ResolverCache.js

@@ -26,10 +26,8 @@ var RelayModernRecord = require('./RelayModernRecord');
 
 var _require3 = require('./RelayStoreUtils'),
     RELAY_RESOLVER_ERROR_KEY = _require3.RELAY_RESOLVER_ERROR_KEY,
-    RELAY_RESOLVER_INPUTS_KEY = _require3.RELAY_RESOLVER_INPUTS_KEY,
     RELAY_RESOLVER_INVALIDATION_KEY = _require3.RELAY_RESOLVER_INVALIDATION_KEY,
-    RELAY_RESOLVER_MISSING_REQUIRED_FIELDS_KEY = _require3.RELAY_RESOLVER_MISSING_REQUIRED_FIELDS_KEY,
-    RELAY_RESOLVER_READER_SELECTOR_KEY = _require3.RELAY_RESOLVER_READER_SELECTOR_KEY,
+    RELAY_RESOLVER_SNAPSHOT_KEY = _require3.RELAY_RESOLVER_SNAPSHOT_KEY,
     RELAY_RESOLVER_VALUE_KEY = _require3.RELAY_RESOLVER_VALUE_KEY,
     getStorageKey = _require3.getStorageKey;
 
@@ -50,10 +48,10 @@ var NoopResolverCache = /*#__PURE__*/function () {
 
     var _evaluate = evaluate(),
         resolverResult = _evaluate.resolverResult,
-        missingRequiredFields = _evaluate.missingRequiredFields,
-        errors = _evaluate.errors;
+        snapshot = _evaluate.snapshot,
+        error = _evaluate.error;
 
-    return [resolverResult, undefined, errors, missingRequiredFields];
+    return [resolverResult, undefined, error, snapshot];
   };
 
   _proto.invalidateDataIDs = function invalidateDataIDs(updatedDataIDs) {};
@@ -94,17 +92,15 @@ var RecordResolverCache = /*#__PURE__*/function () {
     var linkedRecord = linkedID == null ? null : recordSource.get(linkedID);
 
     if (linkedRecord == null || this._isInvalid(linkedRecord, getDataForResolverFragment)) {
-      var _linkedID;
+      var _linkedID, _evaluationResult$sna;
 
       // Cache miss; evaluate the selector and store the result in a new record:
       linkedID = (_linkedID = linkedID) !== null && _linkedID !== void 0 ? _linkedID : generateClientID(recordID, storageKey);
       linkedRecord = RelayModernRecord.create(linkedID, '__RELAY_RESOLVER__');
       var evaluationResult = evaluate();
       RelayModernRecord.setValue(linkedRecord, RELAY_RESOLVER_VALUE_KEY, evaluationResult.resolverResult);
-      RelayModernRecord.setValue(linkedRecord, RELAY_RESOLVER_INPUTS_KEY, evaluationResult.fragmentValue);
-      RelayModernRecord.setValue(linkedRecord, RELAY_RESOLVER_READER_SELECTOR_KEY, evaluationResult.readerSelector);
-      RelayModernRecord.setValue(linkedRecord, RELAY_RESOLVER_MISSING_REQUIRED_FIELDS_KEY, evaluationResult.missingRequiredFields);
-      RelayModernRecord.setValue(linkedRecord, RELAY_RESOLVER_ERROR_KEY, evaluationResult.errors);
+      RelayModernRecord.setValue(linkedRecord, RELAY_RESOLVER_SNAPSHOT_KEY, evaluationResult.snapshot);
+      RelayModernRecord.setValue(linkedRecord, RELAY_RESOLVER_ERROR_KEY, evaluationResult.error);
       recordSource.set(linkedID, linkedRecord); // Link the resolver value record to the resolver field of the record being read:
 
       var nextRecord = RelayModernRecord.clone(record);
@@ -114,29 +110,32 @@ var RecordResolverCache = /*#__PURE__*/function () {
       var resolverID = evaluationResult.resolverID;
       addDependencyEdge(this._resolverIDToRecordIDs, resolverID, linkedID);
       addDependencyEdge(this._recordIDToResolverIDs, recordID, resolverID);
+      var seenRecordIds = (_evaluationResult$sna = evaluationResult.snapshot) === null || _evaluationResult$sna === void 0 ? void 0 : _evaluationResult$sna.seenRecords;
 
-      var _iterator = (0, _createForOfIteratorHelper2["default"])(evaluationResult.seenRecordIDs),
-          _step;
+      if (seenRecordIds != null) {
+        var _iterator = (0, _createForOfIteratorHelper2["default"])(seenRecordIds),
+            _step;
 
-      try {
-        for (_iterator.s(); !(_step = _iterator.n()).done;) {
-          var seenRecordID = _step.value;
-          addDependencyEdge(this._recordIDToResolverIDs, seenRecordID, resolverID);
+        try {
+          for (_iterator.s(); !(_step = _iterator.n()).done;) {
+            var seenRecordID = _step.value;
+            addDependencyEdge(this._recordIDToResolverIDs, seenRecordID, resolverID);
+          }
+        } catch (err) {
+          _iterator.e(err);
+        } finally {
+          _iterator.f();
         }
-      } catch (err) {
-        _iterator.e(err);
-      } finally {
-        _iterator.f();
       }
     } // $FlowFixMe[incompatible-type] - will always be empty
 
 
-    var answer = linkedRecord[RELAY_RESOLVER_VALUE_KEY];
-    var missingRequiredFields = // $FlowFixMe[incompatible-type] - casting mixed
-    linkedRecord[RELAY_RESOLVER_MISSING_REQUIRED_FIELDS_KEY]; // $FlowFixMe[incompatible-type] - casting mixed
+    var answer = linkedRecord[RELAY_RESOLVER_VALUE_KEY]; // $FlowFixMe[incompatible-type] - casting mixed
+
+    var snapshot = linkedRecord[RELAY_RESOLVER_SNAPSHOT_KEY]; // $FlowFixMe[incompatible-type] - casting mixed
 
-    var errors = linkedRecord[RELAY_RESOLVER_ERROR_KEY];
-    return [answer, linkedID, errors, missingRequiredFields];
+    var error = linkedRecord[RELAY_RESOLVER_ERROR_KEY];
+    return [answer, linkedID, error, snapshot];
   };
 
   _proto2.invalidateDataIDs = function invalidateDataIDs(updatedDataIDs) {
@@ -207,11 +206,12 @@ var RecordResolverCache = /*#__PURE__*/function () {
   _proto2._isInvalid = function _isInvalid(record, getDataForResolverFragment) {
     if (!RelayModernRecord.getValue(record, RELAY_RESOLVER_INVALIDATION_KEY)) {
       return false;
-    }
+    } // $FlowFixMe[incompatible-type] - storing values in records is not typed
 
-    var originalInputs = RelayModernRecord.getValue(record, RELAY_RESOLVER_INPUTS_KEY); // $FlowFixMe[incompatible-type] - storing values in records is not typed
 
-    var readerSelector = RelayModernRecord.getValue(record, RELAY_RESOLVER_READER_SELECTOR_KEY);
+    var snapshot = RelayModernRecord.getValue(record, RELAY_RESOLVER_SNAPSHOT_KEY);
+    var originalInputs = snapshot === null || snapshot === void 0 ? void 0 : snapshot.data;
+    var readerSelector = snapshot === null || snapshot === void 0 ? void 0 : snapshot.selector;
 
     if (originalInputs == null || readerSelector == null) {
       process.env.NODE_ENV !== "production" ? warning(false, 'Expected previous inputs and reader selector on resolver record with ID %s, but they were missing.', RelayModernRecord.getDataID(record)) : void 0;

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

@@ -29,10 +29,8 @@ var RelayRecordSource = require('../RelayRecordSource');
 
 var _require3 = require('../RelayStoreUtils'),
     RELAY_RESOLVER_ERROR_KEY = _require3.RELAY_RESOLVER_ERROR_KEY,
-    RELAY_RESOLVER_INPUTS_KEY = _require3.RELAY_RESOLVER_INPUTS_KEY,
     RELAY_RESOLVER_INVALIDATION_KEY = _require3.RELAY_RESOLVER_INVALIDATION_KEY,
-    RELAY_RESOLVER_MISSING_REQUIRED_FIELDS_KEY = _require3.RELAY_RESOLVER_MISSING_REQUIRED_FIELDS_KEY,
-    RELAY_RESOLVER_READER_SELECTOR_KEY = _require3.RELAY_RESOLVER_READER_SELECTOR_KEY,
+    RELAY_RESOLVER_SNAPSHOT_KEY = _require3.RELAY_RESOLVER_SNAPSHOT_KEY,
     RELAY_RESOLVER_VALUE_KEY = _require3.RELAY_RESOLVER_VALUE_KEY,
     getStorageKey = _require3.getStorageKey;
 
@@ -85,7 +83,7 @@ var LiveResolverCache = /*#__PURE__*/function () {
     var linkedRecord = linkedID == null ? null : recordSource.get(linkedID);
 
     if (linkedRecord == null || this._isInvalid(linkedRecord, getDataForResolverFragment)) {
-      var _linkedID;
+      var _linkedID, _evaluationResult$sna;
 
       // Cache miss; evaluate the selector and store the result in a new record:
       linkedID = (_linkedID = linkedID) !== null && _linkedID !== void 0 ? _linkedID : generateClientID(recordID, storageKey);
@@ -105,10 +103,8 @@ var LiveResolverCache = /*#__PURE__*/function () {
         RelayModernRecord.setValue(linkedRecord, RELAY_RESOLVER_VALUE_KEY, evaluationResult.resolverResult);
       }
 
-      RelayModernRecord.setValue(linkedRecord, RELAY_RESOLVER_INPUTS_KEY, evaluationResult.fragmentValue);
-      RelayModernRecord.setValue(linkedRecord, RELAY_RESOLVER_READER_SELECTOR_KEY, evaluationResult.readerSelector);
-      RelayModernRecord.setValue(linkedRecord, RELAY_RESOLVER_MISSING_REQUIRED_FIELDS_KEY, evaluationResult.missingRequiredFields);
-      RelayModernRecord.setValue(linkedRecord, RELAY_RESOLVER_ERROR_KEY, evaluationResult.errors);
+      RelayModernRecord.setValue(linkedRecord, RELAY_RESOLVER_SNAPSHOT_KEY, evaluationResult.snapshot);
+      RelayModernRecord.setValue(linkedRecord, RELAY_RESOLVER_ERROR_KEY, evaluationResult.error);
       recordSource.set(linkedID, linkedRecord); // Link the resolver value record to the resolver field of the record being read:
 
       var nextRecord = RelayModernRecord.clone(record);
@@ -118,19 +114,22 @@ var LiveResolverCache = /*#__PURE__*/function () {
       var resolverID = evaluationResult.resolverID;
       addDependencyEdge(this._resolverIDToRecordIDs, resolverID, linkedID);
       addDependencyEdge(this._recordIDToResolverIDs, recordID, resolverID);
+      var seenRecordIds = (_evaluationResult$sna = evaluationResult.snapshot) === null || _evaluationResult$sna === void 0 ? void 0 : _evaluationResult$sna.seenRecords;
 
-      var _iterator = (0, _createForOfIteratorHelper2["default"])(evaluationResult.seenRecordIDs),
-          _step;
+      if (seenRecordIds != null) {
+        var _iterator = (0, _createForOfIteratorHelper2["default"])(seenRecordIds),
+            _step;
 
-      try {
-        for (_iterator.s(); !(_step = _iterator.n()).done;) {
-          var seenRecordID = _step.value;
-          addDependencyEdge(this._recordIDToResolverIDs, seenRecordID, resolverID);
+        try {
+          for (_iterator.s(); !(_step = _iterator.n()).done;) {
+            var seenRecordID = _step.value;
+            addDependencyEdge(this._recordIDToResolverIDs, seenRecordID, resolverID);
+          }
+        } catch (err) {
+          _iterator.e(err);
+        } finally {
+          _iterator.f();
         }
-      } catch (err) {
-        _iterator.e(err);
-      } finally {
-        _iterator.f();
       }
     } else if (field.kind === RELAY_LIVE_RESOLVER && RelayModernRecord.getValue(linkedRecord, RELAY_RESOLVER_LIVE_STATE_DIRTY)) {
       var _linkedID2;
@@ -152,12 +151,12 @@ var LiveResolverCache = /*#__PURE__*/function () {
     } // $FlowFixMe[incompatible-type] - will always be empty
 
 
-    var answer = linkedRecord[RELAY_RESOLVER_VALUE_KEY];
-    var missingRequiredFields = // $FlowFixMe[incompatible-type] - casting mixed
-    linkedRecord[RELAY_RESOLVER_MISSING_REQUIRED_FIELDS_KEY]; // $FlowFixMe[incompatible-type] - casting mixed
+    var answer = linkedRecord[RELAY_RESOLVER_VALUE_KEY]; // $FlowFixMe[incompatible-type] - casting mixed
+
+    var snapshot = linkedRecord[RELAY_RESOLVER_SNAPSHOT_KEY]; // $FlowFixMe[incompatible-type] - casting mixed
 
-    var errors = linkedRecord[RELAY_RESOLVER_ERROR_KEY];
-    return [answer, linkedID, errors, missingRequiredFields];
+    var error = linkedRecord[RELAY_RESOLVER_ERROR_KEY];
+    return [answer, linkedID, error, snapshot];
   } // Register a new Live State object in the store, subscribing to future
   // updates.
   ;
@@ -288,11 +287,12 @@ var LiveResolverCache = /*#__PURE__*/function () {
   _proto._isInvalid = function _isInvalid(record, getDataForResolverFragment) {
     if (!RelayModernRecord.getValue(record, RELAY_RESOLVER_INVALIDATION_KEY)) {
       return false;
-    }
+    } // $FlowFixMe[incompatible-type] - storing values in records is not typed
 
-    var originalInputs = RelayModernRecord.getValue(record, RELAY_RESOLVER_INPUTS_KEY); // $FlowFixMe[incompatible-type] - storing values in records is not typed
 
-    var readerSelector = RelayModernRecord.getValue(record, RELAY_RESOLVER_READER_SELECTOR_KEY);
+    var snapshot = RelayModernRecord.getValue(record, RELAY_RESOLVER_SNAPSHOT_KEY);
+    var originalInputs = snapshot === null || snapshot === void 0 ? void 0 : snapshot.data;
+    var readerSelector = snapshot === null || snapshot === void 0 ? void 0 : snapshot.selector;
 
     if (originalInputs == null || readerSelector == null) {
       process.env.NODE_ENV !== "production" ? warning(false, 'Expected previous inputs and reader selector on resolver record with ID %s, but they were missing.', RelayModernRecord.getDataID(record)) : void 0;

package/package.json

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