@tulip-systems/core 0.10.0 → 0.10.2

package/dist/modules/data-tables/server/get-data.server.d.mts

@@ -1,4 +1,5 @@
 import { TDatabaseSchema } from "../../database/lib/types.mjs";
+import { TAuthServerOptions } from "../../auth/handler/service.server.mjs";
 import { TulipContext } from "../../config/lib/context.mjs";
 import "../../../config.mjs";
 import { TableQuerySchema } from "../lib/validators.mjs";
@@ -18,10 +19,10 @@ type GetTableDataOptions<TTable extends PgTable> = DBQueryConfig<"many"> & {
 /**
  * Get data from the database for the data table
  */
-declare function getTableData<TTable extends PgTable, TSchema extends TDatabaseSchema>({
+declare function getTableData<TTable extends PgTable, TSchema extends TDatabaseSchema, AuthOptions extends TAuthServerOptions>({
   db,
   schema
-}: TulipContext<TSchema>, query: TableQuerySchema, options: GetTableDataOptions<TTable>): Promise<{
+}: TulipContext<TSchema, AuthOptions>, query: TableQuerySchema, options: GetTableDataOptions<TTable>): Promise<{
   data: TTable["$inferSelect"][];
   total: number;
 }>;

package/dist/modules/inline/lib/variants.d.mts

@@ -4,7 +4,7 @@ import * as class_variance_authority_types0 from "class-variance-authority/types
 //#region src/modules/inline/lib/variants.d.ts
 declare const inlineEditVariants: (props?: ({
   variant?: "default" | "table" | null | undefined;
-  status?: "error" | "success" | "pending" | "idle" | null | undefined;
+  status?: "success" | "error" | "idle" | "pending" | null | undefined;
 } & class_variance_authority_types0.ClassProp) | undefined) => string;
 type InlineEditVariantsProps = VariantProps<typeof inlineEditVariants>;
 //#endregion

package/dist/modules/router/handler/init.server.d.mts

@@ -1,65 +1,57 @@
-import { Permission } from "../../auth/lib/permissions.mjs";
 import { TDatabaseSchema } from "../../database/lib/types.mjs";
 import { Database } from "../../database/lib/service.server.mjs";
-import "../../../database/server.mjs";
 import { Email } from "../../emails/lib/service.server.mjs";
-import { Auth } from "../../auth/handler/service.server.mjs";
+import { Auth, TAuthServerOptions } from "../../auth/handler/service.server.mjs";
 import { Storage } from "../../storage/lib/service.server.mjs";
-import "../../../auth/server.mjs";
-import "../../../emails/server.mjs";
-import "../../../storage/server.mjs";
-import { ProtectedRPCContext, RPCContext } from "./context.server.mjs";
+import { TulipContext } from "../../config/lib/context.mjs";
 import * as _orpc_server0 from "@orpc/server";
 import "server-cli-only";
-import * as next_dist_server_web_spec_extension_adapters_headers0 from "next/dist/server/web/spec-extension/adapters/headers";
 import * as _orpc_contract0 from "@orpc/contract";
 
 //#region src/modules/router/handler/init.server.d.ts
+/**
+ * Tulip RPC Context
+ * This context is used to provide the necessary services and data to the RPC procedures.
+ * It includes the database, schema, authentication service, email service, storage service, and request headers.
+ */
+type RPCContext<TSchema extends TDatabaseSchema, TAuthOptions extends TAuthServerOptions> = {
+  db: Database<TSchema>;
+  schema: TSchema;
+  auth: Auth<TAuthOptions>;
+  email: Email;
+  storage: Storage<TSchema>;
+  headers: Headers;
+};
+/**
+ * Create RPC Context function type
+ * This type defines the shape of the function that creates the RPC context. It takes an object with headers and returns a promise that resolves to the RPC context.
+ */
+type CreateRPCContext<TSchema extends TDatabaseSchema, TAuthOptions extends TAuthServerOptions> = (props: {
+  headers: Headers;
+}) => RPCContext<TSchema, TAuthOptions>;
+/**
+ * Create context for the RPC procedures.
+ */
+declare function defineContext<TSchema extends TDatabaseSchema, TAuthOptions extends TAuthServerOptions>(context: TulipContext<TSchema, TAuthOptions>): <TExtendedContext>(extendedContext: TExtendedContext & {
+  headers: Headers;
+}) => RPCContext<TSchema, TAuthOptions> & TExtendedContext;
 /**
  * Initialize TRPC
  */
-declare function initRPC<TSchema extends TDatabaseSchema>(): {
-  publicProcedure: _orpc_server0.Builder<RPCContext<TSchema> & Record<never, never>, RPCContext<TSchema>, _orpc_contract0.Schema<unknown, unknown>, _orpc_contract0.Schema<unknown, unknown>, Record<never, never>, Record<never, never>>;
-  protectedProcedure: _orpc_server0.BuilderWithMiddlewares<_orpc_server0.MergedInitialContext<RPCContext<TSchema> & Record<never, never>, RPCContext<TSchema> & Record<never, never>, RPCContext<TSchema>>, _orpc_server0.MergedCurrentContext<RPCContext<TSchema>, ProtectedRPCContext<TSchema>>, _orpc_contract0.Schema<unknown, unknown>, _orpc_contract0.Schema<unknown, unknown>, Record<never, never>, Record<never, never>>;
-  authMiddleware: _orpc_server0.DecoratedMiddleware<RPCContext<TSchema> & Record<never, never>, ProtectedRPCContext<TSchema>, unknown, any, any, Record<never, never>>;
-  permissionMiddleware: (permissions: Permission) => _orpc_server0.DecoratedMiddleware<{
-    session: {
-      session: {
-        id: string;
-        createdAt: Date;
-        updatedAt: Date;
-        userId: string;
-        expiresAt: Date;
-        token: string;
-        ipAddress?: string | null | undefined | undefined;
-        userAgent?: string | null | undefined | undefined;
-        impersonatedBy?: string | null | undefined;
-      };
-      user: {
-        id: string;
-        createdAt: Date;
-        updatedAt: Date;
-        email: string;
-        emailVerified: boolean;
-        name: string;
-        image?: string | null | undefined | undefined;
-        firstName: string;
-        lastName: string;
-        banned: boolean | null | undefined;
-        role?: string | null | undefined;
-        banReason?: string | null | undefined;
-        banExpires?: Date | null | undefined;
-      };
-    } | null;
-    headers: next_dist_server_web_spec_extension_adapters_headers0.ReadonlyHeaders;
-    db: Database<TSchema>;
-    schema: TSchema;
-    auth: Auth;
-    email: Email;
-    storage: Storage<TSchema>;
-  } & {
-    session: NonNullable<RPCContext<TSchema_1>["session"]>;
-  } & Record<never, never>, ProtectedRPCContext<TSchema>, unknown, any, any, Record<never, never>>;
+declare function createRPC<TSchema extends TDatabaseSchema, TAuthOptions extends TAuthServerOptions>(): _orpc_server0.Builder<RPCContext<TSchema, TAuthOptions> & Record<never, never>, RPCContext<TSchema, TAuthOptions>, _orpc_contract0.Schema<unknown, unknown>, _orpc_contract0.Schema<unknown, unknown>, Record<never, never>, Record<never, never>>;
+/**
+ * RPC instance.
+ */
+type RPC = ReturnType<typeof createRPC>;
+/**
+ * RPC namespace.
+ *
+ * @example
+ * const rpc = RPC.init<DatabaseSchema, AuthServerOptions>();
+ */
+declare const RPC: {
+  init: typeof createRPC;
+  defineContext: typeof defineContext;
 };
 //#endregion
-export { initRPC };
+export { CreateRPCContext, RPC, RPCContext };

package/dist/modules/router/handler/init.server.mjs

@@ -1,55 +1,38 @@
-import { ServerError } from "../lib/error.server.mjs";
 import { os } from "@orpc/server";
 import "server-cli-only";
 
 //#region src/modules/router/handler/init.server.ts
 /**
-* Initialize TRPC
+* Create context for the RPC procedures.
 */
-function initRPC() {
-	/**
-	* Create the router
-	*/
-	const o = os.$context();
+function defineContext(context) {
 	/**
-	* Middleware function to check if the user is authenticated
+	* Create context function
 	*/
-	const authMiddleware = o.middleware(async (opts) => {
-		if (!opts.context.session) throw new ServerError("UNAUTHORIZED", { message: "Jou hebt geen toegang om deze actie uit te voeren" });
-		return opts.next({ context: {
-			...opts.context,
-			session: opts.context.session
-		} });
+	return (extendedContext) => ({
+		...context,
+		...extendedContext
 	});
+}
+/**
+* Initialize TRPC
+*/
+function createRPC() {
 	/**
-	* Middleware function to check if the user has the required permission
-	*/
-	function permissionMiddleware(permissions) {
-		/**
-		* Middleware function to check if the user has the required permission
-		*/
-		return os.$context().middleware(async (opts) => {
-			const { success, error } = await opts.context.auth.api.userHasPermission({
-				headers: opts.context.headers,
-				body: {
-					userId: opts.context.session.user.id,
-					permissions
-				}
-			});
-			if (error || !success) throw new ServerError("UNAUTHORIZED", { message: "Jou hebt geen toegang om deze actie uit te voeren" });
-			return opts.next({ context: { ...opts.context } });
-		});
-	}
-	/**
-	* Export
+	* Create the router
 	*/
-	return {
-		publicProcedure: o,
-		protectedProcedure: o.use(authMiddleware),
-		authMiddleware,
-		permissionMiddleware
-	};
+	return os.$context();
 }
+/**
+* RPC namespace.
+*
+* @example
+* const rpc = RPC.init<DatabaseSchema, AuthServerOptions>();
+*/
+const RPC = {
+	init: createRPC,
+	defineContext
+};
 
 //#endregion
-export { initRPC };
+export { RPC };

package/dist/modules/router/handler/route.server.d.mts

@@ -1,14 +1,17 @@
 import { TDatabaseSchema } from "../../database/lib/types.mjs";
+import { TAuthServerOptions } from "../../auth/handler/service.server.mjs";
 import { TulipContext } from "../../config/lib/context.mjs";
+import { CreateRPCContext } from "./init.server.mjs";
 import { AnyRouter } from "@orpc/server";
+import { RPCHandlerOptions } from "@orpc/server/fetch";
 
 //#region src/modules/router/handler/route.server.d.ts
 /**
  * RPC Route handler
  */
-declare function handleRPCRoute<TRouter extends AnyRouter, TSchema extends TDatabaseSchema>(props: {
-  appRouter: TRouter;
-  context: TulipContext<TSchema>;
+declare function handleRPCRoute<TRouter extends AnyRouter, TSchema extends TDatabaseSchema, TAuthOptions extends TAuthServerOptions>(appRouter: TRouter, options: RPCHandlerOptions<TulipContext<TSchema, TAuthOptions>> & {
+  prefix?: `/${string}`;
+  createContext: CreateRPCContext<TSchema, TAuthOptions>;
 }): {
   HEAD: (request: Request) => Promise<Response>;
   GET: (request: Request) => Promise<Response>;

package/dist/modules/router/handler/route.server.mjs

@@ -1,20 +1,17 @@
-import { createRPCContext } from "./context.server.mjs";
-import { onError } from "@orpc/client";
 import { RPCHandler } from "@orpc/server/fetch";
 
 //#region src/modules/router/handler/route.server.ts
 /**
 * RPC Route handler
 */
-function handleRPCRoute(props) {
-	const handler = new RPCHandler(props.appRouter, { interceptors: [onError((error) => {
-		console.error(JSON.stringify(error));
-	})] });
+function handleRPCRoute(appRouter, options) {
+	const handler = new RPCHandler(appRouter, options);
 	async function handleRequest(request) {
-		const rpcContext = await createRPCContext({ context: props.context });
+		const prefix = options.prefix ?? "/api/rpc";
+		const context = options.createContext({ headers: request.headers });
 		const { response } = await handler.handle(request, {
-			prefix: "/api/rpc",
-			context: rpcContext
+			prefix,
+			context
 		});
 		return response ?? new Response("Not found", { status: 404 });
 	}

package/dist/modules/router/lib/query-client.server.d.mts

@@ -6,7 +6,7 @@ import "server-cli-only";
 /**
  *  Create a stable getter for the query client that will return the same client during the same request.
  */
-declare const getQueryClient: typeof createQueryClient;
+declare const getServerQueryClient: typeof createQueryClient;
 /**
  * Hydrate the client with the data from the server
  */
@@ -14,4 +14,4 @@ declare function HydrateClient(props: {
   children: React.ReactNode;
 }): react_jsx_runtime0.JSX.Element;
 //#endregion
-export { HydrateClient, getQueryClient };
+export { HydrateClient, getServerQueryClient };

package/dist/modules/router/lib/query-client.server.mjs

@@ -8,16 +8,16 @@ import "server-cli-only";
 /**
 *  Create a stable getter for the query client that will return the same client during the same request.
 */
-const getQueryClient = cache(createQueryClient);
+const getServerQueryClient = cache(createQueryClient);
 /**
 * Hydrate the client with the data from the server
 */
 function HydrateClient(props) {
 	return /* @__PURE__ */ jsx(HydrationBoundary, {
-		state: dehydrate(getQueryClient()),
+		state: dehydrate(getServerQueryClient()),
 		children: props.children
 	});
 }
 
 //#endregion
-export { HydrateClient, getQueryClient };
+export { HydrateClient, getServerQueryClient };

package/dist/modules/storage/components/dropzone.client.d.mts

@@ -36,7 +36,7 @@ type DropzoneContentProps = {
 declare function DropzoneContent({
   children,
   className
-}: DropzoneContentProps): string | number | bigint | true | react_jsx_runtime0.JSX.Element | Iterable<ReactNode> | Promise<string | number | bigint | boolean | react.ReactPortal | react.ReactElement<unknown, string | react.JSXElementConstructor<any>> | Iterable<ReactNode> | null | undefined> | null;
+}: DropzoneContentProps): string | number | bigint | true | Iterable<ReactNode> | Promise<string | number | bigint | boolean | react.ReactPortal | react.ReactElement<unknown, string | react.JSXElementConstructor<any>> | Iterable<ReactNode> | null | undefined> | react_jsx_runtime0.JSX.Element | null;
 /**
  * DropzoneEmptyState
  */
@@ -47,6 +47,6 @@ type DropzoneEmptyStateProps = {
 declare function DropzoneEmptyState({
   children,
   className
-}: DropzoneEmptyStateProps): string | number | bigint | true | react_jsx_runtime0.JSX.Element | Iterable<ReactNode> | Promise<string | number | bigint | boolean | react.ReactPortal | react.ReactElement<unknown, string | react.JSXElementConstructor<any>> | Iterable<ReactNode> | null | undefined> | null;
+}: DropzoneEmptyStateProps): string | number | bigint | true | Iterable<ReactNode> | Promise<string | number | bigint | boolean | react.ReactPortal | react.ReactElement<unknown, string | react.JSXElementConstructor<any>> | Iterable<ReactNode> | null | undefined> | react_jsx_runtime0.JSX.Element | null;
 //#endregion
 export { Dropzone, DropzoneContent, DropzoneContentProps, DropzoneEmptyState, DropzoneEmptyStateProps, DropzoneProps };

package/dist/modules/storage/lib/router-handlers.server.d.mts

@@ -1,5 +1,6 @@
 import { TDatabaseSchema } from "../../database/lib/types.mjs";
-import { TulipContext } from "../../config/lib/context.mjs";
+import { Auth, TAuthServerOptions } from "../../auth/handler/service.server.mjs";
+import { Storage } from "./service.server.mjs";
 import { NextRequest } from "next/server";
 
 //#region src/modules/storage/lib/router-handlers.server.d.ts
@@ -8,9 +9,6 @@ type RouteCtx = {
     rest?: string[];
   }>;
 };
-type CreateStorageRouteHandlerProps<TSchema extends TDatabaseSchema> = {
-  context: Pick<TulipContext<TSchema>, "auth" | "storage">;
-};
 /**
  * Creates a catch-all storage route handler for `/api/storage/[[...rest]]`.
  *
@@ -27,9 +25,10 @@ type CreateStorageRouteHandlerProps<TSchema extends TDatabaseSchema> = {
  * @param props - Route handler dependencies (application context)
  * @returns Next.js route handlers for GET, POST, PUT, PATCH, and DELETE
  */
-declare function createStorageRouteHandler<TSchema extends TDatabaseSchema>({
-  context
-}: CreateStorageRouteHandlerProps<TSchema>): {
+declare function createStorageRouteHandler<TSchema extends TDatabaseSchema, TAuthOptions extends TAuthServerOptions>(context: {
+  auth: Auth<TAuthOptions>;
+  storage: Storage<TSchema>;
+}): {
   GET: (request: NextRequest, ctx: RouteCtx) => Promise<Response>;
   POST: () => Promise<Response>;
   PUT: () => Promise<Response>;

package/dist/modules/storage/lib/router-handlers.server.mjs

@@ -21,7 +21,7 @@ import { connection } from "next/server";
 * @param props - Route handler dependencies (application context)
 * @returns Next.js route handlers for GET, POST, PUT, PATCH, and DELETE
 */
-function createStorageRouteHandler({ context }) {
+function createStorageRouteHandler(context) {
 	/**
 	* GET /api/storage/[[...rest]]
 	*
@@ -51,7 +51,7 @@ function createStorageRouteHandler({ context }) {
 					message: "Asset not found"
 				} }, { status: 404 });
 				if (asset.visibility === "private") {
-					if (!await getSession(context)) return Response.json({ error: {
+					if (!await getSession(context.auth)) return Response.json({ error: {
 						code: "UNAUTHORIZED",
 						message: "Unauthorized"
 					} }, { status: 401 });

package/dist/modules/storage/lib/{procedures.server.d.mts → router.server.d.mts}

@@ -1,15 +1,18 @@
-import { TDatabaseSchema } from "../../database/lib/types.mjs";
-import { ProtectedRPCContext, RPCContext } from "../../router/handler/context.server.mjs";
-import "../../../router/server.mjs";
-import * as _orpc_server0 from "@orpc/server";
-import { InferRouterInputs, InferRouterOutputs } from "@orpc/server";
 import * as drizzle_orm_pg_core0 from "drizzle-orm/pg-core";
 import * as drizzle_zod0 from "drizzle-zod";
 import { z as z$1 } from "zod";
+import * as _orpc_contract0 from "@orpc/contract";
+import { InferContractRouterInputs, InferContractRouterOutputs } from "@orpc/contract";
 
-//#region src/modules/storage/lib/procedures.server.d.ts
-declare function createStorageProcedures<TSchema extends TDatabaseSchema>(): {
-  presign: _orpc_server0.DecoratedProcedure<_orpc_server0.MergedInitialContext<RPCContext<TSchema> & Record<never, never>, RPCContext<TSchema> & Record<never, never>, RPCContext<TSchema>>, _orpc_server0.MergedCurrentContext<RPCContext<TSchema>, ProtectedRPCContext<TSchema>>, z$1.ZodObject<{
+//#region src/modules/storage/lib/router.server.d.ts
+/**
+ * Storage router contract defines the input and output schemas for storage-related procedures.
+ */
+declare const storageRouterContract: {
+  /**
+   * Presign an upload request to get a signed URL for uploading a file to storage.
+   */
+  presign: _orpc_contract0.ContractProcedureBuilderWithInputOutput<z$1.ZodObject<{
     uploadId: z$1.ZodOptional<z$1.ZodUUID>;
     name: z$1.ZodString;
     visibility: z$1.ZodDefault<z$1.ZodOptional<z$1.ZodEnum<{
@@ -50,7 +53,10 @@ declare function createStorageProcedures<TSchema extends TDatabaseSchema>(): {
     out: {};
     in: {};
   }>, Record<never, never>, Record<never, never>>;
-  confirm: _orpc_server0.DecoratedProcedure<_orpc_server0.MergedInitialContext<RPCContext<TSchema> & Record<never, never>, RPCContext<TSchema> & Record<never, never>, RPCContext<TSchema>>, _orpc_server0.MergedCurrentContext<RPCContext<TSchema>, ProtectedRPCContext<TSchema>>, z$1.ZodUUID, drizzle_zod0.BuildSchema<"select", {
+  /**
+   * Confirm an upload request to finalize the upload and get the storage asset information.
+   */
+  confirm: _orpc_contract0.ContractProcedureBuilderWithInputOutput<z$1.ZodUUID, drizzle_zod0.BuildSchema<"select", {
     provider: drizzle_orm_pg_core0.PgColumn<{
       name: "provider";
       tableName: "storage_assets";
@@ -326,7 +332,10 @@ declare function createStorageProcedures<TSchema extends TDatabaseSchema>(): {
       generated: undefined;
     }, {}, {}>;
   }, undefined, undefined>, Record<never, never>, Record<never, never>>;
-  deleteAsset: _orpc_server0.DecoratedProcedure<_orpc_server0.MergedInitialContext<RPCContext<TSchema> & Record<never, never>, RPCContext<TSchema> & Record<never, never>, RPCContext<TSchema>>, _orpc_server0.MergedCurrentContext<RPCContext<TSchema>, ProtectedRPCContext<TSchema>>, z$1.ZodUUID, z$1.ZodNullable<drizzle_zod0.BuildSchema<"select", {
+  /**
+   * Delete a single storage asset by its UUID.
+   */
+  deleteAsset: _orpc_contract0.ContractProcedureBuilderWithInputOutput<z$1.ZodUUID, z$1.ZodNullable<drizzle_zod0.BuildSchema<"select", {
     provider: drizzle_orm_pg_core0.PgColumn<{
       name: "provider";
       tableName: "storage_assets";
@@ -602,7 +611,10 @@ declare function createStorageProcedures<TSchema extends TDatabaseSchema>(): {
       generated: undefined;
     }, {}, {}>;
   }, undefined, undefined>>, Record<never, never>, Record<never, never>>;
-  deleteAssets: _orpc_server0.DecoratedProcedure<_orpc_server0.MergedInitialContext<RPCContext<TSchema> & Record<never, never>, RPCContext<TSchema> & Record<never, never>, RPCContext<TSchema>>, _orpc_server0.MergedCurrentContext<RPCContext<TSchema>, ProtectedRPCContext<TSchema>>, z$1.ZodArray<z$1.ZodString>, z$1.ZodArray<drizzle_zod0.BuildSchema<"select", {
+  /**
+   * Delete multiple storage assets by their UUIDs.
+   */
+  deleteAssets: _orpc_contract0.ContractProcedureBuilderWithInputOutput<z$1.ZodArray<z$1.ZodString>, z$1.ZodArray<drizzle_zod0.BuildSchema<"select", {
     provider: drizzle_orm_pg_core0.PgColumn<{
       name: "provider";
       tableName: "storage_assets";
@@ -878,7 +890,10 @@ declare function createStorageProcedures<TSchema extends TDatabaseSchema>(): {
       generated: undefined;
     }, {}, {}>;
   }, undefined, undefined>>, Record<never, never>, Record<never, never>>;
-  restoreAsset: _orpc_server0.DecoratedProcedure<_orpc_server0.MergedInitialContext<RPCContext<TSchema> & Record<never, never>, RPCContext<TSchema> & Record<never, never>, RPCContext<TSchema>>, _orpc_server0.MergedCurrentContext<RPCContext<TSchema>, ProtectedRPCContext<TSchema>>, z$1.ZodUUID, z$1.ZodNullable<drizzle_zod0.BuildSchema<"select", {
+  /**
+   * Restore a single storage asset by its UUID.
+   */
+  restoreAsset: _orpc_contract0.ContractProcedureBuilderWithInputOutput<z$1.ZodUUID, z$1.ZodNullable<drizzle_zod0.BuildSchema<"select", {
     provider: drizzle_orm_pg_core0.PgColumn<{
       name: "provider";
       tableName: "storage_assets";
@@ -1154,7 +1169,10 @@ declare function createStorageProcedures<TSchema extends TDatabaseSchema>(): {
       generated: undefined;
     }, {}, {}>;
   }, undefined, undefined>>, Record<never, never>, Record<never, never>>;
-  restoreAssets: _orpc_server0.DecoratedProcedure<_orpc_server0.MergedInitialContext<RPCContext<TSchema> & Record<never, never>, RPCContext<TSchema> & Record<never, never>, RPCContext<TSchema>>, _orpc_server0.MergedCurrentContext<RPCContext<TSchema>, ProtectedRPCContext<TSchema>>, z$1.ZodArray<z$1.ZodString>, z$1.ZodArray<drizzle_zod0.BuildSchema<"select", {
+  /**
+   * Restore multiple storage assets by their UUIDs.
+   */
+  restoreAssets: _orpc_contract0.ContractProcedureBuilderWithInputOutput<z$1.ZodArray<z$1.ZodString>, z$1.ZodArray<drizzle_zod0.BuildSchema<"select", {
     provider: drizzle_orm_pg_core0.PgColumn<{
       name: "provider";
       tableName: "storage_assets";
@@ -1430,7 +1448,10 @@ declare function createStorageProcedures<TSchema extends TDatabaseSchema>(): {
       generated: undefined;
     }, {}, {}>;
   }, undefined, undefined>>, Record<never, never>, Record<never, never>>;
-  purgeAsset: _orpc_server0.DecoratedProcedure<_orpc_server0.MergedInitialContext<RPCContext<TSchema> & Record<never, never>, RPCContext<TSchema> & Record<never, never>, RPCContext<TSchema>>, _orpc_server0.MergedCurrentContext<RPCContext<TSchema>, ProtectedRPCContext<TSchema>>, z$1.ZodUUID, z$1.ZodNullable<drizzle_zod0.BuildSchema<"select", {
+  /**
+   * Purge a single storage asset by its UUID, permanently removing it from storage.
+   */
+  purgeAsset: _orpc_contract0.ContractProcedureBuilderWithInputOutput<z$1.ZodUUID, z$1.ZodNullable<drizzle_zod0.BuildSchema<"select", {
     provider: drizzle_orm_pg_core0.PgColumn<{
       name: "provider";
       tableName: "storage_assets";
@@ -1706,7 +1727,10 @@ declare function createStorageProcedures<TSchema extends TDatabaseSchema>(): {
       generated: undefined;
     }, {}, {}>;
   }, undefined, undefined>>, Record<never, never>, Record<never, never>>;
-  purgeAssets: _orpc_server0.DecoratedProcedure<_orpc_server0.MergedInitialContext<RPCContext<TSchema> & Record<never, never>, RPCContext<TSchema> & Record<never, never>, RPCContext<TSchema>>, _orpc_server0.MergedCurrentContext<RPCContext<TSchema>, ProtectedRPCContext<TSchema>>, z$1.ZodArray<z$1.ZodString>, z$1.ZodArray<drizzle_zod0.BuildSchema<"select", {
+  /**
+   * Purge multiple storage assets by their UUIDs, permanently removing them from storage.
+   */
+  purgeAssets: _orpc_contract0.ContractProcedureBuilderWithInputOutput<z$1.ZodArray<z$1.ZodString>, z$1.ZodArray<drizzle_zod0.BuildSchema<"select", {
     provider: drizzle_orm_pg_core0.PgColumn<{
       name: "provider";
       tableName: "storage_assets";
@@ -1983,8 +2007,7 @@ declare function createStorageProcedures<TSchema extends TDatabaseSchema>(): {
     }, {}, {}>;
   }, undefined, undefined>>, Record<never, never>, Record<never, never>>;
 };
-type StorageRouter = ReturnType<typeof createStorageProcedures>;
-type StorageRouterOutputs = InferRouterOutputs<StorageRouter>;
-type StorageRouterInputs = InferRouterInputs<StorageRouter>;
+type StorageRouterContractInputs = InferContractRouterInputs<typeof storageRouterContract>;
+type StorageRouterContractOutputs = InferContractRouterOutputs<typeof storageRouterContract>;
 //#endregion
-export { StorageRouter, StorageRouterInputs, StorageRouterOutputs, createStorageProcedures };
+export { StorageRouterContractInputs, StorageRouterContractOutputs, storageRouterContract };

package/dist/modules/storage/lib/router.server.mjs

@@ -0,0 +1,21 @@
+import { confirmUploadInputSchema, presignUploadInputSchema, presignUploadOutputSchema, selectStorageAssetSchema } from "./validators.mjs";
+import { z as z$1 } from "zod";
+import { oc } from "@orpc/contract";
+
+//#region src/modules/storage/lib/router.server.ts
+/**
+* Storage router contract defines the input and output schemas for storage-related procedures.
+*/
+const storageRouterContract = {
+	presign: oc.input(presignUploadInputSchema).output(presignUploadOutputSchema),
+	confirm: oc.input(confirmUploadInputSchema).output(selectStorageAssetSchema),
+	deleteAsset: oc.input(z$1.uuid()).output(selectStorageAssetSchema.nullable()),
+	deleteAssets: oc.input(z$1.string().array()).output(z$1.array(selectStorageAssetSchema)),
+	restoreAsset: oc.input(z$1.uuid()).output(selectStorageAssetSchema.nullable()),
+	restoreAssets: oc.input(z$1.string().array()).output(z$1.array(selectStorageAssetSchema)),
+	purgeAsset: oc.input(z$1.uuid()).output(selectStorageAssetSchema.nullable()),
+	purgeAssets: oc.input(z$1.string().array()).output(z$1.array(selectStorageAssetSchema))
+};
+
+//#endregion
+export { storageRouterContract };

package/dist/modules/storage/lib/service.server.d.mts

@@ -1,8 +1,8 @@
+import { ConfirmUploadInput, PresignUploadInput, UploadInput } from "./validators.mjs";
 import { TDatabaseSchema } from "../../database/lib/types.mjs";
 import { Database } from "../../database/lib/service.server.mjs";
 import { GetObjectURLOptions } from "../providers/lib/validators.mjs";
 import { StorageAdapter } from "../providers/lib/types.mjs";
-import { ConfirmUploadInput, PresignUploadInput, UploadInput } from "./validators.mjs";
 import * as drizzle_orm_pg_core0 from "drizzle-orm/pg-core";
 import * as node_stream0 from "node:stream";
 
@@ -1915,19 +1915,19 @@ declare class Storage<TSchema extends TDatabaseSchema> {
    */
   presignUpload(props: PresignUploadInput): Promise<{
     presignedUrl: string;
+    key: string;
     id: string;
+    metadata: unknown;
+    name: string | null;
+    status: "error" | "pending" | "ready";
+    contentType: string | null;
+    size: number | null;
     createdAt: Date;
     updatedAt: Date;
-    name: string | null;
-    key: string;
-    metadata: unknown;
     provider: "s3";
     uploadId: string;
     visibility: "private" | "public";
-    size: number | null;
-    contentType: string | null;
     bucket: string;
-    status: "error" | "pending" | "ready";
     etag: string | null;
     uploadedAt: Date;
     deletedAt: Date | null;
@@ -2164,19 +2164,19 @@ declare class Storage<TSchema extends TDatabaseSchema> {
    * @returns The purged asset record, or null if not found
    */
   purgeAsset(input: string): Promise<{
+    key: string;
     id: string;
+    metadata: unknown;
+    name: string | null;
+    status: "error" | "pending" | "ready";
+    contentType: string | null;
+    size: number | null;
     createdAt: Date;
     updatedAt: Date;
-    name: string | null;
-    key: string;
-    metadata: unknown;
     provider: "s3";
     uploadId: string;
     visibility: "private" | "public";
-    size: number | null;
-    contentType: string | null;
     bucket: string;
-    status: "error" | "pending" | "ready";
     etag: string | null;
     uploadedAt: Date;
     deletedAt: Date | null;
@@ -2195,19 +2195,19 @@ declare class Storage<TSchema extends TDatabaseSchema> {
    * @throws {ServerError} If provider deletion fails
    */
   purgeAssets(input: string[]): Promise<{
+    key: string;
     id: string;
+    metadata: unknown;
+    name: string | null;
+    status: "error" | "pending" | "ready";
+    contentType: string | null;
+    size: number | null;
     createdAt: Date;
     updatedAt: Date;
-    name: string | null;
-    key: string;
-    metadata: unknown;
     provider: "s3";
     uploadId: string;
     visibility: "private" | "public";
-    size: number | null;
-    contentType: string | null;
     bucket: string;
-    status: "error" | "pending" | "ready";
     etag: string | null;
     uploadedAt: Date;
     deletedAt: Date | null;

package/dist/modules/storage/lib/upload.client.d.mts

@@ -1,5 +1,4 @@
-import { PresignUploadInput, PresignUploadOutput, SelectStorageAssetSchema } from "./validators.mjs";
-import { StorageRouterInputs, StorageRouterOutputs } from "./procedures.server.mjs";
+import { ConfirmUploadInput, PresignUploadInput, PresignUploadOutput, SelectStorageAssetSchema } from "./validators.mjs";
 
 //#region src/modules/storage/lib/upload.client.d.ts
 /**
@@ -33,14 +32,14 @@ type UploadClient = {
  */
 type CreateStorageClientProps = {
   endpoints: {
-    presign: (input: StorageRouterInputs["presign"]) => Promise<StorageRouterOutputs["presign"]>;
-    confirm: (uploadId: StorageRouterInputs["confirm"]) => Promise<StorageRouterOutputs["confirm"]>;
-    deleteAssets: (ids: StorageRouterInputs["deleteAssets"]) => Promise<StorageRouterOutputs["deleteAssets"]>;
-    deleteAsset: (id: StorageRouterInputs["deleteAsset"]) => Promise<StorageRouterOutputs["deleteAsset"]>;
-    restoreAsset: (id: StorageRouterInputs["restoreAsset"]) => Promise<StorageRouterOutputs["restoreAsset"]>;
-    restoreAssets: (ids: StorageRouterInputs["restoreAssets"]) => Promise<StorageRouterOutputs["restoreAssets"]>;
-    purgeAsset: (id: StorageRouterInputs["purgeAsset"]) => Promise<StorageRouterOutputs["purgeAsset"]>;
-    purgeAssets: (ids: StorageRouterInputs["purgeAssets"]) => Promise<StorageRouterOutputs["purgeAssets"]>;
+    presign: (input: PresignUploadInput) => Promise<PresignUploadOutput>;
+    confirm: (uploadId: ConfirmUploadInput) => Promise<SelectStorageAssetSchema>;
+    deleteAsset: (id: string) => Promise<SelectStorageAssetSchema | null>;
+    deleteAssets: (ids: string[]) => Promise<SelectStorageAssetSchema[]>;
+    restoreAsset: (id: string) => Promise<SelectStorageAssetSchema | null>;
+    restoreAssets: (ids: string[]) => Promise<SelectStorageAssetSchema[]>;
+    purgeAsset: (id: string) => Promise<SelectStorageAssetSchema | null>;
+    purgeAssets: (ids: string[]) => Promise<SelectStorageAssetSchema[]>;
   };
 };
 /**

package/dist/router/client.d.mts

@@ -1,2 +1,2 @@
-import { createRPCClient } from "../src/modules/router/handler/caller.client.mjs";
+import { createRPCClient } from "../modules/router/handler/caller.client.mjs";
 export { createRPCClient };