@apollo/client 4.0.0-alpha.15 → 4.0.0-alpha.17

package/core/QueryManager.js

@@ -6,9 +6,7 @@ import { CombinedGraphQLErrors, graphQLResultHasProtocolErrors, registerLinkErro
 import { PROTOCOL_ERRORS_SYMBOL } from "@apollo/client/errors";
 import { execute } from "@apollo/client/link";
 import { maskFragment, maskOperation } from "@apollo/client/masking";
-import { print } from "@apollo/client/utilities";
-import { cacheSizes } from "@apollo/client/utilities";
-import { DocumentTransform } from "@apollo/client/utilities";
+import { cacheSizes, DocumentTransform, print } from "@apollo/client/utilities";
 import { __DEV__ } from "@apollo/client/utilities/environment";
 import { AutoCleanedWeakCache, checkDocument, filterMap, getDefaultValues, getGraphQLErrorsFromResult, getOperationDefinition, getOperationName, graphQLResultHasError, hasDirectives, hasForcedResolvers, isDocumentNode, isExecutionPatchIncrementalResult, isExecutionPatchResult, isNonEmptyArray, isNonNullObject, makeUniqueId, mergeIncrementalData, onAnyEvent, removeDirectivesFromDocument, toQueryResult, } from "@apollo/client/utilities/internal";
 import { invariant, newInvariantError, } from "@apollo/client/utilities/invariant";
@@ -837,20 +835,29 @@ export class QueryManager {
             }
             const aqr = {
                 data: result.data,
+                dataState: result.data ? "complete" : "empty",
                 loading: false,
                 networkStatus: NetworkStatus.ready,
                 partial: !result.data,
             };
+            if (isExecutionPatchResult(result) && result.hasNext) {
+                aqr.dataState = "streaming";
+                aqr.partial = true;
+            }
             // In the case we start multiple network requests simulatenously, 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 && errorPolicy === "none") {
                 aqr.data = void 0;
+                aqr.dataState = "empty";
             }
             if (hasErrors && errorPolicy !== "ignore") {
                 aqr.error = new CombinedGraphQLErrors(result);
                 aqr.networkStatus = NetworkStatus.error;
+                if (aqr.data) {
+                    aqr.dataState = "complete";
+                }
             }
             return aqr;
         }), catchError((error) => {
@@ -862,6 +869,7 @@ export class QueryManager {
             }
             const aqr = {
                 data: undefined,
+                dataState: "empty",
                 loading: false,
                 networkStatus: NetworkStatus.ready,
                 partial: true,
@@ -1042,7 +1050,9 @@ export class QueryManager {
                             if (result === true) {
                                 // The onQueryUpdated function requested the default refetching
                                 // behavior by returning true.
-                                result = oq.refetch();
+                                result = oq
+                                    .refetch()
+                                    .retain( /* create a persistent subscription on the query */);
                             }
                             // Record the result in the results Map, as long as onQueryUpdated
                             // did not return false to skip/ignore this result.
@@ -1076,7 +1086,9 @@ export class QueryManager {
                 }
                 // Otherwise, we fall back to refetching.
                 if (!onQueryUpdated || result === true) {
-                    result = oq.refetch();
+                    result = oq
+                        .refetch()
+                        .retain( /* create a persistent subscription on the query */);
                 }
                 if (result !== false) {
                     results.set(oq, result);
@@ -1145,6 +1157,9 @@ export class QueryManager {
                 return {
                     // TODO: Handle partial data
                     data: data,
+                    dataState: diff.complete ? "complete"
+                        : data ? "partial"
+                            : "empty",
                     loading: isNetworkRequestInFlight(networkStatus),
                     networkStatus,
                     partial: !diff.complete,