@apollo/client 3.13.8 → 3.14.0-alpha.0

package/core/core.cjs.native.js

@@ -22,7 +22,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var equal__default = /*#__PURE__*/_interopDefaultLegacy(equal);
 
-var version = "3.13.8";
+var version = "3.14.0-alpha.0";
 
 function isNonNullObject(obj) {
     return obj !== null && typeof obj === "object";
@@ -195,6 +195,31 @@ function directiveIsNonreactive(dir) {
     return dir.name.value === "nonreactive";
 }
 
+var slot = new optimism.Slot();
+function isMuted(name) {
+    return (slot.getValue() || []).includes(name);
+}
+function muteDeprecations(name) {
+    var args = [];
+    for (var _i = 1; _i < arguments.length; _i++) {
+        args[_i - 1] = arguments[_i];
+    }
+    return slot.withValue.apply(slot, tslib.__spreadArray([Array.isArray(name) ? name : [name]], args, false));
+}
+function warnRemovedOption(options, name, callSite, recommendation) {
+    if (recommendation === void 0) { recommendation = "Please remove this option."; }
+    warnDeprecated(name, function () {
+        if (name in options) {
+            globalThis.__DEV__ !== false && globals.invariant.warn(91, callSite, name, recommendation);
+        }
+    });
+}
+function warnDeprecated(name, cb) {
+    if (!isMuted(name)) {
+        cb();
+    }
+}
+
 var assign = Object.assign, hasOwnProperty$1 = Object.hasOwnProperty;
 var ObservableQuery =  (function (_super) {
     tslib.__extends(ObservableQuery, _super);
@@ -395,7 +420,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(
-                    21,
+                    22,
                     variables,
                     ((_a = queryDef.name) === null || _a === void 0 ? void 0 : _a.value) || queryDef
                 );
@@ -427,7 +452,7 @@ var ObservableQuery =  (function (_super) {
         var updateQuery = fetchMoreOptions === null || fetchMoreOptions === void 0 ? void 0 : fetchMoreOptions.updateQuery;
         var isCached = this.options.fetchPolicy !== "no-cache";
         if (!isCached) {
-            globals.invariant(updateQuery, 22);
+            globals.invariant(updateQuery, 23);
         }
         return this.queryManager
             .fetchQuery(qid, combinedOptions, exports.NetworkStatus.fetchMore)
@@ -504,7 +529,7 @@ var ObservableQuery =  (function (_super) {
                     options.onError(err);
                     return;
                 }
-                globalThis.__DEV__ !== false && globals.invariant.error(23, err);
+                globalThis.__DEV__ !== false && globals.invariant.error(24, err);
             },
         });
         this.subscriptions.add(subscription);
@@ -515,6 +540,9 @@ var ObservableQuery =  (function (_super) {
         };
     };
     ObservableQuery.prototype.setOptions = function (newOptions) {
+        if (globalThis.__DEV__ !== false) {
+            warnRemovedOption(newOptions, "canonizeResults", "setOptions");
+        }
         return this.reobserve(newOptions);
     };
     ObservableQuery.prototype.silentSetOptions = function (newOptions) {
@@ -607,7 +635,7 @@ var ObservableQuery =  (function (_super) {
         if (pollingInfo && pollingInfo.interval === pollInterval) {
             return;
         }
-        globals.invariant(pollInterval, 24);
+        globals.invariant(pollInterval, 25);
         var info = pollingInfo || (this.pollingInfo = {});
         info.interval = pollInterval;
         var maybeFetch = function () {
@@ -828,11 +856,11 @@ var ObservableQuery =  (function (_super) {
 }(utilities.Observable));
 utilities.fixObservableSubclass(ObservableQuery);
 function defaultSubscriptionObserverErrorCallback(error) {
-    globalThis.__DEV__ !== false && globals.invariant.error(25, error.message, error.stack);
+    globalThis.__DEV__ !== false && globals.invariant.error(26, error.message, error.stack);
 }
 function logMissingFieldErrors(missing) {
     if (globalThis.__DEV__ !== false && missing) {
-        globalThis.__DEV__ !== false && globals.invariant.debug(26, missing);
+        globalThis.__DEV__ !== false && globals.invariant.debug(27, missing);
     }
 }
 function skipCacheDataFor(fetchPolicy ) {
@@ -898,6 +926,7 @@ var QueryInfo =  (function () {
         this.lastDiff = void 0;
     };
     QueryInfo.prototype.getDiff = function () {
+        var _this = this;
         var options = this.getDiffOptions();
         if (this.lastDiff && equal.equal(options, this.lastDiff.options)) {
             return this.lastDiff.diff;
@@ -907,7 +936,9 @@ var QueryInfo =  (function () {
         if (oq && oq.options.fetchPolicy === "no-cache") {
             return { complete: false };
         }
-        var diff = this.cache.diff(options);
+        var diff = muteDeprecations("canonizeResults", function () {
+            return _this.cache.diff(options);
+        });
         this.updateLastDiff(diff, options);
         return diff;
     };
@@ -1030,7 +1061,9 @@ var QueryInfo =  (function () {
                         }
                     }
                     var diffOptions = _this.getDiffOptions(options.variables);
-                    var diff = cache.diff(diffOptions);
+                    var diff = muteDeprecations("canonizeResults", function () {
+                        return cache.diff(diffOptions);
+                    });
                     if (!_this.stopped && equal.equal(_this.variables, options.variables)) {
                         _this.updateWatch(options.variables);
                     }
@@ -1117,7 +1150,7 @@ var QueryManager =  (function () {
         this.queries.forEach(function (_info, queryId) {
             _this.stopQueryNoBroadcast(queryId);
         });
-        this.cancelPendingFetches(globals.newInvariantError(27));
+        this.cancelPendingFetches(globals.newInvariantError(28));
     };
     QueryManager.prototype.cancelPendingFetches = function (error) {
         this.fetchCancelFns.forEach(function (cancel) { return cancel(error); });
@@ -1131,8 +1164,8 @@ var QueryManager =  (function () {
             return tslib.__generator(this, function (_j) {
                 switch (_j.label) {
                     case 0:
-                        globals.invariant(mutation, 28);
-                        globals.invariant(fetchPolicy === "network-only" || fetchPolicy === "no-cache", 29);
+                        globals.invariant(mutation, 29);
+                        globals.invariant(fetchPolicy === "network-only" || fetchPolicy === "no-cache", 30);
                         mutationId = this.generateMutationId();
                         mutation = this.cache.transformForLink(this.transform(mutation));
                         hasClientExports = this.getDocumentInfo(mutation).hasClientExports;
@@ -1462,10 +1495,10 @@ var QueryManager =  (function () {
     QueryManager.prototype.query = function (options, queryId) {
         var _this = this;
         if (queryId === void 0) { queryId = this.generateQueryId(); }
-        globals.invariant(options.query, 30);
-        globals.invariant(options.query.kind === "Document", 31);
-        globals.invariant(!options.returnPartialData, 32);
-        globals.invariant(!options.pollInterval, 33);
+        globals.invariant(options.query, 31);
+        globals.invariant(options.query.kind === "Document", 32);
+        globals.invariant(!options.returnPartialData, 33);
+        globals.invariant(!options.pollInterval, 34);
         var query = this.transform(options.query);
         return this.fetchQuery(queryId, tslib.__assign(tslib.__assign({}, options), { query: query }))
             .then(function (result) {
@@ -1500,7 +1533,7 @@ var QueryManager =  (function () {
         if (options === void 0) { options = {
             discardWatches: true,
         }; }
-        this.cancelPendingFetches(globals.newInvariantError(34));
+        this.cancelPendingFetches(globals.newInvariantError(35));
         this.queries.forEach(function (queryInfo) {
             if (queryInfo.observableQuery) {
                 queryInfo.networkStatus = exports.NetworkStatus.loading;
@@ -1582,10 +1615,10 @@ var QueryManager =  (function () {
                 if (!included) {
                     var queryName = queryNames.get(nameOrQueryString);
                     if (queryName) {
-                        globalThis.__DEV__ !== false && globals.invariant.warn(35, queryName);
+                        globalThis.__DEV__ !== false && globals.invariant.warn(36, queryName);
                     }
                     else {
-                        globalThis.__DEV__ !== false && globals.invariant.warn(36);
+                        globalThis.__DEV__ !== false && globals.invariant.warn(37);
                     }
                 }
             });
@@ -1876,7 +1909,9 @@ var QueryManager =  (function () {
                 var result;
                 if (onQueryUpdated) {
                     if (!diff) {
-                        diff = _this.cache.diff(oq["queryInfo"]["getDiffOptions"]());
+                        diff = muteDeprecations("canonizeResults", function () {
+                            return _this.cache.diff(oq["queryInfo"]["getDiffOptions"]());
+                        });
                     }
                     result = onQueryUpdated(oq, diff, lastDiff);
                 }
@@ -1909,7 +1944,7 @@ var QueryManager =  (function () {
                 !this.noCacheWarningsByQueryId.has(operationId)) {
                 this.noCacheWarningsByQueryId.add(operationId);
                 globalThis.__DEV__ !== false && globals.invariant.warn(
-                    37,
+                    38,
                     (_c = utilities.getOperationName(document)) !== null && _c !== void 0 ? _c : "Unnamed ".concat(operationType !== null && operationType !== void 0 ? operationType : "operation")
                 );
             }
@@ -2224,7 +2259,7 @@ var LocalState =  (function () {
                         }
                         else {
                             fragment = fragmentMap[selection.name.value];
-                            globals.invariant(fragment, 19, selection.name.value);
+                            globals.invariant(fragment, 20, selection.name.value);
                         }
                         if (fragment && fragment.typeCondition) {
                             typeCondition = fragment.typeCondition.name.value;
@@ -2338,7 +2373,7 @@ var LocalState =  (function () {
                     },
                     FragmentSpread: function (spread, _, __, ___, ancestors) {
                         var fragment = fragmentMap[spread.name.value];
-                        globals.invariant(fragment, 20, spread.name.value);
+                        globals.invariant(fragment, 21, spread.name.value);
                         var fragmentSelections = collectByDefinition(fragment);
                         if (fragmentSelections.size > 0) {
                             ancestors.forEach(function (node) {
@@ -2437,14 +2472,26 @@ var hasSuggestedDevtools = false;
 var ApolloClient =  (function () {
     function ApolloClient(options) {
         var _this = this;
-        var _a;
+        var _a, _b, _c;
         this.resetStoreCallbacks = [];
         this.clearStoreCallbacks = [];
         if (!options.cache) {
             throw globals.newInvariantError(16);
         }
-        var uri = options.uri, credentials = options.credentials, headers = options.headers, cache = options.cache, documentTransform = options.documentTransform, _b = options.ssrMode, ssrMode = _b === void 0 ? false : _b, _c = options.ssrForceFetchDelay, ssrForceFetchDelay = _c === void 0 ? 0 : _c,
-        connectToDevTools = options.connectToDevTools, _d = options.queryDeduplication, queryDeduplication = _d === void 0 ? true : _d, defaultOptions = options.defaultOptions, defaultContext = options.defaultContext, _e = options.assumeImmutableResults, assumeImmutableResults = _e === void 0 ? cache.assumeImmutableResults : _e, resolvers = options.resolvers, typeDefs = options.typeDefs, fragmentMatcher = options.fragmentMatcher, clientAwarenessName = options.name, clientAwarenessVersion = options.version, devtools = options.devtools, dataMasking = options.dataMasking;
+        var uri = options.uri, credentials = options.credentials, headers = options.headers, cache = options.cache, documentTransform = options.documentTransform, _d = options.ssrMode, ssrMode = _d === void 0 ? false : _d, _e = options.ssrForceFetchDelay, ssrForceFetchDelay = _e === void 0 ? 0 : _e,
+        connectToDevTools = options.connectToDevTools, _f = options.queryDeduplication, queryDeduplication = _f === void 0 ? true : _f, defaultOptions = options.defaultOptions, defaultContext = options.defaultContext, _g = options.assumeImmutableResults, assumeImmutableResults = _g === void 0 ? cache.assumeImmutableResults : _g, resolvers = options.resolvers, typeDefs = options.typeDefs, fragmentMatcher = options.fragmentMatcher, clientAwareness = options.clientAwareness, clientAwarenessName = options.name, clientAwarenessVersion = options.version, devtools = options.devtools, dataMasking = options.dataMasking;
+        if (globalThis.__DEV__ !== false) {
+            warnRemovedOption(options, "connectToDevTools", "ApolloClient", "Please use `devtools.enabled` instead.");
+            warnRemovedOption(options, "uri", "ApolloClient", "Please initialize an instance of `HttpLink` with `uri` instead.");
+            warnRemovedOption(options, "credentials", "ApolloClient", "Please initialize an instance of `HttpLink` with `credentials` instead.");
+            warnRemovedOption(options, "headers", "ApolloClient", "Please initialize an instance of `HttpLink` with `headers` instead.");
+            warnRemovedOption(options, "name", "ApolloClient", "Please use the `clientAwareness.name` option instead.");
+            warnRemovedOption(options, "version", "ApolloClient", "Please use the `clientAwareness.version` option instead.");
+            warnRemovedOption(options, "typeDefs", "ApolloClient");
+            if (!options.link) {
+                globalThis.__DEV__ !== false && globals.invariant.warn(17);
+            }
+        }
         var link = options.link;
         if (!link) {
             link =
@@ -2486,8 +2533,8 @@ var ApolloClient =  (function () {
             ssrMode: ssrMode,
             dataMasking: !!dataMasking,
             clientAwareness: {
-                name: clientAwarenessName,
-                version: clientAwarenessVersion,
+                name: (_b = clientAwareness === null || clientAwareness === void 0 ? void 0 : clientAwareness.name) !== null && _b !== void 0 ? _b : clientAwarenessName,
+                version: (_c = clientAwareness === null || clientAwareness === void 0 ? void 0 : clientAwareness.version) !== null && _c !== void 0 ? _c : clientAwarenessVersion,
             },
             localState: this.localState,
             assumeImmutableResults: assumeImmutableResults,
@@ -2509,6 +2556,16 @@ var ApolloClient =  (function () {
         if (this.devtoolsConfig.enabled)
             this.connectToDevTools();
     }
+    Object.defineProperty(ApolloClient.prototype, "prioritizeCacheValues", {
+        get: function () {
+            return this.disableNetworkFetches;
+        },
+        set: function (value) {
+            this.disableNetworkFetches = value;
+        },
+        enumerable: false,
+        configurable: true
+    });
     ApolloClient.prototype.connectToDevTools = function () {
         if (typeof window === "undefined") {
             return;
@@ -2567,16 +2624,22 @@ var ApolloClient =  (function () {
                 options.fetchPolicy === "cache-and-network")) {
             options = tslib.__assign(tslib.__assign({}, options), { fetchPolicy: "cache-first" });
         }
+        if (globalThis.__DEV__ !== false) {
+            warnRemovedOption(options, "canonizeResults", "client.watchQuery");
+        }
         return this.queryManager.watchQuery(options);
     };
     ApolloClient.prototype.query = function (options) {
         if (this.defaultOptions.query) {
             options = utilities.mergeOptions(this.defaultOptions.query, options);
         }
-        globals.invariant(options.fetchPolicy !== "cache-and-network", 17);
+        globals.invariant(options.fetchPolicy !== "cache-and-network", 18);
         if (this.disableNetworkFetches && options.fetchPolicy === "network-only") {
             options = tslib.__assign(tslib.__assign({}, options), { fetchPolicy: "cache-first" });
         }
+        if (globalThis.__DEV__ !== false) {
+            warnRemovedOption(options, "canonizeResults", "client.query");
+        }
         return this.queryManager.query(options);
     };
     ApolloClient.prototype.mutate = function (options) {
@@ -2679,7 +2742,7 @@ var ApolloClient =  (function () {
         result.queries = queries;
         result.results = results;
         result.catch(function (error) {
-            globalThis.__DEV__ !== false && globals.invariant.debug(18, error);
+            globalThis.__DEV__ !== false && globals.invariant.debug(19, error);
         });
         return result;
     };

package/core/watchQueryOptions.d.ts

@@ -126,7 +126,7 @@ export interface QueryOptions<TVariables = OperationVariables, TData = any> {
      * 
      * @deprecated
      * 
-     * Using `canonizeResults` can result in memory leaks so we generally do not recommend using this option anymore. A future version of Apollo Client will contain a similar feature without the risk of memory leaks.
+     * Using `canonizeResults` can result in memory leaks so we generally do not recommend using this option. `canonizeResults` will be removed in Apollo Client 4.0.
      */
     canonizeResults?: boolean;
 }
@@ -255,7 +255,7 @@ export interface SharedWatchQueryOptions<TVariables extends OperationVariables,
      * 
      * @deprecated
      * 
-     * Using `canonizeResults` can result in memory leaks so we generally do not recommend using this option anymore. A future version of Apollo Client will contain a similar feature without the risk of memory leaks.
+     * Using `canonizeResults` can result in memory leaks so we generally do not recommend using this option. `canonizeResults` will be removed in Apollo Client 4.0.
      */
     canonizeResults?: boolean;
     /**