test(pagination): add e2e test for nested sort keys PE-7428

ar-io · Jan 15, 2025 · b06369b · b06369b
1 parent 466e8f8
commit b06369b
Show file tree

Hide file tree

Showing 3 changed files with 741 additions and 710 deletions.
diff --git a/src/cli/utils.ts b/src/cli/utils.ts
@@ -302,7 +302,8 @@ export function paginationParamsFromOptions<O extends PaginationCLIOptions>(
   return {
     cursor,
     limit: numberLimit,
-    sortBy,
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    sortBy: sortBy as any,
     sortOrder,
   };
 }

diff --git a/src/types/io.ts b/src/types/io.ts
@@ -41,10 +41,16 @@ type NestedKeys<T> = T extends object
       }[keyof T & string]
   : never;
 
+type SortBy<T> = T extends string
+  ? string
+  : keyof T extends never
+    ? string
+    : NestedKeys<T>;
+
 export type PaginationParams<T = Record<string, never>> = {
   cursor?: string;
   limit?: number;
-  sortBy?: keyof T extends never ? string : NestedKeys<T>; // default to string if T is empty
+  sortBy?: SortBy<T>; // default to string if T is empty
   sortOrder?: 'asc' | 'desc';
 };
 
@@ -53,7 +59,7 @@ export type PaginationResult<T> = {
   nextCursor?: string;
   limit: number;
   totalItems: number;
-  sortBy?: T extends string ? string : keyof T;
+  sortBy?: SortBy<T>;
   sortOrder: 'asc' | 'desc';
   hasMore: boolean;
 };