@apollo/client 3.6.0-beta.8 → 3.6.0-beta.9

package/apollo-client.cjs

@@ -1294,7 +1294,7 @@ var concat = ApolloLink.concat;
 
 var execute = ApolloLink.execute;
 
-var version = '3.6.0-beta.8';
+var version = '3.6.0-beta.9';
 
 var hasOwnProperty$3 = Object.prototype.hasOwnProperty;
 function parseAndCheckHttpResponse(operations) {
@@ -4194,6 +4194,27 @@ var ObservableQuery = (function (_super) {
         this.options.pollInterval = 0;
         this.updatePolling();
     };
+    ObservableQuery.prototype.applyNextFetchPolicy = function (reason, options) {
+        if (options === void 0) { options = this.options; }
+        if (options.nextFetchPolicy) {
+            var _a = options.fetchPolicy, fetchPolicy = _a === void 0 ? "cache-first" : _a;
+            if (typeof options.nextFetchPolicy === "function") {
+                options.fetchPolicy = options.nextFetchPolicy(fetchPolicy, {
+                    reason: reason,
+                    options: options,
+                    observable: this,
+                    initialPolicy: this.initialFetchPolicy,
+                });
+            }
+            else if (reason === "variables-changed") {
+                options.fetchPolicy = this.initialFetchPolicy;
+            }
+            else {
+                options.fetchPolicy = options.nextFetchPolicy;
+            }
+        }
+        return options.fetchPolicy;
+    };
     ObservableQuery.prototype.fetch = function (options, newNetworkStatus) {
         this.queryManager.setObservableQuery(this);
         return this.queryManager.fetchQueryObservable(this.queryId, options, newNetworkStatus);
@@ -4265,7 +4286,7 @@ var ObservableQuery = (function (_super) {
                 newOptions.variables &&
                 !newOptions.fetchPolicy &&
                 !equal.equal(newOptions.variables, oldVariables)) {
-                options.fetchPolicy = this.initialFetchPolicy;
+                this.applyNextFetchPolicy("variables-changed");
                 if (newNetworkStatus === void 0) {
                     newNetworkStatus = exports.NetworkStatus.setVariables;
                 }
@@ -4337,14 +4358,6 @@ function logMissingFieldErrors(missing) {
         __DEV__ && tsInvariant.invariant.debug("Missing cache result fields: ".concat(JSON.stringify(missing)), missing);
     }
 }
-function applyNextFetchPolicy(options) {
-    var _a = options.fetchPolicy, fetchPolicy = _a === void 0 ? "cache-first" : _a, nextFetchPolicy = options.nextFetchPolicy;
-    if (nextFetchPolicy) {
-        options.fetchPolicy = typeof nextFetchPolicy === "function"
-            ? nextFetchPolicy.call(options, fetchPolicy)
-            : nextFetchPolicy;
-    }
-}
 
 var LocalState = (function () {
     function LocalState(_a) {
@@ -5510,7 +5523,9 @@ var QueryManager = (function () {
             : fromVariables(normalized.variables));
         concast.cleanup(function () {
             _this.fetchCancelFns.delete(queryId);
-            applyNextFetchPolicy(options);
+            if (queryInfo.observableQuery) {
+                queryInfo.observableQuery["applyNextFetchPolicy"]("after-fetch", options);
+            }
         });
         return concast;
     };
@@ -6596,7 +6611,6 @@ exports.HttpLink = HttpLink;
 exports.InMemoryCache = InMemoryCache;
 exports.MissingFieldError = MissingFieldError;
 exports.ObservableQuery = ObservableQuery;
-exports.applyNextFetchPolicy = applyNextFetchPolicy;
 exports.checkFetcher = checkFetcher;
 exports.concat = concat;
 exports.createHttpLink = createHttpLink;