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

package/__cjs/core/QueryManager.cjs

@@ -27,9 +27,8 @@ const QueryInfo_js_1 = require("./QueryInfo.cjs");
 const { hasOwnProperty } = Object.prototype;
 const IGNORE = {};
 class QueryManager {
-    cache;
-    link;
     defaultOptions;
+    client;
     assumeImmutableResults;
     documentTransform;
     ssrMode;
@@ -63,8 +62,7 @@ class QueryManager {
         const defaultDocumentTransform = new utilities_4.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;
@@ -88,6 +86,12 @@ 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.
@@ -503,7 +507,7 @@ class QueryManager {
                 id: queryId,
             }),
         }))
-            .finally(() => this.stopQuery(queryId));
+            .finally(() => this.removeQuery(queryId));
     }
     queryIdCounter = 1;
     generateQueryId() {
@@ -697,10 +701,6 @@ 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
@@ -730,16 +730,25 @@ 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: (0, utilities_4.getOperationName)(serverQuery) || void 0,
-                context: this.prepareContext({
-                    ...context,
-                    forceFetch: !deduplication,
-                }),
+                context: prepareContext(context),
                 extensions,
             };
             context = operation.context;
@@ -749,7 +758,7 @@ class QueryManager {
                 const entry = inFlightLinkObservables.lookup(printedServerQuery, varJson);
                 observable = entry.observable;
                 if (!observable) {
-                    observable = entry.observable = (0, core_1.execute)(link, operation).pipe((0, internal_1.onAnyEvent)((event) => {
+                    observable = entry.observable = (0, core_1.execute)(link, operation, executeContext).pipe((0, internal_1.onAnyEvent)((event) => {
                         if ((event.type !== "next" ||
                             !("hasNext" in event.value) ||
                             !event.value.hasNext) &&
@@ -761,12 +770,12 @@ class QueryManager {
                 }
             }
             else {
-                observable = (0, core_1.execute)(link, operation);
+                observable = (0, core_1.execute)(link, operation, executeContext);
             }
         }
         else {
             observable = (0, rxjs_1.of)({ data: {} });
-            context = this.prepareContext(context);
+            context = prepareContext(context);
         }
         if (clientQuery) {
             observable = observable.pipe((0, rxjs_1.mergeMap)((result) => {
@@ -1208,14 +1217,6 @@ class QueryManager {
         }
         return this.queries.get(queryId);
     }
-    prepareContext(context = {}) {
-        const newContext = this.localState.prepareContext(context);
-        return {
-            ...this.defaultContext,
-            ...newContext,
-            clientAwareness: this.clientAwareness,
-        };
-    }
 }
 exports.QueryManager = QueryManager;
 function validateDidEmitValue() {