relay-runtime 18.1.0 → 19.0.0

package/lib/store/RelayReferenceMarker.js

@@ -12,7 +12,8 @@ var RelayStoreUtils = require('./RelayStoreUtils');
 var _require2 = require('./TypeID'),
   generateTypeID = _require2.generateTypeID;
 var invariant = require('invariant');
-var getStorageKey = RelayStoreUtils.getStorageKey,
+var getReadTimeResolverStorageKey = RelayStoreUtils.getReadTimeResolverStorageKey,
+  getStorageKey = RelayStoreUtils.getStorageKey,
   getModuleOperationKey = RelayStoreUtils.getModuleOperationKey;
 function mark(recordSource, selector, references, operationLoader, shouldProcessClientComponents) {
   var dataID = selector.dataID,
@@ -123,8 +124,6 @@ var RelayReferenceMarker = /*#__PURE__*/function () {
           _this._traverseSelections(selection.fragment.selections, record);
           break;
         case 'RelayResolver':
-          _this._traverseResolverField(selection, record);
-          break;
         case 'RelayLiveResolver':
           _this._traverseResolverField(selection, record);
           break;
@@ -195,7 +194,7 @@ var RelayReferenceMarker = /*#__PURE__*/function () {
     }
   };
   _proto._traverseResolverField = function _traverseResolverField(field, record) {
-    var storageKey = getStorageKey(field, this._variables);
+    var storageKey = getReadTimeResolverStorageKey(field, this._variables);
     var dataID = RelayModernRecord.getLinkedRecordID(record, storageKey);
     if (dataID != null) {
       this._references.add(dataID);

package/lib/store/RelayResponseNormalizer.js

@@ -6,6 +6,7 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers
 var _require = require('../multi-actor-environment/ActorUtils'),
   ACTOR_IDENTIFIER_FIELD_NAME = _require.ACTOR_IDENTIFIER_FIELD_NAME,
   getActorIdentifierFromPayload = _require.getActorIdentifierFromPayload;
+var RelayFeatureFlags = require('../util/RelayFeatureFlags');
 var _require2 = require('./ClientID'),
   generateClientID = _require2.generateClientID,
   isClientID = _require2.isClientID;
@@ -53,6 +54,7 @@ var RelayResponseNormalizer = /*#__PURE__*/function () {
     this._recordSource = recordSource;
     this._variables = variables;
     this._shouldProcessClientComponents = options.shouldProcessClientComponents;
+    this._log = options.log;
   }
   var _proto = RelayResponseNormalizer.prototype;
   _proto.normalizeResponse = function normalizeResponse(node, dataID, data, errors) {
@@ -204,8 +206,6 @@ var RelayResponseNormalizer = /*#__PURE__*/function () {
           this._normalizeActorChange(selection, record, data);
           break;
         case 'RelayResolver':
-          this._normalizeResolver(selection, record, data);
-          break;
         case 'RelayLiveResolver':
           this._normalizeResolver(selection, record, data);
           break;
@@ -288,7 +288,8 @@ var RelayResponseNormalizer = /*#__PURE__*/function () {
     var responseKey = selection.alias || selection.name;
     var storageKey = getStorageKey(selection, this._variables);
     var fieldValue = data[responseKey];
-    if (fieldValue == null) {
+    var isNoncompliantlyNullish = RelayFeatureFlags.ENABLE_NONCOMPLIANT_ERROR_HANDLING_ON_LISTS && Array.isArray(fieldValue) && fieldValue.length === 0;
+    if (fieldValue == null || isNoncompliantlyNullish) {
       if (fieldValue === undefined) {
         var isOptionalField = this._isClientExtension || this._isUnmatchedAbstractType;
         if (isOptionalField) {
@@ -300,12 +301,18 @@ var RelayResponseNormalizer = /*#__PURE__*/function () {
           return;
         }
       }
-      if (process.env.NODE_ENV !== "production") {
-        if (selection.kind === 'ScalarField') {
-          this._validateConflictingFieldsWithIdenticalId(record, storageKey, null);
+      if (selection.kind === 'ScalarField') {
+        this._validateConflictingFieldsWithIdenticalId(record, storageKey, null);
+      }
+      if (isNoncompliantlyNullish) {
+        if (selection.kind === 'LinkedField') {
+          RelayModernRecord.setLinkedRecordIDs(record, storageKey, []);
+        } else {
+          RelayModernRecord.setValue(record, storageKey, []);
         }
+      } else {
+        RelayModernRecord.setValue(record, storageKey, null);
       }
-      RelayModernRecord.setValue(record, storageKey, null);
       var errorTrie = this._errorTrie;
       if (errorTrie != null) {
         var errors = getErrorsByKey(errorTrie, responseKey);
@@ -316,9 +323,7 @@ var RelayResponseNormalizer = /*#__PURE__*/function () {
       return;
     }
     if (selection.kind === 'ScalarField') {
-      if (process.env.NODE_ENV !== "production") {
-        this._validateConflictingFieldsWithIdenticalId(record, storageKey, fieldValue);
-      }
+      this._validateConflictingFieldsWithIdenticalId(record, storageKey, fieldValue);
       RelayModernRecord.setValue(record, storageKey, fieldValue);
     } else if (selection.kind === 'LinkedField') {
       this._path.push(responseKey);
@@ -386,16 +391,14 @@ var RelayResponseNormalizer = /*#__PURE__*/function () {
     !(typeof fieldValue === 'object' && fieldValue) ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayResponseNormalizer: Expected data for field `%s` to be an object.', storageKey) : invariant(false) : void 0;
     var nextID = this._getDataId(fieldValue, (_field$concreteType2 = field.concreteType) !== null && _field$concreteType2 !== void 0 ? _field$concreteType2 : this._getRecordType(fieldValue)) || RelayModernRecord.getLinkedRecordID(record, storageKey) || generateClientID(RelayModernRecord.getDataID(record), storageKey);
     !(typeof nextID === 'string') ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayResponseNormalizer: Expected id on field `%s` to be a string.', storageKey) : invariant(false) : void 0;
-    if (process.env.NODE_ENV !== "production") {
-      this._validateConflictingLinkedFieldsWithIdenticalId(RelayModernRecord.getLinkedRecordID(record, storageKey), nextID, storageKey);
-    }
+    this._validateConflictingLinkedFieldsWithIdenticalId(RelayModernRecord.getLinkedRecordID(record, storageKey), nextID, storageKey);
     RelayModernRecord.setLinkedRecordID(record, storageKey, nextID);
     var nextRecord = this._recordSource.get(nextID);
     if (!nextRecord) {
       var typeName = field.concreteType || this._getRecordType(fieldValue);
       nextRecord = RelayModernRecord.create(nextID, typeName);
       this._recordSource.set(nextID, nextRecord);
-    } else if (process.env.NODE_ENV !== "production") {
+    } else {
       this._validateRecordType(nextRecord, field, fieldValue);
     }
     this._traverseSelections(field, nextRecord, fieldValue);
@@ -423,13 +426,11 @@ var RelayResponseNormalizer = /*#__PURE__*/function () {
         var typeName = field.concreteType || _this._getRecordType(item);
         nextRecord = RelayModernRecord.create(nextID, typeName);
         _this._recordSource.set(nextID, nextRecord);
-      } else if (process.env.NODE_ENV !== "production") {
+      } else {
         _this._validateRecordType(nextRecord, field, item);
       }
-      if (process.env.NODE_ENV !== "production") {
-        if (prevIDs) {
-          _this._validateConflictingLinkedFieldsWithIdenticalId(prevIDs[nextIndex], nextID, storageKey);
-        }
+      if (prevIDs) {
+        _this._validateConflictingLinkedFieldsWithIdenticalId(prevIDs[nextIndex], nextID, storageKey);
       }
       _this._traverseSelections(field, nextRecord, item);
       _this._errorTrie = oldErrorTrie;
@@ -438,21 +439,42 @@ var RelayResponseNormalizer = /*#__PURE__*/function () {
     RelayModernRecord.setLinkedRecordIDs(record, storageKey, nextIDs);
   };
   _proto._validateRecordType = function _validateRecordType(record, field, payload) {
-    var _field$concreteType4;
-    var typeName = (_field$concreteType4 = field.concreteType) !== null && _field$concreteType4 !== void 0 ? _field$concreteType4 : this._getRecordType(payload);
-    var dataID = RelayModernRecord.getDataID(record);
-    process.env.NODE_ENV !== "production" ? warning(isClientID(dataID) && dataID !== ROOT_ID || RelayModernRecord.getType(record) === typeName, 'RelayResponseNormalizer: Invalid record `%s`. Expected %s to be ' + 'consistent, but the record was assigned conflicting types `%s` ' + 'and `%s`. The GraphQL server likely violated the globally unique ' + 'id requirement by returning the same id for different objects.', dataID, TYPENAME_KEY, RelayModernRecord.getType(record), typeName) : void 0;
+    if (RelayFeatureFlags.ENABLE_STORE_ID_COLLISION_LOGGING) {
+      var _field$concreteType4;
+      var typeName = (_field$concreteType4 = field.concreteType) !== null && _field$concreteType4 !== void 0 ? _field$concreteType4 : this._getRecordType(payload);
+      var dataID = RelayModernRecord.getDataID(record);
+      var expected = isClientID(dataID) && dataID !== ROOT_ID || RelayModernRecord.getType(record) === typeName;
+      if (!expected) {
+        var logEvent = {
+          name: 'idCollision.typename',
+          previous_typename: RelayModernRecord.getType(record),
+          new_typename: typeName
+        };
+        if (this._log != null) {
+          this._log(logEvent);
+        }
+      }
+    }
+    if (process.env.NODE_ENV !== "production") {
+      var _field$concreteType5;
+      var _typeName3 = (_field$concreteType5 = field.concreteType) !== null && _field$concreteType5 !== void 0 ? _field$concreteType5 : this._getRecordType(payload);
+      var _dataID = RelayModernRecord.getDataID(record);
+      var _expected = isClientID(_dataID) && _dataID !== ROOT_ID || RelayModernRecord.getType(record) === _typeName3;
+      process.env.NODE_ENV !== "production" ? warning(_expected, 'RelayResponseNormalizer: Invalid record `%s`. Expected %s to be ' + 'consistent, but the record was assigned conflicting types `%s` ' + 'and `%s`. The GraphQL server likely violated the globally unique ' + 'id requirement by returning the same id for different objects.', _dataID, TYPENAME_KEY, RelayModernRecord.getType(record), _typeName3) : void 0;
+    }
   };
   _proto._validateConflictingFieldsWithIdenticalId = function _validateConflictingFieldsWithIdenticalId(record, storageKey, fieldValue) {
     if (process.env.NODE_ENV !== "production") {
-      var dataID = RelayModernRecord.getDataID(record);
       var previousValue = RelayModernRecord.getValue(record, storageKey);
-      process.env.NODE_ENV !== "production" ? warning(storageKey === TYPENAME_KEY || previousValue === undefined || areEqual(previousValue, fieldValue), 'RelayResponseNormalizer: Invalid record. The record contains two ' + 'instances of the same id: `%s` with conflicting field, %s and its values: %s and %s. ' + 'If two fields are different but share ' + 'the same id, one field will overwrite the other.', dataID, storageKey, previousValue, fieldValue) : void 0;
+      var dataID = RelayModernRecord.getDataID(record);
+      var expected = storageKey === TYPENAME_KEY || previousValue === undefined || areEqual(previousValue, fieldValue);
+      process.env.NODE_ENV !== "production" ? warning(expected, 'RelayResponseNormalizer: Invalid record. The record contains two ' + 'instances of the same id: `%s` with conflicting field, %s and its values: %s and %s. ' + 'If two fields are different but share ' + 'the same id, one field will overwrite the other.', dataID, storageKey, previousValue, fieldValue) : void 0;
     }
   };
   _proto._validateConflictingLinkedFieldsWithIdenticalId = function _validateConflictingLinkedFieldsWithIdenticalId(prevID, nextID, storageKey) {
     if (process.env.NODE_ENV !== "production") {
-      process.env.NODE_ENV !== "production" ? warning(prevID === undefined || prevID === nextID, 'RelayResponseNormalizer: Invalid record. The record contains ' + 'references to the conflicting field, %s and its id values: %s and %s. ' + 'We need to make sure that the record the field points ' + 'to remains consistent or one field will overwrite the other.', storageKey, prevID, nextID) : void 0;
+      var expected = prevID === undefined || prevID === nextID;
+      process.env.NODE_ENV !== "production" ? warning(expected, 'RelayResponseNormalizer: Invalid record. The record contains ' + 'references to the conflicting field, %s and its id values: %s and %s. ' + 'We need to make sure that the record the field points ' + 'to remains consistent or one field will overwrite the other.', storageKey, prevID, nextID) : void 0;
     }
   };
   return RelayResponseNormalizer;

package/lib/store/RelayStoreSubscriptions.js

@@ -59,7 +59,7 @@ var RelayStoreSubscriptions = /*#__PURE__*/function () {
           missingLiveResolverFields: backup.missingLiveResolverFields,
           seenRecords: backup.seenRecords,
           selector: backup.selector,
-          errorResponseFields: backup.errorResponseFields
+          fieldErrors: backup.fieldErrors
         };
       } else {
         subscription.stale = true;
@@ -94,7 +94,7 @@ var RelayStoreSubscriptions = /*#__PURE__*/function () {
       missingLiveResolverFields: nextSnapshot.missingLiveResolverFields,
       seenRecords: nextSnapshot.seenRecords,
       selector: nextSnapshot.selector,
-      errorResponseFields: nextSnapshot.errorResponseFields
+      fieldErrors: nextSnapshot.fieldErrors
     };
     if (process.env.NODE_ENV !== "production") {
       deepFreeze(nextSnapshot);

package/lib/store/RelayStoreUtils.js

@@ -4,6 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var getRelayHandleKey = require('../util/getRelayHandleKey');
 var RelayConcreteNode = require('../util/RelayConcreteNode');
+var RelayFeatureFlags = require('../util/RelayFeatureFlags');
 var _require = require('../util/stableCopy'),
   stableCopy = _require.stableCopy;
 var invariant = require('invariant');
@@ -14,6 +15,7 @@ var VARIABLE = RelayConcreteNode.VARIABLE,
 var ERRORS_KEY = '__errors';
 var MODULE_COMPONENT_KEY_PREFIX = '__module_component_';
 var MODULE_OPERATION_KEY_PREFIX = '__module_operation_';
+var RELAY_READ_TIME_RESOLVER_KEY_PREFIX = '$r:';
 function getArgumentValue(arg, variables) {
   if (arg.kind === VARIABLE) {
     return getStableVariableValue(arg.variableName, variables);
@@ -76,6 +78,10 @@ function getStorageKey(field, variables) {
   var name = field.name;
   return args && args.length !== 0 ? formatStorageKey(name, getArgumentValues(args, variables)) : name;
 }
+function getReadTimeResolverStorageKey(field, variables) {
+  var storageKey = getStorageKey(field, variables);
+  return RelayFeatureFlags.ENABLE_READ_TIME_RESOLVER_STORAGE_KEY_PREFIX ? '$r:' + storageKey : storageKey;
+}
 function getArguments(field) {
   if (field.kind === 'RelayResolver' || field.kind === 'RelayLiveResolver') {
     var _field$fragment2;
@@ -141,11 +147,13 @@ var RelayStoreUtils = {
   RELAY_RESOLVER_SNAPSHOT_KEY: '__resolverSnapshot',
   RELAY_RESOLVER_ERROR_KEY: '__resolverError',
   RELAY_RESOLVER_OUTPUT_TYPE_RECORD_IDS: '__resolverOutputTypeRecordIDs',
+  RELAY_READ_TIME_RESOLVER_KEY_PREFIX: RELAY_READ_TIME_RESOLVER_KEY_PREFIX,
   formatStorageKey: formatStorageKey,
   getArgumentValue: getArgumentValue,
   getArgumentValues: getArgumentValues,
   getHandleStorageKey: getHandleStorageKey,
   getStorageKey: getStorageKey,
+  getReadTimeResolverStorageKey: getReadTimeResolverStorageKey,
   getStableStorageKey: getStableStorageKey,
   getModuleComponentKey: getModuleComponentKey,
   getModuleOperationKey: getModuleOperationKey

package/lib/store/ResolverCache.js

@@ -1,24 +1,8 @@
 'use strict';
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
-var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/createForOfIteratorHelper"));
-var recycleNodesInto = require('../util/recycleNodesInto');
 var _require = require('../util/RelayConcreteNode'),
   RELAY_LIVE_RESOLVER = _require.RELAY_LIVE_RESOLVER;
-var RelayFeatureFlags = require('../util/RelayFeatureFlags');
-var shallowFreeze = require('../util/shallowFreeze');
-var _require2 = require('./ClientID'),
-  generateClientID = _require2.generateClientID;
-var RelayModernRecord = require('./RelayModernRecord');
-var _require3 = require('./RelayStoreUtils'),
-  RELAY_RESOLVER_ERROR_KEY = _require3.RELAY_RESOLVER_ERROR_KEY,
-  RELAY_RESOLVER_INVALIDATION_KEY = _require3.RELAY_RESOLVER_INVALIDATION_KEY,
-  RELAY_RESOLVER_SNAPSHOT_KEY = _require3.RELAY_RESOLVER_SNAPSHOT_KEY,
-  RELAY_RESOLVER_VALUE_KEY = _require3.RELAY_RESOLVER_VALUE_KEY,
-  getStorageKey = _require3.getStorageKey;
 var invariant = require('invariant');
-var warning = require("fbjs/lib/warning");
-var emptySet = new Set();
 var NoopResolverCache = /*#__PURE__*/function () {
   function NoopResolverCache() {}
   var _proto = NoopResolverCache.prototype;
@@ -37,154 +21,6 @@ var NoopResolverCache = /*#__PURE__*/function () {
   _proto.notifyUpdatedSubscribers = function notifyUpdatedSubscribers(updatedDataIDs) {};
   return NoopResolverCache;
 }();
-function addDependencyEdge(edges, from, to) {
-  var set = edges.get(from);
-  if (!set) {
-    set = new Set();
-    edges.set(from, set);
-  }
-  set.add(to);
-}
-var RecordResolverCache = /*#__PURE__*/function () {
-  function RecordResolverCache(getRecordSource) {
-    this._resolverIDToRecordIDs = new Map();
-    this._recordIDToResolverIDs = new Map();
-    this._getRecordSource = getRecordSource;
-  }
-  var _proto2 = RecordResolverCache.prototype;
-  _proto2.readFromCacheOrEvaluate = function readFromCacheOrEvaluate(recordID, field, variables, evaluate, getDataForResolverFragment) {
-    var recordSource = this._getRecordSource();
-    var record = recordSource.get(recordID);
-    !(record != null) ? process.env.NODE_ENV !== "production" ? invariant(false, 'We expect record to exist in the store.') : invariant(false) : void 0;
-    var storageKey = getStorageKey(field, variables);
-    var linkedID = RelayModernRecord.getLinkedRecordID(record, storageKey);
-    var linkedRecord = linkedID == null ? null : recordSource.get(linkedID);
-    if (linkedRecord == null || this._isInvalid(linkedRecord, getDataForResolverFragment)) {
-      var _linkedID;
-      linkedID = (_linkedID = linkedID) !== null && _linkedID !== void 0 ? _linkedID : generateClientID(recordID, storageKey);
-      linkedRecord = RelayModernRecord.create(linkedID, '__RELAY_RESOLVER__');
-      var evaluationResult = evaluate();
-      shallowFreeze(evaluationResult.resolverResult);
-      RelayModernRecord.setValue(linkedRecord, RELAY_RESOLVER_VALUE_KEY, evaluationResult.resolverResult);
-      RelayModernRecord.setValue(linkedRecord, RELAY_RESOLVER_SNAPSHOT_KEY, evaluationResult.snapshot);
-      RelayModernRecord.setValue(linkedRecord, RELAY_RESOLVER_ERROR_KEY, evaluationResult.error);
-      recordSource.set(linkedID, linkedRecord);
-      var currentRecord = recordSource.get(recordID);
-      !(currentRecord != null) ? process.env.NODE_ENV !== "production" ? invariant(false, 'Expected the parent record to still be in the record source.') : invariant(false) : void 0;
-      var nextRecord = RelayModernRecord.clone(currentRecord);
-      RelayModernRecord.setLinkedRecordID(nextRecord, storageKey, linkedID);
-      recordSource.set(recordID, nextRecord);
-      if (field.fragment != null) {
-        var _evaluationResult$sna;
-        var fragmentStorageKey = getStorageKey(field.fragment, variables);
-        var resolverID = generateClientID(recordID, fragmentStorageKey);
-        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;
-        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);
-            }
-          } catch (err) {
-            _iterator.e(err);
-          } finally {
-            _iterator.f();
-          }
-        }
-      }
-    }
-    var answer = RelayModernRecord.getValue(linkedRecord, RELAY_RESOLVER_VALUE_KEY);
-    var snapshot = RelayModernRecord.getValue(linkedRecord, RELAY_RESOLVER_SNAPSHOT_KEY);
-    var error = RelayModernRecord.getValue(linkedRecord, RELAY_RESOLVER_ERROR_KEY);
-    return [answer, linkedID, error, snapshot, undefined, undefined];
-  };
-  _proto2.invalidateDataIDs = function invalidateDataIDs(updatedDataIDs) {
-    var recordSource = this._getRecordSource();
-    var visited = new Set();
-    var recordsToVisit = Array.from(updatedDataIDs);
-    while (recordsToVisit.length) {
-      var recordID = recordsToVisit.pop();
-      updatedDataIDs.add(recordID);
-      var _iterator2 = (0, _createForOfIteratorHelper2["default"])((_this$_recordIDToReso = this._recordIDToResolverIDs.get(recordID)) !== null && _this$_recordIDToReso !== void 0 ? _this$_recordIDToReso : emptySet),
-        _step2;
-      try {
-        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-          var _this$_recordIDToReso;
-          var fragment = _step2.value;
-          if (!visited.has(fragment)) {
-            var _iterator3 = (0, _createForOfIteratorHelper2["default"])((_this$_resolverIDToRe = this._resolverIDToRecordIDs.get(fragment)) !== null && _this$_resolverIDToRe !== void 0 ? _this$_resolverIDToRe : emptySet),
-              _step3;
-            try {
-              for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-                var _this$_resolverIDToRe;
-                var anotherRecordID = _step3.value;
-                this._markInvalidatedResolverRecord(anotherRecordID, recordSource, updatedDataIDs);
-                if (!visited.has(anotherRecordID)) {
-                  recordsToVisit.push(anotherRecordID);
-                }
-              }
-            } catch (err) {
-              _iterator3.e(err);
-            } finally {
-              _iterator3.f();
-            }
-          }
-        }
-      } catch (err) {
-        _iterator2.e(err);
-      } finally {
-        _iterator2.f();
-      }
-    }
-  };
-  _proto2._markInvalidatedResolverRecord = function _markInvalidatedResolverRecord(dataID, recordSource, updatedDataIDs) {
-    var record = recordSource.get(dataID);
-    if (!record) {
-      process.env.NODE_ENV !== "production" ? warning(false, 'Expected a resolver record with ID %s, but it was missing.', dataID) : void 0;
-      return;
-    }
-    var nextRecord = RelayModernRecord.clone(record);
-    RelayModernRecord.setValue(nextRecord, RELAY_RESOLVER_INVALIDATION_KEY, true);
-    recordSource.set(dataID, nextRecord);
-  };
-  _proto2._isInvalid = function _isInvalid(record, getDataForResolverFragment) {
-    if (!RelayModernRecord.getValue(record, RELAY_RESOLVER_INVALIDATION_KEY)) {
-      return false;
-    }
-    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;
-      return true;
-    }
-    var _getDataForResolverFr = getDataForResolverFragment(readerSelector),
-      latestValues = _getDataForResolverFr.data;
-    var recycled = recycleNodesInto(originalInputs, latestValues);
-    if (recycled !== originalInputs) {
-      return true;
-    }
-    if (RelayFeatureFlags.MARK_RESOLVER_VALUES_AS_CLEAN_AFTER_FRAGMENT_REREAD) {
-      var nextRecord = RelayModernRecord.clone(record);
-      RelayModernRecord.setValue(nextRecord, RELAY_RESOLVER_INVALIDATION_KEY, false);
-      var recordSource = this._getRecordSource();
-      recordSource.set(RelayModernRecord.getDataID(record), nextRecord);
-    }
-    return false;
-  };
-  _proto2.ensureClientRecord = function ensureClientRecord(id, typename) {
-    !false ? process.env.NODE_ENV !== "production" ? invariant(false, 'Client Edges to Client Objects are not supported in this version of Relay Store') : invariant(false) : void 0;
-  };
-  _proto2.notifyUpdatedSubscribers = function notifyUpdatedSubscribers(updatedDataIDs) {
-    !false ? process.env.NODE_ENV !== "production" ? invariant(false, 'Processing @outputType records is not supported in this version of Relay Store') : invariant(false) : void 0;
-  };
-  return RecordResolverCache;
-}();
 module.exports = {
-  NoopResolverCache: NoopResolverCache,
-  RecordResolverCache: RecordResolverCache
+  NoopResolverCache: NoopResolverCache
 };

package/lib/store/ResolverFragments.js

@@ -28,8 +28,8 @@ function readFragment(fragmentInput, fragmentKey) {
   var _context$getDataForRe = context.getDataForResolverFragment(fragmentSelector, fragmentKey),
     data = _context$getDataForRe.data,
     isMissingData = _context$getDataForRe.isMissingData,
-    errorResponseFields = _context$getDataForRe.errorResponseFields;
-  if (isMissingData || errorResponseFields != null && errorResponseFields.some(eventShouldThrow)) {
+    fieldErrors = _context$getDataForRe.fieldErrors;
+  if (isMissingData || fieldErrors != null && fieldErrors.some(eventShouldThrow)) {
     throw RESOLVER_FRAGMENT_ERRORED_SENTINEL;
   }
   return data;

package/lib/store/createRelayLoggingContext.js

@@ -0,0 +1,17 @@
+'use strict';
+
+var invariant = require('invariant');
+var relayLoggingContext;
+var firstReact;
+function createRelayLoggingContext(react) {
+  if (!relayLoggingContext) {
+    relayLoggingContext = react.createContext(null);
+    if (process.env.NODE_ENV !== "production") {
+      relayLoggingContext.displayName = 'RelayLoggingContext';
+    }
+    firstReact = react;
+  }
+  !(react === firstReact) ? process.env.NODE_ENV !== "production" ? invariant(false, '[createRelayLoggingContext]: You are passing a different instance of React', react.version) : invariant(false) : void 0;
+  return relayLoggingContext;
+}
+module.exports = createRelayLoggingContext;

package/lib/store/generateTypenamePrefixedDataID.js

@@ -0,0 +1,9 @@
+'use strict';
+
+var TYPENAME_PREFIX = '__type:';
+function generateTypenamePrefixedDataID(typeName, dataID) {
+  return "".concat(TYPENAME_PREFIX).concat(typeName, ":").concat(dataID);
+}
+module.exports = {
+  generateTypenamePrefixedDataID: generateTypenamePrefixedDataID
+};

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

@@ -22,6 +22,7 @@ var _require5 = require('../RelayStoreUtils'),
   RELAY_RESOLVER_OUTPUT_TYPE_RECORD_IDS = _require5.RELAY_RESOLVER_OUTPUT_TYPE_RECORD_IDS,
   RELAY_RESOLVER_SNAPSHOT_KEY = _require5.RELAY_RESOLVER_SNAPSHOT_KEY,
   RELAY_RESOLVER_VALUE_KEY = _require5.RELAY_RESOLVER_VALUE_KEY,
+  getReadTimeResolverStorageKey = _require5.getReadTimeResolverStorageKey,
   getStorageKey = _require5.getStorageKey;
 var getOutputTypeRecordIDs = require('./getOutputTypeRecordIDs');
 var isLiveStateValue = require('./isLiveStateValue');
@@ -55,7 +56,7 @@ var LiveResolverCache = /*#__PURE__*/function () {
   _proto.readFromCacheOrEvaluate = function readFromCacheOrEvaluate(recordID, field, variables, evaluate, getDataForResolverFragment) {
     var recordSource = this._getRecordSource();
     var record = expectRecord(recordSource, recordID);
-    var storageKey = getStorageKey(field, variables);
+    var storageKey = getReadTimeResolverStorageKey(field, variables);
     var linkedID = RelayModernRecord.getLinkedRecordID(record, storageKey);
     var linkedRecord = linkedID == null ? null : recordSource.get(linkedID);
     var updatedDataIDs;
@@ -292,9 +293,7 @@ var LiveResolverCache = /*#__PURE__*/function () {
     var recordsToVisit = Array.from(updatedDataIDs);
     while (recordsToVisit.length) {
       var recordID = recordsToVisit.pop();
-      if (RelayFeatureFlags.AVOID_CYCLES_IN_RESOLVER_NOTIFICATION) {
-        visited.add(recordID);
-      }
+      visited.add(recordID);
       updatedDataIDs.add(recordID);
       var fragmentSet = this._recordIDToResolverIDs.get(recordID);
       if (fragmentSet == null) {
@@ -306,9 +305,7 @@ var LiveResolverCache = /*#__PURE__*/function () {
         for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
           var fragment = _step4.value;
           if (!visited.has(fragment)) {
-            if (RelayFeatureFlags.AVOID_CYCLES_IN_RESOLVER_NOTIFICATION) {
-              visited.add(fragment);
-            }
+            visited.add(fragment);
             var recordSet = this._resolverIDToRecordIDs.get(fragment);
             if (recordSet == null) {
               continue;
@@ -320,9 +317,7 @@ var LiveResolverCache = /*#__PURE__*/function () {
                 var anotherRecordID = _step5.value;
                 markInvalidatedResolverRecord(anotherRecordID, recordSource);
                 if (!visited.has(anotherRecordID)) {
-                  if (RelayFeatureFlags.AVOID_CYCLES_IN_RESOLVER_NOTIFICATION) {
-                    visited.add(anotherRecordID);
-                  }
+                  visited.add(anotherRecordID);
                   recordsToVisit.push(anotherRecordID);
                 }
               }

package/lib/store/live-resolvers/resolverDataInjector.js

@@ -5,26 +5,26 @@ var _require = require('../ResolverFragments'),
 var invariant = require('invariant');
 function resolverDataInjector(fragment, _resolverFn, fieldName, isRequiredField) {
   var resolverFn = _resolverFn;
-  return function (fragmentKey, args) {
+  return function (fragmentKey, args, resolverContext) {
     var data = readFragment(fragment, fragmentKey);
     if (fieldName != null) {
       if (data == null) {
         if (isRequiredField === true) {
           !false ? process.env.NODE_ENV !== "production" ? invariant(false, 'Expected required resolver field `%s` in fragment `%s` to be present. But resolvers fragment data is null/undefined.', fieldName, fragment.name) : invariant(false) : void 0;
         } else {
-          return resolverFn(null, args);
+          return resolverFn(null, args, resolverContext);
         }
       }
       if (fieldName in data) {
         if (isRequiredField === true) {
           !(data[fieldName] != null) ? process.env.NODE_ENV !== "production" ? invariant(false, 'Expected required resolver field `%s` in fragment `%s` to be non-null.', fieldName, fragment.name) : invariant(false) : void 0;
         }
-        return resolverFn(data[fieldName], args);
+        return resolverFn(data[fieldName], args, resolverContext);
       } else {
         !false ? process.env.NODE_ENV !== "production" ? invariant(false, 'Missing field `%s` in fragment `%s` in resolver response.', fieldName, fragment.name) : invariant(false) : void 0;
       }
     } else {
-      return resolverFn(data, args);
+      return resolverFn(null, args, resolverContext);
     }
   };
 }