@apollo/client 3.1.0-pre.4 → 3.1.0

package/apollo-client.cjs.js

@@ -991,6 +991,25 @@ function graphQLResultHasError(result) {
 var canUseWeakMap = typeof WeakMap === 'function' && !(typeof navigator === 'object' &&
     navigator.product === 'ReactNative');
 
+function compact() {
+    var objects = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        objects[_i] = arguments[_i];
+    }
+    var result = Object.create(null);
+    objects.forEach(function (obj) {
+        if (!obj)
+            return;
+        Object.keys(obj).forEach(function (key) {
+            var value = obj[key];
+            if (value !== void 0) {
+                result[key] = value;
+            }
+        });
+    });
+    return result;
+}
+
 function fromError(errorValue) {
     return new Observable(function (observer) {
         observer.error(errorValue);
@@ -1558,13 +1577,7 @@ var Reobserver = (function () {
         return (this.concast = concast).promise;
     };
     Reobserver.prototype.updateOptions = function (newOptions) {
-        var _this = this;
-        Object.keys(newOptions).forEach(function (key) {
-            var value = newOptions[key];
-            if (value !== void 0) {
-                _this.options[key] = value;
-            }
-        });
+        Object.assign(this.options, compact(newOptions));
         this.updatePolling();
         return this;
     };
@@ -4693,7 +4706,7 @@ var ApolloClient = (function () {
     };
     ApolloClient.prototype.watchQuery = function (options) {
         if (this.defaultOptions.watchQuery) {
-            options = tslib.__assign(tslib.__assign({}, this.defaultOptions.watchQuery), options);
+            options = compact(this.defaultOptions.watchQuery, options);
         }
         if (this.disableNetworkFetches &&
             (options.fetchPolicy === 'network-only' ||
@@ -4704,7 +4717,7 @@ var ApolloClient = (function () {
     };
     ApolloClient.prototype.query = function (options) {
         if (this.defaultOptions.query) {
-            options = tslib.__assign(tslib.__assign({}, this.defaultOptions.query), options);
+            options = compact(this.defaultOptions.query, options);
         }
         process.env.NODE_ENV === "production" ? tsInvariant.invariant(options.fetchPolicy !== 'cache-and-network', 10) : tsInvariant.invariant(options.fetchPolicy !== 'cache-and-network', 'The cache-and-network fetchPolicy does not work with client.query, because ' +
             'client.query can only return a single result. Please use client.watchQuery ' +
@@ -4717,7 +4730,7 @@ var ApolloClient = (function () {
     };
     ApolloClient.prototype.mutate = function (options) {
         if (this.defaultOptions.mutate) {
-            options = tslib.__assign(tslib.__assign({}, this.defaultOptions.mutate), options);
+            options = compact(this.defaultOptions.mutate, options);
         }
         return this.queryManager.mutate(options);
     };
@@ -5125,7 +5138,7 @@ var MutationData = (function (_super) {
     MutationData.prototype.cleanup = function () {
     };
     MutationData.prototype.mutate = function (mutationFunctionOptions) {
-        return this.refreshClient().client.mutate(tslib.__assign(tslib.__assign({}, (this.getOptions() || {})), (mutationFunctionOptions || {})));
+        return this.refreshClient().client.mutate(compact(this.getOptions(), mutationFunctionOptions));
     };
     MutationData.prototype.onMutationStart = function () {
         if (!this.result.loading && !this.getOptions().ignoreResults) {