@apollo/client 3.5.6 → 3.5.7

package/apollo-client.cjs

@@ -1291,7 +1291,7 @@ var concat = ApolloLink.concat;
 
 var execute = ApolloLink.execute;
 
-var version = '3.5.6';
+var version = '3.5.7';
 
 var hasOwnProperty$2 = Object.prototype.hasOwnProperty;
 function parseAndCheckHttpResponse(operations) {
@@ -6054,9 +6054,10 @@ function useQuery(query, options) {
     var _a;
     var context = React.useContext(getApolloContext());
     var client = useApolloClient(options === null || options === void 0 ? void 0 : options.client);
+    var defaultWatchQueryOptions = client.defaultOptions.watchQuery;
     verifyDocumentType(query, exports.DocumentType.Query);
     var _b = React.useState(function () {
-        var watchQueryOptions = createWatchQueryOptions(query, options);
+        var watchQueryOptions = createWatchQueryOptions(query, options, defaultWatchQueryOptions);
         var obsQuery = null;
         if (context.renderPromises) {
             obsQuery = context.renderPromises.getSSRObservable(watchQueryOptions);
@@ -6072,7 +6073,7 @@ function useQuery(query, options) {
             !(options === null || options === void 0 ? void 0 : options.skip) &&
             obsQuery.getCurrentResult().loading) {
             context.renderPromises.addQueryPromise({
-                getOptions: function () { return createWatchQueryOptions(query, options); },
+                getOptions: function () { return createWatchQueryOptions(query, options, defaultWatchQueryOptions); },
                 fetchData: function () { return new Promise(function (resolve) {
                     var sub = obsQuery.subscribe({
                         next: function (result) {
@@ -6113,11 +6114,11 @@ function useQuery(query, options) {
         options: options,
         result: result,
         previousData: void 0,
-        watchQueryOptions: createWatchQueryOptions(query, options),
+        watchQueryOptions: createWatchQueryOptions(query, options, defaultWatchQueryOptions),
     });
     React.useEffect(function () {
         var _a, _b;
-        var watchQueryOptions = createWatchQueryOptions(query, options);
+        var watchQueryOptions = createWatchQueryOptions(query, options, defaultWatchQueryOptions);
         var nextResult;
         if (ref.current.client !== client || !equality.equal(ref.current.query, query)) {
             var obsQuery_1 = client.watchQuery(watchQueryOptions);
@@ -6136,13 +6137,11 @@ function useQuery(query, options) {
             }
             setResult(ref.current.result = nextResult);
             if (!nextResult.loading && options) {
-                if (!result.loading) {
-                    if (result.error) {
-                        (_a = options.onError) === null || _a === void 0 ? void 0 : _a.call(options, result.error);
-                    }
-                    else if (result.data) {
-                        (_b = options.onCompleted) === null || _b === void 0 ? void 0 : _b.call(options, result.data);
-                    }
+                if (nextResult.error) {
+                    (_a = options.onError) === null || _a === void 0 ? void 0 : _a.call(options, nextResult.error);
+                }
+                else if (nextResult.data) {
+                    (_b = options.onCompleted) === null || _b === void 0 ? void 0 : _b.call(options, nextResult.data);
                 }
             }
         }
@@ -6214,7 +6213,7 @@ function useQuery(query, options) {
             (options === null || options === void 0 ? void 0 : options.ssr) !== false &&
             !(options === null || options === void 0 ? void 0 : options.skip) &&
             result.loading) {
-            obsQuery.setOptions(createWatchQueryOptions(query, options)).catch(function () { });
+            obsQuery.setOptions(createWatchQueryOptions(query, options, defaultWatchQueryOptions)).catch(function () { });
         }
         Object.assign(ref.current, { options: options });
     }
@@ -6246,12 +6245,16 @@ function useQuery(query, options) {
         stopPolling: obsQuery.stopPolling.bind(obsQuery),
         subscribeToMore: obsQuery.subscribeToMore.bind(obsQuery),
     }); }, [obsQuery]);
-    return tslib.__assign(tslib.__assign(tslib.__assign({}, obsQueryFields), { variables: createWatchQueryOptions(query, options).variables, client: client, called: true, previousData: ref.current.previousData }), result);
+    return tslib.__assign(tslib.__assign(tslib.__assign({}, obsQueryFields), { variables: createWatchQueryOptions(query, options, defaultWatchQueryOptions).variables, client: client, called: true, previousData: ref.current.previousData }), result);
 }
-function createWatchQueryOptions(query, options) {
+function createWatchQueryOptions(query, options, defaultOptions) {
     var _a;
     if (options === void 0) { options = {}; }
-    var skip = options.skip; options.ssr; options.onCompleted; options.onError; options.displayName; var watchQueryOptions = tslib.__rest(options, ["skip", "ssr", "onCompleted", "onError", "displayName"]);
+    var skip = options.skip; options.ssr; options.onCompleted; options.onError; options.displayName; var otherOptions = tslib.__rest(options, ["skip", "ssr", "onCompleted", "onError", "displayName"]);
+    var watchQueryOptions = tslib.__assign({ query: query }, otherOptions);
+    if (defaultOptions) {
+        watchQueryOptions = mergeOptions(defaultOptions, watchQueryOptions);
+    }
     if (skip) {
         watchQueryOptions.fetchPolicy = 'standby';
     }
@@ -6266,7 +6269,7 @@ function createWatchQueryOptions(query, options) {
     if (!watchQueryOptions.variables) {
         watchQueryOptions.variables = {};
     }
-    return tslib.__assign({ query: query }, watchQueryOptions);
+    return watchQueryOptions;
 }
 
 var EAGER_METHODS = [