@tulip-systems/core 0.10.1 → 0.10.2

package/dist/router/server.mjs

@@ -1,9 +1,8 @@
-import { ServerError } from "../src/modules/router/lib/error.server.mjs";
-import { HydrateClient, getQueryClient } from "../src/modules/router/lib/query-client.server.mjs";
-import { createRPCCaller } from "../src/modules/router/handler/caller.server.mjs";
-import { createRPCContext } from "../src/modules/router/handler/context.server.mjs";
-import { initRPC } from "../src/modules/router/handler/init.server.mjs";
-import { registerRouterClient } from "../src/modules/router/handler/register.server.mjs";
-import { handleRPCRoute } from "../src/modules/router/handler/route.server.mjs";
+import { ServerError } from "../modules/router/lib/error.server.mjs";
+import { HydrateClient, getServerQueryClient } from "../modules/router/lib/query-client.server.mjs";
+import { createRPCCaller } from "../modules/router/handler/caller.server.mjs";
+import { RPC } from "../modules/router/handler/init.server.mjs";
+import { registerRouterClient } from "../modules/router/handler/register.server.mjs";
+import { handleRPCRoute } from "../modules/router/handler/route.server.mjs";
 
-export { HydrateClient, ServerError, createRPCCaller, createRPCContext, getQueryClient, handleRPCRoute, initRPC, registerRouterClient };
+export { HydrateClient, RPC, ServerError, createRPCCaller, getServerQueryClient, handleRPCRoute, registerRouterClient };

package/dist/router.d.mts

@@ -1,3 +1,3 @@
-import { createQueryClient, getQueryClient } from "./src/modules/router/lib/query-client.mjs";
-import { BulkActionSchema, bulkActionSchema } from "./src/modules/router/lib/validators.mjs";
+import { createQueryClient, getQueryClient } from "./modules/router/lib/query-client.mjs";
+import { BulkActionSchema, bulkActionSchema } from "./modules/router/lib/validators.mjs";
 export { BulkActionSchema, bulkActionSchema, createQueryClient, getQueryClient };

package/dist/router.mjs

@@ -1,4 +1,4 @@
-import { createQueryClient, getQueryClient } from "./src/modules/router/lib/query-client.mjs";
-import { bulkActionSchema } from "./src/modules/router/lib/validators.mjs";
+import { createQueryClient, getQueryClient } from "./modules/router/lib/query-client.mjs";
+import { bulkActionSchema } from "./modules/router/lib/validators.mjs";
 
 export { bulkActionSchema, createQueryClient, getQueryClient };

package/dist/storage/client.d.mts

@@ -1,9 +1,9 @@
-import { PrepareUploadInput, UploadClient, UploadFileRequest, UploadHooks, createUploadClient } from "../src/modules/storage/lib/upload.client.mjs";
-import { Dropzone, DropzoneContent, DropzoneContentProps, DropzoneEmptyState, DropzoneEmptyStateProps, DropzoneProps } from "../src/modules/storage/components/dropzone.client.mjs";
-import { DropzoneContext, useDropzoneContext } from "../src/modules/storage/components/dropzone-context.client.mjs";
-import { StorageImage } from "../src/modules/storage/components/image.client.mjs";
-import { ImageGrid, ImageGridSkeleton } from "../src/modules/storage/components/image-grid.client.mjs";
-import { UploadButton } from "../src/modules/storage/components/upload-button.client.mjs";
-import { UploadZoneContext, UploadZoneContextValue, useUploadZone } from "../src/modules/storage/components/upload-zone-context.client.mjs";
-import { UploadZone, UploadZoneProps } from "../src/modules/storage/components/upload-zone.client.mjs";
+import { PrepareUploadInput, UploadClient, UploadFileRequest, UploadHooks, createUploadClient } from "../modules/storage/lib/upload.client.mjs";
+import { Dropzone, DropzoneContent, DropzoneContentProps, DropzoneEmptyState, DropzoneEmptyStateProps, DropzoneProps } from "../modules/storage/components/dropzone.client.mjs";
+import { DropzoneContext, useDropzoneContext } from "../modules/storage/components/dropzone-context.client.mjs";
+import { StorageImage } from "../modules/storage/components/image.client.mjs";
+import { ImageGrid, ImageGridSkeleton } from "../modules/storage/components/image-grid.client.mjs";
+import { UploadButton } from "../modules/storage/components/upload-button.client.mjs";
+import { UploadZoneContext, UploadZoneContextValue, useUploadZone } from "../modules/storage/components/upload-zone-context.client.mjs";
+import { UploadZone, UploadZoneProps } from "../modules/storage/components/upload-zone.client.mjs";
 export { Dropzone, DropzoneContent, DropzoneContentProps, DropzoneContext, DropzoneEmptyState, DropzoneEmptyStateProps, DropzoneProps, ImageGrid, ImageGridSkeleton, PrepareUploadInput, StorageImage, UploadButton, UploadClient, UploadFileRequest, UploadHooks, UploadZone, UploadZoneContext, UploadZoneContextValue, UploadZoneProps, createUploadClient, useDropzoneContext, useUploadZone };

package/dist/storage/client.mjs

@@ -1,10 +1,10 @@
-import { DropzoneContext, useDropzoneContext } from "../src/modules/storage/components/dropzone-context.client.mjs";
-import { Dropzone, DropzoneContent, DropzoneEmptyState } from "../src/modules/storage/components/dropzone.client.mjs";
-import { StorageImage } from "../src/modules/storage/components/image.client.mjs";
-import { UploadZoneContext, useUploadZone } from "../src/modules/storage/components/upload-zone-context.client.mjs";
-import { ImageGrid, ImageGridSkeleton } from "../src/modules/storage/components/image-grid.client.mjs";
-import { UploadButton } from "../src/modules/storage/components/upload-button.client.mjs";
-import { UploadZone } from "../src/modules/storage/components/upload-zone.client.mjs";
-import { createUploadClient } from "../src/modules/storage/lib/upload.client.mjs";
+import { DropzoneContext, useDropzoneContext } from "../modules/storage/components/dropzone-context.client.mjs";
+import { Dropzone, DropzoneContent, DropzoneEmptyState } from "../modules/storage/components/dropzone.client.mjs";
+import { StorageImage } from "../modules/storage/components/image.client.mjs";
+import { UploadZoneContext, useUploadZone } from "../modules/storage/components/upload-zone-context.client.mjs";
+import { ImageGrid, ImageGridSkeleton } from "../modules/storage/components/image-grid.client.mjs";
+import { UploadButton } from "../modules/storage/components/upload-button.client.mjs";
+import { UploadZone } from "../modules/storage/components/upload-zone.client.mjs";
+import { createUploadClient } from "../modules/storage/lib/upload.client.mjs";
 
 export { Dropzone, DropzoneContent, DropzoneContext, DropzoneEmptyState, ImageGrid, ImageGridSkeleton, StorageImage, UploadButton, UploadZone, UploadZoneContext, createUploadClient, useDropzoneContext, useUploadZone };

package/dist/storage/server.d.mts

@@ -1,5 +1,5 @@
-import { Storage, StorageConfig } from "../src/modules/storage/lib/service.server.mjs";
-import { createStorageRouteHandler } from "../src/modules/storage/lib/router-handlers.server.mjs";
-import { StorageS3AdapterConfig, storageS3Adapter } from "../src/modules/storage/providers/adapters/s3.server.mjs";
-import { StorageRouter, StorageRouterInputs, StorageRouterOutputs, createStorageProcedures } from "../src/modules/storage/lib/procedures.server.mjs";
-export { Storage, StorageConfig, StorageRouter, StorageRouterInputs, StorageRouterOutputs, StorageS3AdapterConfig, createStorageProcedures, createStorageRouteHandler, storageS3Adapter };
+import { Storage, StorageConfig } from "../modules/storage/lib/service.server.mjs";
+import { StorageRouterContractInputs, StorageRouterContractOutputs, storageRouterContract } from "../modules/storage/lib/router.server.mjs";
+import { createStorageRouteHandler } from "../modules/storage/lib/router-handlers.server.mjs";
+import { StorageS3AdapterConfig, storageS3Adapter } from "../modules/storage/providers/adapters/s3.server.mjs";
+export { Storage, StorageConfig, StorageRouterContractInputs, StorageRouterContractOutputs, StorageS3AdapterConfig, createStorageRouteHandler, storageRouterContract, storageS3Adapter };

package/dist/storage/server.mjs

@@ -1,6 +1,6 @@
-import { createStorageProcedures } from "../src/modules/storage/lib/procedures.server.mjs";
-import { createStorageRouteHandler } from "../src/modules/storage/lib/router-handlers.server.mjs";
-import { Storage } from "../src/modules/storage/lib/service.server.mjs";
-import { storageS3Adapter } from "../src/modules/storage/providers/adapters/s3.server.mjs";
+import { storageRouterContract } from "../modules/storage/lib/router.server.mjs";
+import { createStorageRouteHandler } from "../modules/storage/lib/router-handlers.server.mjs";
+import { Storage } from "../modules/storage/lib/service.server.mjs";
+import { storageS3Adapter } from "../modules/storage/providers/adapters/s3.server.mjs";
 
-export { Storage, createStorageProcedures, createStorageRouteHandler, storageS3Adapter };
+export { Storage, createStorageRouteHandler, storageRouterContract, storageS3Adapter };

package/dist/storage.d.mts

@@ -1,9 +1,9 @@
-import { StorageProvider, storageProviders } from "./src/modules/storage/providers/lib/constants.mjs";
-import { GetObjectInput, GetObjectOptions, GetObjectOutput, GetObjectURLOptions, HeadObjectInput, HeadObjectOutput, ObjectBodyInput, ObjectBodyOutput, ObjectSchema, PutObjectInput, PutObjectOutput, PutObjectURLInput, PutObjectURLOptions, getObjectInputSchema, getObjectOptionsDefaults, getObjectOptionsSchema, getObjectOutputSchema, getObjectURLOptionsSchema, headObjectInputSchema, headObjectOutputSchema, objectBodyInputSchema, objectBodyOutputSchema, objectSchema, putObjectInputSchema, putObjectOutputSchema, putObjectURLInputSchema, putObjectURLOptionsSchema } from "./src/modules/storage/providers/lib/validators.mjs";
-import { StorageAdapter } from "./src/modules/storage/providers/lib/types.mjs";
-import { storageAssetStatusEnum, storageAssetVisibilityEnum, storageAssets } from "./src/modules/storage/lib/schema.mjs";
-import { ConfirmUploadInput, CreateStorageAssetInput, CreateStorageAssetSchema, GetAssetURLInput, GetAssetURLSchema, PresignUploadInput, PresignUploadOutput, SelectStorageAssetSchema, StorageAsset, StorageAssetVisibility, UpdateStorageAssetInput, UpdateStorageAssetSchema, UploadInput, confirmUploadInputSchema, createStorageAssetSchema, getAssetURLSchema, presignUploadInputSchema, presignUploadOutputSchema, selectStorageAssetSchema, storageAssetVisibilitySchema, updateStorageAssetSchema, uploadInputSchema } from "./src/modules/storage/lib/validators.mjs";
-import { ImageDisposition, imageDispositions } from "./src/modules/storage/lib/constants.mjs";
-import { getAssetURL, imageLoader, renderBytes } from "./src/modules/storage/lib/helpers.mjs";
-import { StorageAdapterError, StorageAdapterErrorCode } from "./src/modules/storage/providers/lib/errors.mjs";
+import { storageAssetStatusEnum, storageAssetVisibilityEnum, storageAssets } from "./modules/storage/lib/schema.mjs";
+import { ConfirmUploadInput, CreateStorageAssetInput, CreateStorageAssetSchema, GetAssetURLInput, GetAssetURLSchema, PresignUploadInput, PresignUploadOutput, SelectStorageAssetSchema, StorageAsset, StorageAssetVisibility, UpdateStorageAssetInput, UpdateStorageAssetSchema, UploadInput, confirmUploadInputSchema, createStorageAssetSchema, getAssetURLSchema, presignUploadInputSchema, presignUploadOutputSchema, selectStorageAssetSchema, storageAssetVisibilitySchema, updateStorageAssetSchema, uploadInputSchema } from "./modules/storage/lib/validators.mjs";
+import { StorageProvider, storageProviders } from "./modules/storage/providers/lib/constants.mjs";
+import { GetObjectInput, GetObjectOptions, GetObjectOutput, GetObjectURLOptions, HeadObjectInput, HeadObjectOutput, ObjectBodyInput, ObjectBodyOutput, ObjectSchema, PutObjectInput, PutObjectOutput, PutObjectURLInput, PutObjectURLOptions, getObjectInputSchema, getObjectOptionsDefaults, getObjectOptionsSchema, getObjectOutputSchema, getObjectURLOptionsSchema, headObjectInputSchema, headObjectOutputSchema, objectBodyInputSchema, objectBodyOutputSchema, objectSchema, putObjectInputSchema, putObjectOutputSchema, putObjectURLInputSchema, putObjectURLOptionsSchema } from "./modules/storage/providers/lib/validators.mjs";
+import { StorageAdapter } from "./modules/storage/providers/lib/types.mjs";
+import { ImageDisposition, imageDispositions } from "./modules/storage/lib/constants.mjs";
+import { getAssetURL, imageLoader, renderBytes } from "./modules/storage/lib/helpers.mjs";
+import { StorageAdapterError, StorageAdapterErrorCode } from "./modules/storage/providers/lib/errors.mjs";
 export { ConfirmUploadInput, CreateStorageAssetInput, CreateStorageAssetSchema, GetAssetURLInput, GetAssetURLSchema, GetObjectInput, GetObjectOptions, GetObjectOutput, GetObjectURLOptions, HeadObjectInput, HeadObjectOutput, ImageDisposition, ObjectBodyInput, ObjectBodyOutput, ObjectSchema, PresignUploadInput, PresignUploadOutput, PutObjectInput, PutObjectOutput, PutObjectURLInput, PutObjectURLOptions, SelectStorageAssetSchema, StorageAdapter, StorageAdapterError, StorageAdapterErrorCode, StorageAsset, StorageAssetVisibility, StorageProvider, UpdateStorageAssetInput, UpdateStorageAssetSchema, UploadInput, confirmUploadInputSchema, createStorageAssetSchema, getAssetURL, getAssetURLSchema, getObjectInputSchema, getObjectOptionsDefaults, getObjectOptionsSchema, getObjectOutputSchema, getObjectURLOptionsSchema, headObjectInputSchema, headObjectOutputSchema, imageDispositions, imageLoader, objectBodyInputSchema, objectBodyOutputSchema, objectSchema, presignUploadInputSchema, presignUploadOutputSchema, putObjectInputSchema, putObjectOutputSchema, putObjectURLInputSchema, putObjectURLOptionsSchema, renderBytes, selectStorageAssetSchema, storageAssetStatusEnum, storageAssetVisibilityEnum, storageAssetVisibilitySchema, storageAssets, storageProviders, updateStorageAssetSchema, uploadInputSchema };

package/dist/storage.mjs

@@ -1,9 +1,9 @@
-import { imageDispositions } from "./src/modules/storage/lib/constants.mjs";
-import { getAssetURL, imageLoader, renderBytes } from "./src/modules/storage/lib/helpers.mjs";
-import { storageProviders } from "./src/modules/storage/providers/lib/constants.mjs";
-import { storageAssetStatusEnum, storageAssetVisibilityEnum, storageAssets } from "./src/modules/storage/lib/schema.mjs";
-import { getObjectInputSchema, getObjectOptionsDefaults, getObjectOptionsSchema, getObjectOutputSchema, getObjectURLOptionsSchema, headObjectInputSchema, headObjectOutputSchema, objectBodyInputSchema, objectBodyOutputSchema, objectSchema, putObjectInputSchema, putObjectOutputSchema, putObjectURLInputSchema, putObjectURLOptionsSchema } from "./src/modules/storage/providers/lib/validators.mjs";
-import { confirmUploadInputSchema, createStorageAssetSchema, getAssetURLSchema, presignUploadInputSchema, presignUploadOutputSchema, selectStorageAssetSchema, storageAssetVisibilitySchema, updateStorageAssetSchema, uploadInputSchema } from "./src/modules/storage/lib/validators.mjs";
-import { StorageAdapterError } from "./src/modules/storage/providers/lib/errors.mjs";
+import { imageDispositions } from "./modules/storage/lib/constants.mjs";
+import { getAssetURL, imageLoader, renderBytes } from "./modules/storage/lib/helpers.mjs";
+import { storageProviders } from "./modules/storage/providers/lib/constants.mjs";
+import { storageAssetStatusEnum, storageAssetVisibilityEnum, storageAssets } from "./modules/storage/lib/schema.mjs";
+import { getObjectInputSchema, getObjectOptionsDefaults, getObjectOptionsSchema, getObjectOutputSchema, getObjectURLOptionsSchema, headObjectInputSchema, headObjectOutputSchema, objectBodyInputSchema, objectBodyOutputSchema, objectSchema, putObjectInputSchema, putObjectOutputSchema, putObjectURLInputSchema, putObjectURLOptionsSchema } from "./modules/storage/providers/lib/validators.mjs";
+import { confirmUploadInputSchema, createStorageAssetSchema, getAssetURLSchema, presignUploadInputSchema, presignUploadOutputSchema, selectStorageAssetSchema, storageAssetVisibilitySchema, updateStorageAssetSchema, uploadInputSchema } from "./modules/storage/lib/validators.mjs";
+import { StorageAdapterError } from "./modules/storage/providers/lib/errors.mjs";
 
 export { StorageAdapterError, confirmUploadInputSchema, createStorageAssetSchema, getAssetURL, getAssetURLSchema, getObjectInputSchema, getObjectOptionsDefaults, getObjectOptionsSchema, getObjectOutputSchema, getObjectURLOptionsSchema, headObjectInputSchema, headObjectOutputSchema, imageDispositions, imageLoader, objectBodyInputSchema, objectBodyOutputSchema, objectSchema, presignUploadInputSchema, presignUploadOutputSchema, putObjectInputSchema, putObjectOutputSchema, putObjectURLInputSchema, putObjectURLOptionsSchema, renderBytes, selectStorageAssetSchema, storageAssetStatusEnum, storageAssetVisibilityEnum, storageAssetVisibilitySchema, storageAssets, storageProviders, updateStorageAssetSchema, uploadInputSchema };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tulip-systems/core",
-  "version": "0.10.1",
+  "version": "0.10.2",
   "type": "module",
   "sideEffects": false,
   "license": "AGPL-3.0",
@@ -31,7 +31,7 @@
     "@dnd-kit/utilities": "^3.2.2",
     "@hookform/resolvers": "^5.2.2",
     "@orpc/client": "^1.14.2",
-    "@orpc/contract": "^1.14.2",
+    "@orpc/contract": "1.14.2",
     "@orpc/server": "^1.14.2",
     "@orpc/tanstack-query": "^1.14.2",
     "@tanstack/react-query": "^5.100.9",

package/src/lib/utils/url.ts

@@ -1,13 +1,24 @@
 /**
- * Get the production url for a path
- * @param {string} path
- * @returns {string}
+ * Builds an absolute application URL for the given path.
+ *
+ * Uses `NEXT_PUBLIC_HOST` as the host name and port, and defaults to the
+ * protocol from `NEXT_PUBLIC_URL_PROTOCOL` or `"https"` when not provided.
+ *
+ * `NEXT_PUBLIC_HOST` must not include the protocol.
+ *
+ * @param path The path to append to the application origin. Defaults to `/`.
+ * @param options Optional URL settings.
+ * @param options.protocol Overrides the protocol for this URL.
+ * @returns The fully qualified URL.
+ * @throws {Error} If `NEXT_PUBLIC_HOST` is not defined.
  */
-export function url(path: string = ""): string {
-  const base = process.env.NEXT_PUBLIC_DEPLOYMENT_URL ?? process.env.NEXT_PUBLIC_VERCEL_URL;
-  const protocol = process.env.NODE_ENV === "production" ? "https" : "http";
+export function url(path = "", options: { protocol?: "http" | "https" } = {}): string {
+  const host = process.env.NEXT_PUBLIC_HOST;
+  const protocol = options.protocol ?? process.env.NEXT_PUBLIC_URL_PROTOCOL ?? "https";
 
-  if (base) return `${protocol}://${base}${path}`;
+  if (!host) {
+    throw new Error("NEXT_PUBLIC_HOST is not defined in the environment variables.");
+  }
 
-  return `http://localhost:${process.env.NEXT_PUBLIC_PORT ?? 3000}${path}`;
+  return new URL(path || "/", `${protocol}://${host}`).toString();
 }

package/src/modules/auth/components/create-first-user-guard.server.tsx

@@ -3,12 +3,13 @@ import "server-cli-only";
 import { redirect } from "next/navigation";
 import { connection } from "next/server";
 import type { PropsWithChildren } from "react";
-import type { TDatabaseSchema, TulipContext } from "@/modules/config/entry";
+import type { Database } from "@/modules/database/lib/service.server";
+import type { TDatabaseSchema } from "@/modules/database/lib/types";
 import { users } from "../db/schema";
 
-type AuthGuardFirstUserProps<TSchema extends TDatabaseSchema> = PropsWithChildren<
-  Pick<TulipContext<TSchema>, "db">
->;
+type AuthGuardFirstUserProps<TSchema extends TDatabaseSchema> = PropsWithChildren<{
+  db: Database<TSchema>;
+}>;
 
 export async function CreateFirstUserPageGuard<TSchema extends TDatabaseSchema>({
   children,

package/src/modules/auth/components/create-first-user-page.client.tsx

@@ -20,12 +20,17 @@ import {
   FormMessage,
 } from "@/components/ui/form.client";
 import { Input } from "@/components/ui/input";
+import type {
+  AuthClient,
+  AuthClientInferAdditionalFieldsPlugin,
+} from "../handler/create-client.client";
 import { useAuthClient } from "../hooks/use-auth-client";
 import { createUserSchema } from "../lib/validators";
 
 export function CreateFirstUserPage() {
   const router = useRouter();
-  const authClient = useAuthClient();
+  const authClient =
+    useAuthClient<AuthClient<{ plugins: [AuthClientInferAdditionalFieldsPlugin] }>>();
   const [callbackURL] = useQueryState("callbackURL", parseAsString);
   const [showPassword, setShowPassword] = useState(false);
 

package/src/modules/auth/components/forget-password-page.client.tsx

@@ -9,11 +9,12 @@ import { Icons } from "@/components/common/icons";
 import { Button } from "@/components/ui/button";
 import { Form, FormControl, FormField, FormItem, FormMessage } from "@/components/ui/form.client";
 import { Input } from "@/components/ui/input";
+import type { AuthClient, AuthClientEmailOtpPlugin } from "../handler/create-client.client";
 import { useAuthClient } from "../hooks/use-auth-client";
 import { forgotPasswordSchema } from "../lib/validators";
 
 export function ForgetPasswordPage() {
-  const authClient = useAuthClient();
+  const authClient = useAuthClient<AuthClient<{ plugins: [AuthClientEmailOtpPlugin] }>>();
   const [isPending, startTransition] = React.useTransition();
 
   const form = useForm<z.infer<typeof forgotPasswordSchema>>({
@@ -45,7 +46,7 @@ export function ForgetPasswordPage() {
                         "We hebben je een email verzonden om je wachtwoord te herstellen.",
                     });
                   },
-                  onError: ({ error }) => {
+                  onError: ({ error }: { error: unknown }) => {
                     console.error("Error: ", error);
                     toast.error("Er is iets misgegaan");
                   },

package/src/modules/auth/components/guard.server.tsx

@@ -2,19 +2,18 @@ import "server-cli-only";
 
 import { redirect } from "next/navigation";
 import type { PropsWithChildren } from "react";
-import type { TDatabaseSchema, TulipContext } from "@/modules/config/entry";
-import { getQueryClient } from "@/modules/router/lib/query-client";
-import { HydrateClient } from "@/modules/router/lib/query-client.server";
+import { getServerQueryClient, HydrateClient } from "@/modules/router/lib/query-client.server";
+import type { Auth, TAuthServerOptions } from "../handler/service.server";
 import { getSession } from "../lib/helpers.server";
 
-export async function AuthGuard<TSchema extends TDatabaseSchema>({
+export async function AuthGuard<TAuthOptions extends TAuthServerOptions>({
   children,
   auth,
-}: PropsWithChildren<Pick<TulipContext<TSchema>, "auth">>) {
-  const session = await getSession({ auth });
+}: PropsWithChildren<{ auth: Auth<TAuthOptions> }>) {
+  const session = await getSession(auth);
   if (!session) redirect("/auth/login");
 
-  const queryClient = getQueryClient();
+  const queryClient = getServerQueryClient();
   queryClient.prefetchQuery({
     queryKey: ["session"],
     queryFn: async () => session,

package/src/modules/auth/components/login-page.client.tsx

@@ -14,6 +14,7 @@ import { Icons } from "@/components/common/icons";
 import { Button } from "@/components/ui/button";
 import { Form, FormControl, FormField, FormItem, FormMessage } from "@/components/ui/form.client";
 import { Input } from "@/components/ui/input";
+import type { AuthClient, AuthClientPasskeyPlugin } from "../handler/create-client.client";
 import { useAuthClient } from "../hooks/use-auth-client";
 import { loginSchema } from "../lib/validators";
 
@@ -25,7 +26,8 @@ type LoginPageProps = {
 
 export function LoginPage(props: LoginPageProps) {
   const router = useRouter();
-  const authClient = useAuthClient();
+  const authClient = useAuthClient<AuthClient<{ plugins: [AuthClientPasskeyPlugin] }>>();
+
   const [callbackURL] = useQueryState("callbackURL", parseAsString);
   const [showPassword, setShowPassword] = useState(false);
 

package/src/modules/auth/components/reset-password-page.client.tsx

@@ -18,6 +18,7 @@ import {
   FormMessage,
 } from "@/components/ui/form.client";
 import { Input } from "@/components/ui/input";
+import type { AuthClient, AuthClientEmailOtpPlugin } from "../handler/create-client.client";
 import { useAuthClient } from "../hooks/use-auth-client";
 import { resetPasswordSchema } from "../lib/validators";
 
@@ -27,7 +28,7 @@ export function ResetPasswordPage(params: {
   const { email, otp } = use(params.searchParams);
 
   const router = useRouter();
-  const authClient = useAuthClient();
+  const authClient = useAuthClient<AuthClient<{ plugins: [AuthClientEmailOtpPlugin] }>>();
 
   const [showPassword, setShowPassword] = useState(false);
   const [showPasswordConfirm, setShowPasswordConfirm] = useState(false);
@@ -61,7 +62,7 @@ export function ResetPasswordPage(params: {
                     });
                     router.replace("/auth/login");
                   },
-                  onError: ({ error }) => {
+                  onError: ({ error }: { error: unknown }) => {
                     console.error("Error: ", error);
                     toast.error("Er is iets misgegaan");
                   },

package/src/modules/auth/db/schema.ts

@@ -1,6 +1,6 @@
 import { relations, type SQL, sql } from "drizzle-orm";
 import { pgTable } from "drizzle-orm/pg-core";
-import { baseColumns } from "@/modules/config/entry";
+import { baseColumns } from "@/modules/database/lib/helpers";
 
 /**
  * Users

package/src/modules/auth/entry.server.ts

@@ -10,7 +10,6 @@ export * from "./handler/route.server";
  * Handlers
  */
 export * from "./handler/service.server";
-
 /**
  * Lib
  **/

package/src/modules/auth/handler/create-client.client.ts

@@ -1,53 +1,55 @@
 import "client-only";
 
-import { passkeyClient } from "@better-auth/passkey/client";
-import { adminClient, emailOTPClient, inferAdditionalFields } from "better-auth/client/plugins";
-import type { AccessControl, Role } from "better-auth/plugins";
+import type { passkeyClient } from "@better-auth/passkey/client";
+import type { BetterAuthClientOptions } from "better-auth";
+import type {
+  adminClient,
+  emailOTPClient,
+  inferAdditionalFields,
+} from "better-auth/client/plugins";
 import { createAuthClient as createBetterAuthClient } from "better-auth/react";
-import { url } from "@/lib/utils/url";
-import type { Auth } from "./service.server";
+import type { AdminClientOptions } from "../plugins/admin";
+import type { Auth, authAdditionalFields } from "./service.server";
+
+export type AuthClientOptions = BetterAuthClientOptions;
 
 /**
  * Create auth client
  */
-export type CreateAuthClientProps<
-  TAccessControl extends AccessControl,
-  TRoles extends { [key in string]: Role },
-> = {
-  /**
-   * Base URL for the auth client
-   */
-  baseURL?: string;
-  /**
-   * Access control instance
-   */
-  ac: TAccessControl;
-  roles: TRoles;
-};
-
-export function createAuthClient<
-  TAccessControl extends AccessControl,
-  TRoles extends { [key in string]: Role },
->(props: CreateAuthClientProps<TAccessControl, TRoles>) {
-  const { ac, roles } = props;
-
-  const baseURL = props.baseURL ?? url();
-
-  return createBetterAuthClient({
-    baseURL,
-    plugins: [
-      emailOTPClient(),
-      passkeyClient(),
-      adminClient({ ac, roles }),
-      inferAdditionalFields<Auth>(),
-    ],
-  });
+export function createAuthClient<TOptions extends AuthClientOptions>(
+  props: TOptions | undefined,
+): AuthClient<TOptions> {
+  return createBetterAuthClient<TOptions>(props) as unknown as AuthClient<TOptions>;
 }
 
+/**
+ * Any auth client
+ */
+declare const authClientMarker: unique symbol;
+
+export type AnyAuthClient = {
+  readonly [authClientMarker]: true;
+};
+
 /**
  * Client auth type
  */
-export type ClientAuth<
-  TAccessControl extends AccessControl,
-  TRoles extends { [key in string]: Role },
-> = ReturnType<typeof createAuthClient<TAccessControl, TRoles>>;
+export type BaseAuthClient<TOptions extends AuthClientOptions> = ReturnType<
+  typeof createBetterAuthClient<TOptions>
+>;
+
+export type AuthClient<TOptions extends AuthClientOptions> = BaseAuthClient<TOptions> & AnyAuthClient;
+
+/**
+ * Auth client plugins types
+ */
+export type AuthClientEmailOtpPlugin = ReturnType<typeof emailOTPClient>;
+export type AuthClientPasskeyPlugin = ReturnType<typeof passkeyClient>;
+
+export type AuthClientInferAdditionalFieldsPlugin = ReturnType<
+  typeof inferAdditionalFields<Auth<{ user: { additionalFields: typeof authAdditionalFields } }>>
+>;
+
+export type AuthClientAdminPlugin<TAdminClientOptions extends AdminClientOptions> = ReturnType<
+  typeof adminClient<TAdminClientOptions>
+>;

package/src/modules/auth/handler/proxy.server.ts

@@ -5,7 +5,7 @@ import { authCookiePrefix } from "./service.server";
 /**
  * Create auth proxy
  */
-export function createAuthProxy(props: { publicRoutes: string[] }) {
+export function createAuthProxy(props: { publicRoutes: string[]; cookiePrefix?: string }) {
   return (req: NextRequest) => {
     // 1. Check if the current route is protected or public
     const pathname = req.nextUrl.pathname;
@@ -15,7 +15,9 @@ export function createAuthProxy(props: { publicRoutes: string[] }) {
     );
 
     // 2. Check if a session cookie is present
-    const sessionCookie = getSessionCookie(req, { cookiePrefix: authCookiePrefix });
+    const sessionCookie = getSessionCookie(req, {
+      cookiePrefix: props.cookiePrefix ?? authCookiePrefix,
+    });
 
     // 3. Redirect to /auth/login if the user is not authenticated
     if (!isPublicRoute && !sessionCookie) {

package/src/modules/auth/handler/route.server.ts

@@ -1,17 +1,18 @@
+import "server-cli-only";
+
 import { toNextJsHandler } from "better-auth/next-js";
 import type { NextRequest } from "next/server";
-import "server-cli-only";
-import type { Auth } from "./service.server";
+import type { Auth, TAuthServerOptions } from "./service.server";
 
 /**
  * Handle the auth routes
  */
-export function handleAuthRoute(props: { auth: Auth }) {
+export function handleAuthRoute<TOptions extends TAuthServerOptions>(auth: Auth<TOptions>) {
   /**
    * GET route handler
    */
   async function GET(request: NextRequest) {
-    const routes = toNextJsHandler(props.auth.handler);
+    const routes = toNextJsHandler(auth.handler);
     return routes.GET(request);
   }
 
@@ -19,7 +20,7 @@ export function handleAuthRoute(props: { auth: Auth }) {
    * POST route handler
    */
   async function POST(request: NextRequest) {
-    const routes = toNextJsHandler(props.auth.handler);
+    const routes = toNextJsHandler(auth.handler);
     return routes.POST(request);
   }