@apollo/client 4.0.0-alpha.10 → 4.0.0-alpha.11

package/core/QueryManager.d.ts

@@ -2,15 +2,15 @@ import { Trie } from "@wry/trie";
 import type { DocumentNode } from "graphql";
 import { Observable } from "rxjs";
 import type { ApolloCache, Cache } from "@apollo/client/cache";
-import type { ApolloLink, FetchResult } from "@apollo/client/link/core";
+import type { FetchResult } from "@apollo/client/link/core";
 import type { MaybeMasked } from "@apollo/client/masking";
 import { DocumentTransform } from "@apollo/client/utilities";
-import type { DefaultOptions } from "./ApolloClient.js";
+import type { ApolloClient, DefaultOptions } from "./ApolloClient.js";
 import type { LocalState } from "./LocalState.js";
 import { NetworkStatus } from "./networkStatus.js";
 import { ObservableQuery } from "./ObservableQuery.js";
 import { QueryInfo } from "./QueryInfo.js";
-import type { ApolloQueryResult, DefaultContext, InternalRefetchQueriesInclude, InternalRefetchQueriesMap, InternalRefetchQueriesOptions, MutateResult, MutationUpdaterFunction, OnQueryUpdated, OperationVariables, QueryResult, SubscribeResult, TypedDocumentNode } from "./types.js";
+import type { ApolloQueryResult, ClientAwareness, DefaultContext, InternalRefetchQueriesInclude, InternalRefetchQueriesMap, InternalRefetchQueriesOptions, MutateResult, MutationUpdaterFunction, OnQueryUpdated, OperationVariables, QueryResult, SubscribeResult, TypedDocumentNode } from "./types.js";
 import type { ErrorPolicy, MutationFetchPolicy, MutationOptions, QueryOptions, SubscriptionOptions, WatchQueryFetchPolicy, WatchQueryOptions } from "./watchQueryOptions.js";
 interface MutationStoreValue {
     mutation: DocumentNode;
@@ -41,23 +41,21 @@ interface MaskOperationOptions<TData> {
     fetchPolicy?: WatchQueryFetchPolicy;
 }
 interface QueryManagerOptions {
-    cache: ApolloCache;
-    link: ApolloLink;
+    client: ApolloClient;
     defaultOptions: DefaultOptions;
     documentTransform: DocumentTransform | null | undefined;
     queryDeduplication: boolean;
     onBroadcast: undefined | (() => void);
     ssrMode: boolean;
-    clientAwareness: Record<string, string>;
+    clientAwareness: ClientAwareness;
     localState: LocalState;
     assumeImmutableResults: boolean;
     defaultContext: Partial<DefaultContext> | undefined;
     dataMasking: boolean;
 }
 export declare class QueryManager {
-    cache: ApolloCache;
-    link: ApolloLink;
     defaultOptions: DefaultOptions;
+    readonly client: ApolloClient;
     readonly assumeImmutableResults: boolean;
     readonly documentTransform: DocumentTransform;
     readonly ssrMode: boolean;
@@ -84,6 +82,8 @@ export declare class QueryManager {
     private queries;
     protected fetchCancelFns: Map<string, (error: any) => any>;
     constructor(options: QueryManagerOptions);
+    get link(): import("@apollo/client/link/core").ApolloLink;
+    get cache(): ApolloCache;
     /**
      * Call this method to terminate any active query processes, making it safe
      * to dispose of this QueryManager instance.
@@ -135,7 +135,6 @@ export declare class QueryManager {
     getObservableQueries(include?: InternalRefetchQueriesInclude): Map<string, ObservableQuery<any, OperationVariables>>;
     reFetchObservableQueries(includeStandby?: boolean): Promise<QueryResult<any>[]>;
     startGraphQLSubscription<TData = unknown>(options: SubscriptionOptions): Observable<SubscribeResult<TData>>;
-    stopQuery(queryId: string): void;
     removeQuery(queryId: string): void;
     broadcastQueries(): void;
     getLocalState(): LocalState;
@@ -151,9 +150,8 @@ export declare class QueryManager {
     maskFragment<TData = unknown>(options: MaskFragmentOptions<TData>): TData;
     private fetchQueryByPolicy;
     getOrCreateQuery(queryId: string): QueryInfo;
-    private prepareContext;
 }
-export interface ObservableAndInfo<TData> {
+interface ObservableAndInfo<TData> {
     fromLink: boolean;
     observable: Observable<ApolloQueryResult<TData>>;
 }

package/core/QueryManager.js

@@ -20,9 +20,8 @@ import { QueryInfo, shouldWriteResult, } from "./QueryInfo.js";
 const { hasOwnProperty } = Object.prototype;
 const IGNORE = {};
 export class QueryManager {
-    cache;
-    link;
     defaultOptions;
+    client;
     assumeImmutableResults;
     documentTransform;
     ssrMode;
@@ -56,8 +55,7 @@ export class QueryManager {
         const defaultDocumentTransform = new DocumentTransform((document) => this.cache.transformDocument(document), 
         // Allow the apollo cache to manage its own transform caches
         { cache: false });
-        this.cache = options.cache;
-        this.link = options.link;
+        this.client = options.client;
         this.defaultOptions = options.defaultOptions;
         this.queryDeduplication = options.queryDeduplication;
         this.clientAwareness = options.clientAwareness;
@@ -81,6 +79,12 @@ export class QueryManager {
             this.mutationStore = {};
         }
     }
+    get link() {
+        return this.client.link;
+    }
+    get cache() {
+        return this.client.cache;
+    }
     /**
      * Call this method to terminate any active query processes, making it safe
      * to dispose of this QueryManager instance.
@@ -496,7 +500,7 @@ export class QueryManager {
                 id: queryId,
             }),
         }))
-            .finally(() => this.stopQuery(queryId));
+            .finally(() => this.removeQuery(queryId));
     }
     queryIdCounter = 1;
     generateQueryId() {
@@ -690,10 +694,6 @@ export class QueryManager {
         }
         return makeObservable(variables);
     }
-    stopQuery(queryId) {
-        this.removeQuery(queryId);
-        this.broadcastQueries();
-    }
     removeQuery(queryId) {
         // teardown all links
         // Both `QueryManager.fetchRequest` and `QueryManager.query` create separate promises
@@ -723,16 +723,25 @@ export class QueryManager {
         this.queryDeduplication) {
         let observable;
         const { serverQuery, clientQuery } = this.getDocumentInfo(query);
+        const prepareContext = (context = {}) => {
+            const newContext = this.localState.prepareContext(context);
+            return {
+                ...this.defaultContext,
+                ...newContext,
+                queryDeduplication: deduplication,
+                clientAwareness: this.clientAwareness,
+            };
+        };
+        const executeContext = {
+            client: this.client,
+        };
         if (serverQuery) {
             const { inFlightLinkObservables, link } = this;
             const operation = {
                 query: serverQuery,
                 variables,
                 operationName: getOperationName(serverQuery) || void 0,
-                context: this.prepareContext({
-                    ...context,
-                    forceFetch: !deduplication,
-                }),
+                context: prepareContext(context),
                 extensions,
             };
             context = operation.context;
@@ -742,7 +751,7 @@ export class QueryManager {
                 const entry = inFlightLinkObservables.lookup(printedServerQuery, varJson);
                 observable = entry.observable;
                 if (!observable) {
-                    observable = entry.observable = execute(link, operation).pipe(onAnyEvent((event) => {
+                    observable = entry.observable = execute(link, operation, executeContext).pipe(onAnyEvent((event) => {
                         if ((event.type !== "next" ||
                             !("hasNext" in event.value) ||
                             !event.value.hasNext) &&
@@ -754,12 +763,12 @@ export class QueryManager {
                 }
             }
             else {
-                observable = execute(link, operation);
+                observable = execute(link, operation, executeContext);
             }
         }
         else {
             observable = of({ data: {} });
-            context = this.prepareContext(context);
+            context = prepareContext(context);
         }
         if (clientQuery) {
             observable = observable.pipe(mergeMap((result) => {
@@ -1201,14 +1210,6 @@ export class QueryManager {
         }
         return this.queries.get(queryId);
     }
-    prepareContext(context = {}) {
-        const newContext = this.localState.prepareContext(context);
-        return {
-            ...this.defaultContext,
-            ...newContext,
-            clientAwareness: this.clientAwareness,
-        };
-    }
 }
 function validateDidEmitValue() {
     let didEmitValue = false;