Fix tree-shaking issues related to the useSuspenseQuery file

.changeset/empty-ladybugs-drive.md

@@ -0,0 +1,5 @@
+---
+"@apollo/client": patch
+---
+
+Fix tree-shaking issues related to the useSuspenseQuery file

src/react/hooks/internal/toApolloError.ts

@@ -0,0 +1,9 @@
+import type { ApolloQueryResult } from "../../../core/index.js";
+import { ApolloError } from "../../../core/index.js";
+import { isNonEmptyArray } from "../../../utilities/index.js";
+
+export function toApolloError(result: ApolloQueryResult<any>) {
+  return isNonEmptyArray(result.errors) ?
+      new ApolloError({ graphQLErrors: result.errors })
+    : result.error;
+}

src/react/hooks/internal/useWatchQueryOptions.ts

@@ -0,0 +1,63 @@
+import type {
+  ApolloClient,
+  DocumentNode,
+  OperationVariables,
+  TypedDocumentNode,
+  WatchQueryOptions,
+} from "../../../core/index.js";
+import { useDeepMemo } from "./index.js";
+import type { SkipToken } from "../constants.js";
+import { skipToken } from "../constants.js";
+import { validateOptions } from "../useSuspenseQuery.js";
+import type { SuspenseQueryHookOptions } from "../../types/types.js";
+
+export function useWatchQueryOptions<
+  TData,
+  TVariables extends OperationVariables,
+>({
+  client,
+  query,
+  options,
+}: UseWatchQueryOptionsHookOptions<TData, TVariables>): WatchQueryOptions<
+  TVariables,
+  TData
+> {
+  return useDeepMemo<WatchQueryOptions<TVariables, TData>>(() => {
+    if (options === skipToken) {
+      return { query, fetchPolicy: "standby" };
+    }
+
+    const fetchPolicy =
+      options.fetchPolicy ||
+      client.defaultOptions.watchQuery?.fetchPolicy ||
+      "cache-first";
+
+    const watchQueryOptions = {
+      ...options,
+      fetchPolicy,
+      query,
+      notifyOnNetworkStatusChange: false,
+      nextFetchPolicy: void 0,
+    };
+
+    if (__DEV__) {
+      validateOptions(watchQueryOptions);
+    }
+
+    // Assign the updated fetch policy after our validation since `standby` is
+    // not a supported fetch policy on its own without the use of `skip`.
+    if (options.skip) {
+      watchQueryOptions.fetchPolicy = "standby";
+    }
+
+    return watchQueryOptions;
+  }, [client, options, query]);
+}
+export interface UseWatchQueryOptionsHookOptions<
+  TData,
+  TVariables extends OperationVariables,
+> {
+  client: ApolloClient<unknown>;
+  query: DocumentNode | TypedDocumentNode<TData, TVariables>;
+  options: SkipToken | SuspenseQueryHookOptions<TData, TVariables>;
+}

src/react/hooks/useBackgroundQuery.ts

@@ -16,7 +16,7 @@ import {
 import type { CacheKey, QueryReference } from "../internal/index.js";
 import type { BackgroundQueryHookOptions, NoInfer } from "../types/types.js";
 import { __use, makeHookWrappable } from "./internal/index.js";
-import { useWatchQueryOptions } from "./useSuspenseQuery.js";
+import { useWatchQueryOptions } from "./internal/useWatchQueryOptions.js";
 import type { FetchMoreFunction, RefetchFunction } from "./useSuspenseQuery.js";
 import { canonicalStringify } from "../../cache/index.js";
 import type { DeepPartial } from "../../utilities/index.js";

src/react/hooks/useLoadableQuery.ts

@@ -16,7 +16,7 @@ import {
 import type { CacheKey, QueryReference } from "../internal/index.js";
 import type { LoadableQueryHookOptions } from "../types/types.js";
 import { __use, useRenderGuard } from "./internal/index.js";
-import { useWatchQueryOptions } from "./useSuspenseQuery.js";
+import { useWatchQueryOptions } from "./internal/useWatchQueryOptions.js";
 import type { FetchMoreFunction, RefetchFunction } from "./useSuspenseQuery.js";
 import { canonicalStringify } from "../../cache/index.js";
 import type {

src/react/hooks/useReadQuery.ts

@@ -6,7 +6,7 @@ import {
 } from "../internal/index.js";
 import type { QueryReference } from "../internal/index.js";
 import { __use, makeHookWrappable } from "./internal/index.js";
-import { toApolloError } from "./useSuspenseQuery.js";
+import { toApolloError } from "./internal/toApolloError.js";
 import { useSyncExternalStore } from "./useSyncExternalStore.js";
 import type { ApolloError } from "../../errors/index.js";
 import type { NetworkStatus } from "../../core/index.js";

src/react/hooks/useSuspenseQuery.ts

@@ -9,23 +9,24 @@ import type {
   WatchQueryFetchPolicy,
   FetchMoreQueryOptions,
   WatchQueryOptions,
+  ApolloError,
 } from "../../core/index.js";
-import { ApolloError, NetworkStatus } from "../../core/index.js";
+import { NetworkStatus } from "../../core/index.js";
 import type { DeepPartial } from "../../utilities/index.js";
-import { isNonEmptyArray } from "../../utilities/index.js";
 import { useApolloClient } from "./useApolloClient.js";
 import { DocumentType, verifyDocumentType } from "../parser/index.js";
 import type {
   SuspenseQueryHookOptions,
   ObservableQueryFields,
   NoInfer,
 } from "../types/types.js";
-import { __use, useDeepMemo, makeHookWrappable } from "./internal/index.js";
+import { __use, makeHookWrappable } from "./internal/index.js";
 import { getSuspenseCache } from "../internal/index.js";
 import { canonicalStringify } from "../../cache/index.js";
-import { skipToken } from "./constants.js";
 import type { SkipToken } from "./constants.js";
 import type { CacheKey, QueryKey } from "../internal/index.js";
+import { toApolloError } from "./internal/toApolloError.js";
+import { useWatchQueryOptions } from "./internal/useWatchQueryOptions.js";
 
 export interface UseSuspenseQueryResult<
   TData = unknown,
@@ -290,7 +291,7 @@ const wrapped = /*#__PURE__*/ makeHookWrappable(
 // @ts-expect-error Cannot assign to 'useSuspenseQuery' because it is a function.ts(2630)
 useSuspenseQuery = wrapped;
 
-function validateOptions(options: WatchQueryOptions) {
+export function validateOptions(options: WatchQueryOptions) {
   const { query, fetchPolicy, returnPartialData } = options;
 
   verifyDocumentType(query, DocumentType.Query);
@@ -325,61 +326,3 @@ function validatePartialDataReturn(
     );
   }
 }
-
-export function toApolloError(result: ApolloQueryResult<any>) {
-  return isNonEmptyArray(result.errors) ?
-      new ApolloError({ graphQLErrors: result.errors })
-    : result.error;
-}
-
-interface UseWatchQueryOptionsHookOptions<
-  TData,
-  TVariables extends OperationVariables,
-> {
-  client: ApolloClient<unknown>;
-  query: DocumentNode | TypedDocumentNode<TData, TVariables>;
-  options: SkipToken | SuspenseQueryHookOptions<TData, TVariables>;
-}
-
-export function useWatchQueryOptions<
-  TData,
-  TVariables extends OperationVariables,
->({
-  client,
-  query,
-  options,
-}: UseWatchQueryOptionsHookOptions<TData, TVariables>): WatchQueryOptions<
-  TVariables,
-  TData
-> {
-  return useDeepMemo<WatchQueryOptions<TVariables, TData>>(() => {
-    if (options === skipToken) {
-      return { query, fetchPolicy: "standby" };
-    }
-
-    const fetchPolicy =
-      options.fetchPolicy ||
-      client.defaultOptions.watchQuery?.fetchPolicy ||
-      "cache-first";
-
-    const watchQueryOptions = {
-      ...options,
-      fetchPolicy,
-      query,
-      notifyOnNetworkStatusChange: false,
-      nextFetchPolicy: void 0,
-    };
-
-    if (__DEV__) {
-      validateOptions(watchQueryOptions);
-    }
-
-    // Assign the updated fetch policy after our validation since `standby` is
-    // not a supported fetch policy on its own without the use of `skip`.
-    if (options.skip) {
-      watchQueryOptions.fetchPolicy = "standby";
-    }
-
-    return watchQueryOptions;
-  }, [client, options, query]);
-}