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

package/__cjs/cache/inmemory/writeToStore.cjs

@@ -75,7 +75,7 @@ class StoreWriter {
             path: [],
         });
         if (!(0, utilities_1.isReference)(ref)) {
-            throw (0, invariant_1.newInvariantError)(116, result);
+            throw (0, invariant_1.newInvariantError)(117, result);
         }
         // So far, the store has not been modified, so now it's time to process
         // context.incomingById and merge those incoming fields into context.store.
@@ -237,7 +237,7 @@ class StoreWriter {
                 // provide a default value, so its absence from the written data should
                 // not be cause for alarm.
                 !policies.getReadFunction(typename, field.name.value)) {
-                invariant_1.invariant.error(117, (0, internal_1.resultKeyNameFromField)(field), result);
+                invariant_1.invariant.error(118, (0, internal_1.resultKeyNameFromField)(field), result);
             }
         });
         // Identify the result object, even if dataId was already provided,
@@ -385,7 +385,7 @@ class StoreWriter {
                 else {
                     const fragment = (0, internal_1.getFragmentFromSelection)(selection, context.lookupFragment);
                     if (!fragment && selection.kind === graphql_1.Kind.FRAGMENT_SPREAD) {
-                        throw (0, invariant_1.newInvariantError)(118, selection.name.value);
+                        throw (0, invariant_1.newInvariantError)(119, selection.name.value);
                     }
                     if (fragment &&
                         policies.fragmentMatches(fragment, typename, result, context.variables)) {
@@ -558,7 +558,7 @@ function warnAboutDataLoss(existingRef, incomingObj, storeFieldName, store) {
             }
         });
     }
-    __DEV__ && invariant_1.invariant.warn(119, fieldName, parentType, childTypenames.length ?
+    __DEV__ && invariant_1.invariant.warn(120, fieldName, parentType, childTypenames.length ?
         "either ensure all objects of type " +
             childTypenames.join(" and ") +
             " have an ID or a custom merge function, or "

package/__cjs/core/ObservableQuery.cjs

@@ -214,12 +214,13 @@ class ObservableQuery {
     * @deprecated This is an internal API and should not be used directly. This can be removed or changed at any time.
     */
     getCacheDiff({ optimistic = true } = {}) {
-        return this.cache.diff({
+        return (0, internal_1.toDiffWithDataState)(this.cache.diff({
             query: this.query,
             variables: this.variables,
             returnPartialData: true,
             optimistic,
-        });
+            [internal_1.handleIncrementalSymbol]: undefined,
+        }));
     }
     getInitialResult(initialFetchPolicy) {
         let fetchPolicy = initialFetchPolicy || this.options.fetchPolicy;
@@ -229,16 +230,18 @@ class ObservableQuery {
         }
         const cacheResult = () => {
             const diff = this.getCacheDiff();
+            let { dataState } = diff;
             // TODO: queryInfo.getDiff should handle this since cache.diff returns a
             // null when returnPartialData is false
             const data = this.options.returnPartialData || diff.complete ?
                 diff.result ?? undefined
                 : undefined;
+            if (data === undefined) {
+                dataState = "empty";
+            }
             return this.maskResult({
                 data,
-                dataState: diff.complete ? "complete"
-                    : data === undefined ? "empty"
-                        : "partial",
+                dataState,
                 loading: !diff.complete,
                 networkStatus: diff.complete ? networkStatus_js_1.NetworkStatus.ready : networkStatus_js_1.NetworkStatus.loading,
                 partial: !diff.complete,
@@ -1164,9 +1167,7 @@ class ObservableQuery {
                     kind: "N",
                     value: {
                         data: diff.result,
-                        dataState: diff.complete ? "complete"
-                            : diff.result ? "partial"
-                                : "empty",
+                        dataState: diff.dataState,
                         networkStatus: networkStatus_js_1.NetworkStatus.ready,
                         loading: false,
                         error: undefined,
@@ -1310,7 +1311,7 @@ class ObservableQuery {
         if (notification.source === "cache") {
             result = notification.value;
             if (result.networkStatus === networkStatus_js_1.NetworkStatus.ready &&
-                result.partial &&
+                result.dataState === "partial" &&
                 (!this.options.returnPartialData ||
                     previous.result.networkStatus === networkStatus_js_1.NetworkStatus.error) &&
                 this.options.fetchPolicy !== "cache-only") {