relay-runtime 1.3.0 → 1.5.0

package/lib/RelayModernFragmentSpecResolver.js

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule RelayModernFragmentSpecResolver
  * 
@@ -65,78 +63,96 @@ var RelayModernFragmentSpecResolver = function () {
   }
 
   RelayModernFragmentSpecResolver.prototype.dispose = function dispose() {
-    require('fbjs/lib/forEachObject')(this._resolvers, disposeCallback);
+    for (var _key in this._resolvers) {
+      if (this._resolvers.hasOwnProperty(_key)) {
+        disposeCallback(this._resolvers[_key]);
+      }
+    }
   };
 
   RelayModernFragmentSpecResolver.prototype.resolve = function resolve() {
-    var _this2 = this;
-
     if (this._stale) {
       // Avoid mapping the object multiple times, which could occur if data for
       // multiple keys changes in the same event loop.
       var prevData = this._data;
       var nextData = void 0;
-      require('fbjs/lib/forEachObject')(this._resolvers, function (resolver, key) {
-        var prevItem = prevData[key];
-        if (resolver) {
-          var nextItem = resolver.resolve();
-          if (nextData || nextItem !== prevItem) {
-            nextData = nextData || (0, _extends3['default'])({}, prevData);
-            nextData[key] = nextItem;
-          }
-        } else {
-          var prop = _this2._props[key];
-          var _nextItem = prop !== undefined ? prop : null;
-          if (nextData || !require('./isScalarAndEqual')(_nextItem, prevItem)) {
-            nextData = nextData || (0, _extends3['default'])({}, prevData);
-            nextData[key] = _nextItem;
+      for (var _key2 in this._resolvers) {
+        if (this._resolvers.hasOwnProperty(_key2)) {
+          var resolver = this._resolvers[_key2];
+          var prevItem = prevData[_key2];
+          if (resolver) {
+            var nextItem = resolver.resolve();
+            if (nextData || nextItem !== prevItem) {
+              nextData = nextData || (0, _extends3['default'])({}, prevData);
+              nextData[_key2] = nextItem;
+            }
+          } else {
+            var prop = this._props[_key2];
+            var _nextItem = prop !== undefined ? prop : null;
+            if (nextData || !require('./isScalarAndEqual')(_nextItem, prevItem)) {
+              nextData = nextData || (0, _extends3['default'])({}, prevData);
+              nextData[_key2] = _nextItem;
+            }
           }
         }
-      });
+      }
       this._data = nextData || prevData;
       this._stale = false;
     }
     return this._data;
   };
 
-  RelayModernFragmentSpecResolver.prototype.setProps = function setProps(props) {
-    var _this3 = this;
+  RelayModernFragmentSpecResolver.prototype.isLoading = function isLoading() {
+    for (var _key3 in this._resolvers) {
+      if (this._resolvers.hasOwnProperty(_key3) && this._resolvers[_key3] && this._resolvers[_key3].isLoading()) {
+        return true;
+      }
+    }
+    return false;
+  };
 
+  RelayModernFragmentSpecResolver.prototype.setProps = function setProps(props) {
     var selectors = getSelectorsFromObject(this._context.variables, this._fragments, props);
-    require('fbjs/lib/forEachObject')(selectors, function (selector, key) {
-      var resolver = _this3._resolvers[key];
-      if (selector == null) {
-        if (resolver != null) {
-          resolver.dispose();
-        }
-        resolver = null;
-      } else if (Array.isArray(selector)) {
-        if (resolver == null) {
-          resolver = new SelectorListResolver(_this3._context.environment, selector, _this3._onChange);
-        } else {
-          require('fbjs/lib/invariant')(resolver instanceof SelectorListResolver, 'RelayModernFragmentSpecResolver: Expected prop `%s` to always be an array.', key);
-          resolver.setSelectors(selector);
-        }
-      } else {
-        if (resolver == null) {
-          resolver = new SelectorResolver(_this3._context.environment, selector, _this3._onChange);
+    for (var _key4 in selectors) {
+      if (selectors.hasOwnProperty(_key4)) {
+        var selector = selectors[_key4];
+        var resolver = this._resolvers[_key4];
+        if (selector == null) {
+          if (resolver != null) {
+            resolver.dispose();
+          }
+          resolver = null;
+        } else if (Array.isArray(selector)) {
+          if (resolver == null) {
+            resolver = new SelectorListResolver(this._context.environment, selector, this._onChange);
+          } else {
+            require('fbjs/lib/invariant')(resolver instanceof SelectorListResolver, 'RelayModernFragmentSpecResolver: Expected prop `%s` to always be an array.', _key4);
+            resolver.setSelectors(selector);
+          }
         } else {
-          require('fbjs/lib/invariant')(resolver instanceof SelectorResolver, 'RelayModernFragmentSpecResolver: Expected prop `%s` to always be an object.', key);
-          resolver.setSelector(selector);
+          if (resolver == null) {
+            resolver = new SelectorResolver(this._context.environment, selector, this._onChange);
+          } else {
+            require('fbjs/lib/invariant')(resolver instanceof SelectorResolver, 'RelayModernFragmentSpecResolver: Expected prop `%s` to always be an object.', _key4);
+            resolver.setSelector(selector);
+          }
         }
+        this._resolvers[_key4] = resolver;
       }
-      _this3._resolvers[key] = resolver;
-    });
+    }
     this._props = props;
     this._stale = true;
   };
 
   RelayModernFragmentSpecResolver.prototype.setVariables = function setVariables(variables) {
-    require('fbjs/lib/forEachObject')(this._resolvers, function (resolver) {
-      if (resolver) {
-        resolver.setVariables(variables);
+    for (var _key5 in this._resolvers) {
+      if (this._resolvers.hasOwnProperty(_key5)) {
+        var resolver = this._resolvers[_key5];
+        if (resolver) {
+          resolver.setVariables(variables);
+        }
       }
-    });
+    }
     this._stale = true;
   };
 
@@ -191,6 +207,10 @@ var SelectorResolver = function () {
     this.setSelector(selector);
   };
 
+  SelectorResolver.prototype.isLoading = function isLoading() {
+    return this._environment.isSelectorLoading(this._selector);
+  };
+
   return SelectorResolver;
 }();
 
@@ -200,23 +220,23 @@ var SelectorResolver = function () {
 
 
 var _initialiseProps = function _initialiseProps() {
-  var _this5 = this;
+  var _this3 = this;
 
   this._onChange = function (snapshot) {
-    _this5._data = snapshot.data;
-    _this5._callback();
+    _this3._data = snapshot.data;
+    _this3._callback();
   };
 };
 
 var SelectorListResolver = function () {
   function SelectorListResolver(environment, selectors, callback) {
-    var _this4 = this;
+    var _this2 = this;
 
     (0, _classCallCheck3['default'])(this, SelectorListResolver);
 
     this._onChange = function (data) {
-      _this4._stale = true;
-      _this4._callback();
+      _this2._stale = true;
+      _this2._callback();
     };
 
     this._callback = callback;
@@ -277,6 +297,12 @@ var SelectorListResolver = function () {
     this._stale = true;
   };
 
+  SelectorListResolver.prototype.isLoading = function isLoading() {
+    return this._resolvers.some(function (resolver) {
+      return resolver.isLoading();
+    });
+  };
+
   return SelectorListResolver;
 }();
 

package/lib/RelayModernGraphQLTag.js

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule RelayModernGraphQLTag
  * 
@@ -24,13 +22,6 @@ function graphql(strings) {
   require('fbjs/lib/invariant')(false, 'graphql: Unexpected invocation at runtime. Either the Babel transform ' + 'was not set up, or it failed to identify this call site. Make sure it ' + 'is being used verbatim as `graphql`.');
 }
 
-/**
- * Variant of the `graphql` tag that enables experimental features.
- */
-graphql.experimental = function (strings) {
-  require('fbjs/lib/invariant')(false, 'graphql.experimental: Unexpected invocation at runtime. Either the ' + 'Babel transform was not set up, or it failed to identify this call ' + 'site. Make sure it is being used verbatim as `graphql`.');
-};
-
 function getNode(taggedNode) {
   var fn = typeof taggedNode === 'function' ? taggedNode : taggedNode.modern;
   // Support for classic raw nodes (used in test mock)
@@ -42,18 +33,18 @@ function getNode(taggedNode) {
 
 function getFragment(taggedNode) {
   var fragment = getNode(taggedNode);
-  require('fbjs/lib/invariant')(typeof fragment === 'object' && fragment !== null && fragment.kind === 'Fragment', 'RelayModernGraphQLTag: Expected a fragment, got `%s`.', JSON.stringify(fragment));
+  require('fbjs/lib/invariant')(typeof fragment === 'object' && fragment !== null && fragment.kind === require('./RelayConcreteNode').FRAGMENT, 'RelayModernGraphQLTag: Expected a fragment, got `%s`.', JSON.stringify(fragment));
   return fragment;
 }
 
-function getOperation(taggedNode) {
-  var operation = getNode(taggedNode);
-  require('fbjs/lib/invariant')(typeof operation === 'object' && operation !== null && operation.kind === 'Batch', 'RelayModernGraphQLTag: Expected an operation, got `%s`.', JSON.stringify(operation));
-  return operation;
+function getRequest(taggedNode) {
+  var request = getNode(taggedNode);
+  require('fbjs/lib/invariant')(typeof request === 'object' && request !== null && (request.kind === require('./RelayConcreteNode').REQUEST || request.kind === require('./RelayConcreteNode').BATCH_REQUEST), 'RelayModernGraphQLTag: Expected an request, got `%s`.', JSON.stringify(request));
+  return request;
 }
 
 module.exports = {
   getFragment: getFragment,
-  getOperation: getOperation,
+  getRequest: getRequest,
   graphql: graphql
 };

package/lib/RelayModernOperationSelector.js

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule RelayModernOperationSelector
  * 
@@ -25,19 +23,21 @@ var _require2 = require('./RelayStoreUtils'),
  * are filtered to exclude variables that do not match defined arguments on the
  * operation, and default values are populated for null values.
  */
-function createOperationSelector(operation, variables) {
+function createOperationSelector(request, variables, operationFromBatch) {
+  var operation = operationFromBatch || (request.kind === require('./RelayConcreteNode').BATCH_REQUEST ? request.requests[0].operation : request.operation);
+
   var operationVariables = getOperationVariables(operation, variables);
   var dataID = ROOT_ID;
   return {
     fragment: {
       dataID: dataID,
-      node: operation.fragment,
+      node: request.fragment,
       variables: operationVariables
     },
-    node: operation,
+    node: request,
     root: {
       dataID: dataID,
-      node: operation.query,
+      node: operation,
       variables: operationVariables
     },
     variables: operationVariables

package/lib/RelayModernRecord.js

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule RelayModernRecord
  * 
@@ -88,11 +86,13 @@ function clone(record) {
  * copied on write.
  */
 function copyFields(source, sink) {
-  require('fbjs/lib/forEachObject')(source, function (value, key) {
-    if (key !== ID_KEY && key !== TYPENAME_KEY) {
-      sink[key] = value;
+  for (var key in source) {
+    if (source.hasOwnProperty(key)) {
+      if (key !== ID_KEY && key !== TYPENAME_KEY) {
+        sink[key] = source[key];
+      }
     }
-  });
+  }
 }
 
 /**

package/lib/RelayModernSelector.js

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule RelayModernSelector
  * 
@@ -98,18 +96,21 @@ function getSelectorList(operationVariables, fragment, items) {
  */
 function getSelectorsFromObject(operationVariables, fragments, object) {
   var selectors = {};
-  require('fbjs/lib/forEachObject')(fragments, function (fragment, key) {
-    var item = object[key];
-    if (item == null) {
-      selectors[key] = item;
-    } else if (fragment.metadata && fragment.metadata.plural === true) {
-      require('fbjs/lib/invariant')(Array.isArray(item), '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);
-      selectors[key] = getSelectorList(operationVariables, fragment, item);
-    } else {
-      require('fbjs/lib/invariant')(!Array.isArray(item), '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);
-      selectors[key] = getSelector(operationVariables, fragment, item);
+  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) {
+        require('fbjs/lib/invariant')(Array.isArray(item), '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);
+        selectors[_key] = getSelectorList(operationVariables, fragment, item);
+      } else {
+        require('fbjs/lib/invariant')(!Array.isArray(item), '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);
+        selectors[_key] = getSelector(operationVariables, fragment, item);
+      }
     }
-  });
+  }
   return selectors;
 }
 
@@ -124,18 +125,21 @@ function getSelectorsFromObject(operationVariables, fragments, object) {
  */
 function getDataIDsFromObject(fragments, object) {
   var ids = {};
-  require('fbjs/lib/forEachObject')(fragments, function (fragment, key) {
-    var item = object[key];
-    if (item == null) {
-      ids[key] = item;
-    } else if (fragment.metadata && fragment.metadata.plural === true) {
-      require('fbjs/lib/invariant')(Array.isArray(item), '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);
-      ids[key] = getDataIDs(fragment, item);
-    } else {
-      require('fbjs/lib/invariant')(!Array.isArray(item), '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);
-      ids[key] = getDataID(fragment, item);
+  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) {
+        require('fbjs/lib/invariant')(Array.isArray(item), '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);
+        ids[_key2] = getDataIDs(fragment, item);
+      } else {
+        require('fbjs/lib/invariant')(!Array.isArray(item), '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);
+        ids[_key2] = getDataID(fragment, item);
+      }
     }
-  });
+  }
   return ids;
 }
 
@@ -179,28 +183,35 @@ function getDataID(fragment, item) {
  */
 function getVariablesFromObject(operationVariables, fragments, object) {
   var variables = {};
-  require('fbjs/lib/forEachObject')(fragments, function (fragment, key) {
-    var item = object[key];
-    if (item == null) {
-      return;
-    } else if (fragment.metadata && fragment.metadata.plural === true) {
-      require('fbjs/lib/invariant')(Array.isArray(item), '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);
-      item.forEach(function (value) {
-        if (value != null) {
-          var itemVariables = getVariables(operationVariables, fragment, value);
+  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) {
+          require('fbjs/lib/invariant')(Array.isArray(item), '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);
+          item.forEach(function (value) {
+            if (value != null) {
+              var itemVariables = getVariables(operationVariables, fragment, value);
+              if (itemVariables) {
+                Object.assign(variables, itemVariables);
+              }
+            }
+          });
+        } else {
+          require('fbjs/lib/invariant')(!Array.isArray(item), '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);
+          var itemVariables = getVariables(operationVariables, fragment, item);
           if (itemVariables) {
             Object.assign(variables, itemVariables);
           }
         }
-      });
-    } else {
-      require('fbjs/lib/invariant')(!Array.isArray(item), '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);
-      var itemVariables = getVariables(operationVariables, fragment, item);
-      if (itemVariables) {
-        Object.assign(variables, itemVariables);
-      }
+      }();
+
+      if (_ret === 'continue') continue;
     }
-  });
+  }
   return variables;
 }
 

package/lib/RelayNetwork.js

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule RelayNetwork
  * 
@@ -13,7 +11,7 @@
 
 'use strict';
 
-var _require = require('./ConvertToObserveFunction'),
+var _require = require('./ConvertToExecuteFunction'),
     convertFetch = _require.convertFetch,
     convertSubscribe = _require.convertSubscribe;
 
@@ -26,24 +24,24 @@ function create(fetchFn, subscribeFn) {
   var observeFetch = convertFetch(fetchFn);
   var observeSubscribe = subscribeFn ? convertSubscribe(subscribeFn) : undefined;
 
-  function observe(operation, variables, cacheConfig, uploadables) {
-    if (operation.query.operation === 'subscription') {
+  function execute(request, variables, cacheConfig, uploadables) {
+    if (request.operationKind === 'subscription') {
       require('fbjs/lib/invariant')(observeSubscribe, 'RelayNetwork: This network layer does not support Subscriptions. ' + 'To use Subscriptions, provide a custom network layer.');
 
       require('fbjs/lib/invariant')(!uploadables, 'RelayNetwork: Cannot provide uploadables while subscribing.');
-      return observeSubscribe(operation, variables, cacheConfig);
+      return observeSubscribe(request, variables, cacheConfig);
     }
 
     var pollInterval = cacheConfig.poll;
     if (pollInterval != null) {
       require('fbjs/lib/invariant')(!uploadables, 'RelayNetwork: Cannot provide uploadables while polling.');
-      return observeFetch(operation, variables, { force: true }).poll(pollInterval);
+      return observeFetch(request, variables, { force: true }).poll(pollInterval);
     }
 
-    return observeFetch(operation, variables, cacheConfig, uploadables);
+    return observeFetch(request, variables, cacheConfig, uploadables);
   }
 
-  return { observe: observe };
+  return { execute: execute };
 }
 
 module.exports = { create: create };

package/lib/RelayNetworkDebug.js

@@ -1,12 +1,9 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
- * @providesModule RelayNetworkDebug
  * 
  * @format
  */
@@ -76,7 +73,6 @@ function createDebuggableFromRequest(type, request, graphiqlPrinter) {
     type: type,
     promise: request.getPromise(),
     logResult: function logResult(error, response) {
-      /* eslint-disable no-console-disallow */
       var requestSize = formatSize(require('fbjs/lib/xhrSimpleDataSerializer')({
         q: request.getQueryString(),
         query_params: request.getVariables()
@@ -98,12 +94,13 @@ function createDebuggableFromRequest(type, request, graphiqlPrinter) {
       console.groupEnd();
 
       if (Object.keys(requestVariables).length > 0) {
+        // eslint-disable-next-line no-console
         console.log('Request Variables\n', request.getVariables());
       }
 
       error && console.error(error);
+      // eslint-disable-next-line no-console
       response && console.log(response);
-      /* eslint-enable no-console-disallow */
     }
   };
 }

package/lib/RelayNetworkLogger.js

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule RelayNetworkLogger
  *