@apollo/client 3.9.8 → 3.9.10

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @apollo/client
 
+## 3.9.10
+
+### Patch Changes
+
+- [#11738](https://github.com/apollographql/apollo-client/pull/11738) [`b1a5eb8`](https://github.com/apollographql/apollo-client/commit/b1a5eb80cae8bdf2e9d8627f1eab65e088c43438) Thanks [@jerelmiller](https://github.com/jerelmiller)! - Fix an issue where rerendering `useBackgroundQuery` after the `queryRef` had been disposed, either via the auto dispose timeout or by unmounting `useReadQuery`, would cause the `queryRef` to be recreated potentially resulting in another network request.
+
+- [#11738](https://github.com/apollographql/apollo-client/pull/11738) [`b1a5eb8`](https://github.com/apollographql/apollo-client/commit/b1a5eb80cae8bdf2e9d8627f1eab65e088c43438) Thanks [@jerelmiller](https://github.com/jerelmiller)! - Allow queryRefs to be disposed of synchronously when a suspense hook unmounts. This prevents some situations where using a suspense hook with the same query/variables as the disposed queryRef accidentally used the disposed queryRef rather than creating a new instance.
+
+- [#11670](https://github.com/apollographql/apollo-client/pull/11670) [`cc5c03b`](https://github.com/apollographql/apollo-client/commit/cc5c03b2690f452483d83eecb68611a23055d99e) Thanks [@phryneas](https://github.com/phryneas)! - Bail out of `executeSubSelectedArray` calls if the array has 0 elements.
+
+## 3.9.9
+
+### Patch Changes
+
+- [#11696](https://github.com/apollographql/apollo-client/pull/11696) [`466ef82`](https://github.com/apollographql/apollo-client/commit/466ef82198486fc696da64d17d82b46140760ac4) Thanks [@PiR1](https://github.com/PiR1)! - Immediately dispose of the `queryRef` if `useBackgroundQuery` unmounts before the auto dispose timeout kicks in.
+
 ## 3.9.8
 
 ### Patch Changes

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.8";
+var version = "3.9.10";
 
 function maybe(thunk) {
     try {
@@ -3318,12 +3318,14 @@ var StoreReader =  (function () {
                     }
                 }
                 else if (isArray(fieldValue)) {
-                    fieldValue = handleMissing(_this.executeSubSelectedArray({
-                        field: selection,
-                        array: fieldValue,
-                        enclosingRef: enclosingRef,
-                        context: context,
-                    }), resultName);
+                    if (fieldValue.length > 0) {
+                        fieldValue = handleMissing(_this.executeSubSelectedArray({
+                            field: selection,
+                            array: fieldValue,
+                            enclosingRef: enclosingRef,
+                            context: context,
+                        }), resultName);
+                    }
                 }
                 else if (!selection.selectionSet) {
                     if (context.canonizeResults) {
@@ -8118,6 +8120,7 @@ var InternalQueryReference =  (function () {
         this.key = {};
         this.listeners = new Set();
         this.references = 0;
+        this.softReferences = 0;
         this.handleNext = this.handleNext.bind(this);
         this.handleError = this.handleError.bind(this);
         this.dispose = this.dispose.bind(this);
@@ -8182,8 +8185,23 @@ var InternalQueryReference =  (function () {
             }
             disposed = true;
             _this.references--;
+            if (!_this.references) {
+                _this.dispose();
+            }
+        };
+    };
+    InternalQueryReference.prototype.softRetain = function () {
+        var _this = this;
+        this.softReferences++;
+        var disposed = false;
+        return function () {
+            if (disposed) {
+                return;
+            }
+            disposed = true;
+            _this.softReferences--;
             setTimeout(function () {
-                if (!_this.references) {
+                if (!_this.softReferences && !_this.references) {
                     _this.dispose();
                 }
             });
@@ -8337,6 +8355,10 @@ var SuspenseCache =  (function () {
         }
         return ref.current;
     };
+    SuspenseCache.prototype.add = function (cacheKey, queryRef) {
+        var ref = this.queryRefs.lookupArray(cacheKey);
+        ref.current = queryRef;
+    };
     return SuspenseCache;
 }());
 
@@ -8391,6 +8413,12 @@ function _useSuspenseQuery(query, options) {
             dispose();
         };
     }, [queryRef]);
+    React__namespace.useEffect(function () {
+        if (queryRef.disposed) {
+            suspenseCache.add(cacheKey, queryRef);
+            queryRef.reinitialize();
+        }
+    });
     var skipResult = React__namespace.useMemo(function () {
         var error = toApolloError(queryRef.result);
         return {
@@ -8498,6 +8526,11 @@ function _useBackgroundQuery(query, options) {
         var promise = queryRef.applyOptions(watchQueryOptions);
         updateWrappedQueryRef(wrappedQueryRef, promise);
     }
+    React__namespace.useEffect(function () {
+        if (queryRef.disposed) {
+            suspenseCache.add(cacheKey, queryRef);
+        }
+    });
     var fetchMore = React__namespace.useCallback(function (options) {
         var promise = queryRef.fetchMore(options);
         setWrappedQueryRef(wrapQueryRef(queryRef));
@@ -8508,6 +8541,7 @@ function _useBackgroundQuery(query, options) {
         setWrappedQueryRef(wrapQueryRef(queryRef));
         return promise;
     }, [queryRef]);
+    React__namespace.useEffect(function () { return queryRef.softRetain(); }, [queryRef]);
     return [
         didFetchResult.current ? wrappedQueryRef : void 0,
         { fetchMore: fetchMore, refetch: refetch },
@@ -8599,7 +8633,12 @@ function _useReadQuery(queryRef) {
         internalQueryRef.reinitialize();
         updateWrappedQueryRef(queryRef, internalQueryRef.promise);
     }
-    React__namespace.useEffect(function () { return internalQueryRef.retain(); }, [internalQueryRef]);
+    React__namespace.useEffect(function () {
+        if (internalQueryRef.disposed) {
+            internalQueryRef.reinitialize();
+        }
+        return internalQueryRef.retain();
+    }, [internalQueryRef]);
     var promise = useSyncExternalStore(React__namespace.useCallback(function (forceUpdate) {
         return internalQueryRef.listen(function (promise) {
             updateWrappedQueryRef(queryRef, promise);