@isograph/react 0.0.0-main-5141cf39 → 0.0.0-main-7f95f0cd

package/dist/react/useLazyReference.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useLazyReference.d.ts","sourceRoot":"","sources":["../../src/react/useLazyReference.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,KAAK,qBAAqB,EAC3B,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,YAAY,EAAE,KAAK,oBAAoB,EAAE,MAAM,eAAe,CAAC;AACxE,OAAO,EACL,kBAAkB,EAClB,KAAK,gBAAgB,EACrB,KAAK,sBAAsB,EAC5B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EACjB,KAAK,qBAAqB,EAC3B,MAAM,2BAA2B,CAAC;AAInC,wBAAgB,gBAAgB,CAC9B,cAAc,SAAS,qBAAqB,EAC5C,iBAAiB,EACjB,iBAAiB,SAAS,gBAAgB,GAAG,sBAAsB,EACnE,gBAAgB,SAAS,qBAAqB,EAE9C,UAAU,EAAE,kBAAkB,CAC5B,cAAc,EACd,iBAAiB,EACjB,iBAAiB,EACjB,gBAAgB,CACjB,EACD,SAAS,EAAE,iBAAiB,CAAC,cAAc,CAAC,EAC5C,GAAG,CAAC,YAAY,CAAC,EAAE,iBAAiB,SAAS,sBAAsB,GAC/D,CAAC,YAAY,EAAE,oBAAoB,CAAC,iBAAiB,CAAC,CAAC,GACvD,CAAC,YAAY,CAAC,EAAE,YAAY,CAAC,iBAAiB,CAAC,CAAC,GACnD,gBAAgB,GAAG,sBAAsB,SAAS,iBAAiB,GAClE,OAAO,GACP;IACE,iBAAiB,EAAE,iBAAiB,CAAC,cAAc,EAAE,iBAAiB,CAAC,CAAC;CACzE,CAqBJ"}
+{"version":3,"file":"useLazyReference.d.ts","sourceRoot":"","sources":["../../src/react/useLazyReference.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,KAAK,qBAAqB,EAC3B,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,YAAY,EAAE,KAAK,oBAAoB,EAAE,MAAM,eAAe,CAAC;AACxE,OAAO,EACL,kBAAkB,EAClB,KAAK,gBAAgB,EACrB,KAAK,sBAAsB,EAC5B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EACjB,KAAK,qBAAqB,EAC3B,MAAM,2BAA2B,CAAC;AAInC,wBAAgB,gBAAgB,CAC9B,cAAc,SAAS,qBAAqB,EAC5C,iBAAiB,EACjB,iBAAiB,SAAS,gBAAgB,GAAG,sBAAsB,EACnE,gBAAgB,SAAS,qBAAqB,EAE9C,UAAU,EAAE,kBAAkB,CAC5B,cAAc,EACd,iBAAiB,EACjB,iBAAiB,EACjB,gBAAgB,CACjB,EACD,SAAS,EAAE,iBAAiB,CAAC,cAAc,CAAC,EAC5C,GAAG,CAAC,YAAY,CAAC,EAAE,iBAAiB,SAAS,sBAAsB,GAC/D,CAAC,YAAY,EAAE,oBAAoB,CAAC,iBAAiB,CAAC,CAAC,GACvD,CAAC,YAAY,CAAC,EAAE,YAAY,CAAC,iBAAiB,EAAE,gBAAgB,CAAC,CAAC,GACrE,gBAAgB,GAAG,sBAAsB,SAAS,iBAAiB,GAClE,OAAO,GACP;IACE,iBAAiB,EAAE,iBAAiB,CAAC,cAAc,EAAE,iBAAiB,CAAC,CAAC;CACzE,CAqBJ"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@isograph/react",
-  "version": "0.0.0-main-5141cf39",
+  "version": "0.0.0-main-7f95f0cd",
   "description": "Use Isograph with React",
   "homepage": "https://isograph.dev",
   "main": "dist/index.js",
@@ -8,9 +8,9 @@
   "author": "Isograph Labs",
   "license": "MIT",
   "dependencies": {
-    "@isograph/disposable-types": "0.0.0-main-5141cf39",
-    "@isograph/reference-counted-pointer": "0.0.0-main-5141cf39",
-    "@isograph/react-disposable-state": "0.0.0-main-5141cf39"
+    "@isograph/disposable-types": "0.0.0-main-7f95f0cd",
+    "@isograph/reference-counted-pointer": "0.0.0-main-7f95f0cd",
+    "@isograph/react-disposable-state": "0.0.0-main-7f95f0cd"
   },
   "peerDependencies": {
     "react": "^18.0.0 || ^19.0.0"

package/src/core/cache.ts

@@ -100,7 +100,7 @@ export function getOrCreateCacheForArtifact<
     TRawResponseType
   >,
   variables: ExtractParameters<TReadFromStore>,
-  fetchOptions?: FetchOptions<TClientFieldValue>,
+  fetchOptions?: FetchOptions<TClientFieldValue, TRawResponseType>,
 ): ParentCache<FragmentReference<TReadFromStore, TClientFieldValue>> {
   let cacheKey = '';
   switch (entrypoint.networkRequestInfo.operation.kind) {

package/src/core/check.ts

@@ -15,15 +15,21 @@ export type RequiredShouldFetch = 'Yes' | 'No';
 
 export const DEFAULT_SHOULD_FETCH_VALUE: ShouldFetch = 'IfNecessary';
 
-export type FetchOptions<TReadOutData> = {
-  shouldFetch?: ShouldFetch;
+type FetchOptionsShared<TReadOutData> = {
   onComplete?: (data: TReadOutData) => void;
   onError?: () => void;
 };
 
-export type RequiredFetchOptions<TReadOutData> = {
+export interface FetchOptions<TReadOutData, TRawResponseType>
+  extends FetchOptionsShared<TReadOutData> {
+  shouldFetch?: ShouldFetch;
+  optimisticNetworkResponse?: TRawResponseType;
+}
+
+export interface RequiredFetchOptions<TReadOutData>
+  extends FetchOptionsShared<TReadOutData> {
   shouldFetch: RequiredShouldFetch;
-} & FetchOptions<TReadOutData>;
+}
 
 export type CheckResult =
   | {

package/src/core/makeNetworkRequest.ts

@@ -27,7 +27,13 @@ import {
 } from './garbageCollection';
 import { IsographEnvironment, ROOT_ID, StoreLink } from './IsographEnvironment';
 import { logMessage } from './logging';
-import { addNetworkResponseStoreLayer } from './optimisticProxy';
+import {
+  addNetworkResponseStoreLayer,
+  addOptimisticNetworkResponseStoreLayer,
+  revertOptimisticStoreLayerAndMaybeReplace,
+  type OptimisticStoreLayer,
+  type StoreLayerWithData,
+} from './optimisticProxy';
 import {
   AnyError,
   PromiseWrapper,
@@ -58,7 +64,7 @@ export function maybeMakeNetworkRequest<
   readerWithRefetchQueries: PromiseWrapper<
     ReaderWithRefetchQueries<TReadFromStore, TClientFieldValue>
   > | null,
-  fetchOptions: FetchOptions<TClientFieldValue> | null,
+  fetchOptions: FetchOptions<TClientFieldValue, TRawResponseType> | null,
 ): ItemCleanupPair<PromiseWrapper<void, AnyError>> {
   switch (fetchOptions?.shouldFetch ?? DEFAULT_SHOULD_FETCH_VALUE) {
     case 'Yes': {
@@ -83,7 +89,8 @@ export function maybeMakeNetworkRequest<
         'NormalizationAstLoader'
       ) {
         throw new Error(
-          'Using lazy loaded normalizationAst with shouldFetch: "IfNecessary" is not supported as it will lead to slower initial load time.',
+          'Using lazy loaded normalizationAst with shouldFetch: "IfNecessary" is ' +
+            'not supported as it will lead to a network waterfall.',
         );
       }
       const result = check(
@@ -131,8 +138,10 @@ export function retainQueryWithoutMakingNetworkRequest<
       >,
   variables: ExtractParameters<TReadFromStore>,
 ): ItemCleanupPair<PromiseWrapper<void, AnyError>> {
-  let status: NetworkRequestStatus = {
-    kind: 'Undisposed',
+  let status:
+    | NetworkRequestStatusUndisposedComplete
+    | NetworkRequestStatusDisposed = {
+    kind: 'UndisposedComplete',
     retainedQuery: fetchNormalizationAstAndRetainArtifact(
       environment,
       artifact,
@@ -142,12 +151,9 @@ export function retainQueryWithoutMakingNetworkRequest<
   return [
     wrapResolvedValue(undefined),
     () => {
-      if (status.kind === 'Undisposed') {
-        unretainAndGarbageCollect(environment, status);
+      if (status.kind !== 'Disposed') {
+        status = unretainAndGarbageCollect(environment, status);
       }
-      status = {
-        kind: 'Disposed',
-      };
     },
   ];
 }
@@ -171,18 +177,27 @@ export function makeNetworkRequest<
   readerWithRefetchQueries: PromiseWrapper<
     ReaderWithRefetchQueries<TReadFromStore, TClientFieldValue>
   > | null,
-  fetchOptions: FetchOptions<TClientFieldValue> | null,
+  fetchOptions: FetchOptions<TClientFieldValue, TRawResponseType> | null,
 ): ItemCleanupPair<PromiseWrapper<void, AnyError>> {
   // TODO this should be a DataId and stored in the store
   const myNetworkRequestId = networkRequestId + '';
   networkRequestId++;
   let status: NetworkRequestStatus = {
-    kind: 'Undisposed',
+    kind: 'UndisposedIncomplete',
     retainedQuery: fetchNormalizationAstAndRetainArtifact(
       environment,
       artifact,
       variables,
     ),
+    optimistic:
+      fetchOptions?.optimisticNetworkResponse != null
+        ? makeOptimisticUpdate(
+            environment,
+            artifact,
+            variables,
+            fetchOptions?.optimisticNetworkResponse,
+          )
+        : null,
   };
 
   logMessage(environment, () => ({
@@ -218,26 +233,50 @@ export function makeNetworkRequest<
       }
 
       const root = { __link: ROOT_ID, __typename: artifact.concreteType };
-      if (status.kind === 'Undisposed') {
-        const encounteredIds: EncounteredIds = new Map();
-        environment.store = addNetworkResponseStoreLayer(environment.store);
-        normalizeData(
-          environment,
-          environment.store,
-          normalizationAst.selections,
-          networkResponse.data ?? {},
-          variables,
-          root,
-          encounteredIds,
-        );
 
-        logMessage(environment, () => ({
-          kind: 'AfterNormalization',
-          store: environment.store,
-          encounteredIds: encounteredIds,
-        }));
+      if (status.kind === 'UndisposedIncomplete') {
+        if (status.optimistic != null) {
+          status =
+            revertOptimisticStoreLayerAndMaybeReplaceIfUndisposedIncomplete(
+              environment,
+              status,
+              (storeLayer) =>
+                normalizeData(
+                  environment,
+                  storeLayer,
+                  normalizationAst.selections,
+                  networkResponse.data ?? {},
+                  variables,
+                  root,
+                  new Map(),
+                ),
+            );
+        } else {
+          const encounteredIds: EncounteredIds = new Map();
+          environment.store = addNetworkResponseStoreLayer(environment.store);
+          normalizeData(
+            environment,
+            environment.store,
+            normalizationAst.selections,
+            networkResponse.data ?? {},
+            variables,
+            root,
+            encounteredIds,
+          );
+
+          logMessage(environment, () => ({
+            kind: 'AfterNormalization',
+            store: environment.store,
+            encounteredIds: encounteredIds,
+          }));
 
-        callSubscriptions(environment, encounteredIds);
+          callSubscriptions(environment, encounteredIds);
+
+          status = {
+            kind: 'UndisposedComplete',
+            retainedQuery: status.retainedQuery,
+          };
+        }
       }
 
       const onComplete = fetchOptions?.onComplete;
@@ -268,6 +307,16 @@ export function makeNetworkRequest<
       try {
         fetchOptions?.onError?.();
       } catch {}
+
+      if (status.kind === 'UndisposedIncomplete') {
+        status =
+          revertOptimisticStoreLayerAndMaybeReplaceIfUndisposedIncomplete(
+            environment,
+            status,
+            null,
+          );
+      }
+
       throw e;
     });
 
@@ -276,27 +325,41 @@ export function makeNetworkRequest<
   const response: ItemCleanupPair<PromiseWrapper<void, AnyError>> = [
     wrapper,
     () => {
-      if (status.kind === 'Undisposed') {
-        unretainAndGarbageCollect(environment, status);
+      if (status.kind === 'UndisposedIncomplete') {
+        status =
+          revertOptimisticStoreLayerAndMaybeReplaceIfUndisposedIncomplete(
+            environment,
+            status,
+            null,
+          );
+      }
+      if (status.kind !== 'Disposed') {
+        status = unretainAndGarbageCollect(environment, status);
       }
-      status = {
-        kind: 'Disposed',
-      };
     },
   ];
   return response;
 }
 
-type NetworkRequestStatusUndisposed = {
-  readonly kind: 'Undisposed';
+type NetworkRequestStatusUndisposedIncomplete = {
+  readonly kind: 'UndisposedIncomplete';
   readonly retainedQuery: RetainedQuery;
+  readonly optimistic: OptimisticStoreLayer | null;
+};
+
+type NetworkRequestStatusUndisposedComplete = {
+  readonly kind: 'UndisposedComplete';
+  readonly retainedQuery: RetainedQuery;
+};
+
+type NetworkRequestStatusDisposed = {
+  readonly kind: 'Disposed';
 };
 
 type NetworkRequestStatus =
-  | NetworkRequestStatusUndisposed
-  | {
-      readonly kind: 'Disposed';
-    };
+  | NetworkRequestStatusUndisposedIncomplete
+  | NetworkRequestStatusUndisposedComplete
+  | NetworkRequestStatusDisposed;
 
 function readDataForOnComplete<
   TReadFromStore extends UnknownTReadFromStore,
@@ -438,12 +501,86 @@ function fetchNormalizationAstAndRetainArtifact<
   return retainedQuery;
 }
 
+function makeOptimisticUpdate<
+  TReadFromStore extends UnknownTReadFromStore,
+  TClientFieldValue,
+  TNormalizationAst extends NormalizationAst | NormalizationAstLoader,
+  TRawResponseType extends NetworkResponseObject,
+>(
+  environment: IsographEnvironment,
+  artifact:
+    | RefetchQueryNormalizationArtifact
+    | IsographEntrypoint<
+        TReadFromStore,
+        TClientFieldValue,
+        TNormalizationAst,
+        TRawResponseType
+      >,
+  variables: ExtractParameters<TReadFromStore>,
+  optimisticNetworkResponse: TRawResponseType,
+): OptimisticStoreLayer {
+  const root = { __link: ROOT_ID, __typename: artifact.concreteType };
+
+  if (
+    artifact.networkRequestInfo.normalizationAst.kind ===
+    'NormalizationAstLoader'
+  ) {
+    throw new Error(
+      'Using lazy loaded normalizationAst with optimisticNetworkResponse is not supported.',
+    );
+  }
+  const encounteredIds: EncounteredIds = new Map();
+  const optimistic = (environment.store =
+    addOptimisticNetworkResponseStoreLayer(environment.store));
+  normalizeData(
+    environment,
+    environment.store,
+    artifact.networkRequestInfo.normalizationAst.selections,
+    optimisticNetworkResponse,
+    variables,
+    root,
+    encounteredIds,
+  );
+
+  logMessage(environment, () => ({
+    kind: 'AfterNormalization',
+    store: environment.store,
+    encounteredIds: encounteredIds,
+  }));
+
+  callSubscriptions(environment, encounteredIds);
+  return optimistic;
+}
+
+function revertOptimisticStoreLayerAndMaybeReplaceIfUndisposedIncomplete(
+  environment: IsographEnvironment,
+  status: NetworkRequestStatusUndisposedIncomplete,
+  normalizeData: null | ((storeLayer: StoreLayerWithData) => void),
+): NetworkRequestStatusUndisposedComplete {
+  if (status.optimistic) {
+    revertOptimisticStoreLayerAndMaybeReplace(
+      environment,
+      status.optimistic,
+      normalizeData,
+    );
+  }
+
+  return {
+    kind: 'UndisposedComplete',
+    retainedQuery: status.retainedQuery,
+  };
+}
+
 function unretainAndGarbageCollect(
   environment: IsographEnvironment,
-  status: NetworkRequestStatusUndisposed,
-) {
+  status: NetworkRequestStatusUndisposedComplete,
+): NetworkRequestStatusDisposed {
   const didUnretainSomeQuery = unretainQuery(environment, status.retainedQuery);
   if (didUnretainSomeQuery) {
     garbageCollectEnvironment(environment);
   }
+
+  return {
+    kind: 'Disposed',
+  };
 }

package/src/core/optimisticProxy.ts

@@ -122,8 +122,28 @@ export type StartUpdateStoreLayer = {
   startUpdate: DataUpdate<StartUpdateStoreLayer | BaseStoreLayer>;
 };
 
-export type OptimisticStoreLayer = {
-  readonly kind: 'OptimisticStoreLayer';
+export type OptimisticStoreLayer =
+  | OptimisticUpdaterStoreLayer
+  | OptimisticNetworkResponseStoreLayer;
+
+export type OptimisticUpdaterStoreLayer = {
+  readonly kind: 'OptimisticUpdaterStoreLayer';
+  childStoreLayer:
+    | OptimisticStoreLayer
+    | StartUpdateStoreLayer
+    | NetworkResponseStoreLayer
+    | null;
+  parentStoreLayer:
+    | OptimisticStoreLayer
+    | StartUpdateStoreLayer
+    | NetworkResponseStoreLayer
+    | BaseStoreLayer;
+  data: StoreLayerData;
+  readonly startUpdate: DataUpdate<OptimisticUpdaterStoreLayer>;
+};
+
+export type OptimisticNetworkResponseStoreLayer = {
+  readonly kind: 'OptimisticNetworkResponseStoreLayer';
   childStoreLayer:
     | OptimisticStoreLayer
     | StartUpdateStoreLayer
@@ -135,7 +155,6 @@ export type OptimisticStoreLayer = {
     | NetworkResponseStoreLayer
     | BaseStoreLayer;
   data: StoreLayerData;
-  readonly startUpdate: DataUpdate<OptimisticStoreLayer>;
 };
 
 export function addNetworkResponseStoreLayer(
@@ -147,7 +166,8 @@ export function addNetworkResponseStoreLayer(
       return parent;
     }
     case 'StartUpdateStoreLayer':
-    case 'OptimisticStoreLayer': {
+    case 'OptimisticNetworkResponseStoreLayer':
+    case 'OptimisticUpdaterStoreLayer': {
       const node: NetworkResponseStoreLayer = {
         kind: 'NetworkResponseStoreLayer',
         parentStoreLayer: parent,
@@ -205,7 +225,8 @@ export function addStartUpdateStoreLayer(
       return node;
     }
     case 'NetworkResponseStoreLayer':
-    case 'OptimisticStoreLayer': {
+    case 'OptimisticNetworkResponseStoreLayer':
+    case 'OptimisticUpdaterStoreLayer': {
       const node: StartUpdateStoreLayer = {
         kind: 'StartUpdateStoreLayer',
         parentStoreLayer: parent,
@@ -225,17 +246,18 @@ export function addStartUpdateStoreLayer(
   }
 }
 
-export function addOptimisticStoreLayer(
+export function addOptimisticUpdaterStoreLayer(
   parent: StoreLayer,
-  startUpdate: OptimisticStoreLayer['startUpdate'],
-): OptimisticStoreLayer {
+  startUpdate: OptimisticUpdaterStoreLayer['startUpdate'],
+): OptimisticUpdaterStoreLayer {
   switch (parent.kind) {
     case 'BaseStoreLayer':
     case 'StartUpdateStoreLayer':
     case 'NetworkResponseStoreLayer':
-    case 'OptimisticStoreLayer': {
-      const node: OptimisticStoreLayer = {
-        kind: 'OptimisticStoreLayer',
+    case 'OptimisticNetworkResponseStoreLayer':
+    case 'OptimisticUpdaterStoreLayer': {
+      const node: OptimisticUpdaterStoreLayer = {
+        kind: 'OptimisticUpdaterStoreLayer',
         parentStoreLayer: parent,
         childStoreLayer: null,
         data: {},
@@ -254,6 +276,33 @@ export function addOptimisticStoreLayer(
   }
 }
 
+export function addOptimisticNetworkResponseStoreLayer(
+  parent: StoreLayer,
+): OptimisticNetworkResponseStoreLayer {
+  switch (parent.kind) {
+    case 'BaseStoreLayer':
+    case 'StartUpdateStoreLayer':
+    case 'NetworkResponseStoreLayer':
+    case 'OptimisticNetworkResponseStoreLayer':
+    case 'OptimisticUpdaterStoreLayer': {
+      const node: OptimisticNetworkResponseStoreLayer = {
+        kind: 'OptimisticNetworkResponseStoreLayer',
+        parentStoreLayer: parent,
+        childStoreLayer: null,
+        data: {},
+      };
+
+      parent.childStoreLayer = node;
+
+      return node;
+    }
+    default: {
+      parent satisfies never;
+      throw new Error('Unreachable. This is a bug in Isograph.');
+    }
+  }
+}
+
 /**
  * Merge storeLayerToMerge, and its children, into baseStoreLayer.
  * We can merge until we reach a revertible layer (i.e. an optimistic layer).
@@ -273,7 +322,7 @@ function mergeLayersWithDataIntoBaseLayer(
 ) {
   while (
     storeLayerToMerge &&
-    storeLayerToMerge.kind !== 'OptimisticStoreLayer'
+    storeLayerToMerge.kind !== 'OptimisticUpdaterStoreLayer'
   ) {
     mergeDataLayer(baseStoreLayer.data, storeLayerToMerge.data);
     storeLayerToMerge = storeLayerToMerge.childStoreLayer;
@@ -309,6 +358,7 @@ function reexecuteUpdatesAndMergeData(
   while (storeLayer !== null) {
     mergeDataLayer(oldMergedData, storeLayer.data);
     switch (storeLayer.kind) {
+      case 'OptimisticNetworkResponseStoreLayer':
       case 'NetworkResponseStoreLayer':
         break;
       case 'StartUpdateStoreLayer': {
@@ -316,7 +366,7 @@ function reexecuteUpdatesAndMergeData(
         storeLayer.startUpdate(storeLayer);
         break;
       }
-      case 'OptimisticStoreLayer': {
+      case 'OptimisticUpdaterStoreLayer': {
         storeLayer.data = {};
         storeLayer.startUpdate(storeLayer);
         break;
@@ -467,7 +517,10 @@ export type StoreLayer =
   | StartUpdateStoreLayer
   | BaseStoreLayer;
 
-export type StoreLayerWithData = BaseStoreLayer | NetworkResponseStoreLayer;
+export type StoreLayerWithData =
+  | BaseStoreLayer
+  | NetworkResponseStoreLayer
+  | OptimisticNetworkResponseStoreLayer;
 
 function compareData(
   oldData: StoreLayerData,

package/src/core/read.ts

@@ -316,7 +316,7 @@ export function readLoadablySelectedFieldData(
     data: (
       args: any,
       // TODO get the associated type for FetchOptions from the loadably selected field
-      fetchOptions?: FetchOptions<any>,
+      fetchOptions?: FetchOptions<any, never>,
     ) => {
       // TODO we should use the reader AST for this
       const includeReadOutData = (variables: any, readOutData: any) => {
@@ -919,7 +919,7 @@ export function readClientPointerData(
     data: (
       args: any,
       // TODO get the associated type for FetchOptions from the loadably selected field
-      fetchOptions?: FetchOptions<any>,
+      fetchOptions?: FetchOptions<any, never>,
     ) => {
       const includeReadOutData = (variables: any, readOutData: any) => {
         variables.id = readOutData.id;

package/src/core/reader.ts

@@ -177,5 +177,5 @@ export type LoadableField<
   // user-facing API. Users should only interact with LoadableFields via APIs
   // like useClientSideDefer. These APIs should have a nullable fetchOptions
   // parameter, and provide a default value ({}) to the LoadableField.
-  fetchOptions: FetchOptions<TResult>,
+  fetchOptions: FetchOptions<TResult, never>,
 ) => [StableId, Factory<FragmentReference<TReadFromStore, TResult>>];

package/src/loadable-hooks/useClientSideDefer.ts

@@ -30,11 +30,11 @@ export function useClientSideDefer<
   >
     ? [
         args?: ArgsWithoutProvidedArgs<TReadFromStore, TProvidedArgs>,
-        fetchOptions?: FetchOptions<TResult>,
+        fetchOptions?: FetchOptions<TResult, never>,
       ]
     : [
         args: ArgsWithoutProvidedArgs<TReadFromStore, TProvidedArgs>,
-        fetchOptions?: FetchOptions<TResult>,
+        fetchOptions?: FetchOptions<TResult, never>,
       ]
 ): { fragmentReference: FragmentReference<TReadFromStore, TResult> } {
   const [args, fetchOptions] = maybeRequiredArgs;

package/src/loadable-hooks/useConnectionSpecPagination.ts

@@ -38,7 +38,7 @@ export type UsePaginationReturnValue<
       kind: 'HasMoreRecords';
       fetchMore: (
         count: number,
-        fetchOptions?: FetchOptions<Connection<TItem>>,
+        fetchOptions?: FetchOptions<Connection<TItem>, never>,
       ) => void;
       results: ReadonlyArray<TItem>;
     }
@@ -210,7 +210,10 @@ export function useConnectionSpecPagination<
 
   const getFetchMore =
     (after: string | null) =>
-    (count: number, fetchOptions?: FetchOptions<Connection<TItem>>): void => {
+    (
+      count: number,
+      fetchOptions?: FetchOptions<Connection<TItem>, never>,
+    ): void => {
       const loadedField = loadableField(
         {
           after: after,

package/src/loadable-hooks/useImperativeLoadableField.ts

@@ -19,7 +19,7 @@ export type UseImperativeLoadableFieldReturn<
     // TODO this should be void iff all args are provided by the query, like in
     // useClientSideDefer.
     args: Omit<ExtractParameters<TReadFromStore>, keyof TProvidedArgs> | void,
-    fetchOptions?: FetchOptions<TResult>,
+    fetchOptions?: FetchOptions<TResult, never>,
   ) => void;
 };
 
@@ -40,7 +40,7 @@ export function useImperativeLoadableField<
   return {
     loadFragmentReference: (
       args: Omit<ExtractParameters<TReadFromStore>, keyof TProvidedArgs> | void,
-      fetchOptions?: FetchOptions<TResult>,
+      fetchOptions?: FetchOptions<TResult, never>,
     ) => {
       const [_id, loader] = loadableField(args, fetchOptions ?? {});
       setState(loader());

package/src/loadable-hooks/useSkipLimitPagination.ts

@@ -33,7 +33,7 @@ export type UseSkipLimitReturnValue<
       readonly kind: 'Complete';
       readonly fetchMore: (
         count: number,
-        fetchOptions?: FetchOptions<ReadonlyArray<TItem>>,
+        fetchOptions?: FetchOptions<ReadonlyArray<TItem>, never>,
       ) => void;
       readonly results: ReadonlyArray<TItem>;
     }
@@ -196,7 +196,7 @@ export function useSkipLimitPagination<
     (loadedSoFar: number) =>
     (
       count: number,
-      fetchOptions?: FetchOptions<ReadonlyArray<TItem>>,
+      fetchOptions?: FetchOptions<ReadonlyArray<TItem>, never>,
     ): void => {
       const loadedField = loadableField(
         {

package/src/react/LoadableFieldReader.tsx

@@ -38,7 +38,7 @@ export function LoadableFieldReader<
       TResult,
       Omit<ExtractParameters<TReadFromStore>, keyof TProvidedArgs>
     >;
-    fetchOptions?: FetchOptions<TResult>;
+    fetchOptions?: FetchOptions<TResult, never>;
     networkRequestOptions?: Partial<NetworkRequestReaderOptions>;
     children: (arg: TResult) => TChildrenResult;
   } & MaybeRequiredArgs<TReadFromStore, TProvidedArgs>,

package/src/react/LoadableFieldRenderer.tsx

@@ -38,7 +38,7 @@ export function LoadableFieldRenderer<
       React.FC<TProps>,
       Omit<ExtractParameters<TReadFromStore>, keyof TProvidedArgs>
     >;
-    fetchOptions?: FetchOptions<React.FC<TProps>>;
+    fetchOptions?: FetchOptions<React.FC<TProps>, never>;
     networkRequestOptions?: Partial<NetworkRequestReaderOptions>;
     additionalProps: Omit<TProps, keyof JSX.IntrinsicAttributes>;
   } & MaybeRequiredArgs<TReadFromStore, TProvidedArgs>,