@apollo/client 4.3.0-alpha.5 → 4.3.0-alpha.7

package/__cjs/core/QueryManager.cjs

@@ -106,7 +106,7 @@ class QueryManager {
      */
     stop() {
         this.obsQueries.forEach((oq) => oq.stop());
-        this.cancelPendingFetches((0, invariant_1.newInvariantError)(90));
+        this.cancelPendingFetches((0, invariant_1.newInvariantError)(91));
     }
     cancelPendingFetches(error) {
         this.fetchCancelFns.forEach((cancel) => cancel(error));
@@ -121,7 +121,7 @@ class QueryManager {
             if (environment_1.__DEV__) {
                 (0, invariant_1.invariant)(
                     this.localState,
-                    91,
+                    92,
                     (0, internal_1.getOperationName)(mutation, "(anonymous)")
                 );
             }
@@ -356,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)(92));
+        this.cancelPendingFetches((0, invariant_1.newInvariantError)(93));
         this.obsQueries.forEach((observableQuery) => {
             // Set loading to true so listeners don't trigger unless they want
             // results with partial data.
@@ -426,10 +426,10 @@ class QueryManager {
                 if (!included) {
                     const queryName = queryNames.get(nameOrQueryString);
                     if (queryName) {
-                        __DEV__ && invariant_1.invariant.warn(93, queryName);
+                        __DEV__ && invariant_1.invariant.warn(94, queryName);
                     }
                     else {
-                        __DEV__ && invariant_1.invariant.warn(94);
+                        __DEV__ && invariant_1.invariant.warn(95);
                     }
                 }
             });
@@ -458,7 +458,7 @@ class QueryManager {
         if (environment_1.__DEV__) {
             (0, invariant_1.invariant)(
                 !this.getDocumentInfo(query).hasClientExports || this.localState,
-                95,
+                96,
                 (0, internal_1.getOperationName)(query, "(anonymous)")
             );
         }
@@ -603,14 +603,14 @@ class QueryManager {
             if (environment_1.__DEV__) {
                 (0, invariant_1.invariant)(
                     this.localState,
-                    96,
+                    97,
                     operation[0].toUpperCase() + operation.slice(1),
                     operationName ?? "(anonymous)"
                 );
             }
             (0, invariant_1.invariant)(
                 !hasIncrementalDirective,
-                97,
+                98,
                 operation[0].toUpperCase() + operation.slice(1),
                 operationName ?? "(anonymous)"
             );
@@ -653,7 +653,6 @@ class QueryManager {
             });
             const hasErrors = (0, internal_1.graphQLResultHasError)(result);
             if (hasErrors && errorPolicy === "none") {
-                queryInfo.resetLastWrite();
                 observableQuery?.["resetNotifications"]();
                 const error = new errors_1.CombinedGraphQLErrors(removeStreamDetailsFromExtensions(result));
                 dataStateErrorCache_js_1.dataStateErrorCache.set(error, dataState);
@@ -688,7 +687,6 @@ class QueryManager {
             return aqr;
         }), (0, rxjs_2.catchError)((error) => {
             if (errorPolicy === "none") {
-                queryInfo.resetLastWrite();
                 observableQuery?.["resetNotifications"]();
                 throw error;
             }
@@ -782,7 +780,7 @@ class QueryManager {
             if (environment_1.__DEV__) {
                 (0, invariant_1.invariant)(
                     this.localState,
-                    98,
+                    99,
                     (0, internal_1.getOperationName)(normalized.query, "(anonymous)")
                 );
             }
@@ -958,7 +956,7 @@ class QueryManager {
                 !this.noCacheWarningsByCause.has(cause)) {
                 this.noCacheWarningsByCause.add(cause);
                 __DEV__ && invariant_1.invariant.warn(
-                    99,
+                    100,
                     (0, internal_1.getOperationName)(document, `Unnamed ${operationType ?? "operation"}`)
                 );
             }
@@ -974,31 +972,32 @@ class QueryManager {
             : data;
     }
     fetchQueryByPolicy({ query, variables, fetchPolicy, errorPolicy, returnPartialData, context, networkStatus, }, { cacheWriteBehavior, onCacheHit, queryInfo, observableQuery, exposeExtensions, }) {
-        const readCache = () => this.cache.diff({
-            query,
-            variables,
-            returnPartialData: true,
-            optimistic: true,
-        });
+        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,
@@ -1024,7 +1023,7 @@ class QueryManager {
                 if (environment_1.__DEV__) {
                     (0, invariant_1.invariant)(
                         this.localState,
-                        100,
+                        101,
                         (0, internal_1.getOperationName)(query, "(anonymous)")
                     );
                 }
@@ -1040,7 +1039,9 @@ 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.
@@ -1136,7 +1137,7 @@ function validateDidEmitValue() {
             didEmitValue = true;
         },
         complete() {
-            (0, invariant_1.invariant)(didEmitValue, 101);
+            (0, invariant_1.invariant)(didEmitValue, 102);
         },
     });
 }