relay-runtime 7.0.0 → 9.1.0

package/lib/store/RelayReferenceMarker.js

@@ -7,12 +7,11 @@
  * 
  * @format
  */
+// flowlint ambiguous-object-type:error
 'use strict';
 
 var RelayConcreteNode = require('../util/RelayConcreteNode');
 
-var RelayConnection = require('./RelayConnection');
-
 var RelayModernRecord = require('./RelayModernRecord');
 
 var RelayStoreUtils = require('./RelayStoreUtils');
@@ -24,7 +23,6 @@ var invariant = require("fbjs/lib/invariant");
 var CONDITION = RelayConcreteNode.CONDITION,
     CLIENT_EXTENSION = RelayConcreteNode.CLIENT_EXTENSION,
     DEFER = RelayConcreteNode.DEFER,
-    CONNECTION = RelayConcreteNode.CONNECTION,
     FRAGMENT_SPREAD = RelayConcreteNode.FRAGMENT_SPREAD,
     INLINE_FRAGMENT = RelayConcreteNode.INLINE_FRAGMENT,
     LINKED_FIELD = RelayConcreteNode.LINKED_FIELD,
@@ -36,11 +34,11 @@ var CONDITION = RelayConcreteNode.CONDITION,
 var getStorageKey = RelayStoreUtils.getStorageKey,
     getModuleOperationKey = RelayStoreUtils.getModuleOperationKey;
 
-function mark(recordSource, selector, references, connectionReferences, getConnectionEvents, operationLoader) {
+function mark(recordSource, selector, references, operationLoader) {
   var dataID = selector.dataID,
       node = selector.node,
       variables = selector.variables;
-  var marker = new RelayReferenceMarker(recordSource, variables, references, connectionReferences, getConnectionEvents, operationLoader);
+  var marker = new RelayReferenceMarker(recordSource, variables, references, operationLoader);
   marker.mark(node, dataID);
 }
 /**
@@ -48,15 +46,9 @@ function mark(recordSource, selector, references, connectionReferences, getConne
  */
 
 
-var RelayReferenceMarker =
-/*#__PURE__*/
-function () {
-  function RelayReferenceMarker(recordSource, variables, references, connectionReferences, getConnectionEvents, operationLoader) {
-    var _operationLoader;
-
-    this._connectionReferences = connectionReferences;
-    this._getConnectionEvents = getConnectionEvents;
-    this._operationLoader = (_operationLoader = operationLoader) !== null && _operationLoader !== void 0 ? _operationLoader : null;
+var RelayReferenceMarker = /*#__PURE__*/function () {
+  function RelayReferenceMarker(recordSource, variables, references, operationLoader) {
+    this._operationLoader = operationLoader !== null && operationLoader !== void 0 ? operationLoader : null;
     this._recordSource = recordSource;
     this._references = references;
     this._variables = variables;
@@ -161,11 +153,6 @@ function () {
 
           break;
 
-        case CONNECTION:
-          _this._traverseConnection(selection, record);
-
-          break;
-
         default:
           selection;
           !false ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayReferenceMarker: Unknown AST node `%s`.', selection) : invariant(false) : void 0;
@@ -173,43 +160,6 @@ function () {
     });
   };
 
-  _proto._traverseConnection = function _traverseConnection(connection, record) {
-    var _this2 = this;
-
-    var parentID = RelayModernRecord.getDataID(record);
-    var connectionID = RelayConnection.createConnectionID(parentID, connection.label);
-
-    if (this._connectionReferences.has(connectionID)) {
-      return;
-    }
-
-    this._connectionReferences.add(connectionID);
-
-    var connectionEvents = this._getConnectionEvents(connectionID);
-
-    if (connectionEvents == null || connectionEvents.length === 0) {
-      return;
-    }
-
-    connectionEvents.forEach(function (event) {
-      if (event.kind === 'fetch') {
-        event.edgeIDs.forEach(function (edgeID) {
-          if (edgeID != null) {
-            _this2._traverse(connection.edges, edgeID);
-          }
-        });
-      } else if (event.kind === 'insert') {
-        _this2._traverse(connection.edges, event.edgeID);
-      } else if (event.kind === 'stream.edge') {
-        _this2._traverse(connection.edges, event.edgeID);
-      } else if (event.kind === 'stream.pageInfo') {// no-op
-      } else {
-        event;
-        !false ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayReferenceMarker: Unexpected connection event kind `%s`.', event.kind) : invariant(false) : void 0;
-      }
-    });
-  };
-
   _proto._traverseModuleImport = function _traverseModuleImport(moduleImport, record) {
     var operationLoader = this._operationLoader;
     !(operationLoader !== null) ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayReferenceMarker: Expected an operationLoader to be configured when using `@module`.') : invariant(false) : void 0;
@@ -242,7 +192,7 @@ function () {
   };
 
   _proto._traversePluralLink = function _traversePluralLink(field, record) {
-    var _this3 = this;
+    var _this2 = this;
 
     var storageKey = getStorageKey(field, this._variables);
     var linkedIDs = RelayModernRecord.getLinkedRecordIDs(record, storageKey);
@@ -253,7 +203,7 @@ function () {
 
     linkedIDs.forEach(function (linkedID) {
       if (linkedID != null) {
-        _this3._traverse(field, linkedID);
+        _this2._traverse(field, linkedID);
       }
     });
   };

package/lib/store/RelayResponseNormalizer.js

@@ -7,16 +7,13 @@
  * 
  * @format
  */
+// flowlint ambiguous-object-type:error
 'use strict';
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
-var RelayConnection = require('./RelayConnection');
-
-var RelayConnectionInterface = require('../handlers/connection/RelayConnectionInterface');
-
 var RelayModernRecord = require('./RelayModernRecord');
 
 var RelayProfiler = require('../util/RelayProfiler');
@@ -29,7 +26,6 @@ var _require = require('../util/RelayConcreteNode'),
     CONDITION = _require.CONDITION,
     CLIENT_EXTENSION = _require.CLIENT_EXTENSION,
     DEFER = _require.DEFER,
-    CONNECTION = _require.CONNECTION,
     INLINE_FRAGMENT = _require.INLINE_FRAGMENT,
     LINKED_FIELD = _require.LINKED_FIELD,
     LINKED_HANDLE = _require.LINKED_HANDLE,
@@ -46,13 +42,13 @@ var _require3 = require('./RelayModernSelector'),
     createNormalizationSelector = _require3.createNormalizationSelector;
 
 var _require4 = require('./RelayStoreUtils'),
-    formatStorageKey = _require4.formatStorageKey,
     getArgumentValues = _require4.getArgumentValues,
     getHandleStorageKey = _require4.getHandleStorageKey,
     getModuleComponentKey = _require4.getModuleComponentKey,
     getModuleOperationKey = _require4.getModuleOperationKey,
     getStorageKey = _require4.getStorageKey,
-    TYPENAME_KEY = _require4.TYPENAME_KEY;
+    TYPENAME_KEY = _require4.TYPENAME_KEY,
+    ROOT_ID = _require4.ROOT_ID;
 
 /**
  * Normalizes the results of a query and standard GraphQL response, writing the
@@ -72,13 +68,11 @@ function normalize(recordSource, selector, response, options) {
  */
 
 
-var RelayResponseNormalizer =
-/*#__PURE__*/
-function () {
+var RelayResponseNormalizer = /*#__PURE__*/function () {
   function RelayResponseNormalizer(recordSource, variables, options) {
-    this._connectionEvents = [];
     this._getDataId = options.getDataID;
     this._handleFieldPayloads = [];
+    this._treatMissingFieldsAsNull = options.treatMissingFieldsAsNull;
     this._incrementalPlaceholders = [];
     this._isClientExtension = false;
     this._moduleImportPayloads = [];
@@ -98,12 +92,12 @@ function () {
     this._traverseSelections(node, record, data);
 
     return {
-      connectionEvents: this._connectionEvents,
       errors: null,
       fieldPayloads: this._handleFieldPayloads,
       incrementalPlaceholders: this._incrementalPlaceholders,
       moduleImportPayloads: this._moduleImportPayloads,
-      source: this._recordSource
+      source: this._recordSource,
+      isFinal: false
     };
   };
 
@@ -187,11 +181,6 @@ function () {
           this._isClientExtension = isClientExtension;
           break;
 
-        case CONNECTION:
-          this._normalizeConnection(node, selection, record, data);
-
-          break;
-
         default:
           selection;
           !false ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayResponseNormalizer(): Unexpected ast kind `%s`.', selection.kind) : invariant(false) : void 0;
@@ -251,16 +240,14 @@ function () {
   };
 
   _proto._normalizeModuleImport = function _normalizeModuleImport(parent, moduleImport, record, data) {
-    var _componentReference, _operationReference;
-
     !(typeof data === 'object' && data) ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayResponseNormalizer: Expected data for @module to be an object.') : invariant(false) : void 0;
     var typeName = RelayModernRecord.getType(record);
     var componentKey = getModuleComponentKey(moduleImport.documentName);
     var componentReference = data[componentKey];
-    RelayModernRecord.setValue(record, componentKey, (_componentReference = componentReference) !== null && _componentReference !== void 0 ? _componentReference : null);
+    RelayModernRecord.setValue(record, componentKey, componentReference !== null && componentReference !== void 0 ? componentReference : null);
     var operationKey = getModuleOperationKey(moduleImport.documentName);
     var operationReference = data[operationKey];
-    RelayModernRecord.setValue(record, operationKey, (_operationReference = operationReference) !== null && _operationReference !== void 0 ? _operationReference : null);
+    RelayModernRecord.setValue(record, operationKey, operationReference !== null && operationReference !== void 0 ? operationReference : null);
 
     if (operationReference != null) {
       this._moduleImportPayloads.push({
@@ -272,122 +259,6 @@ function () {
         variables: this._variables
       });
     }
-  }
-  /**
-   * Connections are represented in the AST as a LinkedField (with connection-
-   * specific args like after/first stripped) that wraps any metadata fields
-   * such as count, plus a Connection node that represents the page of data
-   * being fetched (the edges + pageInfo). The outer LinkedField is normalized
-   * like any other, and the Connection field is normalized by synthesizing
-   * a record to represent the page that was fetched and normalizing the edges
-   * and pageInfo into that page record - as well as recording a "fetch" event.
-   */
-  ;
-
-  _proto._normalizeConnection = function _normalizeConnection(parent, selection, record, data) {
-    // Normalize the data for the page
-    var parentID = RelayModernRecord.getDataID(record);
-    var args = selection.args != null ? getArgumentValues(selection.args, this._variables) : {};
-    var pageStorageKey = formatStorageKey('__connection_page', args);
-    var pageID = generateClientID(parentID, pageStorageKey);
-
-    var pageRecord = this._recordSource.get(pageID);
-
-    if (pageRecord == null) {
-      pageRecord = RelayModernRecord.create(pageID, '__ConnectionPage');
-
-      this._recordSource.set(pageID, pageRecord);
-    }
-
-    RelayModernRecord.setLinkedRecordID(record, pageStorageKey, pageID);
-
-    this._normalizeField(parent, selection.edges, pageRecord, data);
-
-    this._normalizeField(parent, selection.pageInfo, pageRecord, data); // Construct a "fetch" connection event
-
-
-    var connectionID = RelayConnection.createConnectionID(parentID, selection.label);
-
-    var _RelayConnectionInter = RelayConnectionInterface.get(),
-        EDGES = _RelayConnectionInter.EDGES,
-        END_CURSOR = _RelayConnectionInter.END_CURSOR,
-        HAS_NEXT_PAGE = _RelayConnectionInter.HAS_NEXT_PAGE,
-        HAS_PREV_PAGE = _RelayConnectionInter.HAS_PREV_PAGE,
-        PAGE_INFO = _RelayConnectionInter.PAGE_INFO,
-        START_CURSOR = _RelayConnectionInter.START_CURSOR;
-
-    var edgeIDs = RelayModernRecord.getLinkedRecordIDs(pageRecord, EDGES);
-
-    if (edgeIDs == null) {
-      return;
-    }
-
-    var pageInfoID = RelayModernRecord.getLinkedRecordID(pageRecord, PAGE_INFO);
-    var pageInfoRecord = pageInfoID != null ? this._recordSource.get(pageInfoID) : null;
-    var endCursor;
-    var hasNextPage;
-    var hasPrevPage;
-    var startCursor;
-
-    if (pageInfoRecord != null) {
-      endCursor = RelayModernRecord.getValue(pageInfoRecord, END_CURSOR);
-      hasNextPage = RelayModernRecord.getValue(pageInfoRecord, HAS_NEXT_PAGE);
-      hasPrevPage = RelayModernRecord.getValue(pageInfoRecord, HAS_PREV_PAGE);
-      startCursor = RelayModernRecord.getValue(pageInfoRecord, START_CURSOR);
-    } // If streaming is enabled, also emit incremental placeholders for the
-    // edges and pageInfo
-
-
-    var stream = selection.stream;
-    var enableStream = stream != null ? stream["if"].kind === 'Variable' ? this._variables[stream["if"].variableName] : stream["if"].value : false;
-
-    if (stream != null && enableStream === true) {
-      this._incrementalPlaceholders.push({
-        kind: 'connection_edge',
-        args: args,
-        connectionID: connectionID,
-        label: stream.streamLabel,
-        path: (0, _toConsumableArray2["default"])(this._path),
-        parentID: pageID,
-        node: selection.edges,
-        variables: this._variables
-      });
-
-      this._incrementalPlaceholders.push({
-        kind: 'connection_page_info',
-        args: args,
-        connectionID: connectionID,
-        data: data,
-        label: stream.deferLabel,
-        path: (0, _toConsumableArray2["default"])(this._path),
-        selector: createNormalizationSelector({
-          alias: null,
-          args: null,
-          concreteType: RelayModernRecord.getType(pageRecord),
-          kind: 'LinkedField',
-          name: '',
-          plural: false,
-          selections: [selection.pageInfo],
-          storageKey: null
-        }, pageID, this._variables),
-        typeName: RelayModernRecord.getType(pageRecord)
-      });
-    }
-
-    this._connectionEvents.push({
-      kind: 'fetch',
-      connectionID: connectionID,
-      args: args,
-      edgeIDs: edgeIDs,
-      pageInfo: {
-        endCursor: typeof endCursor === 'string' ? endCursor : null,
-        startCursor: typeof startCursor === 'string' ? startCursor : null,
-        hasNextPage: typeof hasNextPage === 'boolean' ? hasNextPage : null,
-        hasPrevPage: typeof hasPrevPage === 'boolean' ? hasPrevPage : null
-      },
-      request: this._request,
-      stream: enableStream === true
-    });
   };
 
   _proto._normalizeField = function _normalizeField(parent, selection, record, data) {
@@ -397,7 +268,7 @@ function () {
     var fieldValue = data[responseKey];
 
     if (fieldValue == null) {
-      if (fieldValue === undefined) {
+      if (!this._treatMissingFieldsAsNull && fieldValue === undefined) {
         // Fields that are missing in the response are not set on the record.
         // There are three main cases where this can occur:
         // - Inside a client extension: the server will not generally return
@@ -540,14 +411,14 @@ function () {
     var _field$concreteType3;
 
     var typeName = (_field$concreteType3 = field.concreteType) !== null && _field$concreteType3 !== void 0 ? _field$concreteType3 : this._getRecordType(payload);
-    process.env.NODE_ENV !== "production" ? warning(isClientID(RelayModernRecord.getDataID(record)) || 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.', RelayModernRecord.getDataID(record), TYPENAME_KEY, RelayModernRecord.getType(record), typeName) : void 0;
+    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;
   };
 
   return RelayResponseNormalizer;
-}(); // eslint-disable-next-line no-func-assign
-
+}();
 
-normalize = RelayProfiler.instrument('RelayResponseNormalizer.normalize', normalize);
+var instrumentedNormalize = RelayProfiler.instrument('RelayResponseNormalizer.normalize', normalize);
 module.exports = {
-  normalize: normalize
+  normalize: instrumentedNormalize
 };

package/lib/store/RelayStoreTypes.js

@@ -7,4 +7,5 @@
  * 
  * @format
  */
+// flowlint ambiguous-object-type:error
 'use strict';

package/lib/store/RelayStoreUtils.js

@@ -7,6 +7,7 @@
  * 
  * @format
  */
+// flowlint ambiguous-object-type:error
 'use strict';
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
@@ -21,24 +22,44 @@ var invariant = require("fbjs/lib/invariant");
 
 var stableCopy = require('../util/stableCopy');
 
-var VARIABLE = RelayConcreteNode.VARIABLE;
+var VARIABLE = RelayConcreteNode.VARIABLE,
+    LITERAL = RelayConcreteNode.LITERAL,
+    OBJECT_VALUE = RelayConcreteNode.OBJECT_VALUE,
+    LIST_VALUE = RelayConcreteNode.LIST_VALUE;
 var MODULE_COMPONENT_KEY_PREFIX = '__module_component_';
 var MODULE_OPERATION_KEY_PREFIX = '__module_operation_';
+
+function getArgumentValue(arg, variables) {
+  if (arg.kind === VARIABLE) {
+    // Variables are provided at runtime and are not guaranteed to be stable.
+    return getStableVariableValue(arg.variableName, variables);
+  } else if (arg.kind === LITERAL) {
+    // The Relay compiler generates stable ConcreteArgument values.
+    return arg.value;
+  } else if (arg.kind === OBJECT_VALUE) {
+    var value = {};
+    arg.fields.forEach(function (field) {
+      value[field.name] = getArgumentValue(field, variables);
+    });
+    return value;
+  } else if (arg.kind === LIST_VALUE) {
+    var _value = [];
+    arg.items.forEach(function (item) {
+      item != null ? _value.push(getArgumentValue(item, variables)) : null;
+    });
+    return _value;
+  }
+}
 /**
  * Returns the values of field/fragment arguments as an object keyed by argument
  * names. Guaranteed to return a result with stable ordered nested values.
  */
 
+
 function getArgumentValues(args, variables) {
   var values = {};
   args.forEach(function (arg) {
-    if (arg.kind === VARIABLE) {
-      // Variables are provided at runtime and are not guaranteed to be stable.
-      values[arg.name] = getStableVariableValue(arg.variableName, variables);
-    } else {
-      // The Relay compiler generates stable ConcreteArgument values.
-      values[arg.name] = arg.value;
-    }
+    values[arg.name] = getArgumentValue(arg, variables);
   });
   return values;
 }
@@ -138,8 +159,9 @@ function formatStorageKey(name, argValues) {
       var value = argValues[argName];
 
       if (value != null) {
-        // $FlowFixMe(>=0.95.0) JSON.stringify can return undefined
-        values.push(argName + ':' + JSON.stringify(value));
+        var _JSON$stringify;
+
+        values.push(argName + ':' + ((_JSON$stringify = JSON.stringify(value)) !== null && _JSON$stringify !== void 0 ? _JSON$stringify : 'undefined'));
       }
     }
   }
@@ -181,7 +203,9 @@ var RelayStoreUtils = {
   ROOT_ID: 'client:root',
   ROOT_TYPE: '__Root',
   TYPENAME_KEY: '__typename',
+  INVALIDATED_AT_KEY: '__invalidated_at',
   formatStorageKey: formatStorageKey,
+  getArgumentValue: getArgumentValue,
   getArgumentValues: getArgumentValues,
   getHandleStorageKey: getHandleStorageKey,
   getStorageKey: getStorageKey,

package/lib/store/StoreInspector.js

@@ -8,14 +8,19 @@
  * @format
  * @emails oncall+relay
  */
+// flowlint ambiguous-object-type:error
 'use strict';
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
+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 inspect = function inspect() {};
 
 if (process.env.NODE_ENV !== "production") {
@@ -133,7 +138,7 @@ if (process.env.NODE_ENV !== "production") {
       return record;
     }
 
-    return new Proxy((0, _objectSpread2["default"])({}, record), {
+    return new Proxy(_objectSpread({}, record), {
       get: function get(target, prop) {
         var value = target[prop];
 
@@ -147,6 +152,9 @@ if (process.env.NODE_ENV !== "production") {
           }
 
           if (Array.isArray(value.__refs)) {
+            /* $FlowFixMe(>=0.111.0) This comment suppresses an error found
+             * when Flow v0.111.0 was deployed. To see the error, delete this
+             * comment and run Flow. */
             return value.__refs.map(function (ref) {
               return getWrappedRecord(source, ref);
             });
@@ -159,10 +167,8 @@ if (process.env.NODE_ENV !== "production") {
   };
 
   inspect = function inspect(environment, dataID) {
-    var _dataID;
-
     installDevtoolFormatters();
-    return getWrappedRecord(environment.getStore().getSource(), (_dataID = dataID) !== null && _dataID !== void 0 ? _dataID : 'client:root');
+    return getWrappedRecord(environment.getStore().getSource(), dataID !== null && dataID !== void 0 ? dataID : 'client:root');
   };
 }
 

package/lib/store/ViewerPattern.js

@@ -7,6 +7,7 @@
  * 
  * @format
  */
+// flowlint ambiguous-object-type:error
 'use strict';
 
 var _require = require('./ClientID'),

package/lib/store/cloneRelayHandleSourceField.js

@@ -7,6 +7,7 @@
  * 
  * @format
  */
+// flowlint ambiguous-object-type:error
 'use strict';
 
 var areEqual = require("fbjs/lib/areEqual");

package/lib/store/createFragmentSpecResolver.js

@@ -7,6 +7,7 @@
  * 
  * @format
  */
+// flowlint ambiguous-object-type:error
 'use strict';
 
 var RelayModernFragmentSpecResolver = require('./RelayModernFragmentSpecResolver');

package/lib/store/createRelayContext.js

@@ -7,6 +7,7 @@
  * 
  * @format
  */
+// flowlint ambiguous-object-type:error
 'use strict';
 
 var invariant = require("fbjs/lib/invariant");

package/lib/store/defaultGetDataID.js

@@ -7,6 +7,7 @@
  * 
  * @format
  */
+// flowlint ambiguous-object-type:error
 'use strict';
 
 var _require = require('./ViewerPattern'),

package/lib/store/hasOverlappingIDs.js

@@ -7,6 +7,7 @@
  * 
  * @format
  */
+// flowlint ambiguous-object-type:error
 'use strict';
 
 var hasOwnProperty = Object.prototype.hasOwnProperty;

package/lib/store/isRelayModernEnvironment.js

@@ -7,6 +7,7 @@
  * 
  * @format
  */
+// flowlint ambiguous-object-type:error
 'use strict';
 /**
  * Determine if a given value is an object that implements the `Environment`

package/lib/store/normalizeRelayPayload.js

@@ -7,11 +7,16 @@
  * 
  * @format
  */
+// flowlint ambiguous-object-type:error
 'use strict';
 
 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 RelayModernRecord = require('./RelayModernRecord');
 
@@ -20,14 +25,13 @@ var RelayRecordSource = require('./RelayRecordSource');
 var RelayResponseNormalizer = require('./RelayResponseNormalizer');
 
 var _require = require('./RelayStoreUtils'),
-    ROOT_ID = _require.ROOT_ID,
     ROOT_TYPE = _require.ROOT_TYPE;
 
 function normalizeRelayPayload(selector, payload, errors, options) {
   var source = RelayRecordSource.create();
-  source.set(ROOT_ID, RelayModernRecord.create(ROOT_ID, ROOT_TYPE));
+  source.set(selector.dataID, RelayModernRecord.create(selector.dataID, ROOT_TYPE));
   var relayPayload = RelayResponseNormalizer.normalize(source, selector, payload, options);
-  return (0, _objectSpread2["default"])({}, relayPayload, {
+  return _objectSpread({}, relayPayload, {
     errors: errors
   });
 }

package/lib/store/readInlineData.js

@@ -7,11 +7,12 @@
  * 
  * @format
  */
+// flowlint ambiguous-object-type:error
 'use strict';
 
 var invariant = require("fbjs/lib/invariant");
 
-var _require = require('../query/RelayModernGraphQLTag'),
+var _require = require('../query/GraphQLTag'),
     getInlineDataFragment = _require.getInlineDataFragment;
 
 var _require2 = require('./RelayStoreUtils'),

package/lib/subscription/requestSubscription.js

@@ -7,13 +7,14 @@
  * 
  * @format
  */
+// flowlint ambiguous-object-type:error
 'use strict';
 
 var RelayDeclarativeMutationConfig = require('../mutations/RelayDeclarativeMutationConfig');
 
 var warning = require("fbjs/lib/warning");
 
-var _require = require('../query/RelayModernGraphQLTag'),
+var _require = require('../query/GraphQLTag'),
     getRequest = _require.getRequest;
 
 var _require2 = require('../store/RelayModernOperationDescriptor'),
@@ -30,7 +31,8 @@ function requestSubscription(environment, config) {
       onCompleted = config.onCompleted,
       onError = config.onError,
       onNext = config.onNext,
-      variables = config.variables;
+      variables = config.variables,
+      cacheConfig = config.cacheConfig;
   var operation = createOperationDescriptor(subscription, variables);
   process.env.NODE_ENV !== "production" ? warning(!(config.updater && configs), 'requestSubscription: Expected only one of `updater` and `configs` to be provided') : void 0;
 
@@ -41,7 +43,8 @@ function requestSubscription(environment, config) {
 
   var sub = environment.execute({
     operation: operation,
-    updater: updater
+    updater: updater,
+    cacheConfig: cacheConfig
   }).map(function () {
     var data = environment.lookup(operation.fragment).data; // $FlowFixMe