@tulip-systems/core 0.4.1 → 0.5.1

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

@@ -1,3 +1,4 @@
+import { baseColumns } from "@/modules/config/entry";
 import { relations, sql, SQL } from "drizzle-orm";
 import { pgTable } from "drizzle-orm/pg-core";
 
@@ -5,7 +6,7 @@ import { pgTable } from "drizzle-orm/pg-core";
  * Users
  */
 export const users = pgTable("users", (t) => ({
-  id: t.text().primaryKey(),
+  ...baseColumns,
   name: t
     .varchar()
     .notNull()
@@ -15,8 +16,6 @@ export const users = pgTable("users", (t) => ({
   email: t.text().notNull().unique(),
   emailVerified: t.boolean().notNull(),
   image: t.text(),
-  createdAt: t.timestamp().notNull(),
-  updatedAt: t.timestamp().notNull(),
   role: t.text(),
   banned: t.boolean(),
   banReason: t.text(),
@@ -34,18 +33,16 @@ export const usersRelations = relations(users, ({ many }) => ({
  * Sessions
  */
 export const sessions = pgTable("sessions", (t) => ({
-  id: t.text().primaryKey(),
+  ...baseColumns,
   expiresAt: t.timestamp().notNull(),
   token: t.text().notNull().unique(),
-  createdAt: t.timestamp().notNull(),
-  updatedAt: t.timestamp().notNull(),
   ipAddress: t.text(),
   userAgent: t.text(),
+  impersonatedBy: t.text(),
   userId: t
-    .text()
+    .uuid()
     .notNull()
     .references(() => users.id, { onDelete: "cascade" }),
-  impersonatedBy: t.text(),
 }));
 
 export const sessionsRelations = relations(sessions, ({ one }) => ({
@@ -59,13 +56,9 @@ export const sessionsRelations = relations(sessions, ({ one }) => ({
  * Accounts
  */
 export const accounts = pgTable("accounts", (t) => ({
-  id: t.text().primaryKey(),
+  ...baseColumns,
   accountId: t.text().notNull(),
   providerId: t.text().notNull(),
-  userId: t
-    .text()
-    .notNull()
-    .references(() => users.id, { onDelete: "cascade" }),
   accessToken: t.text(),
   refreshToken: t.text(),
   idToken: t.text(),
@@ -73,8 +66,10 @@ export const accounts = pgTable("accounts", (t) => ({
   refreshTokenExpiresAt: t.timestamp(),
   scope: t.text(),
   password: t.text(),
-  createdAt: t.timestamp().notNull(),
-  updatedAt: t.timestamp().notNull(),
+  userId: t
+    .uuid()
+    .notNull()
+    .references(() => users.id, { onDelete: "cascade" }),
 }));
 
 export const accountsRelations = relations(accounts, ({ one }) => ({
@@ -88,12 +83,10 @@ export const accountsRelations = relations(accounts, ({ one }) => ({
  * Verifications
  */
 export const verifications = pgTable("verifications", (t) => ({
-  id: t.text().primaryKey(),
+  ...baseColumns,
   identifier: t.text().notNull(),
   value: t.text().notNull(),
   expiresAt: t.timestamp().notNull(),
-  createdAt: t.timestamp(),
-  updatedAt: t.timestamp(),
 }));
 
 export const verificationsRelations = relations(verifications, ({ one }) => ({
@@ -107,7 +100,7 @@ export const verificationsRelations = relations(verifications, ({ one }) => ({
  * Passkeys
  */
 export const passkeys = pgTable("passkeys", (t) => ({
-  id: t.text().primaryKey(),
+  ...baseColumns,
   name: t.text(),
   publicKey: t.text().notNull(),
   credentialID: t.text().notNull(),
@@ -115,10 +108,9 @@ export const passkeys = pgTable("passkeys", (t) => ({
   deviceType: t.text().notNull(),
   backedUp: t.boolean().notNull(),
   transports: t.text(),
-  createdAt: t.timestamp("created_at"),
   aaguid: t.text(),
   userId: t
-    .text()
+    .uuid()
     .notNull()
     .references(() => users.id, { onDelete: "cascade" }),
 }));

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

@@ -4,8 +4,10 @@ import { passkeyClient } from "@better-auth/passkey/client";
 import { adminClient, emailOTPClient, inferAdditionalFields } from "better-auth/client/plugins";
 import { createAuthClient } from "better-auth/react";
 import { AuthClient } from "./init";
+import { url } from "@/lib/utils/url";
 
 export const authClient = createAuthClient({
+  baseURL: url(),
   plugins: [emailOTPClient(), passkeyClient(), adminClient(), inferAdditionalFields<AuthClient>()],
 });
 

package/src/modules/auth/handler/init.ts

@@ -28,11 +28,14 @@ export function initAuth<TSchema extends TDatabaseSchema>(props: InitAuthProps<T
   return betterAuth({
     advanced: {
       cookiePrefix: authCookiePrefix,
+      database: {
+        generateId: () => false,
+      },
     },
     database: drizzleAdapter(props.db, {
       provider: "pg",
-        // schema: props.schema,
       usePlural: true,
+      // schema: props.schema,
     }),
     emailAndPassword: {
       enabled: true,

package/src/modules/auth/hooks/use-permission.ts

@@ -1,7 +1,6 @@
 "use client";
 
 import { useSuspenseQueries } from "@tanstack/react-query";
-import { LiteralString } from "better-auth";
 import { authClient } from "../handler/client.client";
 import { type Permission } from "../lib/permissions";
 import { useSession } from "./use-session";
@@ -21,6 +20,7 @@ export function usePermission(permission?: Permission) {
       queryKey: ["permission", permission],
       queryFn: async () => {
         const userId = sessionQuery.data?.user.id;
+        if (!userId) return { permission, success: false };
 
         const { data, error } = await authClient.admin.hasPermission({ permission, userId });
         if (error) {
@@ -33,13 +33,14 @@ export function usePermission(permission?: Permission) {
           success: data.success,
         };
       },
+      staleTime: 5 * 60 * 1000, // 5 minutes
     })),
     combine: (results) => {
       const errors = results.filter(({ error }) => error);
       if (errors.length) return { data: null, errors };
 
       const values = results.map(({ data }) => data);
-      const success = results.every(({ data }) => data.success);
+      const success = results.every(({ data }) => data?.success);
 
       return { data: { success, values }, errors: null };
     },

package/src/modules/auth/hooks/use-session.ts

@@ -1,18 +1,24 @@
 "use client";
 
-import { useSuspenseQuery } from "@tanstack/react-query";
+import { queryOptions, useSuspenseQuery } from "@tanstack/react-query";
 import { authClient } from "../entry.client";
 
-export function useSession() {
-  const session = useSuspenseQuery({
-    queryKey: ["session"],
-    queryFn: async () => {
-      const session = await authClient.getSession();
-      if (session.error) throw session.error;
+export const sessionQueryOptions = queryOptions({
+  queryKey: ["session"],
+  queryFn: async () => {
+    const session = await authClient.getSession();
+
+    if (session.error) {
+      console.error(session.error);
+      return null;
+    }
 
-      return session.data;
-    },
-  });
+    return session.data;
+  },
+  staleTime: 1000 * 60 * 60,
+});
 
+export function useSession() {
+  const session = useSuspenseQuery(sessionQueryOptions);
   return session;
 }

package/src/modules/auth/lib/validators.ts

@@ -64,7 +64,7 @@ export const createUserSchema = userSchema.pick({ email: true, image: true }).ex
     .min(2, { message: "Achternaam moet langer zijn dan 2 karakters" })
     .max(50, { message: "Achternaam mag niet langer zijn dan 50 karakters" }),
   password: z.string().min(6, { message: "Wachtwoord moet minimaal 6 karakters hebben" }),
-  role: z.string().default("user"),
+  role: z.string(),
 });
 
 export type CreateUserSchema = z.infer<typeof createUserSchema>;

package/src/modules/commands/components/alert-dialog-command.client.tsx

@@ -25,7 +25,7 @@ import { DefaultError, MutationOptions } from "@tanstack/react-query";
 import React from "react";
 import { Keys, useHotkeys } from "react-hotkeys-hook";
 import { useCommand } from "../hooks/context.client";
-import { useCommandAction2 } from "../hooks/use-command-action.client";
+import { useCommandMutation } from "../hooks/use-command-mutation.client";
 import { CommandTrigger } from "./command-trigger.client";
 
 /**
@@ -213,7 +213,7 @@ export function CommandAlertDialogAction<
   const { setOpen } = React.useContext(CommandAlertDialogContext);
   const { status } = useCommand();
 
-  const { mutateAsync } = useCommandAction2({
+  const { mutateAsync } = useCommandMutation({
     ...mutation,
     onSuccess: async (...params) => {
       setOpen(false);

package/src/modules/commands/components/click-command.client.tsx

@@ -7,7 +7,7 @@ import { DefaultError, MutationOptions } from "@tanstack/react-query";
 import React from "react";
 import { Keys, useHotkeys } from "react-hotkeys-hook";
 import { useCommand } from "../hooks/context.client";
-import { useCommandAction2 } from "../hooks/use-command-action.client";
+import { useCommandMutation } from "../hooks/use-command-mutation.client";
 import { CommandTrigger } from "./command-trigger.client";
 
 export type CommandClickProps<
@@ -40,7 +40,7 @@ export function CommandClick<
   ...props
 }: CommandClickProps<TData, TError, TVariables, TOnMutateResult>) {
   const { menu, status } = useCommand();
-  const { mutate } = useCommandAction2(mutation);
+  const { mutate } = useCommandMutation(mutation);
 
   const isDisabled = disabled || status === "pending";
 

package/src/modules/commands/components/dialog-command.client.tsx

@@ -22,22 +22,32 @@ import { CommandTrigger } from "./command-trigger.client";
 /**
  * CommandDialogContext
  */
-type CommandDialogContextValue = {
+type CommandDialogOpenState = {
   open: boolean;
   setOpen: React.Dispatch<React.SetStateAction<boolean>>;
 };
 
+type CommandDialogContextValue = {
+  openState: CommandDialogOpenState;
+};
+
 const CommandDialogContext = React.createContext({} as CommandDialogContextValue);
 
 /**
  * CommandDialog
  */
-export function CommandDialog({ children, ...props }: DialogProps) {
-  const [open, setOpen] = React.useState(false);
+export function CommandDialog({
+  children,
+  openState,
+  ...props
+}: Omit<DialogProps, "open" | "onOpenChange"> & { openState?: CommandDialogOpenState }) {
+  const state = React.useState(false);
+
+  const { open, setOpen } = openState ?? { open: state[0], setOpen: state[1] };
 
   return (
     <Dialog {...props} open={open} onOpenChange={setOpen}>
-      <CommandDialogContext.Provider value={{ open, setOpen }}>
+      <CommandDialogContext.Provider value={{ openState: { open, setOpen } }}>
         {children}
       </CommandDialogContext.Provider>
     </Dialog>
@@ -63,11 +73,13 @@ export function CommandDialogTrigger({
   ...props
 }: CommandDialogTriggerProps) {
   const { menu, status } = useCommand();
-  const { setOpen } = React.useContext(CommandDialogContext);
+  const { openState } = React.useContext(CommandDialogContext);
 
   const isDisabled = disabled || status === "pending";
 
-  useHotkeys(hotkey ?? "", () => setOpen(true), { enabled: !isDisabled && hotkey !== undefined });
+  useHotkeys(hotkey ?? "", () => openState.setOpen(true), {
+    enabled: !isDisabled && hotkey !== undefined,
+  });
 
   if (menu === "inline" || menu === "table") {
     return (
@@ -92,7 +104,7 @@ export function CommandDialogTrigger({
             disabled={isDisabled}
             onClick={(e) => {
               e.preventDefault();
-              setOpen(true);
+              openState.setOpen(true);
             }}
           >
             {children}
@@ -111,7 +123,7 @@ export function CommandDialogTrigger({
             disabled={isDisabled}
             onClick={(e) => {
               e.preventDefault();
-              setOpen(true);
+              openState.setOpen(true);
             }}
           >
             {children}

package/src/modules/commands/components/dropdown-command.client.tsx

@@ -20,7 +20,7 @@ import { cn } from "@/lib/utils/cn";
 import { DefaultError, MutationOptions } from "@tanstack/react-query";
 import React from "react";
 import { useCommand } from "../hooks/context.client";
-import { useCommandAction2 } from "../hooks/use-command-action.client";
+import { useCommandMutation } from "../hooks/use-command-mutation.client";
 import { CommandTrigger } from "./command-trigger.client";
 
 /**
@@ -190,7 +190,7 @@ export function CommandDropdownItem<
   const { setOpen } = React.useContext(CommandDropdownContext);
   const { menu, status } = useCommand();
 
-  const { mutateAsync } = useCommandAction2({
+  const { mutateAsync } = useCommandMutation({
     ...mutation,
     onSuccess: async (...params) => {
       setOpen(false);

package/src/modules/commands/components/form-dialog-command.client.tsx

@@ -19,7 +19,7 @@ import { type DefaultError, type MutationOptions } from "@tanstack/react-query";
 import React, { type ComponentProps } from "react";
 import { type FieldValues, Form, useFormContext } from "react-hook-form";
 import { type Keys, useHotkeys } from "react-hotkeys-hook";
-import { useCommandAction2 } from "../entry.client";
+import { useCommandMutation } from "../entry.client";
 import { useCommand } from "../hooks/context.client";
 import { CommandTrigger } from "./command-trigger.client";
 
@@ -188,7 +188,7 @@ export function CommandFormDialogContent<
   const { setOpen } = React.useContext(CommandFormDialogContext);
   const form = useFormContext<TValues>();
 
-  const { mutateAsync } = useCommandAction2({
+  const { mutateAsync } = useCommandMutation({
     ...mutation,
     onSuccess: async (...params) => {
       form.reset();

package/src/modules/commands/entry.client.ts

@@ -5,7 +5,7 @@ export * from "./components/dialog-command.client";
 export * from "./components/dropdown-command.client";
 export * from "./components/empty-command.client";
 export * from "./components/form-dialog-command.client";
-export * from "./hooks/use-command-action.client";
+export * from "./hooks/use-command-mutation.client";
 export * from "./menus/context-menu.client";
 export * from "./menus/dropdown-menu.client";
 export * from "./menus/inline-menu.client";

package/src/modules/commands/hooks/{use-command-action.client.tsx → use-command-mutation.client.tsx}

@@ -2,7 +2,7 @@
 
 import { useAction } from "@/lib/hooks/use-action";
 import type { DefaultError, MutationFunction, MutationOptions } from "@tanstack/react-query";
-import { toast } from "sonner";
+import { useRouter } from "next/navigation";
 import { useCommand } from "./context.client";
 
 export type CommandActionResult = Promise<unknown>;
@@ -10,58 +10,17 @@ export type CommandActionResult = Promise<unknown>;
 export type CommandAction<TInput = void> = (input: TInput) => CommandActionResult;
 export type BulkCommandAction = (params: { ids: string[] }) => CommandActionResult;
 
-/**
- * Hook to use command
- * @returns Command context value
- */
-export function useCommandAction<TInput = void>(
-  action: CommandAction<TInput>,
-  options?: {
-    message?: string;
-    onSuccess?: () => Promise<void> | void;
-    onError?: () => Promise<void> | void;
-  },
-) {
-  const commandContext = useCommand();
-
-  const { mutateAsync } = useAction({
-    mutationFn: action,
-    onMutate: () => {
-      commandContext.setStatus("pending");
-    },
-    onSuccess: async () => {
-      commandContext.setStatus("success");
-      toast.success(options?.message || "Actie voltooid!");
-      await options?.onSuccess?.();
-      await commandContext.onSuccess?.();
-    },
-    onRedirect: async () => {
-      commandContext.setStatus("success");
-      toast.success(options?.message || "Actie voltooid!");
-      await options?.onSuccess?.();
-      await commandContext.onSuccess?.();
-    },
-    onError: async () => {
-      commandContext.setStatus("error");
-      await options?.onError?.();
-      await commandContext.onError?.();
-    },
-    onSettled: () => {
-      commandContext.setStatus("idle");
-      // finnalyCallback?.();
-      // options?.callback?.();
-    },
-  });
-
-  return mutateAsync as (input: TInput) => CommandActionResult;
-}
+export type CommandMutationMeta = {
+  router: ReturnType<typeof useRouter>;
+};
 
-export function useCommandAction2<
+export function useCommandMutation<
   TData = unknown,
   TError = DefaultError,
   TVariables = void,
   TOnMutateResult = unknown,
 >(options?: MutationOptions<TData, TError, TVariables, TOnMutateResult>) {
+  const router = useRouter();
   const commandContext = useCommand();
 
   const mutation = useAction({
@@ -97,6 +56,9 @@ export function useCommandAction2<
 
       return await result;
     },
+    meta: {
+      router,
+    } satisfies CommandMutationMeta,
   });
 
   return mutation;

package/src/modules/commands/utils/delete-command.client.tsx

@@ -18,7 +18,7 @@ import { CommandLabel } from "../components/command-trigger.client";
 export type DeleteCommandProps<
   TData = unknown,
   TError = DefaultError,
-  TVariables = { ids: string[] },
+  TVariables = unknown,
   TOnMutateResult = unknown,
 > = {
   variables: TVariables;
@@ -31,7 +31,7 @@ export type DeleteCommandProps<
 export function DeleteCommand<
   TData = unknown,
   TError = DefaultError,
-  TVariables = { ids: string[] },
+  TVariables = unknown,
   TOnMutateResult = unknown,
 >({ variables, mutation }: DeleteCommandProps<TData, TError, TVariables, TOnMutateResult>) {
   return (
@@ -62,3 +62,15 @@ export function DeleteCommand<
     </CommandAlertDialog>
   );
 }
+
+/**
+ * Single Delete command
+ */
+export function SingleDeleteCommand<
+  TData = unknown,
+  TError = DefaultError,
+  TVariables = { id: string },
+  TOnMutateResult = unknown,
+>({ variables, mutation }: DeleteCommandProps<TData, TError, TVariables, TOnMutateResult>) {
+  return <DeleteCommand variables={variables} mutation={mutation} />;
+}

package/src/modules/config/db/create-client.ts

@@ -2,18 +2,25 @@ import "server-cli-only";
 
 import { drizzle, PostgresJsDatabase } from "drizzle-orm/postgres-js";
 import postgres from "postgres";
-import { TulipConfig } from "../lib/config.server";
 import { TDatabaseSchema } from "./types";
 
 declare global {
-  // eslint-disable-next-line no-var, @typescript-eslint/no-explicit-any
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   var db: PostgresJsDatabase<any> | undefined;
 }
 
+type CreateDatabaseClientProps<TSchema extends TDatabaseSchema> = {
+  schema: TSchema;
+  pool: {
+    connectionString: string;
+    max?: number;
+  };
+};
+
 export function createDatabaseClient<TSchema extends TDatabaseSchema>(
-  database: TulipConfig<TSchema>["database"],
+  props: CreateDatabaseClientProps<TSchema>,
 ) {
-  const { pool, schema } = database;
+  const { pool, schema } = props;
 
   let db: PostgresJsDatabase<TSchema>;
 

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

@@ -6,5 +6,4 @@ export * from "./db/init";
 /**
  * Providers
  */
-export * from "./providers/blob";
 export * from "./providers/email";

package/src/modules/config/lib/config.ts

@@ -1,4 +1,4 @@
-export type TulipConfig = {
+export type TulipConfig<TValues> = {
   general: {
     name: string;
     shortName: string;
@@ -6,10 +6,10 @@ export type TulipConfig = {
   email: {
     defaultFrom: string;
   };
-};
+} & TValues;
 
 /**
  * Build the Tulip config
  */
 
-export const defineTulipConfig = (config: TulipConfig): TulipConfig => config;
+export const defineTulipConfig = <TValues>(config: TulipConfig<TValues>): TulipConfig<TValues> => config;

package/src/modules/config/lib/context.ts

@@ -1,7 +1,7 @@
+import { StorageClient } from "@/modules/storage/lib/create-client.server";
 import { AuthClient } from "../../auth/handler/init";
 import { DatabaseClient } from "../db/init";
 import { TDatabaseSchema } from "../entry";
-import { BlobClient } from "../providers/blob";
 import { EmailClient } from "../providers/email";
 
 export type TulipContext<TSchema extends TDatabaseSchema> = {
@@ -9,7 +9,7 @@ export type TulipContext<TSchema extends TDatabaseSchema> = {
   schema: TSchema;
   auth: AuthClient;
   email: EmailClient;
-  blob: BlobClient;
+  storage: StorageClient<TSchema>;
 };
 
 export function createContext<TSchema extends TDatabaseSchema>(props: TulipContext<TSchema>) {

package/src/modules/data-tables/components/filters/combobox.client.tsx

@@ -114,9 +114,9 @@ export function TableFilterCombobox<TValue extends string>({
                       <Check className="text-foreground h-4 w-4" />
                     </div>
 
-                    <div className={cn("flex flex-1 items-center gap-2", option.className)}>
-                      {Icon && <Icon className="size-4" />}
-                      <span>{option.label}</span>
+                    <div className="flex flex-1 items-center gap-2">
+                      {Icon && <Icon className={cn("size-4", option.className)} />}
+                      <span className={cn(option.className)}>{option.label}</span>
                     </div>
 
                     {option.total !== undefined && (

package/src/modules/data-tables/entry.ts

@@ -12,9 +12,9 @@ export * from "./components/toolbar";
  * Lib
  */
 export * from "./lib/filters/config";
+export * from "./lib/filters/helpers";
 export * from "./lib/filters/parsers";
 export * from "./lib/filters/resolvers";
 export * from "./lib/search-params";
 export * from "./lib/types";
 export * from "./lib/validators";
-