@tulip-systems/core 0.7.0 → 0.8.0

package/src/entry.ts

@@ -38,6 +38,18 @@ export const entry = {
   "data-tables": "./src/modules/data-tables/entry.ts",
   "data-tables/client": "./src/modules/data-tables/entry.client.ts",
   "data-tables/server": "./src/modules/data-tables/entry.server.ts",
+  /**
+   * Database Module
+   */
+  database: "./src/modules/database/entry.ts",
+  "database/client": "./src/modules/database/entry.client.ts",
+  "database/server": "./src/modules/database/entry.server.ts",
+  /**
+   * Emails Module
+   */
+  emails: "./src/modules/emails/entry.ts",
+  "emails/client": "./src/modules/emails/entry.client.ts",
+  "emails/server": "./src/modules/emails/entry.server.ts",
   /**
    * Inline Edit Module
    */
@@ -57,54 +69,3 @@ export const entry = {
   "storage/client": "./src/modules/storage/entry.client.ts",
   "storage/server": "./src/modules/storage/entry.server.ts",
 };
-
-// export const entry = [
-//   /**
-//    * Components
-//    */
-//   "./src/components/entry.ts",
-//   "./src/components/entry.client.ts",
-//   "./src/components/entry.server.ts",
-//   /**
-//    * Lib
-//    */
-//   "./src/lib/entry.ts",
-//   "./src/lib/entry.client.ts",
-//   "./src/lib/entry.server.ts",
-//   /**
-//    * Auth Module
-//    */
-//   "./src/modules/auth/entry.ts",
-//   "./src/modules/auth/entry.client.ts",
-//   "./src/modules/auth/entry.server.ts",
-//   /**
-//    * Commands Module
-//    */
-//   "./src/modules/commands/entry.ts",
-//   "./src/modules/commands/entry.client.ts",
-//   "./src/modules/commands/entry.server.ts",
-//   /**
-//    * Config Module
-//    */
-//   "./src/modules/config/entry.ts",
-//   "./src/modules/config/entry.client.ts",
-//   "./src/modules/config/entry.server.ts",
-//   /**
-//    * Data Table Module
-//    */
-//   "./src/modules/data-tables/entry.ts",
-//   "./src/modules/data-tables/entry.client.ts",
-//   "./src/modules/data-tables/entry.server.ts",
-//   /**
-//    * Inline Edit Module
-//    */
-//   "./src/modules/inline-edit/entry.ts",
-//   "./src/modules/inline-edit/entry.client.ts",
-//   "./src/modules/inline-edit/entry.server.ts",
-//   /**
-//    * Uploads Module
-//    */
-//   "./src/modules/uploads/entry.ts",
-//   "./src/modules/uploads/entry.client.ts",
-//   "./src/modules/uploads/entry.server.ts",
-// ];

package/src/lib/entry.ts

@@ -1,8 +1,3 @@
-/**
- * Config
- */
-export * from "./config/constants";
-
 /**
  * Types
  */
@@ -15,4 +10,5 @@ export * from "./utils/array-move";
 export * from "./utils/cn";
 export * from "./utils/format";
 export * from "./utils/manifest";
+export * from "./utils/markdown";
 export * from "./utils/url";

package/src/lib/utils/markdown.ts

@@ -0,0 +1,10 @@
+import MarkdownIt from "markdown-it";
+
+/**
+ * Convert markdown to HTML
+ */
+export const markdownParser = new MarkdownIt({
+  html: false, // safer default
+  linkify: true,
+  breaks: true,
+});

package/src/lib/utils/url.ts

@@ -5,8 +5,9 @@
  */
 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";
 
-  if (base) return `https://${base}${path}`;
+  if (base) return `${protocol}://${base}${path}`;
 
   return `http://localhost:${process.env.NEXT_PUBLIC_PORT ?? 3000}${path}`;
 }

package/src/lib/utils/user-agent.ts

@@ -1,3 +1,8 @@
+/**
+ * Detects the browser name and version from a user agent string.
+ * @param ua - The user agent string.
+ * @returns An object with the browser name and optional version.
+ */
 export function detectBrowser(ua: string): { name: string; version?: string } {
   // Edge
   let m = ua.match(/Edg\/(\d+)/);
@@ -22,6 +27,11 @@ export function detectBrowser(ua: string): { name: string; version?: string } {
   return { name: "Unknown browser" };
 }
 
+/**
+ * Detects the operating system name and version from a user agent string.
+ * @param ua - The user agent string.
+ * @returns An object with the OS name and optional version.
+ */
 export function detectOS(ua: string): { name: string; version?: string } {
   // macOS
   let m = ua.match(/Mac OS X ([\d_]+)/);
@@ -48,6 +58,11 @@ export function detectOS(ua: string): { name: string; version?: string } {
   return { name: "Unknown OS" };
 }
 
+/**
+ * Detects the device type (Desktop, Mobile, or Tablet) from a user agent string.
+ * @param ua - The user agent string.
+ * @returns The device type as "Desktop", "Mobile", or "Tablet".
+ */
 export function detectDevice(ua: string): "Desktop" | "Mobile" | "Tablet" {
   const s = ua.toLowerCase();
 

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

@@ -1,25 +1,25 @@
+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 { users } from "../db/schema";
 
 type AuthGuardFirstUserProps<TSchema extends TDatabaseSchema> = PropsWithChildren<
-  Pick<TulipContext<TSchema>, "db"> & { login?: boolean }
+  Pick<TulipContext<TSchema>, "db">
 >;
 
-export async function AuthGuardFirstUser<TSchema extends TDatabaseSchema>({
+export async function CreateFirstUserPageGuard<TSchema extends TDatabaseSchema>({
   children,
   db,
-  login = false,
 }: AuthGuardFirstUserProps<TSchema>) {
+  await connection();
+
   const allUsers = await db.select().from(users).limit(1);
   const usersExist = allUsers.length > 0;
 
-  if (login) {
-    if (!usersExist) redirect("/auth/create-first-user");
-  } else {
-    if (usersExist) redirect("/auth/login");
-  }
+  if (usersExist) redirect("/auth/login");
 
   return <>{children}</>;
 }

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

@@ -1,4 +1,4 @@
-import "server-only";
+import "server-cli-only";
 
 import { redirect } from "next/navigation";
 import type { PropsWithChildren } from "react";

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

@@ -2,15 +2,14 @@
  * Components
  */
 export * from "./components/auth-layout.server";
+export * from "./components/create-first-user-guard.server";
 export * from "./components/guard.server";
-export * from "./components/guard-first-user.server";
-
+export * from "./handler/proxy.server";
+export * from "./handler/route.server";
 /**
  * Handlers
  */
-export * from "./handler/init";
-export * from "./handler/proxy.server";
-export * from "./handler/route.server";
+export * from "./handler/service.server";
 
 /**
  * Lib

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

@@ -5,7 +5,7 @@ import { adminClient, emailOTPClient, inferAdditionalFields } from "better-auth/
 import type { AccessControl, Role } from "better-auth/plugins";
 import { createAuthClient as createBetterAuthClient } from "better-auth/react";
 import { url } from "@/lib/utils/url";
-import type { AuthClient } from "./init";
+import type { Auth } from "./service.server";
 
 /**
  * Create auth client
@@ -39,7 +39,7 @@ export function createAuthClient<
       emailOTPClient(),
       passkeyClient(),
       adminClient({ ac, roles }),
-      inferAdditionalFields<AuthClient>(),
+      inferAdditionalFields<Auth>(),
     ],
   });
 }

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

@@ -1,6 +1,6 @@
 import { getSessionCookie } from "better-auth/cookies";
 import { type NextRequest, NextResponse } from "next/server";
-import { authCookiePrefix } from "./init";
+import { authCookiePrefix } from "./service.server";
 
 /**
  * Create auth proxy

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

@@ -1,12 +1,12 @@
 import { toNextJsHandler } from "better-auth/next-js";
 import type { NextRequest } from "next/server";
 import "server-cli-only";
-import type { AuthClient } from "./init";
+import type { Auth } from "./service.server";
 
 /**
  * Handle the auth routes
  */
-export function handleAuthRoute(props: { auth: AuthClient }) {
+export function handleAuthRoute(props: { auth: Auth }) {
   /**
    * GET route handler
    */

package/src/modules/auth/handler/{init.ts → service.server.ts}

@@ -1,30 +1,36 @@
 import { passkey } from "@better-auth/passkey";
 import { drizzleAdapter } from "better-auth/adapters/drizzle";
+import { createAuthMiddleware } from "better-auth/api";
 import { betterAuth } from "better-auth/minimal";
-import { nextCookies } from "better-auth/next-js";
-import { admin, createAuthMiddleware, emailOTP } from "better-auth/plugins";
+import { admin, emailOTP } from "better-auth/plugins";
 import { eq } from "drizzle-orm";
 import ForgetPasswordEmail from "@/components/emails/forget-password-email";
 import { url } from "@/lib/utils/url";
 import type { TDatabaseSchema } from "@/modules/config/entry";
-import type { DatabaseClient, EmailClient } from "@/modules/config/entry.server";
 import type { TulipConfig } from "@/modules/config/lib/config";
+import type { Database } from "@/modules/database/lib/service.server";
+import type { Email } from "@/modules/emails/lib/service.server";
 import { users } from "../entry";
 import type { createAccessControl, Role } from "../lib/permissions";
 
 export const authCookiePrefix = "tulip";
 
 type InitAuthProps<TSchema extends TDatabaseSchema> = {
-  db: DatabaseClient<TSchema>;
-  email: EmailClient;
+  db: Database<TSchema>;
+  email: Email;
   config: TulipConfig;
   ac: ReturnType<typeof createAccessControl>;
   roles: {
     [key in string]?: Role;
   };
+  allowedHosts: string[];
+  defaultRole?: string;
 };
 
-export function initAuth<TSchema extends TDatabaseSchema>(props: InitAuthProps<TSchema>) {
+/**
+ * Create the Better Auth server instance.
+ */
+function createAuth<TSchema extends TDatabaseSchema>(props: InitAuthProps<TSchema>) {
   return betterAuth({
     advanced: {
       cookiePrefix: authCookiePrefix,
@@ -32,10 +38,12 @@ export function initAuth<TSchema extends TDatabaseSchema>(props: InitAuthProps<T
         generateId: () => false,
       },
     },
+    baseURL: {
+      allowedHosts: props.allowedHosts,
+    },
     database: drizzleAdapter(props.db, {
       provider: "pg",
       usePlural: true,
-      // schema: props.schema,
     }),
     emailAndPassword: {
       enabled: true,
@@ -75,12 +83,12 @@ export function initAuth<TSchema extends TDatabaseSchema>(props: InitAuthProps<T
       }),
     },
     plugins: [
-      nextCookies(),
       passkey(),
       admin({
         roles: props.roles,
         ac: props.ac,
         adminRoles: ["admin", "developer"],
+        defaultRole: props.defaultRole ?? "user",
       }),
       emailOTP({
         sendVerificationOTP: async ({ email, otp, type }) => {
@@ -108,4 +116,17 @@ export function initAuth<TSchema extends TDatabaseSchema>(props: InitAuthProps<T
   });
 }
 
-export type AuthClient = ReturnType<typeof initAuth>;
+/**
+ * Better Auth instance type returned by `Auth.init()`.
+ */
+export type Auth = ReturnType<typeof createAuth>;
+
+/**
+ * Auth service namespace.
+ *
+ * @example
+ * const auth = Auth.init({ db, email, config, ac, roles, allowedHosts });
+ */
+export const Auth = {
+  init: createAuth,
+};

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

@@ -1,9 +0,0 @@
-/**
- * Database
- */
-export * from "./db/init";
-
-/**
- * Providers
- */
-export * from "./providers/email";

package/src/modules/config/entry.ts

@@ -1,5 +1,5 @@
-export * from "./db/helpers";
-export * from "./db/types";
+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,15 +1,15 @@
-import type { StorageClient } from "@/modules/storage/lib/create-client.server";
-import type { AuthClient } from "../../auth/handler/init";
-import type { DatabaseClient } from "../db/init";
-import type { TDatabaseSchema } from "../entry";
-import type { EmailClient } from "../providers/email";
+import type { Auth } 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> = {
-  db: DatabaseClient<TSchema>;
+  db: Database<TSchema>;
   schema: TSchema;
-  auth: AuthClient;
-  email: EmailClient;
-  storage: StorageClient<TSchema>;
+  auth: Auth;
+  email: Email;
+  storage: Storage<TSchema>;
 };
 
 export function createContext<TSchema extends TDatabaseSchema>(props: TulipContext<TSchema>) {

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

@@ -29,3 +29,4 @@ export * from "./tables/inline-table/components/cells/drag-handle.client";
 export * from "./tables/inline-table/components/cells/read-only";
 export * from "./tables/inline-table/components/table";
 export * from "./tables/inline-table/hooks/context.client";
+export * from "./tables/inline-table/hooks/use-hotkeys.client";

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

@@ -1,4 +1,4 @@
-import "server-only";
+import "server-cli-only";
 
 import { and, type DBQueryConfig, getTableName, isTable, type SQL } from "drizzle-orm";
 import type { PgTable } from "drizzle-orm/pg-core";

package/src/modules/data-tables/strategies/infinite/strategy.ts

@@ -16,7 +16,7 @@ export interface UseInfiniteStrategyInput {
 
 export type InfiniteStrategyMeta = Pick<
   UseInfiniteStrategyInput,
-  "isFetching" | "isFetchingNextPage"
+  "isFetching" | "isFetchingNextPage" | "total" | "cursor" | "fetchNextPage"
 >;
 
 export function useInfiniteStrategy({
@@ -63,6 +63,9 @@ export function useInfiniteStrategy({
     manualSorting: true,
     onSortingChange: handleSortingChange({ sortingState, setQuery, resetCursor }),
     meta: {
+      total,
+      cursor,
+      fetchNextPage,
       isFetching,
       isFetchingNextPage,
     } satisfies InfiniteStrategyMeta,

package/src/modules/data-tables/tables/data-table/components/row.tsx

@@ -1,12 +1,6 @@
 import type { Row, Table } from "@tanstack/react-table";
 import type * as React from "react";
-import {
-  ContextCommandMenu,
-  ContextCommandMenuContent,
-  ContextCommandMenuTrigger,
-} from "@/modules/commands/menus/context-menu.client";
 import { TableRow } from "@/modules/data-tables/components/table";
-import type { TableMeta } from "../../../lib/types";
 
 export type DataTableRowProps<TData extends { id: string }> = React.ComponentProps<
   typeof TableRow
@@ -21,20 +15,17 @@ export function DataTableRow<TData extends { id: string }>({
   className,
   ...props
 }: DataTableRowProps<TData>) {
-  const meta = table.options.meta as TableMeta<TData>;
+  return <TableRow {...props} data-state={row.getIsSelected() && "selected"} />;
+}
 
-  return (
-    <ContextCommandMenu>
-      <ContextCommandMenuTrigger asChild>
-        <TableRow {...props} data-state={row.getIsSelected() && "selected"} />
-      </ContextCommandMenuTrigger>
+//  <ContextCommandMenu>
+//       <ContextCommandMenuTrigger asChild>
+//   </ContextCommandMenuTrigger>
 
-      <ContextCommandMenuContent
-        data={row.original}
-        commands={meta.commands || []}
-        meta={meta as never}
-        className="w-[300px]"
-      />
-    </ContextCommandMenu>
-  );
-}
+//       <ContextCommandMenuContent
+//         data={row.original}
+//         commands={meta.commands || []}
+//         meta={meta as never}
+//         className="w-[300px]"
+//       />
+//     </ContextCommandMenu>

package/src/modules/data-tables/tables/inline-table/components/body.tsx

@@ -38,7 +38,7 @@ export function InlineTableBody<TData extends { id: string }>({ table }: { table
     }),
   );
 
-  useInlineDataTableHotkeys();
+  useInlineDataTableHotkeys(context.hotkeys);
 
   if (rows?.length === 0) {
     return (

package/src/modules/data-tables/tables/inline-table/components/row.client.tsx

@@ -4,14 +4,8 @@ import { useSortable } from "@dnd-kit/sortable";
 import { CSS } from "@dnd-kit/utilities";
 import type { Row, Table } from "@tanstack/react-table";
 import type * as React from "react";
-import {
-  ContextCommandMenu,
-  ContextCommandMenuContent,
-  ContextCommandMenuTrigger,
-} from "@/modules/commands/entry.client";
 import { TableRow } from "@/modules/data-tables/components/table";
 import { InlineEditProvider } from "@/modules/inline-edit/entry.client";
-import type { TableMeta } from "../../../lib/types";
 
 export type InlineTableRowProps<TData extends { id: string }> =
   React.HTMLAttributes<HTMLTableRowElement> & {
@@ -25,34 +19,34 @@ export function InlineTableRow<TData extends { id: string }>({
   children,
   ...props
 }: InlineTableRowProps<TData>) {
-  const meta = table.options.meta as TableMeta<TData>;
-
   const rowId = (row.original as { id: string }).id;
 
   const { setNodeRef, transform, transition } = useSortable({ id: rowId });
 
   return (
-    <ContextCommandMenu>
-      <ContextCommandMenuTrigger asChild>
-        <TableRow
-          {...props}
-          ref={setNodeRef}
-          data-state={row.getIsSelected() && "selected"}
-          style={{
-            transform: CSS.Transform.toString(transform),
-            transition,
-          }}
-        >
-          <InlineEditProvider id={row.original.id}>{children}</InlineEditProvider>
-        </TableRow>
-      </ContextCommandMenuTrigger>
-
-      <ContextCommandMenuContent
-        data={row.original}
-        commands={meta.commands || []}
-        meta={meta as never}
-        className="w-[300px]"
-      />
-    </ContextCommandMenu>
+    <TableRow
+      {...props}
+      ref={setNodeRef}
+      data-state={row.getIsSelected() && "selected"}
+      style={{
+        transform: CSS.Transform.toString(transform),
+        transition,
+      }}
+    >
+      <InlineEditProvider id={row.original.id}>{children}</InlineEditProvider>
+    </TableRow>
   );
 }
+
+{
+  /* <ContextCommandMenu>
+  <ContextCommandMenuTrigger asChild></ContextCommandMenuTrigger>
+
+  <ContextCommandMenuContent
+    data={row.original}
+    commands={meta.commands || []}
+    meta={meta as never}
+    className="w-[300px]"
+  />
+</ContextCommandMenu>; */
+}

package/src/modules/data-tables/tables/inline-table/components/table.tsx

@@ -14,13 +14,18 @@ import { InlineTableHeader } from "./header";
 export function InlineTable<TData extends { id: string }>({
   disabledColumns,
   moveRowAction,
+  hotkeys,
   ...props
 }: ComponentProps<typeof Table> & ComponentProps<typeof InlineTableProvider>) {
   const table = useTable<TData>();
   const meta = table.options.meta as TableMeta<TData>;
 
   return (
-    <InlineTableProvider disabledColumns={disabledColumns} moveRowAction={moveRowAction}>
+    <InlineTableProvider
+      disabledColumns={disabledColumns}
+      moveRowAction={moveRowAction}
+      hotkeys={hotkeys}
+    >
       <div className="space-y-4">
         <div className="rounded-md border">
           <Table {...props}>

package/src/modules/data-tables/tables/inline-table/hooks/context.client.tsx

@@ -5,6 +5,7 @@ import React, { type PropsWithChildren } from "react";
 import { arrayMove } from "@/lib/entry";
 import { useAction } from "@/lib/hooks/use-action";
 import { useTableConfigContext } from "@/modules/data-tables/entry.client";
+import type { InlineDataTableHotkeysConfig } from "./use-hotkeys.client";
 
 /**
  * Move row method as meta
@@ -24,6 +25,7 @@ type MoveRowMethod =
  */
 export type InlineTableContextValue = MoveRowMethod & {
   disabledColumns?: VisibilityState;
+  hotkeys?: InlineDataTableHotkeysConfig;
   // setData: React.Dispatch<React.SetStateAction<TData[]>>;
 };
 
@@ -49,9 +51,11 @@ export function InlineTableProvider<TData extends { id: string }>({
   children,
   disabledColumns,
   moveRowAction,
+  hotkeys,
 }: PropsWithChildren<{
   disabledColumns?: VisibilityState;
   moveRowAction?: (input: { fromIndex: number; toIndex: number }) => Promise<unknown>;
+  hotkeys?: InlineDataTableHotkeysConfig;
 }>) {
   const { queryData, setData } = useTableConfigContext<TData>();
 
@@ -74,6 +78,7 @@ export function InlineTableProvider<TData extends { id: string }>({
     <InlineTableContext.Provider
       value={{
         disabledColumns,
+        hotkeys,
         ...(moveRowAction
           ? { isDraggable: true, moveRow: moveRowMutation.mutate }
           : { isDraggable: false, moveRow: undefined }),