@apollo/client 3.6.8 → 3.6.10

package/README.md

@@ -22,8 +22,12 @@ Learn how to use Apollo Client with self-paced hands-on training on Odyssey, Apo
 ## Apollo Maintainers
 
 - [@benjamn](https://github.com/benjamn)
+- [@alessbell](https://github.com/alessbell)
+- [@bignimbus](https://github.com/bignimbus)
 - [@hwillson](https://github.com/hwillson)
 - [@jpvajda](https://github.com/jpvajda)
+- [@mrdoombringer](https://github.com/mrdoombringer)
+- [@jerelmiller](https://github.com/jerelmiller)
 
 ## Who is Apollo?
 

package/apollo-client.cjs

@@ -1300,13 +1300,24 @@ var concat = ApolloLink.concat;
 
 var execute = ApolloLink.execute;
 
-var version = '3.6.8';
+var version = '3.6.10';
 
 var hasOwnProperty$3 = Object.prototype.hasOwnProperty;
 function parseAndCheckHttpResponse(operations) {
     return function (response) { return response
         .text()
         .then(function (bodyText) {
+        if (response.status >= 300) {
+            var getResult = function () {
+                try {
+                    return JSON.parse(bodyText);
+                }
+                catch (err) {
+                    return bodyText;
+                }
+            };
+            throwServerError(response, getResult(), "Response not successful: Received status code ".concat(response.status));
+        }
         try {
             return JSON.parse(bodyText);
         }
@@ -1320,9 +1331,6 @@ function parseAndCheckHttpResponse(operations) {
         }
     })
         .then(function (result) {
-        if (response.status >= 300) {
-            throwServerError(response, result, "Response not successful: Received status code ".concat(response.status));
-        }
         if (!Array.isArray(result) &&
             !hasOwnProperty$3.call(result, 'data') &&
             !hasOwnProperty$3.call(result, 'errors')) {
@@ -1682,15 +1690,19 @@ exports.Cache = void 0;
 (function (Cache) {
 })(exports.Cache || (exports.Cache = {}));
 
-var MissingFieldError = (function () {
+var MissingFieldError = (function (_super) {
+    tslib.__extends(MissingFieldError, _super);
     function MissingFieldError(message, path, query, variables) {
-        this.message = message;
-        this.path = path;
-        this.query = query;
-        this.variables = variables;
+        var _this = _super.call(this, message) || this;
+        _this.message = message;
+        _this.path = path;
+        _this.query = query;
+        _this.variables = variables;
+        _this.__proto__ = MissingFieldError.prototype;
+        return _this;
     }
     return MissingFieldError;
-}());
+}(Error));
 
 var hasOwn = Object.prototype.hasOwnProperty;
 function defaultDataIdFromObject(_a, context) {
@@ -4223,7 +4235,8 @@ var ObservableQuery = (function (_super) {
     ObservableQuery.prototype.applyNextFetchPolicy = function (reason, options) {
         if (options.nextFetchPolicy) {
             var _a = options.fetchPolicy, fetchPolicy = _a === void 0 ? "cache-first" : _a, _b = options.initialFetchPolicy, initialFetchPolicy = _b === void 0 ? fetchPolicy : _b;
-            if (typeof options.nextFetchPolicy === "function") {
+            if (fetchPolicy === "standby") ;
+            else if (typeof options.nextFetchPolicy === "function") {
                 options.fetchPolicy = options.nextFetchPolicy(fetchPolicy, {
                     reason: reason,
                     options: options,
@@ -4312,7 +4325,8 @@ var ObservableQuery = (function (_super) {
             if (newOptions &&
                 newOptions.variables &&
                 !equality.equal(newOptions.variables, oldVariables) &&
-                (!newOptions.fetchPolicy || newOptions.fetchPolicy === oldFetchPolicy)) {
+                options.fetchPolicy !== "standby" &&
+                options.fetchPolicy === oldFetchPolicy) {
                 this.applyNextFetchPolicy("variables-changed", options);
                 if (newNetworkStatus === void 0) {
                     newNetworkStatus = exports.NetworkStatus.setVariables;
@@ -5561,20 +5575,23 @@ var QueryManager = (function () {
         });
         var fromVariables = function (variables) {
             normalized.variables = variables;
-            return _this.fetchQueryByPolicy(queryInfo, normalized, networkStatus);
+            var concastSources = _this.fetchQueryByPolicy(queryInfo, normalized, networkStatus);
+            if (normalized.fetchPolicy !== "standby" &&
+                concastSources.length > 0 &&
+                queryInfo.observableQuery) {
+                queryInfo.observableQuery["applyNextFetchPolicy"]("after-fetch", options);
+            }
+            return concastSources;
         };
+        var cleanupCancelFn = function () { return _this.fetchCancelFns.delete(queryId); };
         this.fetchCancelFns.set(queryId, function (reason) {
+            cleanupCancelFn();
             setTimeout(function () { return concast.cancel(reason); });
         });
         var concast = new Concast(this.transform(normalized.query).hasClientExports
             ? this.localState.addExportedVariables(normalized.query, normalized.variables, normalized.context).then(fromVariables)
             : fromVariables(normalized.variables));
-        concast.cleanup(function () {
-            _this.fetchCancelFns.delete(queryId);
-            if (queryInfo.observableQuery) {
-                queryInfo.observableQuery["applyNextFetchPolicy"]("after-fetch", options);
-            }
-        });
+        concast.promise.then(cleanupCancelFn, cleanupCancelFn);
         return concast;
     };
     QueryManager.prototype.refetchQueries = function (_a) {
@@ -6335,7 +6352,7 @@ var InternalState = (function () {
     InternalState.prototype.createWatchQueryOptions = function (_a) {
         var _b;
         if (_a === void 0) { _a = {}; }
-        var skip = _a.skip; _a.ssr; _a.onCompleted; _a.onError; _a.displayName; _a.defaultOptions; var otherOptions = tslib.__rest(_a, ["skip", "ssr", "onCompleted", "onError", "displayName", "defaultOptions"]);
+        var skip = _a.skip; _a.ssr; _a.onCompleted; _a.onError; _a.defaultOptions; var otherOptions = tslib.__rest(_a, ["skip", "ssr", "onCompleted", "onError", "defaultOptions"]);
         var watchQueryOptions = Object.assign(otherOptions, { query: this.query });
         if (this.renderPromises &&
             (watchQueryOptions.fetchPolicy === 'network-only' ||
@@ -6519,7 +6536,7 @@ function useMutation(mutation, options) {
         if (executeOptions === void 0) { executeOptions = {}; }
         var _a = ref.current, client = _a.client, options = _a.options, mutation = _a.mutation;
         var baseOptions = tslib.__assign(tslib.__assign({}, options), { mutation: mutation });
-        if (!ref.current.result.loading && !baseOptions.ignoreResults) {
+        if (!ref.current.result.loading && !baseOptions.ignoreResults && ref.current.isMounted) {
             setResult(ref.current.result = {
                 loading: true,
                 error: void 0,
@@ -6549,8 +6566,8 @@ function useMutation(mutation, options) {
                     setResult(ref.current.result = result_1);
                 }
             }
-            (_b = (_a = ref.current.options) === null || _a === void 0 ? void 0 : _a.onCompleted) === null || _b === void 0 ? void 0 : _b.call(_a, response.data);
-            (_c = executeOptions.onCompleted) === null || _c === void 0 ? void 0 : _c.call(executeOptions, response.data);
+            (_b = (_a = ref.current.options) === null || _a === void 0 ? void 0 : _a.onCompleted) === null || _b === void 0 ? void 0 : _b.call(_a, response.data, clientOptions);
+            (_c = executeOptions.onCompleted) === null || _c === void 0 ? void 0 : _c.call(executeOptions, response.data, clientOptions);
             return response;
         }).catch(function (error) {
             var _a, _b, _c, _d;
@@ -6568,15 +6585,17 @@ function useMutation(mutation, options) {
                 }
             }
             if (((_a = ref.current.options) === null || _a === void 0 ? void 0 : _a.onError) || clientOptions.onError) {
-                (_c = (_b = ref.current.options) === null || _b === void 0 ? void 0 : _b.onError) === null || _c === void 0 ? void 0 : _c.call(_b, error);
-                (_d = executeOptions.onError) === null || _d === void 0 ? void 0 : _d.call(executeOptions, error);
+                (_c = (_b = ref.current.options) === null || _b === void 0 ? void 0 : _b.onError) === null || _c === void 0 ? void 0 : _c.call(_b, error, clientOptions);
+                (_d = executeOptions.onError) === null || _d === void 0 ? void 0 : _d.call(executeOptions, error, clientOptions);
                 return { data: void 0, errors: error };
             }
             throw error;
         });
     }, []);
     var reset = React.useCallback(function () {
-        setResult({ called: false, loading: false, client: client });
+        if (ref.current.isMounted) {
+            setResult({ called: false, loading: false, client: client });
+        }
     }, []);
     React.useEffect(function () {
         ref.current.isMounted = true;