@tulip-systems/drive 0.10.1 → 0.10.3

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

@@ -1,51 +1,44 @@
-import { createLocalDriveFolderInputSchema, getLocalDriveNodesByParentIdInputSchema, getLocalFileURLSchema, listLocalDriveFlatInputSchema, listLocalDriveTreeInputSchema, localDriveNodeSchema, localDriveNodeWithChildrenSchema, presignLocalDriveFileInputSchema, updateLocalDriveNodeInputSchema } from "./validators.mjs";
+import { createLocalDriveFolderInputSchema, getLocalDriveNodesByParentIdInputSchema, getLocalFileURLSchema, listLocalDriveFlatInputSchema, listLocalDriveTreeInputSchema, localDriveFileNodeSchema, localDriveFlatResponseSchema, localDriveNodeParentSchema, localDriveNodeSchema, localDriveNodeWithChildrenSchema, localDrivePresignUploadOutputSchema, localDriveTreeResponseSchema, presignLocalDriveFileInputSchema, updateLocalDriveNodeInputSchema } from "./validators.mjs";
 import { z } from "zod";
-import { initRPC } from "@tulip-systems/core/router/server";
+import { oc } from "@orpc/contract";
 import { bulkActionSchema } from "@tulip-systems/core/router";
 
 //#region src/providers/local/lib/router.server.ts
 /**
+* Local Drive router contract defines the input and output schemas for local drive-related procedures.
+*/
+const localDriveRouterContract = {
+	getNodeWithChildren: oc.input(z.object({
+		id: z.string(),
+		namespace: z.string()
+	})).output(localDriveNodeWithChildrenSchema.nullable()),
+	getNodesByParentId: oc.input(getLocalDriveNodesByParentIdInputSchema).output(z.array(localDriveNodeSchema)),
+	listTree: oc.input(listLocalDriveTreeInputSchema).output(localDriveTreeResponseSchema),
+	listFlat: oc.input(listLocalDriveFlatInputSchema).output(localDriveFlatResponseSchema),
+	getFolderParents: oc.input(z.object({
+		id: z.string().nullable(),
+		namespace: z.string()
+	})).output(z.array(localDriveNodeParentSchema)),
+	getURL: oc.input(getLocalFileURLSchema.extend({ id: z.string() })).output(z.string().nullable()),
+	presignUpload: oc.input(presignLocalDriveFileInputSchema).output(localDrivePresignUploadOutputSchema),
+	confirmUpload: oc.input(z.object({ uploadId: z.string() })).output(localDriveFileNodeSchema),
+	createFolder: oc.input(createLocalDriveFolderInputSchema).output(localDriveNodeSchema),
+	updateNode: oc.input(z.object({
+		id: z.string(),
+		data: updateLocalDriveNodeInputSchema
+	})).output(localDriveNodeSchema),
+	setReadonly: oc.input(bulkActionSchema.extend({ readonly: z.boolean() })).output(z.array(localDriveNodeSchema)),
+	moveNode: oc.input(z.object({
+		id: z.string(),
+		parentId: z.string().nullish()
+	})).output(localDriveNodeSchema),
+	archiveNodes: oc.input(bulkActionSchema).output(z.array(localDriveNodeSchema)),
+	restoreNodes: oc.input(bulkActionSchema).output(z.array(localDriveNodeSchema)),
+	deleteNodes: oc.input(bulkActionSchema).output(z.void())
+};
+/**
 * Create Drive base procedures
 */
-function createLocalDriveProcedures(drive) {
-	const { protectedProcedure } = initRPC();
-	return {
-		getNodeWithChildren: protectedProcedure.input(z.object({
-			id: z.string(),
-			namespace: z.string()
-		})).output(localDriveNodeWithChildrenSchema.nullable()).handler(async ({ input }) => drive.getNodeWithChildren(input)),
-		getNodesByParentId: protectedProcedure.input(getLocalDriveNodesByParentIdInputSchema).output(z.array(localDriveNodeSchema)).handler(async ({ input }) => drive.getNodesByParentId(input)),
-		listTree: protectedProcedure.input(listLocalDriveTreeInputSchema).handler(async ({ input }) => drive.listTree(input)),
-		listFlat: protectedProcedure.input(listLocalDriveFlatInputSchema).handler(async ({ input }) => drive.listFlat(input)),
-		getFolderParents: protectedProcedure.input(z.object({
-			id: z.string().nullable(),
-			namespace: z.string()
-		})).handler(async ({ input }) => drive.getFolderParents(input)),
-		getURL: protectedProcedure.input(getLocalFileURLSchema.extend({ id: z.string() })).output(z.string().nullable()).handler(async ({ input: { id, ...options } }) => {
-			const node = await drive.getNodeById(id);
-			if (!node) return null;
-			return await drive.getURL(node, options);
-		}),
-		presignUpload: protectedProcedure.input(presignLocalDriveFileInputSchema).handler(async ({ input }) => drive.presignUpload(input)),
-		confirmUpload: protectedProcedure.input(z.object({ uploadId: z.string() })).handler(async ({ input }) => drive.confirmUpload(input.uploadId)),
-		createFolder: protectedProcedure.input(createLocalDriveFolderInputSchema).output(localDriveNodeSchema).handler(async ({ input }) => drive.createFolder(input)),
-		updateNode: protectedProcedure.input(z.object({
-			id: z.string(),
-			data: updateLocalDriveNodeInputSchema
-		})).output(localDriveNodeSchema).handler(async ({ input }) => drive.updateNode(input.id, input.data)),
-		setReadonly: protectedProcedure.input(bulkActionSchema.extend({ readonly: z.boolean() })).output(z.array(localDriveNodeSchema)).handler(async ({ input }) => drive.setReadonly(input.ids, input.readonly)),
-		moveNode: protectedProcedure.input(z.object({
-			id: z.string(),
-			parentId: z.string().nullish()
-		})).output(localDriveNodeSchema).handler(async ({ input }) => drive.moveNode({
-			id: input.id,
-			parentId: input.parentId ?? null
-		})),
-		archiveNodes: protectedProcedure.input(bulkActionSchema).output(z.array(localDriveNodeSchema)).handler(async ({ input }) => drive.archiveNodes(input.ids)),
-		restoreNodes: protectedProcedure.input(bulkActionSchema).output(z.array(localDriveNodeSchema)).handler(async ({ input }) => drive.restoreNodes(input.ids)),
-		deleteNodes: protectedProcedure.input(bulkActionSchema).output(z.void()).handler(async ({ input }) => drive.deleteNodes(input.ids))
-	};
-}
 
 //#endregion
-export { createLocalDriveProcedures };
+export { localDriveRouterContract };

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/schema.mjs

@@ -1,5 +1,5 @@
 import { imageVariants, nodeSubtypes } from "./constants.mjs";
-import { baseColumns } from "@tulip-systems/core/config";
+import { baseColumns } from "@tulip-systems/core/database";
 import { imageDispositions, storageAssets } from "@tulip-systems/core/storage";
 import { relations } from "drizzle-orm";
 import { boolean, pgEnum, pgTable, unique } from "drizzle-orm/pg-core";

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

@@ -1,6 +1,6 @@
 import { DriveArchive, DriveDirectUpload, DriveNodeMutations, DrivePresignedUpload, DrivePreviewGenerator, DriveReader, DriveReadonly } from "../../../lib/contracts.mjs";
 import { CreateLocalDriveFolderSchema, GetLocalDriveNodesByParentIdInput, GetLocalFileURLSchema, ListLocalDriveFlatSchema, ListLocalDriveTreeSchema, LocalDriveFileNode, LocalDriveNode, LocalDriveNodeChild, LocalDriveNodeWithAsset, LocalDriveNodeWithChildren, LocalNode, PresignLocalDriveFileInput, UpdateLocalDriveNodeInput, UploadLocalDriveFileSchema } from "./validators.mjs";
-import { TDatabaseSchema } from "@tulip-systems/core/config";
+import { TDatabaseSchema } from "@tulip-systems/core/database";
 import { ObjectBodyInput } from "@tulip-systems/core/storage";
 import { TableQueryResponse } from "@tulip-systems/core/data-tables/server";
 import { Database } from "@tulip-systems/core/database/server";
@@ -109,7 +109,7 @@ declare class LocalDrive<TSchema extends TDatabaseSchema> implements DriveReader
     parentId: string | null;
     contentType: string | null;
     size: number | null;
-    type: "file" | "folder" | null;
+    type: "folder" | "file" | null;
     readonly: boolean | null;
     id: string;
     subtype: "image" | "document" | "spreadsheet" | "video" | "audio" | "archive" | "other";
@@ -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;
@@ -247,22 +247,22 @@ declare class LocalDrive<TSchema extends TDatabaseSchema> implements DriveReader
     presignedUrl: string;
     node: LocalDriveFileNode;
     asset: {
-      id: string;
-      createdAt: Date;
-      updatedAt: Date;
-      name: string | null;
-      key: string;
       metadata: unknown;
-      provider: "s3";
       uploadId: string;
+      name: string | null;
       visibility: "private" | "public";
       size: number | null;
       contentType: string | null;
+      provider: "s3";
       bucket: string;
+      key: string;
       status: "error" | "pending" | "ready";
       etag: string | null;
       uploadedAt: Date;
       deletedAt: Date | null;
+      id: string;
+      createdAt: Date;
+      updatedAt: Date;
     };
   }>;
   /**
@@ -278,7 +278,30 @@ declare class LocalDrive<TSchema extends TDatabaseSchema> implements DriveReader
    * @returns A promise resolving to the finalized file node.
    * @throws {ServerError} If the asset or node cannot be resolved.
    */
-  confirmUpload(uploadId: string): Promise<LocalDriveFileNode>;
+  confirmUpload(uploadId: string): Promise<{
+    id: string;
+    createdAt: Date;
+    updatedAt: Date;
+    name: string;
+    namespace: string;
+    subtype: "image" | "document" | "spreadsheet" | "video" | "audio" | "archive" | "other";
+    size: number | null;
+    contentType: string | null;
+    readonly: boolean;
+    hidden: boolean;
+    archivedAt: Date | null;
+    parentId: string | null;
+    links: {
+      view: string | null;
+      download: string | null;
+      preview: string | null;
+      thumbnail: string | null;
+    };
+    availability: "ready" | "pending" | "failed";
+    provider: "local";
+    assetId: string | null;
+    type: "file";
+  }>;
   /**
    * Generates preview assets for an image node.
    *
@@ -309,7 +332,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 +367,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 +401,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 +435,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 +466,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/upload.client.d.mts

@@ -1,5 +1,5 @@
 import { LocalDriveFileNode, LocalDriveNode, PresignLocalDriveFileInput, UpdateLocalDriveNodeInput } from "./validators.mjs";
-import { StorageAsset } from "@tulip-systems/core/storage";
+import { SelectStorageAssetSchema } from "@tulip-systems/core/storage";
 import { BulkActionSchema } from "@tulip-systems/core/router";
 
 //#region src/providers/local/lib/upload.client.d.ts
@@ -13,13 +13,13 @@ type LocalDriveUploadFileRequest = PresignLocalDriveFileInput & {
 type LocalDriveUploadHooks = {
   beforePresign?: (input: LocalDriveUploadFileRequest) => Promise<void> | void;
   afterPresign?: (presignResult: {
-    asset: Omit<StorageAsset, "presignedUrl">;
+    asset: SelectStorageAssetSchema;
     node: LocalDriveFileNode;
     uploadId: string;
     presignedUrl: string;
   }) => Promise<void> | void;
   beforeConfirm?: (presignResult: {
-    asset: Omit<StorageAsset, "presignedUrl">;
+    asset: SelectStorageAssetSchema;
     node: LocalDriveFileNode;
     uploadId: string;
     presignedUrl: string;
@@ -41,7 +41,7 @@ type LocalDriveUploadClient = {
 type CreateLocalDriveUploadClientProps = {
   endpoints: {
     presignUpload: (input: PresignLocalDriveFileInput) => Promise<{
-      asset: Omit<StorageAsset, "presignedUrl">;
+      asset: SelectStorageAssetSchema;
       node: LocalDriveFileNode;
       uploadId: string;
       presignedUrl: string;

package/dist/providers/local/lib/upload.client.mjs

@@ -1,4 +1,4 @@
-import { generateDefaultUUID } from "@tulip-systems/core/config";
+import { generateDefaultUUID } from "@tulip-systems/core/database";
 
 //#region src/providers/local/lib/upload.client.ts
 function createLocalDriveUploadClient(props) {