relay-runtime 2.0.0-rc.2 → 5.0.0

package/lib/RelayModernFragmentSpecResolver.js

@@ -9,9 +9,27 @@
  */
 'use strict';
 
-var _objectSpread2 = require("@babel/runtime/helpers/interopRequireDefault")(require("@babel/runtime/helpers/objectSpread"));
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
-var _defineProperty2 = require("@babel/runtime/helpers/interopRequireDefault")(require("@babel/runtime/helpers/defineProperty"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread"));
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+var areEqual = require("fbjs/lib/areEqual");
+
+var invariant = require("fbjs/lib/invariant");
+
+var isScalarAndEqual = require("./isScalarAndEqual");
+
+var _require = require("./RelayModernFragmentOwner"),
+    getFragmentOwners = _require.getFragmentOwners;
+
+var _require2 = require("./RelayModernSelector"),
+    areEqualSelectors = _require2.areEqualSelectors,
+    getSelectorsFromObject = _require2.getSelectorsFromObject;
+
+var _require3 = require("./RelayStoreUtils"),
+    ROOT_ID = _require3.ROOT_ID;
 
 /**
  * A utility for resolving and subscribing to the results of a fragment spec
@@ -89,7 +107,7 @@ function () {
 
             var _nextItem = prop !== undefined ? prop : null;
 
-            if (nextData || !require("./isScalarAndEqual")(_nextItem, prevItem)) {
+            if (nextData || !isScalarAndEqual(_nextItem, prevItem)) {
               nextData = nextData || (0, _objectSpread2["default"])({}, prevData);
               nextData[_key2] = _nextItem;
             }
@@ -109,7 +127,9 @@ function () {
   };
 
   _proto.setProps = function setProps(props) {
-    var ownedSelectors = require("./RelayModernSelector").getSelectorsFromObject(this._context.variables, this._fragments, props);
+    var ownedSelectors = getSelectorsFromObject( // NOTE: We pass empty operationVariables because we want to prefer
+    // the variables from the fragment owner
+    {}, this._fragments, props, getFragmentOwners(this._fragments, props));
 
     for (var _key3 in ownedSelectors) {
       if (ownedSelectors.hasOwnProperty(_key3)) {
@@ -126,14 +146,14 @@ function () {
           if (resolver == null) {
             resolver = new SelectorListResolver(this._context.environment, ownedSelector, this._onChange);
           } else {
-            !(resolver instanceof SelectorListResolver) ? process.env.NODE_ENV !== "production" ? require("fbjs/lib/invariant")(false, 'RelayModernFragmentSpecResolver: Expected prop `%s` to always be an array.', _key3) : require("fbjs/lib/invariant")(false) : void 0;
+            !(resolver instanceof SelectorListResolver) ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayModernFragmentSpecResolver: Expected prop `%s` to always be an array.', _key3) : invariant(false) : void 0;
             resolver.setSelectors(ownedSelector);
           }
         } else {
           if (resolver == null) {
             resolver = new SelectorResolver(this._context.environment, ownedSelector, this._onChange);
           } else {
-            !(resolver instanceof SelectorResolver) ? process.env.NODE_ENV !== "production" ? require("fbjs/lib/invariant")(false, 'RelayModernFragmentSpecResolver: Expected prop `%s` to always be an object.', _key3) : require("fbjs/lib/invariant")(false) : void 0;
+            !(resolver instanceof SelectorResolver) ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayModernFragmentSpecResolver: Expected prop `%s` to always be an object.', _key3) : invariant(false) : void 0;
             resolver.setSelector(ownedSelector);
           }
         }
@@ -146,13 +166,13 @@ function () {
     this._stale = true;
   };
 
-  _proto.setVariables = function setVariables(variables) {
+  _proto.setVariables = function setVariables(variables, request) {
     for (var _key4 in this._resolvers) {
       if (this._resolvers.hasOwnProperty(_key4)) {
         var resolver = this._resolvers[_key4];
 
         if (resolver) {
-          resolver.setVariables(variables);
+          resolver.setVariables(variables, request);
         }
       }
     }
@@ -179,7 +199,7 @@ function () {
       _this2._callback();
     });
 
-    var _snapshot = environment.lookup(ownedSelector.selector);
+    var _snapshot = environment.lookup(ownedSelector.selector, ownedSelector.owner);
 
     this._callback = callback;
     this._data = _snapshot.data;
@@ -203,22 +223,53 @@ function () {
   };
 
   _proto2.setSelector = function setSelector(ownedSelector) {
-    if (this._subscription != null && require("./RelayModernSelector").areEqualSelectors(ownedSelector, this._ownedSelector)) {
+    if (this._subscription != null && areEqualSelectors(ownedSelector, this._ownedSelector)) {
       return;
     }
 
     this.dispose();
 
-    var snapshot = this._environment.lookup(ownedSelector.selector);
+    var snapshot = this._environment.lookup(ownedSelector.selector, ownedSelector.owner);
 
     this._data = snapshot.data;
     this._ownedSelector = ownedSelector;
     this._subscription = this._environment.subscribe(snapshot, this._onChange);
   };
 
-  _proto2.setVariables = function setVariables(variables) {
+  _proto2.setVariables = function setVariables(variables, request) {
+    if (areEqual(variables, this._ownedSelector.selector.variables)) {
+      // If we're not actually setting new variables, we don't actually want
+      // to create a new fragment owner, since areEqualSelectors relies on
+      // owner identity when fragment ownership is enabled.
+      // In fact, we don't even need to try to attempt to set a new selector.
+      // When fragment ownership is not enabled, setSelector will also bail
+      // out since the selector doesn't really change, so we're doing it here
+      // earlier.
+      return;
+    }
+
     var ownedSelector = {
-      owner: null,
+      owner: request ? // NOTE: We manually create the operation descriptor here instead of
+      // calling createOperationDescriptor() because we want to set a
+      // descriptor with *unaltered* variables as the fragment owner.
+      // This is a hack that allows us to preserve exisiting (broken)
+      // behavior of RelayModern containers while using fragment ownership
+      // to propagate variables instead of Context.
+      // For more details, see the summary of D13999308
+      {
+        fragment: {
+          dataID: ROOT_ID,
+          node: request.fragment,
+          variables: variables
+        },
+        node: request,
+        root: {
+          dataID: ROOT_ID,
+          node: request.operation,
+          variables: variables
+        },
+        variables: variables
+      } : null,
       selector: (0, _objectSpread2["default"])({}, this._ownedSelector.selector, {
         variables: variables
       })
@@ -305,9 +356,9 @@ function () {
     this._stale = true;
   };
 
-  _proto3.setVariables = function setVariables(variables) {
+  _proto3.setVariables = function setVariables(variables, request) {
     this._resolvers.forEach(function (resolver) {
-      return resolver.setVariables(variables);
+      return resolver.setVariables(variables, request);
     });
 
     this._stale = true;

package/lib/RelayModernGraphQLTag.js

@@ -9,12 +9,16 @@
  */
 'use strict';
 
+var RelayConcreteNode = require("./RelayConcreteNode");
+
+var invariant = require("fbjs/lib/invariant");
+
 /**
  * Runtime function to correspond to the `graphql` tagged template function.
  * All calls to this function should be transformed by the plugin.
  */
 function graphql(strings) {
-  !false ? process.env.NODE_ENV !== "production" ? 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`.') : require("fbjs/lib/invariant")(false) : void 0;
+  !false ? process.env.NODE_ENV !== "production" ? 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`.') : invariant(false) : void 0;
 }
 
 function getNode(taggedNode) {
@@ -31,17 +35,17 @@ function getNode(taggedNode) {
 
 function isFragment(node) {
   var fragment = getNode(node);
-  return typeof fragment === 'object' && fragment !== null && fragment.kind === require("./RelayConcreteNode").FRAGMENT;
+  return typeof fragment === 'object' && fragment !== null && fragment.kind === RelayConcreteNode.FRAGMENT;
 }
 
 function isRequest(node) {
   var request = getNode(node);
-  return typeof request === 'object' && request !== null && request.kind === require("./RelayConcreteNode").REQUEST;
+  return typeof request === 'object' && request !== null && request.kind === RelayConcreteNode.REQUEST;
 }
 
 function getFragment(taggedNode) {
   var fragment = getNode(taggedNode);
-  !isFragment(fragment) ? process.env.NODE_ENV !== "production" ? require("fbjs/lib/invariant")(false, 'RelayModernGraphQLTag: Expected a fragment, got `%s`.', JSON.stringify(fragment)) : require("fbjs/lib/invariant")(false) : void 0;
+  !isFragment(fragment) ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayModernGraphQLTag: Expected a fragment, got `%s`.', JSON.stringify(fragment)) : invariant(false) : void 0;
   return fragment;
 }
 
@@ -74,7 +78,7 @@ function getRefetchableFragment(taggedNode) {
 
 function getRequest(taggedNode) {
   var request = getNode(taggedNode);
-  !isRequest(request) ? process.env.NODE_ENV !== "production" ? require("fbjs/lib/invariant")(false, 'RelayModernGraphQLTag: Expected a request, got `%s`.', JSON.stringify(request)) : require("fbjs/lib/invariant")(false) : void 0;
+  !isRequest(request) ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayModernGraphQLTag: Expected a request, got `%s`.', JSON.stringify(request)) : invariant(false) : void 0;
   return request;
 }
 

package/lib/RelayModernOperationDescriptor.js

@@ -4,11 +4,17 @@
  * 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 _require = require("./RelayConcreteVariables"),
+    getOperationVariables = _require.getOperationVariables;
+
+var _require2 = require("./RelayStoreUtils"),
+    ROOT_ID = _require2.ROOT_ID;
+
 /**
  * Creates an instance of the `OperationDescriptor` type defined in
  * `RelayStoreTypes` given an operation and some variables. The input variables
@@ -17,11 +23,8 @@
  */
 function createOperationDescriptor(request, variables) {
   var operation = request.operation;
-
-  var operationVariables = require("./RelayConcreteVariables").getOperationVariables(operation, variables);
-
-  var dataID = require("./RelayStoreUtils").ROOT_ID;
-
+  var operationVariables = getOperationVariables(operation, variables);
+  var dataID = ROOT_ID;
   return {
     fragment: {
       dataID: dataID,