Fix some wrong dataState values with network-only and errorPolicy: "none" queries

.api-reports/api-report-core.api.md

@@ -1377,8 +1377,8 @@ export const windowFocusSource: RefetchEventManager.EventSource<Event>;
 // Warnings were encountered during analysis:
 //
 // src/core/ApolloClient.ts:635:5 - (ae-forgotten-export) The symbol "NextFetchPolicyContext" needs to be exported by the entry point index.d.ts
-// src/core/ObservableQuery.ts:375:5 - (ae-forgotten-export) The symbol "QueryManager" needs to be exported by the entry point index.d.ts
-// src/core/QueryManager.ts:195:5 - (ae-forgotten-export) The symbol "MutationStoreValue" needs to be exported by the entry point index.d.ts
+// src/core/ObservableQuery.ts:376:5 - (ae-forgotten-export) The symbol "QueryManager" needs to be exported by the entry point index.d.ts
+// src/core/QueryManager.ts:196:5 - (ae-forgotten-export) The symbol "MutationStoreValue" needs to be exported by the entry point index.d.ts
 
 // (No @packageDocumentation comment for this package)
 

.api-reports/api-report-incremental.api.md

@@ -10,6 +10,9 @@ import type { DocumentNode } from 'graphql';
 import type { FormattedExecutionResult } from 'graphql';
 import type { GraphQLFormattedError } from 'graphql';
 import type { HKT } from '@apollo/client/utilities';
+import type { Incremental as Incremental_2 } from '@apollo/client/incremental';
+import { StreamInfoTrie as StreamInfoTrie_2 } from '@apollo/client/utilities/internal';
+import type { Trie } from '@wry/trie';
 
 // @public (undocumented)
 namespace Defer20220824Handler {
@@ -197,16 +200,32 @@ export namespace Incremental {
     // (undocumented)
     export interface IncrementalRequest<Chunk extends Record<string, unknown>, TData> {
         // (undocumented)
-        getPendingType?: (id: string) => "defer" | "stream";
+        getPendingWithInfo?: () => Array<PendingItemWithInfo>;
         // (undocumented)
         handle: (cacheData: TData | DeepPartial<TData> | undefined | null, chunk: Chunk) => FormattedExecutionResult<TData>;
         // (undocumented)
         hasNext: boolean;
+        // Warning: (ae-forgotten-export) The symbol "StreamInfoTrie" needs to be exported by the entry point index.d.ts
+        //
         // (undocumented)
-        pending?: Array<Incremental.PendingResult>;
+        readonly streamInfo?: StreamInfoTrie;
     }
     // (undocumented)
     export type Path = ReadonlyArray<string | number>;
+    // @internal @deprecated (undocumented)
+    export interface PendingDeferResultWithInfo {
+        // (undocumented)
+        delivered: boolean;
+        // (undocumented)
+        path: Incremental.Path;
+        // (undocumented)
+        type: "defer";
+    }
+    // Warning: (ae-incompatible-release-tags) The symbol "PendingItemWithInfo" is marked as @public, but its signature references "Incremental" which is marked as @internal
+    // Warning: (ae-incompatible-release-tags) The symbol "PendingItemWithInfo" is marked as @public, but its signature references "Incremental" which is marked as @internal
+    //
+    // (undocumented)
+    export type PendingItemWithInfo = PendingDeferResultWithInfo | PendingStreamResultWithInfo;
     // (undocumented)
     export interface PendingResult {
         // (undocumented)
@@ -217,6 +236,13 @@ export namespace Incremental {
         path: Incremental.Path;
     }
     // @internal @deprecated (undocumented)
+    export interface PendingStreamResultWithInfo {
+        // (undocumented)
+        path: Incremental.Path;
+        // (undocumented)
+        type: "stream";
+    }
+    // @internal @deprecated (undocumented)
     export interface StartRequestOptions {
         // (undocumented)
         query: DocumentNode;
@@ -233,13 +259,21 @@ export namespace Incremental {
 // @public (undocumented)
 class IncrementalRequest<TData> implements Incremental.IncrementalRequest<GraphQL17Alpha9Handler.Chunk<TData>, TData> {
     // (undocumented)
-    getPendingType(id: string): "defer" | "stream";
+    getPendingWithInfo(): ({
+        type: "stream";
+        path: Incremental.Path;
+        delivered?: undefined;
+    } | {
+        type: "defer";
+        delivered: boolean;
+        path: Incremental.Path;
+    })[];
     // (undocumented)
     handle(cacheData: TData | DeepPartial<TData> | null | undefined, chunk: GraphQL17Alpha9Handler.Chunk<TData>): FormattedExecutionResult<TData>;
     // (undocumented)
     hasNext: boolean;
     // (undocumented)
-    get pending(): GraphQL17Alpha9Handler.PendingResult[];
+    get streamInfo(): StreamInfoTrie_2 | undefined;
 }
 
 // @public (undocumented)
@@ -272,6 +306,33 @@ export class NotImplementedHandler implements Incremental.Handler<never> {
     startRequest: any;
 }
 
+// @public (undocumented)
+class StreamArrayState {
+    constructor(path: Incremental_2.Path);
+    // (undocumented)
+    depend(): void;
+    // (undocumented)
+    get streamPosition(): number;
+    set streamPosition(value: number);
+    // (undocumented)
+    truncate: boolean;
+}
+
+// @internal @deprecated (undocumented)
+type StreamInfoTrie = Trie<{
+    current: Incremental_2.StreamFieldInfo;
+    state: StreamArrayState;
+    previous?: {
+        incoming: unknown;
+        streamFieldInfo: Incremental_2.StreamFieldInfo;
+        result: unknown;
+    };
+}>;
+
+// Warnings were encountered during analysis:
+//
+// src/utilities/internal/types/StreamInfoTrie.ts:10:3 - (ae-forgotten-export) The symbol "StreamArrayState" needs to be exported by the entry point index.d.ts
+
 // (No @packageDocumentation comment for this package)
 
 ```

.api-reports/api-report.api.md

@@ -1598,17 +1598,33 @@ namespace Incremental {
     }
     // (undocumented)
     interface IncrementalRequest<Chunk extends Record<string, unknown>, TData> {
+        // Warning: (ae-forgotten-export) The symbol "Incremental" needs to be exported by the entry point index.d.ts
+        //
         // (undocumented)
-        getPendingType?: (id: string) => "defer" | "stream";
+        getPendingWithInfo?: () => Array<PendingItemWithInfo>;
         // (undocumented)
         handle: (cacheData: TData | DeepPartial<TData> | undefined | null, chunk: Chunk) => FormattedExecutionResult<TData>;
         // (undocumented)
         hasNext: boolean;
         // (undocumented)
-        pending?: Array<Incremental.PendingResult>;
+        readonly streamInfo?: StreamInfoTrie;
     }
     // (undocumented)
     type Path = ReadonlyArray<string | number>;
+    // @internal @deprecated (undocumented)
+    interface PendingDeferResultWithInfo {
+        // (undocumented)
+        delivered: boolean;
+        // (undocumented)
+        path: Incremental.Path;
+        // (undocumented)
+        type: "defer";
+    }
+    // Warning: (ae-forgotten-export) The symbol "Incremental" needs to be exported by the entry point index.d.ts
+    // Warning: (ae-forgotten-export) The symbol "Incremental" needs to be exported by the entry point index.d.ts
+    //
+    // (undocumented)
+    type PendingItemWithInfo = PendingDeferResultWithInfo | PendingStreamResultWithInfo;
     // (undocumented)
     interface PendingResult {
         // (undocumented)
@@ -1619,6 +1635,13 @@ namespace Incremental {
         path: Incremental.Path;
     }
     // @internal @deprecated (undocumented)
+    interface PendingStreamResultWithInfo {
+        // (undocumented)
+        path: Incremental.Path;
+        // (undocumented)
+        type: "stream";
+    }
+    // @internal @deprecated (undocumented)
     interface StartRequestOptions {
         // (undocumented)
         query: DocumentNode;
@@ -3263,8 +3286,8 @@ interface WriteContext extends ReadMergeModifyContext {
 // src/cache/inmemory/types.ts:162:3 - (ae-forgotten-export) The symbol "FragmentRegistryAPI" needs to be exported by the entry point index.d.ts
 // src/core/ApolloClient.ts:201:5 - (ae-forgotten-export) The symbol "IgnoreModifier" needs to be exported by the entry point index.d.ts
 // src/core/ApolloClient.ts:635:5 - (ae-forgotten-export) The symbol "NextFetchPolicyContext" needs to be exported by the entry point index.d.ts
-// src/core/ObservableQuery.ts:375:5 - (ae-forgotten-export) The symbol "QueryManager" needs to be exported by the entry point index.d.ts
-// src/core/QueryManager.ts:195:5 - (ae-forgotten-export) The symbol "MutationStoreValue" needs to be exported by the entry point index.d.ts
+// src/core/ObservableQuery.ts:376:5 - (ae-forgotten-export) The symbol "QueryManager" needs to be exported by the entry point index.d.ts
+// src/core/QueryManager.ts:196:5 - (ae-forgotten-export) The symbol "MutationStoreValue" needs to be exported by the entry point index.d.ts
 // src/local-state/LocalState.ts:149:5 - (ae-forgotten-export) The symbol "LocalState" needs to be exported by the entry point index.d.ts
 // src/local-state/LocalState.ts:202:7 - (ae-forgotten-export) The symbol "LocalState" needs to be exported by the entry point index.d.ts
 // src/local-state/LocalState.ts:245:7 - (ae-forgotten-export) The symbol "LocalState" needs to be exported by the entry point index.d.ts

.changeset/chilly-actors-complain.md

@@ -0,0 +1,5 @@
+---
+"@apollo/client": patch
+---
+
+Fix an issue where a `network-only` query leaked partial cache data for `@defer` fragments that were not delivered by the network due to an error that bubbled to the `@defer` fragment boundary.

.changeset/loud-bulldogs-pay.md

@@ -0,0 +1,5 @@
+---
+"@apollo/client": patch
+---
+
+Fix an issue where a `@defer` query reported the `dataState` as `complete` instead of `streaming` when an error occurs on a deferred field that bubbled to the defer boundary.

.changeset/swift-starfishes-know.md

@@ -0,0 +1,5 @@
+---
+"@apollo/client": patch
+---
+
+Fix an invariant error thrown when a `@defer` boundary received a payload after it had already been marked complete.

src/cache/inmemory/__tests__/cache.diff/incremental.test.ts

@@ -9645,6 +9645,57 @@ test("strips both a partial pending @defer boundary and a complete pending sibli
   });
 });
 
+test("keeps fields shared with a delivered @defer boundary while pruning a pending boundary at a nested path", () => {
+  const cache = new InMemoryCache();
+  const query = gql`
+    query {
+      ... @defer {
+        hero {
+          name
+        }
+      }
+      hero {
+        id
+        ... @defer {
+          name
+          homePlanet
+        }
+      }
+    }
+  `;
+
+  cache.writeQuery({
+    query,
+    data: {
+      hero: {
+        __typename: "Hero",
+        id: "1",
+        name: "Luke",
+        homePlanet: "Tatooine",
+      },
+    },
+  });
+
+  const deferInfo: DeferInfoTrie = new Trie();
+  deferInfo.lookup("hero");
+
+  expect(
+    cache.diff({
+      query,
+      optimistic: true,
+      returnPartialData: false,
+      [handleIncrementalSymbol]: { deferInfo },
+    })
+  ).toStrictEqualTyped({
+    result: markAsStreaming({
+      hero: { __typename: "Hero", id: "1", name: "Luke" },
+    }),
+    dataState: "streaming",
+    complete: false,
+    missing: undefined,
+  });
+});
+
 function getMissingMessage(fieldName: string, obj: Record<string, unknown>) {
   return `Can't find field '${fieldName}' on ${
     isReference(obj) ?

src/core/ObservableQuery.ts

@@ -34,6 +34,7 @@ import {
 import { invariant } from "@apollo/client/utilities/invariant";
 
 import type { ApolloClient } from "./ApolloClient.js";
+import { dataStateErrorCache } from "./dataStateErrorCache.js";
 import { NetworkStatus } from "./networkStatus.js";
 import type { QueryManager } from "./QueryManager.js";
 import type {
@@ -2018,7 +2019,8 @@ Did you mean to call refetch(variables) instead of refetch({ variables })?`,
         : notification.value;
 
       if (notification.kind === "E" && result.dataState === "streaming") {
-        result.dataState = "complete" as any;
+        result.dataState =
+          dataStateErrorCache.get(notification.error) ?? ("complete" as any);
       }
 
       if (result.error) {