react-relay 17.0.0 → 18.0.0

package/ReactRelayContainerUtils.js.flow

@@ -11,11 +11,11 @@
 
 'use strict';
 
-function getComponentName(component: React$ComponentType<any>): string {
+function getComponentName(component: React.ComponentType<any>): string {
   return component.displayName || component.name || 'Component';
 }
 
-function getContainerName(Component: React$ComponentType<any>): string {
+function getContainerName(Component: React.ComponentType<any>): string {
   return 'Relay(' + getComponentName(Component) + ')';
 }
 

package/ReactRelayContext.js

@@ -1,5 +1,5 @@
 /**
- * Relay v17.0.0
+ * Relay v18.0.0
  *
  * Copyright (c) Meta Platforms, Inc. and affiliates.
  *

package/ReactRelayContext.js.flow

@@ -19,4 +19,4 @@ const {
 
 module.exports = (createRelayContext(
   React,
-): React$Context<RelayContext | null>);
+): React.Context<RelayContext | null>);

package/ReactRelayFragmentContainer.js.flow

@@ -51,7 +51,7 @@ function createContainerWithFragments<
   Component: TComponent,
   fragments: FragmentMap,
 ): React.ComponentType<
-  $RelayProps<React$ElementConfig<TComponent>, RelayProp>,
+  $RelayProps<React.ElementConfig<TComponent>, RelayProp>,
 > {
   const containerName = getContainerName(Component);
 
@@ -275,7 +275,7 @@ function createContainer<
   Component: TComponent,
   fragmentSpec: GeneratedNodeMap,
 ): React.AbstractComponent<
-  $RelayProps<React$ElementConfig<TComponent>, RelayProp>,
+  $RelayProps<React.ElementConfig<TComponent>, RelayProp>,
   Instance,
 > {
   // $FlowFixMe[incompatible-return]

package/ReactRelayPaginationContainer.js.flow

@@ -325,7 +325,7 @@ function createContainerWithFragments<
   fragments: FragmentMap,
   connectionConfig: ConnectionConfig,
 ): React.ComponentType<
-  $RelayProps<React$ElementConfig<TComponent>, RelayPaginationProp>,
+  $RelayProps<React.ElementConfig<TComponent>, RelayPaginationProp>,
 > {
   const componentName = getComponentName(Component);
   const containerName = getContainerName(Component);
@@ -942,7 +942,7 @@ function createContainer<Props: {...}, TComponent: React.ComponentType<Props>>(
   fragmentSpec: GeneratedNodeMap,
   connectionConfig: ConnectionConfig,
 ): React.ComponentType<
-  $RelayProps<React$ElementConfig<TComponent>, RelayPaginationProp>,
+  $RelayProps<React.ElementConfig<TComponent>, RelayPaginationProp>,
 > {
   // $FlowFixMe[incompatible-return]
   return buildReactRelayContainer(

package/ReactRelayQueryRenderer.js.flow

@@ -263,7 +263,7 @@ class ReactRelayQueryRenderer extends React.Component<Props, State> {
     });
   };
 
-  render(): React.Element<typeof ReactRelayContext.Provider> {
+  render(): React.MixedElement {
     const {renderProps, relayContext} = this.state;
     // Note that the root fragment results in `renderProps.props` is already
     // frozen by the store; this call is to freeze the renderProps object and

package/ReactRelayQueryRendererContext.js.flow

@@ -16,4 +16,4 @@ export type ReactRelayQueryRendererContext = {rootIsQueryRenderer: boolean};
 
 module.exports = (React.createContext({
   rootIsQueryRenderer: false,
-}): React$Context<ReactRelayQueryRendererContext | null>);
+}): React.Context<ReactRelayQueryRendererContext | null>);

package/ReactRelayRefetchContainer.js.flow

@@ -75,7 +75,7 @@ function createContainerWithFragments<
   fragments: FragmentMap,
   taggedNode: GraphQLTaggedNode,
 ): React.ComponentType<
-  $RelayProps<React$ElementConfig<TComponent>, RelayRefetchProp>,
+  $RelayProps<React.ElementConfig<TComponent>, RelayRefetchProp>,
 > {
   const containerName = getContainerName(Component);
 
@@ -491,7 +491,7 @@ function createContainer<Props: {...}, TComponent: React.ComponentType<Props>>(
   fragmentSpec: GeneratedNodeMap,
   taggedNode: GraphQLTaggedNode,
 ): React.ComponentType<
-  $RelayProps<React$ElementConfig<TComponent>, RelayRefetchProp>,
+  $RelayProps<React.ElementConfig<TComponent>, RelayRefetchProp>,
 > {
   // $FlowFixMe[incompatible-return]
   return buildReactRelayContainer(

package/ReactRelayTypes.js.flow

@@ -103,28 +103,55 @@ export type $FragmentRef<T> = {
  */
 // prettier-ignore
 // $FlowFixMe[extra-type-arg] xplat redux flow type error
-// $FlowFixMe[deprecated-type]
-export type $RelayProps<Props, RelayPropT = RelayProp> = $ObjMap<
-  $Diff<Props, { relay: RelayPropT | void, ... }>,
-  & (<T: { +$fragmentType: empty, ... }>( T) =>  T)
-  & (<T: { +$fragmentType: empty, ... }>(?T) => ?T)
-  & (<TFragmentType: FragmentType, T: { +$fragmentType: TFragmentType, ... }>(                 T ) =>                  $FragmentRef<T> )
-  & (<TFragmentType: FragmentType, T: { +$fragmentType: TFragmentType, ... }>(?                T ) => ?                $FragmentRef<T> )
-  & (<TFragmentType: FragmentType, T: { +$fragmentType: TFragmentType, ... }>( $ReadOnlyArray< T>) =>  $ReadOnlyArray< $FragmentRef<T>>)
-  & (<TFragmentType: FragmentType, T: { +$fragmentType: TFragmentType, ... }>(?$ReadOnlyArray< T>) => ?$ReadOnlyArray< $FragmentRef<T>>)
-  & (<TFragmentType: FragmentType, T: { +$fragmentType: TFragmentType, ... }>( $ReadOnlyArray<?T>) =>  $ReadOnlyArray<?$FragmentRef<T>>)
-  & (<TFragmentType: FragmentType, T: { +$fragmentType: TFragmentType, ... }>(?$ReadOnlyArray<?T>) => ?$ReadOnlyArray<?$FragmentRef<T>>)
-  & (<T>(T) => T),
+export type $RelayProps<Props, RelayPropT = RelayProp> = MapRelayProps<
+  $Diff<Props, {relay: RelayPropT | void, ...}>,
 >;
 
-export type RelayFragmentContainer<TComponent> = React$ComponentType<
-  $RelayProps<React$ElementConfig<TComponent>, RelayProp>,
+type MapRelayProps<Props> = {[K in keyof Props]: MapRelayProp<Props[K]>};
+type MapRelayProp<T> = [+t: T] extends [+t: {+$fragmentType: empty, ...}]
+  ? T
+  : [+t: T] extends [+t: ?{+$fragmentType: empty, ...}]
+    ? ?T
+    : [+t: T] extends [+t: {+$fragmentType: FragmentType, ...}]
+      ? $FragmentRef<T>
+      : [+t: T] extends [+t: ?{+$fragmentType: FragmentType, ...}]
+        ? ?$FragmentRef<$NonMaybeType<T>>
+        : [+t: T] extends [
+              +t: $ReadOnlyArray<
+                infer V extends {+$fragmentType: FragmentType, ...},
+              >,
+            ]
+          ? $ReadOnlyArray<$FragmentRef<V>>
+          : [+t: T] extends [
+                +t: ?$ReadOnlyArray<
+                  infer V extends {+$fragmentType: FragmentType, ...},
+                >,
+              ]
+            ? ?$ReadOnlyArray<$FragmentRef<V>>
+            : [+t: T] extends [
+                  +t: $ReadOnlyArray<?infer V extends {
+                    +$fragmentType: FragmentType,
+                    ...
+                  }>,
+                ]
+              ? $ReadOnlyArray<?$FragmentRef<$NonMaybeType<V>>>
+              : [+t: T] extends [
+                    +t: ?$ReadOnlyArray<?infer V extends {
+                      +$fragmentType: FragmentType,
+                      ...
+                    }>,
+                  ]
+                ? ?$ReadOnlyArray<?$FragmentRef<$NonMaybeType<V>>>
+                : T;
+
+export type RelayFragmentContainer<TComponent> = React.ComponentType<
+  $RelayProps<React.ElementConfig<TComponent>, RelayProp>,
 >;
 
-export type RelayPaginationContainer<TComponent> = React$ComponentType<
-  $RelayProps<React$ElementConfig<TComponent>, RelayPaginationProp>,
+export type RelayPaginationContainer<TComponent> = React.ComponentType<
+  $RelayProps<React.ElementConfig<TComponent>, RelayPaginationProp>,
 >;
 
-export type RelayRefetchContainer<TComponent> = React$ComponentType<
-  $RelayProps<React$ElementConfig<TComponent>, RelayRefetchProp>,
+export type RelayRefetchContainer<TComponent> = React.ComponentType<
+  $RelayProps<React.ElementConfig<TComponent>, RelayRefetchProp>,
 >;

package/__flowtests__/ReactRelayFragmentContainer-flowtest.js.flow

@@ -50,7 +50,7 @@ class BarComponent extends React.Component<{
   getNum(): number {
     return 42;
   }
-  render(): React.Element<'div'> {
+  render(): React.MixedElement {
     const reqLen = this.props.requiredProp.length;
     const optionalProp = this.props.optionalProp;
 
@@ -137,7 +137,7 @@ module.exports = {
         /** $FlowExpectedError: Bar `getNum` gives number, but `getString` assumes string  **/
         return bad ? 'not good' : ok;
       }
-      render(): React.Element<typeof Bar> {
+      render(): React.MixedElement {
         return (
           <Bar
             componentRef={(ref: empty) => {

package/buildReactRelayContainer.js.flow

@@ -28,15 +28,15 @@ const {getFragment} = require('relay-runtime');
 const {useContext} = React;
 
 type ContainerCreator = (
-  Component: React$ComponentType<any>,
+  Component: React.ComponentType<any>,
   fragments: FragmentMap,
-) => React$ComponentType<any>;
+) => React.ComponentType<any>;
 
 /**
  * Helper to create the Relay HOCs with ref forwarding, setting the displayName
  * and reading the React context.
  */
-function buildReactRelayContainer<TBase: React$ComponentType<any>>(
+function buildReactRelayContainer<TBase: React.ComponentType<any>>(
   ComponentClass: TBase,
   fragmentSpec: GeneratedNodeMap,
   createContainerWithFragments: ContainerCreator,
@@ -55,8 +55,8 @@ function buildReactRelayContainer<TBase: React$ComponentType<any>>(
   function ForwardRef(
     props: any,
     ref:
-      | ((null | React$ElementRef<TBase>) => mixed)
-      | {-current: null | React$ElementRef<TBase>, ...},
+      | ((null | React.ElementRef<TBase>) => mixed)
+      | {-current: null | React.ElementRef<TBase>, ...},
   ) {
     // $FlowFixMe[react-rule-hook]
     const context = useContext(ReactRelayContext);

package/hooks.js

@@ -1,5 +1,5 @@
 /**
- * Relay v17.0.0
+ * Relay v18.0.0
  *
  * Copyright (c) Meta Platforms, Inc. and affiliates.
  *

package/index.js

@@ -1,5 +1,5 @@
 /**
- * Relay v17.0.0
+ * Relay v18.0.0
  *
  * Copyright (c) Meta Platforms, Inc. and affiliates.
  *

package/legacy.js

@@ -1,5 +1,5 @@
 /**
- * Relay v17.0.0
+ * Relay v18.0.0
  *
  * Copyright (c) Meta Platforms, Inc. and affiliates.
  *

package/lib/relay-hooks/loadEntryPoint.js

@@ -16,11 +16,14 @@ function loadEntryPoint(environmentProvider, entryPoint, entryPointParams) {
   if (queries != null) {
     var queriesPropNames = Object.keys(queries);
     queriesPropNames.forEach(function (queryPropName) {
-      var _queries$queryPropNam = queries[queryPropName],
-        environmentProviderOptions = _queries$queryPropNam.environmentProviderOptions,
-        options = _queries$queryPropNam.options,
-        parameters = _queries$queryPropNam.parameters,
-        variables = _queries$queryPropNam.variables;
+      var query = queries[queryPropName];
+      if (query == null) {
+        return;
+      }
+      var environmentProviderOptions = query.environmentProviderOptions,
+        options = query.options,
+        parameters = query.parameters,
+        variables = query.variables;
       var environment = environmentProvider.getEnvironment(environmentProviderOptions);
       preloadedQueries[queryPropName] = loadQuery(environment, parameters, variables, {
         fetchPolicy: options === null || options === void 0 ? void 0 : options.fetchPolicy,

package/lib/relay-hooks/loadQuery.js

@@ -3,7 +3,6 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var invariant = require('invariant');
-var React = require('react');
 var _require = require('relay-runtime'),
   fetchQueryDeduped = _require.__internal.fetchQueryDeduped,
   Observable = _require.Observable,
@@ -13,19 +12,9 @@ var _require = require('relay-runtime'),
   createOperationDescriptor = _require.createOperationDescriptor,
   getRequest = _require.getRequest,
   getRequestIdentifier = _require.getRequestIdentifier;
-var warning = require("fbjs/lib/warning");
-var RenderDispatcher = null;
 var fetchKey = 100001;
-function useTrackLoadQueryInRender() {
-  if (RenderDispatcher === null) {
-    var _React$__SECRET_INTER, _React$__SECRET_INTER2;
-    RenderDispatcher = (_React$__SECRET_INTER = React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED) === null || _React$__SECRET_INTER === void 0 ? void 0 : (_React$__SECRET_INTER2 = _React$__SECRET_INTER.ReactCurrentDispatcher) === null || _React$__SECRET_INTER2 === void 0 ? void 0 : _React$__SECRET_INTER2.current;
-  }
-}
 function loadQuery(environment, preloadableRequest, variables, options, environmentProviderOptions) {
-  var _React$__SECRET_INTER3, _React$__SECRET_INTER4, _options$__nameForWar, _options$fetchPolicy;
-  var CurrentDispatcher = (_React$__SECRET_INTER3 = React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED) === null || _React$__SECRET_INTER3 === void 0 ? void 0 : (_React$__SECRET_INTER4 = _React$__SECRET_INTER3.ReactCurrentDispatcher) === null || _React$__SECRET_INTER4 === void 0 ? void 0 : _React$__SECRET_INTER4.current;
-  process.env.NODE_ENV !== "production" ? warning(RenderDispatcher == null || CurrentDispatcher !== RenderDispatcher, 'Relay: `%s` should not be called inside a React render function.', (_options$__nameForWar = options === null || options === void 0 ? void 0 : options.__nameForWarning) !== null && _options$__nameForWar !== void 0 ? _options$__nameForWar : 'loadQuery') : void 0;
+  var _options$fetchPolicy;
   fetchKey++;
   var fetchPolicy = (_options$fetchPolicy = options === null || options === void 0 ? void 0 : options.fetchPolicy) !== null && _options$fetchPolicy !== void 0 ? _options$fetchPolicy : 'store-or-network';
   var networkCacheConfig = (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, options === null || options === void 0 ? void 0 : options.networkCacheConfig), {}, {
@@ -201,6 +190,5 @@ function loadQuery(environment, preloadableRequest, variables, options, environm
   };
 }
 module.exports = {
-  loadQuery: loadQuery,
-  useTrackLoadQueryInRender: useTrackLoadQueryInRender
+  loadQuery: loadQuery
 };

package/lib/relay-hooks/useEntryPointLoader.js

@@ -3,20 +3,17 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
 var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/createForOfIteratorHelper"));
 var loadEntryPoint = require('./loadEntryPoint');
-var _require = require('./loadQuery'),
-  useTrackLoadQueryInRender = _require.useTrackLoadQueryInRender;
 var useIsMountedRef = require('./useIsMountedRef');
-var _require2 = require('react'),
-  useCallback = _require2.useCallback,
-  useEffect = _require2.useEffect,
-  useRef = _require2.useRef,
-  useState = _require2.useState;
+var _require = require('react'),
+  useCallback = _require.useCallback,
+  useEffect = _require.useEffect,
+  useRef = _require.useRef,
+  useState = _require.useState;
 var initialNullEntryPointReferenceState = {
   kind: 'NullEntryPointReference'
 };
 function useLoadEntryPoint(environmentProvider, entryPoint, options) {
   var _options$TEST_ONLY__i, _options$TEST_ONLY__i2, _options$TEST_ONLY__i3, _options$TEST_ONLY__i4;
-  useTrackLoadQueryInRender();
   var initialEntryPointReferenceInternal = (_options$TEST_ONLY__i = options === null || options === void 0 ? void 0 : (_options$TEST_ONLY__i2 = options.TEST_ONLY__initialEntryPointData) === null || _options$TEST_ONLY__i2 === void 0 ? void 0 : _options$TEST_ONLY__i2.entryPointReference) !== null && _options$TEST_ONLY__i !== void 0 ? _options$TEST_ONLY__i : initialNullEntryPointReferenceState;
   var initialEntryPointParamsInternal = (_options$TEST_ONLY__i3 = options === null || options === void 0 ? void 0 : (_options$TEST_ONLY__i4 = options.TEST_ONLY__initialEntryPointData) === null || _options$TEST_ONLY__i4 === void 0 ? void 0 : _options$TEST_ONLY__i4.entryPointParams) !== null && _options$TEST_ONLY__i3 !== void 0 ? _options$TEST_ONLY__i3 : null;
   var isMountedRef = useIsMountedRef();

package/lib/relay-hooks/useFragment.js

@@ -1,15 +1,12 @@
 'use strict';
 
-var _require = require('./loadQuery'),
-  useTrackLoadQueryInRender = _require.useTrackLoadQueryInRender;
 var useFragmentInternal = require('./useFragmentInternal');
 var useStaticFragmentNodeWarning = require('./useStaticFragmentNodeWarning');
-var _require2 = require('react'),
-  useDebugValue = _require2.useDebugValue;
-var _require3 = require('relay-runtime'),
-  getFragment = _require3.getFragment;
+var _require = require('react'),
+  useDebugValue = _require.useDebugValue;
+var _require2 = require('relay-runtime'),
+  getFragment = _require2.getFragment;
 function useFragment(fragment, key) {
-  useTrackLoadQueryInRender();
   var fragmentNode = getFragment(fragment);
   useStaticFragmentNodeWarning(fragmentNode, 'first argument of useFragment()');
   var data = useFragmentInternal(fragmentNode, key, 'useFragment()');