@apollo/client 4.0.9 → 4.1.2

package/local-state/LocalState.js

@@ -64,7 +64,7 @@ export class LocalState {
     addResolvers(resolvers) {
         this.resolvers = mergeDeep(this.resolvers, resolvers);
     }
-    async execute({ document, client, context, remoteResult, variables = {}, onlyRunForcedResolvers = false, returnPartialData = false, }) {
+    async execute({ document, client, context, remoteResult, variables = {}, onlyRunForcedResolvers = false, returnPartialData = false, fetchPolicy, }) {
         if (__DEV__) {
             invariant(hasDirectives(["client"], document), 47);
             validateCacheImplementation(client.cache);
@@ -78,12 +78,14 @@ export class LocalState {
         }
         const { selectionsToResolve, exportedVariableDefs, operationDefinition, fragmentMap, } = this.collectQueryDetail(document);
         const rootValue = remoteResult ? remoteResult.data : {};
-        const diff = client.cache.diff({
-            query: toQueryOperation(document),
-            variables,
-            returnPartialData: true,
-            optimistic: false,
-        });
+        const diff = fetchPolicy === "no-cache" ?
+            { result: null, complete: false }
+            : client.cache.diff({
+                query: toQueryOperation(document),
+                variables,
+                returnPartialData: true,
+                optimistic: false,
+            });
         const requestContext = { ...client.defaultContext, ...context };
         const execContext = {
             client,
@@ -105,6 +107,7 @@ export class LocalState {
             exportedVariableDefs,
             diff,
             returnPartialData,
+            fetchPolicy,
         };
         const localResult = await this.resolveSelectionSet(operationDefinition.selectionSet, false, rootValue, execContext, []);
         const errors = (remoteResult?.errors ?? []).concat(execContext.errors);
@@ -221,7 +224,7 @@ export class LocalState {
             : rootValue;
     }
     resolveServerField(field, rootValue, execContext, path) {
-        const result = rootValue?.[field.name.value];
+        const result = rootValue?.[resultKeyNameFromField(field)];
         if (!field.selectionSet) {
             return result;
         }
@@ -241,7 +244,8 @@ export class LocalState {
         return this.resolveSelectionSet(field.selectionSet, false, result, execContext, path);
     }
     async resolveClientField(field, isClientFieldDescendant, rootValue, execContext, parentSelectionSet, path) {
-        const { client, diff, variables, operationDefinition, phase, returnPartialData, onlyRunForcedResolvers, } = execContext;
+        const { client, diff, variables, operationDefinition, phase, onlyRunForcedResolvers, fetchPolicy, } = execContext;
+        let { returnPartialData } = execContext;
         const isRootField = parentSelectionSet === operationDefinition.selectionSet;
         const fieldName = field.name.value;
         const typename = isRootField ?
@@ -263,7 +267,17 @@ export class LocalState {
                 if (fieldFromCache !== undefined) {
                     return fieldFromCache;
                 }
+                if (client.cache.resolvesClientField?.(typename, fieldName)) {
+                    if (fetchPolicy === "no-cache") {
+                        __DEV__ && invariant.warn(50, resolverName);
+                        return null;
+                    }
+                    // assume the cache will handle returning the correct value
+                    returnPartialData = true;
+                    return;
+                }
                 if (!returnPartialData) {
+                    __DEV__ && invariant.warn(51, resolverName);
                     return null;
                 }
             });
@@ -329,13 +343,13 @@ export class LocalState {
         if (result === undefined && !returnPartialData) {
             if (__DEV__ && phase === "resolve") {
                 if (resolver && !onlyRunForcedResolvers) {
-                    __DEV__ && invariant.warn(50, resolverName);
+                    __DEV__ && invariant.warn(52, resolverName);
                 }
                 else if (onlyRunForcedResolvers) {
-                    __DEV__ && invariant.warn(51, resolverName);
+                    __DEV__ && invariant.warn(53, resolverName);
                 }
                 else {
-                    __DEV__ && invariant.warn(52, fieldName, rootValue);
+                    __DEV__ && invariant.warn(54, fieldName, rootValue);
                 }
             }
             result = null;
@@ -347,7 +361,7 @@ export class LocalState {
             return this.resolveSubSelectedArray(field, true, result, execContext, path);
         }
         if (phase === "resolve" && !result.__typename) {
-            this.addError(newInvariantError(53, result, resolverName), path, execContext, { resolver: resolverName });
+            this.addError(newInvariantError(55, result, resolverName), path, execContext, { resolver: resolverName });
             return null;
         }
         return this.resolveSelectionSet(field.selectionSet, true, result, execContext, path);
@@ -458,7 +472,7 @@ export class LocalState {
                 },
                 FragmentSpread(spread, _, __, ___, ancestors) {
                     const fragment = fragmentMap[spread.name.value];
-                    invariant(fragment, 54, spread.name.value);
+                    invariant(fragment, 56, spread.name.value);
                     const { selectionsToResolve: fragmentSelections } = traverse(fragment);
                     if (fragmentSelections.size > 0) {
                         // Fragment for this spread contains @client directive (either directly or transitively)
@@ -517,7 +531,7 @@ function getExportedVariableName(directive) {
     }
 }
 function validateCacheImplementation(cache) {
-    invariant(cache.fragmentMatches, 55);
+    invariant(cache.fragmentMatches, 57);
 }
 function getCacheResultAtPath(diff, path) {
     if (diff.result === null) {