@apollo/client 4.0.12-beta.0 → 4.0.13

package/link/remove-typename/removeTypenameFromVariables.js

@@ -4,7 +4,7 @@ import { wrap } from "optimism";
 import { ApolloLink } from "@apollo/client/link";
 import { cacheSizes, stripTypename } from "@apollo/client/utilities";
 import { __DEV__ } from "@apollo/client/utilities/environment";
-import { isPlainObject } from "@apollo/client/utilities/internal";
+import { bindCacheKey, isPlainObject } from "@apollo/client/utilities/internal";
 /**
  * Sentinel value used to indicate that `__typename` fields should be kept
  * for a specific field or input type.
@@ -69,7 +69,7 @@ export class RemoveTypenameFromVariablesLink extends ApolloLink {
             if (variables) {
                 operation.variables =
                     except ?
-                        maybeStripTypenameUsingConfig(query, variables, except)
+                        this.maybeStripTypenameUsingConfig(query, variables, except)
                         : stripTypename(variables);
             }
             return forward(operation);
@@ -79,64 +79,65 @@ export class RemoveTypenameFromVariablesLink extends ApolloLink {
                 getMemoryInternals() {
                     return {
                         removeTypenameFromVariables: {
-                            getVariableDefinitions: getVariableDefinitions?.size ?? 0,
+                            getVariableDefinitions: this.getVariableDefinitions?.size ?? 0,
                         },
                     };
                 },
             }
             : {});
     }
-}
-function maybeStripTypenameUsingConfig(query, variables, config) {
-    const variableDefinitions = getVariableDefinitions(query);
-    return Object.fromEntries(Object.entries(variables).map((keyVal) => {
-        const [key, value] = keyVal;
-        const typename = variableDefinitions[key];
-        const typenameConfig = config[typename];
-        keyVal[1] =
-            typenameConfig ?
-                maybeStripTypename(value, typenameConfig)
-                : stripTypename(value);
-        return keyVal;
-    }));
-}
-function maybeStripTypename(value, config) {
-    if (config === KEEP) {
-        return value;
+    maybeStripTypenameUsingConfig(query, variables, config) {
+        const variableDefinitions = this.getVariableDefinitions(query);
+        return Object.fromEntries(Object.entries(variables).map((keyVal) => {
+            const [key, value] = keyVal;
+            const typename = variableDefinitions[key];
+            const typenameConfig = config[typename];
+            keyVal[1] =
+                typenameConfig ?
+                    this.maybeStripTypename(value, typenameConfig)
+                    : stripTypename(value);
+            return keyVal;
+        }));
     }
-    if (Array.isArray(value)) {
-        return value.map((item) => maybeStripTypename(item, config));
+    maybeStripTypename(value, config) {
+        if (config === KEEP) {
+            return value;
+        }
+        if (Array.isArray(value)) {
+            return value.map((item) => this.maybeStripTypename(item, config));
+        }
+        if (isPlainObject(value)) {
+            const modified = {};
+            Object.keys(value).forEach((key) => {
+                const child = value[key];
+                if (key === "__typename") {
+                    return;
+                }
+                const fieldConfig = config[key];
+                modified[key] =
+                    fieldConfig ?
+                        this.maybeStripTypename(child, fieldConfig)
+                        : stripTypename(child);
+            });
+            return modified;
+        }
+        return value;
     }
-    if (isPlainObject(value)) {
-        const modified = {};
-        Object.keys(value).forEach((key) => {
-            const child = value[key];
-            if (key === "__typename") {
-                return;
-            }
-            const fieldConfig = config[key];
-            modified[key] =
-                fieldConfig ?
-                    maybeStripTypename(child, fieldConfig)
-                    : stripTypename(child);
+    getVariableDefinitions = wrap((document) => {
+        const definitions = {};
+        visit(document, {
+            VariableDefinition(node) {
+                definitions[node.variable.name.value] = unwrapType(node.type);
+            },
         });
-        return modified;
-    }
-    return value;
-}
-const getVariableDefinitions = wrap((document) => {
-    const definitions = {};
-    visit(document, {
-        VariableDefinition(node) {
-            definitions[node.variable.name.value] = unwrapType(node.type);
-        },
+        return definitions;
+    }, {
+        max: cacheSizes["removeTypenameFromVariables.getVariableDefinitions"] ||
+            2000 /* defaultCacheSizes["removeTypenameFromVariables.getVariableDefinitions"] */,
+        cache: WeakCache,
+        makeCacheKey: bindCacheKey(this),
     });
-    return definitions;
-}, {
-    max: cacheSizes["removeTypenameFromVariables.getVariableDefinitions"] ||
-        2000 /* defaultCacheSizes["removeTypenameFromVariables.getVariableDefinitions"] */,
-    cache: WeakCache,
-});
+}
 function unwrapType(node) {
     switch (node.kind) {
         case Kind.NON_NULL_TYPE:

package/link/remove-typename/removeTypenameFromVariables.js.map

@@ -1 +1 @@
-{"version":3,"file":"removeTypenameFromVariables.js","sourceRoot":"","sources":["../../../src/link/remove-typename/removeTypenameFromVariables.ts"],"names":[],"mappings":"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","sourcesContent":["import { WeakCache } from \"@wry/caches\";\nimport type { DocumentNode, TypeNode } from \"graphql\";\nimport { Kind, visit } from \"graphql\";\nimport { wrap } from \"optimism\";\n\nimport type { OperationVariables } from \"@apollo/client\";\nimport { ApolloLink } from \"@apollo/client/link\";\nimport { cacheSizes, stripTypename } from \"@apollo/client/utilities\";\nimport { __DEV__ } from \"@apollo/client/utilities/environment\";\nimport { isPlainObject } from \"@apollo/client/utilities/internal\";\n\nimport { defaultCacheSizes } from \"../../utilities/caching/sizes.js\";\n\n/**\n * Sentinel value used to indicate that `__typename` fields should be kept\n * for a specific field or input type.\n *\n * @remarks\n * Use this value in the `except` configuration to preserve `__typename`\n * fields in JSON scalar fields or other cases where you need to retain\n * the typename information.\n *\n * @example\n *\n * ```ts\n * import {\n *   RemoveTypenameFromVariablesLink,\n *   KEEP,\n * } from \"@apollo/client/link/remove-typename\";\n *\n * const link = new RemoveTypenameFromVariablesLink({\n *   except: {\n *     JSON: KEEP, // Keep __typename for all JSON scalar variables\n *     DashboardInput: {\n *       config: KEEP, // Keep __typename only for the config field\n *     },\n *   },\n * });\n * ```\n */\nexport const KEEP = \"__KEEP\";\n\nexport declare namespace RemoveTypenameFromVariablesLink {\n  /**\n   * Configuration object that specifies which input types and fields should\n   * retain their `__typename` fields.\n   *\n   * @remarks\n   * This is a recursive configuration where:\n   *\n   * - Keys represent GraphQL input type names or field names\n   * - Values can be either the `KEEP` sentinel to preserve all `__typename`\n   *   fields, or a nested `KeepTypenameConfig` to preserve `__typename` fields on\n   *   a specific field name.\n   *\n   * @example\n   *\n   * ```ts\n   * const config: KeepTypenameConfig = {\n   *   // Keep __typename for all JSON scalar variables\n   *   JSON: KEEP,\n   *\n   *   // For DashboardInput, only keep __typename on the config field\n   *   DashboardInput: {\n   *     config: KEEP,\n   *   },\n   *\n   *   // Nested configuration for complex input types\n   *   UserInput: {\n   *     profile: {\n   *       settings: KEEP,\n   *     },\n   *   },\n   * };\n   * ```\n   */\n  export interface KeepTypenameConfig {\n    [key: string]:\n      | typeof KEEP\n      | RemoveTypenameFromVariablesLink.KeepTypenameConfig;\n  }\n\n  /**\n   * Options for configuring the `RemoveTypenameFromVariablesLink`.\n   */\n  export interface Options {\n    /**\n     * Configuration that determines which input types should retain `__typename`\n     * fields.\n     *\n     * Maps GraphQL input type names to configurations. Each configuration can\n     * either be the `KEEP` sentinel, to preserve all `__typename` fields, or\n     * a nested object that specifies which fields should retain `__typename`.\n     *\n     * @example\n     *\n     * ```ts\n     * {\n     *   except: {\n     *     // Keep __typename for all JSON scalar variables\n     *     JSON: KEEP,\n     *\n     *     // For DashboardInput, remove __typename except for config field\n     *     DashboardInput: {\n     *       config: KEEP,\n     *     },\n     *\n     *     // Complex nested configuration\n     *     UserProfileInput: {\n     *       settings: {\n     *         preferences: KEEP,\n     *       },\n     *     },\n     *   },\n     * }\n     * ```\n     */\n    except?: RemoveTypenameFromVariablesLink.KeepTypenameConfig;\n  }\n}\n\n/**\n * @deprecated\n * Use `RemoveTypenameFromVariablesLink` from `@apollo/client/link/remove-typename` instead.\n */\nexport function removeTypenameFromVariables(\n  options?: RemoveTypenameFromVariablesLink.Options\n) {\n  return new RemoveTypenameFromVariablesLink(options);\n}\n\n/**\n * `RemoveTypenameFromVariablesLink` is a non-terminating link that automatically\n * removes `__typename` fields from operation variables to prevent GraphQL\n * validation errors.\n *\n * @remarks\n *\n * When reusing data from a query as input to another GraphQL operation,\n * `__typename` fields can cause server-side validation errors because input\n * types don't accept fields that start with double underscores (`__`).\n * `RemoveTypenameFromVariablesLink` automatically strips these fields from all\n * operation variables.\n *\n * @example\n *\n * ```ts\n * import { RemoveTypenameFromVariablesLink } from \"@apollo/client/link/remove-typename\";\n *\n * const link = new RemoveTypenameFromVariablesLink();\n * ```\n */\nexport class RemoveTypenameFromVariablesLink extends ApolloLink {\n  constructor(options: RemoveTypenameFromVariablesLink.Options = {}) {\n    super((operation, forward) => {\n      const { except } = options;\n      const { query, variables } = operation;\n\n      if (variables) {\n        operation.variables =\n          except ?\n            maybeStripTypenameUsingConfig(query, variables, except)\n          : stripTypename(variables);\n      }\n\n      return forward(operation);\n    });\n    return Object.assign(\n      this,\n      __DEV__ ?\n        {\n          getMemoryInternals() {\n            return {\n              removeTypenameFromVariables: {\n                getVariableDefinitions: getVariableDefinitions?.size ?? 0,\n              },\n            };\n          },\n        }\n      : {}\n    );\n  }\n}\n\nfunction maybeStripTypenameUsingConfig(\n  query: DocumentNode,\n  variables: OperationVariables,\n  config: RemoveTypenameFromVariablesLink.KeepTypenameConfig\n) {\n  const variableDefinitions = getVariableDefinitions(query);\n\n  return Object.fromEntries(\n    Object.entries(variables).map((keyVal) => {\n      const [key, value] = keyVal;\n      const typename = variableDefinitions[key];\n      const typenameConfig = config[typename];\n\n      keyVal[1] =\n        typenameConfig ?\n          maybeStripTypename(value, typenameConfig)\n        : stripTypename(value);\n\n      return keyVal;\n    })\n  );\n}\n\ntype JSONPrimitive = string | number | null | boolean;\ntype JSONValue = JSONPrimitive | JSONValue[] | { [key: string]: JSONValue };\n\nfunction maybeStripTypename(\n  value: JSONValue,\n  config: RemoveTypenameFromVariablesLink.KeepTypenameConfig[string]\n): JSONValue {\n  if (config === KEEP) {\n    return value;\n  }\n\n  if (Array.isArray(value)) {\n    return value.map((item) => maybeStripTypename(item, config));\n  }\n\n  if (isPlainObject(value)) {\n    const modified: Record<string, any> = {};\n\n    Object.keys(value).forEach((key) => {\n      const child = value[key];\n\n      if (key === \"__typename\") {\n        return;\n      }\n\n      const fieldConfig = config[key];\n\n      modified[key] =\n        fieldConfig ?\n          maybeStripTypename(child, fieldConfig)\n        : stripTypename(child);\n    });\n\n    return modified;\n  }\n\n  return value;\n}\n\nconst getVariableDefinitions = wrap(\n  (document: DocumentNode) => {\n    const definitions: Record<string, string> = {};\n\n    visit(document, {\n      VariableDefinition(node) {\n        definitions[node.variable.name.value] = unwrapType(node.type);\n      },\n    });\n\n    return definitions;\n  },\n  {\n    max:\n      cacheSizes[\"removeTypenameFromVariables.getVariableDefinitions\"] ||\n      defaultCacheSizes[\"removeTypenameFromVariables.getVariableDefinitions\"],\n    cache: WeakCache,\n  }\n);\n\nfunction unwrapType(node: TypeNode): string {\n  switch (node.kind) {\n    case Kind.NON_NULL_TYPE:\n      return unwrapType(node.type);\n    case Kind.LIST_TYPE:\n      return unwrapType(node.type);\n    case Kind.NAMED_TYPE:\n      return node.name.value;\n  }\n}\n"]}
+{"version":3,"file":"removeTypenameFromVariables.js","sourceRoot":"","sources":["../../../src/link/remove-typename/removeTypenameFromVariables.ts"],"names":[],"mappings":"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","sourcesContent":["import { WeakCache } from \"@wry/caches\";\nimport type { DocumentNode, TypeNode } from \"graphql\";\nimport { Kind, visit } from \"graphql\";\nimport { wrap } from \"optimism\";\n\nimport type { OperationVariables } from \"@apollo/client\";\nimport { ApolloLink } from \"@apollo/client/link\";\nimport { cacheSizes, stripTypename } from \"@apollo/client/utilities\";\nimport { __DEV__ } from \"@apollo/client/utilities/environment\";\nimport { bindCacheKey, isPlainObject } from \"@apollo/client/utilities/internal\";\n\nimport { defaultCacheSizes } from \"../../utilities/caching/sizes.js\";\n\n/**\n * Sentinel value used to indicate that `__typename` fields should be kept\n * for a specific field or input type.\n *\n * @remarks\n * Use this value in the `except` configuration to preserve `__typename`\n * fields in JSON scalar fields or other cases where you need to retain\n * the typename information.\n *\n * @example\n *\n * ```ts\n * import {\n *   RemoveTypenameFromVariablesLink,\n *   KEEP,\n * } from \"@apollo/client/link/remove-typename\";\n *\n * const link = new RemoveTypenameFromVariablesLink({\n *   except: {\n *     JSON: KEEP, // Keep __typename for all JSON scalar variables\n *     DashboardInput: {\n *       config: KEEP, // Keep __typename only for the config field\n *     },\n *   },\n * });\n * ```\n */\nexport const KEEP = \"__KEEP\";\n\nexport declare namespace RemoveTypenameFromVariablesLink {\n  /**\n   * Configuration object that specifies which input types and fields should\n   * retain their `__typename` fields.\n   *\n   * @remarks\n   * This is a recursive configuration where:\n   *\n   * - Keys represent GraphQL input type names or field names\n   * - Values can be either the `KEEP` sentinel to preserve all `__typename`\n   *   fields, or a nested `KeepTypenameConfig` to preserve `__typename` fields on\n   *   a specific field name.\n   *\n   * @example\n   *\n   * ```ts\n   * const config: KeepTypenameConfig = {\n   *   // Keep __typename for all JSON scalar variables\n   *   JSON: KEEP,\n   *\n   *   // For DashboardInput, only keep __typename on the config field\n   *   DashboardInput: {\n   *     config: KEEP,\n   *   },\n   *\n   *   // Nested configuration for complex input types\n   *   UserInput: {\n   *     profile: {\n   *       settings: KEEP,\n   *     },\n   *   },\n   * };\n   * ```\n   */\n  export interface KeepTypenameConfig {\n    [key: string]:\n      | typeof KEEP\n      | RemoveTypenameFromVariablesLink.KeepTypenameConfig;\n  }\n\n  /**\n   * Options for configuring the `RemoveTypenameFromVariablesLink`.\n   */\n  export interface Options {\n    /**\n     * Configuration that determines which input types should retain `__typename`\n     * fields.\n     *\n     * Maps GraphQL input type names to configurations. Each configuration can\n     * either be the `KEEP` sentinel, to preserve all `__typename` fields, or\n     * a nested object that specifies which fields should retain `__typename`.\n     *\n     * @example\n     *\n     * ```ts\n     * {\n     *   except: {\n     *     // Keep __typename for all JSON scalar variables\n     *     JSON: KEEP,\n     *\n     *     // For DashboardInput, remove __typename except for config field\n     *     DashboardInput: {\n     *       config: KEEP,\n     *     },\n     *\n     *     // Complex nested configuration\n     *     UserProfileInput: {\n     *       settings: {\n     *         preferences: KEEP,\n     *       },\n     *     },\n     *   },\n     * }\n     * ```\n     */\n    except?: RemoveTypenameFromVariablesLink.KeepTypenameConfig;\n  }\n}\n\n/**\n * @deprecated\n * Use `RemoveTypenameFromVariablesLink` from `@apollo/client/link/remove-typename` instead.\n */\nexport function removeTypenameFromVariables(\n  options?: RemoveTypenameFromVariablesLink.Options\n) {\n  return new RemoveTypenameFromVariablesLink(options);\n}\n\n/**\n * `RemoveTypenameFromVariablesLink` is a non-terminating link that automatically\n * removes `__typename` fields from operation variables to prevent GraphQL\n * validation errors.\n *\n * @remarks\n *\n * When reusing data from a query as input to another GraphQL operation,\n * `__typename` fields can cause server-side validation errors because input\n * types don't accept fields that start with double underscores (`__`).\n * `RemoveTypenameFromVariablesLink` automatically strips these fields from all\n * operation variables.\n *\n * @example\n *\n * ```ts\n * import { RemoveTypenameFromVariablesLink } from \"@apollo/client/link/remove-typename\";\n *\n * const link = new RemoveTypenameFromVariablesLink();\n * ```\n */\nexport class RemoveTypenameFromVariablesLink extends ApolloLink {\n  constructor(options: RemoveTypenameFromVariablesLink.Options = {}) {\n    super((operation, forward) => {\n      const { except } = options;\n      const { query, variables } = operation;\n\n      if (variables) {\n        operation.variables =\n          except ?\n            this.maybeStripTypenameUsingConfig(query, variables, except)\n          : stripTypename(variables);\n      }\n\n      return forward(operation);\n    });\n    return Object.assign(\n      this,\n      __DEV__ ?\n        {\n          getMemoryInternals(this: RemoveTypenameFromVariablesLink) {\n            return {\n              removeTypenameFromVariables: {\n                getVariableDefinitions: this.getVariableDefinitions?.size ?? 0,\n              },\n            };\n          },\n        }\n      : {}\n    );\n  }\n\n  private maybeStripTypenameUsingConfig(\n    query: DocumentNode,\n    variables: OperationVariables,\n    config: RemoveTypenameFromVariablesLink.KeepTypenameConfig\n  ) {\n    const variableDefinitions = this.getVariableDefinitions(query);\n\n    return Object.fromEntries(\n      Object.entries(variables).map((keyVal) => {\n        const [key, value] = keyVal;\n        const typename = variableDefinitions[key];\n        const typenameConfig = config[typename];\n\n        keyVal[1] =\n          typenameConfig ?\n            this.maybeStripTypename(value, typenameConfig)\n          : stripTypename(value);\n\n        return keyVal;\n      })\n    );\n  }\n\n  private maybeStripTypename(\n    value: JSONValue,\n    config: RemoveTypenameFromVariablesLink.KeepTypenameConfig[string]\n  ): JSONValue {\n    if (config === KEEP) {\n      return value;\n    }\n\n    if (Array.isArray(value)) {\n      return value.map((item) => this.maybeStripTypename(item, config));\n    }\n\n    if (isPlainObject(value)) {\n      const modified: Record<string, any> = {};\n\n      Object.keys(value).forEach((key) => {\n        const child = value[key];\n\n        if (key === \"__typename\") {\n          return;\n        }\n\n        const fieldConfig = config[key];\n\n        modified[key] =\n          fieldConfig ?\n            this.maybeStripTypename(child, fieldConfig)\n          : stripTypename(child);\n      });\n\n      return modified;\n    }\n\n    return value;\n  }\n\n  private getVariableDefinitions = wrap(\n    (document: DocumentNode) => {\n      const definitions: Record<string, string> = {};\n\n      visit(document, {\n        VariableDefinition(node) {\n          definitions[node.variable.name.value] = unwrapType(node.type);\n        },\n      });\n\n      return definitions;\n    },\n    {\n      max:\n        cacheSizes[\"removeTypenameFromVariables.getVariableDefinitions\"] ||\n        defaultCacheSizes[\"removeTypenameFromVariables.getVariableDefinitions\"],\n      cache: WeakCache,\n      makeCacheKey: bindCacheKey(this),\n    }\n  );\n}\n\ntype JSONPrimitive = string | number | null | boolean;\ntype JSONValue = JSONPrimitive | JSONValue[] | { [key: string]: JSONValue };\n\nfunction unwrapType(node: TypeNode): string {\n  switch (node.kind) {\n    case Kind.NON_NULL_TYPE:\n      return unwrapType(node.type);\n    case Kind.LIST_TYPE:\n      return unwrapType(node.type);\n    case Kind.NAMED_TYPE:\n      return node.name.value;\n  }\n}\n"]}

package/link/ws/index.js

@@ -32,7 +32,7 @@ export class WebSocketLink extends ApolloLink {
     constructor(paramsOrClient) {
         super();
         if (__DEV__) {
-            __DEV__ && invariant.warn(58);
+            __DEV__ && invariant.warn(56);
         }
         if (paramsOrClient instanceof SubscriptionClient) {
             this.subscriptionClient = paramsOrClient;

package/local-state/LocalState.d.ts

@@ -1,5 +1,5 @@
 import type { DocumentNode, FieldNode, FormattedExecutionResult } from "graphql";
-import type { ApolloClient, DefaultContext, OperationVariables, TypedDocumentNode, WatchQueryFetchPolicy } from "@apollo/client";
+import type { ApolloClient, DefaultContext, OperationVariables, TypedDocumentNode } from "@apollo/client";
 import type { FragmentMap, NoInfer, RemoveIndexSignature } from "@apollo/client/utilities/internal";
 type InferContextValueFromResolvers<TResolvers> = TResolvers extends {
     [typename: string]: infer TFieldResolvers;
@@ -155,7 +155,7 @@ export declare class LocalState<TResolvers extends LocalState.Resolvers = LocalS
      * ```
      */
     addResolvers(resolvers: TResolvers): void;
-    execute<TData = unknown, TVariables extends OperationVariables = OperationVariables>({ document, client, context, remoteResult, variables, onlyRunForcedResolvers, returnPartialData, fetchPolicy, }: {
+    execute<TData = unknown, TVariables extends OperationVariables = OperationVariables>({ document, client, context, remoteResult, variables, onlyRunForcedResolvers, returnPartialData, }: {
         document: DocumentNode | TypedDocumentNode<TData, TVariables>;
         client: ApolloClient;
         context: DefaultContext | undefined;
@@ -163,7 +163,6 @@ export declare class LocalState<TResolvers extends LocalState.Resolvers = LocalS
         variables: TVariables | undefined;
         onlyRunForcedResolvers?: boolean;
         returnPartialData?: boolean;
-        fetchPolicy: WatchQueryFetchPolicy;
     }): Promise<FormattedExecutionResult<TData>>;
     getExportedVariables<TVariables extends OperationVariables = OperationVariables>({ document, client, context, variables, }: {
         document: DocumentNode | TypedDocumentNode<any, TVariables>;

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