relay-runtime 1.7.0-rc.1 → 2.0.0

package/lib/RelayModernSelector.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,7 +7,6 @@
  * 
  * @format
  */
-
 'use strict';
 
 /**
@@ -40,22 +39,49 @@
  * ```
  */
 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];
+  !(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];
+
   if (typeof dataID === 'string' && typeof fragments === 'object' && fragments !== null && typeof fragments[fragment.name] === 'object' && fragments[fragment.name] !== null) {
     var argumentVariables = fragments[fragment.name];
-    var fragmentVariables = require('./RelayConcreteVariables').getFragmentVariables(fragment, operationVariables, argumentVariables);
+
+    if (owner != null && typeof owner === 'object') {
+      // $FlowFixMe - TODO T39154660
+      var typedOwner = owner;
+      var ownerOperationVariables = typedOwner.variables;
+
+      var _fragmentVariables = require("./RelayConcreteVariables").getFragmentVariables(fragment, ownerOperationVariables, argumentVariables);
+
+      return {
+        owner: typedOwner,
+        selector: {
+          dataID: dataID,
+          node: fragment,
+          variables: _fragmentVariables
+        }
+      };
+    }
+
+    var fragmentVariables = require("./RelayConcreteVariables").getFragmentVariables(fragment, operationVariables, argumentVariables);
+
     return {
-      dataID: dataID,
-      node: fragment,
-      variables: fragmentVariables
+      owner: null,
+      selector: {
+        dataID: dataID,
+        node: fragment,
+        variables: fragmentVariables
+      }
     };
   }
-  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" ? 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;
   return null;
 }
-
 /**
  * @public
  *
@@ -64,10 +90,13 @@ function getSelector(operationVariables, fragment, item) {
  * items. This is similar to `getSelector` but for "plural" fragments that
  * expect an array of results and therefore return an array of selectors.
  */
+
+
 function getSelectorList(operationVariables, fragment, items) {
   var selectors = null;
   items.forEach(function (item) {
     var selector = item != null ? getSelector(operationVariables, fragment, item) : null;
+
     if (selector != null) {
       selectors = selectors || [];
       selectors.push(selector);
@@ -75,7 +104,6 @@ function getSelectorList(operationVariables, fragment, items) {
   });
   return selectors;
 }
-
 /**
  * @public
  *
@@ -86,26 +114,30 @@ function getSelectorList(operationVariables, fragment, items) {
  * uses this function to convert (props, fragments) into selectors so that it
  * can read the results to pass to the inner component.
  */
+
+
 function getSelectorsFromObject(operationVariables, fragments, object) {
   var selectors = {};
+
   for (var _key in fragments) {
     if (fragments.hasOwnProperty(_key)) {
       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;
+        !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);
       } 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;
+        !!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);
       }
     }
   }
+
   return selectors;
 }
-
 /**
  * @public
  *
@@ -115,33 +147,40 @@ function getSelectorsFromObject(operationVariables, fragments, object) {
  * Similar to `getSelectorsFromObject()`, this function can be useful in
  * determining the "identity" of the props passed to a component.
  */
+
+
 function getDataIDsFromObject(fragments, object) {
   var ids = {};
+
   for (var _key2 in fragments) {
     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;
+        !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;
+        !!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);
       }
     }
   }
+
   return ids;
 }
-
 /**
  * @internal
  */
+
+
 function getDataIDs(fragment, items) {
-  var ids = void 0;
+  var ids;
   items.forEach(function (item) {
     var id = item != null ? getDataID(fragment, item) : null;
+
     if (id != null) {
       ids = ids || [];
       ids.push(id);
@@ -149,20 +188,23 @@ function getDataIDs(fragment, items) {
   });
   return ids || null;
 }
-
 /**
  * @internal
  */
+
+
 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" ? 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];
+
   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" ? 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;
   return null;
 }
-
 /**
  * @public
  *
@@ -173,48 +215,60 @@ function getDataID(fragment, item) {
  * This can be useful in determing what varaibles were used to fetch the data
  * for a Relay container, for example.
  */
+
+
 function getVariablesFromObject(operationVariables, fragments, object) {
   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';
+          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;
+          !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;
+          !!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);
           }
         }
       }();
 
-      if (_ret === 'continue') continue;
+      if (_ret === "continue") continue;
     }
   }
+
   return variables;
 }
-
 /**
  * @internal
  */
+
+
 function getVariables(operationVariables, fragment, item) {
-  var selector = getSelector(operationVariables, fragment, item);
-  return selector ? selector.variables : null;
-}
+  var ownedSelector = getSelector(operationVariables, fragment, item);
+
+  if (!ownedSelector) {
+    return null;
+  }
 
+  return ownedSelector.selector.variables;
+}
 /**
  * @public
  *
@@ -222,8 +276,10 @@ function getVariables(operationVariables, fragment, item) {
  * that this function returns `false` when the two queries/fragments are
  * different objects, even if they select the same fields.
  */
+
+
 function areEqualSelectors(thisSelector, thatSelector) {
-  return thisSelector.dataID === thatSelector.dataID && thisSelector.node === thatSelector.node && require('fbjs/lib/areEqual')(thisSelector.variables, thatSelector.variables);
+  return thisSelector.selector.dataID === thatSelector.selector.dataID && thisSelector.selector.node === thatSelector.selector.node && require("fbjs/lib/areEqual")(thisSelector.selector.variables, thatSelector.selector.variables);
 }
 
 module.exports = {

package/lib/RelayModernStore.js

@@ -0,0 +1,301 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ *  strict-local
+ * @format
+ */
+'use strict';
+
+var _objectSpread2 = require("@babel/runtime/helpers/interopRequireDefault")(require("@babel/runtime/helpers/objectSpread"));
+
+/**
+ * @public
+ *
+ * An implementation of the `Store` interface defined in `RelayStoreTypes`.
+ *
+ * Note that a Store takes ownership of all records provided to it: other
+ * objects may continue to hold a reference to such records but may not mutate
+ * them. The static Relay core is architected to avoid mutating records that may have been
+ * passed to a store: operations that mutate records will either create fresh
+ * records or clone existing records and modify the clones. Record immutability
+ * is also enforced in development mode by freezing all records passed to a store.
+ */
+var RelayModernStore =
+/*#__PURE__*/
+function () {
+  function RelayModernStore(source) {
+    var gcScheduler = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : require("fbjs/lib/resolveImmediate");
+    var operationLoader = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
+
+    // Prevent mutation of a record from outside the store.
+    if (process.env.NODE_ENV !== "production") {
+      var storeIDs = source.getRecordIDs();
+
+      for (var ii = 0; ii < storeIDs.length; ii++) {
+        var record = source.get(storeIDs[ii]);
+
+        if (record) {
+          require("./RelayModernRecord").freeze(record);
+        }
+      }
+    }
+
+    this._gcScheduler = gcScheduler;
+    this._hasScheduledGC = false;
+    this._index = 0;
+    this._operationLoader = operationLoader;
+    this._recordSource = source;
+    this._roots = new Map();
+    this._subscriptions = new Set();
+    this._updatedRecordIDs = {};
+    this._gcHoldCounter = 0;
+    this._shouldScheduleGC = false;
+  }
+
+  var _proto = RelayModernStore.prototype;
+
+  _proto.getSource = function getSource() {
+    return this._recordSource;
+  };
+
+  _proto.check = function check(selector) {
+    return require("./DataChecker").check(this._recordSource, this._recordSource, selector, [], this._operationLoader);
+  };
+
+  _proto.retain = function retain(selector) {
+    var _this = this;
+
+    var index = this._index++;
+
+    var dispose = function dispose() {
+      _this._roots["delete"](index);
+
+      _this._scheduleGC();
+    };
+
+    this._roots.set(index, selector);
+
+    return {
+      dispose: dispose
+    };
+  };
+
+  _proto.lookup = function lookup(selector, owner) {
+    var snapshot = require("./RelayReader").read(this._recordSource, selector, owner);
+
+    if (process.env.NODE_ENV !== "production") {
+      require("./deepFreeze")(snapshot);
+    }
+
+    return snapshot;
+  };
+
+  _proto.notify = function notify() {
+    var _this2 = this;
+
+    this._subscriptions.forEach(function (subscription) {
+      _this2._updateSubscription(subscription);
+    });
+
+    this._updatedRecordIDs = {};
+  };
+
+  _proto.publish = function publish(source) {
+    updateTargetFromSource(this._recordSource, source, this._updatedRecordIDs);
+  };
+
+  _proto.subscribe = function subscribe(snapshot, callback) {
+    var _this3 = this;
+
+    var subscription = {
+      callback: callback,
+      snapshot: snapshot
+    };
+
+    var dispose = function dispose() {
+      _this3._subscriptions["delete"](subscription);
+    };
+
+    this._subscriptions.add(subscription);
+
+    return {
+      dispose: dispose
+    };
+  };
+
+  _proto.holdGC = function holdGC() {
+    var _this4 = this;
+
+    this._gcHoldCounter++;
+
+    var dispose = function dispose() {
+      if (_this4._gcHoldCounter > 0) {
+        _this4._gcHoldCounter--;
+
+        if (_this4._gcHoldCounter === 0 && _this4._shouldScheduleGC) {
+          _this4._scheduleGC();
+
+          _this4._shouldScheduleGC = false;
+        }
+      }
+    };
+
+    return {
+      dispose: dispose
+    };
+  };
+
+  _proto.toJSON = function toJSON() {
+    return 'RelayModernStore()';
+  }; // Internal API
+
+
+  _proto.__getUpdatedRecordIDs = function __getUpdatedRecordIDs() {
+    return this._updatedRecordIDs;
+  };
+
+  _proto._updateSubscription = function _updateSubscription(subscription) {
+    var callback = subscription.callback,
+        snapshot = subscription.snapshot;
+
+    if (!require("./hasOverlappingIDs")(snapshot, this._updatedRecordIDs)) {
+      return;
+    }
+
+    var _RelayReader$read = require("./RelayReader").read(this._recordSource, snapshot, snapshot.owner),
+        data = _RelayReader$read.data,
+        seenRecords = _RelayReader$read.seenRecords;
+
+    var nextData = require("./recycleNodesInto")(snapshot.data, data);
+
+    var nextSnapshot = (0, _objectSpread2["default"])({}, snapshot, {
+      data: nextData,
+      seenRecords: seenRecords
+    });
+
+    if (process.env.NODE_ENV !== "production") {
+      require("./deepFreeze")(nextSnapshot);
+    }
+
+    subscription.snapshot = nextSnapshot;
+
+    if (nextSnapshot.data !== snapshot.data) {
+      callback(nextSnapshot);
+    }
+  };
+
+  _proto._scheduleGC = function _scheduleGC() {
+    var _this5 = this;
+
+    if (this._gcHoldCounter > 0) {
+      this._shouldScheduleGC = true;
+      return;
+    }
+
+    if (this._hasScheduledGC) {
+      return;
+    }
+
+    this._hasScheduledGC = true;
+
+    this._gcScheduler(function () {
+      _this5.__gc();
+
+      _this5._hasScheduledGC = false;
+    });
+  };
+
+  _proto.__gc = function __gc() {
+    var _this6 = this;
+
+    var references = new Set(); // Mark all records that are traversable from a root
+
+    this._roots.forEach(function (selector) {
+      require("./RelayReferenceMarker").mark(_this6._recordSource, selector, references, _this6._operationLoader);
+    }); // Short-circuit if *nothing* is referenced
+
+
+    if (!references.size) {
+      this._recordSource.clear();
+
+      return;
+    } // Evict any unreferenced nodes
+
+
+    var storeIDs = this._recordSource.getRecordIDs();
+
+    for (var ii = 0; ii < storeIDs.length; ii++) {
+      var dataID = storeIDs[ii];
+
+      if (!references.has(dataID)) {
+        this._recordSource.remove(dataID);
+      }
+    }
+  };
+
+  return RelayModernStore;
+}();
+/**
+ * Updates the target with information from source, also updating a mapping of
+ * which records in the target were changed as a result.
+ */
+
+
+function updateTargetFromSource(target, source, updatedRecordIDs) {
+  var dataIDs = source.getRecordIDs();
+
+  for (var ii = 0; ii < dataIDs.length; ii++) {
+    var dataID = dataIDs[ii];
+    var sourceRecord = source.get(dataID);
+    var targetRecord = target.get(dataID); // Prevent mutation of a record from outside the store.
+
+    if (process.env.NODE_ENV !== "production") {
+      if (sourceRecord) {
+        require("./RelayModernRecord").freeze(sourceRecord);
+      }
+    }
+
+    if (sourceRecord === require("./RelayStoreUtils").UNPUBLISH_RECORD_SENTINEL) {
+      // Unpublish a record
+      target.remove(dataID);
+      updatedRecordIDs[dataID] = true;
+    } else if (sourceRecord && targetRecord) {
+      var nextRecord = require("./RelayModernRecord").update(targetRecord, sourceRecord);
+
+      if (nextRecord !== targetRecord) {
+        // Prevent mutation of a record from outside the store.
+        if (process.env.NODE_ENV !== "production") {
+          require("./RelayModernRecord").freeze(nextRecord);
+        }
+
+        updatedRecordIDs[dataID] = true;
+        target.set(dataID, nextRecord);
+      }
+    } else if (sourceRecord === null) {
+      target["delete"](dataID);
+
+      if (targetRecord !== null) {
+        updatedRecordIDs[dataID] = true;
+      }
+    } else if (sourceRecord) {
+      target.set(dataID, sourceRecord);
+      updatedRecordIDs[dataID] = true;
+    } // don't add explicit undefined
+
+  }
+}
+
+require("./RelayProfiler").instrumentMethods(RelayModernStore.prototype, {
+  lookup: 'RelayModernStore.prototype.lookup',
+  notify: 'RelayModernStore.prototype.notify',
+  publish: 'RelayModernStore.prototype.publish',
+  retain: 'RelayModernStore.prototype.retain',
+  subscribe: 'RelayModernStore.prototype.subscribe',
+  __gc: 'RelayModernStore.prototype.__gc',
+  holdGC: 'RelayModernStore.prototype.holdGC'
+});
+
+module.exports = RelayModernStore;

package/lib/RelayNetwork.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,7 +7,6 @@
  *  strict-local
  * @format
  */
-
 'use strict';
 
 /**
@@ -16,45 +15,34 @@
  */
 function create(fetchFn, subscribeFn) {
   // Convert to functions that returns RelayObservable.
-  var observeFetch = require('./ConvertToExecuteFunction').convertFetch(fetchFn);
-  var observeSubscribe = subscribeFn ? require('./ConvertToExecuteFunction').convertSubscribe(subscribeFn) : undefined;
-  var observeSubscribeWithEvents = subscribeFn ? require('./ConvertToExecuteFunction').convertSubscribeWithEvents(subscribeFn) : undefined;
+  var observeFetch = require("./ConvertToExecuteFunction").convertFetch(fetchFn);
+
+  var observeSubscribe = subscribeFn ? require("./ConvertToExecuteFunction").convertSubscribe(subscribeFn) : undefined;
 
   function execute(request, variables, cacheConfig, uploadables) {
     if (request.operationKind === 'subscription') {
-      !observeSubscribe ? process.env.NODE_ENV !== 'production' ? require('fbjs/lib/invariant')(false, 'RelayNetwork: This network layer does not support Subscriptions. ' + 'To use Subscriptions, provide a custom network layer.') : require('fbjs/lib/invariant')(false) : void 0;
-
-      !!uploadables ? process.env.NODE_ENV !== 'production' ? require('fbjs/lib/invariant')(false, 'RelayNetwork: Cannot provide uploadables while subscribing.') : require('fbjs/lib/invariant')(false) : void 0;
+      !observeSubscribe ? process.env.NODE_ENV !== "production" ? require("fbjs/lib/invariant")(false, 'RelayNetwork: This network layer does not support Subscriptions. ' + 'To use Subscriptions, provide a custom network layer.') : require("fbjs/lib/invariant")(false) : void 0;
+      !!uploadables ? process.env.NODE_ENV !== "production" ? require("fbjs/lib/invariant")(false, 'RelayNetwork: Cannot provide uploadables while subscribing.') : require("fbjs/lib/invariant")(false) : void 0;
       return observeSubscribe(request, variables, cacheConfig);
     }
 
     var pollInterval = cacheConfig.poll;
-    if (pollInterval != null) {
-      !!uploadables ? process.env.NODE_ENV !== 'production' ? require('fbjs/lib/invariant')(false, 'RelayNetwork: Cannot provide uploadables while polling.') : require('fbjs/lib/invariant')(false) : void 0;
-      return observeFetch(request, variables, { force: true }).poll(pollInterval);
-    }
 
-    return observeFetch(request, variables, cacheConfig, uploadables);
-  }
-
-  function executeWithEvents(request, variables, cacheConfig, uploadables) {
-    if (request.operationKind === 'subscription') {
-      !observeSubscribeWithEvents ? process.env.NODE_ENV !== 'production' ? require('fbjs/lib/invariant')(false, 'RelayNetwork: This network layer does not support Subscriptions. ' + 'To use Subscriptions, provide a custom network layer.') : require('fbjs/lib/invariant')(false) : void 0;
-
-      !!uploadables ? process.env.NODE_ENV !== 'production' ? require('fbjs/lib/invariant')(false, 'RelayNetwork: Cannot provide uploadables while subscribing.') : require('fbjs/lib/invariant')(false) : void 0;
-      return observeSubscribeWithEvents(request, variables, cacheConfig);
-    }
-
-    var pollInterval = cacheConfig.poll;
     if (pollInterval != null) {
-      !!uploadables ? process.env.NODE_ENV !== 'production' ? require('fbjs/lib/invariant')(false, 'RelayNetwork: Cannot provide uploadables while polling.') : require('fbjs/lib/invariant')(false) : void 0;
-      return observeFetch(request, variables, { force: true }).poll(pollInterval);
+      !!uploadables ? process.env.NODE_ENV !== "production" ? require("fbjs/lib/invariant")(false, 'RelayNetwork: Cannot provide uploadables while polling.') : require("fbjs/lib/invariant")(false) : void 0;
+      return observeFetch(request, variables, {
+        force: true
+      }).poll(pollInterval);
     }
 
     return observeFetch(request, variables, cacheConfig, uploadables);
   }
 
-  return { execute: execute, executeWithEvents: executeWithEvents };
+  return {
+    execute: execute
+  };
 }
 
-module.exports = { create: create };
+module.exports = {
+  create: create
+};

package/lib/RelayNetworkLogger.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,7 +7,6 @@
  *  strict-local
  * @format
  */
-
 'use strict';
 
-module.exports = require('./createRelayNetworkLogger')(require('./RelayNetworkLoggerTransaction'));
+module.exports = require("./createRelayNetworkLogger")(require("./RelayNetworkLoggerTransaction"));