@apollo/client 4.3.3 → 4.3.4

package/core/QueryManager.js

@@ -99,7 +99,7 @@ export class QueryManager {
      */
     stop() {
         this.obsQueries.forEach((oq) => oq.stop());
-        this.cancelPendingFetches(newInvariantError(93));
+        this.cancelPendingFetches(newInvariantError(94));
     }
     cancelPendingFetches(error) {
         this.fetchCancelFns.forEach((cancel) => cancel(error));
@@ -112,7 +112,7 @@ export class QueryManager {
         variables = this.getVariables(mutation, variables);
         if (hasClientExports) {
             if (__DEV__) {
-                invariant(this.localState, 94, getOperationName(mutation, "(anonymous)"));
+                invariant(this.localState, 95, getOperationName(mutation, "(anonymous)"));
             }
             variables = await this.localState.getExportedVariables({
                 client: this.client,
@@ -345,7 +345,7 @@ export 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(newInvariantError(95));
+        this.cancelPendingFetches(newInvariantError(96));
         this.obsQueries.forEach((observableQuery) => {
             // Set loading to true so listeners don't trigger unless they want
             // results with partial data.
@@ -415,10 +415,10 @@ export class QueryManager {
                 if (!included) {
                     const queryName = queryNames.get(nameOrQueryString);
                     if (queryName) {
-                        __DEV__ && invariant.warn(96, queryName);
+                        __DEV__ && invariant.warn(97, queryName);
                     }
                     else {
-                        __DEV__ && invariant.warn(97);
+                        __DEV__ && invariant.warn(98);
                     }
                 }
             });
@@ -447,7 +447,7 @@ export class QueryManager {
         if (__DEV__) {
             invariant(
                 !this.getDocumentInfo(query).hasClientExports || this.localState,
-                98,
+                99,
                 getOperationName(query, "(anonymous)")
             );
         }
@@ -592,14 +592,14 @@ export class QueryManager {
             if (__DEV__) {
                 invariant(
                     this.localState,
-                    99,
+                    100,
                     operation[0].toUpperCase() + operation.slice(1),
                     operationName ?? "(anonymous)"
                 );
             }
             invariant(
                 !hasIncrementalDirective,
-                100,
+                101,
                 operation[0].toUpperCase() + operation.slice(1),
                 operationName ?? "(anonymous)"
             );
@@ -767,7 +767,7 @@ export class QueryManager {
         // we deprecated and removed LocalState.
         if (this.getDocumentInfo(normalized.query).hasClientExports) {
             if (__DEV__) {
-                invariant(this.localState, 101, getOperationName(normalized.query, "(anonymous)"));
+                invariant(this.localState, 102, getOperationName(normalized.query, "(anonymous)"));
             }
             observable = from(this.localState.getExportedVariables({
                 client: this.client,
@@ -940,7 +940,7 @@ export class QueryManager {
                 !isFullyUnmaskedOperation(document) &&
                 !this.noCacheWarningsByCause.has(cause)) {
                 this.noCacheWarningsByCause.add(cause);
-                __DEV__ && invariant.warn(102, getOperationName(document, `Unnamed ${operationType ?? "operation"}`));
+                __DEV__ && invariant.warn(103, getOperationName(document, `Unnamed ${operationType ?? "operation"}`));
             }
         }
         return (this.dataMasking ?
@@ -1003,7 +1003,7 @@ export class QueryManager {
             (diff.complete || returnPartialData) &&
                 this.getDocumentInfo(query).hasForcedResolvers) {
                 if (__DEV__) {
-                    invariant(this.localState, 103, getOperationName(query, "(anonymous)"));
+                    invariant(this.localState, 104, getOperationName(query, "(anonymous)"));
                 }
                 onCacheHit();
                 return from(this.localState.execute({
@@ -1124,7 +1124,7 @@ function validateDidEmitValue() {
             didEmitValue = true;
         },
         complete() {
-            invariant(didEmitValue, 104);
+            invariant(didEmitValue, 105);
         },
     });
 }

package/core/RefetchEventManager.js

@@ -27,7 +27,7 @@ export class RefetchEventManager {
         }
         if (this.client) {
             if (__DEV__) {
-                __DEV__ && invariant.warn(105);
+                __DEV__ && invariant.warn(106);
             }
             this.disconnect();
         }
@@ -96,13 +96,13 @@ export class RefetchEventManager {
         const [payload] = args;
         if (!this.client) {
             if (__DEV__) {
-                __DEV__ && invariant.warn(106, source);
+                __DEV__ && invariant.warn(107, source);
             }
             return;
         }
         if (!this.hasSource(source)) {
             if (__DEV__) {
-                __DEV__ && invariant.warn(107, source);
+                __DEV__ && invariant.warn(108, source);
             }
             return;
         }

package/incremental/handlers/defer20220824.d.ts

@@ -41,13 +41,17 @@ export declare namespace Defer20220824Handler {
     type Chunk<TData extends Record<string, unknown>> = InitialResult<TData> | SubsequentResult<TData>;
 }
 declare class DeferRequest<TData extends Record<string, unknown>> implements Incremental.IncrementalRequest<Defer20220824Handler.Chunk<TData>, TData> {
+    private hasDefer;
     hasNext: boolean;
+    private hasFailedDefer;
+    constructor({ query }: Incremental.StartRequestOptions);
     private errors;
     private extensions;
     private data;
     private ignoredImpossibleStreamPaths;
     private merge;
     handle(cacheData: TData | DeepPartial<TData> | null | undefined, chunk: Defer20220824Handler.Chunk<TData>): FormattedExecutionResult<TData>;
+    isDeferPending: () => boolean;
 }
 /**
  * This handler implements the `@defer` directive as specified in this historical commit:
@@ -57,7 +61,7 @@ export declare class Defer20220824Handler implements Incremental.Handler<Defer20
     isIncrementalResult(result: Record<string, any>): result is Defer20220824Handler.SubsequentResult | Defer20220824Handler.InitialResult;
     extractErrors(result: ApolloLink.Result<any>): GraphQLFormattedError[] | undefined;
     prepareRequest(request: ApolloLink.Request): ApolloLink.Request;
-    startRequest<TData extends Record<string, unknown>>(_: Incremental.StartRequestOptions): DeferRequest<TData>;
+    startRequest<TData extends Record<string, unknown>>(opts: Incremental.StartRequestOptions): DeferRequest<TData>;
 }
 export declare function hasIncrementalChunks(result: Record<string, any>): result is Required<Defer20220824Handler.SubsequentResult>;
 export {};

package/incremental/handlers/defer20220824.js

@@ -1,6 +1,11 @@
 import { DeepMerger, hasDirectives, isNonEmptyArray, } from "@apollo/client/utilities/internal";
 class DeferRequest {
+    hasDefer;
     hasNext = true;
+    hasFailedDefer = false;
+    constructor({ query }) {
+        this.hasDefer = hasDirectives(["defer"], query);
+    }
     errors = [];
     extensions = {};
     data = {};
@@ -40,6 +45,9 @@ class DeferRequest {
                         continue;
                     }
                 }
+                if ("data" in incremental && incremental.data === null) {
+                    this.hasFailedDefer = true;
+                }
                 let data = "items" in incremental ? incremental.items
                     // Ensure `data: null` isn't merged for `@defer` responses by
                     // falling back to `undefined`
@@ -72,6 +80,11 @@ class DeferRequest {
         }
         return result;
     }
+    // This protocol can't identify individual `@defer`/`@stream` boundaries by
+    // `path`/`label`, so we can't answer whether a *specific* boundary is
+    // pending - only whether *anything* might still be coming (`hasNext`), or
+    // whether a boundary failed and will never arrive (`hasFailedDefer`).
+    isDeferPending = () => this.hasDefer && (this.hasNext || this.hasFailedDefer);
 }
 /**
  * This handler implements the `@defer` directive as specified in this historical commit:
@@ -111,8 +124,8 @@ export class Defer20220824Handler {
         }
         return request;
     }
-    startRequest(_) {
-        return new DeferRequest();
+    startRequest(opts) {
+        return new DeferRequest(opts);
     }
 }
 // only exported for use in tests

package/incremental/handlers/defer20220824.js.map

@@ -1 +1 @@
-{"version":3,"file":"defer20220824.js","sourceRoot":"","sources":["../../../src/incremental/handlers/defer20220824.ts"],"names":[],"mappings":"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","sourcesContent":["import type { FormattedExecutionResult, GraphQLFormattedError } from \"graphql\";\n\nimport type { ApolloLink } from \"@apollo/client/link\";\nimport type { DeepPartial, HKT } from \"@apollo/client/utilities\";\nimport {\n  DeepMerger,\n  hasDirectives,\n  isNonEmptyArray,\n} from \"@apollo/client/utilities/internal\";\n\nimport type { Incremental } from \"../types.js\";\n\nexport declare namespace Defer20220824Handler {\n  interface Defer20220824Result extends HKT {\n    arg1: unknown; // TData\n    arg2: unknown; // TExtensions\n    return: Defer20220824Handler.Chunk<Record<string, unknown>>;\n  }\n  export interface TypeOverrides {\n    AdditionalApolloLinkResultTypes: Defer20220824Result;\n  }\n\n  export type InitialResult<TData = Record<string, unknown>> = {\n    data?: TData | null | undefined;\n    errors?: ReadonlyArray<GraphQLFormattedError>;\n    extensions?: Record<string, unknown>;\n    hasNext: boolean;\n    incremental?: ReadonlyArray<IncrementalResult<TData>>;\n  };\n\n  export type SubsequentResult<TData = Record<string, unknown>> = {\n    extensions?: Record<string, unknown>;\n    hasNext: boolean;\n    incremental?: Array<IncrementalResult<TData>>;\n  };\n\n  export type IncrementalDeferResult<TData = Record<string, unknown>> = {\n    data?: TData | null;\n    errors?: ReadonlyArray<GraphQLFormattedError>;\n    extensions?: Record<string, unknown>;\n    path?: Incremental.Path;\n    label?: string;\n  };\n\n  export type IncrementalStreamResult<TData = Array<unknown>> = {\n    errors?: ReadonlyArray<GraphQLFormattedError>;\n    items?: TData;\n    path?: Incremental.Path;\n    label?: string;\n    extensions?: Record<string, unknown>;\n  };\n\n  export type IncrementalResult<TData = Record<string, unknown>> =\n    | IncrementalDeferResult<TData>\n    | IncrementalStreamResult<TData>;\n\n  export type Chunk<TData extends Record<string, unknown>> =\n    | InitialResult<TData>\n    | SubsequentResult<TData>;\n}\n\nclass DeferRequest<TData extends Record<string, unknown>>\n  implements\n    Incremental.IncrementalRequest<Defer20220824Handler.Chunk<TData>, TData>\n{\n  public hasNext = true;\n\n  private errors: Array<GraphQLFormattedError> = [];\n  private extensions: Record<string, any> = {};\n  private data: any = {};\n  // This tracks paths for `@stream` arrays that returns items: null due to\n  // errors thrown for non-null array items. We stop processing future updates\n  // to these stream arrays to prevent creating sparse arrays or inserting\n  // `null` for an expected non-null value which could cause runtime crashes.\n  private ignoredImpossibleStreamPaths = new Set<string>();\n\n  private merge(\n    normalized: FormattedExecutionResult<TData>,\n    atPath?: DeepMerger.MergeOptions[\"atPath\"]\n  ) {\n    if (normalized.data !== undefined) {\n      this.data = new DeepMerger({ arrayMerge: \"truncate\" }).merge(\n        this.data,\n        normalized.data,\n        { atPath }\n      );\n    }\n    if (normalized.errors) {\n      this.errors.push(...normalized.errors);\n    }\n    Object.assign(this.extensions, normalized.extensions);\n  }\n\n  handle(\n    // we'll get `undefined` here in case of a `no-cache` fetch policy,\n    // so we'll continue with the last value this request had accumulated\n    cacheData: TData | DeepPartial<TData> | null | undefined = this.data,\n    chunk: Defer20220824Handler.Chunk<TData>\n  ): FormattedExecutionResult<TData> {\n    this.hasNext = chunk.hasNext;\n    this.data = cacheData;\n\n    if (hasIncrementalChunks(chunk)) {\n      for (const incremental of chunk.incremental) {\n        const { path, errors, extensions } = incremental;\n\n        if (\"items\" in incremental) {\n          // Remove the array index from the end of the array since each future\n          // chunk sends a different array index. This normalizes the path to\n          // ensure we ignore updates to this field if `items` is `null`.\n          const stringPath = path?.slice(0, -1).join(\".\") ?? \"\";\n\n          if (incremental.items === null) {\n            this.ignoredImpossibleStreamPaths.add(stringPath);\n          }\n\n          if (this.ignoredImpossibleStreamPaths.has(stringPath)) {\n            this.merge({ errors, extensions });\n            continue;\n          }\n        }\n\n        let data: any =\n          \"items\" in incremental ? incremental.items\n            // Ensure `data: null` isn't merged for `@defer` responses by\n            // falling back to `undefined`\n          : \"data\" in incremental ? incremental.data ?? undefined\n          : undefined;\n\n        if (path && typeof path.at(-1) === \"number\" && Array.isArray(data)) {\n          const startingIdx = path.at(-1) as number;\n          data.forEach((item, idx) => {\n            this.merge({ data: item }, [\n              ...path!.slice(0, -1),\n              startingIdx + idx,\n            ]);\n          });\n        } else {\n          this.merge({ data }, path);\n        }\n\n        this.merge({ errors, extensions });\n      }\n    } else {\n      this.merge(chunk);\n    }\n\n    const result: FormattedExecutionResult<TData> = { data: this.data };\n\n    if (isNonEmptyArray(this.errors)) {\n      result.errors = this.errors;\n    }\n\n    if (Object.keys(this.extensions).length > 0) {\n      result.extensions = this.extensions;\n    }\n\n    return result;\n  }\n}\n\n/**\n * This handler implements the `@defer` directive as specified in this historical commit:\n * https://github.com/graphql/graphql-spec/tree/48cf7263a71a683fab03d45d309fd42d8d9a6659/spec\n */\nexport class Defer20220824Handler\n  implements Incremental.Handler<Defer20220824Handler.Chunk<any>>\n{\n  isIncrementalResult(\n    result: Record<string, any>\n  ): result is\n    | Defer20220824Handler.SubsequentResult\n    | Defer20220824Handler.InitialResult {\n    return \"hasNext\" in result;\n  }\n\n  extractErrors(result: ApolloLink.Result<any>) {\n    const acc: GraphQLFormattedError[] = [];\n    const push = ({\n      errors,\n    }: {\n      errors?: ReadonlyArray<GraphQLFormattedError>;\n    }) => {\n      if (errors) {\n        acc.push(...errors);\n      }\n    };\n    if (this.isIncrementalResult(result)) {\n      if (\"errors\" in result) {\n        push(result);\n      }\n      if (hasIncrementalChunks(result)) {\n        result.incremental.forEach(push);\n      }\n    }\n    if (acc.length) {\n      return acc;\n    }\n  }\n\n  prepareRequest(request: ApolloLink.Request): ApolloLink.Request {\n    if (hasDirectives([\"defer\", \"stream\"], request.query)) {\n      const context = request.context ?? {};\n      const http = (context.http ??= {});\n      http.accept = [\n        \"multipart/mixed;deferSpec=20220824\",\n        ...(http.accept || []),\n      ];\n    }\n\n    return request;\n  }\n  startRequest<TData extends Record<string, unknown>>(\n    _: Incremental.StartRequestOptions\n  ) {\n    return new DeferRequest<TData>();\n  }\n}\n\n// only exported for use in tests\nexport function hasIncrementalChunks(\n  result: Record<string, any>\n): result is Required<Defer20220824Handler.SubsequentResult> {\n  return isNonEmptyArray(result.incremental);\n}\n"]}
+{"version":3,"file":"defer20220824.js","sourceRoot":"","sources":["../../../src/incremental/handlers/defer20220824.ts"],"names":[],"mappings":"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","sourcesContent":["import type { FormattedExecutionResult, GraphQLFormattedError } from \"graphql\";\n\nimport type { ApolloLink } from \"@apollo/client/link\";\nimport type { DeepPartial, HKT } from \"@apollo/client/utilities\";\nimport {\n  DeepMerger,\n  hasDirectives,\n  isNonEmptyArray,\n} from \"@apollo/client/utilities/internal\";\n\nimport type { Incremental } from \"../types.js\";\n\nexport declare namespace Defer20220824Handler {\n  interface Defer20220824Result extends HKT {\n    arg1: unknown; // TData\n    arg2: unknown; // TExtensions\n    return: Defer20220824Handler.Chunk<Record<string, unknown>>;\n  }\n  export interface TypeOverrides {\n    AdditionalApolloLinkResultTypes: Defer20220824Result;\n  }\n\n  export type InitialResult<TData = Record<string, unknown>> = {\n    data?: TData | null | undefined;\n    errors?: ReadonlyArray<GraphQLFormattedError>;\n    extensions?: Record<string, unknown>;\n    hasNext: boolean;\n    incremental?: ReadonlyArray<IncrementalResult<TData>>;\n  };\n\n  export type SubsequentResult<TData = Record<string, unknown>> = {\n    extensions?: Record<string, unknown>;\n    hasNext: boolean;\n    incremental?: Array<IncrementalResult<TData>>;\n  };\n\n  export type IncrementalDeferResult<TData = Record<string, unknown>> = {\n    data?: TData | null;\n    errors?: ReadonlyArray<GraphQLFormattedError>;\n    extensions?: Record<string, unknown>;\n    path?: Incremental.Path;\n    label?: string;\n  };\n\n  export type IncrementalStreamResult<TData = Array<unknown>> = {\n    errors?: ReadonlyArray<GraphQLFormattedError>;\n    items?: TData;\n    path?: Incremental.Path;\n    label?: string;\n    extensions?: Record<string, unknown>;\n  };\n\n  export type IncrementalResult<TData = Record<string, unknown>> =\n    | IncrementalDeferResult<TData>\n    | IncrementalStreamResult<TData>;\n\n  export type Chunk<TData extends Record<string, unknown>> =\n    | InitialResult<TData>\n    | SubsequentResult<TData>;\n}\n\nclass DeferRequest<TData extends Record<string, unknown>>\n  implements\n    Incremental.IncrementalRequest<Defer20220824Handler.Chunk<TData>, TData>\n{\n  private hasDefer: boolean;\n  public hasNext = true;\n  private hasFailedDefer = false;\n\n  constructor({ query }: Incremental.StartRequestOptions) {\n    this.hasDefer = hasDirectives([\"defer\"], query);\n  }\n\n  private errors: Array<GraphQLFormattedError> = [];\n  private extensions: Record<string, any> = {};\n  private data: any = {};\n  // This tracks paths for `@stream` arrays that returns items: null due to\n  // errors thrown for non-null array items. We stop processing future updates\n  // to these stream arrays to prevent creating sparse arrays or inserting\n  // `null` for an expected non-null value which could cause runtime crashes.\n  private ignoredImpossibleStreamPaths = new Set<string>();\n\n  private merge(\n    normalized: FormattedExecutionResult<TData>,\n    atPath?: DeepMerger.MergeOptions[\"atPath\"]\n  ) {\n    if (normalized.data !== undefined) {\n      this.data = new DeepMerger({ arrayMerge: \"truncate\" }).merge(\n        this.data,\n        normalized.data,\n        { atPath }\n      );\n    }\n    if (normalized.errors) {\n      this.errors.push(...normalized.errors);\n    }\n    Object.assign(this.extensions, normalized.extensions);\n  }\n\n  handle(\n    // we'll get `undefined` here in case of a `no-cache` fetch policy,\n    // so we'll continue with the last value this request had accumulated\n    cacheData: TData | DeepPartial<TData> | null | undefined = this.data,\n    chunk: Defer20220824Handler.Chunk<TData>\n  ): FormattedExecutionResult<TData> {\n    this.hasNext = chunk.hasNext;\n    this.data = cacheData;\n\n    if (hasIncrementalChunks(chunk)) {\n      for (const incremental of chunk.incremental) {\n        const { path, errors, extensions } = incremental;\n\n        if (\"items\" in incremental) {\n          // Remove the array index from the end of the array since each future\n          // chunk sends a different array index. This normalizes the path to\n          // ensure we ignore updates to this field if `items` is `null`.\n          const stringPath = path?.slice(0, -1).join(\".\") ?? \"\";\n\n          if (incremental.items === null) {\n            this.ignoredImpossibleStreamPaths.add(stringPath);\n          }\n\n          if (this.ignoredImpossibleStreamPaths.has(stringPath)) {\n            this.merge({ errors, extensions });\n            continue;\n          }\n        }\n\n        if (\"data\" in incremental && incremental.data === null) {\n          this.hasFailedDefer = true;\n        }\n\n        let data: any =\n          \"items\" in incremental ? incremental.items\n            // Ensure `data: null` isn't merged for `@defer` responses by\n            // falling back to `undefined`\n          : \"data\" in incremental ? incremental.data ?? undefined\n          : undefined;\n\n        if (path && typeof path.at(-1) === \"number\" && Array.isArray(data)) {\n          const startingIdx = path.at(-1) as number;\n          data.forEach((item, idx) => {\n            this.merge({ data: item }, [\n              ...path!.slice(0, -1),\n              startingIdx + idx,\n            ]);\n          });\n        } else {\n          this.merge({ data }, path);\n        }\n\n        this.merge({ errors, extensions });\n      }\n    } else {\n      this.merge(chunk);\n    }\n\n    const result: FormattedExecutionResult<TData> = { data: this.data };\n\n    if (isNonEmptyArray(this.errors)) {\n      result.errors = this.errors;\n    }\n\n    if (Object.keys(this.extensions).length > 0) {\n      result.extensions = this.extensions;\n    }\n\n    return result;\n  }\n\n  // This protocol can't identify individual `@defer`/`@stream` boundaries by\n  // `path`/`label`, so we can't answer whether a *specific* boundary is\n  // pending - only whether *anything* might still be coming (`hasNext`), or\n  // whether a boundary failed and will never arrive (`hasFailedDefer`).\n  isDeferPending = () => this.hasDefer && (this.hasNext || this.hasFailedDefer);\n}\n\n/**\n * This handler implements the `@defer` directive as specified in this historical commit:\n * https://github.com/graphql/graphql-spec/tree/48cf7263a71a683fab03d45d309fd42d8d9a6659/spec\n */\nexport class Defer20220824Handler\n  implements Incremental.Handler<Defer20220824Handler.Chunk<any>>\n{\n  isIncrementalResult(\n    result: Record<string, any>\n  ): result is\n    | Defer20220824Handler.SubsequentResult\n    | Defer20220824Handler.InitialResult {\n    return \"hasNext\" in result;\n  }\n\n  extractErrors(result: ApolloLink.Result<any>) {\n    const acc: GraphQLFormattedError[] = [];\n    const push = ({\n      errors,\n    }: {\n      errors?: ReadonlyArray<GraphQLFormattedError>;\n    }) => {\n      if (errors) {\n        acc.push(...errors);\n      }\n    };\n    if (this.isIncrementalResult(result)) {\n      if (\"errors\" in result) {\n        push(result);\n      }\n      if (hasIncrementalChunks(result)) {\n        result.incremental.forEach(push);\n      }\n    }\n    if (acc.length) {\n      return acc;\n    }\n  }\n\n  prepareRequest(request: ApolloLink.Request): ApolloLink.Request {\n    if (hasDirectives([\"defer\", \"stream\"], request.query)) {\n      const context = request.context ?? {};\n      const http = (context.http ??= {});\n      http.accept = [\n        \"multipart/mixed;deferSpec=20220824\",\n        ...(http.accept || []),\n      ];\n    }\n\n    return request;\n  }\n  startRequest<TData extends Record<string, unknown>>(\n    opts: Incremental.StartRequestOptions\n  ) {\n    return new DeferRequest<TData>(opts);\n  }\n}\n\n// only exported for use in tests\nexport function hasIncrementalChunks(\n  result: Record<string, any>\n): result is Required<Defer20220824Handler.SubsequentResult> {\n  return isNonEmptyArray(result.incremental);\n}\n"]}

package/incremental/handlers/graphql17Alpha9.d.ts

@@ -58,9 +58,18 @@ declare class IncrementalRequest<TData> implements Incremental.IncrementalReques
     private errors;
     private extensions;
     private pendingMap;
+    private deferredByPathAndLabel;
     private completedMap;
     private _streamInfo;
     private streamPositions;
+    private deferLabels;
+    /**
+    * @internal
+    * 
+    * @deprecated This is an internal API and should not be used directly. This can be removed or changed at any time.
+    */
+    tracksPending: boolean;
+    constructor({ query }: Incremental.StartRequestOptions);
     /**
     * @internal
     * 
@@ -72,17 +81,19 @@ declare class IncrementalRequest<TData> implements Incremental.IncrementalReques
     * 
     * @deprecated This is an internal API and should not be used directly. This can be removed or changed at any time.
     */
-    getPendingWithInfo(): ({
-        type: "stream";
-        path: Incremental.Path;
-        delivered?: undefined;
-        label?: undefined;
-    } | {
-        type: "defer";
-        delivered: boolean;
-        path: Incremental.Path;
-        label: string | undefined;
-    })[];
+    markStreamedPendingForTruncation(): void;
+    private pendingDeferCount;
+    /**
+    * @internal
+    *
+    * @privateRemarks
+    * Important: this function is used as a reactivity dependency in the `readFromStore.prune*` methods.
+    * It needs to be a different instance for each instance of `IncrementalRequest`,
+    * so it cannot be a normal class/prototype method, but it has to be an instance property.
+    * 
+    * @deprecated This is an internal API and should not be used directly. This can be removed or changed at any time.
+    */
+    isDeferPending: (path?: Incremental.Path, label?: string | undefined) => boolean;
     handle(cacheData: TData | DeepPartial<TData> | null | undefined, chunk: GraphQL17Alpha9Handler.Chunk<TData>): FormattedExecutionResult<TData>;
     private merge;
 }
@@ -115,7 +126,7 @@ export declare class GraphQL17Alpha9Handler implements Incremental.Handler<Graph
     * 
     * @deprecated This is an internal API and should not be used directly. This can be removed or changed at any time.
     */
-    startRequest<TData>(_: Incremental.StartRequestOptions): IncrementalRequest<TData>;
+    startRequest<TData>(opts: Incremental.StartRequestOptions): IncrementalRequest<TData>;
 }
 export {};
 //# sourceMappingURL=graphql17Alpha9.d.ts.map

package/incremental/handlers/graphql17Alpha9.js

@@ -1,3 +1,5 @@
+import { Trie } from "@wry/trie";
+import { visit } from "graphql";
 import { DocumentTransform } from "@apollo/client/utilities";
 import { addDeferFragmentLabels, DeepMerger, makeStreamInfoTrie, streamInfoSymbol, } from "@apollo/client/utilities/internal";
 import { hasDirectives, isNonEmptyArray, } from "@apollo/client/utilities/internal";
@@ -8,6 +10,7 @@ class IncrementalRequest {
     errors = [];
     extensions = {};
     pendingMap = new Map();
+    deferredByPathAndLabel = new Trie(false, () => ({}));
     completedMap = new Map();
     _streamInfo = makeStreamInfoTrie();
     // `streamPositions` maps `pending.id` to the index that should be set by the
@@ -18,6 +21,25 @@ class IncrementalRequest {
     // updated by the cache between a streamed chunk aren't overwritten by merges
     // of future stream items from already merged stream items.
     streamPositions = {};
+    deferLabels = new Set();
+    /**
+    * @internal
+    * 
+    * @deprecated This is an internal API and should not be used directly. This can be removed or changed at any time.
+    */
+    tracksPending = true;
+    constructor({ query }) {
+        visit(query, {
+            Directive: (node) => {
+                const name = node.name.value;
+                if (name === "defer") {
+                    const labelNode = node.arguments?.find((arg) => arg.name.value === "label");
+                    invariant(labelNode && labelNode.value.kind === "StringValue", 68);
+                    this.deferLabels.add(labelNode.value.value);
+                }
+            },
+        });
+    }
     /**
     * @internal
     * 
@@ -31,25 +53,44 @@ class IncrementalRequest {
     * 
     * @deprecated This is an internal API and should not be used directly. This can be removed or changed at any time.
     */
-    getPendingWithInfo() {
-        return Array.from(this.pendingMap.values()).map((pending) => {
+    markStreamedPendingForTruncation() {
+        const streamInfo = this.streamInfo;
+        if (!streamInfo)
+            return;
+        for (const pending of this.pendingMap.values()) {
             if (pending.id in this.streamPositions) {
-                return { type: "stream", path: pending.path };
+                streamInfo.lookupArray(pending.path).state.truncate = true;
             }
-            return {
-                type: "defer",
-                delivered: !!this.completedMap.get(pending.id),
-                path: pending.path,
-                label: pending.label,
-            };
-        });
+        }
     }
+    pendingDeferCount = 0;
+    /**
+    * @internal
+    *
+    * @privateRemarks
+    * Important: this function is used as a reactivity dependency in the `readFromStore.prune*` methods.
+    * It needs to be a different instance for each instance of `IncrementalRequest`,
+    * so it cannot be a normal class/prototype method, but it has to be an instance property.
+    * 
+    * @deprecated This is an internal API and should not be used directly. This can be removed or changed at any time.
+    */
+    isDeferPending = (path, label) => {
+        if (!path) {
+            return !!this.pendingDeferCount;
+        }
+        const found = this.deferredByPathAndLabel.peek(...path, label);
+        return !!found && this.completedMap.get(found.id) !== true;
+    };
     handle(cacheData = this.data, chunk) {
         this.hasNext = chunk.hasNext;
         this.data = cacheData;
         if (chunk.pending) {
             for (const pending of chunk.pending) {
                 this.pendingMap.set(pending.id, pending);
+                if (pending.label != null && this.deferLabels.has(pending.label)) {
+                    this.deferredByPathAndLabel.lookup(...pending.path, pending.label).id = pending.id;
+                    this.pendingDeferCount++;
+                }
                 if ("data" in chunk) {
                     const dataAtPath = pending.path.reduce((data, key) => data[key], chunk.data);
                     if (Array.isArray(dataAtPath)) {
@@ -67,7 +108,7 @@ class IncrementalRequest {
         if (hasIncrementalChunks(chunk)) {
             for (const incremental of chunk.incremental) {
                 const pending = this.pendingMap.get(incremental.id);
-                invariant(pending, 68);
+                invariant(pending, 69);
                 const path = pending.path.concat(incremental.subPath ?? []);
                 let data;
                 if ("items" in incremental) {
@@ -121,9 +162,12 @@ class IncrementalRequest {
         }
         if ("completed" in chunk && chunk.completed) {
             for (const completed of chunk.completed) {
-                const { path } = this.pendingMap.get(completed.id);
+                const { path, label } = this.pendingMap.get(completed.id);
                 const streamPosition = this.streamPositions[completed.id];
                 this.completedMap.set(completed.id, !completed.errors);
+                if (label != null && this.deferLabels.has(label) && !completed.errors) {
+                    this.pendingDeferCount--;
+                }
                 // Truncate any stream arrays in case the chunk only contains `hasNext`
                 // and `completed`.
                 if (streamPosition !== undefined) {
@@ -241,8 +285,8 @@ export class GraphQL17Alpha9Handler {
     * 
     * @deprecated This is an internal API and should not be used directly. This can be removed or changed at any time.
     */
-    startRequest(_) {
-        return new IncrementalRequest();
+    startRequest(opts) {
+        return new IncrementalRequest(opts);
     }
 }
 function hasIncrementalChunks(result) {