react-relay 0.0.0-main-87aabe9a → 0.0.0-main-ee43b7b9

package/ReactRelayContext.js

@@ -1,5 +1,5 @@
 /**
- * Relay v0.0.0-main-87aabe9a
+ * Relay v0.0.0-main-ee43b7b9
  *
  * Copyright (c) Meta Platforms, Inc. and affiliates.
  *

package/ReactRelayFragmentContainer.js.flow

@@ -45,8 +45,8 @@ type ContainerState = {
  * updates.
  */
 function createContainerWithFragments<
-  Props: {...},
-  TComponent: component(...Props),
+  Props extends {...},
+  TComponent extends component(...Props),
 >(
   Component: TComponent,
   fragments: FragmentMap,
@@ -265,7 +265,10 @@ function getRelayProp(environment: IEnvironment) {
  * `fragmentSpec` is memoized once per environment, rather than once per
  * instance of the container constructed/rendered.
  */
-function createContainer<Props: {...}, TComponent: component(...Props)>(
+function createContainer<
+  Props extends {...},
+  TComponent extends component(...Props),
+>(
   Component: TComponent,
   fragmentSpec: GeneratedNodeMap,
 ): component(...$RelayProps<Props, RelayProp>) {

package/ReactRelayLocalQueryRenderer.js.flow

@@ -45,7 +45,7 @@ const queryRendererContext: ReactRelayQueryRendererContextType = {
   rootIsQueryRenderer: true,
 };
 
-hook useDeepCompare<T: {...}>(value: T): T {
+hook useDeepCompare<T extends {...}>(value: T): T {
   const latestValue = React.useRef(value);
   // $FlowFixMe[react-rule-unsafe-ref]
   if (!areEqual(latestValue.current, value)) {

package/ReactRelayPaginationContainer.js.flow

@@ -318,8 +318,8 @@ function toObserver(observerOrCallback: ?ObserverOrCallback): Observer<void> {
 }
 
 function createContainerWithFragments<
-  Props: {...},
-  TComponent: component(...Props),
+  Props extends {...},
+  TComponent extends component(...Props),
 >(
   Component: TComponent,
   fragments: FragmentMap,
@@ -941,7 +941,10 @@ function createContainerWithFragments<
  * `fragmentSpec` is memoized once per environment, rather than once per
  * instance of the container constructed/rendered.
  */
-function createContainer<Props: {...}, TComponent: component(...Props)>(
+function createContainer<
+  Props extends {...},
+  TComponent extends component(...Props),
+>(
   Component: TComponent,
   fragmentSpec: GeneratedNodeMap,
   connectionConfig: ConnectionConfig,

package/ReactRelayRefetchContainer.js.flow

@@ -68,8 +68,8 @@ type ContainerState = {
  * updates.
  */
 function createContainerWithFragments<
-  Props: {...},
-  TComponent: component(...Props),
+  Props extends {...},
+  TComponent extends component(...Props),
 >(
   Component: TComponent,
   fragments: FragmentMap,
@@ -146,7 +146,7 @@ function createContainerWithFragments<
       prevState: ContainerState,
     ): Partial<ContainerState> | null {
       // Any props change could impact the query, so we mirror props in state.
-      // This is an unusual pattern, but necessary for this container usecase.
+      // This is an unusual pattern, but necessary for this container use case.
       const {prevProps} = prevState;
       const relayContext = assertRelayContext(nextProps.__relayContext);
       const rootIsQueryRenderer = nextProps.__rootIsQueryRenderer ?? false;
@@ -350,7 +350,7 @@ function createContainerWithFragments<
         typeof observerOrCallback === 'function'
           ? {
               error: observerOrCallback,
-              // callback is not exectued on complete or unsubscribe
+              // callback is not executed on complete or unsubscribe
               // for backward compatibility
               next: observerOrCallback,
             }
@@ -429,7 +429,7 @@ function createContainerWithFragments<
         })
         .finally(() => {
           // Finalizing a refetch should only clear this._refetchSubscription
-          // if the finizing subscription is the most recent call.
+          // if the finalizing subscription is the most recent call.
           if (this._refetchSubscription === refetchSubscription) {
             this._refetchSubscription = null;
           }
@@ -486,7 +486,10 @@ function getRelayProp(
  * `fragmentSpec` is memoized once per environment, rather than once per
  * instance of the container constructed/rendered.
  */
-function createContainer<Props: {...}, TComponent: component(...Props)>(
+function createContainer<
+  Props extends {...},
+  TComponent extends component(...Props),
+>(
   Component: TComponent,
   fragmentSpec: GeneratedNodeMap,
   taggedNode: GraphQLTaggedNode,

package/ReactRelayTypes.js.flow

@@ -99,7 +99,7 @@ export type $FragmentRef<T> = {
 
 /* $FlowExpectedError[unclear-type]: Intentional so that it won't fail,
  * even if the type we want to exclude doesn't exist in Props */
-type LooseOmitRelayProps<Props, K: keyof any> = Pick<
+type LooseOmitRelayProps<Props, K extends keyof any> = Pick<
   Props,
   Exclude<keyof Props, K>,
 >;
@@ -150,15 +150,13 @@ type MapRelayProp<T> = [+t: T] extends [+t: {+$fragmentType: empty, ...}]
                 ? ?ReadonlyArray<?$FragmentRef<NonNullable<V>>>
                 : T;
 
-export type RelayFragmentContainer<TComponent: component(...empty)> = component(
-  ...$RelayProps<React.ElementConfig<TComponent>, RelayProp>
-);
+export type RelayFragmentContainer<TComponent extends component(...empty)> =
+  component(...$RelayProps<React.ElementConfig<TComponent>, RelayProp>);
 
-export type RelayPaginationContainer<TComponent: component(...empty)> =
+export type RelayPaginationContainer<TComponent extends component(...empty)> =
   component(
     ...$RelayProps<React.ElementConfig<TComponent>, RelayPaginationProp>
   );
 
-export type RelayRefetchContainer<TComponent: component(...empty)> = component(
-  ...$RelayProps<React.ElementConfig<TComponent>, RelayRefetchProp>
-);
+export type RelayRefetchContainer<TComponent extends component(...empty)> =
+  component(...$RelayProps<React.ElementConfig<TComponent>, RelayRefetchProp>);

package/buildReactRelayContainer.js.flow

@@ -36,7 +36,7 @@ type ContainerCreator = (
  * Helper to create the Relay HOCs with ref forwarding, setting the displayName
  * and reading the React context.
  */
-function buildReactRelayContainer<TBase: component(...empty)>(
+function buildReactRelayContainer<TBase extends component(...empty)>(
   ComponentClass: TBase,
   fragmentSpec: GeneratedNodeMap,
   createContainerWithFragments: ContainerCreator,

package/getRootVariablesForFragments.js.flow

@@ -15,7 +15,7 @@ import type {FragmentMap, Variables} from 'relay-runtime';
 
 const {getSelector} = require('relay-runtime');
 
-function getRootVariablesForFragments<TProps: {...}>(
+function getRootVariablesForFragments<TProps extends {...}>(
   fragments: FragmentMap,
   props: TProps,
 ): Variables {

package/hooks.js

@@ -1,5 +1,5 @@
 /**
- * Relay v0.0.0-main-87aabe9a
+ * Relay v0.0.0-main-ee43b7b9
  *
  * Copyright (c) Meta Platforms, Inc. and affiliates.
  *

package/index.js

@@ -1,5 +1,5 @@
 /**
- * Relay v0.0.0-main-87aabe9a
+ * Relay v0.0.0-main-ee43b7b9
  *
  * Copyright (c) Meta Platforms, Inc. and affiliates.
  *

package/legacy.js

@@ -1,5 +1,5 @@
 /**
- * Relay v0.0.0-main-87aabe9a
+ * Relay v0.0.0-main-ee43b7b9
  *
  * Copyright (c) Meta Platforms, Inc. and affiliates.
  *

package/package.json

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

package/relay-hooks/EntryPointContainer.react.js.flow

@@ -24,10 +24,10 @@ const warning = require('warning');
 
 component EntryPointContainer<
   // $FlowFixMe[unsupported-variance-annotation]
-  TRuntimeProps: {...},
-  TRenders: React.Node,
+  TRuntimeProps extends {...},
+  TRenders extends React.Node,
   // $FlowFixMe[unsupported-variance-annotation]
-  TEntryPointComponent: EntryPointComponent<
+  TEntryPointComponent extends EntryPointComponent<
     // $FlowExpectedError[unclear-type] s[unclear-type] Use any to accept all kinds of EntryPointComponent
     any,
     // $FlowExpectedError[unclear-type] s[unclear-type] Use any to accept all kinds of EntryPointComponent

package/relay-hooks/EntryPointTypes.flow.js.flow

@@ -48,7 +48,7 @@ export type LoadQueryOptions = {
   +__nameForWarning?: ?string,
 };
 
-export type PreloadableConcreteRequest<+TQuery: OperationType> = {
+export type PreloadableConcreteRequest<+TQuery extends OperationType> = {
   kind: 'PreloadableConcreteRequest',
   params: RequestParameters,
   // Note: the phantom type parameter here helps ensures that the
@@ -62,14 +62,14 @@ export type PreloadableConcreteRequest<+TQuery: OperationType> = {
 export type EnvironmentProviderOptions = {+[string]: unknown, ...};
 
 export type PreloadedQuery<
-  +TQuery: OperationType,
+  +TQuery extends OperationType,
   TEnvironmentProviderOptions = EnvironmentProviderOptions,
 > =
   | PreloadedQueryInner_DEPRECATED<TQuery, TEnvironmentProviderOptions>
   | PreloadedQueryInner<TQuery, TEnvironmentProviderOptions>;
 
 export type PreloadedQueryInner_DEPRECATED<
-  +TQuery: OperationType,
+  +TQuery extends OperationType,
   TEnvironmentProviderOptions = EnvironmentProviderOptions,
 > = {
   +kind: 'PreloadedQuery_DEPRECATED',
@@ -86,7 +86,7 @@ export type PreloadedQueryInner_DEPRECATED<
 };
 
 export type PreloadedQueryInner<
-  +TQuery: OperationType,
+  +TQuery extends OperationType,
   TEnvironmentProviderOptions = EnvironmentProviderOptions,
 > = {
   // Releases query data and cancels network request if still in flight
@@ -131,7 +131,7 @@ TEntryPointComponent -  the root components
 export type EntryPoint<
   -TEntryPointParams,
   // $FlowExpectedError[unclear-type] accepts any root component
-  +TEntryPointComponent: EntryPointComponent<any, any, any, any, any>,
+  +TEntryPointComponent extends EntryPointComponent<any, any, any, any, any>,
 > = Readonly<{
   getPreloadProps: (
     entryPointParams: TEntryPointParams,
@@ -178,7 +178,7 @@ export type EntryPointComponent<
   TPreloadedEntryPoints = {},
   TRuntimeProps = {},
   TExtraProps = null,
-  +TRenders: React.Node = React.Node,
+  +TRenders extends React.Node = React.Node,
 > = component(
   ...EntryPointProps<
     TPreloadedQueries,
@@ -191,8 +191,8 @@ export type EntryPointComponent<
 // Return type of the `getPreloadProps(...)` of the entry point
 export type PreloadProps<
   // $FlowExpectedError[unclear-type] Need any to make it supertype of all PreloadedQuery
-  TPreloadedQueries: {+[string]: ?PreloadedQuery<any>},
-  TPreloadedEntryPoints: {...},
+  TPreloadedQueries extends {+[string]: ?PreloadedQuery<any>},
+  TPreloadedEntryPoints extends {...},
   TExtraProps = null,
   TEnvironmentProviderOptions = EnvironmentProviderOptions,
 > = Readonly<{
@@ -215,7 +215,7 @@ export type PreloadedEntryPoint<TEntryPointComponent> = Readonly<{
 }>;
 
 export type EntryPointElementConfig<
-  +TEntryPoint: EntryPoint<
+  +TEntryPoint extends EntryPoint<
     // $FlowExpectedError[unclear-type] Need any to make it supertype of all InternalEntryPointRepresentation
     any,
     // $FlowExpectedError[unclear-type] Need any to make it supertype of all InternalEntryPointRepresentation
@@ -230,7 +230,7 @@ export type EntryPointElementConfig<
     : empty;
 
 export type ThinQueryParams<
-  +TQuery: OperationType,
+  +TQuery extends OperationType,
   TEnvironmentProviderOptions,
 > = Readonly<{
   environmentProviderOptions?: ?TEnvironmentProviderOptions,
@@ -272,7 +272,7 @@ type ExtractThinQueryParams<T, TEnvironmentProviderOptions> = [+t: T] extends [
 export type ExtractQueryTypes<
   TEnvironmentProviderOptions,
   // $FlowExpectedError[unclear-type] Need any to make it supertype of all PreloadedQuery
-  PreloadedQueries: {+[string]: ?PreloadedQuery<any>} | void,
+  PreloadedQueries extends {+[string]: ?PreloadedQuery<any>} | void,
 > = {
   [K in keyof PreloadedQueries]: ExtractThinQueryParams<
     PreloadedQueries[K],
@@ -281,7 +281,7 @@ export type ExtractQueryTypes<
 };
 
 // $FlowFixMe[unclear-type]: we don't care about the props
-export type RootComponentRenders<+C: component(...any)> =
+export type RootComponentRenders<+C extends component(...any)> =
   // $FlowFixMe[unclear-type]: we don't care about the props
   C extends component(...any) renders infer R extends React.Node ? R : empty;
 

package/relay-hooks/LazyLoadEntryPointContainer_DEPRECATED.react.js.flow

@@ -62,19 +62,19 @@ function stableStringify(value: unknown): string {
 }
 
 function prepareEntryPoint<
-  TEntryPointParams: {...},
+  TEntryPointParams extends {...},
   // $FlowExpectedError[unclear-type] Need any to make it supertype of all PreloadedQuery
-  TPreloadedQueries: {+[string]: PreloadedQuery<any>},
-  TPreloadedEntryPoints: {...},
-  TRuntimeProps: {...},
+  TPreloadedQueries extends {+[string]: PreloadedQuery<any>},
+  TPreloadedEntryPoints extends {...},
+  TRuntimeProps extends {...},
   TExtraProps,
-  TEntryPointComponent: EntryPointComponent<
+  TEntryPointComponent extends EntryPointComponent<
     TPreloadedQueries,
     TPreloadedEntryPoints,
     TRuntimeProps,
     TExtraProps,
   >,
-  TEntryPoint: EntryPoint<TEntryPointParams, TEntryPointComponent>,
+  TEntryPoint extends EntryPoint<TEntryPointParams, TEntryPointComponent>,
 >(
   environmentProvider: IEnvironmentProvider<EnvironmentProviderOptions>,
   entryPoint: TEntryPoint,
@@ -155,11 +155,11 @@ function prepareEntryPoint<
 }
 
 function LazyLoadEntryPointContainer_DEPRECATED<
-  TEntryPointParams: {...},
+  TEntryPointParams extends {...},
   // $FlowExpectedError[unclear-type] Need any to make it supertype of all PreloadedQuery
-  TPreloadedQueries: {+[string]: PreloadedQuery<any>},
-  TPreloadedEntryPoints: {...},
-  TRuntimeProps: {...},
+  TPreloadedQueries extends {+[string]: PreloadedQuery<any>},
+  TPreloadedEntryPoints extends {...},
+  TRuntimeProps extends {...},
   TExtraProps,
 >({
   entryPoint,

package/relay-hooks/MatchContainer.js.flow

@@ -93,14 +93,20 @@ export type MatchPointer = {
   ...
 };
 
-export type MatchContainerProps<TProps: {...}, TFallback: React.Node> = {
+export type MatchContainerProps<
+  TProps extends {...},
+  TFallback extends React.Node,
+> = {
   +fallback?: ?TFallback,
   +loader: (module: unknown) => component(...TProps),
   +match: ?MatchPointer | ?TypenameOnlyPointer,
   +props?: TProps,
 };
 
-function MatchContainer<TProps: {...}, TFallback: React.Node | null>({
+function MatchContainer<
+  TProps extends {...},
+  TFallback extends React.Node | null,
+>({
   fallback,
   loader,
   match,

package/relay-hooks/RelayEnvironmentProvider.js.flow

@@ -30,7 +30,7 @@ type Props<TChildren> = Readonly<{
   ) => IActorEnvironment,
 }>;
 
-component RelayEnvironmentProvider<TChildren: React.Node>(
+component RelayEnvironmentProvider<TChildren extends React.Node>(
   ...props: Props<TChildren>
 ) renders TChildren {
   const {children, environment, getEnvironmentForActor} = props;

package/relay-hooks/__flowtests__/useBlockingPaginationFragment-flowtest.js.flow

@@ -30,8 +30,8 @@ import {
 } from './utils';
 
 type ExpectedReturnType<
-  TRefetchVariables: Variables,
-  TLoadMoreVariables: Variables,
+  TRefetchVariables extends Variables,
+  TLoadMoreVariables extends Variables,
   TFragmentData,
 > = {
   data: TFragmentData,

package/relay-hooks/__flowtests__/usePaginationFragment-flowtest.js.flow

@@ -30,8 +30,8 @@ import {
 } from './utils';
 
 type ExpectedReturnType<
-  TRefetchVariables: Variables,
-  TLoadMoreVariables: Variables,
+  TRefetchVariables extends Variables,
+  TLoadMoreVariables extends Variables,
   TFragmentData,
 > = {
   data: TFragmentData,

package/relay-hooks/legacy/useBlockingPaginationFragment.js.flow

@@ -60,10 +60,10 @@ type ReturnType<TVariables, TData, TKey> = {
 };
 
 hook useBlockingPaginationFragment<
-  TFragmentType: FragmentType,
-  TVariables: Variables,
+  TFragmentType extends FragmentType,
+  TVariables extends Variables,
   TData,
-  TKey: ?{+$fragmentSpreads: TFragmentType, ...},
+  TKey extends ?{+$fragmentSpreads: TFragmentType, ...},
 >(
   fragmentInput: RefetchableFragment<TFragmentType, TData, TVariables>,
   parentFragmentRef: TKey,
@@ -161,7 +161,7 @@ hook useBlockingPaginationFragment<
   };
 }
 
-hook useLoadMore<TVariables: Variables>(args: {
+hook useLoadMore<TVariables extends Variables>(args: {
   disableStoreUpdates: () => void,
   enableStoreUpdates: () => void,
   ...$Exact<Omit<UseLoadMoreFunctionArgs, 'observer' | 'onReset'>>,

package/relay-hooks/legacy/useFragmentNode.js.flow

@@ -20,13 +20,13 @@ const {useEffect, useState} = require('react');
 const {RelayFeatureFlags, getFragmentIdentifier} = require('relay-runtime');
 const warning = require('warning');
 
-type ReturnType<TFragmentData: unknown> = {
+type ReturnType<TFragmentData extends unknown> = {
   data: TFragmentData,
   disableStoreUpdates: () => void,
   enableStoreUpdates: () => void,
 };
 
-hook useFragmentNode<TFragmentData: unknown>(
+hook useFragmentNode<TFragmentData extends unknown>(
   fragmentNode: ReaderFragment,
   fragmentRef: unknown,
   componentDisplayName: string,

package/relay-hooks/legacy/useRefetchableFragmentNode.js.flow

@@ -46,7 +46,7 @@ const {
 const warning = require('warning');
 
 export type RefetchFn<
-  TQuery: OperationType,
+  TQuery extends OperationType,
   TOptions = Options,
 > = RefetchFnExact<TQuery, TOptions>;
 
@@ -56,16 +56,16 @@ export type RefetchFn<
 //  - Or, expects /a subset/ of the query variables if the provided key type is
 //    /non-null/.
 export type RefetchFnDynamic<
-  TQuery: OperationType,
-  TKey: ?{+$data?: unknown, ...},
+  TQuery extends OperationType,
+  TKey extends ?{+$data?: unknown, ...},
   TOptions = Options,
 > = [TKey] extends [{+$data?: unknown, ...}]
   ? RefetchFnInexact<TQuery, TOptions>
   : RefetchFnExact<TQuery, TOptions>;
 
 export type ReturnType<
-  TQuery: OperationType,
-  TKey: ?{+$data?: unknown, ...},
+  TQuery extends OperationType,
+  TKey extends ?{+$data?: unknown, ...},
   TOptions = Options,
 > = {
   fragmentData: unknown,
@@ -91,12 +91,12 @@ type RefetchFnBase<TVars, TOptions> = (
   options?: TOptions,
 ) => Disposable;
 
-type RefetchFnExact<TQuery: OperationType, TOptions = Options> = RefetchFnBase<
-  VariablesOf<TQuery>,
-  TOptions,
->;
+type RefetchFnExact<
+  TQuery extends OperationType,
+  TOptions = Options,
+> = RefetchFnBase<VariablesOf<TQuery>, TOptions>;
 type RefetchFnInexact<
-  TQuery: OperationType,
+  TQuery extends OperationType,
   TOptions = Options,
 > = RefetchFnBase<Partial<VariablesOf<TQuery>>, TOptions>;
 
@@ -163,8 +163,8 @@ function reducer(state: RefetchState, action: Action): RefetchState {
 }
 
 hook useRefetchableFragmentNode<
-  TQuery: OperationType,
-  TKey: ?{+$data?: unknown, ...},
+  TQuery extends OperationType,
+  TKey extends ?{+$data?: unknown, ...},
 >(
   fragmentNode: ReaderFragment,
   parentFragmentRef: unknown,
@@ -367,7 +367,7 @@ hook useRefetchableFragmentNode<
   };
 }
 
-hook useRefetchFunction<TQuery: OperationType>(
+hook useRefetchFunction<TQuery extends OperationType>(
   componentDisplayName: string,
   dispatch: (
     | {

package/relay-hooks/loadEntryPoint.js.flow

@@ -23,19 +23,19 @@ import type {
 const {loadQuery} = require('./loadQuery');
 
 function loadEntryPoint<
-  TEntryPointParams: {...},
+  TEntryPointParams extends {...},
   // $FlowExpectedError[unclear-type] Need any to make it supertype of all PreloadedQuery
-  TPreloadedQueries: {+[string]: PreloadedQuery<any>},
-  TPreloadedEntryPoints: {...},
-  TRuntimeProps: {...},
+  TPreloadedQueries extends {+[string]: PreloadedQuery<any>},
+  TPreloadedEntryPoints extends {...},
+  TRuntimeProps extends {...},
   TExtraProps,
-  TEntryPointComponent: EntryPointComponent<
+  TEntryPointComponent extends EntryPointComponent<
     TPreloadedQueries,
     TPreloadedEntryPoints,
     TRuntimeProps,
     TExtraProps,
   >,
-  TEntryPoint: EntryPoint<TEntryPointParams, TEntryPointComponent>,
+  TEntryPoint extends EntryPoint<TEntryPointParams, TEntryPointComponent>,
 >(
   environmentProvider: IEnvironmentProvider<EnvironmentProviderOptions>,
   entryPoint: TEntryPoint,

package/relay-hooks/loadQuery.js.flow

@@ -66,7 +66,7 @@ declare function loadQuery<
 ): PreloadedQueryInner<QueryType<T>, TEnvironmentProviderOptions>;
 
 function loadQuery<
-  TQuery: OperationType,
+  TQuery extends OperationType,
   TEnvironmentProviderOptions = EnvironmentProviderOptions,
 >(
   environment: IEnvironment,

package/relay-hooks/preloadQuery_DEPRECATED.js.flow

@@ -70,7 +70,10 @@ type PendingQueryEntry =
       status: PreloadQueryStatus,
     }>;
 
-function preloadQuery<TQuery: OperationType, TEnvironmentProviderOptions>(
+function preloadQuery<
+  TQuery extends OperationType,
+  TEnvironmentProviderOptions,
+>(
   environment: IEnvironment,
   preloadableRequest: GraphQLTaggedNode | PreloadableConcreteRequest<TQuery>,
   variables: VariablesOf<TQuery>,
@@ -138,7 +141,7 @@ function preloadQuery<TQuery: OperationType, TEnvironmentProviderOptions>(
   };
 }
 
-function preloadQueryDeduped<TQuery: OperationType>(
+function preloadQueryDeduped<TQuery extends OperationType>(
   environment: IEnvironment,
   pendingQueries: Map<string, PendingQueryEntry>,
   preloadableRequest: GraphQLTaggedNode | PreloadableConcreteRequest<TQuery>,

package/relay-hooks/prepareEntryPoint_DEPRECATED.js.flow

@@ -22,19 +22,19 @@ import type {
 const preloadQuery = require('./preloadQuery_DEPRECATED');
 
 function prepareEntryPoint<
-  TEntryPointParams: {...},
+  TEntryPointParams extends {...},
   // $FlowExpectedError[unclear-type] Need any to make it supertype of all PreloadedQuery
-  TPreloadedQueries: {+[string]: PreloadedQuery<any>},
-  TPreloadedEntryPoints: {...},
-  TRuntimeProps: {...},
+  TPreloadedQueries extends {+[string]: PreloadedQuery<any>},
+  TPreloadedEntryPoints extends {...},
+  TRuntimeProps extends {...},
   TExtraProps,
-  TEntryPointComponent: EntryPointComponent<
+  TEntryPointComponent extends EntryPointComponent<
     TPreloadedQueries,
     TPreloadedEntryPoints,
     TRuntimeProps,
     TExtraProps,
   >,
-  TEntryPoint: EntryPoint<TEntryPointParams, TEntryPointComponent>,
+  TEntryPoint extends EntryPoint<TEntryPointParams, TEntryPointComponent>,
 >(
   environmentProvider: IEnvironmentProvider<EnvironmentProviderOptions>,
   entryPoint: TEntryPoint,

package/relay-hooks/useClientQuery.js.flow

@@ -20,7 +20,7 @@ const useLazyLoadQuery = require('./useLazyLoadQuery');
  * These queries are consist of queries for client-only data,
  * schematized via local schema extensions and/or Relay resolvers.
  */
-hook useClientQuery<TVariables: Variables, TData, TRawResponse>(
+hook useClientQuery<TVariables extends Variables, TData, TRawResponse>(
   gqlQuery: ClientQuery<TVariables, TData, TRawResponse>,
   variables: NoInfer<TVariables>,
   options?: {

package/relay-hooks/useEntryPointLoader.js.flow

@@ -25,12 +25,12 @@ const useIsMountedRef = require('./useIsMountedRef');
 const {useCallback, useEffect, useRef, useState} = require('react');
 
 type UseEntryPointLoaderHookReturnType<
-  TEntryPointParams: {...},
-  TPreloadedQueries: {...},
-  TPreloadedEntryPoints: {...},
-  TRuntimeProps: {...},
+  TEntryPointParams extends {...},
+  TPreloadedQueries extends {...},
+  TPreloadedEntryPoints extends {...},
+  TRuntimeProps extends {...},
   TExtraProps,
-  TEntryPointComponent: EntryPointComponent<
+  TEntryPointComponent extends EntryPointComponent<
     TPreloadedQueries,
     TPreloadedEntryPoints,
     TRuntimeProps,
@@ -53,19 +53,19 @@ const initialNullEntryPointReferenceState: NullEntryPointReference = {
 };
 
 hook useLoadEntryPoint<
-  TEntryPointParams: {...},
+  TEntryPointParams extends {...},
   // $FlowExpectedError[unclear-type] Need any to make it supertype of all PreloadedQuery
-  TPreloadedQueries: {+[string]: PreloadedQuery<any>},
-  TPreloadedEntryPoints: {...},
-  TRuntimeProps: {...},
+  TPreloadedQueries extends {+[string]: PreloadedQuery<any>},
+  TPreloadedEntryPoints extends {...},
+  TRuntimeProps extends {...},
   TExtraProps,
-  TEntryPointComponent: EntryPointComponent<
+  TEntryPointComponent extends EntryPointComponent<
     TPreloadedQueries,
     TPreloadedEntryPoints,
     TRuntimeProps,
     TExtraProps,
   >,
-  TEntryPoint: EntryPoint<TEntryPointParams, TEntryPointComponent>,
+  TEntryPoint extends EntryPoint<TEntryPointParams, TEntryPointComponent>,
 >(
   environmentProvider: IEnvironmentProvider<EnvironmentProviderOptions>,
   entryPoint: TEntryPoint,

package/relay-hooks/useFragment.js.flow

@@ -24,25 +24,25 @@ type HasSpread<TFragmentType> = {
 };
 
 // if the key is non-nullable, return non-nullable value
-declare hook useFragment<TFragmentType: FragmentType, TData>(
+declare hook useFragment<TFragmentType extends FragmentType, TData>(
   fragment: Fragment<TFragmentType, TData>,
   key: HasSpread<TFragmentType>,
 ): TData;
 
 // if the key is nullable, return nullable value
-declare hook useFragment<TFragmentType: FragmentType, TData>(
+declare hook useFragment<TFragmentType extends FragmentType, TData>(
   fragment: Fragment<TFragmentType, TData>,
   key: ?HasSpread<TFragmentType>,
 ): ?TData;
 
 // if the key is a non-nullable array of keys, return non-nullable array
-declare hook useFragment<TFragmentType: FragmentType, TData>(
+declare hook useFragment<TFragmentType extends FragmentType, TData>(
   fragment: Fragment<TFragmentType, TData>,
   key: ReadonlyArray<HasSpread<TFragmentType>>,
 ): TData;
 
 // if the key is a nullable array of keys, return nullable array
-declare hook useFragment<TFragmentType: FragmentType, TData>(
+declare hook useFragment<TFragmentType extends FragmentType, TData>(
   fragment: Fragment<TFragmentType, TData>,
   key: ?ReadonlyArray<HasSpread<TFragmentType>>,
 ): ?TData;

package/relay-hooks/useIsParentQueryActive.js.flow

@@ -18,7 +18,7 @@ const useStaticFragmentNodeWarning = require('./useStaticFragmentNodeWarning');
 const {getFragment} = require('relay-runtime');
 
 hook useIsParentQueryActive<
-  TKey: ?{+$data?: unknown, +$fragmentSpreads: FragmentType, ...},
+  TKey extends ?{+$data?: unknown, +$fragmentSpreads: FragmentType, ...},
 >(
   fragmentInput: GraphQLTaggedNode,
   fragmentRef: TKey,

package/relay-hooks/useLazyLoadQuery.js.flow

@@ -30,7 +30,10 @@ const {
 // This separate type export is only needed as long as we are injecting
 // a separate hooks implementation in ./HooksImplementation -- it can
 // be removed after we stop doing that.
-export type UseLazyLoadQueryHookType = hook <TVariables: Variables, TData>(
+export type UseLazyLoadQueryHookType = hook <
+  TVariables extends Variables,
+  TData,
+>(
   gqlQuery: Query<TVariables, TData>,
   variables: TVariables,
   options?: Options,
@@ -86,7 +89,7 @@ type Options = {
  * @returns - `data`: Object that contains data which has been read out from the Relay store; the object matches the shape of specified query.
  *   - The Flow type for data will also match this shape, and contain types derived from the GraphQL Schema. For example, the type of `data` above is: `{| user: ?{| name: ?string |} |}`.
  */
-hook useLazyLoadQuery<TVariables: Variables, TData>(
+hook useLazyLoadQuery<TVariables extends Variables, TData>(
   /**
    * GraphQL query specified using a `graphql` template literal.
    */

package/relay-hooks/useLazyLoadQueryNode.js.flow

@@ -56,8 +56,8 @@ export type LazyLoadQueryNodeParams =
   | LazyLoadQueryNodeParamsWithoutQuery;
 
 hook useLazyLoadQueryNode<
-  TQuery: OperationType,
-  TParams: LazyLoadQueryNodeParams = LazyLoadQueryNodeParams,
+  TQuery extends OperationType,
+  TParams extends LazyLoadQueryNodeParams = LazyLoadQueryNodeParams,
 >(
   params: TParams,
 ): TParams extends LazyLoadQueryNodeParamsWithQuery

package/relay-hooks/useLoadMoreFunction.js.flow

@@ -40,7 +40,7 @@ const {
 } = require('relay-runtime');
 const warning = require('warning');
 
-export type LoadMoreFn<TVariables: Variables> = (
+export type LoadMoreFn<TVariables extends Variables> = (
   count: number,
   options?: {
     onComplete?: (Error | null) => void,
@@ -62,7 +62,7 @@ export type UseLoadMoreFunctionArgs = {
   onReset: () => void,
 };
 
-hook useLoadMoreFunction<TVariables: Variables>(
+hook useLoadMoreFunction<TVariables extends Variables>(
   args: UseLoadMoreFunctionArgs,
 ): [LoadMoreFn<TVariables>, boolean, () => void] {
   if (RelayFeatureFlags.ENABLE_ACTIVITY_COMPATIBILITY) {
@@ -76,7 +76,7 @@ hook useLoadMoreFunction<TVariables: Variables>(
   return useLoadMoreFunction_CURRENT(args);
 }
 
-hook useLoadMoreFunction_CURRENT<TVariables: Variables>(
+hook useLoadMoreFunction_CURRENT<TVariables extends Variables>(
   args: UseLoadMoreFunctionArgs,
 ): [LoadMoreFn<TVariables>, boolean, () => void] {
   const {

package/relay-hooks/useLoadMoreFunction_EXPERIMENTAL.js.flow

@@ -38,7 +38,7 @@ const {
 } = require('relay-runtime');
 const warning = require('warning');
 
-export type LoadMoreFn<TVariables: Variables> = (
+export type LoadMoreFn<TVariables extends Variables> = (
   count: number,
   options?: {
     onComplete?: (Error | null) => void,
@@ -60,7 +60,7 @@ export type UseLoadMoreFunctionArgs = {
   onReset: () => void,
 };
 
-hook useLoadMoreFunction_EXPERIMENTAL<TVariables: Variables>(
+hook useLoadMoreFunction_EXPERIMENTAL<TVariables extends Variables>(
   args: UseLoadMoreFunctionArgs,
 ): [
   // Function to load more data

package/relay-hooks/useMemoVariables.js.flow

@@ -21,7 +21,7 @@ const {useState} = require('react');
  * This is useful when a `variables` object is used as a value in a depencency
  * array as it might often be constructed during render.
  */
-hook useMemoVariables<TVariables: Variables | null>(
+hook useMemoVariables<TVariables extends Variables | null>(
   variables: TVariables,
 ): TVariables {
   const [mirroredVariables, setMirroredVariables] = useState(variables);

package/relay-hooks/useMutation.js.flow

@@ -30,7 +30,7 @@ const {commitMutation: defaultCommitMutation} = require('relay-runtime');
 
 const {useState, useEffect, useRef, useCallback} = React;
 
-export type UseMutationConfig<TMutation: MutationParameters> = {
+export type UseMutationConfig<TMutation extends MutationParameters> = {
   configs?: Array<DeclarativeMutationConfig>,
   onError?: ?(error: Error) => void,
   onCompleted?: ?(
@@ -63,7 +63,7 @@ type UseMutationConfigInternal<TVariables, TData, TRawResponse> = {
   variables: TVariables,
 };
 
-hook useMutation<TVariables: Variables, TData, TRawResponse = {...}>(
+hook useMutation<TVariables extends Variables, TData, TRawResponse = {...}>(
   mutation: Mutation<TVariables, TData, TRawResponse>,
   commitMutationFn?: (
     environment: IEnvironment,

package/relay-hooks/usePaginationFragment.js.flow

@@ -32,7 +32,10 @@ const {
   getPaginationMetadata,
 } = require('relay-runtime');
 
-type RefetchVariables<TVariables, TKey: ?{+$fragmentSpreads: unknown, ...}> =
+type RefetchVariables<
+  TVariables,
+  TKey extends ?{+$fragmentSpreads: unknown, ...},
+> =
   // NOTE: This type ensures that the type of the returned variables is either:
   //   - nullable if the provided ref type is nullable
   //   - non-nullable if the provided ref type is non-nullable
@@ -70,20 +73,20 @@ export type ReturnType<TVariables, TData, TKey> = {
 // a separate hooks implementation in ./HooksImplementation -- it can
 // be removed after we stop doing that.
 export type UsePaginationFragmentType = <
-  TFragmentType: FragmentType,
-  TVariables: Variables,
+  TFragmentType extends FragmentType,
+  TVariables extends Variables,
   TData,
-  TKey: ?{+$fragmentSpreads: TFragmentType, ...},
+  TKey extends ?{+$fragmentSpreads: TFragmentType, ...},
 >(
   fragmentInput: RefetchableFragment<TFragmentType, TData, TVariables>,
   parentFragmentRef: TKey,
 ) => ReturnType<TVariables, TData, TKey>;
 
 hook usePaginationFragment<
-  TFragmentType: FragmentType,
-  TVariables: Variables,
+  TFragmentType extends FragmentType,
+  TVariables extends Variables,
   TData,
-  TKey: ?{+$fragmentSpreads: TFragmentType, ...},
+  TKey extends ?{+$fragmentSpreads: TFragmentType, ...},
 >(
   fragmentInput: RefetchableFragment<TFragmentType, TData, TVariables>,
   parentFragmentRef: TKey,
@@ -168,7 +171,7 @@ hook usePaginationFragment<
   };
 }
 
-hook useLoadMore<TVariables: Variables>(
+hook useLoadMore<TVariables extends Variables>(
   args: Omit<UseLoadMoreFunctionArgs, 'observer' | 'onReset'>,
 ): [LoadMoreFn<TVariables>, boolean, boolean, () => void] {
   const environment = useRelayEnvironment();

package/relay-hooks/usePrefetchableForwardPaginationFragment.js.flow

@@ -43,7 +43,7 @@ const {
   getValueAtPath,
 } = require('relay-runtime');
 
-type LoadMoreFn<TVariables: Variables> = (
+type LoadMoreFn<TVariables extends Variables> = (
   count: number,
   options?: {
     onComplete?: (Error | null) => void,
@@ -79,11 +79,11 @@ export type GetExtraVariablesFn<TEdgeData, TData, TVariables, TKey> = ({
 }) => Partial<TVariables>;
 
 hook usePrefetchableForwardPaginationFragment<
-  TFragmentType: FragmentType,
-  TVariables: Variables,
+  TFragmentType extends FragmentType,
+  TVariables extends Variables,
   TData,
   TEdgeData,
-  TKey: ?{+$fragmentSpreads: TFragmentType, ...},
+  TKey extends ?{+$fragmentSpreads: TFragmentType, ...},
 >(
   fragmentInput: PrefetchableRefetchableFragment<
     TFragmentType,

package/relay-hooks/usePrefetchableForwardPaginationFragment_EXPERIMENTAL.js.flow

@@ -43,7 +43,7 @@ const {
   getValueAtPath,
 } = require('relay-runtime');
 
-type LoadMoreFn<TVariables: Variables> = (
+type LoadMoreFn<TVariables extends Variables> = (
   count: number,
   options?: {
     onComplete?: (Error | null) => void,
@@ -79,11 +79,11 @@ export type GetExtraVariablesFn<TEdgeData, TData, TVariables, TKey> = ({
 }) => Partial<TVariables>;
 
 hook usePrefetchableForwardPaginationFragment_EXPERIMENTAL<
-  TFragmentType: FragmentType,
-  TVariables: Variables,
+  TFragmentType extends FragmentType,
+  TVariables extends Variables,
   TData,
   TEdgeData,
-  TKey: ?{+$fragmentSpreads: TFragmentType, ...},
+  TKey extends ?{+$fragmentSpreads: TFragmentType, ...},
 >(
   fragmentInput: PrefetchableRefetchableFragment<
     TFragmentType,

package/relay-hooks/usePreloadedQuery.js.flow

@@ -29,7 +29,7 @@ const {
 const warning = require('warning');
 
 type PreloadedQuery<
-  TVariables: Variables,
+  TVariables extends Variables,
   TData,
   TRawResponse,
   TEnvironmentProviderOptions = EnvironmentProviderOptions,
@@ -52,9 +52,9 @@ type PreloadedQuery<
     >;
 
 declare hook usePreloadedQuery<
-  TVariables: Variables,
+  TVariables extends Variables,
   TData,
-  TRawResponse: ?{...} = void,
+  TRawResponse extends ?{...} = void,
 >(
   gqlQuery:
     | Query<TVariables, TData, TRawResponse>
@@ -66,9 +66,9 @@ declare hook usePreloadedQuery<
 ): TData;
 
 declare hook usePreloadedQuery<
-  TVariables: Variables,
+  TVariables extends Variables,
   TData,
-  TRawResponse: ?{...} = void,
+  TRawResponse extends ?{...} = void,
 >(
   gqlQuery:
     | Query<TVariables, TData, TRawResponse>
@@ -80,10 +80,10 @@ declare hook usePreloadedQuery<
 ): ?TData;
 
 hook usePreloadedQuery<
-  TVariables: Variables,
+  TVariables extends Variables,
   TData,
-  TRawResponse: ?{...} = void,
-  TPreloadedQuery: ?PreloadedQuery<
+  TRawResponse extends ?{...} = void,
+  TPreloadedQuery extends ?PreloadedQuery<
     TVariables,
     TData,
     NonNullable<TRawResponse>,

package/relay-hooks/useQueryLoader.js.flow

@@ -30,7 +30,7 @@ const useRelayEnvironment = require('./useRelayEnvironment');
 const {useCallback, useEffect, useRef, useState} = require('react');
 const {RelayFeatureFlags, getRequest} = require('relay-runtime');
 
-export type LoaderFn<TQuery: OperationType> = (
+export type LoaderFn<TQuery extends OperationType> = (
   variables: TQuery['variables'],
   options?: UseQueryLoaderLoadQueryOptions,
 ) => void;
@@ -51,10 +51,10 @@ const initialNullQueryReferenceState: NullQueryReference = {
 };
 
 function requestIsLiveQuery<
-  TVariables: Variables,
+  TVariables extends Variables,
   TData,
-  TRawResponse: ?{...} = void,
-  TQuery: OperationType = {
+  TRawResponse extends ?{...} = void,
+  TQuery extends OperationType = {
     response: TData,
     variables: TVariables,
     rawResponse?: NonNullable<TRawResponse>,
@@ -72,9 +72,9 @@ function requestIsLiveQuery<
 }
 
 export type UseQueryLoaderHookReturnType<
-  TVariables: Variables,
+  TVariables extends Variables,
   TData,
-  TRawResponse: ?{...} = void,
+  TRawResponse extends ?{...} = void,
 > = [
   ?PreloadedQuery<{
     response: TData,
@@ -86,17 +86,17 @@ export type UseQueryLoaderHookReturnType<
 ];
 
 declare function useQueryLoader<
-  TVariables: Variables,
+  TVariables extends Variables,
   TData,
-  TRawResponse: ?{...} = void,
+  TRawResponse extends ?{...} = void,
 >(
   preloadableRequest: Query<TVariables, TData, TRawResponse>,
 ): UseQueryLoaderHookReturnType<TVariables, TData>;
 
 declare function useQueryLoader<
-  TVariables: Variables,
+  TVariables extends Variables,
   TData,
-  TRawResponse: ?{...} = void,
+  TRawResponse extends ?{...} = void,
 >(
   preloadableRequest: Query<TVariables, TData, TRawResponse>,
   initialQueryReference: ?PreloadedQuery<{
@@ -106,12 +106,16 @@ declare function useQueryLoader<
   }>,
 ): UseQueryLoaderHookReturnType<TVariables, TData>;
 
-declare function useQueryLoader<TQuery: OperationType>(
+declare function useQueryLoader<TQuery extends OperationType>(
   preloadableRequest: PreloadableConcreteRequest<TQuery>,
   initialQueryReference?: ?PreloadedQuery<TQuery>,
 ): UseQueryLoaderHookReturnType<TQuery['variables'], TQuery['response']>;
 
-hook useQueryLoader<TVariables: Variables, TData, TRawResponse: ?{...} = void>(
+hook useQueryLoader<
+  TVariables extends Variables,
+  TData,
+  TRawResponse extends ?{...} = void,
+>(
   preloadableRequest: Query<TVariables, TData, TRawResponse>,
   initialQueryReference?: ?PreloadedQuery<{
     response: TData,
@@ -133,9 +137,9 @@ hook useQueryLoader<TVariables: Variables, TData, TRawResponse: ?{...} = void>(
 }
 
 hook useQueryLoader_CURRENT<
-  TVariables: Variables,
+  TVariables extends Variables,
   TData,
-  TRawResponse: ?{...} = void,
+  TRawResponse extends ?{...} = void,
 >(
   preloadableRequest: Query<TVariables, TData, TRawResponse>,
   initialQueryReference?: ?PreloadedQuery<{

package/relay-hooks/useQueryLoader_EXPERIMENTAL.js.flow

@@ -40,10 +40,10 @@ const initialNullQueryReferenceState: NullQueryReference = {
 };
 
 function requestIsLiveQuery<
-  TVariables: Variables,
+  TVariables extends Variables,
   TData,
-  TRawResponse: ?{...} = void,
-  TQuery: OperationType = {
+  TRawResponse extends ?{...} = void,
+  TQuery extends OperationType = {
     response: TData,
     variables: TVariables,
     rawResponse?: NonNullable<TRawResponse>,
@@ -63,9 +63,9 @@ function requestIsLiveQuery<
 const CLEANUP_TIMEOUT = 1000 * 60 * 5; // 5 minutes;
 
 hook useQueryLoader_EXPERIMENTAL<
-  TVariables: Variables,
+  TVariables extends Variables,
   TData,
-  TRawResponse: ?{...} = void,
+  TRawResponse extends ?{...} = void,
 >(
   preloadableRequest: Query<TVariables, TData, TRawResponse>,
   initialQueryReference?: ?PreloadedQuery<{

package/relay-hooks/useRefetchableFragment.js.flow

@@ -24,7 +24,10 @@ const useStaticFragmentNodeWarning = require('./useStaticFragmentNodeWarning');
 const {useDebugValue} = require('react');
 const {getFragment} = require('relay-runtime');
 
-type RefetchVariables<TVariables, TKey: ?{+$fragmentSpreads: unknown, ...}> =
+type RefetchVariables<
+  TVariables,
+  TKey extends ?{+$fragmentSpreads: unknown, ...},
+> =
   // NOTE: This type ensures that the type of the returned variables is either:
   //   - nullable if the provided ref type is nullable
   //   - non-nullable if the provided ref type is non-nullable
@@ -45,7 +48,7 @@ export type RefetchFn<TVariables, TKey, TOptions = Options> = RefetchFnBase<
 export type ReturnType<
   TVariables,
   TData,
-  TKey: ?{+$fragmentSpreads: unknown, ...},
+  TKey extends ?{+$fragmentSpreads: unknown, ...},
 > = [
   // NOTE: This type ensures that the type of the returned data is either:
   //   - nullable if the provided ref type is nullable
@@ -57,20 +60,20 @@ export type ReturnType<
 ];
 
 export type UseRefetchableFragmentType = <
-  TFragmentType: FragmentType,
-  TVariables: Variables,
+  TFragmentType extends FragmentType,
+  TVariables extends Variables,
   TData,
-  TKey: ?{+$fragmentSpreads: TFragmentType, ...},
+  TKey extends ?{+$fragmentSpreads: TFragmentType, ...},
 >(
   fragment: RefetchableFragment<TFragmentType, TData, TVariables>,
   key: TKey,
 ) => ReturnType<TVariables, TData, TKey>;
 
 hook useRefetchableFragment<
-  TFragmentType: FragmentType,
-  TVariables: Variables,
+  TFragmentType extends FragmentType,
+  TVariables extends Variables,
   TData,
-  TKey: ?{+$fragmentSpreads: TFragmentType, ...},
+  TKey extends ?{+$fragmentSpreads: TFragmentType, ...},
 >(
   fragmentInput: RefetchableFragment<TFragmentType, TData, TVariables>,
   fragmentRef: TKey,

package/relay-hooks/useRefetchableFragmentInternal.js.flow

@@ -46,7 +46,7 @@ const {
 const warning = require('warning');
 
 export type RefetchFn<
-  TQuery: OperationType,
+  TQuery extends OperationType,
   TOptions = Options,
 > = RefetchFnExact<TQuery, TOptions>;
 
@@ -56,16 +56,16 @@ export type RefetchFn<
 //  - Or, expects /a subset/ of the query variables if the provided key type is
 //    /non-null/.
 export type RefetchFnDynamic<
-  TQuery: OperationType,
-  TKey: ?{+$data?: unknown, ...},
+  TQuery extends OperationType,
+  TKey extends ?{+$data?: unknown, ...},
   TOptions = Options,
 > = [TKey] extends [{+$data?: unknown, ...}]
   ? RefetchFnInexact<TQuery, TOptions>
   : RefetchFnExact<TQuery, TOptions>;
 
 export type ReturnType<
-  TQuery: OperationType,
-  TKey: ?{+$data?: unknown, ...},
+  TQuery extends OperationType,
+  TKey extends ?{+$data?: unknown, ...},
   TOptions = Options,
 > = {
   fragmentData: unknown,
@@ -89,12 +89,12 @@ type RefetchFnBase<TVars, TOptions> = (
   options?: TOptions,
 ) => Disposable;
 
-type RefetchFnExact<TQuery: OperationType, TOptions = Options> = RefetchFnBase<
-  VariablesOf<TQuery>,
-  TOptions,
->;
+type RefetchFnExact<
+  TQuery extends OperationType,
+  TOptions = Options,
+> = RefetchFnBase<VariablesOf<TQuery>, TOptions>;
 type RefetchFnInexact<
-  TQuery: OperationType,
+  TQuery extends OperationType,
   TOptions = Options,
 > = RefetchFnBase<Readonly<Partial<VariablesOf<TQuery>>>, TOptions>;
 
@@ -161,8 +161,8 @@ function reducer(state: RefetchState, action: Action): RefetchState {
 }
 
 hook useRefetchableFragmentInternal<
-  TQuery: OperationType,
-  TKey: ?{+$data?: unknown, ...},
+  TQuery extends OperationType,
+  TKey extends ?{+$data?: unknown, ...},
 >(
   fragmentNode: ReaderFragment,
   parentFragmentRef: unknown,
@@ -355,7 +355,7 @@ hook useRefetchableFragmentInternal<
   };
 }
 
-hook useRefetchFunction<TQuery: OperationType>(
+hook useRefetchFunction<TQuery extends OperationType>(
   componentDisplayName: string,
   dispatch: (
     | {