react-relay 16.1.0 → 17.0.0

package/lib/relay-hooks/{experimental/useFragmentInternal_EXPERIMENTAL.js → useFragmentInternal.js}

@@ -4,9 +4,9 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/createForOfIteratorHelper"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-var _require = require('../QueryResource'),
+var _require = require('./QueryResource'),
   getQueryResourceForEnvironment = _require.getQueryResourceForEnvironment;
-var useRelayEnvironment = require('../useRelayEnvironment');
+var useRelayEnvironment = require('./useRelayEnvironment');
 var invariant = require('invariant');
 var _require2 = require('react'),
   useDebugValue = _require2.useDebugValue,
@@ -15,7 +15,9 @@ var _require2 = require('react'),
   useRef = _require2.useRef,
   useState = _require2.useState;
 var _require3 = require('relay-runtime'),
-  fetchQueryInternal = _require3.__internal.fetchQuery,
+  _require3$__internal = _require3.__internal,
+  fetchQueryInternal = _require3$__internal.fetchQuery,
+  getPromiseForActiveRequest = _require3$__internal.getPromiseForActiveRequest,
   RelayFeatureFlags = _require3.RelayFeatureFlags,
   areEqualSelectors = _require3.areEqualSelectors,
   createOperationDescriptor = _require3.createOperationDescriptor,
@@ -114,14 +116,16 @@ function getSuspendingLiveResolver(state) {
 }
 function handlePotentialSnapshotErrorsForState(environment, state) {
   if (state.kind === 'singular') {
-    handlePotentialSnapshotErrors(environment, state.snapshot.missingRequiredFields, state.snapshot.relayResolverErrors);
+    var _state$snapshot$selec, _state$snapshot$selec2;
+    handlePotentialSnapshotErrors(environment, state.snapshot.missingRequiredFields, state.snapshot.relayResolverErrors, state.snapshot.errorResponseFields, (_state$snapshot$selec = (_state$snapshot$selec2 = state.snapshot.selector.node.metadata) === null || _state$snapshot$selec2 === void 0 ? void 0 : _state$snapshot$selec2.throwOnFieldError) !== null && _state$snapshot$selec !== void 0 ? _state$snapshot$selec : false);
   } else if (state.kind === 'plural') {
     var _iterator5 = (0, _createForOfIteratorHelper2["default"])(state.snapshots),
       _step5;
     try {
       for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+        var _snapshot$selector$no, _snapshot$selector$no2;
         var snapshot = _step5.value;
-        handlePotentialSnapshotErrors(environment, snapshot.missingRequiredFields, snapshot.relayResolverErrors);
+        handlePotentialSnapshotErrors(environment, snapshot.missingRequiredFields, snapshot.relayResolverErrors, snapshot.errorResponseFields, (_snapshot$selector$no = (_snapshot$selector$no2 = snapshot.selector.node.metadata) === null || _snapshot$selector$no2 === void 0 ? void 0 : _snapshot$selector$no2.throwOnFieldError) !== null && _snapshot$selector$no !== void 0 ? _snapshot$selector$no : false);
       }
     } catch (err) {
       _iterator5.e(err);
@@ -149,7 +153,8 @@ function handleMissedUpdates(environment, state) {
       seenRecords: currentSnapshot.seenRecords,
       selector: currentSnapshot.selector,
       missingRequiredFields: currentSnapshot.missingRequiredFields,
-      relayResolverErrors: currentSnapshot.relayResolverErrors
+      relayResolverErrors: currentSnapshot.relayResolverErrors,
+      errorResponseFields: currentSnapshot.errorResponseFields
     };
     return [updatedData !== state.snapshot.data, {
       kind: 'singular',
@@ -171,7 +176,8 @@ function handleMissedUpdates(environment, state) {
         seenRecords: _currentSnapshot.seenRecords,
         selector: _currentSnapshot.selector,
         missingRequiredFields: _currentSnapshot.missingRequiredFields,
-        relayResolverErrors: _currentSnapshot.relayResolverErrors
+        relayResolverErrors: _currentSnapshot.relayResolverErrors,
+        errorResponseFields: _currentSnapshot.errorResponseFields
       };
       if (_updatedData !== snapshot.data) {
         didMissUpdates = true;
@@ -193,9 +199,10 @@ function handleMissingClientEdge(environment, parentFragmentNode, parentFragment
   });
   var queryOperationDescriptor = createOperationDescriptor(missingClientEdgeRequestInfo.request, variables, queryOptions === null || queryOptions === void 0 ? void 0 : queryOptions.networkCacheConfig);
   var QueryResource = getQueryResourceForEnvironment(environment);
-  return QueryResource.prepare(queryOperationDescriptor, fetchQueryInternal(environment, queryOperationDescriptor), queryOptions === null || queryOptions === void 0 ? void 0 : queryOptions.fetchPolicy);
+  var queryResult = QueryResource.prepare(queryOperationDescriptor, fetchQueryInternal(environment, queryOperationDescriptor), queryOptions === null || queryOptions === void 0 ? void 0 : queryOptions.fetchPolicy);
+  return [queryResult, getPromiseForActiveRequest(environment, queryOperationDescriptor.request)];
 }
-function subscribeToSnapshot(environment, state, setState) {
+function subscribeToSnapshot(environment, state, setState, hasPendingStateChanges) {
   if (state.kind === 'bailout') {
     return function () {};
   } else if (state.kind === 'singular') {
@@ -210,11 +217,13 @@ function subscribeToSnapshot(environment, state, setState) {
               name: 'useFragment.subscription.missedUpdates',
               hasDataChanges: dataChanged
             });
+            hasPendingStateChanges.current = dataChanged;
             return dataChanged ? nextState : prevState;
           } else {
             return prevState;
           }
         }
+        hasPendingStateChanges.current = true;
         return {
           kind: 'singular',
           snapshot: latestSnapshot,
@@ -239,6 +248,7 @@ function subscribeToSnapshot(environment, state, setState) {
                 name: 'useFragment.subscription.missedUpdates',
                 hasDataChanges: dataChanged
               });
+              hasPendingStateChanges.current = hasPendingStateChanges.current || dataChanged;
               return dataChanged ? nextState : prevState;
             } else {
               return prevState;
@@ -246,6 +256,7 @@ function subscribeToSnapshot(environment, state, setState) {
           }
           var updated = (0, _toConsumableArray2["default"])(prevState.snapshots);
           updated[index] = latestSnapshot;
+          hasPendingStateChanges.current = true;
           return {
             kind: 'plural',
             snapshots: updated,
@@ -291,7 +302,7 @@ function getFragmentState(environment, fragmentSelector) {
     };
   }
 }
-function useFragmentInternal_EXPERIMENTAL(fragmentNode, fragmentRef, hookDisplayName, queryOptions) {
+function useFragmentInternal(fragmentNode, fragmentRef, hookDisplayName, queryOptions) {
   var _fragmentNode$metadat, _fragmentNode$metadat2;
   var fragmentSelector = useMemo(function () {
     return getSelector(fragmentNode, fragmentRef);
@@ -334,26 +345,38 @@ function useFragmentInternal_EXPERIMENTAL(fragmentNode, fragmentRef, hookDisplay
     committedFragmentSelectorRef.current = fragmentSelector;
   }, [fragmentSelector]);
   if (((_fragmentNode$metadat2 = fragmentNode.metadata) === null || _fragmentNode$metadat2 === void 0 ? void 0 : _fragmentNode$metadat2.hasClientEdges) === true) {
-    var clientEdgeQueries = useMemo(function () {
-      var missingClientEdges = getMissingClientEdges(state);
-      var clientEdgeQueries;
-      if (missingClientEdges !== null && missingClientEdges !== void 0 && missingClientEdges.length) {
-        clientEdgeQueries = [];
-        var _iterator7 = (0, _createForOfIteratorHelper2["default"])(missingClientEdges),
-          _step7;
-        try {
-          for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
-            var edge = _step7.value;
-            clientEdgeQueries.push(handleMissingClientEdge(environment, fragmentNode, fragmentRef, edge, queryOptions));
+    var _useMemo = useMemo(function () {
+        var missingClientEdges = getMissingClientEdges(state);
+        var clientEdgeQueries;
+        var activeRequestPromises = [];
+        if (missingClientEdges !== null && missingClientEdges !== void 0 && missingClientEdges.length) {
+          clientEdgeQueries = [];
+          var _iterator7 = (0, _createForOfIteratorHelper2["default"])(missingClientEdges),
+            _step7;
+          try {
+            for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
+              var edge = _step7.value;
+              var _handleMissingClientE = handleMissingClientEdge(environment, fragmentNode, fragmentRef, edge, queryOptions),
+                queryResult = _handleMissingClientE[0],
+                requestPromise = _handleMissingClientE[1];
+              clientEdgeQueries.push(queryResult);
+              if (requestPromise != null) {
+                activeRequestPromises.push(requestPromise);
+              }
+            }
+          } catch (err) {
+            _iterator7.e(err);
+          } finally {
+            _iterator7.f();
           }
-        } catch (err) {
-          _iterator7.e(err);
-        } finally {
-          _iterator7.f();
         }
-      }
-      return clientEdgeQueries;
-    }, [state, environment, fragmentNode, fragmentRef, queryOptions]);
+        return [clientEdgeQueries, activeRequestPromises];
+      }, [state, environment, fragmentNode, fragmentRef, queryOptions]),
+      clientEdgeQueries = _useMemo[0],
+      activeRequestPromises = _useMemo[1];
+    if (activeRequestPromises.length) {
+      throw Promise.all(activeRequestPromises);
+    }
     useEffect(function () {
       var QueryResource = getQueryResourceForEnvironment(environment);
       if (clientEdgeQueries !== null && clientEdgeQueries !== void 0 && clientEdgeQueries.length) {
@@ -395,7 +418,7 @@ function useFragmentInternal_EXPERIMENTAL(fragmentNode, fragmentRef, hookDisplay
         return environment.getStore().getLiveResolverPromise(liveStateID);
       }));
     }
-    if (!committedFragmentSelectorRef.current || !areEqualSelectors(committedFragmentSelectorRef.current, fragmentSelector)) {
+    if (RelayFeatureFlags.ENABLE_RELAY_OPERATION_TRACKER_SUSPENSE || environment !== previousEnvironment || !committedFragmentSelectorRef.current || !areEqualSelectors(committedFragmentSelectorRef.current, fragmentSelector)) {
       !(fragmentSelector != null) ? process.env.NODE_ENV !== "production" ? invariant(false, 'refinement, see invariants above') : invariant(false) : void 0;
       var fragmentOwner = fragmentSelector.kind === 'PluralReaderSelector' ? fragmentSelector.selectors[0].owner : fragmentSelector.owner;
       var pendingOperationsResult = getPendingOperationsForFragment(environment, fragmentNode, fragmentOwner);
@@ -405,6 +428,7 @@ function useFragmentInternal_EXPERIMENTAL(fragmentNode, fragmentRef, hookDisplay
     }
   }
   handlePotentialSnapshotErrorsForState(environment, state);
+  var hasPendingStateChanges = useRef(false);
   useEffect(function () {
     var currentState = subscribedState;
     var updates = handleMissedUpdates(environment, subscribedState);
@@ -416,8 +440,20 @@ function useFragmentInternal_EXPERIMENTAL(fragmentNode, fragmentRef, hookDisplay
       }
       currentState = updatedState;
     }
-    return subscribeToSnapshot(environment, currentState, setState);
+    return subscribeToSnapshot(environment, currentState, setState, hasPendingStateChanges);
   }, [environment, subscribedState]);
+  if (hasPendingStateChanges.current) {
+    var updates = handleMissedUpdates(environment, state);
+    if (updates != null) {
+      var hasStateUpdates = updates[0],
+        updatedState = updates[1];
+      if (hasStateUpdates) {
+        setState(updatedState);
+        state = updatedState;
+      }
+    }
+    hasPendingStateChanges.current = false;
+  }
   var data;
   if (isPlural) {
     var fragmentRefIsNullish = fragmentRef == null;
@@ -452,4 +488,4 @@ function useFragmentInternal_EXPERIMENTAL(fragmentNode, fragmentRef, hookDisplay
   }
   return data;
 }
-module.exports = useFragmentInternal_EXPERIMENTAL;
+module.exports = useFragmentInternal;

package/lib/relay-hooks/useLazyLoadQueryNode.js

@@ -1,12 +1,11 @@
 'use strict';
 
-var HooksImplementation = require('./HooksImplementation');
 var ProfilerContext = require('./ProfilerContext');
 var _require = require('./QueryResource'),
   getQueryCacheIdentifier = _require.getQueryCacheIdentifier,
   getQueryResourceForEnvironment = _require.getQueryResourceForEnvironment;
 var useFetchTrackingRef = require('./useFetchTrackingRef');
-var useFragmentNode = require('./useFragmentNode');
+var useFragmentInternal = require('./useFragmentInternal');
 var useRelayEnvironment = require('./useRelayEnvironment');
 var React = require('react');
 var useContext = React.useContext,
@@ -62,17 +61,7 @@ function useLazyLoadQueryNode(_ref) {
   });
   var fragmentNode = preparedQueryResult.fragmentNode,
     fragmentRef = preparedQueryResult.fragmentRef;
-  var data = useFragmentNodeImpl(fragmentNode, fragmentRef, componentDisplayName);
+  var data = useFragmentInternal(fragmentNode, fragmentRef, componentDisplayName);
   return data;
 }
-function useFragmentNodeImpl(fragment, key, componentDisplayName) {
-  var impl = HooksImplementation.get();
-  if (impl && impl.useFragment__internal) {
-    return impl.useFragment__internal(fragment, key, componentDisplayName);
-  } else {
-    var _useFragmentNode = useFragmentNode(fragment, key, componentDisplayName),
-      data = _useFragmentNode.data;
-    return data;
-  }
-}
 module.exports = useLazyLoadQueryNode;

package/lib/relay-hooks/usePaginationFragment.js

@@ -2,9 +2,9 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var HooksImplementation = require('./HooksImplementation');
 var useLoadMoreFunction = require('./useLoadMoreFunction');
-var useRefetchableFragmentNode = require('./useRefetchableFragmentNode');
+var useRefetchableFragmentInternal = require('./useRefetchableFragmentInternal');
+var useRelayEnvironment = require('./useRelayEnvironment');
 var useStaticFragmentNodeWarning = require('./useStaticFragmentNodeWarning');
 var _require = require('react'),
   useCallback = _require.useCallback,
@@ -14,7 +14,7 @@ var _require2 = require('relay-runtime'),
   getFragment = _require2.getFragment,
   getFragmentIdentifier = _require2.getFragmentIdentifier,
   getPaginationMetadata = _require2.getPaginationMetadata;
-function usePaginationFragment_LEGACY(fragmentInput, parentFragmentRef) {
+function usePaginationFragment(fragmentInput, parentFragmentRef) {
   var fragmentNode = getFragment(fragmentInput);
   useStaticFragmentNodeWarning(fragmentNode, 'first argument of usePaginationFragment()');
   var componentDisplayName = 'usePaginationFragment()';
@@ -22,7 +22,7 @@ function usePaginationFragment_LEGACY(fragmentInput, parentFragmentRef) {
     connectionPathInFragmentData = _getPaginationMetadat.connectionPathInFragmentData,
     paginationRequest = _getPaginationMetadat.paginationRequest,
     paginationMetadata = _getPaginationMetadat.paginationMetadata;
-  var _useRefetchableFragme = useRefetchableFragmentNode(fragmentNode, parentFragmentRef, componentDisplayName),
+  var _useRefetchableFragme = useRefetchableFragmentInternal(fragmentNode, parentFragmentRef, componentDisplayName),
     fragmentData = _useRefetchableFragme.fragmentData,
     fragmentRef = _useRefetchableFragme.fragmentRef,
     refetch = _useRefetchableFragme.refetch;
@@ -86,9 +86,21 @@ function usePaginationFragment_LEGACY(fragmentInput, parentFragmentRef) {
   };
 }
 function useLoadMore(args) {
+  var environment = useRelayEnvironment();
   var _useState = useState(false),
     isLoadingMore = _useState[0],
-    setIsLoadingMore = _useState[1];
+    reallySetIsLoadingMore = _useState[1];
+  var setIsLoadingMore = function setIsLoadingMore(value) {
+    var _environment$getSched;
+    var schedule = (_environment$getSched = environment.getScheduler()) === null || _environment$getSched === void 0 ? void 0 : _environment$getSched.schedule;
+    if (schedule) {
+      schedule(function () {
+        reallySetIsLoadingMore(value);
+      });
+    } else {
+      reallySetIsLoadingMore(value);
+    }
+  };
   var observer = {
     start: function start() {
       return setIsLoadingMore(true);
@@ -112,12 +124,4 @@ function useLoadMore(args) {
     disposeFetch = _useLoadMoreFunction[2];
   return [loadMore, hasMore, isLoadingMore, disposeFetch];
 }
-function usePaginationFragment(fragmentInput, parentFragmentRef) {
-  var impl = HooksImplementation.get();
-  if (impl) {
-    return impl.usePaginationFragment(fragmentInput, parentFragmentRef);
-  } else {
-    return usePaginationFragment_LEGACY(fragmentInput, parentFragmentRef);
-  }
-}
 module.exports = usePaginationFragment;

package/lib/relay-hooks/useRefetchableFragment.js

@@ -1,16 +1,15 @@
 'use strict';
 
-var HooksImplementation = require('./HooksImplementation');
-var useRefetchableFragmentNode = require('./useRefetchableFragmentNode');
+var useRefetchableFragmentInternal = require('./useRefetchableFragmentInternal');
 var useStaticFragmentNodeWarning = require('./useStaticFragmentNodeWarning');
 var _require = require('react'),
   useDebugValue = _require.useDebugValue;
 var _require2 = require('relay-runtime'),
   getFragment = _require2.getFragment;
-function useRefetchableFragment_LEGACY(fragmentInput, fragmentRef) {
+function useRefetchableFragment(fragmentInput, fragmentRef) {
   var fragmentNode = getFragment(fragmentInput);
   useStaticFragmentNodeWarning(fragmentNode, 'first argument of useRefetchableFragment()');
-  var _useRefetchableFragme = useRefetchableFragmentNode(fragmentNode, fragmentRef, 'useRefetchableFragment()'),
+  var _useRefetchableFragme = useRefetchableFragmentInternal(fragmentNode, fragmentRef, 'useRefetchableFragment()'),
     fragmentData = _useRefetchableFragme.fragmentData,
     refetch = _useRefetchableFragme.refetch;
   if (process.env.NODE_ENV !== "production") {
@@ -21,12 +20,4 @@ function useRefetchableFragment_LEGACY(fragmentInput, fragmentRef) {
   }
   return [fragmentData, refetch];
 }
-function useRefetchableFragment(fragmentInput, parentFragmentRef) {
-  var impl = HooksImplementation.get();
-  if (impl) {
-    return impl.useRefetchableFragment(fragmentInput, parentFragmentRef);
-  } else {
-    return useRefetchableFragment_LEGACY(fragmentInput, parentFragmentRef);
-  }
-}
 module.exports = useRefetchableFragment;

package/lib/relay-hooks/{experimental/useRefetchableFragmentInternal_EXPERIMENTAL.js → useRefetchableFragmentInternal.js}

@@ -2,14 +2,14 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var ProfilerContext = require('../ProfilerContext');
-var _require = require('../QueryResource'),
+var ProfilerContext = require('./ProfilerContext');
+var _require = require('./QueryResource'),
   getQueryResourceForEnvironment = _require.getQueryResourceForEnvironment;
-var useIsMountedRef = require('../useIsMountedRef');
-var useQueryLoader = require('../useQueryLoader');
-var useRelayEnvironment = require('../useRelayEnvironment');
-var readFragmentInternal = require('./readFragmentInternal_EXPERIMENTAL');
-var useFragmentInternal = require('./useFragmentInternal_EXPERIMENTAL');
+var readFragmentInternal = require('./readFragmentInternal');
+var useFragmentInternal = require('./useFragmentInternal');
+var useIsMountedRef = require('./useIsMountedRef');
+var useQueryLoader = require('./useQueryLoader');
+var useRelayEnvironment = require('./useRelayEnvironment');
 var invariant = require('invariant');
 var _require2 = require('react'),
   useCallback = _require2.useCallback,

package/multi-actor/useRelayActorEnvironment.js.flow

@@ -20,7 +20,7 @@ const ReactRelayContext = require('./../ReactRelayContext');
 const invariant = require('invariant');
 const {useContext} = require('react');
 
-function useRelayActorEnvironment(
+hook useRelayActorEnvironment(
   actorIdentifier: ActorIdentifier,
 ): IActorEnvironment {
   const context = useContext(ReactRelayContext);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-relay",
   "description": "A framework for building GraphQL-driven React applications.",
-  "version": "16.1.0",
+  "version": "17.0.0",
   "keywords": [
     "graphql",
     "relay",
@@ -20,7 +20,7 @@
     "fbjs": "^3.0.2",
     "invariant": "^2.2.4",
     "nullthrows": "^1.1.1",
-    "relay-runtime": "16.1.0"
+    "relay-runtime": "17.0.0"
   },
   "peerDependencies": {
     "react": "^16.9.0 || ^17 || ^18"