@tulip-systems/core 0.10.0 → 0.10.2

package/src/modules/auth/plugins/email-otp.ts

@@ -0,0 +1,43 @@
+import { emailOTP } from "better-auth/plugins";
+import ForgetPasswordEmail from "@/components/emails/forget-password-email";
+import { url } from "@/lib/utils/url";
+import type { Email } from "@/modules/emails/lib/service.server";
+
+type EmailOtpOptions = Omit<NonNullable<Parameters<typeof emailOTP>[0]>, "sendVerificationOTP">;
+
+export type EmailOtpPluginConfig = EmailOtpOptions & {
+  email: Email;
+  defaultFrom: string;
+};
+
+/**
+ * Email OTP plugin.
+ *
+ * Handles Better Auth email OTP flows and provides Tulip's default
+ * forgot-password email implementation.
+ */
+export function emailOtpPlugin(config: EmailOtpPluginConfig) {
+  const { email: emailClient, defaultFrom, ...options } = config;
+
+  return emailOTP({
+    ...options,
+    sendVerificationOTP: async ({ email, otp, type }) => {
+      if (type !== "forget-password") return;
+
+      const searchParams = new URLSearchParams();
+      searchParams.set("email", email);
+      searchParams.set("otp", otp);
+
+      const resetPasswordHref = url(`/auth/reset-password?${searchParams.toString()}`);
+
+      const result = await emailClient.emails.send({
+        from: defaultFrom,
+        to: email,
+        subject: "Wachtwoord herstellen",
+        react: ForgetPasswordEmail({ resetPasswordHref }),
+      });
+
+      if (result.error) throw new Error(result.error.message);
+    },
+  });
+}

package/src/modules/config/entry.ts

@@ -1,6 +1,3 @@
-export * from "../database/lib/helpers";
-export * from "../database/lib/types";
-
 export * from "./lib/config";
 export * from "./lib/context";
 

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

@@ -1,17 +1,21 @@
-import type { Auth } from "@/modules/auth/handler/service.server";
+import type { BetterAuthOptions } from "better-auth";
+import type { Auth, TAuthServerOptions } from "@/modules/auth/handler/service.server";
 import type { Database } from "@/modules/database/lib/service.server";
 import type { TDatabaseSchema } from "@/modules/database/lib/types";
 import type { Email } from "@/modules/emails/lib/service.server";
 import type { Storage } from "@/modules/storage/lib/service.server";
 
-export type TulipContext<TSchema extends TDatabaseSchema> = {
+export type TulipContext<TSchema extends TDatabaseSchema, TOptions extends TAuthServerOptions> = {
   db: Database<TSchema>;
   schema: TSchema;
-  auth: Auth;
+  auth: Auth<TOptions>;
   email: Email;
   storage: Storage<TSchema>;
 };
 
-export function createContext<TSchema extends TDatabaseSchema>(props: TulipContext<TSchema>) {
+export function createContext<
+  TSchema extends TDatabaseSchema,
+  TAuthOptions extends BetterAuthOptions = BetterAuthOptions,
+>(props: TulipContext<TSchema, TAuthOptions>) {
   return props;
 }

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

@@ -25,11 +25,7 @@ export type TableFilterDateRangePreset = {
   value: [Date, Date];
 };
 
-export function TableFilterDateRange({
-  title,
-  filter,
-  presets,
-}: TableFilterDateRangeProps) {
+export function TableFilterDateRange({ title, filter, presets }: TableFilterDateRangeProps) {
   const [open, setOpen] = useState(false);
   const [query, setQuery] = useQueryState(filter.name, filter.parser);
 

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

@@ -11,6 +11,7 @@ export * from "./components/toolbar";
 /**
  * Lib
  */
+export * from "./lib/converters/dto";
 export * from "./lib/filters/config";
 export * from "./lib/filters/helpers";
 export * from "./lib/filters/parsers";

package/src/modules/data-tables/lib/converters/dto.ts

@@ -1,3 +1,4 @@
+import { z } from "zod";
 import type { TableQuerySchema } from "../validators";
 
 /**
@@ -19,6 +20,17 @@ export type TableQueryPaginationResponse = {
   previousCursor: number | null;
 };
 
+export const tableQueryPaginationResponseSchema = z.object({
+  total: z.number(),
+  totalPages: z.number(),
+  limit: z.number(),
+  hasNextPage: z.boolean(),
+  hasPreviousPage: z.boolean(),
+  cursor: z.number(),
+  nextCursor: z.number().nullable(),
+  previousCursor: z.number().nullable(),
+});
+
 /**
  * Table query response input
  */

package/src/modules/data-tables/lib/converters/filters.ts

@@ -1,6 +1,6 @@
-import type { TDatabaseSchema } from "@tulip-systems/core/config";
 import { and, type SQL } from "drizzle-orm";
 import type { Database } from "@/modules/database/lib/service.server";
+import type { TDatabaseSchema } from "@/modules/database/lib/types";
 
 /**
  * Parser function for a single filter key.

package/src/modules/data-tables/lib/filters/parsers.ts

@@ -93,8 +93,7 @@ export const parseFilterDatetimeRange = <TSchema extends ParseFilterDatetimeRang
     const [from, to] = encoded.split("_");
     return (from && to ? [new Date(from), new Date(to)] : null) as unknown as z.input<TSchema>;
   },
-  encode: (decoded) =>
-    decoded ? `${decoded[0].toISOString()}_${decoded[1].toISOString()}` : "",
+  encode: (decoded) => (decoded ? `${decoded[0].toISOString()}_${decoded[1].toISOString()}` : ""),
 });
 
 /**

package/src/modules/data-tables/server/get-data.server.ts

@@ -11,9 +11,10 @@ import {
 } from "drizzle-orm";
 import type { PgTable } from "drizzle-orm/pg-core";
 import type { RelationalQueryBuilder } from "drizzle-orm/pg-core/query-builders/query";
+import type { TAuthServerOptions } from "@/modules/auth/handler/service.server";
 import type { TulipContext } from "@/modules/config/entry";
 import type { TDatabaseSchema } from "@/modules/database/lib/types";
-import { parseTableQueryPagination } from "../entry.server";
+import { parseTableQueryPagination } from "../lib/converters/pagination";
 import {
   type ConvertSearchToQueryParamsFields,
   convertSearchToQueryParams,
@@ -32,8 +33,12 @@ export type GetTableDataOptions<TTable extends PgTable> = DBQueryConfig<"many">
 /**
  * Get data from the database for the data table
  */
-export async function getTableData<TTable extends PgTable, TSchema extends TDatabaseSchema>(
-  { db, schema }: TulipContext<TSchema>,
+export async function getTableData<
+  TTable extends PgTable,
+  TSchema extends TDatabaseSchema,
+  AuthOptions extends TAuthServerOptions,
+>(
+  { db, schema }: TulipContext<TSchema, AuthOptions>,
   query: TableQuerySchema,
   options: GetTableDataOptions<TTable>,
 ): Promise<{ data: TTable["$inferSelect"][]; total: number }> {

package/src/modules/inline/components/inputs/combobox-dropdown.client.tsx

@@ -19,9 +19,7 @@ import { type InlineEditVariantsProps, inlineEditVariants } from "../../lib/vari
 
 type ComboboxDropdownInlineTrigger = "commit";
 
-type InlineStringSchema =
-  | z.ZodType<string | null, string | null>
-  | z.ZodType<string, string>;
+type InlineStringSchema = z.ZodType<string | null, string | null> | z.ZodType<string, string>;
 
 export type InlineEditComboboxDropdownProps<
   TValue extends ComboboxDropdownItem,

package/src/modules/inline/components/inputs/combobox.client.tsx

@@ -13,9 +13,7 @@ import {
 
 type ComboboxInlineTrigger = "commit";
 
-type InlineStringSchema =
-  | z.ZodType<string | null, string | null>
-  | z.ZodType<string, string>;
+type InlineStringSchema = z.ZodType<string | null, string | null> | z.ZodType<string, string>;
 
 export type InlineComboboxProps<
   TValue,
@@ -68,11 +66,7 @@ export function InlineCombobox<
     state,
   });
 
-  const { handleTrigger } = useInlineStrategy<
-    ComboboxInlineTrigger,
-    TSchema,
-    string | null
-  >({
+  const { handleTrigger } = useInlineStrategy<ComboboxInlineTrigger, TSchema, string | null>({
     strategy,
     state,
     mutations,

package/src/modules/inline/components/inputs/date-time.client.tsx

@@ -17,9 +17,7 @@ import { type InlineEditVariantsProps, inlineEditVariants } from "../../lib/vari
 
 type DateTimeInlineTrigger = "change" | "blur";
 
-type InlineDateTimeSchema =
-  | z.ZodType<Date | null, Date | null>
-  | z.ZodType<Date, Date>;
+type InlineDateTimeSchema = z.ZodType<Date | null, Date | null> | z.ZodType<Date, Date>;
 
 type InlineDateTimeInputProps<
   TSchema extends InlineDateTimeSchema = z.ZodType<Date | null, Date | null>,
@@ -28,14 +26,7 @@ type InlineDateTimeInputProps<
   TVariables = unknown,
   TOnMutateResult = unknown,
 > = ComponentProps<typeof DateTimeInput> &
-  useInlineEditOptions<
-    DateTimeInlineTrigger,
-    TSchema,
-    TData,
-    TError,
-    TVariables,
-    TOnMutateResult
-  > &
+  useInlineEditOptions<DateTimeInlineTrigger, TSchema, TData, TError, TVariables, TOnMutateResult> &
   InlineEditVariantsProps;
 
 export function InlineDateTimeInput<
@@ -59,25 +50,14 @@ export function InlineDateTimeInput<
     initialValue ? format(initialValue, "yyyy-MM-dd'T'HH:mm") : "",
   );
   const access = useInlineAccess({ permission, disabled });
-  const mutations = useInlineMutation<
-    TSchema,
-    string,
-    TData,
-    TError,
-    TVariables,
-    TOnMutateResult
-  >({
+  const mutations = useInlineMutation<TSchema, string, TData, TError, TVariables, TOnMutateResult>({
     variables,
     mutation,
     access,
     state,
   });
 
-  const { handleTrigger } = useInlineStrategy<
-    DateTimeInlineTrigger,
-    TSchema,
-    string
-  >({
+  const { handleTrigger } = useInlineStrategy<DateTimeInlineTrigger, TSchema, string>({
     strategy,
     state,
     mutations,

package/src/modules/inline/components/inputs/date.client.tsx

@@ -121,9 +121,7 @@ export function InlineDateInputField({
 }: InlineDateInputFieldProps) {
   const { state, access, mutations } = useInlineDateContext();
 
-  const [draftValue, setDraftValue] = useState(() =>
-    formatDisplayDate(state.value, dateFormat),
-  );
+  const [draftValue, setDraftValue] = useState(() => formatDisplayDate(state.value, dateFormat));
   const [isLocallyInvalid, setIsLocallyInvalid] = useState(false);
   const [isFocused, setIsFocused] = useState(false);
 
@@ -270,20 +268,14 @@ function toCalendarDate(value: string | null | undefined): Date | undefined {
   return format(date, "yyyy-MM-dd") === value ? date : undefined;
 }
 
-function formatDisplayDate(
-  value: string | null | undefined,
-  dateFormat: string,
-): string {
+function formatDisplayDate(value: string | null | undefined, dateFormat: string): string {
   const date = toCalendarDate(value);
   if (!date) return "";
 
   return format(date, dateFormat);
 }
 
-function parseDisplayDate(
-  value: string,
-  dateFormat: string,
-): string | null | undefined {
+function parseDisplayDate(value: string, dateFormat: string): string | null | undefined {
   const trimmed = value.trim();
   if (!trimmed) return null;
 

package/src/modules/inline/components/inputs/editor.client.tsx

@@ -21,24 +21,23 @@ type InlineEditorSchema =
   | z.ZodType<EditorJSONContent, EditorJSONContent>;
 
 export type InlineEditorProps<
-  TSchema extends InlineEditorSchema = z.ZodType<EditorJSONContent | null, EditorJSONContent | null>,
+  TSchema extends InlineEditorSchema = z.ZodType<
+    EditorJSONContent | null,
+    EditorJSONContent | null
+  >,
   TData = unknown,
   TError = DefaultError,
   TVariables = unknown,
   TOnMutateResult = unknown,
-> = useInlineEditOptions<
-  EditorInlineTrigger,
-  TSchema,
-  TData,
-  TError,
-  TVariables,
-  TOnMutateResult
-> &
+> = useInlineEditOptions<EditorInlineTrigger, TSchema, TData, TError, TVariables, TOnMutateResult> &
   InlineEditVariantsProps &
   Omit<EditorProps, "value" | "onUpdate" | "onBlur" | "variant">;
 
 export function InlineEditor<
-  TSchema extends InlineEditorSchema = z.ZodType<EditorJSONContent | null, EditorJSONContent | null>,
+  TSchema extends InlineEditorSchema = z.ZodType<
+    EditorJSONContent | null,
+    EditorJSONContent | null
+  >,
   TData = unknown,
   TError = DefaultError,
   TVariables = unknown,

package/src/modules/inline/components/inputs/input.client.tsx

@@ -16,13 +16,9 @@ import { type InlineEditVariantsProps, inlineEditVariants } from "../../lib/vari
 
 type InputInlineTrigger = "change" | "blur";
 
-type InlineStringSchema =
-  | z.ZodType<string | null, string | null>
-  | z.ZodType<string, string>;
+type InlineStringSchema = z.ZodType<string | null, string | null> | z.ZodType<string, string>;
 
-type InlineNumberSchema =
-  | z.ZodType<number | null, number | null>
-  | z.ZodType<number, number>;
+type InlineNumberSchema = z.ZodType<number | null, number | null> | z.ZodType<number, number>;
 
 type InlineEditInputProps<
   TSchema extends z.ZodType,
@@ -121,13 +117,7 @@ export function InlineNumberInput<
   strategy,
   disabled,
   ...props
-}: InlineEditInputProps<
-  TSchema,
-  TData,
-  TError,
-  TVariables,
-  TOnMutateResult
->) {
+}: InlineEditInputProps<TSchema, TData, TError, TVariables, TOnMutateResult>) {
   const state = useInlineState<number | null>(initialValue);
   const access = useInlineAccess({ permission, disabled });
   const mutations = useInlineMutation<
@@ -144,11 +134,7 @@ export function InlineNumberInput<
     state,
   });
 
-  const { handleTrigger } = useInlineStrategy<
-    InputInlineTrigger,
-    TSchema,
-    number | null
-  >({
+  const { handleTrigger } = useInlineStrategy<InputInlineTrigger, TSchema, number | null>({
     strategy,
     state,
     mutations,
@@ -181,9 +167,10 @@ export function InlineNumberInput<
  * The inline edit decimal input component.
  */
 export function InlineDecimalInput<
-  TSchema extends
-    | z.ZodType<string | null, string | null>
-    | z.ZodType<string, string> = z.ZodType<string | null, string | null>,
+  TSchema extends z.ZodType<string | null, string | null> | z.ZodType<string, string> = z.ZodType<
+    string | null,
+    string | null
+  >,
   TData = unknown,
   TError = DefaultError,
   TVariables = unknown,
@@ -198,13 +185,7 @@ export function InlineDecimalInput<
   strategy,
   disabled,
   ...props
-}: InlineEditInputProps<
-  TSchema,
-  TData,
-  TError,
-  TVariables,
-  TOnMutateResult
->) {
+}: InlineEditInputProps<TSchema, TData, TError, TVariables, TOnMutateResult>) {
   const state = useInlineState<string | null>(initialValue);
   const access = useInlineAccess({ permission, disabled });
   const mutations = useInlineMutation<
@@ -221,11 +202,7 @@ export function InlineDecimalInput<
     state,
   });
 
-  const { handleTrigger } = useInlineStrategy<
-    InputInlineTrigger,
-    TSchema,
-    string | null
-  >({
+  const { handleTrigger } = useInlineStrategy<InputInlineTrigger, TSchema, string | null>({
     strategy,
     state,
     mutations,

package/src/modules/inline/components/inputs/select.client.tsx

@@ -23,9 +23,7 @@ import { type InlineEditVariantsProps, inlineEditVariants } from "../../lib/vari
 
 type SelectInlineTrigger = "commit";
 
-type InlineStringSchema =
-  | z.ZodType<string | null, string | null>
-  | z.ZodType<string, string>;
+type InlineStringSchema = z.ZodType<string | null, string | null> | z.ZodType<string, string>;
 
 type InlineSelectProps<
   TSchema extends InlineStringSchema = z.ZodType<string | null, string | null>,
@@ -34,14 +32,7 @@ type InlineSelectProps<
   TVariables = unknown,
   TOnMutateResult = unknown,
 > = Omit<ComponentProps<typeof Select>, "value" | "defaultValue"> &
-  useInlineEditOptions<
-    SelectInlineTrigger,
-    TSchema,
-    TData,
-    TError,
-    TVariables,
-    TOnMutateResult
-  >;
+  useInlineEditOptions<SelectInlineTrigger, TSchema, TData, TError, TVariables, TOnMutateResult>;
 
 export function InlineSelect<
   TSchema extends InlineStringSchema = z.ZodType<string | null, string | null>,
@@ -75,11 +66,7 @@ export function InlineSelect<
     state,
   });
 
-  const { handleTrigger } = useInlineStrategy<
-    SelectInlineTrigger,
-    TSchema,
-    string | null
-  >({
+  const { handleTrigger } = useInlineStrategy<SelectInlineTrigger, TSchema, string | null>({
     strategy,
     state,
     mutations,

package/src/modules/inline/components/inputs/switch.client.tsx

@@ -14,9 +14,7 @@ import {
 
 type SwitchInlineTrigger = "commit";
 
-type InlineBooleanSchema =
-  | z.ZodType<boolean | null, boolean | null>
-  | z.ZodType<boolean, boolean>;
+type InlineBooleanSchema = z.ZodType<boolean | null, boolean | null> | z.ZodType<boolean, boolean>;
 
 type InlineSwitchProps<
   TSchema extends InlineBooleanSchema = z.ZodType<boolean | null, boolean | null>,
@@ -25,14 +23,7 @@ type InlineSwitchProps<
   TVariables = unknown,
   TOnMutateResult = unknown,
 > = ComponentProps<typeof Switch> &
-  useInlineEditOptions<
-    SwitchInlineTrigger,
-    TSchema,
-    TData,
-    TError,
-    TVariables,
-    TOnMutateResult
-  >;
+  useInlineEditOptions<SwitchInlineTrigger, TSchema, TData, TError, TVariables, TOnMutateResult>;
 
 export function InlineSwitch<
   TSchema extends InlineBooleanSchema = z.ZodType<boolean | null, boolean | null>,
@@ -65,11 +56,7 @@ export function InlineSwitch<
     state,
   });
 
-  const { handleTrigger } = useInlineStrategy<
-    SwitchInlineTrigger,
-    TSchema,
-    boolean | null
-  >({
+  const { handleTrigger } = useInlineStrategy<SwitchInlineTrigger, TSchema, boolean | null>({
     strategy,
     state,
     mutations,

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

@@ -2,7 +2,6 @@
  * Handler
  */
 export * from "./handler/caller.server";
-export * from "./handler/context.server";
 export * from "./handler/init.server";
 export * from "./handler/register.server";
 export * from "./handler/route.server";

package/src/modules/router/handler/init.server.ts

@@ -1,78 +1,74 @@
 import "server-cli-only";
 
 import { os } from "@orpc/server";
-import type { Permission } from "@/modules/auth/lib/permissions";
+import type { Auth, TAuthServerOptions } from "@/modules/auth/handler/service.server";
+import type { TulipContext } from "@/modules/config/lib/context";
+import type { Database } from "@/modules/database/lib/service.server";
 import type { TDatabaseSchema } from "@/modules/database/lib/types";
-import { ServerError } from "../lib/error.server";
-import type { ProtectedRPCContext, RPCContext } from "./context.server";
+import type { Email } from "@/modules/emails/lib/service.server";
+import type { Storage } from "@/modules/storage/lib/service.server";
 
 /**
- * Initialize TRPC
+ * 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.
  */
-export function initRPC<TSchema extends TDatabaseSchema>() {
-  /**
-   * Create the router
-   */
-  const o = os.$context<RPCContext<TSchema>>();
-
-  /**
-   * Middleware function to check if the user is authenticated
-   */
-  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",
-      });
-    }
+export type RPCContext<TSchema extends TDatabaseSchema, TAuthOptions extends TAuthServerOptions> = {
+  db: Database<TSchema>;
+  schema: TSchema;
+  auth: Auth<TAuthOptions>;
+  email: Email;
+  storage: Storage<TSchema>;
+  headers: Headers;
+};
 
-    return opts.next({
-      context: { ...opts.context, session: opts.context.session } as ProtectedRPCContext<TSchema>,
-    });
-  });
+/**
+ * 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.
+ */
+export type CreateRPCContext<
+  TSchema extends TDatabaseSchema,
+  TAuthOptions extends TAuthServerOptions,
+> = (props: { headers: Headers }) => RPCContext<TSchema, TAuthOptions>;
 
+/**
+ * Create context for the RPC procedures.
+ */
+function defineContext<TSchema extends TDatabaseSchema, TAuthOptions extends TAuthServerOptions>(
+  context: TulipContext<TSchema, TAuthOptions>,
+) {
   /**
-   * Middleware function to check if the user has the required permission
+   * Create context function
    */
-  function permissionMiddleware(permissions: Permission) {
-    /**
-     * Middleware function to check if the user has the required permission
-     */
-    return os.$context<ProtectedRPCContext<TSchema>>().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 } as ProtectedRPCContext<TSchema> });
-    });
-  }
+  return <TExtendedContext>(extendedContext: TExtendedContext & { headers: Headers }) =>
+    ({
+      ...context,
+      ...extendedContext,
+    }) as RPCContext<TSchema, TAuthOptions> & TExtendedContext;
+}
 
+/**
+ * Initialize TRPC
+ */
+function createRPC<TSchema extends TDatabaseSchema, TAuthOptions extends TAuthServerOptions>() {
   /**
-   * Public procedures
+   * Create the router
    */
-  const publicProcedure = o;
+  return os.$context<RPCContext<TSchema, TAuthOptions>>();
+}
 
-  /**
-   * Protected procedures
-   */
-  const protectedProcedure = o.use(authMiddleware);
+/**
+ * RPC instance.
+ */
+export type RPC = ReturnType<typeof createRPC>;
 
-  /**
-   * Export
-   */
-  return {
-    publicProcedure,
-    protectedProcedure,
-    authMiddleware,
-    permissionMiddleware,
-  };
-}
+/**
+ * RPC namespace.
+ *
+ * @example
+ * const rpc = RPC.init<DatabaseSchema, AuthServerOptions>();
+ */
+export const RPC = {
+  init: createRPC,
+  defineContext,
+};