Minor refactor (#12390)

jerelmiller · web-flow · commit 388ba97a09f1 · 2025-03-10T14:48:40.000-06:00
diff --git a/.api-reports/api-report-core.api.md b/.api-reports/api-report-core.api.md
@@ -2015,8 +2015,6 @@ class QueryManager<TStore> {
     // (undocumented)
     stopQuery(queryId: string): void;
     // (undocumented)
-    stopQueryInStore(queryId: string): void;
-    // (undocumented)
     transform(document: DocumentNode): DocumentNode;
     // (undocumented)
     watchQuery<T, TVariables extends OperationVariables = OperationVariables>(options: WatchQueryOptions<TVariables, T>): ObservableQuery<T, TVariables>;
diff --git a/.api-reports/api-report-react.api.md b/.api-reports/api-report-react.api.md
@@ -1773,8 +1773,6 @@ class QueryManager<TStore> {
     // (undocumented)
     stopQuery(queryId: string): void;
     // (undocumented)
-    stopQueryInStore(queryId: string): void;
-    // (undocumented)
     transform(document: DocumentNode): DocumentNode;
     // (undocumented)
     watchQuery<T, TVariables extends OperationVariables = OperationVariables>(options: WatchQueryOptions<TVariables, T>): ObservableQuery<T, TVariables>;
diff --git a/.api-reports/api-report-react_context.api.md b/.api-reports/api-report-react_context.api.md
@@ -1519,8 +1519,6 @@ class QueryManager<TStore> {
     // (undocumented)
     stopQuery(queryId: string): void;
     // (undocumented)
-    stopQueryInStore(queryId: string): void;
-    // (undocumented)
     transform(document: DocumentNode): DocumentNode;
     // (undocumented)
     watchQuery<T, TVariables extends OperationVariables = OperationVariables>(options: WatchQueryOptions<TVariables, T>): ObservableQuery<T, TVariables>;
diff --git a/.api-reports/api-report-react_hooks.api.md b/.api-reports/api-report-react_hooks.api.md
@@ -1644,8 +1644,6 @@ class QueryManager<TStore> {
     // (undocumented)
     stopQuery(queryId: string): void;
     // (undocumented)
-    stopQueryInStore(queryId: string): void;
-    // (undocumented)
     transform(document: DocumentNode): DocumentNode;
     // (undocumented)
     watchQuery<T, TVariables extends OperationVariables = OperationVariables>(options: WatchQueryOptions<TVariables, T>): ObservableQuery<T, TVariables>;
diff --git a/.api-reports/api-report-react_internal.api.md b/.api-reports/api-report-react_internal.api.md
@@ -1751,8 +1751,6 @@ class QueryManager<TStore> {
     // (undocumented)
     stopQuery(queryId: string): void;
     // (undocumented)
-    stopQueryInStore(queryId: string): void;
-    // (undocumented)
     transform(document: DocumentNode): DocumentNode;
     // (undocumented)
     watchQuery<T, TVariables extends OperationVariables = OperationVariables>(options: WatchQueryOptions<TVariables, T>): ObservableQuery<T, TVariables>;
diff --git a/.api-reports/api-report-react_ssr.api.md b/.api-reports/api-report-react_ssr.api.md
@@ -1504,8 +1504,6 @@ class QueryManager<TStore> {
     // (undocumented)
     stopQuery(queryId: string): void;
     // (undocumented)
-    stopQueryInStore(queryId: string): void;
-    // (undocumented)
     transform(document: DocumentNode): DocumentNode;
     // (undocumented)
     watchQuery<T, TVariables extends OperationVariables = OperationVariables>(options: WatchQueryOptions<TVariables, T>): ObservableQuery<T, TVariables>;
diff --git a/.api-reports/api-report-testing.api.md b/.api-reports/api-report-testing.api.md
@@ -1534,8 +1534,6 @@ class QueryManager<TStore> {
     // (undocumented)
     stopQuery(queryId: string): void;
     // (undocumented)
-    stopQueryInStore(queryId: string): void;
-    // (undocumented)
     transform(document: DocumentNode): DocumentNode;
     // (undocumented)
     watchQuery<T, TVariables extends OperationVariables = OperationVariables>(options: WatchQueryOptions<TVariables, T>): ObservableQuery<T, TVariables>;
diff --git a/.api-reports/api-report-testing_core.api.md b/.api-reports/api-report-testing_core.api.md
@@ -1534,8 +1534,6 @@ class QueryManager<TStore> {
     // (undocumented)
     stopQuery(queryId: string): void;
     // (undocumented)
-    stopQueryInStore(queryId: string): void;
-    // (undocumented)
     transform(document: DocumentNode): DocumentNode;
     // (undocumented)
     watchQuery<T, TVariables extends OperationVariables = OperationVariables>(options: WatchQueryOptions<TVariables, T>): ObservableQuery<T, TVariables>;
diff --git a/.api-reports/api-report-testing_react.api.md b/.api-reports/api-report-testing_react.api.md
@@ -1495,8 +1495,6 @@ class QueryManager<TStore> {
     // (undocumented)
     stopQuery(queryId: string): void;
     // (undocumented)
-    stopQueryInStore(queryId: string): void;
-    // (undocumented)
     transform(document: DocumentNode): DocumentNode;
     // (undocumented)
     watchQuery<T, TVariables extends OperationVariables = OperationVariables>(options: WatchQueryOptions<TVariables, T>): ObservableQuery<T, TVariables>;
diff --git a/.api-reports/api-report-utilities.api.md b/.api-reports/api-report-utilities.api.md
@@ -2320,8 +2320,6 @@ class QueryManager<TStore> {
     // (undocumented)
     stopQuery(queryId: string): void;
     // (undocumented)
-    stopQueryInStore(queryId: string): void;
-    // (undocumented)
     transform(document: DocumentNode): DocumentNode;
     // (undocumented)
     watchQuery<T, TVariables extends OperationVariables = OperationVariables>(options: WatchQueryOptions<TVariables, T>): ObservableQuery<T, TVariables>;
diff --git a/.api-reports/api-report.api.md b/.api-reports/api-report.api.md
@@ -2015,8 +2015,6 @@ class QueryManager<TStore> {
     // (undocumented)
     stopQuery(queryId: string): void;
     // (undocumented)
-    stopQueryInStore(queryId: string): void;
-    // (undocumented)
     transform(document: DocumentNode): DocumentNode;
     // (undocumented)
     watchQuery<T, TVariables extends OperationVariables = OperationVariables>(options: WatchQueryOptions<TVariables, T>): ObservableQuery<T, TVariables>;
diff --git a/.size-limits.json b/.size-limits.json
@@ -1,6 +1,6 @@
 {
-  "import { ApolloClient, InMemoryCache, HttpLink } from \"@apollo/client\" (CJS)": 44144,
-  "import { ApolloClient, InMemoryCache, HttpLink } from \"@apollo/client\" (production) (CJS)": 39543,
-  "import { ApolloClient, InMemoryCache, HttpLink } from \"@apollo/client\"": 34164,
-  "import { ApolloClient, InMemoryCache, HttpLink } from \"@apollo/client\" (production)": 29526
+  "import { ApolloClient, InMemoryCache, HttpLink } from \"@apollo/client\" (CJS)": 41903,
+  "import { ApolloClient, InMemoryCache, HttpLink } from \"@apollo/client\" (production) (CJS)": 41423,
+  "import { ApolloClient, InMemoryCache, HttpLink } from \"@apollo/client\"": 32087,
+  "import { ApolloClient, InMemoryCache, HttpLink } from \"@apollo/client\" (production)": 31494
 }
diff --git a/src/core/QueryManager.ts b/src/core/QueryManager.ts
@@ -211,7 +211,7 @@ export class QueryManager<TStore> {
    */
   public stop() {
     this.queries.forEach((_info, queryId) => {
-      this.stopQueryNoBroadcast(queryId);
+      this.removeQuery(queryId);
     });
 
     this.cancelPendingFetches(
@@ -832,16 +832,6 @@ export class QueryManager<TStore> {
     return String(this.mutationIdCounter++);
   }
 
-  public stopQueryInStore(queryId: string) {
-    this.stopQueryInStoreNoBroadcast(queryId);
-    this.broadcastQueries();
-  }
-
-  private stopQueryInStoreNoBroadcast(queryId: string) {
-    const queryInfo = this.queries.get(queryId);
-    if (queryInfo) queryInfo.stop();
-  }
-
   public clearStore(
     options: Cache.ResetOptions = {
       discardWatches: true,
@@ -1082,13 +1072,8 @@ export class QueryManager<TStore> {
   }
 
   public stopQuery(queryId: string) {
-    this.stopQueryNoBroadcast(queryId);
-    this.broadcastQueries();
-  }
-
-  private stopQueryNoBroadcast(queryId: string) {
-    this.stopQueryInStoreNoBroadcast(queryId);
     this.removeQuery(queryId);
+    this.broadcastQueries();
   }
 
   public removeQuery(queryId: string) {
@@ -1539,7 +1524,7 @@ export class QueryManager<TStore> {
         }
 
         if (queryId.indexOf("legacyOneTimeQuery") >= 0) {
-          this.stopQueryNoBroadcast(queryId);
+          this.removeQuery(queryId);
         }
       });
     }
