@apollo/client 3.7.2 → 3.7.4

package/core/core.cjs.native.js

@@ -15,10 +15,99 @@ var utils = require('../link/utils');
 var tsInvariant = require('ts-invariant');
 var graphqlTag = require('graphql-tag');
 
-var version = '3.7.2';
+var version = '3.7.4';
+
+function isNonEmptyArray(value) {
+    return Array.isArray(value) && value.length > 0;
+}
+
+function isNonNullObject(obj) {
+    return obj !== null && typeof obj === 'object';
+}
+
+var hasOwnProperty$2 = Object.prototype.hasOwnProperty;
+var defaultReconciler = function (target, source, property) {
+    return this.merge(target[property], source[property]);
+};
+var DeepMerger = (function () {
+    function DeepMerger(reconciler) {
+        if (reconciler === void 0) { reconciler = defaultReconciler; }
+        this.reconciler = reconciler;
+        this.isObject = isNonNullObject;
+        this.pastCopies = new Set();
+    }
+    DeepMerger.prototype.merge = function (target, source) {
+        var _this = this;
+        var context = [];
+        for (var _i = 2; _i < arguments.length; _i++) {
+            context[_i - 2] = arguments[_i];
+        }
+        if (isNonNullObject(source) && isNonNullObject(target)) {
+            Object.keys(source).forEach(function (sourceKey) {
+                if (hasOwnProperty$2.call(target, sourceKey)) {
+                    var targetValue = target[sourceKey];
+                    if (source[sourceKey] !== targetValue) {
+                        var result = _this.reconciler.apply(_this, tslib.__spreadArray([target, source, sourceKey], context, false));
+                        if (result !== targetValue) {
+                            target = _this.shallowCopyForMerge(target);
+                            target[sourceKey] = result;
+                        }
+                    }
+                }
+                else {
+                    target = _this.shallowCopyForMerge(target);
+                    target[sourceKey] = source[sourceKey];
+                }
+            });
+            return target;
+        }
+        return source;
+    };
+    DeepMerger.prototype.shallowCopyForMerge = function (value) {
+        if (isNonNullObject(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);
+            }
+        }
+        return value;
+    };
+    return DeepMerger;
+}());
 
 function isExecutionPatchIncrementalResult(value) {
-    return !!value.incremental;
+    return "incremental" in value;
+}
+function isExecutionPatchInitialResult(value) {
+    return "hasNext" in value && "data" in value;
+}
+function isExecutionPatchResult(value) {
+    return (isExecutionPatchIncrementalResult(value) ||
+        isExecutionPatchInitialResult(value));
+}
+function mergeIncrementalData(prevResult, result) {
+    var mergedData = prevResult;
+    var merger = new DeepMerger();
+    if (isExecutionPatchIncrementalResult(result) &&
+        isNonEmptyArray(result.incremental)) {
+        result.incremental.forEach(function (_a) {
+            var data = _a.data, path = _a.path;
+            for (var i = path.length - 1; i >= 0; --i) {
+                var key = path[i];
+                var isNumericKey = !isNaN(+key);
+                var parent_1 = isNumericKey ? [] : {};
+                parent_1[key] = data;
+                data = parent_1;
+            }
+            mergedData = merger.merge(mergedData, data);
+        });
+    }
+    return mergedData;
 }
 
 exports.NetworkStatus = void 0;
@@ -983,28 +1072,18 @@ var QueryInfo = (function () {
     };
     QueryInfo.prototype.markResult = function (result, document, options, cacheWriteBehavior) {
         var _this = this;
+        var merger = new utilities.DeepMerger();
         var graphQLErrors = utilities.isNonEmptyArray(result.errors)
             ? result.errors.slice(0)
             : [];
         this.reset();
         if ('incremental' in result && utilities.isNonEmptyArray(result.incremental)) {
-            var mergedData_1 = this.getDiff().result;
-            var merger_1 = new utilities.DeepMerger();
-            result.incremental.forEach(function (_a) {
-                var data = _a.data, path = _a.path, errors = _a.errors;
-                for (var i = path.length - 1; i >= 0; --i) {
-                    var key = path[i];
-                    var isNumericKey = !isNaN(+key);
-                    var parent_1 = isNumericKey ? [] : {};
-                    parent_1[key] = data;
-                    data = parent_1;
-                }
-                if (errors) {
-                    graphQLErrors.push.apply(graphQLErrors, errors);
-                }
-                mergedData_1 = merger_1.merge(mergedData_1, data);
-            });
-            result.data = mergedData_1;
+            var mergedData = mergeIncrementalData(this.getDiff().result, result);
+            result.data = mergedData;
+        }
+        else if ('hasNext' in result && result.hasNext) {
+            var diff = this.getDiff();
+            result.data = merger.merge(diff.result, result.data);
         }
         this.graphQLErrors = graphQLErrors;
         if (options.fetchPolicy === 'no-cache') {
@@ -1161,7 +1240,7 @@ var QueryManager = (function () {
                                 return utilities.asyncMap(self.getObservableFromLink(mutation, tslib.__assign(tslib.__assign({}, context), { optimisticResponse: optimisticResponse }), variables, false), function (result) {
                                     if (utilities.graphQLResultHasError(result) && errorPolicy === 'none') {
                                         throw new errors.ApolloError({
-                                            graphQLErrors: result.errors,
+                                            graphQLErrors: utilities.getGraphQLErrorsFromResult(result),
                                         });
                                     }
                                     if (mutationStoreValue) {
@@ -1195,7 +1274,9 @@ var QueryManager = (function () {
                                 }).subscribe({
                                     next: function (storeResult) {
                                         self.broadcastQueries();
-                                        resolve(storeResult);
+                                        if (!('hasNext' in storeResult) || storeResult.hasNext === false) {
+                                            resolve(storeResult);
+                                        }
                                     },
                                     error: function (err) {
                                         if (mutationStoreValue) {
@@ -1223,12 +1304,33 @@ var QueryManager = (function () {
         var cacheWrites = [];
         var skipCache = mutation.fetchPolicy === "no-cache";
         if (!skipCache && shouldWriteResult(result, mutation.errorPolicy)) {
-            cacheWrites.push({
-                result: result.data,
-                dataId: 'ROOT_MUTATION',
-                query: mutation.document,
-                variables: mutation.variables,
-            });
+            if (!isExecutionPatchIncrementalResult(result)) {
+                cacheWrites.push({
+                    result: result.data,
+                    dataId: 'ROOT_MUTATION',
+                    query: mutation.document,
+                    variables: mutation.variables,
+                });
+            }
+            if (isExecutionPatchIncrementalResult(result) && utilities.isNonEmptyArray(result.incremental)) {
+                var diff = cache.diff({
+                    id: "ROOT_MUTATION",
+                    query: this.transform(mutation.document).asQuery,
+                    variables: mutation.variables,
+                    optimistic: false,
+                    returnPartialData: true,
+                });
+                var mergedData = mergeIncrementalData(diff.result, result);
+                if (typeof mergedData !== 'undefined') {
+                    result.data = mergedData;
+                    cacheWrites.push({
+                        result: mergedData,
+                        dataId: 'ROOT_MUTATION',
+                        query: mutation.document,
+                        variables: mutation.variables,
+                    });
+                }
+            }
             var updateQueries_1 = mutation.updateQueries;
             if (updateQueries_1) {
                 this.queries.forEach(function (_a, queryId) {
@@ -1275,6 +1377,8 @@ var QueryManager = (function () {
                         cacheWrites.forEach(function (write) { return cache.write(write); });
                     }
                     var update = mutation.update;
+                    var isFinalResult = !isExecutionPatchResult(result) ||
+                        (isExecutionPatchIncrementalResult(result) && !result.hasNext);
                     if (update) {
                         if (!skipCache) {
                             var diff = cache.diff({
@@ -1284,16 +1388,24 @@ var QueryManager = (function () {
                                 optimistic: false,
                                 returnPartialData: true,
                             });
-                            if (diff.complete && !(isExecutionPatchIncrementalResult(result))) {
+                            if (diff.complete) {
                                 result = tslib.__assign(tslib.__assign({}, result), { data: diff.result });
+                                if ('incremental' in result) {
+                                    delete result.incremental;
+                                }
+                                if ('hasNext' in result) {
+                                    delete result.hasNext;
+                                }
                             }
                         }
-                        update(cache, result, {
-                            context: mutation.context,
-                            variables: mutation.variables,
-                        });
+                        if (isFinalResult) {
+                            update(cache, result, {
+                                context: mutation.context,
+                                variables: mutation.variables,
+                            });
+                        }
                     }
-                    if (!skipCache && !mutation.keepRootFields) {
+                    if (!skipCache && !mutation.keepRootFields && isFinalResult) {
                         cache.modify({
                             id: 'ROOT_MUTATION',
                             fields: function (value, _a) {
@@ -1661,17 +1773,8 @@ var QueryManager = (function () {
         var requestId = queryInfo.lastRequestId = this.generateRequestId();
         var linkDocument = this.cache.transformForLink(this.transform(queryInfo.document).document);
         return utilities.asyncMap(this.getObservableFromLink(linkDocument, options.context, options.variables), function (result) {
-            var graphQLErrors = utilities.isNonEmptyArray(result.errors)
-                ? result.errors.slice(0)
-                : [];
-            if ('incremental' in result && utilities.isNonEmptyArray(result.incremental)) {
-                result.incremental.forEach(function (incrementalResult) {
-                    if (incrementalResult.errors) {
-                        graphQLErrors.push.apply(graphQLErrors, incrementalResult.errors);
-                    }
-                });
-            }
-            var hasErrors = utilities.isNonEmptyArray(graphQLErrors);
+            var graphQLErrors = utilities.getGraphQLErrorsFromResult(result);
+            var hasErrors = graphQLErrors.length > 0;
             if (requestId >= queryInfo.lastRequestId) {
                 if (hasErrors && options.errorPolicy === "none") {
                     throw queryInfo.markError(new errors.ApolloError({

package/invariantErrorCodes.js

@@ -5,7 +5,7 @@
 // consult the @apollo/client/invariantErrorCodes.js file specific to
 // your @apollo/client version. This file is not meant to be imported.
 {
-  "@apollo/client version": "3.7.2",
+  "@apollo/client version": "3.7.4",
 
   1: {
     file: "@apollo/client/cache/inmemory/entityStore.js",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apollo/client",
-  "version": "3.7.2",
+  "version": "3.7.4",
   "description": "A fully-featured caching GraphQL client.",
   "private": false,
   "keywords": [
@@ -66,47 +66,53 @@
     "zen-observable-ts": "^1.2.5"
   },
   "devDependencies": {
-    "@babel/parser": "7.20.5",
-    "@graphql-tools/schema": "9.0.10",
+    "@babel/parser": "7.20.7",
+    "@changesets/changelog-github": "0.4.8",
+    "@changesets/cli": "2.26.0",
+    "@graphql-tools/schema": "9.0.12",
     "@rollup/plugin-node-resolve": "11.2.1",
     "@testing-library/react": "13.4.0",
     "@testing-library/react-12": "npm:@testing-library/react@^12",
-    "@testing-library/react-hooks": "8.0.1",
     "@testing-library/user-event": "14.4.3",
     "@types/bytes": "3.1.1",
     "@types/fast-json-stable-stringify": "2.0.0",
     "@types/fetch-mock": "7.3.5",
     "@types/glob": "8.0.0",
     "@types/hoist-non-react-statics": "3.3.1",
-    "@types/jest": "29.2.3",
+    "@types/jest": "29.2.5",
     "@types/lodash": "4.14.191",
-    "@types/node": "16.18.4",
+    "@types/node": "18.11.18",
     "@types/node-fetch": "2.6.2",
     "@types/react": "18.0.26",
-    "@types/react-dom": "18.0.9",
+    "@types/react-dom": "18.0.10",
     "@types/use-sync-external-store": "0.0.3",
+    "@typescript-eslint/eslint-plugin": "5.48.1",
+    "@typescript-eslint/parser": "5.48.1",
     "acorn": "8.8.1",
     "blob-polyfill": "7.0.20220408",
     "bytes": "3.1.2",
     "cross-fetch": "3.1.5",
+    "eslint": "8.31.0",
+    "eslint-plugin-testing-library": "5.9.1",
     "fetch-mock": "9.11.0",
     "glob": "8.0.3",
     "graphql": "16.6.0",
     "graphql-ws": "5.11.2",
     "jest": "29.3.1",
     "jest-environment-jsdom": "29.3.1",
-    "jest-junit": "14.0.1",
+    "jest-junit": "15.0.0",
     "lodash": "4.17.21",
+    "patch-package": "6.5.1",
     "react": "18.2.0",
     "react-17": "npm:react@^17",
     "react-dom": "18.2.0",
     "react-dom-17": "npm:react-dom@^17",
-    "recast": "0.21.5",
+    "recast": "0.22.0",
     "resolve": "1.22.1",
     "rimraf": "3.0.2",
     "rollup": "2.79.1",
     "rollup-plugin-terser": "7.0.2",
-    "rxjs": "7.6.0",
+    "rxjs": "7.8.0",
     "subscriptions-transport-ws": "0.11.0",
     "terser": "5.16.1",
     "ts-jest": "29.0.3",

package/react/hooks/hooks.cjs

@@ -128,11 +128,19 @@ var InternalState = (function () {
     InternalState.prototype.forceUpdate = function () {
         __DEV__ && globals.invariant.warn("Calling default no-op implementation of InternalState#forceUpdate");
     };
-    InternalState.prototype.asyncUpdate = function () {
+    InternalState.prototype.asyncUpdate = function (signal) {
         var _this = this;
-        return new Promise(function (resolve) {
+        return new Promise(function (resolve, reject) {
+            var watchQueryOptions = _this.watchQueryOptions;
+            var handleAborted = function () {
+                _this.asyncResolveFns.delete(resolve);
+                _this.optionsToIgnoreOnce.delete(watchQueryOptions);
+                signal.removeEventListener('abort', handleAborted);
+                reject(signal.reason);
+            };
             _this.asyncResolveFns.add(resolve);
-            _this.optionsToIgnoreOnce.add(_this.watchQueryOptions);
+            _this.optionsToIgnoreOnce.add(watchQueryOptions);
+            signal.addEventListener('abort', handleAborted);
             _this.forceUpdate();
         });
     };
@@ -309,9 +317,10 @@ var InternalState = (function () {
     InternalState.prototype.handleErrorOrCompleted = function (result) {
         var _this = this;
         if (!result.loading) {
+            var error_1 = this.toApolloError(result);
             Promise.resolve().then(function () {
-                if (result.error) {
-                    _this.onError(result.error);
+                if (error_1) {
+                    _this.onError(error_1);
                 }
                 else if (result.data) {
                     _this.onCompleted(result.data);
@@ -321,6 +330,11 @@ var InternalState = (function () {
             });
         }
     };
+    InternalState.prototype.toApolloError = function (result) {
+        return utilities.isNonEmptyArray(result.errors)
+            ? new errors.ApolloError({ graphQLErrors: result.errors })
+            : result.error;
+    };
     InternalState.prototype.getCurrentResult = function () {
         if (!this.result) {
             this.handleErrorOrCompleted(this.result = this.observable.getCurrentResult());
@@ -363,6 +377,7 @@ var EAGER_METHODS = [
     'subscribeToMore',
 ];
 function useLazyQuery(query, options) {
+    var abortControllersRef = React.useRef(new Set());
     var internalState = useInternalState(useApolloClient(options && options.client), query);
     var execOptionsRef = React.useRef();
     var merged = execOptionsRef.current
@@ -393,14 +408,28 @@ function useLazyQuery(query, options) {
         return eagerMethods;
     }, []);
     Object.assign(result, eagerMethods);
+    React.useEffect(function () {
+        return function () {
+            abortControllersRef.current.forEach(function (controller) {
+                controller.abort();
+            });
+        };
+    }, []);
     var execute = React.useCallback(function (executeOptions) {
+        var controller = new AbortController();
+        abortControllersRef.current.add(controller);
         execOptionsRef.current = executeOptions ? tslib.__assign(tslib.__assign({}, executeOptions), { fetchPolicy: executeOptions.fetchPolicy || initialFetchPolicy }) : {
             fetchPolicy: initialFetchPolicy,
         };
         var promise = internalState
-            .asyncUpdate()
-            .then(function (queryResult) { return Object.assign(queryResult, eagerMethods); });
-        promise.catch(function () { });
+            .asyncUpdate(controller.signal)
+            .then(function (queryResult) {
+            abortControllersRef.current.delete(controller);
+            return Object.assign(queryResult, eagerMethods);
+        });
+        promise.catch(function () {
+            abortControllersRef.current.delete(controller);
+        });
         return promise;
     }, []);
     return [execute, result];
@@ -441,7 +470,7 @@ function useMutation(mutation, options) {
         var mutationId = ++ref.current.mutationId;
         var clientOptions = core.mergeOptions(baseOptions, executeOptions);
         return client.mutate(clientOptions).then(function (response) {
-            var _a, _b, _c;
+            var _a;
             var data = response.data, errors$1 = response.errors;
             var error = errors$1 && errors$1.length > 0
                 ? new errors.ApolloError({ graphQLErrors: errors$1 })
@@ -459,11 +488,11 @@ 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, clientOptions);
-            (_c = executeOptions.onCompleted) === null || _c === void 0 ? void 0 : _c.call(executeOptions, response.data, clientOptions);
+            var onCompleted = executeOptions.onCompleted || ((_a = ref.current.options) === null || _a === void 0 ? void 0 : _a.onCompleted);
+            onCompleted === null || onCompleted === void 0 ? void 0 : onCompleted(response.data, clientOptions);
             return response;
         }).catch(function (error) {
-            var _a, _b, _c, _d;
+            var _a;
             if (mutationId === ref.current.mutationId &&
                 ref.current.isMounted) {
                 var result_2 = {
@@ -477,9 +506,9 @@ function useMutation(mutation, options) {
                     setResult(ref.current.result = result_2);
                 }
             }
-            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, clientOptions);
-                (_d = executeOptions.onError) === null || _d === void 0 ? void 0 : _d.call(executeOptions, error, clientOptions);
+            var onError = executeOptions.onError || ((_a = ref.current.options) === null || _a === void 0 ? void 0 : _a.onError);
+            if (onError) {
+                onError(error, clientOptions);
                 return { data: void 0, errors: error };
             }
             throw error;