@apollo/client 3.11.2 → 3.11.4

package/core/core.cjs

@@ -20,7 +20,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var equal__default = /*#__PURE__*/_interopDefaultLegacy(equal);
 
-var version = "3.11.2";
+var version = "3.11.4";
 
 function isNonNullObject(obj) {
     return obj !== null && typeof obj === "object";
@@ -406,6 +406,11 @@ var ObservableQuery =  (function (_super) {
             this.observe();
         }
         var updatedQuerySet = new Set();
+        var updateQuery = fetchMoreOptions === null || fetchMoreOptions === void 0 ? void 0 : fetchMoreOptions.updateQuery;
+        var isCached = this.options.fetchPolicy !== "no-cache";
+        if (!isCached) {
+            globals.invariant(updateQuery, 21);
+        }
         return this.queryManager
             .fetchQuery(qid, combinedOptions, exports.NetworkStatus.fetchMore)
             .then(function (fetchMoreResult) {
@@ -413,38 +418,48 @@ var ObservableQuery =  (function (_super) {
             if (queryInfo.networkStatus === exports.NetworkStatus.fetchMore) {
                 queryInfo.networkStatus = originalNetworkStatus;
             }
-            _this.queryManager.cache.batch({
-                update: function (cache) {
-                    var updateQuery = fetchMoreOptions.updateQuery;
-                    if (updateQuery) {
-                        cache.updateQuery({
-                            query: _this.query,
-                            variables: _this.variables,
-                            returnPartialData: true,
-                            optimistic: false,
-                        }, function (previous) {
-                            return updateQuery(previous, {
-                                fetchMoreResult: fetchMoreResult.data,
+            if (isCached) {
+                _this.queryManager.cache.batch({
+                    update: function (cache) {
+                        var updateQuery = fetchMoreOptions.updateQuery;
+                        if (updateQuery) {
+                            cache.updateQuery({
+                                query: _this.query,
+                                variables: _this.variables,
+                                returnPartialData: true,
+                                optimistic: false,
+                            }, function (previous) {
+                                return updateQuery(previous, {
+                                    fetchMoreResult: fetchMoreResult.data,
+                                    variables: combinedOptions.variables,
+                                });
+                            });
+                        }
+                        else {
+                            cache.writeQuery({
+                                query: combinedOptions.query,
                                 variables: combinedOptions.variables,
+                                data: fetchMoreResult.data,
                             });
-                        });
-                    }
-                    else {
-                        cache.writeQuery({
-                            query: combinedOptions.query,
-                            variables: combinedOptions.variables,
-                            data: fetchMoreResult.data,
-                        });
-                    }
-                },
-                onWatchUpdated: function (watch) {
-                    updatedQuerySet.add(watch.query);
-                },
-            });
+                        }
+                    },
+                    onWatchUpdated: function (watch) {
+                        updatedQuerySet.add(watch.query);
+                    },
+                });
+            }
+            else {
+                var lastResult = _this.getLast("result");
+                var data = updateQuery(lastResult.data, {
+                    fetchMoreResult: fetchMoreResult.data,
+                    variables: combinedOptions.variables,
+                });
+                _this.reportResult(tslib.__assign(tslib.__assign({}, lastResult), { data: data }), _this.variables);
+            }
             return fetchMoreResult;
         })
             .finally(function () {
-            if (!updatedQuerySet.has(_this.query)) {
+            if (isCached && !updatedQuerySet.has(_this.query)) {
                 reobserveCacheFirst(_this);
             }
         });
@@ -475,7 +490,7 @@ var ObservableQuery =  (function (_super) {
                     options.onError(err);
                     return;
                 }
-                globalThis.__DEV__ !== false && globals.invariant.error(21, err);
+                globalThis.__DEV__ !== false && globals.invariant.error(22, err);
             },
         });
         this.subscriptions.add(subscription);
@@ -575,7 +590,7 @@ var ObservableQuery =  (function (_super) {
         if (pollingInfo && pollingInfo.interval === pollInterval) {
             return;
         }
-        globals.invariant(pollInterval, 22);
+        globals.invariant(pollInterval, 23);
         var info = pollingInfo || (this.pollingInfo = {});
         info.interval = pollInterval;
         var maybeFetch = function () {
@@ -659,6 +674,9 @@ var ObservableQuery =  (function (_super) {
             },
             error: function (error) {
                 if (equal.equal(_this.variables, variables)) {
+                    if (!errors.isApolloError(error)) {
+                        error = new errors.ApolloError({ networkError: error });
+                    }
                     finishWaitingForOwnResult();
                     _this.reportError(error, variables);
                 }
@@ -749,11 +767,11 @@ function reobserveCacheFirst(obsQuery) {
     return obsQuery.reobserve();
 }
 function defaultSubscriptionObserverErrorCallback(error) {
-    globalThis.__DEV__ !== false && globals.invariant.error(23, error.message, error.stack);
+    globalThis.__DEV__ !== false && globals.invariant.error(24, error.message, error.stack);
 }
 function logMissingFieldErrors(missing) {
     if (globalThis.__DEV__ !== false && missing) {
-        globalThis.__DEV__ !== false && globals.invariant.debug(24, missing);
+        globalThis.__DEV__ !== false && globals.invariant.debug(25, missing);
     }
 }
 function skipCacheDataFor(fetchPolicy ) {
@@ -1081,7 +1099,7 @@ var QueryManager =  (function () {
         this.queries.forEach(function (_info, queryId) {
             _this.stopQueryNoBroadcast(queryId);
         });
-        this.cancelPendingFetches(globals.newInvariantError(25));
+        this.cancelPendingFetches(globals.newInvariantError(26));
     };
     QueryManager.prototype.cancelPendingFetches = function (error) {
         this.fetchCancelFns.forEach(function (cancel) { return cancel(error); });
@@ -1095,8 +1113,8 @@ var QueryManager =  (function () {
             return tslib.__generator(this, function (_j) {
                 switch (_j.label) {
                     case 0:
-                        globals.invariant(mutation, 26);
-                        globals.invariant(fetchPolicy === "network-only" || fetchPolicy === "no-cache", 27);
+                        globals.invariant(mutation, 27);
+                        globals.invariant(fetchPolicy === "network-only" || fetchPolicy === "no-cache", 28);
                         mutationId = this.generateMutationId();
                         mutation = this.cache.transformForLink(this.transform(mutation));
                         hasClientExports = this.getDocumentInfo(mutation).hasClientExports;
@@ -1418,10 +1436,10 @@ var QueryManager =  (function () {
     QueryManager.prototype.query = function (options, queryId) {
         var _this = this;
         if (queryId === void 0) { queryId = this.generateQueryId(); }
-        globals.invariant(options.query, 28);
-        globals.invariant(options.query.kind === "Document", 29);
-        globals.invariant(!options.returnPartialData, 30);
-        globals.invariant(!options.pollInterval, 31);
+        globals.invariant(options.query, 29);
+        globals.invariant(options.query.kind === "Document", 30);
+        globals.invariant(!options.returnPartialData, 31);
+        globals.invariant(!options.pollInterval, 32);
         return this.fetchQuery(queryId, tslib.__assign(tslib.__assign({}, options), { query: this.transform(options.query) })).finally(function () { return _this.stopQuery(queryId); });
     };
     QueryManager.prototype.generateQueryId = function () {
@@ -1446,7 +1464,7 @@ var QueryManager =  (function () {
         if (options === void 0) { options = {
             discardWatches: true,
         }; }
-        this.cancelPendingFetches(globals.newInvariantError(32));
+        this.cancelPendingFetches(globals.newInvariantError(33));
         this.queries.forEach(function (queryInfo) {
             if (queryInfo.observableQuery) {
                 queryInfo.networkStatus = exports.NetworkStatus.loading;
@@ -1522,7 +1540,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" ? 33 : 34, nameOrDoc);
+                    globalThis.__DEV__ !== false && globals.invariant.warn(typeof nameOrDoc === "string" ? 34 : 35, nameOrDoc);
                 }
             });
         }
@@ -1680,8 +1698,9 @@ var QueryManager =  (function () {
         return utilities.asyncMap(this.getObservableFromLink(linkDocument, options.context, options.variables), function (result) {
             var graphQLErrors = utilities.getGraphQLErrorsFromResult(result);
             var hasErrors = graphQLErrors.length > 0;
+            var errorPolicy = options.errorPolicy;
             if (requestId >= queryInfo.lastRequestId) {
-                if (hasErrors && options.errorPolicy === "none") {
+                if (hasErrors && errorPolicy === "none") {
                     throw queryInfo.markError(new errors.ApolloError({
                         graphQLErrors: graphQLErrors,
                     }));
@@ -1694,7 +1713,10 @@ var QueryManager =  (function () {
                 loading: false,
                 networkStatus: exports.NetworkStatus.ready,
             };
-            if (hasErrors && options.errorPolicy !== "ignore") {
+            if (hasErrors && errorPolicy === "none") {
+                aqr.data = void 0;
+            }
+            if (hasErrors && errorPolicy !== "ignore") {
                 aqr.errors = graphQLErrors;
                 aqr.networkStatus = exports.NetworkStatus.error;
             }