relay-runtime 8.0.0 → 10.0.1

package/lib/store/RelayModernRecord.js

@@ -12,7 +12,11 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 var areEqual = require("fbjs/lib/areEqual");
 
@@ -30,7 +34,8 @@ var _require2 = require('./RelayStoreUtils'),
     REF_KEY = _require2.REF_KEY,
     REFS_KEY = _require2.REFS_KEY,
     TYPENAME_KEY = _require2.TYPENAME_KEY,
-    INVALIDATED_AT_KEY = _require2.INVALIDATED_AT_KEY;
+    INVALIDATED_AT_KEY = _require2.INVALIDATED_AT_KEY,
+    ROOT_ID = _require2.ROOT_ID;
 
 /**
  * @public
@@ -82,7 +87,7 @@ var _require2 = require('./RelayStoreUtils'),
  * Clone a record.
  */
 function clone(record) {
-  return (0, _objectSpread2["default"])({}, record);
+  return _objectSpread({}, record);
 }
 /**
  * @public
@@ -233,7 +238,7 @@ function update(prevRecord, nextRecord) {
 
     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" ? 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;
+    process.env.NODE_ENV !== "production" ? warning(isClientID(nextID) && nextID !== ROOT_ID || 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;
@@ -243,7 +248,7 @@ function update(prevRecord, nextRecord) {
     var key = keys[ii];
 
     if (updated || !areEqual(prevRecord[key], nextRecord[key])) {
-      updated = updated !== null ? updated : (0, _objectSpread2["default"])({}, prevRecord);
+      updated = updated !== null ? updated : _objectSpread({}, prevRecord);
       updated[key] = nextRecord[key];
     }
   }
@@ -268,7 +273,7 @@ function merge(record1, record2) {
 
     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" ? 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;
+    process.env.NODE_ENV !== "production" ? warning(isClientID(nextID) && nextID !== ROOT_ID || 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);
@@ -298,12 +303,12 @@ function setValue(record, storageKey, value) {
     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;
+      var _getType5;
 
       // 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" ? 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;
+      var nextType = value !== null && value !== void 0 ? value : null;
+      process.env.NODE_ENV !== "production" ? warning(isClientID(getDataID(record)) && getDataID(record) !== ROOT_ID || 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;
     }
   }
 

package/lib/store/RelayModernSelector.js

@@ -22,7 +22,8 @@ var _require = require('./RelayConcreteVariables'),
 var _require2 = require('./RelayStoreUtils'),
     FRAGMENT_OWNER_KEY = _require2.FRAGMENT_OWNER_KEY,
     FRAGMENTS_KEY = _require2.FRAGMENTS_KEY,
-    ID_KEY = _require2.ID_KEY;
+    ID_KEY = _require2.ID_KEY,
+    IS_WITHIN_UNMATCHED_TYPE_REFINEMENT = _require2.IS_WITHIN_UNMATCHED_TYPE_REFINEMENT;
 
 /**
  * @public
@@ -58,12 +59,13 @@ function getSingularSelector(fragment, item) {
   var dataID = item[ID_KEY];
   var fragments = item[FRAGMENTS_KEY];
   var mixedOwner = item[FRAGMENT_OWNER_KEY];
+  var isWithinUnmatchedTypeRefinement = item[IS_WITHIN_UNMATCHED_TYPE_REFINEMENT] === true;
 
   if (typeof dataID === 'string' && typeof fragments === 'object' && fragments !== null && typeof fragments[fragment.name] === 'object' && fragments[fragment.name] !== null && typeof mixedOwner === 'object' && mixedOwner !== null) {
     var owner = mixedOwner;
     var argumentVariables = fragments[fragment.name];
     var fragmentVariables = getFragmentVariables(fragment, owner.variables, argumentVariables);
-    return createReaderSelector(fragment, dataID, fragmentVariables, owner);
+    return createReaderSelector(fragment, dataID, fragmentVariables, owner, isWithinUnmatchedTypeRefinement);
   }
 
   if (process.env.NODE_ENV !== "production") {
@@ -211,7 +213,7 @@ function getDataID(fragment, item) {
     return dataID;
   }
 
-  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;
+  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)`, or `null` is passed as the fragment ' + "reference for `%s` if it's conditonally included and the condition isn't met.", fragment.name, JSON.stringify(item), fragment.name, fragment.name) : void 0;
   return null;
 }
 /**
@@ -292,9 +294,11 @@ function areEqualSelectors(thisSelector, thatSelector) {
 }
 
 function createReaderSelector(fragment, dataID, variables, request) {
+  var isWithinUnmatchedTypeRefinement = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
   return {
     kind: 'SingularReaderSelector',
     dataID: dataID,
+    isWithinUnmatchedTypeRefinement: isWithinUnmatchedTypeRefinement,
     node: fragment,
     variables: variables,
     owner: request