@apollo/client 3.13.4 → 3.13.6

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @apollo/client
 
+## 3.13.6
+
+### Patch Changes
+
+- [#12285](https://github.com/apollographql/apollo-client/pull/12285) [`cdc55ff`](https://github.com/apollographql/apollo-client/commit/cdc55ff54bf4c83ec8571508ec4bf8156af1bc97) Thanks [@phryneas](https://github.com/phryneas)! - keep ObservableQuery created by useQuery non-active before it is first subscribed
+
+## 3.13.5
+
+### Patch Changes
+
+- [#12461](https://github.com/apollographql/apollo-client/pull/12461) [`12c8d06`](https://github.com/apollographql/apollo-client/commit/12c8d06f1ef7cfbece8e3a63b7ad09d91334f663) Thanks [@jerelmiller](https://github.com/jerelmiller)! - Fix an issue where a `cache-first` query would return the result for previous variables when a cache update is issued after simultaneously changing variables and skipping the query.
+
 ## 3.13.4
 
 ### Patch Changes

package/apollo-client.cjs

@@ -7,10 +7,10 @@ var tsInvariant = require('ts-invariant');
 var equal = require('@wry/equality');
 var graphql = require('graphql');
 var caches = require('@wry/caches');
+var optimism = require('optimism');
 var zenObservableTs = require('zen-observable-ts');
 require('symbol-observable');
 var trie = require('@wry/trie');
-var optimism = require('optimism');
 var graphqlTag = require('graphql-tag');
 var React = require('rehackt');
 
@@ -31,7 +31,7 @@ function _interopNamespace(e) {
 var equal__default = /*#__PURE__*/_interopDefaultLegacy(equal);
 var React__namespace = /*#__PURE__*/_interopNamespace(React);
 
-var version = "3.13.4";
+var version = "3.13.6";
 
 function maybe(thunk) {
     try {
@@ -5169,7 +5169,13 @@ var ObservableQuery =  (function (_super) {
     tslib.__extends(ObservableQuery, _super);
     function ObservableQuery(_a) {
         var queryManager = _a.queryManager, queryInfo = _a.queryInfo, options = _a.options;
-        var _this = _super.call(this, function (observer) {
+        var _this = this;
+        var startedInactive = ObservableQuery.inactiveOnCreation.getValue();
+        _this = _super.call(this, function (observer) {
+            if (startedInactive) {
+                queryManager["queries"].set(_this.queryId, queryInfo);
+                startedInactive = false;
+            }
             try {
                 var subObserver = observer._subscription._observer;
                 if (subObserver && !subObserver.error) {
@@ -5549,8 +5555,9 @@ var ObservableQuery =  (function (_super) {
         return options.fetchPolicy;
     };
     ObservableQuery.prototype.fetch = function (options, newNetworkStatus, query) {
-        this.queryManager.setObservableQuery(this);
-        return this.queryManager["fetchConcastWithInfo"](this.queryId, options, newNetworkStatus, query);
+        var queryInfo = this.queryManager.getOrCreateQuery(this.queryId);
+        queryInfo.setObservableQuery(this);
+        return this.queryManager["fetchConcastWithInfo"](queryInfo, options, newNetworkStatus, query);
     };
     ObservableQuery.prototype.updatePolling = function () {
         var _this = this;
@@ -5732,6 +5739,7 @@ var ObservableQuery =  (function (_super) {
                 id: this.queryId,
             }) }) : result;
     };
+    ObservableQuery.inactiveOnCreation = new optimism.Slot();
     return ObservableQuery;
 }(zenObservableTs.Observable));
 fixObservableSubclass(ObservableQuery);
@@ -5809,6 +5817,7 @@ var QueryInfo =  (function () {
         }
         if (!equal.equal(query.variables, this.variables)) {
             this.lastDiff = void 0;
+            this.cancel();
         }
         Object.assign(this, {
             document: query.document,
@@ -5930,13 +5939,16 @@ var QueryInfo =  (function () {
             this.stopped = true;
             this.reset();
             this.cancel();
-            this.cancel = QueryInfo.prototype.cancel;
             var oq = this.observableQuery;
             if (oq)
                 oq.stopPolling();
         }
     };
-    QueryInfo.prototype.cancel = function () { };
+    QueryInfo.prototype.cancel = function () {
+        var _a;
+        (_a = this.cancelWatch) === null || _a === void 0 ? void 0 : _a.call(this);
+        this.cancelWatch = void 0;
+    };
     QueryInfo.prototype.updateWatch = function (variables) {
         var _this = this;
         if (variables === void 0) { variables = this.variables; }
@@ -5947,7 +5959,7 @@ var QueryInfo =  (function () {
         var watchOptions = tslib.__assign(tslib.__assign({}, this.getDiffOptions(variables)), { watcher: this, callback: function (diff) { return _this.setDiff(diff); } });
         if (!this.lastWatch || !equal.equal(watchOptions, this.lastWatch)) {
             this.cancel();
-            this.cancel = this.cache.watch((this.lastWatch = watchOptions));
+            this.cancelWatch = this.cache.watch((this.lastWatch = watchOptions));
         }
     };
     QueryInfo.prototype.resetLastWrite = function () {
@@ -6350,8 +6362,7 @@ var QueryManager =  (function () {
         return true;
     };
     QueryManager.prototype.fetchQuery = function (queryId, options, networkStatus) {
-        return this.fetchConcastWithInfo(queryId, options, networkStatus).concast
-            .promise;
+        return this.fetchConcastWithInfo(this.getOrCreateQuery(queryId), options, networkStatus).concast.promise;
     };
     QueryManager.prototype.getQueryStore = function () {
         var store = Object.create(null);
@@ -6419,7 +6430,9 @@ var QueryManager =  (function () {
             options: options,
         });
         observable["lastQuery"] = query;
-        this.queries.set(observable.queryId, queryInfo);
+        if (!ObservableQuery["inactiveOnCreation"].getValue()) {
+            this.queries.set(observable.queryId, queryInfo);
+        }
         queryInfo.init({
             document: query,
             observableQuery: observable,
@@ -6531,7 +6544,7 @@ var QueryManager =  (function () {
         if (legacyQueryOptions.size) {
             legacyQueryOptions.forEach(function (options) {
                 var queryId = makeUniqueId("legacyOneTimeQuery");
-                var queryInfo = _this.getQuery(queryId).init({
+                var queryInfo = _this.getOrCreateQuery(queryId).init({
                     document: options.query,
                     variables: options.variables,
                 });
@@ -6571,14 +6584,11 @@ var QueryManager =  (function () {
                 (fetchPolicy !== "standby" && fetchPolicy !== "cache-only")) {
                 observableQueryPromises.push(observableQuery.refetch());
             }
-            _this.getQuery(queryId).setDiff(null);
+            (_this.queries.get(queryId) || observableQuery["queryInfo"]).setDiff(null);
         });
         this.broadcastQueries();
         return Promise.all(observableQueryPromises);
     };
-    QueryManager.prototype.setObservableQuery = function (observableQuery) {
-        this.getQuery(observableQuery.queryId).setObservableQuery(observableQuery);
-    };
     QueryManager.prototype.startGraphQLSubscription = function (options) {
         var _this = this;
         var query = options.query, variables = options.variables;
@@ -6639,9 +6649,10 @@ var QueryManager =  (function () {
         this.removeQuery(queryId);
     };
     QueryManager.prototype.removeQuery = function (queryId) {
+        var _a;
         this.fetchCancelFns.delete(queryId);
         if (this.queries.has(queryId)) {
-            this.getQuery(queryId).stop();
+            (_a = this.queries.get(queryId)) === null || _a === void 0 ? void 0 : _a.stop();
             this.queries.delete(queryId);
         }
     };
@@ -6749,13 +6760,12 @@ var QueryManager =  (function () {
             throw error;
         });
     };
-    QueryManager.prototype.fetchConcastWithInfo = function (queryId, options,
+    QueryManager.prototype.fetchConcastWithInfo = function (queryInfo, options,
     networkStatus, query) {
         var _this = this;
         if (networkStatus === void 0) { networkStatus = exports.NetworkStatus.loading; }
         if (query === void 0) { query = options.query; }
         var variables = this.getVariables(query, options.variables);
-        var queryInfo = this.getQuery(queryId);
         var defaults = this.defaultOptions.watchQuery;
         var _a = options.fetchPolicy, fetchPolicy = _a === void 0 ? (defaults && defaults.fetchPolicy) || "cache-first" : _a, _b = options.errorPolicy, errorPolicy = _b === void 0 ? (defaults && defaults.errorPolicy) || "none" : _b, _c = options.returnPartialData, returnPartialData = _c === void 0 ? false : _c, _d = options.notifyOnNetworkStatusChange, notifyOnNetworkStatusChange = _d === void 0 ? false : _d, _e = options.context, context = _e === void 0 ? {} : _e;
         var normalized = Object.assign({}, options, {
@@ -6778,8 +6788,8 @@ var QueryManager =  (function () {
             }
             return sourcesWithInfo;
         };
-        var cleanupCancelFn = function () { return _this.fetchCancelFns.delete(queryId); };
-        this.fetchCancelFns.set(queryId, function (reason) {
+        var cleanupCancelFn = function () { return _this.fetchCancelFns.delete(queryInfo.queryId); };
+        this.fetchCancelFns.set(queryInfo.queryId, function (reason) {
             cleanupCancelFn();
             setTimeout(function () { return concast.cancel(reason); });
         });
@@ -6810,7 +6820,7 @@ var QueryManager =  (function () {
             this.getObservableQueries(include).forEach(function (oq, queryId) {
                 includedQueriesById.set(queryId, {
                     oq: oq,
-                    lastDiff: _this.getQuery(queryId).getDiff(),
+                    lastDiff: (_this.queries.get(queryId) || oq["queryInfo"]).getDiff(),
                 });
             });
         }
@@ -7006,7 +7016,7 @@ var QueryManager =  (function () {
                 return { fromLink: false, sources: [] };
         }
     };
-    QueryManager.prototype.getQuery = function (queryId) {
+    QueryManager.prototype.getOrCreateQuery = function (queryId) {
         if (queryId && !this.queries.has(queryId)) {
             this.queries.set(queryId, new QueryInfo(this, queryId));
         }
@@ -7897,7 +7907,9 @@ function useInternalState(client, query, options, renderPromises, makeWatchQuery
             observable:
             (renderPromises &&
                 renderPromises.getSSRObservable(makeWatchQueryOptions())) ||
-                client.watchQuery(getObsQueryOptions(void 0, client, options, makeWatchQueryOptions())),
+                ObservableQuery["inactiveOnCreation"].withValue(!renderPromises, function () {
+                    return client.watchQuery(getObsQueryOptions(void 0, client, options, makeWatchQueryOptions()));
+                }),
             resultData: {
                 previousData: (_a = previous === null || previous === void 0 ? void 0 : previous.resultData.current) === null || _a === void 0 ? void 0 : _a.data,
             },