@isograph/react 0.0.0-main-2f4311e8 → 0.0.0-main-3179ac5f

package/dist/core/FragmentReference.d.ts

@@ -5,6 +5,12 @@ export type VariableValue = string | number | boolean | null | object;
 export type Variables = {
     readonly [index: string]: VariableValue;
 };
+export type ExtractData<T> = T extends {
+    data: infer D extends object;
+} ? D : never;
+export type ExtractParameters<T> = T extends {
+    parameters: infer P extends Variables;
+} ? P : Variables;
 export type FragmentReference<TReadFromStore extends {
     parameters: object;
     data: object;
@@ -12,7 +18,7 @@ export type FragmentReference<TReadFromStore extends {
     readonly kind: 'FragmentReference';
     readonly readerWithRefetchQueries: PromiseWrapper<ReaderWithRefetchQueries<TReadFromStore, TClientFieldValue>>;
     readonly root: DataId;
-    readonly variables: Variables;
+    readonly variables: ExtractParameters<TReadFromStore>;
     readonly networkRequest: PromiseWrapper<void, any>;
 };
 export declare function stableIdForFragmentReference(fragmentReference: FragmentReference<any, any>): string;

package/dist/core/cache.d.ts

@@ -3,7 +3,7 @@ import { DataId, type IsographEnvironment } from './IsographEnvironment';
 import { IsographEntrypoint, NormalizationAst, NormalizationLinkedField, NormalizationScalarField, RefetchQueryNormalizationArtifactWrapper } from '../core/entrypoint';
 import { ReaderLinkedField, ReaderScalarField, type ReaderAst } from './reader';
 import { WithEncounteredRecords } from './read';
-import { FragmentReference, Variables } from './FragmentReference';
+import { FragmentReference, Variables, ExtractParameters } from './FragmentReference';
 export declare function getOrCreateItemInSuspenseCache<TReadFromStore extends {
     parameters: object;
     data: object;
@@ -17,7 +17,7 @@ export declare function stableCopy<T>(value: T): T;
 export declare function getOrCreateCacheForArtifact<TReadFromStore extends {
     parameters: object;
     data: object;
-}, TClientFieldValue>(environment: IsographEnvironment, entrypoint: IsographEntrypoint<TReadFromStore, TClientFieldValue>, variables: Variables): ParentCache<FragmentReference<TReadFromStore, TClientFieldValue>>;
+}, TClientFieldValue>(environment: IsographEnvironment, entrypoint: IsographEntrypoint<TReadFromStore, TClientFieldValue>, variables: ExtractParameters<TReadFromStore>): ParentCache<FragmentReference<TReadFromStore, TClientFieldValue>>;
 type NetworkResponseScalarValue = string | number | boolean;
 type NetworkResponseValue = NetworkResponseScalarValue | null | NetworkResponseObject | NetworkResponseObject[] | NetworkResponseScalarValue[];
 type NetworkResponseObject = {

package/dist/core/cache.js

@@ -105,9 +105,7 @@ function subscribe(environment, encounteredDataAndRecords, fragmentReference, ca
         fragmentReference,
         readerAst,
     };
-    // @ts-expect-error
     environment.subscriptions.add(fragmentSubscription);
-    // @ts-expect-error
     return () => environment.subscriptions.delete(fragmentSubscription);
 }
 exports.subscribe = subscribe;

package/dist/core/read.d.ts

@@ -1,8 +1,8 @@
-import { FragmentReference } from './FragmentReference';
+import { FragmentReference, ExtractData } from './FragmentReference';
 import { DataId, IsographEnvironment } from './IsographEnvironment';
 export type WithEncounteredRecords<T> = {
     readonly encounteredRecords: Set<DataId>;
-    readonly item: T;
+    readonly item: ExtractData<T>;
 };
 export declare function readButDoNotEvaluate<TReadFromStore extends {
     parameters: object;

package/dist/core/reader.d.ts

@@ -1,33 +1,36 @@
 /// <reference types="react" />
 import { Factory } from '@isograph/disposable-types';
-import { FragmentReference, Variables } from './FragmentReference';
+import { FragmentReference, ExtractParameters, ExtractData } from './FragmentReference';
 import { ComponentOrFieldName, DataId, IsographEnvironment } from './IsographEnvironment';
 import { IsographEntrypoint, IsographEntrypointLoader, RefetchQueryNormalizationArtifact, RefetchQueryNormalizationArtifactWrapper } from './entrypoint';
 import { Arguments } from './util';
 export type TopLevelReaderArtifact<TReadFromStore extends {
     parameters: object;
     data: object;
-}, TClientFieldValue, TComponentProps extends Record<string, never>, TVariables = Variables> = EagerReaderArtifact<TReadFromStore, TClientFieldValue, TVariables> | ComponentReaderArtifact<TReadFromStore, TComponentProps, TVariables>;
+}, TClientFieldValue, TComponentProps extends Record<string, never>> = EagerReaderArtifact<TReadFromStore, TClientFieldValue> | ComponentReaderArtifact<TReadFromStore, TComponentProps>;
 export type EagerReaderArtifact<TReadFromStore extends {
     parameters: object;
     data: object;
-}, TClientFieldValue, TVariables = Variables> = {
+}, TClientFieldValue> = {
     readonly kind: 'EagerReaderArtifact';
     readonly readerAst: ReaderAst<TReadFromStore>;
-    readonly resolver: (data: ResolverFirstParameter<TReadFromStore, TVariables>) => TClientFieldValue;
+    readonly resolver: (data: ResolverFirstParameter<TReadFromStore>) => TClientFieldValue;
 };
 export type ComponentReaderArtifact<TReadFromStore extends {
     parameters: object;
     data: object;
-}, TComponentProps extends Record<string, unknown> = Record<string, never>, TVariables = Variables> = {
+}, TComponentProps extends Record<string, unknown> = Record<string, never>> = {
     readonly kind: 'ComponentReaderArtifact';
     readonly componentName: ComponentOrFieldName;
     readonly readerAst: ReaderAst<TReadFromStore>;
-    readonly resolver: (data: ResolverFirstParameter<TReadFromStore, TVariables>, runtimeProps: TComponentProps) => React.ReactNode;
+    readonly resolver: (data: ResolverFirstParameter<TReadFromStore>, runtimeProps: TComponentProps) => React.ReactNode;
 };
-export type ResolverFirstParameter<TReadFromStore extends object, TVariables = Variables> = {
-    readonly data: TReadFromStore;
-    readonly parameters: TVariables;
+export type ResolverFirstParameter<TReadFromStore extends {
+    data: object;
+    parameters: object;
+}> = {
+    data: ExtractData<TReadFromStore>;
+    parameters: ExtractParameters<TReadFromStore>;
 };
 export type RefetchReaderArtifact = {
     readonly kind: 'RefetchReaderArtifact';

package/dist/index.d.ts

@@ -7,7 +7,7 @@ export { type EagerReaderArtifact, type ComponentReaderArtifact, type RefetchRea
 export { type NormalizationAst, type NormalizationAstNode, type NormalizationLinkedField, type NormalizationScalarField, type IsographEntrypoint, assertIsEntrypoint, type RefetchQueryNormalizationArtifact, type RefetchQueryNormalizationArtifactWrapper, type ExtractProps, type ExtractReadFromStore, type ExtractResolverResult, } from './core/entrypoint';
 export { readButDoNotEvaluate } from './core/read';
 export { type ExtractSecondParam, type Argument, type ArgumentName, type ArgumentValue, type Arguments, } from './core/util';
-export { type FragmentReference, type Variables, stableIdForFragmentReference, } from './core/FragmentReference';
+export { type FragmentReference, type Variables, type ExtractParameters, type ExtractData, stableIdForFragmentReference, } from './core/FragmentReference';
 export { IsographEnvironmentProvider, useIsographEnvironment, type IsographEnvironmentProviderProps, } from './react/IsographEnvironmentProvider';
 export { useImperativeReference } from './react/useImperativeReference';
 export { FragmentReader } from './react/FragmentReader';

package/dist/loadable-hooks/useSkipLimitPagination.js

@@ -69,6 +69,7 @@ function useSkipLimitPagination(loadableField) {
             }
             return clonedRefCountedPointer;
         });
+        // @ts-expect-error
         clonedPointers.push(newPointer);
         const totalItemCleanupPair = [
             clonedPointers,

package/dist/react/useImperativeReference.d.ts

@@ -1,10 +1,10 @@
 import { UnassignedState } from '@isograph/react-disposable-state';
 import { IsographEntrypoint } from '../core/entrypoint';
-import { FragmentReference, Variables } from '../core/FragmentReference';
+import { FragmentReference, ExtractParameters } from '../core/FragmentReference';
 export declare function useImperativeReference<TReadFromStore extends {
     parameters: object;
     data: object;
 }, TClientFieldValue>(entrypoint: IsographEntrypoint<TReadFromStore, TClientFieldValue>): {
     fragmentReference: FragmentReference<TReadFromStore, TClientFieldValue> | UnassignedState;
-    loadFragmentReference: (variables: Variables) => void;
+    loadFragmentReference: (variables: ExtractParameters<TReadFromStore>) => void;
 };

package/dist/react/useLazyReference.d.ts

@@ -1,8 +1,8 @@
-import { FragmentReference, Variables } from '../core/FragmentReference';
+import { FragmentReference, ExtractParameters } from '../core/FragmentReference';
 import { IsographEntrypoint } from '../core/entrypoint';
 export declare function useLazyReference<TReadFromStore extends {
     parameters: object;
     data: object;
-}, TClientFieldValue>(entrypoint: IsographEntrypoint<TReadFromStore, TClientFieldValue>, variables: Variables): {
+}, TClientFieldValue>(entrypoint: IsographEntrypoint<TReadFromStore, TClientFieldValue>, variables: ExtractParameters<TReadFromStore>): {
     fragmentReference: FragmentReference<TReadFromStore, TClientFieldValue>;
 };

package/dist/react/useReadAndSubscribe.d.ts

@@ -1,4 +1,4 @@
-import { FragmentReference } from '../core/FragmentReference';
+import { FragmentReference, ExtractData } from '../core/FragmentReference';
 import { NetworkRequestReaderOptions, WithEncounteredRecords } from '../core/read';
 import type { ReaderAst } from '../core/reader';
 /**
@@ -7,7 +7,7 @@ import type { ReaderAst } from '../core/reader';
 export declare function useReadAndSubscribe<TReadFromStore extends {
     parameters: object;
     data: object;
-}>(fragmentReference: FragmentReference<TReadFromStore, any>, networkRequestOptions: NetworkRequestReaderOptions, readerAst: ReaderAst<TReadFromStore>): TReadFromStore;
+}>(fragmentReference: FragmentReference<TReadFromStore, any>, networkRequestOptions: NetworkRequestReaderOptions, readerAst: ReaderAst<TReadFromStore>): ExtractData<TReadFromStore>;
 export declare function useSubscribeToMultiple<TReadFromStore extends {
     parameters: object;
     data: object;

package/dist/react/useResult.js

@@ -18,11 +18,11 @@ function useResult(fragmentReference, partialNetworkRequestOptions) {
         }
         case 'EagerReaderArtifact': {
             const data = (0, useReadAndSubscribe_1.useReadAndSubscribe)(fragmentReference, networkRequestOptions, readerWithRefetchQueries.readerArtifact.readerAst);
-            const firstParameter = {
+            const param = {
                 data: data,
                 parameters: fragmentReference.variables,
             };
-            return readerWithRefetchQueries.readerArtifact.resolver(firstParameter);
+            return readerWithRefetchQueries.readerArtifact.resolver(param);
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@isograph/react",
-  "version": "0.0.0-main-2f4311e8",
+  "version": "0.0.0-main-3179ac5f",
   "description": "Use Isograph with React",
   "homepage": "https://isograph.dev",
   "main": "dist/index.js",
@@ -17,9 +17,9 @@
     "tsc": "tsc"
   },
   "dependencies": {
-    "@isograph/disposable-types": "0.0.0-main-2f4311e8",
-    "@isograph/react-disposable-state": "0.0.0-main-2f4311e8",
-    "@isograph/reference-counted-pointer": "0.0.0-main-2f4311e8"
+    "@isograph/disposable-types": "0.0.0-main-3179ac5f",
+    "@isograph/react-disposable-state": "0.0.0-main-3179ac5f",
+    "@isograph/reference-counted-pointer": "0.0.0-main-3179ac5f"
   },
   "peerDependencies": {
     "react": "18.2.0"

package/src/core/FragmentReference.ts

@@ -7,6 +7,18 @@ export type VariableValue = string | number | boolean | null | object;
 
 export type Variables = { readonly [index: string]: VariableValue };
 
+export type ExtractData<T> = T extends {
+  data: infer D extends object;
+}
+  ? D
+  : never;
+
+export type ExtractParameters<T> = T extends {
+  parameters: infer P extends Variables;
+}
+  ? P
+  : Variables;
+
 export type FragmentReference<
   TReadFromStore extends { parameters: object; data: object },
   TClientFieldValue,
@@ -16,7 +28,7 @@ export type FragmentReference<
     ReaderWithRefetchQueries<TReadFromStore, TClientFieldValue>
   >;
   readonly root: DataId;
-  readonly variables: Variables;
+  readonly variables: ExtractParameters<TReadFromStore>;
   readonly networkRequest: PromiseWrapper<void, any>;
 };
 

package/src/core/cache.ts

@@ -24,7 +24,11 @@ import {
 import { ReaderLinkedField, ReaderScalarField, type ReaderAst } from './reader';
 import { Argument, ArgumentValue } from './util';
 import { WithEncounteredRecords, readButDoNotEvaluate } from './read';
-import { FragmentReference, Variables } from './FragmentReference';
+import {
+  FragmentReference,
+  Variables,
+  ExtractParameters,
+} from './FragmentReference';
 import { mergeObjectsUsingReaderAst } from './areEqualWithDeepComparison';
 import { makeNetworkRequest } from './makeNetworkRequest';
 import { wrapResolvedValue } from './PromiseWrapper';
@@ -82,7 +86,7 @@ export function getOrCreateCacheForArtifact<
 >(
   environment: IsographEnvironment,
   entrypoint: IsographEntrypoint<TReadFromStore, TClientFieldValue>,
-  variables: Variables,
+  variables: ExtractParameters<TReadFromStore>,
 ): ParentCache<FragmentReference<TReadFromStore, TClientFieldValue>> {
   const cacheKey = entrypoint.queryText + JSON.stringify(stableCopy(variables));
   const factory = () => {
@@ -198,9 +202,7 @@ export function subscribe<
     fragmentReference,
     readerAst,
   };
-  // @ts-expect-error
   environment.subscriptions.add(fragmentSubscription);
-  // @ts-expect-error
   return () => environment.subscriptions.delete(fragmentSubscription);
 }
 

package/src/core/read.ts

@@ -5,7 +5,12 @@ import {
   IsographEntrypoint,
   RefetchQueryNormalizationArtifactWrapper,
 } from './entrypoint';
-import { FragmentReference, Variables } from './FragmentReference';
+import {
+  FragmentReference,
+  Variables,
+  ExtractData,
+  ExtractParameters,
+} from './FragmentReference';
 import {
   assertLink,
   DataId,
@@ -26,7 +31,7 @@ import { Arguments } from './util';
 
 export type WithEncounteredRecords<T> = {
   readonly encounteredRecords: Set<DataId>;
-  readonly item: T;
+  readonly item: ExtractData<T>;
 };
 
 export function readButDoNotEvaluate<
@@ -88,7 +93,7 @@ export function readButDoNotEvaluate<
 type ReadDataResult<TReadFromStore> =
   | {
       readonly kind: 'Success';
-      readonly data: TReadFromStore;
+      readonly data: ExtractData<TReadFromStore>;
       readonly encounteredRecords: Set<DataId>;
     }
   | {
@@ -101,7 +106,7 @@ function readData<TReadFromStore>(
   environment: IsographEnvironment,
   ast: ReaderAst<TReadFromStore>,
   root: DataId,
-  variables: Variables,
+  variables: ExtractParameters<TReadFromStore>,
   nestedRefetchQueries: RefetchQueryNormalizationArtifactWrapper[],
   networkRequest: PromiseWrapper<void, any>,
   networkRequestOptions: NetworkRequestReaderOptions,

package/src/core/reader.ts

@@ -1,5 +1,9 @@
 import { Factory } from '@isograph/disposable-types';
-import { FragmentReference, Variables } from './FragmentReference';
+import {
+  FragmentReference,
+  ExtractParameters,
+  ExtractData,
+} from './FragmentReference';
 import {
   ComponentOrFieldName,
   DataId,
@@ -17,43 +21,39 @@ export type TopLevelReaderArtifact<
   TReadFromStore extends { parameters: object; data: object },
   TClientFieldValue,
   TComponentProps extends Record<string, never>,
-  TVariables = Variables,
 > =
-  | EagerReaderArtifact<TReadFromStore, TClientFieldValue, TVariables>
-  | ComponentReaderArtifact<TReadFromStore, TComponentProps, TVariables>;
+  | EagerReaderArtifact<TReadFromStore, TClientFieldValue>
+  | ComponentReaderArtifact<TReadFromStore, TComponentProps>;
 
 export type EagerReaderArtifact<
   TReadFromStore extends { parameters: object; data: object },
   TClientFieldValue,
-  TVariables = Variables,
 > = {
   readonly kind: 'EagerReaderArtifact';
   readonly readerAst: ReaderAst<TReadFromStore>;
   readonly resolver: (
-    data: ResolverFirstParameter<TReadFromStore, TVariables>,
+    data: ResolverFirstParameter<TReadFromStore>,
   ) => TClientFieldValue;
 };
 
 export type ComponentReaderArtifact<
   TReadFromStore extends { parameters: object; data: object },
   TComponentProps extends Record<string, unknown> = Record<string, never>,
-  TVariables = Variables,
 > = {
   readonly kind: 'ComponentReaderArtifact';
   readonly componentName: ComponentOrFieldName;
   readonly readerAst: ReaderAst<TReadFromStore>;
   readonly resolver: (
-    data: ResolverFirstParameter<TReadFromStore, TVariables>,
+    data: ResolverFirstParameter<TReadFromStore>,
     runtimeProps: TComponentProps,
   ) => React.ReactNode;
 };
 
 export type ResolverFirstParameter<
-  TReadFromStore extends object,
-  TVariables = Variables,
+  TReadFromStore extends { data: object; parameters: object },
 > = {
-  readonly data: TReadFromStore;
-  readonly parameters: TVariables;
+  data: ExtractData<TReadFromStore>;
+  parameters: ExtractParameters<TReadFromStore>;
 };
 
 export type RefetchReaderArtifact = {

package/src/index.ts

@@ -63,6 +63,8 @@ export {
 export {
   type FragmentReference,
   type Variables,
+  type ExtractParameters,
+  type ExtractData,
   stableIdForFragmentReference,
 } from './core/FragmentReference';
 

package/src/loadable-hooks/useSkipLimitPagination.ts

@@ -169,6 +169,7 @@ export function useSkipLimitPagination<
         }
         return clonedRefCountedPointer;
       });
+      // @ts-expect-error
       clonedPointers.push(newPointer);
 
       const totalItemCleanupPair: ItemCleanupPair<

package/src/react/useImperativeReference.ts

@@ -3,7 +3,10 @@ import {
   useUpdatableDisposableState,
 } from '@isograph/react-disposable-state';
 import { IsographEntrypoint } from '../core/entrypoint';
-import { FragmentReference, Variables } from '../core/FragmentReference';
+import {
+  FragmentReference,
+  ExtractParameters,
+} from '../core/FragmentReference';
 import { useIsographEnvironment } from './IsographEnvironmentProvider';
 import { ROOT_ID } from '../core/IsographEnvironment';
 import { makeNetworkRequest } from '../core/makeNetworkRequest';
@@ -20,7 +23,7 @@ export function useImperativeReference<
   fragmentReference:
     | FragmentReference<TReadFromStore, TClientFieldValue>
     | UnassignedState;
-  loadFragmentReference: (variables: Variables) => void;
+  loadFragmentReference: (variables: ExtractParameters<TReadFromStore>) => void;
 } {
   const { state, setState } =
     useUpdatableDisposableState<
@@ -29,7 +32,7 @@ export function useImperativeReference<
   const environment = useIsographEnvironment();
   return {
     fragmentReference: state,
-    loadFragmentReference: (variables: Variables) => {
+    loadFragmentReference: (variables: ExtractParameters<TReadFromStore>) => {
       const [networkRequest, disposeNetworkRequest] = makeNetworkRequest(
         environment,
         entrypoint,

package/src/react/useLazyReference.ts

@@ -1,4 +1,7 @@
-import { FragmentReference, Variables } from '../core/FragmentReference';
+import {
+  FragmentReference,
+  ExtractParameters,
+} from '../core/FragmentReference';
 import { useIsographEnvironment } from './IsographEnvironmentProvider';
 import { IsographEntrypoint } from '../core/entrypoint';
 import { getOrCreateCacheForArtifact } from '../core/cache';
@@ -9,7 +12,7 @@ export function useLazyReference<
   TClientFieldValue,
 >(
   entrypoint: IsographEntrypoint<TReadFromStore, TClientFieldValue>,
-  variables: Variables,
+  variables: ExtractParameters<TReadFromStore>,
 ): {
   fragmentReference: FragmentReference<TReadFromStore, TClientFieldValue>;
 } {

package/src/react/useReadAndSubscribe.ts

@@ -2,6 +2,7 @@ import { useEffect, useState } from 'react';
 import {
   FragmentReference,
   stableIdForFragmentReference,
+  ExtractData,
 } from '../core/FragmentReference';
 import {
   NetworkRequestReaderOptions,
@@ -22,7 +23,7 @@ export function useReadAndSubscribe<
   fragmentReference: FragmentReference<TReadFromStore, any>,
   networkRequestOptions: NetworkRequestReaderOptions,
   readerAst: ReaderAst<TReadFromStore>,
-): TReadFromStore {
+): ExtractData<TReadFromStore> {
   const environment = useIsographEnvironment();
   const [readOutDataAndRecords, setReadOutDataAndRecords] = useState(() =>
     readButDoNotEvaluate(environment, fragmentReference, networkRequestOptions),

package/src/react/useResult.ts

@@ -48,11 +48,11 @@ export function useResult<
         networkRequestOptions,
         readerWithRefetchQueries.readerArtifact.readerAst,
       );
-      const firstParameter = {
+      const param = {
         data: data,
         parameters: fragmentReference.variables,
       };
-      return readerWithRefetchQueries.readerArtifact.resolver(firstParameter);
+      return readerWithRefetchQueries.readerArtifact.resolver(param);
     }
   }
 }

package/src/tests/__isograph/Query/meName/param_type.ts

@@ -1,11 +1,9 @@
 
-import { type Variables } from '@isograph/react';
-
 export type Query__meName__param = {
   readonly data: {
     readonly me: {
       readonly name: string,
     },
   },
-  readonly parameters: Variables,
+  readonly parameters: Record<string, never>,
 };

package/src/tests/__isograph/Query/meNameSuccessor/param_type.ts

@@ -1,6 +1,4 @@
 
-import { type Variables } from '@isograph/react';
-
 export type Query__meNameSuccessor__param = {
   readonly data: {
     readonly me: {
@@ -12,5 +10,5 @@ export type Query__meNameSuccessor__param = {
       } | null),
     },
   },
-  readonly parameters: Variables,
+  readonly parameters: Record<string, never>,
 };

package/src/tests/__isograph/Query/nodeField/param_type.ts

@@ -1,5 +1,4 @@
-
-import { type Variables } from '@isograph/react';
+import type { Query__nodeField__parameters } from './parameters_type';
 
 export type Query__nodeField__param = {
   readonly data: {
@@ -7,5 +6,5 @@ export type Query__nodeField__param = {
       readonly id: string,
     } | null),
   },
-  readonly parameters: Variables,
+  readonly parameters: Query__nodeField__parameters,
 };

package/src/tests/__isograph/Query/nodeField/parameters_type.ts

@@ -0,0 +1,3 @@
+export type Query__nodeField__parameters = {
+  readonly id: string,
+};

package/src/tests/__isograph/iso.ts

@@ -1,4 +1,4 @@
-import type { IsographEntrypoint, ResolverFirstParameter, Variables } from '@isograph/react';
+import type { IsographEntrypoint } from '@isograph/react';
 import { type Query__meNameSuccessor__param } from './Query/meNameSuccessor/param_type';
 import { type Query__meName__param } from './Query/meName/param_type';
 import { type Query__nodeField__param } from './Query/nodeField/param_type';
@@ -10,9 +10,9 @@ import entrypoint_Query__nodeField from '../__isograph/Query/nodeField/entrypoin
 // This means that the type of the exported iso literal is exactly
 // the type of the passed-in function, which takes one parameter
 // of type TParam.
-type IdentityWithParam<TParam extends object> = <TClientFieldReturn, TVariables = Variables>(
+type IdentityWithParam<TParam extends object> = <TClientFieldReturn>(
   clientField: (param: TParam) => TClientFieldReturn
-) => (param: ResolverFirstParameter<TParam, TVariables>) => TClientFieldReturn;
+) => (param: TParam) => TClientFieldReturn;
 
 // This is the type given it to client fields with @component.
 // This means that the type of the exported iso literal is exactly
@@ -24,10 +24,9 @@ type IdentityWithParam<TParam extends object> = <TClientFieldReturn, TVariables
 type IdentityWithParamComponent<TParam extends object> = <
   TClientFieldReturn,
   TComponentProps = Record<string, never>,
-  TVariables = Variables
 >(
   clientComponentField: (data: TParam, componentProps: TComponentProps) => TClientFieldReturn
-) => (data: ResolverFirstParameter<TParam, TVariables>, componentProps: TComponentProps) => TClientFieldReturn;
+) => (data: TParam, componentProps: TComponentProps) => TClientFieldReturn;
 
 type WhitespaceCharacter = ' ' | '\t' | '\n';
 type Whitespace<In> = In extends `${WhitespaceCharacter}${infer In}`