@apollo/client 3.5.5 → 3.5.6

package/apollo-client.cjs

@@ -1291,7 +1291,7 @@ var concat = ApolloLink.concat;
 
 var execute = ApolloLink.execute;
 
-var version = '3.5.5';
+var version = '3.5.6';
 
 var hasOwnProperty$2 = Object.prototype.hasOwnProperty;
 function parseAndCheckHttpResponse(operations) {
@@ -6146,7 +6146,7 @@ function useQuery(query, options) {
                 }
             }
         }
-        Object.assign(ref.current, { client: client, query: query, options: options });
+        Object.assign(ref.current, { client: client, query: query });
     }, [obsQuery, client, query, options]);
     React.useEffect(function () {
         if (context.renderPromises) {
@@ -6216,6 +6216,7 @@ function useQuery(query, options) {
             result.loading) {
             obsQuery.setOptions(createWatchQueryOptions(query, options)).catch(function () { });
         }
+        Object.assign(ref.current, { options: options });
     }
     if ((context.renderPromises || client.disableNetworkFetches) &&
         (options === null || options === void 0 ? void 0 : options.ssr) === false) {
@@ -6245,7 +6246,7 @@ function useQuery(query, options) {
         stopPolling: obsQuery.stopPolling.bind(obsQuery),
         subscribeToMore: obsQuery.subscribeToMore.bind(obsQuery),
     }); }, [obsQuery]);
-    return tslib.__assign(tslib.__assign(tslib.__assign({}, obsQueryFields), { variables: obsQuery.variables, client: client, called: true, previousData: ref.current.previousData }), result);
+    return tslib.__assign(tslib.__assign(tslib.__assign({}, obsQueryFields), { variables: createWatchQueryOptions(query, options).variables, client: client, called: true, previousData: ref.current.previousData }), result);
 }
 function createWatchQueryOptions(query, options) {
     var _a;
@@ -6262,6 +6263,9 @@ function createWatchQueryOptions(query, options) {
     else if (!watchQueryOptions.fetchPolicy) {
         watchQueryOptions.fetchPolicy = 'cache-first';
     }
+    if (!watchQueryOptions.variables) {
+        watchQueryOptions.variables = {};
+    }
     return tslib.__assign({ query: query }, watchQueryOptions);
 }
 
@@ -6333,82 +6337,73 @@ function useMutation(mutation, options) {
         result: result,
         mutationId: 0,
         isMounted: true,
-        execute: null,
         client: client,
         mutation: mutation,
         options: options,
     });
-    var execute = React.useMemo(function () {
-        if (ref.current.execute != null &&
-            ref.current.client === client &&
-            equality.equal(options, ref.current.options) &&
-            equality.equal(mutation, ref.current.mutation)) {
-            return ref.current.execute;
-        }
-        ref.current.client = client;
-        ref.current.options = options;
-        ref.current.mutation = mutation;
-        ref.current.execute = function (executeOptions) {
-            if (executeOptions === void 0) { executeOptions = {}; }
-            var baseOptions = tslib.__assign(tslib.__assign({}, options), { mutation: mutation });
-            if (!ref.current.result.loading && !baseOptions.ignoreResults) {
-                setResult(ref.current.result = {
-                    loading: true,
-                    error: void 0,
-                    data: void 0,
+    {
+        Object.assign(ref.current, { client: client, options: options, mutation: mutation });
+    }
+    var execute = React.useCallback(function (executeOptions) {
+        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) {
+            setResult(ref.current.result = {
+                loading: true,
+                error: void 0,
+                data: void 0,
+                called: true,
+                client: client,
+            });
+        }
+        var mutationId = ++ref.current.mutationId;
+        var clientOptions = mergeOptions(baseOptions, executeOptions);
+        return client.mutate(clientOptions).then(function (response) {
+            var _a, _b;
+            var data = response.data, errors = response.errors;
+            var error = errors && errors.length > 0
+                ? new ApolloError({ graphQLErrors: errors })
+                : void 0;
+            if (mutationId === ref.current.mutationId &&
+                !clientOptions.ignoreResults) {
+                var result_1 = {
                     called: true,
+                    loading: false,
+                    data: data,
+                    error: error,
                     client: client,
-                });
-            }
-            var mutationId = ++ref.current.mutationId;
-            var clientOptions = mergeOptions(baseOptions, executeOptions);
-            return client.mutate(clientOptions).then(function (response) {
-                var _a, _b;
-                var data = response.data, errors = response.errors;
-                var error = errors && errors.length > 0
-                    ? new ApolloError({ graphQLErrors: errors })
-                    : void 0;
-                if (mutationId === ref.current.mutationId &&
-                    !clientOptions.ignoreResults) {
-                    var result_1 = {
-                        called: true,
-                        loading: false,
-                        data: data,
-                        error: error,
-                        client: client,
-                    };
-                    if (ref.current.isMounted && !equality.equal(ref.current.result, result_1)) {
-                        setResult(ref.current.result = result_1);
-                    }
-                }
-                (_a = baseOptions.onCompleted) === null || _a === void 0 ? void 0 : _a.call(baseOptions, response.data);
-                (_b = executeOptions.onCompleted) === null || _b === void 0 ? void 0 : _b.call(executeOptions, response.data);
-                return response;
-            }).catch(function (error) {
-                var _a, _b;
-                if (mutationId === ref.current.mutationId &&
-                    ref.current.isMounted) {
-                    var result_2 = {
-                        loading: false,
-                        error: error,
-                        data: void 0,
-                        called: true,
-                        client: client,
-                    };
-                    if (!equality.equal(ref.current.result, result_2)) {
-                        setResult(ref.current.result = result_2);
-                    }
+                };
+                if (ref.current.isMounted && !equality.equal(ref.current.result, result_1)) {
+                    setResult(ref.current.result = result_1);
                 }
-                if (baseOptions.onError || clientOptions.onError) {
-                    (_a = baseOptions.onError) === null || _a === void 0 ? void 0 : _a.call(baseOptions, error);
-                    (_b = executeOptions.onError) === null || _b === void 0 ? void 0 : _b.call(executeOptions, error);
-                    return { data: void 0, errors: error };
+            }
+            (_a = baseOptions.onCompleted) === null || _a === void 0 ? void 0 : _a.call(baseOptions, response.data);
+            (_b = executeOptions.onCompleted) === null || _b === void 0 ? void 0 : _b.call(executeOptions, response.data);
+            return response;
+        }).catch(function (error) {
+            var _a, _b;
+            if (mutationId === ref.current.mutationId &&
+                ref.current.isMounted) {
+                var result_2 = {
+                    loading: false,
+                    error: error,
+                    data: void 0,
+                    called: true,
+                    client: client,
+                };
+                if (!equality.equal(ref.current.result, result_2)) {
+                    setResult(ref.current.result = result_2);
                 }
-                throw error;
-            });
-        };
-        return ref.current.execute;
-    }, [client, mutation, options]);
+            }
+            if (baseOptions.onError || clientOptions.onError) {
+                (_a = baseOptions.onError) === null || _a === void 0 ? void 0 : _a.call(baseOptions, error);
+                (_b = executeOptions.onError) === null || _b === void 0 ? void 0 : _b.call(executeOptions, error);
+                return { data: void 0, errors: error };
+            }
+            throw error;
+        });
+    }, []);
     var reset = React.useCallback(function () {
         setResult({ called: false, loading: false, client: client });
     }, []);