@apollo/client 4.3.0-alpha.1 → 4.3.0-alpha.10

package/__cjs/core/QueryManager.cjs

@@ -18,6 +18,7 @@ const utilities_1 = require("@apollo/client/utilities");
 const environment_1 = require("@apollo/client/utilities/environment");
 const internal_1 = require("@apollo/client/utilities/internal");
 const invariant_1 = require("@apollo/client/utilities/invariant");
+const dataStateErrorCache_js_1 = require("./dataStateErrorCache.cjs");
 const networkStatus_js_1 = require("./networkStatus.cjs");
 const ObservableQuery_js_1 = require("./ObservableQuery.cjs");
 const QueryInfo_js_1 = require("./QueryInfo.cjs");
@@ -82,6 +83,12 @@ class QueryManager {
                     // selections and fragments from the fragment registry.
                     .concat(defaultDocumentTransform)
                 : defaultDocumentTransform;
+        // Put the incremental transform last so custom document transforms don't
+        // revert changes made to the document accidentally. Adding last also
+        // ensures `@defer` fragments added by the fragment registry are labeled.
+        if (this.incrementalHandler.documentTransform) {
+            this.documentTransform = this.documentTransform.concat(this.incrementalHandler.documentTransform);
+        }
         this.defaultContext = options.defaultContext || {};
         if ((this.onBroadcast = options.onBroadcast)) {
             this.mutationStore = {};
@@ -99,7 +106,7 @@ class QueryManager {
      */
     stop() {
         this.obsQueries.forEach((oq) => oq.stop());
-        this.cancelPendingFetches((0, invariant_1.newInvariantError)(89));
+        this.cancelPendingFetches((0, invariant_1.newInvariantError)(92));
     }
     cancelPendingFetches(error) {
         this.fetchCancelFns.forEach((cancel) => cancel(error));
@@ -114,7 +121,7 @@ class QueryManager {
             if (environment_1.__DEV__) {
                 (0, invariant_1.invariant)(
                     this.localState,
-                    90,
+                    93,
                     (0, internal_1.getOperationName)(mutation, "(anonymous)")
                 );
             }
@@ -128,7 +135,7 @@ class QueryManager {
         const mutationStoreValue = this.mutationStore &&
             (this.mutationStore[queryInfo.id] = {
                 mutation,
-                variables,
+                variables: this.cache.serializeVariables(mutation, variables),
                 loading: true,
                 error: null,
             });
@@ -341,10 +348,6 @@ class QueryManager {
             }),
         }));
     }
-    requestIdCounter = 1;
-    generateRequestId() {
-        return this.requestIdCounter++;
-    }
     clearStore(options = {
         discardWatches: true,
     }) {
@@ -353,7 +356,7 @@ class QueryManager {
         // depend on values that previously existed in the data portion of the
         // store. So, we cancel the promises and observers that we have issued
         // so far and not yet resolved (in the case of queries).
-        this.cancelPendingFetches((0, invariant_1.newInvariantError)(91));
+        this.cancelPendingFetches((0, invariant_1.newInvariantError)(94));
         this.obsQueries.forEach((observableQuery) => {
             // Set loading to true so listeners don't trigger unless they want
             // results with partial data.
@@ -423,10 +426,10 @@ class QueryManager {
                 if (!included) {
                     const queryName = queryNames.get(nameOrQueryString);
                     if (queryName) {
-                        __DEV__ && invariant_1.invariant.warn(92, queryName);
+                        __DEV__ && invariant_1.invariant.warn(95, queryName);
                     }
                     else {
-                        __DEV__ && invariant_1.invariant.warn(93);
+                        __DEV__ && invariant_1.invariant.warn(96);
                     }
                 }
             });
@@ -455,7 +458,7 @@ class QueryManager {
         if (environment_1.__DEV__) {
             (0, invariant_1.invariant)(
                 !this.getDocumentInfo(query).hasClientExports || this.localState,
-                94,
+                97,
                 (0, internal_1.getOperationName)(query, "(anonymous)")
             );
         }
@@ -530,6 +533,7 @@ class QueryManager {
         const executeContext = {
             client: this.client,
         };
+        variables = this.cache.serializeVariables(query, variables);
         if (serverQuery) {
             const { inFlightLinkObservables, link } = this;
             try {
@@ -599,14 +603,14 @@ class QueryManager {
             if (environment_1.__DEV__) {
                 (0, invariant_1.invariant)(
                     this.localState,
-                    95,
+                    98,
                     operation[0].toUpperCase() + operation.slice(1),
                     operationName ?? "(anonymous)"
                 );
             }
             (0, invariant_1.invariant)(
                 !hasIncrementalDirective,
-                96,
+                99,
                 operation[0].toUpperCase() + operation.slice(1),
                 operationName ?? "(anonymous)"
             );
@@ -630,8 +634,7 @@ class QueryManager {
             })),
         };
     }
-    getResultsFromLink(options, { queryInfo, cacheWriteBehavior, observableQuery, exposeExtensions, }) {
-        const requestId = (queryInfo.lastRequestId = this.generateRequestId());
+    getResultsFromLink(options, { queryInfo, cacheWriteBehavior, observableQuery, exposeExtensions, prunePendingDeferFragments, }) {
         const { errorPolicy } = options;
         // Performing transformForLink here gives this.cache a chance to fill in
         // missing fragment definitions (for example) before sending this document
@@ -641,57 +644,49 @@ class QueryManager {
             // Use linkDocument rather than queryInfo.document so the
             // operation/fragments used to write the result are the same as the
             // ones used to obtain it from the link.
-            const result = queryInfo.markQueryResult(incoming, {
+            const { dataState, ...result } = queryInfo.markQueryResult(incoming, {
                 ...options,
                 document: linkDocument,
                 cacheWriteBehavior,
+                returnPartialData: options.returnPartialData,
+                prunePendingDeferFragments,
             });
             const hasErrors = (0, internal_1.graphQLResultHasError)(result);
             if (hasErrors && errorPolicy === "none") {
-                queryInfo.resetLastWrite();
                 observableQuery?.["resetNotifications"]();
-                throw new errors_1.CombinedGraphQLErrors(removeStreamDetailsFromExtensions(result));
+                const error = new errors_1.CombinedGraphQLErrors(removeStreamDetailsFromExtensions(result));
+                dataStateErrorCache_js_1.dataStateErrorCache.set(error, dataState);
+                throw error;
             }
+            const partial = dataState !== "complete";
             const aqr = {
                 data: result.data,
                 ...(queryInfo.hasNext ?
                     {
                         loading: true,
                         networkStatus: networkStatus_js_1.NetworkStatus.streaming,
-                        dataState: "streaming",
-                        partial: true,
+                        dataState,
+                        partial,
                     }
                     : {
-                        dataState: result.data ? "complete" : "empty",
+                        dataState,
                         loading: false,
                         networkStatus: networkStatus_js_1.NetworkStatus.ready,
-                        partial: !result.data,
+                        partial,
                     }),
             };
             if (exposeExtensions && "extensions" in result) {
                 aqr[internal_1.extensionsSymbol] = result.extensions;
             }
-            // In the case we start multiple network requests simultaneously, we
-            // want to ensure we properly set `data` if we're reporting on an old
-            // result which will not be caught by the conditional above that ends up
-            // throwing the markError result.
-            if (hasErrors) {
-                if (errorPolicy === "none") {
-                    aqr.data = void 0;
-                    aqr.dataState = "empty";
-                }
-                if (errorPolicy !== "ignore") {
-                    aqr.error = new errors_1.CombinedGraphQLErrors(removeStreamDetailsFromExtensions(result));
-                    if (aqr.dataState !== "streaming") {
-                        aqr.networkStatus = networkStatus_js_1.NetworkStatus.error;
-                    }
+            if (hasErrors && errorPolicy !== "ignore") {
+                aqr.error = new errors_1.CombinedGraphQLErrors(removeStreamDetailsFromExtensions(result));
+                if (aqr.networkStatus !== networkStatus_js_1.NetworkStatus.streaming) {
+                    aqr.networkStatus = networkStatus_js_1.NetworkStatus.error;
                 }
             }
             return aqr;
         }), (0, rxjs_2.catchError)((error) => {
-            // Avoid storing errors from older interrupted queries.
-            if (requestId >= queryInfo.lastRequestId && errorPolicy === "none") {
-                queryInfo.resetLastWrite();
+            if (errorPolicy === "none") {
                 observableQuery?.["resetNotifications"]();
                 throw error;
             }
@@ -726,6 +721,7 @@ class QueryManager {
             fetchPolicy,
             errorPolicy,
             returnPartialData,
+            networkStatus,
             notifyOnNetworkStatusChange,
             context,
         });
@@ -784,7 +780,7 @@ class QueryManager {
             if (environment_1.__DEV__) {
                 (0, invariant_1.invariant)(
                     this.localState,
-                    97,
+                    100,
                     (0, internal_1.getOperationName)(normalized.query, "(anonymous)")
                 );
             }
@@ -960,7 +956,7 @@ class QueryManager {
                 !this.noCacheWarningsByCause.has(cause)) {
                 this.noCacheWarningsByCause.add(cause);
                 __DEV__ && invariant_1.invariant.warn(
-                    98,
+                    101,
                     (0, internal_1.getOperationName)(document, `Unnamed ${operationType ?? "operation"}`)
                 );
             }
@@ -975,32 +971,33 @@ class QueryManager {
             (0, masking_1.maskFragment)(data, fragment, this.cache, fragmentName)
             : data;
     }
-    fetchQueryByPolicy({ query, variables, fetchPolicy, errorPolicy, returnPartialData, context, }, { cacheWriteBehavior, onCacheHit, queryInfo, observableQuery, exposeExtensions, }) {
-        const readCache = () => this.cache.diff({
-            query,
-            variables,
-            returnPartialData: true,
-            optimistic: true,
-        });
+    fetchQueryByPolicy({ query, variables, fetchPolicy, errorPolicy, returnPartialData, context, networkStatus, }, { cacheWriteBehavior, onCacheHit, queryInfo, observableQuery, exposeExtensions, }) {
+        const readCache = () => {
+            return queryInfo.getDiff({
+                query,
+                variables,
+                returnPartialData: true,
+                optimistic: true,
+            });
+        };
         const resultsFromCache = (diff, networkStatus) => {
             const data = diff.result;
             if (environment_1.__DEV__ && !returnPartialData && data !== null) {
                 (0, ObservableQuery_js_1.logMissingFieldErrors)(diff.missing);
             }
-            const toResult = (data) => {
+            const toResult = (data, dataState = diff.dataState) => {
                 // TODO: Eventually we should move this handling into
                 // queryInfo.getDiff() directly. Since getDiff is updated to return null
                 // on returnPartialData: false, we should take advantage of that instead
                 // of having to patch it elsewhere.
                 if (!diff.complete && !returnPartialData) {
                     data = undefined;
+                    dataState = "empty";
                 }
                 return {
                     // TODO: Handle partial data
                     data: data,
-                    dataState: diff.complete ? "complete"
-                        : data ? "partial"
-                            : "empty",
+                    dataState,
                     loading: (0, utilities_1.isNetworkRequestInFlight)(networkStatus),
                     networkStatus,
                     partial: !diff.complete,
@@ -1010,6 +1007,10 @@ class QueryManager {
                 return (0, rxjs_2.of)({
                     kind: "N",
                     value: toResult(data),
+                    // Always attach the variables used for this fetch so @export
+                    // resolution can update ObservableQuery.options.variables and
+                    // resubscribe the cache watch under the correct variable set.
+                    resolvedVariables: variables,
                     source: "cache",
                 });
             };
@@ -1022,7 +1023,7 @@ class QueryManager {
                 if (environment_1.__DEV__) {
                     (0, invariant_1.invariant)(
                         this.localState,
-                        99,
+                        102,
                         (0, internal_1.getOperationName)(query, "(anonymous)")
                     );
                 }
@@ -1038,7 +1039,13 @@ class QueryManager {
                     fetchPolicy,
                 }).then((resolved) => ({
                     kind: "N",
-                    value: toResult(resolved.data || void 0),
+                    value: toResult(resolved.data || void 0, diff.complete ? "complete"
+                        : resolved.data ? "partial"
+                            : "empty"),
+                    // Always attach the variables used for this fetch so @export
+                    // resolution can update ObservableQuery.options.variables and
+                    // resubscribe the cache watch under the correct variable set.
+                    resolvedVariables: variables,
                     source: "cache",
                 })));
             }
@@ -1053,19 +1060,26 @@ class QueryManager {
             }
             return fromData(data || undefined);
         };
-        const resultsFromLink = () => this.getResultsFromLink({
+        const resultsFromLink = ({ prunePendingDeferFragments = true, } = {}) => this.getResultsFromLink({
             query,
             variables,
             context,
             fetchPolicy,
             errorPolicy,
+            returnPartialData,
+            networkStatus,
         }, {
             cacheWriteBehavior,
             queryInfo,
             observableQuery,
             exposeExtensions,
+            prunePendingDeferFragments,
         }).pipe(validateDidEmitValue(), (0, rxjs_2.materialize)(), (0, rxjs_2.map)((result) => ({
             ...result,
+            // Always attach the variables used for this fetch so @export
+            // resolution can update ObservableQuery.options.variables and
+            // resubscribe the cache watch under the correct variable set.
+            resolvedVariables: variables,
             source: "network",
         })));
         switch (fetchPolicy) {
@@ -1091,7 +1105,7 @@ class QueryManager {
                 if (diff.complete || returnPartialData) {
                     return {
                         fromLink: true,
-                        observable: (0, rxjs_2.concat)(resultsFromCache(diff, networkStatus_js_1.NetworkStatus.loading), resultsFromLink()),
+                        observable: (0, rxjs_2.concat)(resultsFromCache(diff, networkStatus_js_1.NetworkStatus.loading), resultsFromLink({ prunePendingDeferFragments: false })),
                     };
                 }
                 return { fromLink: true, observable: resultsFromLink() };
@@ -1102,9 +1116,24 @@ class QueryManager {
                     observable: (0, rxjs_2.concat)(resultsFromCache(readCache(), networkStatus_js_1.NetworkStatus.ready)),
                 };
             case "network-only":
-                return { fromLink: true, observable: resultsFromLink() };
+                return {
+                    fromLink: true,
+                    observable: resultsFromLink({
+                        prunePendingDeferFragments: networkStatus !== networkStatus_js_1.NetworkStatus.refetch,
+                    }),
+                };
             case "no-cache":
-                return { fromLink: true, observable: resultsFromLink() };
+                return {
+                    fromLink: true,
+                    observable: resultsFromLink().pipe((0, rxjs_2.map)((notification) => {
+                        if (notification.kind === "N" &&
+                            notification.value.data != null &&
+                            this.cache.configuresScalars()) {
+                            notification.value.data = (0, internal_1.coerceScalarFieldsToParsed)(notification.value.data, query, this.cache);
+                        }
+                        return notification;
+                    })),
+                };
             case "standby":
                 return { fromLink: false, observable: rxjs_2.EMPTY };
         }
@@ -1118,7 +1147,7 @@ function validateDidEmitValue() {
             didEmitValue = true;
         },
         complete() {
-            (0, invariant_1.invariant)(didEmitValue, 100);
+            (0, invariant_1.invariant)(didEmitValue, 103);
         },
     });
 }