@apollo/client 4.3.0-alpha.2 → 4.3.0-alpha.4

package/__cjs/core/QueryManager.cjs

@@ -341,10 +341,6 @@ class QueryManager {
             }),
         }));
     }
-    requestIdCounter = 1;
-    generateRequestId() {
-        return this.requestIdCounter++;
-    }
     clearStore(options = {
         discardWatches: true,
     }) {
@@ -632,7 +628,6 @@ class QueryManager {
         };
     }
     getResultsFromLink(options, { queryInfo, cacheWriteBehavior, observableQuery, exposeExtensions, }) {
-        const requestId = (queryInfo.lastRequestId = this.generateRequestId());
         const { errorPolicy } = options;
         // Performing transformForLink here gives this.cache a chance to fill in
         // missing fragment definitions (for example) before sending this document
@@ -642,10 +637,11 @@ 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,
             });
             const hasErrors = (0, internal_1.graphQLResultHasError)(result);
             if (hasErrors && errorPolicy === "none") {
@@ -653,29 +649,26 @@ class QueryManager {
                 observableQuery?.["resetNotifications"]();
                 throw new errors_1.CombinedGraphQLErrors(removeStreamDetailsFromExtensions(result));
             }
+            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;
@@ -683,15 +676,14 @@ class QueryManager {
                 }
                 if (errorPolicy !== "ignore") {
                     aqr.error = new errors_1.CombinedGraphQLErrors(removeStreamDetailsFromExtensions(result));
-                    if (aqr.dataState !== "streaming") {
+                    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") {
+            if (errorPolicy === "none") {
                 queryInfo.resetLastWrite();
                 observableQuery?.["resetNotifications"]();
                 throw error;
@@ -727,6 +719,7 @@ class QueryManager {
             fetchPolicy,
             errorPolicy,
             returnPartialData,
+            networkStatus,
             notifyOnNetworkStatusChange,
             context,
         });
@@ -976,7 +969,7 @@ class QueryManager {
             (0, masking_1.maskFragment)(data, fragment, this.cache, fragmentName)
             : data;
     }
-    fetchQueryByPolicy({ query, variables, fetchPolicy, errorPolicy, returnPartialData, context, }, { cacheWriteBehavior, onCacheHit, queryInfo, observableQuery, exposeExtensions, }) {
+    fetchQueryByPolicy({ query, variables, fetchPolicy, errorPolicy, returnPartialData, context, networkStatus, }, { cacheWriteBehavior, onCacheHit, queryInfo, observableQuery, exposeExtensions, }) {
         const readCache = () => this.cache.diff({
             query,
             variables,
@@ -1060,6 +1053,8 @@ class QueryManager {
             context,
             fetchPolicy,
             errorPolicy,
+            returnPartialData,
+            networkStatus,
         }, {
             cacheWriteBehavior,
             queryInfo,