@apollo/client 3.9.5 → 3.9.7

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @apollo/client
 
+## 3.9.7
+
+### Patch Changes
+
+- [#11659](https://github.com/apollographql/apollo-client/pull/11659) [`652a61e`](https://github.com/apollographql/apollo-client/commit/652a61e96db0f0e27d0a22fafae1df388f3fdf36) Thanks [@phryneas](https://github.com/phryneas)! - Make `useRenderGuard` more resilient to changes in React internals.
+
+- [#11594](https://github.com/apollographql/apollo-client/pull/11594) [`50b1097`](https://github.com/apollographql/apollo-client/commit/50b10970ca0efa290ae415ef801650327a89ab8e) Thanks [@alessbell](https://github.com/alessbell)! - Adds a fix for multipart subscriptions that terminate with payload: null
+
+## 3.9.6
+
+### Patch Changes
+
+- [#11617](https://github.com/apollographql/apollo-client/pull/11617) [`f1d8bc4`](https://github.com/apollographql/apollo-client/commit/f1d8bc40c3d8e39340f721f4f1c3fd0ed77b8a6b) Thanks [@phryneas](https://github.com/phryneas)! - Allow Apollo Client instance to intercept hook functionality
+
+- [#11638](https://github.com/apollographql/apollo-client/pull/11638) [`bf93ada`](https://github.com/apollographql/apollo-client/commit/bf93adaa0321b573db0ea8fc3a5c364e1fdfeef3) Thanks [@jerelmiller](https://github.com/jerelmiller)! - Fix issue where calling `fetchMore` from a suspense-enabled hook inside `startTransition` caused an unnecessary rerender.
+
 ## 3.9.5
 
 ### Patch Changes
@@ -127,6 +143,25 @@
 
 - [#11412](https://github.com/apollographql/apollo-client/pull/11412) [`58db5c3`](https://github.com/apollographql/apollo-client/commit/58db5c3295b88162f91019f0898f6baa4b9cced6) Thanks [@jerelmiller](https://github.com/jerelmiller)! - Add the ability to start preloading a query outside React to begin fetching as early as possible. Call `createQueryPreloader` to create a `preloadQuery` function which can be called to start fetching a query. This returns a `queryRef` which is passed to `useReadQuery` and suspended until the query is done fetching.
 
+  ```tsx
+  const preloadQuery = createQueryPreloader(client);
+  const queryRef = preloadQuery(QUERY, { variables, ...otherOptions });
+
+  function App() {
+    return {
+      <Suspense fallback={<div>Loading</div>}>
+        <MyQuery />
+      </Suspense>
+    }
+  }
+
+  function MyQuery() {
+    const { data } = useReadQuery(queryRef);
+
+    // do something with data
+  }
+  ```
+
 #### Testing utility improvements
 
 - [#11178](https://github.com/apollographql/apollo-client/pull/11178) [`4d64a6f`](https://github.com/apollographql/apollo-client/commit/4d64a6fa2ad5abe6f7f172c164f5e1fc2cb89829) Thanks [@sebakerckhof](https://github.com/sebakerckhof)! - Support re-using of mocks in the MockedProvider
@@ -193,25 +228,6 @@
 
   The `IGNORE` sentinel can be destructured from the second parameter in the callback function signature passed to `optimisticResponse`.
 
-  ```tsx
-  const preloadQuery = createQueryPreloader(client);
-  const queryRef = preloadQuery(QUERY, { variables, ...otherOptions });
-
-  function App() {
-    return {
-      <Suspense fallback={<div>Loading</div>}>
-        <MyQuery />
-      </Suspense>
-    }
-  }
-
-  function MyQuery() {
-    const { data } = useReadQuery(queryRef);
-
-    // do something with data
-  }
-  ```
-
 #### Network adapters for multipart subscriptions usage with Relay and urql
 
 - [#11301](https://github.com/apollographql/apollo-client/pull/11301) [`46ab032`](https://github.com/apollographql/apollo-client/commit/46ab032af83a01f184bfcce5edba4b55dbb2962a) Thanks [@alessbell](https://github.com/alessbell)! - Add multipart subscription network adapters for Relay and urql

package/apollo-client.cjs

@@ -31,7 +31,7 @@ function _interopNamespace(e) {
 var equal__default = /*#__PURE__*/_interopDefaultLegacy(equal);
 var React__namespace = /*#__PURE__*/_interopNamespace(React);
 
-var version = "3.9.5";
+var version = "3.9.7";
 
 function maybe(thunk) {
     try {
@@ -1938,10 +1938,10 @@ var ApolloError =  (function (_super) {
 
 var hasOwnProperty$3 = Object.prototype.hasOwnProperty;
 function readMultipartBody(response, nextValue) {
-    var _a;
     return tslib.__awaiter(this, void 0, void 0, function () {
-        var decoder, contentType, delimiter, boundaryVal, boundary, buffer, iterator, running, _b, value, done, chunk, searchFrom, bi, message, i, headers, contentType_1, body, result, next;
-        var _c, _d;
+        var decoder, contentType, delimiter, boundaryVal, boundary, buffer, iterator, running, _a, value, done, chunk, searchFrom, bi, message, i, headers, contentType_1, body, result, next;
+        var _b, _c;
+        var _d;
         return tslib.__generator(this, function (_e) {
             switch (_e.label) {
                 case 0:
@@ -1949,7 +1949,7 @@ function readMultipartBody(response, nextValue) {
                         throw new Error("TextDecoder must be defined in the environment: please import a polyfill.");
                     }
                     decoder = new TextDecoder("utf-8");
-                    contentType = (_a = response.headers) === null || _a === void 0 ? void 0 : _a.get("content-type");
+                    contentType = (_d = response.headers) === null || _d === void 0 ? void 0 : _d.get("content-type");
                     delimiter = "boundary=";
                     boundaryVal = (contentType === null || contentType === void 0 ? void 0 : contentType.includes(delimiter)) ?
                         contentType === null || contentType === void 0 ? void 0 : contentType.substring((contentType === null || contentType === void 0 ? void 0 : contentType.indexOf(delimiter)) + delimiter.length).replace(/['"]/g, "").replace(/\;(.*)/gm, "").trim()
@@ -1963,7 +1963,7 @@ function readMultipartBody(response, nextValue) {
                     if (!running) return [3 , 3];
                     return [4 , iterator.next()];
                 case 2:
-                    _b = _e.sent(), value = _b.value, done = _b.done;
+                    _a = _e.sent(), value = _a.value, done = _a.done;
                     chunk = typeof value === "string" ? value : decoder.decode(value);
                     searchFrom = buffer.length - boundary.length + 1;
                     running = !done;
@@ -1971,10 +1971,10 @@ function readMultipartBody(response, nextValue) {
                     bi = buffer.indexOf(boundary, searchFrom);
                     while (bi > -1) {
                         message = void 0;
-                        _c = [
+                        _b = [
                             buffer.slice(0, bi),
                             buffer.slice(bi + boundary.length),
-                        ], message = _c[0], buffer = _c[1];
+                        ], message = _b[0], buffer = _b[1];
                         i = message.indexOf("\r\n\r\n");
                         headers = parseHeaders(message.slice(0, i));
                         contentType_1 = headers["content-type"];
@@ -1993,10 +1993,13 @@ function readMultipartBody(response, nextValue) {
                                 if (isApolloPayloadResult(result)) {
                                     next = {};
                                     if ("payload" in result) {
+                                        if (Object.keys(result).length === 1 && result.payload === null) {
+                                            return [2 ];
+                                        }
                                         next = tslib.__assign({}, result.payload);
                                     }
                                     if ("errors" in result) {
-                                        next = tslib.__assign(tslib.__assign({}, next), { extensions: tslib.__assign(tslib.__assign({}, ("extensions" in next ? next.extensions : null)), (_d = {}, _d[PROTOCOL_ERRORS_SYMBOL] = result.errors, _d)) });
+                                        next = tslib.__assign(tslib.__assign({}, next), { extensions: tslib.__assign(tslib.__assign({}, ("extensions" in next ? next.extensions : null)), (_c = {}, _c[PROTOCOL_ERRORS_SYMBOL] = result.errors, _c)) });
                                     }
                                     nextValue(next);
                                 }
@@ -5436,9 +5439,9 @@ var LocalState =  (function () {
         return this.resolvers || {};
     };
     LocalState.prototype.runResolvers = function (_a) {
-        var document = _a.document, remoteResult = _a.remoteResult, context = _a.context, variables = _a.variables, _b = _a.onlyRunForcedResolvers, onlyRunForcedResolvers = _b === void 0 ? false : _b;
-        return tslib.__awaiter(this, void 0, void 0, function () {
-            return tslib.__generator(this, function (_c) {
+        return tslib.__awaiter(this, arguments, void 0, function (_b) {
+            var document = _b.document, remoteResult = _b.remoteResult, context = _b.context, variables = _b.variables, _c = _b.onlyRunForcedResolvers, onlyRunForcedResolvers = _c === void 0 ? false : _c;
+            return tslib.__generator(this, function (_d) {
                 if (document) {
                     return [2 , this.resolveDocument(document, remoteResult.data, context, variables, this.fragmentMatcher, onlyRunForcedResolvers).then(function (localResult) { return (tslib.__assign(tslib.__assign({}, remoteResult), { data: localResult.result })); })];
                 }
@@ -5470,10 +5473,10 @@ var LocalState =  (function () {
                 return cache.identify(obj);
             } });
     };
-    LocalState.prototype.addExportedVariables = function (document, variables, context) {
-        if (variables === void 0) { variables = {}; }
-        if (context === void 0) { context = {}; }
-        return tslib.__awaiter(this, void 0, void 0, function () {
+    LocalState.prototype.addExportedVariables = function (document_1) {
+        return tslib.__awaiter(this, arguments, void 0, function (document, variables, context) {
+            if (variables === void 0) { variables = {}; }
+            if (context === void 0) { context = {}; }
             return tslib.__generator(this, function (_a) {
                 if (document) {
                     return [2 , this.resolveDocument(document, this.buildRootValueFromCache(document, variables) || {}, this.prepareContext(context), variables).then(function (data) { return (tslib.__assign(tslib.__assign({}, variables), data.exportedVariables)); })];
@@ -5510,13 +5513,13 @@ var LocalState =  (function () {
             optimistic: false,
         }).result;
     };
-    LocalState.prototype.resolveDocument = function (document, rootValue, context, variables, fragmentMatcher, onlyRunForcedResolvers) {
-        if (context === void 0) { context = {}; }
-        if (variables === void 0) { variables = {}; }
-        if (fragmentMatcher === void 0) { fragmentMatcher = function () { return true; }; }
-        if (onlyRunForcedResolvers === void 0) { onlyRunForcedResolvers = false; }
-        return tslib.__awaiter(this, void 0, void 0, function () {
+    LocalState.prototype.resolveDocument = function (document_1, rootValue_1) {
+        return tslib.__awaiter(this, arguments, void 0, function (document, rootValue, context, variables, fragmentMatcher, onlyRunForcedResolvers) {
             var mainDefinition, fragments, fragmentMap, selectionsToResolve, definitionOperation, defaultOperationType, _a, cache, client, execContext, isClientFieldDescendant;
+            if (context === void 0) { context = {}; }
+            if (variables === void 0) { variables = {}; }
+            if (fragmentMatcher === void 0) { fragmentMatcher = function () { return true; }; }
+            if (onlyRunForcedResolvers === void 0) { onlyRunForcedResolvers = false; }
             return tslib.__generator(this, function (_b) {
                 mainDefinition = getMainDefinition(document);
                 fragments = getFragmentDefinitions(document);
@@ -6044,12 +6047,12 @@ var QueryManager =  (function () {
         this.fetchCancelFns.clear();
     };
     QueryManager.prototype.mutate = function (_a) {
-        var _b, _c;
-        var mutation = _a.mutation, variables = _a.variables, optimisticResponse = _a.optimisticResponse, updateQueries = _a.updateQueries, _d = _a.refetchQueries, refetchQueries = _d === void 0 ? [] : _d, _e = _a.awaitRefetchQueries, awaitRefetchQueries = _e === void 0 ? false : _e, updateWithProxyFn = _a.update, onQueryUpdated = _a.onQueryUpdated, _f = _a.fetchPolicy, fetchPolicy = _f === void 0 ? ((_b = this.defaultOptions.mutate) === null || _b === void 0 ? void 0 : _b.fetchPolicy) || "network-only" : _f, _g = _a.errorPolicy, errorPolicy = _g === void 0 ? ((_c = this.defaultOptions.mutate) === null || _c === void 0 ? void 0 : _c.errorPolicy) || "none" : _g, keepRootFields = _a.keepRootFields, context = _a.context;
-        return tslib.__awaiter(this, void 0, void 0, function () {
+        return tslib.__awaiter(this, arguments, void 0, function (_b) {
             var mutationId, hasClientExports, mutationStoreValue, isOptimistic, self;
-            return tslib.__generator(this, function (_h) {
-                switch (_h.label) {
+            var _c, _d;
+            var mutation = _b.mutation, variables = _b.variables, optimisticResponse = _b.optimisticResponse, updateQueries = _b.updateQueries, _e = _b.refetchQueries, refetchQueries = _e === void 0 ? [] : _e, _f = _b.awaitRefetchQueries, awaitRefetchQueries = _f === void 0 ? false : _f, updateWithProxyFn = _b.update, onQueryUpdated = _b.onQueryUpdated, _g = _b.fetchPolicy, fetchPolicy = _g === void 0 ? ((_c = this.defaultOptions.mutate) === null || _c === void 0 ? void 0 : _c.fetchPolicy) || "network-only" : _g, _h = _b.errorPolicy, errorPolicy = _h === void 0 ? ((_d = this.defaultOptions.mutate) === null || _d === void 0 ? void 0 : _d.errorPolicy) || "none" : _h, keepRootFields = _b.keepRootFields, context = _b.context;
+            return tslib.__generator(this, function (_j) {
+                switch (_j.label) {
                     case 0:
                         invariant(mutation, 26);
                         invariant(fetchPolicy === "network-only" || fetchPolicy === "no-cache", 27);
@@ -6060,8 +6063,8 @@ var QueryManager =  (function () {
                         if (!hasClientExports) return [3 , 2];
                         return [4 , this.localState.addExportedVariables(mutation, variables, context)];
                     case 1:
-                        variables = (_h.sent());
-                        _h.label = 2;
+                        variables = (_j.sent());
+                        _j.label = 2;
                     case 2:
                         mutationStoreValue = this.mutationStore &&
                             (this.mutationStore[mutationId] = {
@@ -7371,9 +7374,64 @@ function verifyDocumentType(document, type) {
     );
 }
 
+function useDeepMemo(memoFn, deps) {
+    var ref = React__namespace.useRef();
+    if (!ref.current || !equal.equal(ref.current.deps, deps)) {
+        ref.current = { value: memoFn(), deps: deps };
+    }
+    return ref.current.value;
+}
+
+function getRenderDispatcher() {
+    var _a, _b;
+    return (_b = (_a = React__namespace.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED) === null || _a === void 0 ? void 0 : _a.ReactCurrentDispatcher) === null || _b === void 0 ? void 0 : _b.current;
+}
+var RenderDispatcher = null;
+function useRenderGuard() {
+    RenderDispatcher = getRenderDispatcher();
+    return React__namespace.useCallback(function () {
+        return (RenderDispatcher != null && RenderDispatcher === getRenderDispatcher());
+    }, []);
+}
+
+var INIT = {};
+function useLazyRef(getInitialValue) {
+    var ref = React__namespace.useRef(INIT);
+    if (ref.current === INIT) {
+        ref.current = getInitialValue();
+    }
+    return ref;
+}
+
+var useKey = "use";
+var realHook = React__namespace[useKey];
+var __use = realHook ||
+    function __use(promise) {
+        var statefulPromise = wrapPromiseWithState(promise);
+        switch (statefulPromise.status) {
+            case "pending":
+                throw statefulPromise;
+            case "rejected":
+                throw statefulPromise.reason;
+            case "fulfilled":
+                return statefulPromise.value;
+        }
+    };
+
+var wrapperSymbol = Symbol.for("apollo.hook.wrappers");
+function wrapHook(hookName, useHook, clientOrObsQuery) {
+    var queryManager = clientOrObsQuery["queryManager"];
+    var wrappers = queryManager && queryManager[wrapperSymbol];
+    var wrapper = wrappers && wrappers[hookName];
+    return wrapper ? wrapper(useHook) : useHook;
+}
+
 var hasOwnProperty = Object.prototype.hasOwnProperty;
 function useQuery(query, options) {
     if (options === void 0) { options = Object.create(null); }
+    return wrapHook("useQuery", _useQuery, useApolloClient(options && options.client))(query, options);
+}
+function _useQuery(query, options) {
     return useInternalState(useApolloClient(options.client), query).useQuery(options);
 }
 function useInternalState(client, query) {
@@ -7978,51 +8036,10 @@ function useReactiveVar(rv) {
     }, [rv]), rv, rv);
 }
 
-function useDeepMemo(memoFn, deps) {
-    var ref = React__namespace.useRef();
-    if (!ref.current || !equal.equal(ref.current.deps, deps)) {
-        ref.current = { value: memoFn(), deps: deps };
-    }
-    return ref.current.value;
-}
-
-function getRenderDispatcher() {
-    var _a, _b;
-    return (_b = (_a = React__namespace.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED) === null || _a === void 0 ? void 0 : _a.ReactCurrentDispatcher) === null || _b === void 0 ? void 0 : _b.current;
-}
-var RenderDispatcher = null;
-function useRenderGuard() {
-    RenderDispatcher = getRenderDispatcher();
-    return React__namespace.useCallback(function () {
-        return (RenderDispatcher !== null && RenderDispatcher === getRenderDispatcher());
-    }, []);
-}
-
-var INIT = {};
-function useLazyRef(getInitialValue) {
-    var ref = React__namespace.useRef(INIT);
-    if (ref.current === INIT) {
-        ref.current = getInitialValue();
-    }
-    return ref;
-}
-
-var useKey = "use";
-var realHook = React__namespace[useKey];
-var __use = realHook ||
-    function __use(promise) {
-        var statefulPromise = wrapPromiseWithState(promise);
-        switch (statefulPromise.status) {
-            case "pending":
-                throw statefulPromise;
-            case "rejected":
-                throw statefulPromise.reason;
-            case "fulfilled":
-                return statefulPromise.value;
-        }
-    };
-
 function useFragment(options) {
+    return wrapHook("useFragment", _useFragment, useApolloClient(options.client))(options);
+}
+function _useFragment(options) {
     var cache = useApolloClient(options.client).cache;
     var diffOptions = useDeepMemo(function () {
         var fragment = options.fragment, fragmentName = options.fragmentName, from = options.from, _a = options.optimistic, optimistic = _a === void 0 ? true : _a, rest = tslib.__rest(options, ["fragment", "fragmentName", "from", "optimistic"]);
@@ -8259,11 +8276,13 @@ var InternalQueryReference =  (function () {
         this.promise.catch(function () { });
         returnedPromise
             .then(function (result) {
-            var _a;
-            if (_this.promise.status === "pending") {
-                _this.result = result;
-                (_a = _this.resolve) === null || _a === void 0 ? void 0 : _a.call(_this, result);
-            }
+            setTimeout(function () {
+                var _a;
+                if (_this.promise.status === "pending") {
+                    _this.result = result;
+                    (_a = _this.resolve) === null || _a === void 0 ? void 0 : _a.call(_this, result);
+                }
+            });
         })
             .catch(function () { });
         return returnedPromise;
@@ -8330,6 +8349,9 @@ var skipToken = Symbol.for("apollo.skipToken");
 
 function useSuspenseQuery(query, options) {
     if (options === void 0) { options = Object.create(null); }
+    return wrapHook("useSuspenseQuery", _useSuspenseQuery, useApolloClient(typeof options === "object" ? options.client : undefined))(query, options);
+}
+function _useSuspenseQuery(query, options) {
     var client = useApolloClient(options.client);
     var suspenseCache = getSuspenseCache(client);
     var watchQueryOptions = useWatchQueryOptions({
@@ -8447,6 +8469,9 @@ function useWatchQueryOptions(_a) {
 
 function useBackgroundQuery(query, options) {
     if (options === void 0) { options = Object.create(null); }
+    return wrapHook("useBackgroundQuery", _useBackgroundQuery, useApolloClient(typeof options === "object" ? options.client : undefined))(query, options);
+}
+function _useBackgroundQuery(query, options) {
     var client = useApolloClient(options.client);
     var suspenseCache = getSuspenseCache(client);
     var watchQueryOptions = useWatchQueryOptions({ client: client, query: query, options: options });
@@ -8561,6 +8586,9 @@ function useQueryRefHandlers(queryRef) {
 }
 
 function useReadQuery(queryRef) {
+    return wrapHook("useReadQuery", _useReadQuery, unwrapQueryRef(queryRef)["observable"])(queryRef);
+}
+function _useReadQuery(queryRef) {
     var internalQueryRef = React__namespace.useMemo(function () { return unwrapQueryRef(queryRef); }, [queryRef]);
     var getPromise = React__namespace.useCallback(function () { return getWrappedPromise(queryRef); }, [queryRef]);
     if (internalQueryRef.disposed) {