more type fixes

src/cache/inmemory/entityStore.ts

@@ -755,7 +755,11 @@ class Layer extends EntityStore {
   public getStorage(): StorageType {
     let p: EntityStore = this.parent;
     while ((p as Layer).parent) p = (p as Layer).parent;
-    return p.getStorage.apply(p, arguments);
+    return p.getStorage.apply(
+      p,
+      // @ts-expect-error
+      arguments
+    );
   }
 }
 

src/core/ObservableQuery.ts

@@ -929,13 +929,7 @@ Did you mean to call refetch(variables) instead of refetch({ variables })?`,
     newNetworkStatus?: NetworkStatus
   ) {
     return this.reobserveAsConcast(newOptions, newNetworkStatus).promise.then(
-      (value) => {
-        invariant(
-          value,
-          "A Concast finished without a result. This in an Apollo Client bug, please file a bug report."
-        );
-        return value;
-      }
+      ensureResult
     );
   }
 
@@ -1102,3 +1096,13 @@ function skipCacheDataFor(
     fetchPolicy === "standby"
   );
 }
+
+export function ensureResult<TData = any>(
+  value: ApolloQueryResult<TData> | undefined
+): ApolloQueryResult<TData> {
+  invariant(
+    value,
+    "A Concast finished without a result. This in an Apollo Client bug, please file a bug report."
+  );
+  return value;
+}

src/core/QueryInfo.ts

@@ -50,6 +50,7 @@ function wrapDestructiveCacheMethod(
         // that matters in any conceivable practical scenario.
         (destructiveMethodCounts.get(cache)! + 1) % 1e15
       );
+      // @ts-expect-error this is just too generic to be typed correctly
       return original.apply(this, arguments);
     };
   }
@@ -113,7 +114,7 @@ export class QueryInfo {
     // NetworkStatus.loading, but also possibly fetchMore, poll, refetch,
     // or setVariables.
     networkStatus?: NetworkStatus;
-    observableQuery?: ObservableQuery<any>;
+    observableQuery?: ObservableQuery<any, any>;
     lastRequestId?: number;
   }): this {
     let networkStatus = query.networkStatus || NetworkStatus.loading;
@@ -214,10 +215,10 @@ export class QueryInfo {
     }
   }
 
-  public readonly observableQuery: ObservableQuery<any> | null = null;
+  public readonly observableQuery: ObservableQuery<any, any> | null = null;
   private oqListener?: QueryListener;
 
-  setObservableQuery(oq: ObservableQuery<any> | null) {
+  setObservableQuery(oq: ObservableQuery<any, any> | null) {
     if (oq === this.observableQuery) return;
 
     if (this.oqListener) {

src/core/QueryManager.ts

@@ -51,7 +51,11 @@ import type {
   ErrorPolicy,
   MutationFetchPolicy,
 } from "./watchQueryOptions.js";
-import { ObservableQuery, logMissingFieldErrors } from "./ObservableQuery.js";
+import {
+  ObservableQuery,
+  ensureResult,
+  logMissingFieldErrors,
+} from "./ObservableQuery.js";
 import { NetworkStatus, isNetworkRequestInFlight } from "./networkStatus.js";
 import type {
   ApolloQueryResult,
@@ -479,7 +483,7 @@ export class QueryManager<TStore> {
       const results: any[] = [];
 
       this.refetchQueries({
-        updateCache: (cache: TCache) => {
+        updateCache: (cache) => {
           if (!skipCache) {
             cacheWrites.forEach((write) => cache.write(write));
           }
@@ -526,7 +530,7 @@ export class QueryManager<TStore> {
             // either a SingleExecutionResult or the final ExecutionPatchResult,
             // call the update function.
             if (isFinalResult) {
-              update(cache, result, {
+              update(cache as TCache, result, {
                 context: mutation.context,
                 variables: mutation.variables,
               });
@@ -616,8 +620,11 @@ export class QueryManager<TStore> {
     options: WatchQueryOptions<TVars, TData>,
     networkStatus?: NetworkStatus
   ): Promise<ApolloQueryResult<TData>> {
-    return this.fetchConcastWithInfo(queryId, options, networkStatus).concast
-      .promise;
+    return this.fetchConcastWithInfo(
+      queryId,
+      options,
+      networkStatus
+    ).concast.promise.then(ensureResult);
   }
 
   public getQueryStore() {
@@ -1301,7 +1308,7 @@ export class QueryManager<TStore> {
             normalized.variables,
             normalized.context
           )
-          .then(fromVariables)
+          .then(fromVariables as (Variables: any) => SourcesAndInfo<TData>)
           .then((sourcesWithInfo) => sourcesWithInfo.sources)
       );
       // there is just no way we can synchronously get the *right* value here,

src/link/http/HttpLink.ts

@@ -1,10 +1,8 @@
-import type { RequestHandler } from "../core/index.js";
 import { ApolloLink } from "../core/index.js";
 import type { HttpOptions } from "./selectHttpOptionsAndBody.js";
 import { createHttpLink } from "./createHttpLink.js";
 
 export class HttpLink extends ApolloLink {
-  public requester: RequestHandler;
   constructor(public options: HttpOptions = {}) {
     super(createHttpLink(options).request);
   }

src/link/http/iterators/reader.ts

@@ -6,7 +6,7 @@
 import { canUseAsyncIteratorSymbol } from "../../../utilities/index.js";
 
 interface ReaderIterator<T> {
-  next(): Promise<ReadableStreamReadResult<T>>;
+  next(): Promise<IteratorResult<T, T | undefined>>;
   [Symbol.asyncIterator]?(): AsyncIterator<T>;
 }
 
@@ -15,12 +15,20 @@ export default function readerIterator<T>(
 ): AsyncIterableIterator<T> {
   const iterator: ReaderIterator<T> = {
     next() {
-      return reader.read();
+      return reader.read() as Promise<
+        | ReadableStreamReadValueResult<T>
+        // DoneResult has `value` optional, which doesn't comply with an
+        // `IteratorResult`, so we assert it to `T | undefined` instead
+        | Required<ReadableStreamReadDoneResult<T | undefined>>
+      >;
     },
   };
 
   if (canUseAsyncIteratorSymbol) {
-    iterator[Symbol.asyncIterator] = function (): AsyncIterator<T> {
+    iterator[Symbol.asyncIterator] = function (): AsyncIterator<
+      T,
+      T | undefined
+    > {
       return this;
     };
   }

src/link/http/serializeFetchParameter.ts

@@ -9,7 +9,7 @@ export const serializeFetchParameter = (p: any, label: string) => {
   let serialized;
   try {
     serialized = JSON.stringify(p);
-  } catch (e) {
+  } catch (e: any) {
     const parseError = newInvariantError(
       `Network request failed. %s is not serializable: %s`,
       label,

src/react/cache/SuspenseCache.ts

@@ -32,7 +32,9 @@ export class SuspenseCache {
     cacheKey: CacheKey,
     createObservable: () => ObservableQuery<TData>
   ) {
-    const ref = this.queryRefs.lookupArray(cacheKey);
+    const ref = this.queryRefs.lookupArray(cacheKey) as {
+      current?: InternalQueryReference<TData>;
+    };
 
     if (!ref.current) {
       ref.current = new InternalQueryReference(createObservable(), {
@@ -44,6 +46,6 @@ export class SuspenseCache {
       });
     }
 
-    return ref.current as InternalQueryReference<TData>;
+    return ref.current;
   }
 }

src/react/hoc/mutation-hoc.tsx

@@ -86,6 +86,7 @@ export function withMutation<
 
         return (
           <Mutation ignoreResults {...opts} mutation={document}>
+            {/* @ts-expect-error */}
             {(
               mutate: MutationFunction<TData, TGraphQLVariables>,
               { data, ...r }: MutationResult<TData>

src/react/hooks/useBackgroundQuery.ts

@@ -1,8 +1,10 @@
 import * as React from "react";
 import type {
   DocumentNode,
+  FetchMoreQueryOptions,
   OperationVariables,
   TypedDocumentNode,
+  WatchQueryOptions,
 } from "../../core/index.js";
 import { useApolloClient } from "./useApolloClient.js";
 import { wrapQueryRef } from "../cache/QueryReference.js";
@@ -197,7 +199,7 @@ export function useBackgroundQuery<
   ];
 
   const queryRef = suspenseCache.getQueryRef(cacheKey, () =>
-    client.watchQuery(watchQueryOptions)
+    client.watchQuery(watchQueryOptions as WatchQueryOptions<any, any>)
   );
 
   const [promiseCache, setPromiseCache] = React.useState(
@@ -213,7 +215,7 @@ export function useBackgroundQuery<
 
   const fetchMore: FetchMoreFunction<TData, TVariables> = React.useCallback(
     (options) => {
-      const promise = queryRef.fetchMore(options);
+      const promise = queryRef.fetchMore(options as FetchMoreQueryOptions<any>);
 
       setPromiseCache((promiseCache) =>
         new Map(promiseCache).set(queryRef.key, queryRef.promise)

src/react/hooks/useLazyQuery.ts

@@ -75,6 +75,7 @@ export function useLazyQuery<
           // Only the first time populating execOptionsRef.current matters here.
           internalState.forceUpdateState();
         }
+        // @ts-expect-error this is just too generic to type
         return method.apply(this, arguments);
       };
     }

src/react/hooks/useMutation.ts

@@ -12,6 +12,7 @@ import type {
 import type {
   ApolloCache,
   DefaultContext,
+  MutationOptions,
   OperationVariables,
 } from "../../core/index.js";
 import { mergeOptions } from "../../utilities/index.js";
@@ -87,10 +88,10 @@ export function useMutation<
       }
 
       const mutationId = ++ref.current.mutationId;
-      const clientOptions = mergeOptions(baseOptions, executeOptions as any);
+      const clientOptions = mergeOptions(baseOptions, executeOptions);
 
       return client
-        .mutate(clientOptions)
+        .mutate(clientOptions as MutationOptions<TData, OperationVariables>)
         .then((response) => {
           const { data, errors } = response;
           const error =
@@ -102,7 +103,10 @@ export function useMutation<
             executeOptions.onError || ref.current.options?.onError;
 
           if (error && onError) {
-            onError(error, clientOptions);
+            onError(
+              error,
+              clientOptions as MutationOptions<TData, OperationVariables>
+            );
           }
 
           if (
@@ -126,7 +130,10 @@ export function useMutation<
             executeOptions.onCompleted || ref.current.options?.onCompleted;
 
           if (!error) {
-            onCompleted?.(response.data!, clientOptions);
+            onCompleted?.(
+              response.data!,
+              clientOptions as MutationOptions<TData, OperationVariables>
+            );
           }
 
           return response;
@@ -150,7 +157,10 @@ export function useMutation<
             executeOptions.onError || ref.current.options?.onError;
 
           if (onError) {
-            onError(error, clientOptions);
+            onError(
+              error,
+              clientOptions as MutationOptions<TData, OperationVariables>
+            );
 
             // TODO(brian): why are we returning this here???
             return { data: void 0, errors: error };

src/react/hooks/useSuspenseQuery.ts

@@ -189,7 +189,7 @@ export function useSuspenseQuery<
   ];
 
   const queryRef = suspenseCache.getQueryRef(cacheKey, () =>
-    client.watchQuery(watchQueryOptions)
+    client.watchQuery(watchQueryOptions as WatchQueryOptions<any, any>)
   );
 
   const [promiseCache, setPromiseCache] = React.useState(
@@ -236,18 +236,21 @@ export function useSuspenseQuery<
 
   const result = fetchPolicy === "standby" ? skipResult : __use(promise);
 
-  const fetchMore: FetchMoreFunction<TData, TVariables> = React.useCallback(
-    (options) => {
-      const promise = queryRef.fetchMore(options);
+  const fetchMore: FetchMoreFunction<TData | undefined, TVariables> =
+    React.useCallback(
+      (options) => {
+        const promise = queryRef.fetchMore(
+          options as WatchQueryOptions<TVariables, TData | undefined>
+        );
 
-      setPromiseCache((previousPromiseCache) =>
-        new Map(previousPromiseCache).set(queryRef.key, queryRef.promise)
-      );
+        setPromiseCache((previousPromiseCache) =>
+          new Map(previousPromiseCache).set(queryRef.key, queryRef.promise)
+        );
 
-      return promise;
-    },
-    [queryRef]
-  );
+        return promise;
+      },
+      [queryRef]
+    );
 
   const refetch: RefetchFunction<TData, TVariables> = React.useCallback(
     (variables) => {
@@ -262,13 +265,17 @@ export function useSuspenseQuery<
     [queryRef]
   );
 
-  const subscribeToMore: SubscribeToMoreFunction<TData, TVariables> =
-    React.useCallback(
-      (options) => queryRef.observable.subscribeToMore(options),
-      [queryRef]
-    );
+  const subscribeToMore: SubscribeToMoreFunction<
+    TData | undefined,
+    TVariables
+  > = React.useCallback(
+    (options) => queryRef.observable.subscribeToMore(options),
+    [queryRef]
+  );
 
-  return React.useMemo(() => {
+  return React.useMemo<
+    UseSuspenseQueryResult<TData | undefined, TVariables>
+  >(() => {
     return {
       client,
       data: result.data,

src/testing/core/mocking/mockSubscriptionLink.ts

@@ -15,7 +15,7 @@ export interface MockedSubscriptionResult {
 export class MockSubscriptionLink extends ApolloLink {
   public unsubscribers: any[] = [];
   public setups: any[] = [];
-  public operation: Operation;
+  public operation?: Operation;
 
   private observers: any[] = [];
 

src/testing/core/withConsoleSpy.ts

@@ -2,8 +2,7 @@ function wrapTestFunction(
   fn: (...args: any[]) => any,
   consoleMethodName: "log" | "warn" | "error"
 ) {
-  return function () {
-    const args = arguments;
+  return function (this: any, ...args: any[]) {
     const spy = jest.spyOn(console, consoleMethodName);
     spy.mockImplementation(() => {});
     return new Promise((resolve) => {

src/testing/internal/profile/profile.tsx

@@ -203,7 +203,7 @@ export function profile<
         return render;
       },
       async takeRender(options: NextRenderOptions = {}) {
-        let error: { message?: string } | undefined = undefined;
+        let error: unknown = undefined;
         try {
           return await Profiled.peekRender({
             [_stackTrace]: captureStackTrace(Profiled.takeRender),