@apollo/client 3.6.4 → 3.6.7

package/README.md

@@ -19,12 +19,11 @@ The Apollo Client API reference can be found at: <br/>
 Learn how to use Apollo Client with self-paced hands-on training on Odyssey, Apollo's official learning platform: <br/>
 [https://odyssey.apollographql.com/](https://odyssey.apollographql.com/)
 
-## Maintainers
+## Apollo Maintainers
 
-- [@benjamn](https://github.com/benjamn) (Apollo)
-- [@brainkim](https://github.com/brainkim) (Apollo)
-- [@jcreighton](https://github.com/jcreighton) (Netflix)
-- [@hwillson](https://github.com/hwillson) (Apollo)
+- [@benjamn](https://github.com/benjamn)
+- [@hwillson](https://github.com/hwillson)
+- [@jpvajda](https://github.com/jpvajda)
 
 ## Who is Apollo?
 

package/apollo-client.cjs

@@ -761,18 +761,15 @@ var DeepMerger = (function () {
     };
     DeepMerger.prototype.shallowCopyForMerge = function (value) {
         if (isNonNullObject(value)) {
-            if (this.pastCopies.has(value)) {
-                if (!Object.isFrozen(value))
-                    return value;
-                this.pastCopies.delete(value);
-            }
-            if (Array.isArray(value)) {
-                value = value.slice(0);
-            }
-            else {
-                value = tslib.__assign({ __proto__: Object.getPrototypeOf(value) }, value);
+            if (!this.pastCopies.has(value)) {
+                if (Array.isArray(value)) {
+                    value = value.slice(0);
+                }
+                else {
+                    value = tslib.__assign({ __proto__: Object.getPrototypeOf(value) }, value);
+                }
+                this.pastCopies.add(value);
             }
-            this.pastCopies.add(value);
         }
         return value;
     };
@@ -1303,7 +1300,7 @@ var concat = ApolloLink.concat;
 
 var execute = ApolloLink.execute;
 
-var version = '3.6.4';
+var version = '3.6.7';
 
 var hasOwnProperty$3 = Object.prototype.hasOwnProperty;
 function parseAndCheckHttpResponse(operations) {
@@ -2396,7 +2393,6 @@ var StoreReader = (function () {
         var policies = this.config.cache.policies;
         variables = tslib.__assign(tslib.__assign({}, getDefaultValues(getQueryDefinition(query))), variables);
         var rootRef = makeReference(rootId);
-        var merger = new DeepMerger;
         var execResult = this.executeSelectionSet({
             selectionSet: getMainDefinition(query).selectionSet,
             objectOrReference: rootRef,
@@ -2409,9 +2405,6 @@ var StoreReader = (function () {
                 varString: canonicalStringify(variables),
                 canonizeResults: canonizeResults,
                 fragmentMap: createFragmentMap(getFragmentDefinitions(query)),
-                merge: function (a, b) {
-                    return merger.merge(a, b);
-                },
             },
         });
         var missing;
@@ -2450,17 +2443,18 @@ var StoreReader = (function () {
         }
         var variables = context.variables, policies = context.policies, store = context.store;
         var typename = store.getFieldValue(objectOrReference, "__typename");
-        var result = {};
+        var objectsToMerge = [];
         var missing;
+        var missingMerger = new DeepMerger();
         if (this.config.addTypename &&
             typeof typename === "string" &&
             !policies.rootIdsByTypename[typename]) {
-            result = { __typename: typename };
+            objectsToMerge.push({ __typename: typename });
         }
         function handleMissing(result, resultName) {
             var _a;
             if (result.missing) {
-                missing = context.merge(missing, (_a = {}, _a[resultName] = result.missing, _a));
+                missing = missingMerger.merge(missing, (_a = {}, _a[resultName] = result.missing, _a));
             }
             return result.result;
         }
@@ -2479,7 +2473,7 @@ var StoreReader = (function () {
                 var resultName = resultKeyNameFromField(selection);
                 if (fieldValue === void 0) {
                     if (!addTypenameToDocument.added(selection)) {
-                        missing = context.merge(missing, (_a = {},
+                        missing = missingMerger.merge(missing, (_a = {},
                             _a[resultName] = "Can't find field '".concat(selection.name.value, "' on ").concat(isReference(objectOrReference)
                                 ? objectOrReference.__ref + " object"
                                 : "object " + JSON.stringify(objectOrReference, null, 2)),
@@ -2508,7 +2502,7 @@ var StoreReader = (function () {
                     }), resultName);
                 }
                 if (fieldValue !== void 0) {
-                    result = context.merge(result, (_b = {}, _b[resultName] = fieldValue, _b));
+                    objectsToMerge.push((_b = {}, _b[resultName] = fieldValue, _b));
                 }
             }
             else {
@@ -2518,6 +2512,7 @@ var StoreReader = (function () {
                 }
             }
         });
+        var result = mergeDeepArray(objectsToMerge);
         var finalResult = { result: result, missing: missing };
         var frozen = context.canonizeResults
             ? this.canon.admit(finalResult)
@@ -2531,10 +2526,11 @@ var StoreReader = (function () {
         var _this = this;
         var field = _a.field, array = _a.array, enclosingRef = _a.enclosingRef, context = _a.context;
         var missing;
+        var missingMerger = new DeepMerger();
         function handleMissing(childResult, i) {
             var _a;
             if (childResult.missing) {
-                missing = context.merge(missing, (_a = {}, _a[i] = childResult.missing, _a));
+                missing = missingMerger.merge(missing, (_a = {}, _a[i] = childResult.missing, _a));
             }
             return childResult.result;
         }
@@ -4307,7 +4303,7 @@ var ObservableQuery = (function (_super) {
             newNetworkStatus === exports.NetworkStatus.poll;
         var oldVariables = this.options.variables;
         var oldFetchPolicy = this.options.fetchPolicy;
-        var mergedOptions = mergeOptions(this.options, newOptions || {});
+        var mergedOptions = compact(this.options, newOptions || {});
         var options = useDisposableConcast
             ? mergedOptions
             : assign(this.options, mergedOptions);
@@ -6189,7 +6185,7 @@ function useInternalState(client, query) {
     if (!stateRef.current ||
         client !== stateRef.current.client ||
         query !== stateRef.current.query) {
-        stateRef.current = new InternalState(client, query);
+        stateRef.current = new InternalState(client, query, stateRef.current);
     }
     var state = stateRef.current;
     var _a = React.useState(0); _a[0]; var setTick = _a[1];
@@ -6199,7 +6195,7 @@ function useInternalState(client, query) {
     return state;
 }
 var InternalState = (function () {
-    function InternalState(client, query) {
+    function InternalState(client, query, previous) {
         this.client = client;
         this.query = query;
         this.asyncResolveFns = new Set();
@@ -6218,6 +6214,11 @@ var InternalState = (function () {
         });
         this.toQueryResultCache = new (canUseWeakMap ? WeakMap : Map)();
         verifyDocumentType(query, exports.DocumentType.Query);
+        var previousResult = previous && previous.result;
+        var previousData = previousResult && previousResult.data;
+        if (previousData) {
+            this.previousData = previousData;
+        }
     }
     InternalState.prototype.forceUpdate = function () {
         __DEV__ && tsInvariant.invariant.warn("Calling default no-op implementation of InternalState#forceUpdate");
@@ -6299,7 +6300,7 @@ var InternalState = (function () {
             this.watchQueryOptions = watchQueryOptions;
             if (currentWatchQueryOptions && this.observable) {
                 this.optionsToIgnoreOnce.delete(currentWatchQueryOptions);
-                this.observable.reobserve(watchQueryOptions);
+                this.observable.reobserve(this.getObsQueryOptions());
                 this.previousData = ((_a = this.result) === null || _a === void 0 ? void 0 : _a.data) || this.previousData;
                 this.result = void 0;
             }
@@ -6320,6 +6321,17 @@ var InternalState = (function () {
             this.result = void 0;
         }
     };
+    InternalState.prototype.getObsQueryOptions = function () {
+        var toMerge = [];
+        var globalDefaults = this.client.defaultOptions.watchQuery;
+        if (globalDefaults)
+            toMerge.push(globalDefaults);
+        if (this.queryHookOptions.defaultOptions) {
+            toMerge.push(this.queryHookOptions.defaultOptions);
+        }
+        toMerge.push(compact(this.observable && this.observable.options, this.watchQueryOptions));
+        return toMerge.reduce(mergeOptions);
+    };
     InternalState.prototype.createWatchQueryOptions = function (_a) {
         var _b;
         if (_a === void 0) { _a = {}; }
@@ -6360,7 +6372,7 @@ var InternalState = (function () {
             this.renderPromises
                 && this.renderPromises.getSSRObservable(this.watchQueryOptions)
                 || this.observable
-                || this.client.watchQuery(mergeOptions(this.queryHookOptions.defaultOptions, this.watchQueryOptions));
+                || this.client.watchQuery(this.getObsQueryOptions());
         this.obsQueryFields = React.useMemo(function () { return ({
             refetch: obsQuery.refetch.bind(obsQuery),
             reobserve: obsQuery.reobserve.bind(obsQuery),
@@ -6443,7 +6455,10 @@ var EAGER_METHODS = [
 function useLazyQuery(query, options) {
     var internalState = useInternalState(useApolloClient(options && options.client), query);
     var execOptionsRef = React.useRef();
-    var useQueryResult = internalState.useQuery(tslib.__assign(tslib.__assign(tslib.__assign({}, options), execOptionsRef.current), { skip: !execOptionsRef.current }));
+    var merged = execOptionsRef.current
+        ? mergeOptions(options, execOptionsRef.current)
+        : options;
+    var useQueryResult = internalState.useQuery(tslib.__assign(tslib.__assign({}, merged), { skip: !execOptionsRef.current }));
     var initialFetchPolicy = useQueryResult.observable.options.initialFetchPolicy ||
         internalState.getDefaultFetchPolicy();
     var result = Object.assign(useQueryResult, {
@@ -6516,7 +6531,7 @@ function useMutation(mutation, options) {
         var mutationId = ++ref.current.mutationId;
         var clientOptions = mergeOptions(baseOptions, executeOptions);
         return client.mutate(clientOptions).then(function (response) {
-            var _a, _b;
+            var _a, _b, _c;
             var data = response.data, errors = response.errors;
             var error = errors && errors.length > 0
                 ? new ApolloError({ graphQLErrors: errors })
@@ -6534,11 +6549,11 @@ function useMutation(mutation, options) {
                     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);
+            (_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);
             return response;
         }).catch(function (error) {
-            var _a, _b;
+            var _a, _b, _c, _d;
             if (mutationId === ref.current.mutationId &&
                 ref.current.isMounted) {
                 var result_2 = {
@@ -6552,9 +6567,9 @@ function useMutation(mutation, options) {
                     setResult(ref.current.result = result_2);
                 }
             }
-            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);
+            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);
                 return { data: void 0, errors: error };
             }
             throw error;