@apollo/client 4.0.0-alpha.3 → 4.0.0-alpha.4

package/__cjs/core/ObservableQuery.cjs

@@ -15,6 +15,7 @@ const invariant_1 = require("@apollo/client/utilities/invariant");
 const equalByQuery_js_1 = require("./equalByQuery.cjs");
 const networkStatus_js_1 = require("./networkStatus.cjs");
 const { assign, hasOwnProperty } = Object;
+const newNetworkStatusSymbol = Symbol();
 class ObservableQuery {
     options;
     queryId;
@@ -84,6 +85,7 @@ class ObservableQuery {
             this.options.notifyOnNetworkStatusChange) ||
             // TODO: Remove this behavior when unifying loading state for notifyOnNetworkStatusChange
             (this.options.fetchPolicy === "network-only" &&
+                !this.queryManager.prioritizeCacheValues &&
                 this.queryInfo.getDiff().complete) ||
             result !== this.initialResult));
         this["@@observable"] = () => this;
@@ -141,7 +143,11 @@ class ObservableQuery {
             loading: (0, networkStatus_js_1.isNetworkRequestInFlight)(networkStatus),
             networkStatus,
         };
-        const { fetchPolicy = "cache-first" } = this.options;
+        let { fetchPolicy = "cache-first" } = this.options;
+        const { prioritizeCacheValues } = this.queryManager;
+        if (prioritizeCacheValues) {
+            fetchPolicy = "cache-first";
+        }
         if (
         // These fetch policies should never deliver data from the cache, unless
         // redelivering a previously delivered result.
@@ -153,7 +159,7 @@ class ObservableQuery {
             this.queryManager.getDocumentInfo(this.query).hasForcedResolvers) {
             // Fall through.
         }
-        else if (this.waitForOwnResult) {
+        else if (this.waitForOwnResult && !prioritizeCacheValues) {
             // This would usually be a part of `QueryInfo.getDiff()`.
             // which we skip in the waitForOwnResult case since we are not
             // interested in the diff.
@@ -276,7 +282,10 @@ class ObservableQuery {
             };
         }
         this.queryInfo.resetLastWrite();
-        return this.reobserve(reobserveOptions, networkStatus_js_1.NetworkStatus.refetch);
+        return this.reobserve({
+            ...reobserveOptions,
+            [newNetworkStatusSymbol]: networkStatus_js_1.NetworkStatus.refetch,
+        });
     }
     /**
      * A function that helps you fetch the next set of results for a [paginated list field](https://www.apollographql.com/docs/react/pagination/core-api/).
@@ -450,9 +459,7 @@ class ObservableQuery {
             }
         };
     }
-    setOptions(newOptions) {
-        return this.reobserve(newOptions);
-    }
+    /** @internal */
     silentSetOptions(newOptions) {
         const mergedOptions = (0, utilities_1.compact)(this.options, newOptions || {});
         assign(this.options, mergedOptions);
@@ -491,7 +498,8 @@ class ObservableQuery {
             // Reset options.fetchPolicy to its original value.
             fetchPolicy: this.options.initialFetchPolicy,
             variables,
-        }, networkStatus_js_1.NetworkStatus.setVariables);
+            [newNetworkStatusSymbol]: networkStatus_js_1.NetworkStatus.setVariables,
+        });
     }
     /**
      * A function that enables you to update the query's cached result without executing a followup GraphQL operation.
@@ -556,7 +564,7 @@ class ObservableQuery {
                 // requests to be triggered only if the cache result is incomplete. To
                 // that end, the options.nextFetchPolicy option provides an easy way to
                 // update options.fetchPolicy after the initial network request, without
-                // having to call observableQuery.setOptions.
+                // having to call observableQuery.reobserve.
                 options.fetchPolicy = options.nextFetchPolicy(fetchPolicy, {
                     reason,
                     options,
@@ -611,7 +619,8 @@ class ObservableQuery {
                         fetchPolicy: this.options.initialFetchPolicy === "no-cache" ?
                             "no-cache"
                             : "network-only",
-                    }, networkStatus_js_1.NetworkStatus.poll).then(poll, poll);
+                        [newNetworkStatusSymbol]: networkStatus_js_1.NetworkStatus.poll,
+                    }).then(poll, poll);
                 }
                 else {
                     poll();
@@ -641,10 +650,20 @@ class ObservableQuery {
             ...(error ? { error } : null),
         });
     }
+    /**
+     * Reevaluate the query, optionally against new options. New options will be
+     * merged with the current options when given.
+     */
     // TODO: catch `EmptyError` and rethrow as network error if `complete`
     // notification is emitted without a value.
-    reobserve(newOptions, newNetworkStatus) {
+    reobserve(newOptions) {
         this.isTornDown = false;
+        let newNetworkStatus;
+        if (newOptions) {
+            newNetworkStatus = newOptions[newNetworkStatusSymbol];
+            // Avoid setting the symbol option in this.options
+            delete newOptions[newNetworkStatusSymbol];
+        }
         const useDisposableObservable = 
         // Refetching uses a disposable Observable to allow refetches using different
         // options/variables, without permanently altering the options of the