@apollo/client 3.13.5 → 3.13.7

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @apollo/client
 
+## 3.13.7
+
+### Patch Changes
+
+- [#12540](https://github.com/apollographql/apollo-client/pull/12540) [`0098932`](https://github.com/apollographql/apollo-client/commit/009893220934081f6e5733bff5863c768a597117) Thanks [@phryneas](https://github.com/phryneas)! - Refactor: Move notification scheduling logic from `QueryInfo` to `ObservableQuery`
+
+- [#12540](https://github.com/apollographql/apollo-client/pull/12540) [`0098932`](https://github.com/apollographql/apollo-client/commit/009893220934081f6e5733bff5863c768a597117) Thanks [@phryneas](https://github.com/phryneas)! - Refactored cache emit logic for ObservableQuery. This should be an invisible change.
+
+## 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

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.5";
+var version = "3.13.7";
 
 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) {
@@ -5197,6 +5203,7 @@ var ObservableQuery =  (function (_super) {
         }) || this;
         _this.observers = new Set();
         _this.subscriptions = new Set();
+        _this.dirty = false;
         _this.queryInfo = queryInfo;
         _this.queryManager = queryManager;
         _this.waitForOwnResult = skipCacheDataFor(options.fetchPolicy);
@@ -5440,7 +5447,7 @@ var ObservableQuery =  (function (_super) {
         })
             .finally(function () {
             if (isCached && !updatedQuerySet.has(_this.query)) {
-                reobserveCacheFirst(_this);
+                _this.reobserveCacheFirst();
             }
         });
     };
@@ -5549,8 +5556,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,25 +5740,62 @@ var ObservableQuery =  (function (_super) {
                 id: this.queryId,
             }) }) : result;
     };
+    ObservableQuery.prototype.resetNotifications = function () {
+        this.cancelNotifyTimeout();
+        this.dirty = false;
+    };
+    ObservableQuery.prototype.cancelNotifyTimeout = function () {
+        if (this.notifyTimeout) {
+            clearTimeout(this.notifyTimeout);
+            this.notifyTimeout = void 0;
+        }
+    };
+    ObservableQuery.prototype.scheduleNotify = function () {
+        var _this = this;
+        if (this.dirty)
+            return;
+        this.dirty = true;
+        if (!this.notifyTimeout) {
+            this.notifyTimeout = setTimeout(function () { return _this.notify(); }, 0);
+        }
+    };
+    ObservableQuery.prototype.notify = function () {
+        this.cancelNotifyTimeout();
+        if (this.dirty) {
+            if (this.options.fetchPolicy == "cache-only" ||
+                this.options.fetchPolicy == "cache-and-network" ||
+                !isNetworkRequestInFlight(this.queryInfo.networkStatus)) {
+                var diff = this.queryInfo.getDiff();
+                if (diff.fromOptimisticTransaction) {
+                    this.observe();
+                }
+                else {
+                    this.reobserveCacheFirst();
+                }
+            }
+        }
+        this.dirty = false;
+    };
+    ObservableQuery.prototype.reobserveCacheFirst = function () {
+        var _a = this.options, fetchPolicy = _a.fetchPolicy, nextFetchPolicy = _a.nextFetchPolicy;
+        if (fetchPolicy === "cache-and-network" || fetchPolicy === "network-only") {
+            return this.reobserve({
+                fetchPolicy: "cache-first",
+                nextFetchPolicy: function (currentFetchPolicy, context) {
+                    this.nextFetchPolicy = nextFetchPolicy;
+                    if (typeof this.nextFetchPolicy === "function") {
+                        return this.nextFetchPolicy(currentFetchPolicy, context);
+                    }
+                    return fetchPolicy;
+                },
+            });
+        }
+        return this.reobserve();
+    };
+    ObservableQuery.inactiveOnCreation = new optimism.Slot();
     return ObservableQuery;
 }(zenObservableTs.Observable));
 fixObservableSubclass(ObservableQuery);
-function reobserveCacheFirst(obsQuery) {
-    var _a = obsQuery.options, fetchPolicy = _a.fetchPolicy, nextFetchPolicy = _a.nextFetchPolicy;
-    if (fetchPolicy === "cache-and-network" || fetchPolicy === "network-only") {
-        return obsQuery.reobserve({
-            fetchPolicy: "cache-first",
-            nextFetchPolicy: function (currentFetchPolicy, context) {
-                this.nextFetchPolicy = nextFetchPolicy;
-                if (typeof this.nextFetchPolicy === "function") {
-                    return this.nextFetchPolicy(currentFetchPolicy, context);
-                }
-                return fetchPolicy;
-            },
-        });
-    }
-    return obsQuery.reobserve();
-}
 function defaultSubscriptionObserverErrorCallback(error) {
     globalThis.__DEV__ !== false && invariant.error(25, error.message, error.stack);
 }
@@ -5776,21 +5821,13 @@ function wrapDestructiveCacheMethod(cache, methodName) {
         };
     }
 }
-function cancelNotifyTimeout(info) {
-    if (info["notifyTimeout"]) {
-        clearTimeout(info["notifyTimeout"]);
-        info["notifyTimeout"] = void 0;
-    }
-}
 var QueryInfo =  (function () {
     function QueryInfo(queryManager, queryId) {
         if (queryId === void 0) { queryId = queryManager.generateQueryId(); }
         this.queryId = queryId;
-        this.listeners = new Set();
         this.document = null;
         this.lastRequestId = 1;
         this.stopped = false;
-        this.dirty = false;
         this.observableQuery = null;
         var cache = (this.cache = queryManager.cache);
         if (!destructiveMethodCounts.has(cache)) {
@@ -5826,10 +5863,6 @@ var QueryInfo =  (function () {
         }
         return this;
     };
-    QueryInfo.prototype.reset = function () {
-        cancelNotifyTimeout(this);
-        this.dirty = false;
-    };
     QueryInfo.prototype.resetDiff = function () {
         this.lastDiff = void 0;
     };
@@ -5868,68 +5901,29 @@ var QueryInfo =  (function () {
         };
     };
     QueryInfo.prototype.setDiff = function (diff) {
-        var _this = this;
-        var _a;
+        var _a, _b;
         var oldDiff = this.lastDiff && this.lastDiff.diff;
         if (diff && !diff.complete && ((_a = this.observableQuery) === null || _a === void 0 ? void 0 : _a.getLastError())) {
             return;
         }
         this.updateLastDiff(diff);
-        if (!this.dirty && !equal.equal(oldDiff && oldDiff.result, diff && diff.result)) {
-            this.dirty = true;
-            if (!this.notifyTimeout) {
-                this.notifyTimeout = setTimeout(function () { return _this.notify(); }, 0);
-            }
+        if (!equal.equal(oldDiff && oldDiff.result, diff && diff.result)) {
+            (_b = this.observableQuery) === null || _b === void 0 ? void 0 : _b["scheduleNotify"]();
         }
     };
     QueryInfo.prototype.setObservableQuery = function (oq) {
-        var _this = this;
         if (oq === this.observableQuery)
             return;
-        if (this.oqListener) {
-            this.listeners.delete(this.oqListener);
-        }
         this.observableQuery = oq;
         if (oq) {
             oq["queryInfo"] = this;
-            this.listeners.add((this.oqListener = function () {
-                var diff = _this.getDiff();
-                if (diff.fromOptimisticTransaction) {
-                    oq["observe"]();
-                }
-                else {
-                    reobserveCacheFirst(oq);
-                }
-            }));
-        }
-        else {
-            delete this.oqListener;
-        }
-    };
-    QueryInfo.prototype.notify = function () {
-        var _this = this;
-        cancelNotifyTimeout(this);
-        if (this.shouldNotify()) {
-            this.listeners.forEach(function (listener) { return listener(_this); });
-        }
-        this.dirty = false;
-    };
-    QueryInfo.prototype.shouldNotify = function () {
-        if (!this.dirty || !this.listeners.size) {
-            return false;
-        }
-        if (isNetworkRequestInFlight(this.networkStatus) && this.observableQuery) {
-            var fetchPolicy = this.observableQuery.options.fetchPolicy;
-            if (fetchPolicy !== "cache-only" && fetchPolicy !== "cache-and-network") {
-                return false;
-            }
         }
-        return true;
     };
     QueryInfo.prototype.stop = function () {
+        var _a;
         if (!this.stopped) {
             this.stopped = true;
-            this.reset();
+            (_a = this.observableQuery) === null || _a === void 0 ? void 0 : _a["resetNotifications"]();
             this.cancel();
             var oq = this.observableQuery;
             if (oq)
@@ -5966,9 +5960,10 @@ var QueryInfo =  (function () {
     };
     QueryInfo.prototype.markResult = function (result, document, options, cacheWriteBehavior) {
         var _this = this;
+        var _a;
         var merger = new DeepMerger();
         var graphQLErrors = isNonEmptyArray(result.errors) ? result.errors.slice(0) : [];
-        this.reset();
+        (_a = this.observableQuery) === null || _a === void 0 ? void 0 : _a["resetNotifications"]();
         if ("incremental" in result && isNonEmptyArray(result.incremental)) {
             var mergedData = mergeIncrementalData(this.getDiff().result, result);
             result.data = mergedData;
@@ -6024,9 +6019,10 @@ var QueryInfo =  (function () {
         return (this.networkStatus = exports.NetworkStatus.ready);
     };
     QueryInfo.prototype.markError = function (error) {
+        var _a;
         this.networkStatus = exports.NetworkStatus.error;
         this.lastWrite = void 0;
-        this.reset();
+        (_a = this.observableQuery) === null || _a === void 0 ? void 0 : _a["resetNotifications"]();
         if (error.graphQLErrors) {
             this.graphQLErrors = error.graphQLErrors;
         }
@@ -6354,8 +6350,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);
@@ -6423,7 +6418,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,
@@ -6535,7 +6532,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,
                 });
@@ -6575,14 +6572,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;
@@ -6643,16 +6637,17 @@ 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);
         }
     };
     QueryManager.prototype.broadcastQueries = function () {
         if (this.onBroadcast)
             this.onBroadcast();
-        this.queries.forEach(function (info) { return info.notify(); });
+        this.queries.forEach(function (info) { var _a; return (_a = info.observableQuery) === null || _a === void 0 ? void 0 : _a["notify"](); });
     };
     QueryManager.prototype.getLocalState = function () {
         return this.localState;
@@ -6753,13 +6748,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, {
@@ -6782,8 +6776,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); });
         });
@@ -6814,7 +6808,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(),
                 });
             });
         }
@@ -6851,9 +6845,7 @@ var QueryManager =  (function () {
                 var result;
                 if (onQueryUpdated) {
                     if (!diff) {
-                        var info = oq["queryInfo"];
-                        info.reset();
-                        diff = info.getDiff();
+                        diff = _this.cache.diff(oq["queryInfo"]["getDiffOptions"]());
                     }
                     result = onQueryUpdated(oq, diff, lastDiff);
                 }
@@ -7010,7 +7002,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));
         }
@@ -7901,7 +7893,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,
             },