fix up types

Author: phryneas

src/core/ObservableQuery.ts

@@ -49,18 +49,20 @@ import type {
 
 const { assign, hasOwnProperty } = Object;
 
-export interface FetchMoreOptions<
+export type FetchMoreOptions<
   TData = unknown,
-  TVariables = OperationVariables,
-> {
+  TVariables extends OperationVariables = OperationVariables,
+  TFetchData = TData,
+  TFetchVars extends OperationVariables = TVariables,
+> = FetchMoreQueryOptions<TFetchVars, TFetchData> & {
   updateQuery?: (
-    previousQueryResult: TData,
+    previousQueryResult: Unmasked<TData>,
     options: {
-      fetchMoreResult?: TData;
-      variables?: TVariables;
+      fetchMoreResult: Unmasked<TFetchData>;
+      variables: TFetchVars;
     }
-  ) => TData;
-}
+  ) => Unmasked<TData>;
+};
 
 interface TrackedOperation {
   /**
@@ -714,15 +716,9 @@ Did you mean to call refetch(variables) instead of refetch({ variables })?`,
     context,
     errorPolicy,
     updateQuery,
-  }: FetchMoreQueryOptions<TFetchVars, TFetchData> & {
-    updateQuery?: (
-      previousQueryResult: Unmasked<TData>,
-      options: {
-        fetchMoreResult: Unmasked<TFetchData>;
-        variables: TFetchVars;
-      }
-    ) => Unmasked<TData>;
-  }): Promise<QueryResult<TFetchData>> {
+  }: FetchMoreOptions<TData, TVariables, TFetchData, TFetchVars>): Promise<
+    QueryResult<TFetchData>
+  > {
     const combinedOptions = {
       ...compact(
         this.options,

src/core/watchQueryOptions.ts

@@ -14,10 +14,10 @@ import type { IgnoreModifier } from "../cache/core/types/common.js";
 import type { ObservableQuery } from "./ObservableQuery.js";
 import type {
   DefaultContext,
-  NormalizedExecutionResult,
   InternalRefetchQueriesInclude,
   MutationQueryReducersMap,
   MutationUpdaterFunction,
+  NormalizedExecutionResult,
   OnQueryUpdated,
   OperationVariables,
 } from "./types.js";
@@ -140,14 +140,14 @@ export type FetchMoreQueryOptions<
   TData = unknown,
 > = {
   /** {@inheritDoc @apollo/client!QueryOptionsDocumentation#query:member} */
-  query: DocumentNode | TypedDocumentNode<TData, TVariables>;
-
+  query?: DocumentNode | TypedDocumentNode<TData, TVariables>;
+  /** {@inheritDoc @apollo/client!QueryOptionsDocumentation#variables:member} */
+  variables?: Partial<NoInfer<TVariables>>;
   /** {@inheritDoc @apollo/client!QueryOptionsDocumentation#errorPolicy:member} */
   errorPolicy?: ErrorPolicy;
-
   /** {@inheritDoc @apollo/client!QueryOptionsDocumentation#context:member} */
   context?: DefaultContext;
-} & VariablesOption<NoInfer<TVariables>>;
+};
 
 export type UpdateQueryOptions<TData, TVariables> = {
   variables?: TVariables;

src/react/hooks/useLoadableQuery.ts

@@ -6,7 +6,6 @@ import type {
   DefaultContext,
   DocumentNode,
   ErrorPolicy,
-  FetchMoreQueryOptions,
   OperationVariables,
   RefetchWritePolicy,
   TypedDocumentNode,
@@ -234,9 +233,7 @@ export function useLoadableQuery<
         );
       }
 
-      const promise = internalQueryRef.fetchMore(
-        options as FetchMoreQueryOptions<TVariables, TData>
-      );
+      const promise = internalQueryRef.fetchMore(options);
 
       setQueryRef(wrapQueryRef(internalQueryRef));
 

src/react/internal/cache/QueryReference.ts

@@ -5,6 +5,7 @@ import { filter } from "rxjs";
 import type {
   ApolloQueryResult,
   DataState,
+  FetchMoreOptions,
   ObservableQuery,
   OperationVariables,
   QueryResult,
@@ -30,10 +31,6 @@ type Listener<TData, TStates extends DataState<TData>["dataState"]> = (
   promise: QueryRefPromise<TData, TStates>
 ) => void;
 
-type FetchMoreOptions<TData> = Parameters<
-  ObservableQuery<TData>["fetchMore"]
->[0];
-
 const QUERY_REFERENCE_SYMBOL: unique symbol = Symbol.for(
   "apollo.internal.queryRef"
 );
@@ -350,7 +347,7 @@ export class InternalQueryReference<
     return this.initiateFetch(this.observable.refetch(variables));
   }
 
-  fetchMore(options: FetchMoreOptions<TData>) {
+  fetchMore(options: FetchMoreOptions<TData, any>) {
     return this.initiateFetch(this.observable.fetchMore<TData>(options));
   }
 

src/react/internal/types.ts

@@ -1,23 +1,14 @@
 import type {
-  FetchMoreQueryOptions,
+  FetchMoreOptions,
   MaybeMasked,
   OperationVariables,
   QueryResult,
-  Unmasked,
 } from "@apollo/client";
 
 export type RefetchFunction<TData, TVariables extends OperationVariables> = (
   variables?: Partial<TVariables>
 ) => Promise<QueryResult<TData>>;
 
 export type FetchMoreFunction<TData, TVariables extends OperationVariables> = (
-  fetchMoreOptions: FetchMoreQueryOptions<TVariables, TData> & {
-    updateQuery?: (
-      previousQueryResult: Unmasked<TData>,
-      options: {
-        fetchMoreResult: Unmasked<TData>;
-        variables: TVariables;
-      }
-    ) => Unmasked<TData>;
-  }
+  fetchMoreOptions: FetchMoreOptions<TData, TVariables>
 ) => Promise<QueryResult<MaybeMasked<TData>>>;