@apollo/client 3.9.6 → 3.10.0-alpha.1

package/.changeset/flat-singers-kiss.md

@@ -0,0 +1,5 @@
+---
+"@apollo/client": patch
+---
+
+Fix issue where passing a new `from` option to `useFragment` would first render with the previous value before rerendering with the correct value.

package/.changeset/pre.json

@@ -0,0 +1,11 @@
+{
+  "mode": "pre",
+  "tag": "alpha",
+  "initialVersions": {
+    "@apollo/client": "3.9.7"
+  },
+  "changesets": [
+    "flat-singers-kiss",
+    "tasty-pillows-ring"
+  ]
+}

package/.changeset/tasty-pillows-ring.md

@@ -0,0 +1,5 @@
+---
+"@apollo/client": minor
+---
+
+Add `watchFragment` method to the cache and expose it on ApolloClient, refactor `useFragment` using `watchFragment`.

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @apollo/client
 
+## 3.10.0-alpha.1
+
+### Patch Changes
+
+- [#11689](https://github.com/apollographql/apollo-client/pull/11689) [`cb8ffe5`](https://github.com/apollographql/apollo-client/commit/cb8ffe50e903397f741b62a44624bfe69b5f7b75) Thanks [@jerelmiller](https://github.com/jerelmiller)! - Fix issue where passing a new `from` option to `useFragment` would first render with the previous value before rerendering with the correct value.
+
+## 3.10.0-alpha.0
+
+### Minor Changes
+
+- [#11465](https://github.com/apollographql/apollo-client/pull/11465) [`7623da7`](https://github.com/apollographql/apollo-client/commit/7623da7720855b0c19e13ff9124679f426a39725) Thanks [@alessbell](https://github.com/alessbell)! - Add `watchFragment` method to the cache and expose it on ApolloClient, refactor `useFragment` using `watchFragment`.
+
+## 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

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.6";
+var version = "3.10.0-alpha.1";
 
 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);
                                 }
@@ -2413,6 +2416,33 @@ var ApolloCache =  (function () {
         if (optimistic === void 0) { optimistic = !!options.optimistic; }
         return this.read(tslib.__assign(tslib.__assign({}, options), { rootId: options.id || "ROOT_QUERY", optimistic: optimistic }));
     };
+    ApolloCache.prototype.watchFragment = function (options) {
+        var _this = this;
+        var fragment = options.fragment, fragmentName = options.fragmentName, from = options.from, _a = options.optimistic, optimistic = _a === void 0 ? true : _a;
+        var diffOptions = {
+            returnPartialData: true,
+            id: typeof from === "string" ? from : this.identify(from),
+            query: this.getFragmentDoc(fragment, fragmentName),
+            optimistic: optimistic,
+        };
+        var latestDiff;
+        return new zenObservableTs.Observable(function (observer) {
+            return _this.watch(tslib.__assign(tslib.__assign({}, diffOptions), { immediate: true, query: _this.getFragmentDoc(fragment, fragmentName), callback: function (diff) {
+                    if (equal.equal(diff, latestDiff)) {
+                        return;
+                    }
+                    var result = {
+                        data: diff.result,
+                        complete: !!diff.complete,
+                    };
+                    if (diff.missing) {
+                        result.missing = mergeDeepArray(diff.missing.map(function (error) { return error.missing; }));
+                    }
+                    latestDiff = diff;
+                    observer.next(result);
+                } }));
+        });
+    };
     ApolloCache.prototype.readFragment = function (options, optimistic) {
         if (optimistic === void 0) { optimistic = !!options.optimistic; }
         return this.read(tslib.__assign(tslib.__assign({}, options), { query: this.getFragmentDoc(options.fragment, options.fragmentName), rootId: options.id, optimistic: optimistic }));
@@ -5436,9 +5466,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 +5500,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 +5540,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 +6074,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 +6090,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] = {
@@ -7058,6 +7088,9 @@ var ApolloClient =  (function () {
         if (optimistic === void 0) { optimistic = false; }
         return this.cache.readQuery(options, optimistic);
     };
+    ApolloClient.prototype.watchFragment = function (options) {
+        return this.cache.watchFragment(options);
+    };
     ApolloClient.prototype.readFragment = function (options, optimistic) {
         if (optimistic === void 0) { optimistic = false; }
         return this.cache.readFragment(options, optimistic);
@@ -7387,7 +7420,7 @@ var RenderDispatcher = null;
 function useRenderGuard() {
     RenderDispatcher = getRenderDispatcher();
     return React__namespace.useCallback(function () {
-        return (RenderDispatcher !== null && RenderDispatcher === getRenderDispatcher());
+        return (RenderDispatcher != null && RenderDispatcher === getRenderDispatcher());
     }, []);
 }
 
@@ -8045,21 +8078,27 @@ function _useFragment(options) {
     var resultRef = useLazyRef(function () {
         return diffToResult(cache.diff(diffOptions));
     });
+    var stableOptions = useDeepMemo(function () { return options; }, [options]);
+    React__namespace.useMemo(function () {
+        resultRef.current = diffToResult(cache.diff(diffOptions));
+    }, [diffOptions, cache]);
     var getSnapshot = React__namespace.useCallback(function () { return resultRef.current; }, []);
     return useSyncExternalStore(React__namespace.useCallback(function (forceUpdate) {
         var lastTimeout = 0;
-        var unsubscribe = cache.watch(tslib.__assign(tslib.__assign({}, diffOptions), { immediate: true, callback: function (diff) {
-                if (!equal.equal(diff.result, resultRef.current.data)) {
-                    resultRef.current = diffToResult(diff);
-                    clearTimeout(lastTimeout);
-                    lastTimeout = setTimeout(forceUpdate);
-                }
-            } }));
+        var subscription = cache.watchFragment(stableOptions).subscribe({
+            next: function (result) {
+                if (equal__default(result, resultRef.current))
+                    return;
+                resultRef.current = result;
+                clearTimeout(lastTimeout);
+                lastTimeout = setTimeout(forceUpdate);
+            },
+        });
         return function () {
-            unsubscribe();
+            subscription.unsubscribe();
             clearTimeout(lastTimeout);
         };
-    }, [cache, diffOptions]), getSnapshot, getSnapshot);
+    }, [cache, stableOptions]), getSnapshot, getSnapshot);
 }
 function diffToResult(diff) {
     var result = {