@tulip-systems/core 0.10.1 → 0.10.2

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,
+};

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

@@ -1,31 +1,31 @@
-import { onError } from "@orpc/client";
 import type { AnyRouter } from "@orpc/server";
-import { RPCHandler } from "@orpc/server/fetch";
+import { RPCHandler, type RPCHandlerOptions } from "@orpc/server/fetch";
+import type { TAuthServerOptions } from "@/modules/auth/handler/service.server";
 import type { TulipContext } from "@/modules/config/lib/context";
 import type { TDatabaseSchema } from "@/modules/database/lib/types";
-import { createRPCContext } from "./context.server";
+import type { CreateRPCContext } from "./init.server";
 
 /**
  * RPC Route handler
  */
-export function handleRPCRoute<TRouter extends AnyRouter, TSchema extends TDatabaseSchema>(props: {
-  appRouter: TRouter;
-  context: TulipContext<TSchema>;
-}) {
-  const handler = new RPCHandler(props.appRouter, {
-    interceptors: [
-      onError((error) => {
-        console.error(JSON.stringify(error));
-      }),
-    ],
-  });
+export function handleRPCRoute<
+  TRouter extends AnyRouter,
+  TSchema extends TDatabaseSchema,
+  TAuthOptions extends TAuthServerOptions,
+>(
+  appRouter: TRouter,
+  options: RPCHandlerOptions<TulipContext<TSchema, TAuthOptions>> & {
+    prefix?: `/${string}`;
+    createContext: CreateRPCContext<TSchema, TAuthOptions>;
+  },
+) {
+  const handler = new RPCHandler(appRouter, options);
 
   async function handleRequest(request: Request) {
-    const rpcContext = await createRPCContext({ context: props.context });
-    const { response } = await handler.handle(request, {
-      prefix: "/api/rpc",
-      context: rpcContext,
-    });
+    const prefix = options.prefix ?? "/api/rpc";
+    const context = options.createContext({ headers: request.headers });
+
+    const { response } = await handler.handle(request, { prefix, context });
 
     return response ?? new Response("Not found", { status: 404 });
   }

package/src/modules/router/lib/query-client.server.tsx

@@ -7,13 +7,13 @@ import { createQueryClient } from "./query-client";
 /**
  *  Create a stable getter for the query client that will return the same client during the same request.
  */
-export const getQueryClient = cache(createQueryClient);
+export const getServerQueryClient = cache(createQueryClient);
 
 /**
  * Hydrate the client with the data from the server
  */
 export function HydrateClient(props: { children: React.ReactNode }) {
-  const queryClient = getQueryClient();
+  const queryClient = getServerQueryClient();
 
   return <HydrationBoundary state={dehydrate(queryClient)}>{props.children}</HydrationBoundary>;
 }

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

@@ -2,7 +2,7 @@
  * Lib
  */
 
-export * from "./lib/procedures.server";
+export * from "./lib/router.server";
 export * from "./lib/router-handlers.server";
 export * from "./lib/service.server";
 

package/src/modules/storage/lib/router-handlers.server.ts

@@ -1,19 +1,16 @@
 import { connection, type NextRequest } from "next/server";
 import z from "zod";
+import type { Auth, TAuthServerOptions } from "@/modules/auth/handler/service.server";
 import { getSession } from "@/modules/auth/lib/helpers.server";
-import type { TulipContext } from "@/modules/config/lib/context";
 import type { TDatabaseSchema } from "@/modules/database/lib/types";
 import { ServerError } from "@/modules/router/lib/error.server";
-import { getAssetURLSchema } from "../entry";
+import { getAssetURLSchema } from "../lib/validators";
+import type { Storage } from "./service.server";
 
 type RouteCtx = {
   params: Promise<{ rest?: string[] }>;
 };
 
-type CreateStorageRouteHandlerProps<TSchema extends TDatabaseSchema> = {
-  context: Pick<TulipContext<TSchema>, "auth" | "storage">;
-};
-
 /**
  * Creates a catch-all storage route handler for `/api/storage/[[...rest]]`.
  *
@@ -31,9 +28,10 @@ type CreateStorageRouteHandlerProps<TSchema extends TDatabaseSchema> = {
  * @returns Next.js route handlers for GET, POST, PUT, PATCH, and DELETE
  */
 
-export function createStorageRouteHandler<TSchema extends TDatabaseSchema>({
-  context,
-}: CreateStorageRouteHandlerProps<TSchema>) {
+export function createStorageRouteHandler<
+  TSchema extends TDatabaseSchema,
+  TAuthOptions extends TAuthServerOptions,
+>(context: { auth: Auth<TAuthOptions>; storage: Storage<TSchema> }) {
   /**
    * GET /api/storage/[[...rest]]
    *
@@ -78,7 +76,7 @@ export function createStorageRouteHandler<TSchema extends TDatabaseSchema>({
 
         // Enforce private visibility with session auth
         if (asset.visibility === "private") {
-          const session = await getSession(context);
+          const session = await getSession(context.auth);
           if (!session) {
             return Response.json(
               { error: { code: "UNAUTHORIZED", message: "Unauthorized" } },