relay-runtime 2.0.0-rc.2 → 5.0.0

package/lib/RelayModernRecord.js

@@ -9,7 +9,27 @@
  */
 'use strict';
 
-var _objectSpread2 = require("@babel/runtime/helpers/interopRequireDefault")(require("@babel/runtime/helpers/objectSpread"));
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread"));
+
+var areEqual = require("fbjs/lib/areEqual");
+
+var deepFreeze = require("./deepFreeze");
+
+var invariant = require("fbjs/lib/invariant");
+
+var warning = require("fbjs/lib/warning");
+
+var _require = require("./ClientID"),
+    isClientID = _require.isClientID;
+
+var _require2 = require("./RelayStoreUtils"),
+    ID_KEY = _require2.ID_KEY,
+    REF_KEY = _require2.REF_KEY,
+    REFS_KEY = _require2.REFS_KEY,
+    TYPENAME_KEY = _require2.TYPENAME_KEY,
+    UNPUBLISH_FIELD_SENTINEL = _require2.UNPUBLISH_FIELD_SENTINEL;
 
 /**
  * @public
@@ -78,7 +98,7 @@ function clone(record) {
 function copyFields(source, sink) {
   for (var key in source) {
     if (source.hasOwnProperty(key)) {
-      if (key !== require("./RelayStoreUtils").ID_KEY && key !== require("./RelayStoreUtils").TYPENAME_KEY) {
+      if (key !== ID_KEY && key !== TYPENAME_KEY) {
         sink[key] = source[key];
       }
     }
@@ -94,8 +114,8 @@ function copyFields(source, sink) {
 function create(dataID, typeName) {
   // See perf note above for why we aren't using computed property access.
   var record = {};
-  record[require("./RelayStoreUtils").ID_KEY] = dataID;
-  record[require("./RelayStoreUtils").TYPENAME_KEY] = typeName;
+  record[ID_KEY] = dataID;
+  record[TYPENAME_KEY] = typeName;
   return record;
 }
 /**
@@ -106,7 +126,7 @@ function create(dataID, typeName) {
 
 
 function getDataID(record) {
-  return record[require("./RelayStoreUtils").ID_KEY];
+  return record[ID_KEY];
 }
 /**
  * @public
@@ -116,7 +136,7 @@ function getDataID(record) {
 
 
 function getType(record) {
-  return record[require("./RelayStoreUtils").TYPENAME_KEY];
+  return record[TYPENAME_KEY];
 }
 /**
  * @public
@@ -129,7 +149,7 @@ function getValue(record, storageKey) {
   var value = record[storageKey];
 
   if (value && typeof value === 'object') {
-    !(!value.hasOwnProperty(require("./RelayStoreUtils").REF_KEY) && !value.hasOwnProperty(require("./RelayStoreUtils").REFS_KEY)) ? process.env.NODE_ENV !== "production" ? require("fbjs/lib/invariant")(false, 'RelayModernRecord.getValue(): Expected a scalar (non-link) value for `%s.%s` ' + 'but found %s.', record[require("./RelayStoreUtils").ID_KEY], storageKey, value.hasOwnProperty(require("./RelayStoreUtils").REF_KEY) ? 'a linked record' : 'plural linked records') : require("fbjs/lib/invariant")(false) : void 0;
+    !(!value.hasOwnProperty(REF_KEY) && !value.hasOwnProperty(REFS_KEY)) ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayModernRecord.getValue(): Expected a scalar (non-link) value for `%s.%s` ' + 'but found %s.', record[ID_KEY], storageKey, value.hasOwnProperty(REF_KEY) ? 'a linked record' : 'plural linked records') : invariant(false) : void 0;
   }
 
   return value;
@@ -149,8 +169,8 @@ function getLinkedRecordID(record, storageKey) {
     return link;
   }
 
-  !(typeof link === 'object' && link && typeof link[require("./RelayStoreUtils").REF_KEY] === 'string') ? process.env.NODE_ENV !== "production" ? require("fbjs/lib/invariant")(false, 'RelayModernRecord.getLinkedRecordID(): Expected `%s.%s` to be a linked ID, ' + 'was `%s`.', record[require("./RelayStoreUtils").ID_KEY], storageKey, JSON.stringify(link)) : require("fbjs/lib/invariant")(false) : void 0;
-  return link[require("./RelayStoreUtils").REF_KEY];
+  !(typeof link === 'object' && link && typeof link[REF_KEY] === 'string') ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayModernRecord.getLinkedRecordID(): Expected `%s.%s` to be a linked ID, ' + 'was `%s`.', record[ID_KEY], storageKey, JSON.stringify(link)) : invariant(false) : void 0;
+  return link[REF_KEY];
 }
 /**
  * @public
@@ -167,9 +187,9 @@ function getLinkedRecordIDs(record, storageKey) {
     return links;
   }
 
-  !(typeof links === 'object' && Array.isArray(links[require("./RelayStoreUtils").REFS_KEY])) ? process.env.NODE_ENV !== "production" ? require("fbjs/lib/invariant")(false, 'RelayModernRecord.getLinkedRecordIDs(): Expected `%s.%s` to contain an array ' + 'of linked IDs, got `%s`.', record[require("./RelayStoreUtils").ID_KEY], storageKey, JSON.stringify(links)) : require("fbjs/lib/invariant")(false) : void 0; // assume items of the array are ids
+  !(typeof links === 'object' && Array.isArray(links[REFS_KEY])) ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayModernRecord.getLinkedRecordIDs(): Expected `%s.%s` to contain an array ' + 'of linked IDs, got `%s`.', record[ID_KEY], storageKey, JSON.stringify(links)) : invariant(false) : void 0; // assume items of the array are ids
 
-  return links[require("./RelayStoreUtils").REFS_KEY];
+  return links[REFS_KEY];
 }
 /**
  * @public
@@ -186,11 +206,11 @@ function update(prevRecord, nextRecord) {
 
     var prevID = getDataID(prevRecord);
     var nextID = getDataID(nextRecord);
-    process.env.NODE_ENV !== "production" ? require("fbjs/lib/warning")(prevID === nextID, 'RelayModernRecord: Invalid record update, expected both versions of ' + 'the record to have the same id, got `%s` and `%s`.', prevID, nextID) : void 0; // note: coalesce null/undefined to null
+    process.env.NODE_ENV !== "production" ? warning(prevID === nextID, 'RelayModernRecord: Invalid record update, expected both versions of ' + 'the record to have the same id, got `%s` and `%s`.', prevID, nextID) : void 0; // note: coalesce null/undefined to null
 
     var prevType = (_getType = getType(prevRecord)) !== null && _getType !== void 0 ? _getType : null;
     var nextType = (_getType2 = getType(nextRecord)) !== null && _getType2 !== void 0 ? _getType2 : null;
-    process.env.NODE_ENV !== "production" ? require("fbjs/lib/warning")(prevType === nextType, 'RelayModernRecord: Invalid record update, expected both versions of ' + 'record `%s` to have the same `%s` but got conflicting types `%s` ' + 'and `%s`. The GraphQL server likely violated the globally unique ' + 'id requirement by returning the same id for different objects.', prevID, require("./RelayStoreUtils").TYPENAME_KEY, prevType, nextType) : void 0;
+    process.env.NODE_ENV !== "production" ? warning(isClientID(nextID) || prevType === nextType, 'RelayModernRecord: Invalid record update, expected both versions of ' + 'record `%s` to have the same `%s` but got conflicting types `%s` ' + 'and `%s`. The GraphQL server likely violated the globally unique ' + 'id requirement by returning the same id for different objects.', prevID, TYPENAME_KEY, prevType, nextType) : void 0;
   }
 
   var updated = null;
@@ -199,10 +219,10 @@ function update(prevRecord, nextRecord) {
   for (var ii = 0; ii < keys.length; ii++) {
     var key = keys[ii];
 
-    if (updated || !require("fbjs/lib/areEqual")(prevRecord[key], nextRecord[key])) {
+    if (updated || !areEqual(prevRecord[key], nextRecord[key])) {
       updated = updated !== null ? updated : (0, _objectSpread2["default"])({}, prevRecord);
 
-      if (nextRecord[key] !== require("./RelayStoreUtils").UNPUBLISH_FIELD_SENTINEL) {
+      if (nextRecord[key] !== UNPUBLISH_FIELD_SENTINEL) {
         updated[key] = nextRecord[key];
       } else {
         delete updated[key];
@@ -226,11 +246,11 @@ function merge(record1, record2) {
 
     var prevID = getDataID(record1);
     var nextID = getDataID(record2);
-    process.env.NODE_ENV !== "production" ? require("fbjs/lib/warning")(prevID === nextID, 'RelayModernRecord: Invalid record merge, expected both versions of ' + 'the record to have the same id, got `%s` and `%s`.', prevID, nextID) : void 0; // note: coalesce null/undefined to null
+    process.env.NODE_ENV !== "production" ? warning(prevID === nextID, 'RelayModernRecord: Invalid record merge, expected both versions of ' + 'the record to have the same id, got `%s` and `%s`.', prevID, nextID) : void 0; // note: coalesce null/undefined to null
 
     var prevType = (_getType3 = getType(record1)) !== null && _getType3 !== void 0 ? _getType3 : null;
     var nextType = (_getType4 = getType(record2)) !== null && _getType4 !== void 0 ? _getType4 : null;
-    process.env.NODE_ENV !== "production" ? require("fbjs/lib/warning")(prevType === nextType, 'RelayModernRecord: Invalid record merge, expected both versions of ' + 'record `%s` to have the same `%s` but got conflicting types `%s` ' + 'and `%s`. The GraphQL server likely violated the globally unique ' + 'id requirement by returning the same id for different objects.', prevID, require("./RelayStoreUtils").TYPENAME_KEY, prevType, nextType) : void 0;
+    process.env.NODE_ENV !== "production" ? warning(isClientID(nextID) || prevType === nextType, 'RelayModernRecord: Invalid record merge, expected both versions of ' + 'record `%s` to have the same `%s` but got conflicting types `%s` ' + 'and `%s`. The GraphQL server likely violated the globally unique ' + 'id requirement by returning the same id for different objects.', prevID, TYPENAME_KEY, prevType, nextType) : void 0;
   }
 
   return Object.assign({}, record1, record2);
@@ -244,7 +264,7 @@ function merge(record1, record2) {
 
 
 function freeze(record) {
-  require("./deepFreeze")(record);
+  deepFreeze(record);
 }
 /**
  * @public
@@ -257,15 +277,15 @@ function setValue(record, storageKey, value) {
   if (process.env.NODE_ENV !== "production") {
     var prevID = getDataID(record);
 
-    if (storageKey === require("./RelayStoreUtils").ID_KEY) {
-      process.env.NODE_ENV !== "production" ? require("fbjs/lib/warning")(prevID === value, 'RelayModernRecord: Invalid field update, expected both versions of ' + 'the record to have the same id, got `%s` and `%s`.', prevID, value) : void 0;
-    } else if (storageKey === require("./RelayStoreUtils").TYPENAME_KEY) {
+    if (storageKey === ID_KEY) {
+      process.env.NODE_ENV !== "production" ? warning(prevID === value, 'RelayModernRecord: Invalid field update, expected both versions of ' + 'the record to have the same id, got `%s` and `%s`.', prevID, value) : void 0;
+    } else if (storageKey === TYPENAME_KEY) {
       var _getType5, _value;
 
       // note: coalesce null/undefined to null
       var prevType = (_getType5 = getType(record)) !== null && _getType5 !== void 0 ? _getType5 : null;
       var nextType = (_value = value) !== null && _value !== void 0 ? _value : null;
-      process.env.NODE_ENV !== "production" ? require("fbjs/lib/warning")(prevType === nextType, 'RelayModernRecord: Invalid field update, expected both versions of ' + 'record `%s` to have the same `%s` but got conflicting types `%s` ' + 'and `%s`. The GraphQL server likely violated the globally unique ' + 'id requirement by returning the same id for different objects.', prevID, require("./RelayStoreUtils").TYPENAME_KEY, prevType, nextType) : void 0;
+      process.env.NODE_ENV !== "production" ? warning(isClientID(getDataID(record)) || prevType === nextType, 'RelayModernRecord: Invalid field update, expected both versions of ' + 'record `%s` to have the same `%s` but got conflicting types `%s` ' + 'and `%s`. The GraphQL server likely violated the globally unique ' + 'id requirement by returning the same id for different objects.', prevID, TYPENAME_KEY, prevType, nextType) : void 0;
     }
   }
 
@@ -281,7 +301,7 @@ function setValue(record, storageKey, value) {
 function setLinkedRecordID(record, storageKey, linkedID) {
   // See perf note above for why we aren't using computed property access.
   var link = {};
-  link[require("./RelayStoreUtils").REF_KEY] = linkedID;
+  link[REF_KEY] = linkedID;
   record[storageKey] = link;
 }
 /**
@@ -294,7 +314,7 @@ function setLinkedRecordID(record, storageKey, linkedID) {
 function setLinkedRecordIDs(record, storageKey, linkedIDs) {
   // See perf note above for why we aren't using computed property access.
   var links = {};
-  links[require("./RelayStoreUtils").REFS_KEY] = linkedIDs;
+  links[REFS_KEY] = linkedIDs;
   record[storageKey] = links;
 }
 

package/lib/RelayModernSelector.js

@@ -9,6 +9,20 @@
  */
 'use strict';
 
+var areEqual = require("fbjs/lib/areEqual");
+
+var invariant = require("fbjs/lib/invariant");
+
+var warning = require("fbjs/lib/warning");
+
+var _require = require("./RelayConcreteVariables"),
+    getFragmentVariables = _require.getFragmentVariables;
+
+var _require2 = require("./RelayStoreUtils"),
+    FRAGMENT_OWNER_KEY = _require2.FRAGMENT_OWNER_KEY,
+    FRAGMENTS_KEY = _require2.FRAGMENTS_KEY,
+    ID_KEY = _require2.ID_KEY;
+
 /**
  * @public
  *
@@ -34,43 +48,55 @@
  * using that selector to `lookup()` the results against the environment:
  *
  * ```
- * const childSelector = getSelector(queryVariables, Child, parent);
+ * const childSelector = getSingularSelector(queryVariables, Child, parent);
  * const childData = environment.lookup(childSelector).data;
  * ```
  */
-function getSelector(operationVariables, fragment, item) {
-  !(typeof item === 'object' && item !== null && !Array.isArray(item)) ? process.env.NODE_ENV !== "production" ? require("fbjs/lib/invariant")(false, 'RelayModernSelector: Expected value for fragment `%s` to be an object, got ' + '`%s`.', fragment.name, JSON.stringify(item)) : require("fbjs/lib/invariant")(false) : void 0;
-
-  var dataID = item[require("./RelayStoreUtils").ID_KEY];
-
-  var fragments = item[require("./RelayStoreUtils").FRAGMENTS_KEY];
-
-  var owner = item[require("./RelayStoreUtils").FRAGMENT_OWNER_KEY];
+function getSingularSelector(operationVariables, fragment, item, explicitOwner) {
+  !(typeof item === 'object' && item !== null && !Array.isArray(item)) ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayModernSelector: Expected value for fragment `%s` to be an object, got ' + '`%s`.', fragment.name, JSON.stringify(item)) : invariant(false) : void 0;
+  var dataID = item[ID_KEY];
+  var fragments = item[FRAGMENTS_KEY];
 
   if (typeof dataID === 'string' && typeof fragments === 'object' && fragments !== null && typeof fragments[fragment.name] === 'object' && fragments[fragment.name] !== null) {
-    var argumentVariables = fragments[fragment.name];
+    var _ref, _explicitOwner;
 
-    if (owner != null && typeof owner === 'object') {
-      // $FlowFixMe - TODO T39154660
-      var typedOwner = owner;
-      var ownerOperationVariables = typedOwner.variables;
+    var argumentVariables = fragments[fragment.name]; // We only use the owner to compute the selector variables if an owner
+    // was explicitly passed by the caller, for backwards compatibility.
+    // See TODO(T39494051) for details
+
+    if (explicitOwner != null && typeof explicitOwner === 'object') {
+      var ownerOperationVariables = explicitOwner.variables;
 
-      var _fragmentVariables = require("./RelayConcreteVariables").getFragmentVariables(fragment, ownerOperationVariables, argumentVariables);
+      var _fragmentVariables = getFragmentVariables(fragment, ownerOperationVariables,
+      /* $FlowFixMe(>=0.98.0 site=www,mobile,react_native_fb,oss) This comment
+       * suppresses an error found when Flow v0.98 was deployed. To see the
+       * error delete this comment and run Flow. */
+      argumentVariables);
 
       return {
-        owner: typedOwner,
+        owner: explicitOwner,
         selector: {
           dataID: dataID,
           node: fragment,
           variables: _fragmentVariables
         }
       };
-    }
-
-    var fragmentVariables = require("./RelayConcreteVariables").getFragmentVariables(fragment, operationVariables, argumentVariables);
-
+    } // For convenience, we read and pass through the owner if one
+    // is present in the fragment reference (`item`), but we only
+    // use the owner to compute the selector variables if an owner was
+    // explicitly passed by the caller, for backwards compatibility.
+    // See TODO(T39494051) for details
+
+
+    var owner = (_ref = (_explicitOwner = explicitOwner) !== null && _explicitOwner !== void 0 ? _explicitOwner : item[FRAGMENT_OWNER_KEY]) !== null && _ref !== void 0 ? _ref : null;
+    var fragmentVariables = getFragmentVariables(fragment, operationVariables,
+    /* $FlowFixMe(>=0.98.0 site=www,mobile,react_native_fb,oss) This comment
+     * suppresses an error found when Flow v0.98 was deployed. To see the
+     * error delete this comment and run Flow. */
+    argumentVariables);
     return {
-      owner: null,
+      // $FlowFixMe - TODO T39154660
+      owner: owner,
       selector: {
         dataID: dataID,
         node: fragment,
@@ -79,7 +105,16 @@ function getSelector(operationVariables, fragment, item) {
     };
   }
 
-  process.env.NODE_ENV !== "production" ? require("fbjs/lib/warning")(false, 'RelayModernSelector: Expected object to contain data for fragment `%s`, got ' + '`%s`. Make sure that the parent operation/fragment included fragment ' + '`...%s` without `@relay(mask: false)`.', fragment.name, JSON.stringify(item), fragment.name) : void 0;
+  if (process.env.NODE_ENV !== "production") {
+    var stringifiedItem = JSON.stringify(item);
+
+    if (stringifiedItem.length > 499) {
+      stringifiedItem = stringifiedItem.substr(0, 498) + "\u2026";
+    }
+
+    process.env.NODE_ENV !== "production" ? warning(false, 'RelayModernSelector: Expected object to contain data for fragment `%s`, got ' + '`%s`. Make sure that the parent operation/fragment included fragment ' + '`...%s` without `@relay(mask: false)`.', fragment.name, stringifiedItem, fragment.name) : void 0;
+  }
+
   return null;
 }
 /**
@@ -87,15 +122,23 @@ function getSelector(operationVariables, fragment, item) {
  *
  * Given the result `items` from a parent that fetched `fragment`, creates a
  * selector that can be used to read the results of that fragment on those
- * items. This is similar to `getSelector` but for "plural" fragments that
+ * items. This is similar to `getSingularSelector` but for "plural" fragments that
  * expect an array of results and therefore return an array of selectors.
  */
 
 
-function getSelectorList(operationVariables, fragment, items) {
+function getPluralSelector(operationVariables, fragment, items, owners) {
   var selectors = null;
-  items.forEach(function (item) {
-    var selector = item != null ? getSelector(operationVariables, fragment, item) : null;
+
+  if (process.env.NODE_ENV !== "production") {
+    if (owners != null) {
+      process.env.NODE_ENV !== "production" ? warning(items.length === owners.length, 'RelayModernSelector: Expected number of plural values for fragment ' + '`%s` to match number of owners. Received %s values and %s owners.', fragment.name, items.length, owners.length) : void 0;
+    }
+  }
+
+  items.forEach(function (item, ii) {
+    var owner = owners != null ? owners[ii] : null;
+    var selector = item != null ? getSingularSelector(operationVariables, fragment, item, owner) : null;
 
     if (selector != null) {
       selectors = selectors || [];
@@ -104,6 +147,42 @@ function getSelectorList(operationVariables, fragment, items) {
   });
   return selectors;
 }
+
+function getSelector(operationVariables, fragment, item, explicitOwner) {
+  var selectorOrSelectors;
+
+  if (item == null) {
+    selectorOrSelectors = item;
+  } else if (fragment.metadata && fragment.metadata.plural === true) {
+    !Array.isArray(item) ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayModernSelector: Expected value for fragment `%s` to be an array, got `%s`. ' + 'Remove `@relay(plural: true)` from fragment `%s` to allow the prop to be an object.', fragment.name, JSON.stringify(item), fragment.name) : invariant(false) : void 0;
+
+    if (explicitOwner !== undefined) {
+      !Array.isArray(explicitOwner) ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayModernSelector: Expected explcitly provided owner for ' + 'fragment `%s` to be an array, got `%s`.', fragment.name, JSON.stringify(explicitOwner)) : invariant(false) : void 0;
+      selectorOrSelectors = getPluralSelector(operationVariables, fragment,
+      /* $FlowFixMe(>=0.98.0 site=www,mobile,react_native_fb,oss) This comment
+       * suppresses an error found when Flow v0.98 was deployed. To see the
+       * error delete this comment and run Flow. */
+      item, explicitOwner);
+    } else {
+      selectorOrSelectors = getPluralSelector(operationVariables, fragment,
+      /* $FlowFixMe(>=0.98.0 site=www,mobile,react_native_fb,oss) This comment
+       * suppresses an error found when Flow v0.98 was deployed. To see the
+       * error delete this comment and run Flow. */
+      item);
+    }
+  } else {
+    !!Array.isArray(item) ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayModernSelector: Expected value for fragment `%s` to be an object, got `%s`. ' + 'Add `@relay(plural: true)` to fragment `%s` to allow the prop to be an array of items.', fragment.name, JSON.stringify(item), fragment.name) : invariant(false) : void 0;
+
+    if (explicitOwner != null) {
+      !!Array.isArray(explicitOwner) ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayModernSelector: Expected explcitly provided owner for ' + 'fragment `%s` not to be an array, got `%s`.', fragment.name, JSON.stringify(explicitOwner)) : invariant(false) : void 0;
+      selectorOrSelectors = getSingularSelector(operationVariables, fragment, item, explicitOwner);
+    } else {
+      selectorOrSelectors = getSingularSelector(operationVariables, fragment, item);
+    }
+  }
+
+  return selectorOrSelectors;
+}
 /**
  * @public
  *
@@ -116,7 +195,7 @@ function getSelectorList(operationVariables, fragment, items) {
  */
 
 
-function getSelectorsFromObject(operationVariables, fragments, object) {
+function getSelectorsFromObject(operationVariables, fragments, object, owners) {
   var selectors = {};
 
   for (var _key in fragments) {
@@ -124,13 +203,11 @@ function getSelectorsFromObject(operationVariables, fragments, object) {
       var fragment = fragments[_key];
       var item = object[_key];
 
-      if (item == null) {
-        selectors[_key] = item;
-      } else if (fragment.metadata && fragment.metadata.plural === true) {
-        !Array.isArray(item) ? process.env.NODE_ENV !== "production" ? require("fbjs/lib/invariant")(false, 'RelayModernSelector: Expected value for key `%s` to be an array, got `%s`. ' + 'Remove `@relay(plural: true)` from fragment `%s` to allow the prop to be an object.', _key, JSON.stringify(item), fragment.name) : require("fbjs/lib/invariant")(false) : void 0;
-        selectors[_key] = getSelectorList(operationVariables, fragment, item);
+      if (owners != null) {
+        !owners.hasOwnProperty(_key) ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayModernSelector: Expected explcitly provided owner for ' + 'fragment `%s` under key `%s` to exist.', fragment.name, _key) : invariant(false) : void 0;
+        var explicitOwner = owners[_key];
+        selectors[_key] = getSelector(operationVariables, fragment, item, explicitOwner);
       } else {
-        !!Array.isArray(item) ? process.env.NODE_ENV !== "production" ? require("fbjs/lib/invariant")(false, 'RelayModernFragmentSpecResolver: Expected value for key `%s` to be an object, got `%s`. ' + 'Add `@relay(plural: true)` to fragment `%s` to allow the prop to be an array of items.', _key, JSON.stringify(item), fragment.name) : require("fbjs/lib/invariant")(false) : void 0;
         selectors[_key] = getSelector(operationVariables, fragment, item);
       }
     }
@@ -156,21 +233,32 @@ function getDataIDsFromObject(fragments, object) {
     if (fragments.hasOwnProperty(_key2)) {
       var fragment = fragments[_key2];
       var item = object[_key2];
-
-      if (item == null) {
-        ids[_key2] = item;
-      } else if (fragment.metadata && fragment.metadata.plural === true) {
-        !Array.isArray(item) ? process.env.NODE_ENV !== "production" ? require("fbjs/lib/invariant")(false, 'RelayModernSelector: Expected value for key `%s` to be an array, got `%s`. ' + 'Remove `@relay(plural: true)` from fragment `%s` to allow the prop to be an object.', _key2, JSON.stringify(item), fragment.name) : require("fbjs/lib/invariant")(false) : void 0;
-        ids[_key2] = getDataIDs(fragment, item);
-      } else {
-        !!Array.isArray(item) ? process.env.NODE_ENV !== "production" ? require("fbjs/lib/invariant")(false, 'RelayModernFragmentSpecResolver: Expected value for key `%s` to be an object, got `%s`. ' + 'Add `@relay(plural: true)` to fragment `%s` to allow the prop to be an array of items.', _key2, JSON.stringify(item), fragment.name) : require("fbjs/lib/invariant")(false) : void 0;
-        ids[_key2] = getDataID(fragment, item);
-      }
+      ids[_key2] = getDataIDsFromFragment(fragment, item);
     }
   }
 
   return ids;
 }
+
+function getDataIDsFromFragment(fragment, item) {
+  var idOrIDs;
+
+  if (item == null) {
+    idOrIDs = item;
+  } else if (fragment.metadata && fragment.metadata.plural === true) {
+    !Array.isArray(item) ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayModernSelector: Expected value for fragment `%s` to be an array, got `%s`. ' + 'Remove `@relay(plural: true)` from fragment `%s` to allow the prop to be an object.', fragment.name, JSON.stringify(item), fragment.name) : invariant(false) : void 0;
+    /* $FlowFixMe(>=0.98.0 site=www,mobile,react_native_fb,oss) This comment
+     * suppresses an error found when Flow v0.98 was deployed. To see the error
+     * delete this comment and run Flow. */
+
+    idOrIDs = getDataIDs(fragment, item);
+  } else {
+    !!Array.isArray(item) ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayModernFragmentSpecResolver: Expected value for fragment `%s` to be an object, got `%s`. ' + 'Add `@relay(plural: true)` to fragment `%s` to allow the prop to be an array of items.', fragment.name, JSON.stringify(item), fragment.name) : invariant(false) : void 0;
+    idOrIDs = getDataID(fragment, item);
+  }
+
+  return idOrIDs;
+}
 /**
  * @internal
  */
@@ -194,15 +282,14 @@ function getDataIDs(fragment, items) {
 
 
 function getDataID(fragment, item) {
-  !(typeof item === 'object' && item !== null && !Array.isArray(item)) ? process.env.NODE_ENV !== "production" ? require("fbjs/lib/invariant")(false, 'RelayModernSelector: Expected value for fragment `%s` to be an object, got ' + '`%s`.', fragment.name, JSON.stringify(item)) : require("fbjs/lib/invariant")(false) : void 0;
-
-  var dataID = item[require("./RelayStoreUtils").ID_KEY];
+  !(typeof item === 'object' && item !== null && !Array.isArray(item)) ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayModernSelector: Expected value for fragment `%s` to be an object, got ' + '`%s`.', fragment.name, JSON.stringify(item)) : invariant(false) : void 0;
+  var dataID = item[ID_KEY];
 
   if (typeof dataID === 'string') {
     return dataID;
   }
 
-  process.env.NODE_ENV !== "production" ? require("fbjs/lib/warning")(false, 'RelayModernSelector: Expected object to contain data for fragment `%s`, got ' + '`%s`. Make sure that the parent operation/fragment included fragment ' + '`...%s` without `@relay(mask: false)`.', fragment.name, JSON.stringify(item), fragment.name) : void 0;
+  process.env.NODE_ENV !== "production" ? warning(false, 'RelayModernSelector: Expected object to contain data for fragment `%s`, got ' + '`%s`. Make sure that the parent operation/fragment included fragment ' + '`...%s` without `@relay(mask: false)`.', fragment.name, JSON.stringify(item), fragment.name) : void 0;
   return null;
 }
 /**
@@ -217,51 +304,65 @@ function getDataID(fragment, item) {
  */
 
 
-function getVariablesFromObject(operationVariables, fragments, object) {
+function getVariablesFromObject(operationVariables, fragments, object, owners) {
   var variables = {};
 
   for (var _key3 in fragments) {
     if (fragments.hasOwnProperty(_key3)) {
-      var _ret = function () {
-        var fragment = fragments[_key3];
-        var item = object[_key3];
-
-        if (item == null) {
-          return "continue";
-        } else if (fragment.metadata && fragment.metadata.plural === true) {
-          !Array.isArray(item) ? process.env.NODE_ENV !== "production" ? require("fbjs/lib/invariant")(false, 'RelayModernSelector: Expected value for key `%s` to be an array, got `%s`. ' + 'Remove `@relay(plural: true)` from fragment `%s` to allow the prop to be an object.', _key3, JSON.stringify(item), fragment.name) : require("fbjs/lib/invariant")(false) : void 0;
-          item.forEach(function (value) {
-            if (value != null) {
-              var itemVariables = getVariables(operationVariables, fragment, value);
-
-              if (itemVariables) {
-                Object.assign(variables, itemVariables);
-              }
-            }
-          });
-        } else {
-          !!Array.isArray(item) ? process.env.NODE_ENV !== "production" ? require("fbjs/lib/invariant")(false, 'RelayModernFragmentSpecResolver: Expected value for key `%s` to be an object, got `%s`. ' + 'Add `@relay(plural: true)` to fragment `%s` to allow the prop to be an array of items.', _key3, JSON.stringify(item), fragment.name) : require("fbjs/lib/invariant")(false) : void 0;
-          var itemVariables = getVariables(operationVariables, fragment, item);
-
-          if (itemVariables) {
-            Object.assign(variables, itemVariables);
-          }
-        }
-      }();
+      var fragment = fragments[_key3];
+      var item = object[_key3];
+
+      if (owners != null) {
+        !owners.hasOwnProperty(_key3) ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayModernSelector: Expected explcitly provided owner for ' + 'fragment `%s` under key `%s` to exist.', fragment.name, _key3) : invariant(false) : void 0;
+        var explicitOwner = owners[_key3];
+        var itemVariables = getVariablesFromFragment(operationVariables, fragment, item, explicitOwner);
+        Object.assign(variables, itemVariables);
+      } else {
+        var _itemVariables = getVariablesFromFragment(operationVariables, fragment, item);
 
-      if (_ret === "continue") continue;
+        Object.assign(variables, _itemVariables);
+      }
     }
   }
 
   return variables;
 }
-/**
- * @internal
- */
 
+function getVariablesFromFragment(operationVariables, fragment, item, explicitOwner) {
+  var _fragment$metadata;
+
+  if (item == null) {
+    return {};
+  } else if (((_fragment$metadata = fragment.metadata) === null || _fragment$metadata === void 0 ? void 0 : _fragment$metadata.plural) === true) {
+    !Array.isArray(item) ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayModernSelector: Expected value for fragment `%s` to be an array, got `%s`. ' + 'Remove `@relay(plural: true)` from fragment `%s` to allow the prop to be an object.', fragment.name, JSON.stringify(item), fragment.name) : invariant(false) : void 0;
+
+    if (explicitOwner !== undefined) {
+      !Array.isArray(explicitOwner) ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayModernSelector: Expected explcitly provided owner for ' + 'fragment `%s` to be an array, got `%s`.', fragment.name, JSON.stringify(explicitOwner)) : invariant(false) : void 0;
+      return getVariablesFromPluralFragment(operationVariables, fragment,
+      /* $FlowFixMe(>=0.98.0 site=www,mobile,react_native_fb,oss) This comment
+       * suppresses an error found when Flow v0.98 was deployed. To see the
+       * error delete this comment and run Flow. */
+      item, explicitOwner);
+    } else {
+      /* $FlowFixMe(>=0.98.0 site=www,mobile,react_native_fb,oss) This comment
+       * suppresses an error found when Flow v0.98 was deployed. To see the
+       * error delete this comment and run Flow. */
+      return getVariablesFromPluralFragment(operationVariables, fragment, item);
+    }
+  } else {
+    !!Array.isArray(item) ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayModernFragmentSpecResolver: Expected value for fragment `%s` to be an object, got `%s`. ' + 'Add `@relay(plural: true)` to fragment `%s` to allow the prop to be an array of items.', fragment.name, JSON.stringify(item), fragment.name) : invariant(false) : void 0;
+
+    if (explicitOwner !== undefined) {
+      !!Array.isArray(explicitOwner) ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayModernSelector: Expected explcitly provided owner for ' + 'fragment `%s` not to be an array, got `%s`.', fragment.name, JSON.stringify(explicitOwner)) : invariant(false) : void 0;
+      return getVariablesFromSingularFragment(operationVariables, fragment, item, explicitOwner) || {};
+    } else {
+      return getVariablesFromSingularFragment(operationVariables, fragment, item) || {};
+    }
+  }
+}
 
-function getVariables(operationVariables, fragment, item) {
-  var ownedSelector = getSelector(operationVariables, fragment, item);
+function getVariablesFromSingularFragment(operationVariables, fragment, item, owner) {
+  var ownedSelector = getSingularSelector(operationVariables, fragment, item, owner);
 
   if (!ownedSelector) {
     return null;
@@ -269,6 +370,21 @@ function getVariables(operationVariables, fragment, item) {
 
   return ownedSelector.selector.variables;
 }
+
+function getVariablesFromPluralFragment(operationVariables, fragment, items, owners) {
+  var variables = {};
+  items.forEach(function (value, ii) {
+    if (value != null) {
+      var owner = owners != null ? owners[ii] : null;
+      var itemVariables = getVariablesFromSingularFragment(operationVariables, fragment, value, owner);
+
+      if (itemVariables) {
+        Object.assign(variables, itemVariables);
+      }
+    }
+  });
+  return variables;
+}
 /**
  * @public
  *
@@ -279,14 +395,24 @@ function getVariables(operationVariables, fragment, item) {
 
 
 function areEqualSelectors(thisSelector, thatSelector) {
-  return thisSelector.selector.dataID === thatSelector.selector.dataID && thisSelector.selector.node === thatSelector.selector.node && require("fbjs/lib/areEqual")(thisSelector.selector.variables, thatSelector.selector.variables);
+  var areVariablesEqual = areEqual(thisSelector.selector.variables, thatSelector.selector.variables);
+  var areReaderSelectorsEqual = thisSelector.selector.dataID === thatSelector.selector.dataID && thisSelector.selector.node === thatSelector.selector.node && areVariablesEqual; // NOTE: With fragment ownership we need to also compare if
+  // the owners attached to the selectors are the same, otherwise we might
+  // skip setting a new selector that has a new owner.
+
+  return areReaderSelectorsEqual && thisSelector.owner === thatSelector.owner;
 }
 
 module.exports = {
   areEqualSelectors: areEqualSelectors,
+  getDataIDsFromFragment: getDataIDsFromFragment,
   getDataIDsFromObject: getDataIDsFromObject,
+  getSingularSelector: getSingularSelector,
+  getPluralSelector: getPluralSelector,
   getSelector: getSelector,
-  getSelectorList: getSelectorList,
   getSelectorsFromObject: getSelectorsFromObject,
+  getVariablesFromSingularFragment: getVariablesFromSingularFragment,
+  getVariablesFromPluralFragment: getVariablesFromPluralFragment,
+  getVariablesFromFragment: getVariablesFromFragment,
   getVariablesFromObject: getVariablesFromObject
 };