@tulip-systems/drive 0.8.3 → 0.9.0

package/dist/providers/local/lib/schema.d.mts

@@ -49,7 +49,7 @@ declare const nodes: drizzle_orm_pg_core0.PgTableWithColumns<{
       tableName: "nodes";
       dataType: "string";
       columnType: "PgEnumColumn";
-      data: "file" | "folder";
+      data: "folder" | "file";
       driverParam: string;
       notNull: false;
       hasDefault: false;
@@ -604,7 +604,7 @@ declare const driveSchema: {
         tableName: "nodes";
         dataType: "string";
         columnType: "PgEnumColumn";
-        data: "file" | "folder";
+        data: "folder" | "file";
         driverParam: string;
         notNull: false;
         hasDefault: false;

package/dist/providers/local/lib/search-params.d.mts

@@ -4,7 +4,7 @@ import * as nuqs_server0 from "nuqs/server";
 declare const localDriveTreeFilterSearchParams: {
   readonly subtypes: nuqs_server0.SingleParserBuilder<("image" | "document" | "spreadsheet" | "video" | "audio" | "archive" | "other")[] | null>;
   readonly hidden: nuqs_server0.SingleParserBuilder<boolean | null>;
-  readonly types: nuqs_server0.SingleParserBuilder<("file" | "folder")[] | null>;
+  readonly types: nuqs_server0.SingleParserBuilder<("folder" | "file")[] | null>;
   readonly contentTypes: nuqs_server0.SingleParserBuilder<string[] | null>;
   readonly nodeIds: nuqs_server0.SingleParserBuilder<string[] | null>;
   readonly isArchived: nuqs_server0.SingleParserBuilder<boolean | null>;

package/dist/providers/local/lib/service.server.d.mts

@@ -104,16 +104,16 @@ declare class LocalDrive<TSchema extends TDatabaseSchema> implements DriveReader
     id: string | null;
     namespace: string;
   }): Promise<(Pick<{
+    type: "folder" | "file" | null;
+    subtype: "image" | "document" | "spreadsheet" | "video" | "audio" | "archive" | "other";
     id: string;
     createdAt: Date;
     updatedAt: Date;
     name: string;
-    type: "file" | "folder" | null;
-    readonly: boolean | null;
+    namespace: string;
     size: number | null;
     contentType: string | null;
-    namespace: string;
-    subtype: "image" | "document" | "spreadsheet" | "video" | "audio" | "archive" | "other";
+    readonly: boolean | null;
     hidden: boolean | null;
     archivedAt: Date | null;
     parentId: string | null;
@@ -172,7 +172,7 @@ declare class LocalDrive<TSchema extends TDatabaseSchema> implements DriveReader
     updatedAt: Date;
     name: string;
     namespace: string;
-    type: "file" | "folder";
+    type: "folder" | "file";
     subtype: "image" | "document" | "spreadsheet" | "video" | "audio" | "archive" | "other";
     size: number | null;
     contentType: string | null;
@@ -211,7 +211,7 @@ declare class LocalDrive<TSchema extends TDatabaseSchema> implements DriveReader
     updatedAt: Date;
     name: string;
     namespace: string;
-    type: "file" | "folder";
+    type: "folder" | "file";
     subtype: "image" | "document" | "spreadsheet" | "video" | "audio" | "archive" | "other";
     size: number | null;
     contentType: string | null;
@@ -309,7 +309,7 @@ declare class LocalDrive<TSchema extends TDatabaseSchema> implements DriveReader
     updatedAt: Date;
     name: string;
     namespace: string;
-    type: "file" | "folder";
+    type: "folder" | "file";
     subtype: "image" | "document" | "spreadsheet" | "video" | "audio" | "archive" | "other";
     size: number | null;
     contentType: string | null;
@@ -344,7 +344,7 @@ declare class LocalDrive<TSchema extends TDatabaseSchema> implements DriveReader
     updatedAt: Date;
     name: string;
     namespace: string;
-    type: "file" | "folder";
+    type: "folder" | "file";
     subtype: "image" | "document" | "spreadsheet" | "video" | "audio" | "archive" | "other";
     size: number | null;
     contentType: string | null;
@@ -378,7 +378,7 @@ declare class LocalDrive<TSchema extends TDatabaseSchema> implements DriveReader
     updatedAt: Date;
     name: string;
     namespace: string;
-    type: "file" | "folder";
+    type: "folder" | "file";
     subtype: "image" | "document" | "spreadsheet" | "video" | "audio" | "archive" | "other";
     size: number | null;
     contentType: string | null;
@@ -412,7 +412,7 @@ declare class LocalDrive<TSchema extends TDatabaseSchema> implements DriveReader
     updatedAt: Date;
     name: string;
     namespace: string;
-    type: "file" | "folder";
+    type: "folder" | "file";
     subtype: "image" | "document" | "spreadsheet" | "video" | "audio" | "archive" | "other";
     size: number | null;
     contentType: string | null;
@@ -443,7 +443,7 @@ declare class LocalDrive<TSchema extends TDatabaseSchema> implements DriveReader
     updatedAt: Date;
     name: string;
     namespace: string;
-    type: "file" | "folder";
+    type: "folder" | "file";
     subtype: "image" | "document" | "spreadsheet" | "video" | "audio" | "archive" | "other";
     size: number | null;
     contentType: string | null;

package/dist/providers/local/lib/service.server.mjs

@@ -2,12 +2,13 @@ import { deviceSizes } from "./constants.mjs";
 import { inferLocalDriveNodeSubtype, isLocalDriveFile, isLocalDriveFolder, toLocalDriveNode } from "./helpers.mjs";
 import { nodePresignedUrls, nodeVariants, nodes } from "./schema.mjs";
 import { getLocalFileURLSchemaDefaults } from "./validators.mjs";
+import { parseLocalDriveTableQuerySorting } from "../config/sorting.mjs";
 import { storageAssets } from "@tulip-systems/core/storage";
-import { and, asc, desc, eq, getTableColumns, inArray, isNotNull, isNull, sql } from "drizzle-orm";
+import { and, eq, getTableColumns, inArray, isNotNull, isNull, sql } from "drizzle-orm";
 import { ServerError } from "@tulip-systems/core/router/server";
 import { after } from "next/server";
 import stream from "node:stream/consumers";
-import { convertOrderByToQueryParams, convertSearchToQueryParams, createTableQueryResponse } from "@tulip-systems/core/data-tables/server";
+import { convertSearchToQueryParams, createTableQueryResponse } from "@tulip-systems/core/data-tables/server";
 import { addSeconds } from "date-fns";
 
 //#region src/providers/local/lib/service.server.ts
@@ -105,11 +106,11 @@ var LocalDrive = class {
 	* @returns A promise resolving to the matching child nodes.
 	*/
 	async getNodesByParentId({ filters, ...query }) {
-		const orderBy = convertOrderByToQueryParams(query, nodes, asc(nodes.createdAt));
+		const orderBy = parseLocalDriveTableQuerySorting.parse(query);
 		const search = convertSearchToQueryParams(query, [nodes.name]);
 		const archivedFilter = filters.isArchived === true ? isNotNull(nodes.archivedAt) : filters.isArchived === false ? isNull(nodes.archivedAt) : void 0;
 		const parentFilter = filters.parentId ? eq(nodes.parentId, filters.parentId) : isNull(nodes.parentId);
-		return (await this.#db.select().from(nodes).where(and(filters.nodeIds != null ? inArray(nodes.id, filters.nodeIds) : void 0, filters.types != null ? inArray(nodes.type, filters.types) : void 0, archivedFilter, filters.hidden != null ? eq(nodes.hidden, filters.hidden) : void 0, parentFilter, eq(nodes.namespace, filters.namespace), search)).orderBy(orderBy)).map(toLocalDriveNode);
+		return (await this.#db.select().from(nodes).where(and(filters.nodeIds != null ? inArray(nodes.id, filters.nodeIds) : void 0, filters.types != null ? inArray(nodes.type, filters.types) : void 0, archivedFilter, filters.hidden != null ? eq(nodes.hidden, filters.hidden) : void 0, parentFilter, eq(nodes.namespace, filters.namespace), search)).orderBy(...orderBy)).map(toLocalDriveNode);
 	}
 	/**
 	* Lists tree-scoped nodes with pagination, search, and richer local filters.
@@ -121,7 +122,7 @@ var LocalDrive = class {
 	* @returns A paginated table-query response.
 	*/
 	async listTree({ filters, ...query }) {
-		const orderBy = convertOrderByToQueryParams(query, nodes, desc(nodes.createdAt));
+		const orderBy = parseLocalDriveTableQuerySorting.parse(query);
 		const search = convertSearchToQueryParams(query, [nodes.name]);
 		const archivedFilter = filters.isArchived === true ? isNotNull(nodes.archivedAt) : filters.isArchived === false ? isNull(nodes.archivedAt) : void 0;
 		const parentFilter = filters.parentId ? eq(nodes.parentId, filters.parentId) : isNull(nodes.parentId);
@@ -132,7 +133,7 @@ var LocalDrive = class {
 			return [await tx.select({
 				...getTableColumns(nodes),
 				asset: storageAssets
-			}).from(nodes).where(where).leftJoin(storageAssets, eq(nodes.assetId, storageAssets.id)).orderBy(orderBy).limit(limit).offset(offset), await tx.$count(nodes, where)];
+			}).from(nodes).where(where).leftJoin(storageAssets, eq(nodes.assetId, storageAssets.id)).orderBy(...orderBy).limit(limit).offset(offset), await tx.$count(nodes, where)];
 		});
 		return createTableQueryResponse({
 			data: data.map(({ asset, ...node }) => ({
@@ -153,7 +154,7 @@ var LocalDrive = class {
 	* @returns A paginated table-query response.
 	*/
 	async listFlat({ filters, ...query }) {
-		const orderBy = convertOrderByToQueryParams(query, nodes, desc(nodes.createdAt));
+		const orderBy = parseLocalDriveTableQuerySorting.parse(query);
 		const search = convertSearchToQueryParams(query, [nodes.name]);
 		const archivedFilter = filters.isArchived === true ? isNotNull(nodes.archivedAt) : filters.isArchived === false ? isNull(nodes.archivedAt) : void 0;
 		const limit = query.limit;
@@ -163,7 +164,7 @@ var LocalDrive = class {
 			return [await tx.select({
 				...getTableColumns(nodes),
 				asset: storageAssets
-			}).from(nodes).where(where).leftJoin(storageAssets, eq(nodes.assetId, storageAssets.id)).orderBy(orderBy).limit(limit).offset(offset), await tx.$count(nodes, where)];
+			}).from(nodes).where(where).leftJoin(storageAssets, eq(nodes.assetId, storageAssets.id)).orderBy(...orderBy).limit(limit).offset(offset), await tx.$count(nodes, where)];
 		});
 		return createTableQueryResponse({
 			data: data.map(({ asset, ...node }) => ({

package/dist/providers/local/lib/validators.d.mts

@@ -15,8 +15,8 @@ declare const localDriveNodeSchema: z.ZodObject<{
   name: z.ZodString;
   namespace: z.ZodString;
   type: z.ZodEnum<{
-    file: "file";
     folder: "folder";
+    file: "file";
   }>;
   subtype: z.ZodEnum<{
     image: "image";
@@ -68,8 +68,8 @@ declare const localDriveNodeWithChildrenSchema: z.ZodObject<{
   name: z.ZodString;
   namespace: z.ZodString;
   type: z.ZodEnum<{
-    file: "file";
     folder: "folder";
+    file: "file";
   }>;
   subtype: z.ZodEnum<{
     image: "image";
@@ -106,8 +106,8 @@ declare const localDriveNodeWithChildrenSchema: z.ZodObject<{
     name: z.ZodString;
     namespace: z.ZodString;
     type: z.ZodEnum<{
-      file: "file";
       folder: "folder";
+      file: "file";
     }>;
     subtype: z.ZodEnum<{
       image: "image";
@@ -227,8 +227,8 @@ declare const localDriveTreeFiltersSchema: z.ZodPipe<z.ZodObject<{
   }>>>>;
   hidden: z.ZodOptional<z.ZodNullable<z.ZodBoolean>>;
   types: z.ZodOptional<z.ZodNullable<z.ZodArray<z.ZodEnum<{
-    file: "file";
     folder: "folder";
+    file: "file";
   }>>>>;
   contentTypes: z.ZodOptional<z.ZodNullable<z.ZodArray<z.ZodString>>>;
   nodeIds: z.ZodOptional<z.ZodNullable<z.ZodArray<z.ZodString>>>;
@@ -241,7 +241,7 @@ declare const localDriveTreeFiltersSchema: z.ZodPipe<z.ZodObject<{
   namespace: string;
   parentId: string | null;
   subtypes?: ("image" | "document" | "spreadsheet" | "video" | "audio" | "archive" | "other")[] | null | undefined;
-  types?: ("file" | "folder")[] | null | undefined;
+  types?: ("folder" | "file")[] | null | undefined;
   contentTypes?: string[] | null | undefined;
   nodeIds?: string[] | null | undefined;
 }, {
@@ -249,7 +249,7 @@ declare const localDriveTreeFiltersSchema: z.ZodPipe<z.ZodObject<{
   parentId: string | null;
   subtypes?: ("image" | "document" | "spreadsheet" | "video" | "audio" | "archive" | "other")[] | null | undefined;
   hidden?: boolean | null | undefined;
-  types?: ("file" | "folder")[] | null | undefined;
+  types?: ("folder" | "file")[] | null | undefined;
   contentTypes?: string[] | null | undefined;
   nodeIds?: string[] | null | undefined;
   isArchived?: boolean | null | undefined;
@@ -270,8 +270,8 @@ declare const localDriveFlatFiltersSchema: z.ZodPipe<z.ZodObject<{
   }>>>>;
   hidden: z.ZodOptional<z.ZodNullable<z.ZodBoolean>>;
   types: z.ZodOptional<z.ZodNullable<z.ZodArray<z.ZodEnum<{
-    file: "file";
     folder: "folder";
+    file: "file";
   }>>>>;
   contentTypes: z.ZodOptional<z.ZodNullable<z.ZodArray<z.ZodString>>>;
   nodeIds: z.ZodOptional<z.ZodNullable<z.ZodArray<z.ZodString>>>;
@@ -281,14 +281,14 @@ declare const localDriveFlatFiltersSchema: z.ZodPipe<z.ZodObject<{
   hidden: boolean;
   isArchived: boolean;
   subtypes?: ("image" | "document" | "spreadsheet" | "video" | "audio" | "archive" | "other")[] | null | undefined;
-  types?: ("file" | "folder")[] | null | undefined;
+  types?: ("folder" | "file")[] | null | undefined;
   contentTypes?: string[] | null | undefined;
   nodeIds?: string[] | null | undefined;
   namespace?: string | undefined;
 }, {
   subtypes?: ("image" | "document" | "spreadsheet" | "video" | "audio" | "archive" | "other")[] | null | undefined;
   hidden?: boolean | null | undefined;
-  types?: ("file" | "folder")[] | null | undefined;
+  types?: ("folder" | "file")[] | null | undefined;
   contentTypes?: string[] | null | undefined;
   nodeIds?: string[] | null | undefined;
   isArchived?: boolean | null | undefined;
@@ -318,8 +318,8 @@ declare const listLocalDriveTreeInputSchema: z.ZodObject<{
     }>>>>;
     hidden: z.ZodOptional<z.ZodNullable<z.ZodBoolean>>;
     types: z.ZodOptional<z.ZodNullable<z.ZodArray<z.ZodEnum<{
-      file: "file";
       folder: "folder";
+      file: "file";
     }>>>>;
     contentTypes: z.ZodOptional<z.ZodNullable<z.ZodArray<z.ZodString>>>;
     nodeIds: z.ZodOptional<z.ZodNullable<z.ZodArray<z.ZodString>>>;
@@ -332,7 +332,7 @@ declare const listLocalDriveTreeInputSchema: z.ZodObject<{
     namespace: string;
     parentId: string | null;
     subtypes?: ("image" | "document" | "spreadsheet" | "video" | "audio" | "archive" | "other")[] | null | undefined;
-    types?: ("file" | "folder")[] | null | undefined;
+    types?: ("folder" | "file")[] | null | undefined;
     contentTypes?: string[] | null | undefined;
     nodeIds?: string[] | null | undefined;
   }, {
@@ -340,7 +340,7 @@ declare const listLocalDriveTreeInputSchema: z.ZodObject<{
     parentId: string | null;
     subtypes?: ("image" | "document" | "spreadsheet" | "video" | "audio" | "archive" | "other")[] | null | undefined;
     hidden?: boolean | null | undefined;
-    types?: ("file" | "folder")[] | null | undefined;
+    types?: ("folder" | "file")[] | null | undefined;
     contentTypes?: string[] | null | undefined;
     nodeIds?: string[] | null | undefined;
     isArchived?: boolean | null | undefined;
@@ -372,8 +372,8 @@ declare const listLocalDriveFlatInputSchema: z.ZodObject<{
     }>>>>;
     hidden: z.ZodOptional<z.ZodNullable<z.ZodBoolean>>;
     types: z.ZodOptional<z.ZodNullable<z.ZodArray<z.ZodEnum<{
-      file: "file";
       folder: "folder";
+      file: "file";
     }>>>>;
     contentTypes: z.ZodOptional<z.ZodNullable<z.ZodArray<z.ZodString>>>;
     nodeIds: z.ZodOptional<z.ZodNullable<z.ZodArray<z.ZodString>>>;
@@ -383,14 +383,14 @@ declare const listLocalDriveFlatInputSchema: z.ZodObject<{
     hidden: boolean;
     isArchived: boolean;
     subtypes?: ("image" | "document" | "spreadsheet" | "video" | "audio" | "archive" | "other")[] | null | undefined;
-    types?: ("file" | "folder")[] | null | undefined;
+    types?: ("folder" | "file")[] | null | undefined;
     contentTypes?: string[] | null | undefined;
     nodeIds?: string[] | null | undefined;
     namespace?: string | undefined;
   }, {
     subtypes?: ("image" | "document" | "spreadsheet" | "video" | "audio" | "archive" | "other")[] | null | undefined;
     hidden?: boolean | null | undefined;
-    types?: ("file" | "folder")[] | null | undefined;
+    types?: ("folder" | "file")[] | null | undefined;
     contentTypes?: string[] | null | undefined;
     nodeIds?: string[] | null | undefined;
     isArchived?: boolean | null | undefined;
@@ -420,8 +420,8 @@ declare const getLocalDriveNodesByParentIdInputSchema: z.ZodObject<{
     }>>>>;
     hidden: z.ZodOptional<z.ZodNullable<z.ZodBoolean>>;
     types: z.ZodOptional<z.ZodNullable<z.ZodArray<z.ZodEnum<{
-      file: "file";
       folder: "folder";
+      file: "file";
     }>>>>;
     contentTypes: z.ZodOptional<z.ZodNullable<z.ZodArray<z.ZodString>>>;
     nodeIds: z.ZodOptional<z.ZodNullable<z.ZodArray<z.ZodString>>>;
@@ -434,7 +434,7 @@ declare const getLocalDriveNodesByParentIdInputSchema: z.ZodObject<{
     namespace: string;
     parentId: string | null;
     subtypes?: ("image" | "document" | "spreadsheet" | "video" | "audio" | "archive" | "other")[] | null | undefined;
-    types?: ("file" | "folder")[] | null | undefined;
+    types?: ("folder" | "file")[] | null | undefined;
     contentTypes?: string[] | null | undefined;
     nodeIds?: string[] | null | undefined;
   }, {
@@ -442,7 +442,7 @@ declare const getLocalDriveNodesByParentIdInputSchema: z.ZodObject<{
     parentId: string | null;
     subtypes?: ("image" | "document" | "spreadsheet" | "video" | "audio" | "archive" | "other")[] | null | undefined;
     hidden?: boolean | null | undefined;
-    types?: ("file" | "folder")[] | null | undefined;
+    types?: ("folder" | "file")[] | null | undefined;
     contentTypes?: string[] | null | undefined;
     nodeIds?: string[] | null | undefined;
     isArchived?: boolean | null | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tulip-systems/drive",
-  "version": "0.8.3",
+  "version": "0.9.0",
   "type": "module",
   "sideEffects": false,
   "license": "AGPL-3.0",
@@ -65,7 +65,7 @@
     "uuid": "^14.0.0",
     "vaul": "^1.1.2",
     "zod": "^4.4.3",
-    "@tulip-systems/core": "0.8.3"
+    "@tulip-systems/core": "0.9.0"
   },
   "peerDependencies": {
     "@tailwindcss/typography": "^0.5.19",

package/src/components/grid-card.client.tsx

@@ -29,7 +29,7 @@ import { useDriveSelectionContext } from "./selection.client";
  */
 type DriveGridCardProps<TData extends DriveNode> = ComponentProps<"div"> & {
   node: TData;
-  commands?: CommandDef<TData>[];
+  commands?: CommandDef[];
   imageLoader?: (props: ImageLoaderProps) => string;
   unoptimized?: boolean;
 };

package/src/providers/google/components/view.client.tsx

@@ -34,7 +34,7 @@ type GoogleDriveViewProviderProps<TData extends GoogleDriveNode = GoogleDriveNod
     queryData: TData[];
     columns?: TableColumnDef<TData>[];
     strategy: ReturnType<typeof useInfiniteStrategy>;
-    commands?: CommandDef<TData>[];
+    commands?: CommandDef[];
     columnVisibility?: VisibilityState;
   };
 
@@ -48,7 +48,7 @@ export function GoogleDriveViewProvider<TData extends GoogleDriveNode = GoogleDr
   ...props
 }: GoogleDriveViewProviderProps<TData>) {
   const { meta } = useGoogleDriveContext();
-  const { selection } = useDriveSelectionContext();
+  const selectionContext = useDriveSelectionContext();
 
   /**
    * Table
@@ -56,11 +56,12 @@ export function GoogleDriveViewProvider<TData extends GoogleDriveNode = GoogleDr
   const config = createTableConfig<TData>({
     queryData,
     columns,
+    getRowId: (row) => row.id,
     strategy,
     commands,
     meta,
     columnVisibility,
-    selection,
+    selection: selectionContext?.selection,
   });
 
   return (

package/src/providers/local/components/view.client.tsx

@@ -33,7 +33,7 @@ type LocalDriveViewProviderProps<TData extends LocalDriveNodeWithAsset = LocalDr
     queryData: TData[];
     columns?: TableColumnDef<TData>[];
     strategy: ReturnType<typeof useInfiniteStrategy>;
-    commands?: CommandDef<TData>[];
+    commands?: CommandDef[];
     columnVisibility?: VisibilityState;
   };
 
@@ -49,16 +49,17 @@ export function LocalDriveViewProvider<
   ...props
 }: LocalDriveViewProviderProps<TData>) {
   const { meta } = useLocalDriveContext();
-  const { selection } = useDriveSelectionContext();
+  const selectionContext = useDriveSelectionContext();
 
   const config = createTableConfig<TData>({
     queryData,
     columns,
+    getRowId: (row) => row.id,
     strategy,
     commands,
     meta,
     columnVisibility,
-    selection,
+    selection: selectionContext?.selection,
   });
 
   return (

package/src/providers/local/config/sorting.ts

@@ -0,0 +1,16 @@
+import { createTableQuerySortingParser } from "@tulip-systems/core/data-tables/server";
+import { asc, getTableColumns } from "drizzle-orm";
+import { nodes } from "../lib/schema";
+
+/**
+ * Local Drive specific sorting config
+ */
+const localDriveTableQuerySortingConfig = getTableColumns(nodes);
+
+/**
+ * Local Drive specific sorting parser
+ */
+export const parseLocalDriveTableQuerySorting = createTableQuerySortingParser(
+  localDriveTableQuerySortingConfig,
+  { fallback: asc(nodes.createdAt) },
+);

package/src/providers/local/lib/service.server.ts

@@ -2,7 +2,6 @@ import stream from "node:stream/consumers";
 import type { TDatabaseSchema } from "@tulip-systems/core/config";
 import type { TableQueryResponse } from "@tulip-systems/core/data-tables/server";
 import {
-  convertOrderByToQueryParams,
   convertSearchToQueryParams,
   createTableQueryResponse,
 } from "@tulip-systems/core/data-tables/server";
@@ -11,18 +10,7 @@ import { ServerError } from "@tulip-systems/core/router/server";
 import { type ObjectBodyInput, storageAssets } from "@tulip-systems/core/storage";
 import type { Storage } from "@tulip-systems/core/storage/server";
 import { addSeconds } from "date-fns";
-import {
-  and,
-  asc,
-  desc,
-  eq,
-  getTableColumns,
-  inArray,
-  isNotNull,
-  isNull,
-  type SQL,
-  sql,
-} from "drizzle-orm";
+import { and, eq, getTableColumns, inArray, isNotNull, isNull, sql } from "drizzle-orm";
 import { after } from "next/server";
 import type { QueryResult } from "pg";
 import type {
@@ -34,6 +22,7 @@ import type {
   DriveReader,
   DriveReadonly,
 } from "../../../lib/contracts";
+import { parseLocalDriveTableQuerySorting } from "../config/sorting";
 import { deviceSizes } from "./constants";
 import {
   inferLocalDriveNodeSubtype,
@@ -221,7 +210,7 @@ export class LocalDrive<TSchema extends TDatabaseSchema>
     filters,
     ...query
   }: GetLocalDriveNodesByParentIdInput): Promise<LocalDriveNode[]> {
-    const orderBy = convertOrderByToQueryParams(query, nodes, asc(nodes.createdAt));
+    const orderBy = parseLocalDriveTableQuerySorting.parse(query);
     const search = convertSearchToQueryParams(query, [nodes.name]);
     const archivedFilter =
       filters.isArchived === true
@@ -247,7 +236,7 @@ export class LocalDrive<TSchema extends TDatabaseSchema>
           search,
         ),
       )
-      .orderBy(orderBy as SQL);
+      .orderBy(...orderBy);
 
     return items.map(toLocalDriveNode);
   }
@@ -265,7 +254,7 @@ export class LocalDrive<TSchema extends TDatabaseSchema>
     filters,
     ...query
   }: ListLocalDriveTreeSchema): Promise<TableQueryResponse<LocalDriveNodeWithAsset>> {
-    const orderBy = convertOrderByToQueryParams(query, nodes, desc(nodes.createdAt));
+    const orderBy = parseLocalDriveTableQuerySorting.parse(query);
     const search = convertSearchToQueryParams(query, [nodes.name]);
 
     const archivedFilter =
@@ -303,7 +292,7 @@ export class LocalDrive<TSchema extends TDatabaseSchema>
         .from(nodes)
         .where(where)
         .leftJoin(storageAssets, eq(nodes.assetId, storageAssets.id))
-        .orderBy(orderBy as SQL)
+        .orderBy(...orderBy)
         .limit(limit)
         .offset(offset);
 
@@ -331,7 +320,7 @@ export class LocalDrive<TSchema extends TDatabaseSchema>
     filters,
     ...query
   }: ListLocalDriveFlatSchema): Promise<TableQueryResponse<LocalDriveNodeWithAsset>> {
-    const orderBy = convertOrderByToQueryParams(query, nodes, desc(nodes.createdAt));
+    const orderBy = parseLocalDriveTableQuerySorting.parse(query);
     const search = convertSearchToQueryParams(query, [nodes.name]);
     const archivedFilter =
       filters.isArchived === true
@@ -363,7 +352,7 @@ export class LocalDrive<TSchema extends TDatabaseSchema>
         .from(nodes)
         .where(where)
         .leftJoin(storageAssets, eq(nodes.assetId, storageAssets.id))
-        .orderBy(orderBy as SQL)
+        .orderBy(...orderBy)
         .limit(limit)
         .offset(offset);