@isograph/react 0.0.0-main-6bd3135f → 0.0.0-main-eca51643

package/dist/core/reader.d.ts

@@ -6,7 +6,7 @@ import { Arguments } from './util';
 export type TopLevelReaderArtifact<TReadFromStore extends {
     parameters: object;
     data: object;
-}, TClientFieldValue, TComponentProps extends Record<string, never>> = EagerReaderArtifact<TReadFromStore, TClientFieldValue> | ComponentReaderArtifact<TReadFromStore, TComponentProps>;
+}, TClientFieldValue, TComponentProps extends Record<PropertyKey, never>> = EagerReaderArtifact<TReadFromStore, TClientFieldValue> | ComponentReaderArtifact<TReadFromStore, TComponentProps>;
 export type EagerReaderArtifact<TReadFromStore extends {
     parameters: object;
     data: object;
@@ -18,7 +18,7 @@ export type EagerReaderArtifact<TReadFromStore extends {
 export type ComponentReaderArtifact<TReadFromStore extends {
     parameters: object;
     data: object;
-}, TComponentProps extends Record<string, unknown> = Record<string, never>> = {
+}, TComponentProps extends Record<string, unknown> = Record<PropertyKey, never>> = {
     readonly kind: 'ComponentReaderArtifact';
     readonly componentName: ComponentOrFieldName;
     readonly readerAst: ReaderAst<TReadFromStore>;
@@ -77,5 +77,5 @@ type StableId = string;
 export type LoadableField<TReadFromStore extends {
     data: object;
     parameters: object;
-}, TResult, TProvidedArgs extends object = object> = (args: Omit<ExtractParameters<TReadFromStore>, keyof TProvidedArgs> | void) => [StableId, Factory<FragmentReference<TReadFromStore, TResult>>];
+}, TResult, TArgs = ExtractParameters<TReadFromStore>> = (args: TArgs | void) => [StableId, Factory<FragmentReference<TReadFromStore, TResult>>];
 export {};

package/dist/core/util.d.ts

@@ -1,4 +1,5 @@
 export type ExtractSecondParam<T extends (arg1: any, arg2: any) => any> = T extends (arg1: any, arg2: infer P) => any ? P : never;
+export type CombineWithIntrinsicAttributes<T> = T extends Record<PropertyKey, never> ? JSX.IntrinsicAttributes : T & JSX.IntrinsicAttributes;
 export type Arguments = Argument[];
 export type Argument = [ArgumentName, ArgumentValue];
 export type ArgumentName = string;

package/dist/index.d.ts

@@ -6,7 +6,7 @@ export { ROOT_ID, type DataId, type DataTypeValue, type IsographEnvironment, typ
 export { type EagerReaderArtifact, type ComponentReaderArtifact, type RefetchReaderArtifact, type ReaderAst, type ReaderAstNode, type ReaderLinkedField, type ReaderNonLoadableResolverField, type ReaderScalarField, type TopLevelReaderArtifact, type LoadableField, type ResolverFirstParameter, } from './core/reader';
 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 ExtractSecondParam, type CombineWithIntrinsicAttributes, type Argument, type ArgumentName, type ArgumentValue, type Arguments, } from './core/util';
 export { type FragmentReference, type Variables, type ExtractParameters, type ExtractData, stableIdForFragmentReference, } from './core/FragmentReference';
 export { type LogMessage, type LogFunction, logMessage, registerLogger, } from './core/logging';
 export { IsographEnvironmentProvider, useIsographEnvironment, type IsographEnvironmentProviderProps, } from './react/IsographEnvironmentProvider';

package/dist/loadable-hooks/useClientSideDefer.d.ts

@@ -3,12 +3,12 @@ import { LoadableField } from '../core/reader';
 export declare function useClientSideDefer<TReadFromStore extends {
     data: object;
     parameters: object;
-}, TResult>(loadableField: LoadableField<TReadFromStore, TResult>): {
+}, TResult>(loadableField: LoadableField<TReadFromStore, TResult, ExtractParameters<TReadFromStore>>): {
     fragmentReference: FragmentReference<TReadFromStore, TResult>;
 };
 export declare function useClientSideDefer<TReadFromStore extends {
     data: object;
     parameters: object;
-}, TResult, TProvidedArgs extends object>(loadableField: LoadableField<TReadFromStore, TResult, TProvidedArgs>, args: Omit<ExtractParameters<TReadFromStore>, keyof TProvidedArgs>): {
+}, TResult, TProvidedArgs extends object>(loadableField: LoadableField<TReadFromStore, TResult, Omit<ExtractParameters<TReadFromStore>, keyof TProvidedArgs>>, args: Omit<ExtractParameters<TReadFromStore>, keyof TProvidedArgs>): {
     fragmentReference: FragmentReference<TReadFromStore, TResult>;
 };

package/dist/loadable-hooks/useConnectionSpecPagination.d.ts

@@ -1,7 +1,5 @@
 import { FragmentReference } from '../core/FragmentReference';
 import { LoadableField } from '../core/reader';
-type FirstOrAfter = 'first' | 'after';
-type OmitFirstAfter<TArgs> = keyof Omit<TArgs, FirstOrAfter> extends never ? void | Record<string, never> : Omit<TArgs, FirstOrAfter>;
 type UsePaginationReturnValue<TReadFromStore extends {
     parameters: object;
     data: object;
@@ -11,7 +9,7 @@ type UsePaginationReturnValue<TReadFromStore extends {
     results: ReadonlyArray<TItem>;
 } | {
     kind: 'Complete';
-    fetchMore: (args: OmitFirstAfter<TReadFromStore['parameters']>, first: number) => void;
+    fetchMore: (count: number) => void;
     results: ReadonlyArray<TItem>;
     hasNextPage: boolean;
 };
@@ -23,11 +21,12 @@ type Connection<T> = {
     readonly edges: ReadonlyArray<T> | null;
     readonly pageInfo: PageInfo;
 };
+type UseConnectionSpecPaginationArgs = {
+    first: number;
+    after: string | null;
+};
 export declare function useConnectionSpecPagination<TReadFromStore extends {
-    parameters: {
-        readonly first?: number | void | null;
-        readonly after?: string | void | null;
-    };
+    parameters: object;
     data: object;
-}, TItem>(loadableField: LoadableField<TReadFromStore, Connection<TItem>>): UsePaginationReturnValue<TReadFromStore, TItem>;
+}, TItem>(loadableField: LoadableField<TReadFromStore, Connection<TItem>, UseConnectionSpecPaginationArgs>, pageInfo?: PageInfo): UsePaginationReturnValue<TReadFromStore, TItem>;
 export {};

package/dist/loadable-hooks/useConnectionSpecPagination.js

@@ -19,7 +19,8 @@ function flatten(arr) {
     }
     return outArray;
 }
-function useConnectionSpecPagination(loadableField) {
+function useConnectionSpecPagination(loadableField, pageInfo) {
+    var _a, _b;
     const networkRequestOptions = {
         suspendIfInFlight: true,
         throwOnNetworkError: true,
@@ -64,9 +65,11 @@ function useConnectionSpecPagination(loadableField) {
             };
         });
     }
-    const getFetchMore = (after) => (args, first) => {
-        // @ts-expect-error
-        const loadedField = loadableField(Object.assign(Object.assign({}, args), { after: after, first: first }))[1]();
+    const getFetchMore = (after) => (count) => {
+        const loadedField = loadableField({
+            after: after,
+            first: count,
+        })[1]();
         const newPointer = (0, reference_counted_pointer_1.createReferenceCountedPointer)(loadedField);
         const clonedPointers = loadedReferences.map(([refCountedPointer]) => {
             const clonedRefCountedPointer = refCountedPointer.cloneIfNotDisposed();
@@ -113,9 +116,9 @@ function useConnectionSpecPagination(loadableField) {
     if (!networkRequestStatus) {
         return {
             kind: 'Complete',
-            fetchMore: getFetchMore(null),
+            fetchMore: getFetchMore((_a = pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.endCursor) !== null && _a !== void 0 ? _a : null),
             results: [],
-            hasNextPage: true,
+            hasNextPage: (_b = pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.hasNextPage) !== null && _b !== void 0 ? _b : true,
         };
     }
     switch (networkRequestStatus.kind) {

package/dist/loadable-hooks/useImperativeLoadableField.d.ts

@@ -11,5 +11,5 @@ type UseImperativeLoadableFieldReturn<TReadFromStore extends {
 export declare function useImperativeLoadableField<TReadFromStore extends {
     data: object;
     parameters: object;
-}, TResult, TProvidedArgs extends object>(loadableField: LoadableField<TReadFromStore, TResult, TProvidedArgs>): UseImperativeLoadableFieldReturn<TReadFromStore, TResult, TProvidedArgs>;
+}, TResult, TProvidedArgs extends object>(loadableField: LoadableField<TReadFromStore, TResult, Omit<ExtractParameters<TReadFromStore>, keyof TProvidedArgs>>): UseImperativeLoadableFieldReturn<TReadFromStore, TResult, TProvidedArgs>;
 export {};

package/dist/loadable-hooks/useSkipLimitPagination.d.ts

@@ -1,24 +1,25 @@
 import { LoadableField } from '../core/reader';
 import { FragmentReference } from '../core/FragmentReference';
-type SkipOrLimit = 'skip' | 'limit';
-type OmitSkipLimit<TArgs> = keyof Omit<TArgs, SkipOrLimit> extends never ? void | Record<string, never> : Omit<TArgs, SkipOrLimit>;
 type UseSkipLimitReturnValue<TReadFromStore extends {
     data: object;
     parameters: object;
-}, TArgs, TItem> = {
+}, TItem> = {
     readonly kind: 'Complete';
-    readonly fetchMore: (args: OmitSkipLimit<TArgs>, count: number) => void;
+    readonly fetchMore: (count: number) => void;
     readonly results: ReadonlyArray<TItem>;
 } | {
     readonly kind: 'Pending';
     readonly results: ReadonlyArray<TItem>;
     readonly pendingFragment: FragmentReference<TReadFromStore, ReadonlyArray<TItem>>;
 };
-export declare function useSkipLimitPagination<TArgs extends {
-    skip: number | void | null;
-    limit: number | void | null;
-}, TItem, TReadFromStore extends {
-    parameters: TArgs;
+type UseSkipLimitPaginationArgs = {
+    skip: number;
+    limit: number;
+};
+export declare function useSkipLimitPagination<TItem, TReadFromStore extends {
+    parameters: object;
     data: object;
-}>(loadableField: LoadableField<TReadFromStore, ReadonlyArray<TItem>>): UseSkipLimitReturnValue<TReadFromStore, TArgs, TItem>;
+}>(loadableField: LoadableField<TReadFromStore, ReadonlyArray<TItem>, UseSkipLimitPaginationArgs>, initialArgs?: {
+    skip?: number | void | null;
+}): UseSkipLimitReturnValue<TReadFromStore, TItem>;
 export {};

package/dist/loadable-hooks/useSkipLimitPagination.js

@@ -19,7 +19,8 @@ function flatten(arr) {
     }
     return outArray;
 }
-function useSkipLimitPagination(loadableField) {
+function useSkipLimitPagination(loadableField, initialArgs) {
+    var _a;
     const networkRequestOptions = {
         suspendIfInFlight: true,
         throwOnNetworkError: true,
@@ -57,9 +58,11 @@ function useSkipLimitPagination(loadableField) {
             };
         });
     }
-    const getFetchMore = (loadedSoFar) => (args, count) => {
-        // @ts-expect-error
-        const loadedField = loadableField(Object.assign(Object.assign({}, args), { skip: loadedSoFar, limit: count }))[1]();
+    const getFetchMore = (loadedSoFar) => (count) => {
+        const loadedField = loadableField({
+            skip: loadedSoFar,
+            limit: count,
+        })[1]();
         const newPointer = (0, reference_counted_pointer_1.createReferenceCountedPointer)(loadedField);
         const clonedPointers = loadedReferences.map(([refCountedPointer]) => {
             const clonedRefCountedPointer = refCountedPointer.cloneIfNotDisposed();
@@ -106,7 +109,7 @@ function useSkipLimitPagination(loadableField) {
     if (!networkRequestStatus) {
         return {
             kind: 'Complete',
-            fetchMore: getFetchMore(0),
+            fetchMore: getFetchMore((_a = initialArgs === null || initialArgs === void 0 ? void 0 : initialArgs.skip) !== null && _a !== void 0 ? _a : 0),
             results: [],
         };
     }
@@ -135,3 +138,15 @@ function useSkipLimitPagination(loadableField) {
         }
     }
 }
+// @ts-ignore
+function tsTests() {
+    let basicLoadable;
+    useSkipLimitPagination(basicLoadable);
+    useSkipLimitPagination(basicLoadable, {});
+    useSkipLimitPagination(basicLoadable, { skip: 10 });
+    let unprovidedSearchLoadable;
+    // @ts-expect-error
+    useSkipLimitPagination(unprovidedSearchLoadable);
+    let providedSearchLoadable;
+    useSkipLimitPagination(providedSearchLoadable);
+}

package/dist/react/FragmentReader.d.ts

@@ -2,7 +2,7 @@ import * as React from 'react';
 import { ExtractReadFromStore, IsographEntrypoint } from '../core/entrypoint';
 import { FragmentReference } from '../core/FragmentReference';
 import { NetworkRequestReaderOptions } from '../core/read';
-export declare function FragmentReader<TProps extends Record<any, any>, TEntrypoint extends IsographEntrypoint<any, React.FC<TProps>>>(props: TProps extends Record<string, never> ? {
+export declare function FragmentReader<TProps extends Record<any, any>, TEntrypoint extends IsographEntrypoint<any, React.FC<TProps>>>(props: TProps extends Record<PropertyKey, never> ? {
     fragmentReference: FragmentReference<ExtractReadFromStore<TEntrypoint>, React.FC<{}>>;
     additionalProps?: TProps;
     networkRequestOptions?: Partial<NetworkRequestReaderOptions>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@isograph/react",
-  "version": "0.0.0-main-6bd3135f",
+  "version": "0.0.0-main-eca51643",
   "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-6bd3135f",
-    "@isograph/react-disposable-state": "0.0.0-main-6bd3135f",
-    "@isograph/reference-counted-pointer": "0.0.0-main-6bd3135f"
+    "@isograph/disposable-types": "0.0.0-main-eca51643",
+    "@isograph/react-disposable-state": "0.0.0-main-eca51643",
+    "@isograph/reference-counted-pointer": "0.0.0-main-eca51643"
   },
   "peerDependencies": {
     "react": "18.3.1"

package/src/core/reader.ts

@@ -20,7 +20,7 @@ import { Arguments } from './util';
 export type TopLevelReaderArtifact<
   TReadFromStore extends { parameters: object; data: object },
   TClientFieldValue,
-  TComponentProps extends Record<string, never>,
+  TComponentProps extends Record<PropertyKey, never>,
 > =
   | EagerReaderArtifact<TReadFromStore, TClientFieldValue>
   | ComponentReaderArtifact<TReadFromStore, TComponentProps>;
@@ -38,7 +38,7 @@ export type EagerReaderArtifact<
 
 export type ComponentReaderArtifact<
   TReadFromStore extends { parameters: object; data: object },
-  TComponentProps extends Record<string, unknown> = Record<string, never>,
+  TComponentProps extends Record<string, unknown> = Record<PropertyKey, never>,
 > = {
   readonly kind: 'ComponentReaderArtifact';
   readonly componentName: ComponentOrFieldName;
@@ -144,7 +144,7 @@ type StableId = string;
 export type LoadableField<
   TReadFromStore extends { data: object; parameters: object },
   TResult,
-  TProvidedArgs extends object = object,
+  TArgs = ExtractParameters<TReadFromStore>,
 > = (
-  args: Omit<ExtractParameters<TReadFromStore>, keyof TProvidedArgs> | void,
+  args: TArgs | void,
 ) => [StableId, Factory<FragmentReference<TReadFromStore, TResult>>];

package/src/core/util.ts

@@ -1,5 +1,9 @@
 export type ExtractSecondParam<T extends (arg1: any, arg2: any) => any> =
   T extends (arg1: any, arg2: infer P) => any ? P : never;
+export type CombineWithIntrinsicAttributes<T> =
+  T extends Record<PropertyKey, never>
+    ? JSX.IntrinsicAttributes
+    : T & JSX.IntrinsicAttributes;
 
 export type Arguments = Argument[];
 export type Argument = [ArgumentName, ArgumentValue];

package/src/index.ts

@@ -55,6 +55,7 @@ export {
 export { readButDoNotEvaluate } from './core/read';
 export {
   type ExtractSecondParam,
+  type CombineWithIntrinsicAttributes,
   type Argument,
   type ArgumentName,
   type ArgumentValue,

package/src/loadable-hooks/useClientSideDefer.ts

@@ -11,7 +11,11 @@ export function useClientSideDefer<
   TReadFromStore extends { data: object; parameters: object },
   TResult,
 >(
-  loadableField: LoadableField<TReadFromStore, TResult>,
+  loadableField: LoadableField<
+    TReadFromStore,
+    TResult,
+    ExtractParameters<TReadFromStore>
+  >,
 ): { fragmentReference: FragmentReference<TReadFromStore, TResult> };
 
 export function useClientSideDefer<
@@ -19,7 +23,11 @@ export function useClientSideDefer<
   TResult,
   TProvidedArgs extends object,
 >(
-  loadableField: LoadableField<TReadFromStore, TResult, TProvidedArgs>,
+  loadableField: LoadableField<
+    TReadFromStore,
+    TResult,
+    Omit<ExtractParameters<TReadFromStore>, keyof TProvidedArgs>
+  >,
   args: Omit<ExtractParameters<TReadFromStore>, keyof TProvidedArgs>,
 ): { fragmentReference: FragmentReference<TReadFromStore, TResult> };
 
@@ -28,7 +36,11 @@ export function useClientSideDefer<
   TResult,
   TProvidedArgs extends object,
 >(
-  loadableField: LoadableField<TReadFromStore, TResult, TProvidedArgs>,
+  loadableField: LoadableField<
+    TReadFromStore,
+    TResult,
+    Omit<ExtractParameters<TReadFromStore>, keyof TProvidedArgs>
+  >,
   args?: Omit<ExtractParameters<TReadFromStore>, keyof TProvidedArgs>,
 ): { fragmentReference: FragmentReference<TReadFromStore, TResult> } {
   const [id, loader] = loadableField(args);

package/src/loadable-hooks/useConnectionSpecPagination.ts

@@ -20,11 +20,6 @@ import { useIsographEnvironment } from '../react/IsographEnvironmentProvider';
 import { useSubscribeToMultiple } from '../react/useReadAndSubscribe';
 import { maybeUnwrapNetworkRequest } from '../react/useResult';
 
-type FirstOrAfter = 'first' | 'after';
-type OmitFirstAfter<TArgs> = keyof Omit<TArgs, FirstOrAfter> extends never
-  ? void | Record<string, never>
-  : Omit<TArgs, FirstOrAfter>;
-
 type UsePaginationReturnValue<
   TReadFromStore extends { parameters: object; data: object },
   TItem,
@@ -36,10 +31,7 @@ type UsePaginationReturnValue<
     }
   | {
       kind: 'Complete';
-      fetchMore: (
-        args: OmitFirstAfter<TReadFromStore['parameters']>,
-        first: number,
-      ) => void;
+      fetchMore: (count: number) => void;
       results: ReadonlyArray<TItem>;
       hasNextPage: boolean;
     };
@@ -81,17 +73,24 @@ type NonNullConnection<T> = {
   readonly pageInfo: PageInfo;
 };
 
+type UseConnectionSpecPaginationArgs = {
+  first: number;
+  after: string | null;
+};
+
 export function useConnectionSpecPagination<
   TReadFromStore extends {
-    parameters: {
-      readonly first?: number | void | null;
-      readonly after?: string | void | null;
-    };
+    parameters: object;
     data: object;
   },
   TItem,
 >(
-  loadableField: LoadableField<TReadFromStore, Connection<TItem>>,
+  loadableField: LoadableField<
+    TReadFromStore,
+    Connection<TItem>,
+    UseConnectionSpecPaginationArgs
+  >,
+  pageInfo?: PageInfo,
 ): UsePaginationReturnValue<TReadFromStore, TItem> {
   const networkRequestOptions = {
     suspendIfInFlight: true,
@@ -178,16 +177,11 @@ export function useConnectionSpecPagination<
   }
 
   const getFetchMore =
-    (after: string | null | undefined) =>
-    (
-      args: OmitFirstAfter<TReadFromStore['parameters']>,
-      first: number,
-    ): void => {
-      // @ts-expect-error
+    (after: string | null) =>
+    (count: number): void => {
       const loadedField = loadableField({
-        ...args,
         after: after,
-        first: first,
+        first: count,
       })[1]();
       const newPointer = createReferenceCountedPointer(loadedField);
       const clonedPointers = loadedReferences.map(([refCountedPointer]) => {
@@ -278,9 +272,9 @@ export function useConnectionSpecPagination<
   if (!networkRequestStatus) {
     return {
       kind: 'Complete',
-      fetchMore: getFetchMore(null),
+      fetchMore: getFetchMore(pageInfo?.endCursor ?? null),
       results: [],
-      hasNextPage: true,
+      hasNextPage: pageInfo?.hasNextPage ?? true,
     };
   }
 

package/src/loadable-hooks/useImperativeLoadableField.ts

@@ -26,7 +26,11 @@ export function useImperativeLoadableField<
   TResult,
   TProvidedArgs extends object,
 >(
-  loadableField: LoadableField<TReadFromStore, TResult, TProvidedArgs>,
+  loadableField: LoadableField<
+    TReadFromStore,
+    TResult,
+    Omit<ExtractParameters<TReadFromStore>, keyof TProvidedArgs>
+  >,
 ): UseImperativeLoadableFieldReturn<TReadFromStore, TResult, TProvidedArgs> {
   const { state, setState } =
     useUpdatableDisposableState<FragmentReference<TReadFromStore, TResult>>();

package/src/loadable-hooks/useSkipLimitPagination.ts

@@ -18,19 +18,13 @@ import { getPromiseState, readPromise } from '../core/PromiseWrapper';
 import { type WithEncounteredRecords } from '../core/read';
 import { useSubscribeToMultiple } from '../react/useReadAndSubscribe';
 
-type SkipOrLimit = 'skip' | 'limit';
-type OmitSkipLimit<TArgs> = keyof Omit<TArgs, SkipOrLimit> extends never
-  ? void | Record<string, never>
-  : Omit<TArgs, SkipOrLimit>;
-
 type UseSkipLimitReturnValue<
   TReadFromStore extends { data: object; parameters: object },
-  TArgs,
   TItem,
 > =
   | {
       readonly kind: 'Complete';
-      readonly fetchMore: (args: OmitSkipLimit<TArgs>, count: number) => void;
+      readonly fetchMore: (count: number) => void;
       readonly results: ReadonlyArray<TItem>;
     }
   | {
@@ -69,16 +63,27 @@ function flatten<T>(arr: ReadonlyArray<ReadonlyArray<T>>): ReadonlyArray<T> {
   return outArray;
 }
 
+type UseSkipLimitPaginationArgs = {
+  skip: number;
+  limit: number;
+};
+
 export function useSkipLimitPagination<
-  TArgs extends {
-    skip: number | void | null;
-    limit: number | void | null;
-  },
   TItem,
-  TReadFromStore extends { parameters: TArgs; data: object },
+  TReadFromStore extends {
+    parameters: object;
+    data: object;
+  },
 >(
-  loadableField: LoadableField<TReadFromStore, ReadonlyArray<TItem>>,
-): UseSkipLimitReturnValue<TReadFromStore, TArgs, TItem> {
+  loadableField: LoadableField<
+    TReadFromStore,
+    ReadonlyArray<TItem>,
+    UseSkipLimitPaginationArgs
+  >,
+  initialArgs?: {
+    skip?: number | void | null;
+  },
+): UseSkipLimitReturnValue<TReadFromStore, TItem> {
   const networkRequestOptions = {
     suspendIfInFlight: true,
     throwOnNetworkError: true,
@@ -158,10 +163,8 @@ export function useSkipLimitPagination<
 
   const getFetchMore =
     (loadedSoFar: number) =>
-    (args: OmitSkipLimit<TArgs>, count: number): void => {
-      // @ts-expect-error
+    (count: number): void => {
       const loadedField = loadableField({
-        ...args,
         skip: loadedSoFar,
         limit: count,
       })[1]();
@@ -252,7 +255,7 @@ export function useSkipLimitPagination<
   if (!networkRequestStatus) {
     return {
       kind: 'Complete',
-      fetchMore: getFetchMore(0),
+      fetchMore: getFetchMore(initialArgs?.skip ?? 0),
       results: [],
     };
   }
@@ -285,3 +288,45 @@ export function useSkipLimitPagination<
     }
   }
 }
+
+// @ts-ignore
+function tsTests() {
+  type Parameters = {
+    readonly search: string;
+    readonly skip: number;
+    readonly limit: number;
+  };
+
+  let basicLoadable!: LoadableField<
+    {
+      readonly data: object;
+      readonly parameters: Omit<Parameters, 'search'>;
+    },
+    object[]
+  >;
+
+  useSkipLimitPagination(basicLoadable);
+  useSkipLimitPagination(basicLoadable, {});
+  useSkipLimitPagination(basicLoadable, { skip: 10 });
+
+  let unprovidedSearchLoadable!: LoadableField<
+    {
+      readonly data: object;
+      readonly parameters: Parameters;
+    },
+    object[]
+  >;
+  // @ts-expect-error
+  useSkipLimitPagination(unprovidedSearchLoadable);
+
+  let providedSearchLoadable!: LoadableField<
+    {
+      readonly data: object;
+      readonly parameters: Parameters;
+    },
+    object[],
+    Omit<Parameters, 'search'>
+  >;
+
+  useSkipLimitPagination(providedSearchLoadable);
+}

package/src/react/FragmentReader.tsx

@@ -8,7 +8,7 @@ export function FragmentReader<
   TProps extends Record<any, any>,
   TEntrypoint extends IsographEntrypoint<any, React.FC<TProps>>,
 >(
-  props: TProps extends Record<string, never>
+  props: TProps extends Record<PropertyKey, never>
     ? {
         fragmentReference: FragmentReference<
           ExtractReadFromStore<TEntrypoint>,

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

@@ -5,5 +5,5 @@ export type Query__meName__param = {
       readonly name: string,
     },
   },
-  readonly parameters: Record<string, never>,
+  readonly parameters: Record<PropertyKey, never>,
 };

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

@@ -10,5 +10,5 @@ export type Query__meNameSuccessor__param = {
       } | null),
     },
   },
-  readonly parameters: Record<string, never>,
+  readonly parameters: Record<PropertyKey, never>,
 };

package/src/tests/__isograph/iso.ts

@@ -23,7 +23,7 @@ type IdentityWithParam<TParam extends object> = <TClientFieldReturn>(
 // whenever the @component field is rendered.
 type IdentityWithParamComponent<TParam extends object> = <
   TClientFieldReturn,
-  TComponentProps = Record<string, never>,
+  TComponentProps = Record<PropertyKey, never>,
 >(
   clientComponentField: (data: TParam, componentProps: TComponentProps) => TClientFieldReturn
 ) => (data: TParam, componentProps: TComponentProps) => TClientFieldReturn;