@apollo/client 3.8.4 → 3.8.6

package/core/core.cjs

@@ -19,7 +19,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var equal__default = /*#__PURE__*/_interopDefaultLegacy(equal);
 
-var version = "3.8.4";
+var version = "3.8.6";
 
 function isNonNullObject(obj) {
     return obj !== null && typeof obj === "object";
@@ -369,7 +369,7 @@ var ObservableQuery = (function (_super) {
             var vars = queryDef.variableDefinitions;
             if (!vars || !vars.some(function (v) { return v.variable.name.value === "variables"; })) {
                 globalThis.__DEV__ !== false && globals.invariant.warn(
-                    18,
+                    20,
                     variables,
                     ((_a = queryDef.name) === null || _a === void 0 ? void 0 : _a.value) || queryDef
                 );
@@ -467,7 +467,7 @@ var ObservableQuery = (function (_super) {
                     options.onError(err);
                     return;
                 }
-                globalThis.__DEV__ !== false && globals.invariant.error(19, err);
+                globalThis.__DEV__ !== false && globals.invariant.error(21, err);
             },
         });
         this.subscriptions.add(subscription);
@@ -546,9 +546,9 @@ var ObservableQuery = (function (_super) {
         }
         return options.fetchPolicy;
     };
-    ObservableQuery.prototype.fetch = function (options, newNetworkStatus) {
+    ObservableQuery.prototype.fetch = function (options, newNetworkStatus, query) {
         this.queryManager.setObservableQuery(this);
-        return this.queryManager["fetchConcastWithInfo"](this.queryId, options, newNetworkStatus);
+        return this.queryManager["fetchConcastWithInfo"](this.queryId, options, newNetworkStatus, query);
     };
     ObservableQuery.prototype.updatePolling = function () {
         var _this = this;
@@ -566,7 +566,7 @@ var ObservableQuery = (function (_super) {
         if (pollingInfo && pollingInfo.interval === pollInterval) {
             return;
         }
-        globals.invariant(pollInterval, 20);
+        globals.invariant(pollInterval, 22);
         var info = pollingInfo || (this.pollingInfo = {});
         info.interval = pollInterval;
         var maybeFetch = function () {
@@ -630,15 +630,14 @@ var ObservableQuery = (function (_super) {
                 }
             }
         }
-        var fetchOptions = query === options.query ? options : tslib.__assign(tslib.__assign({}, options), { query: query });
-        this.waitForOwnResult && (this.waitForOwnResult = skipCacheDataFor(fetchOptions.fetchPolicy));
+        this.waitForOwnResult && (this.waitForOwnResult = skipCacheDataFor(options.fetchPolicy));
         var finishWaitingForOwnResult = function () {
             if (_this.concast === concast) {
                 _this.waitForOwnResult = false;
             }
         };
-        var variables = fetchOptions.variables && tslib.__assign({}, fetchOptions.variables);
-        var _a = this.fetch(fetchOptions, newNetworkStatus), concast = _a.concast, fromLink = _a.fromLink;
+        var variables = options.variables && tslib.__assign({}, options.variables);
+        var _a = this.fetch(options, newNetworkStatus, query), concast = _a.concast, fromLink = _a.fromLink;
         var observer = {
             next: function (result) {
                 finishWaitingForOwnResult();
@@ -732,11 +731,11 @@ function reobserveCacheFirst(obsQuery) {
     return obsQuery.reobserve();
 }
 function defaultSubscriptionObserverErrorCallback(error) {
-    globalThis.__DEV__ !== false && globals.invariant.error(21, error.message, error.stack);
+    globalThis.__DEV__ !== false && globals.invariant.error(23, error.message, error.stack);
 }
 function logMissingFieldErrors(missing) {
     if (globalThis.__DEV__ !== false && missing) {
-        globalThis.__DEV__ !== false && globals.invariant.debug(22, missing);
+        globalThis.__DEV__ !== false && globals.invariant.debug(24, missing);
     }
 }
 function skipCacheDataFor(fetchPolicy) {
@@ -921,7 +920,7 @@ var LocalState = (function () {
                         }
                         else {
                             fragment = fragmentMap[selection.name.value];
-                            globals.invariant(fragment, 16, selection.name.value);
+                            globals.invariant(fragment, 18, selection.name.value);
                         }
                         if (fragment && fragment.typeCondition) {
                             typeCondition = fragment.typeCondition.name.value;
@@ -1034,7 +1033,7 @@ var LocalState = (function () {
                     },
                     FragmentSpread: function (spread, _, __, ___, ancestors) {
                         var fragment = fragmentMap[spread.name.value];
-                        globals.invariant(fragment, 17, spread.name.value);
+                        globals.invariant(fragment, 19, spread.name.value);
                         var fragmentSelections = collectByDefinition(fragment);
                         if (fragmentSelections.size > 0) {
                             ancestors.forEach(function (node) {
@@ -1080,7 +1079,6 @@ var QueryInfo = (function () {
         this.listeners = new Set();
         this.document = null;
         this.lastRequestId = 1;
-        this.subscriptions = new Set();
         this.stopped = false;
         this.dirty = false;
         this.observableQuery = null;
@@ -1215,7 +1213,6 @@ var QueryInfo = (function () {
             this.reset();
             this.cancel();
             this.cancel = QueryInfo.prototype.cancel;
-            this.subscriptions.forEach(function (sub) { return sub.unsubscribe(); });
             var oq = this.observableQuery;
             if (oq)
                 oq.stopPolling();
@@ -1366,7 +1363,7 @@ var QueryManager = (function () {
         this.queries.forEach(function (_info, queryId) {
             _this.stopQueryNoBroadcast(queryId);
         });
-        this.cancelPendingFetches(globals.newInvariantError(23));
+        this.cancelPendingFetches(globals.newInvariantError(25));
     };
     QueryManager.prototype.cancelPendingFetches = function (error) {
         this.fetchCancelFns.forEach(function (cancel) { return cancel(error); });
@@ -1380,8 +1377,8 @@ var QueryManager = (function () {
             return tslib.__generator(this, function (_h) {
                 switch (_h.label) {
                     case 0:
-                        globals.invariant(mutation, 24);
-                        globals.invariant(fetchPolicy === "network-only" || fetchPolicy === "no-cache", 25);
+                        globals.invariant(mutation, 26);
+                        globals.invariant(fetchPolicy === "network-only" || fetchPolicy === "no-cache", 27);
                         mutationId = this.generateMutationId();
                         mutation = this.cache.transformForLink(this.transform(mutation));
                         hasClientExports = this.getDocumentInfo(mutation).hasClientExports;
@@ -1702,10 +1699,10 @@ var QueryManager = (function () {
     QueryManager.prototype.query = function (options, queryId) {
         var _this = this;
         if (queryId === void 0) { queryId = this.generateQueryId(); }
-        globals.invariant(options.query, 26);
-        globals.invariant(options.query.kind === "Document", 27);
-        globals.invariant(!options.returnPartialData, 28);
-        globals.invariant(!options.pollInterval, 29);
+        globals.invariant(options.query, 28);
+        globals.invariant(options.query.kind === "Document", 29);
+        globals.invariant(!options.returnPartialData, 30);
+        globals.invariant(!options.pollInterval, 31);
         return this.fetchQuery(queryId, tslib.__assign(tslib.__assign({}, options), { query: this.transform(options.query) })).finally(function () { return _this.stopQuery(queryId); });
     };
     QueryManager.prototype.generateQueryId = function () {
@@ -1730,7 +1727,7 @@ var QueryManager = (function () {
         if (options === void 0) { options = {
             discardWatches: true,
         }; }
-        this.cancelPendingFetches(globals.newInvariantError(30));
+        this.cancelPendingFetches(globals.newInvariantError(32));
         this.queries.forEach(function (queryInfo) {
             if (queryInfo.observableQuery) {
                 queryInfo.networkStatus = exports.NetworkStatus.loading;
@@ -1806,7 +1803,7 @@ var QueryManager = (function () {
         if (globalThis.__DEV__ !== false && queryNamesAndDocs.size) {
             queryNamesAndDocs.forEach(function (included, nameOrDoc) {
                 if (!included) {
-                    globalThis.__DEV__ !== false && globals.invariant.warn(typeof nameOrDoc === "string" ? 31 : 32, nameOrDoc);
+                    globalThis.__DEV__ !== false && globals.invariant.warn(typeof nameOrDoc === "string" ? 33 : 34, nameOrDoc);
                 }
             });
         }
@@ -1994,10 +1991,10 @@ var QueryManager = (function () {
             throw error;
         });
     };
-    QueryManager.prototype.fetchConcastWithInfo = function (queryId, options, networkStatus) {
+    QueryManager.prototype.fetchConcastWithInfo = function (queryId, options, networkStatus, query) {
         var _this = this;
         if (networkStatus === void 0) { networkStatus = exports.NetworkStatus.loading; }
-        var query = options.query;
+        if (query === void 0) { query = options.query; }
         var variables = this.getVariables(query, options.variables);
         var queryInfo = this.getQuery(queryId);
         var defaults = this.defaultOptions.watchQuery;
@@ -2243,7 +2240,7 @@ var ApolloClient = (function () {
         this.resetStoreCallbacks = [];
         this.clearStoreCallbacks = [];
         if (!options.cache) {
-            throw globals.newInvariantError(13);
+            throw globals.newInvariantError(15);
         }
         var uri = options.uri, credentials = options.credentials, headers = options.headers, cache = options.cache, documentTransform = options.documentTransform, _a = options.ssrMode, ssrMode = _a === void 0 ? false : _a, _b = options.ssrForceFetchDelay, ssrForceFetchDelay = _b === void 0 ? 0 : _b, _c = options.connectToDevTools, connectToDevTools = _c === void 0 ? typeof window === "object" &&
             !window.__APOLLO_CLIENT__ &&
@@ -2368,7 +2365,7 @@ var ApolloClient = (function () {
         if (this.defaultOptions.query) {
             options = utilities.mergeOptions(this.defaultOptions.query, options);
         }
-        globals.invariant(options.fetchPolicy !== "cache-and-network", 14);
+        globals.invariant(options.fetchPolicy !== "cache-and-network", 16);
         if (this.disableNetworkFetches && options.fetchPolicy === "network-only") {
             options = tslib.__assign(tslib.__assign({}, options), { fetchPolicy: "cache-first" });
         }
@@ -2461,7 +2458,7 @@ var ApolloClient = (function () {
         result.queries = queries;
         result.results = results;
         result.catch(function (error) {
-            globalThis.__DEV__ !== false && globals.invariant.debug(15, error);
+            globalThis.__DEV__ !== false && globals.invariant.debug(17, error);
         });
         return result;
     };