@batijs/cli 0.0.258 → 0.0.260

package/dist/boilerplates/@batijs/express/files/$package.json.js

@@ -48,6 +48,7 @@ var require_package = __commonJS({
         "@batijs/lucia-auth": "workspace:*",
         "@batijs/shared-server": "workspace:^",
         "@batijs/shared-todo": "workspace:^",
+        "@batijs/shared-db": "workspace:^",
         "@batijs/telefunc": "workspace:*",
         "@batijs/trpc": "workspace:*",
         "@batijs/ts-rest": "workspace:*",
@@ -55,7 +56,7 @@ var require_package = __commonJS({
         "@types/cookie-parser": "^1.4.7",
         "@types/express": "^4.17.21",
         "@types/node": "^18.19.14",
-        "@universal-middleware/express": "^0.2.2",
+        "@universal-middleware/express": "^0.2.3",
         "cookie-parser": "^1.4.6",
         "cross-env": "^7.0.3",
         dotenv: "^16.4.5",

package/dist/boilerplates/@batijs/express/files/express-entry.ts

@@ -15,17 +15,18 @@ import {
   luciaAuthLogoutHandler,
   luciaAuthSignupHandler,
   luciaCsrfMiddleware,
+  luciaDbMiddleware,
   luciaGithubCallbackHandler,
   luciaGithubLoginHandler,
 } from "@batijs/lucia-auth/server/lucia-auth-handlers";
 import { createTodoHandler } from "@batijs/shared-server/server/create-todo-handler";
 import { vikeHandler } from "@batijs/shared-server/server/vike-handler";
 import { telefuncHandler } from "@batijs/telefunc/server/telefunc-handler";
-import { appRouter } from "@batijs/trpc/trpc/server";
 import { tsRestHandler } from "@batijs/ts-rest/server/ts-rest-handler";
-import * as trpcExpress from "@trpc/server/adapters/express";
 import { createHandler, createMiddleware } from "@universal-middleware/express";
+import { dbMiddleware } from "@batijs/shared-db/server/db-middleware";
 import express from "express";
+import { trpcHandler } from "@batijs/trpc/server/trpc-handler";
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
@@ -54,6 +55,13 @@ async function startServer() {
     app.use(viteDevMiddleware);
   }
 
+  if (BATI.hasDatabase) {
+    /**
+     * Make database available in Context as `context.db`
+     */
+    app.use(createMiddleware(dbMiddleware)());
+  }
+
   if (BATI.has("authjs") || BATI.has("auth0")) {
     /**
      * Append Auth.js session to context
@@ -74,6 +82,7 @@ async function startServer() {
   }
 
   if (BATI.has("lucia-auth")) {
+    app.use(createMiddleware(luciaDbMiddleware)());
     app.use(createMiddleware(luciaCsrfMiddleware)());
     app.use(createMiddleware(luciaAuthContextMiddleware)());
     app.use(createMiddleware(luciaAuthCookieMiddleware)());
@@ -89,17 +98,9 @@ async function startServer() {
     /**
      * tRPC route
      *
-     * @link {@see https://trpc.io/docs/server/adapters/express#3-use-the-express-adapter}
+     * @link {@see https://trpc.io/docs/server/adapters/fetch}
      **/
-    app.use(
-      "/api/trpc",
-      trpcExpress.createExpressMiddleware({
-        router: appRouter,
-        createContext({ req, res }: trpcExpress.CreateExpressContextOptions) {
-          return { req, res };
-        },
-      }),
-    );
+    app.use("/api/trpc", createHandler(trpcHandler)("/api/trpc"));
   }
 
   if (BATI.has("telefunc")) {

package/dist/boilerplates/@batijs/fastify/files/$package.json.js

@@ -48,6 +48,7 @@ var require_package = __commonJS({
         "@batijs/lucia-auth": "workspace:*",
         "@batijs/shared-server": "workspace:^",
         "@batijs/shared-todo": "workspace:^",
+        "@batijs/shared-db": "workspace:^",
         "@batijs/telefunc": "workspace:^",
         "@batijs/trpc": "workspace:^",
         "@batijs/ts-rest": "workspace:*",
@@ -56,7 +57,7 @@ var require_package = __commonJS({
         "@trpc/server": "^10.45.2",
         "@types/express": "^4.17.21",
         "@types/node": "^18.19.14",
-        "@universal-middleware/fastify": "^0.2.2",
+        "@universal-middleware/fastify": "^0.2.3",
         "cross-env": "^7.0.3",
         dotenv: "^16.4.5",
         fastify: "^4.28.1",

package/dist/boilerplates/@batijs/fastify/files/fastify-entry.ts

@@ -15,21 +15,18 @@ import {
   luciaAuthLogoutHandler,
   luciaAuthSignupHandler,
   luciaCsrfMiddleware,
+  luciaDbMiddleware,
   luciaGithubCallbackHandler,
   luciaGithubLoginHandler,
 } from "@batijs/lucia-auth/server/lucia-auth-handlers";
 import { createTodoHandler } from "@batijs/shared-server/server/create-todo-handler";
 import { vikeHandler } from "@batijs/shared-server/server/vike-handler";
 import { telefuncHandler } from "@batijs/telefunc/server/telefunc-handler";
-import { appRouter, type AppRouter } from "@batijs/trpc/trpc/server";
 import { tsRestHandler } from "@batijs/ts-rest/server/ts-rest-handler";
-import {
-  type CreateFastifyContextOptions,
-  fastifyTRPCPlugin,
-  type FastifyTRPCPluginOptions,
-} from "@trpc/server/adapters/fastify";
 import Fastify from "fastify";
 import { createHandler, createMiddleware } from "@universal-middleware/fastify";
+import { dbMiddleware } from "@batijs/shared-db/server/db-middleware";
+import { trpcHandler } from "@batijs/trpc/server/trpc-handler";
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
@@ -68,11 +65,18 @@ async function startServer() {
     app.use(viteDevMiddleware);
   }
 
+  if (BATI.hasDatabase) {
+    /**
+     * Make database available in Context as `context.db`
+     */
+    await app.register(createMiddleware(dbMiddleware)());
+  }
+
   if (BATI.has("authjs") || BATI.has("auth0")) {
     /**
      * Append Auth.js session to context
      **/
-    app.register(createMiddleware(authjsSessionMiddleware)());
+    await app.register(createMiddleware(authjsSessionMiddleware)());
 
     /**
      * Auth.js route
@@ -88,9 +92,10 @@ async function startServer() {
   }
 
   if (BATI.has("lucia-auth")) {
-    app.register(createMiddleware(luciaCsrfMiddleware)());
-    app.register(createMiddleware(luciaAuthContextMiddleware)());
-    app.register(createMiddleware(luciaAuthCookieMiddleware)());
+    await app.register(createMiddleware(luciaDbMiddleware)());
+    await app.register(createMiddleware(luciaCsrfMiddleware)());
+    await app.register(createMiddleware(luciaAuthContextMiddleware)());
+    await app.register(createMiddleware(luciaAuthCookieMiddleware)());
 
     app.post("/api/signup", createHandler(luciaAuthSignupHandler)());
     app.post("/api/login", createHandler(luciaAuthLoginHandler)());
@@ -103,21 +108,9 @@ async function startServer() {
     /**
      * tRPC route
      *
-     * @link {@see https://trpc.io/docs/server/adapters/fastify}
+     * @link {@see https://trpc.io/docs/server/adapters/fetch}
      **/
-    await app.register(fastifyTRPCPlugin, {
-      prefix: "/api/trpc",
-      trpcOptions: {
-        router: appRouter,
-        createContext({ req, res }: CreateFastifyContextOptions) {
-          return { req, res };
-        },
-        onError({ path, error }) {
-          // report to error monitoring
-          console.error(`Error in tRPC handler on path '${path}':`, error);
-        },
-      } satisfies FastifyTRPCPluginOptions<AppRouter>["trpcOptions"],
-    });
+    app.all("/api/trpc/*", createHandler(trpcHandler)("/api/trpc"));
   }
 
   if (BATI.has("telefunc")) {

package/dist/boilerplates/@batijs/firebase-auth/files/$package.json.js

@@ -44,10 +44,10 @@ var require_package = __commonJS({
         "@batijs/compile": "workspace:*",
         "@types/cookie": "^0.6.0",
         "@types/node": "^18.19.14",
-        "@universal-middleware/core": "^0.2.5",
+        "@universal-middleware/core": "^0.2.6",
         cookie: "^0.6.0",
         dotenv: "^16.4.5",
-        firebase: "^10.13.0",
+        firebase: "^10.13.1",
         "firebase-admin": "^12.4.0",
         firebaseui: "^6.1.0",
         vike: "^0.4.193",

package/dist/boilerplates/@batijs/firebase-auth/files/server/firebase-auth-middleware.ts

@@ -3,7 +3,7 @@ import { getAuth } from "firebase-admin/auth";
 import { firebaseAdmin } from "../libs/firebaseAdmin";
 import type { Get, UniversalHandler, UniversalMiddleware } from "@universal-middleware/core";
 
-export const firebaseAuthMiddleware = (() => async (request, context) => {
+export const firebaseAuthMiddleware: Get<[], UniversalMiddleware> = () => async (request, context) => {
   if (!request.headers.has("cookie")) return;
 
   const cookies = parse(request.headers.get("cookie")!);
@@ -24,7 +24,7 @@ export const firebaseAuthMiddleware = (() => async (request, context) => {
       user: null,
     };
   }
-}) satisfies Get<[], UniversalMiddleware>;
+};
 
 export const firebaseAuthLoginHandler: Get<[], UniversalHandler> = () => async (request) => {
   const body = await request.json();

package/dist/boilerplates/@batijs/firebase-auth/types/server/firebase-auth-middleware.d.ts

@@ -1,8 +1,4 @@
-import type { Get, UniversalHandler } from "@universal-middleware/core";
-export declare const firebaseAuthMiddleware: () => (request: Request, context: Universal.Context) => Promise<{
-    user: import("firebase-admin/auth").UserRecord;
-} | {
-    user: null;
-} | undefined>;
+import type { Get, UniversalHandler, UniversalMiddleware } from "@universal-middleware/core";
+export declare const firebaseAuthMiddleware: Get<[], UniversalMiddleware>;
 export declare const firebaseAuthLoginHandler: Get<[], UniversalHandler>;
 export declare const firebaseAuthLogoutHandler: Get<[], UniversalHandler>;

package/dist/boilerplates/@batijs/h3/files/$package.json.js

@@ -48,6 +48,7 @@ var require_package = __commonJS({
         "@batijs/lucia-auth": "workspace:*",
         "@batijs/shared-server": "workspace:^",
         "@batijs/shared-todo": "workspace:^",
+        "@batijs/shared-db": "workspace:^",
         "@batijs/telefunc": "workspace:^",
         "@batijs/trpc": "workspace:^",
         "@batijs/ts-rest": "workspace:*",

package/dist/boilerplates/@batijs/h3/files/h3-entry.ts

@@ -16,6 +16,7 @@ import {
   luciaAuthLogoutHandler,
   luciaAuthSignupHandler,
   luciaCsrfMiddleware,
+  luciaDbMiddleware,
   luciaGithubCallbackHandler,
   luciaGithubLoginHandler,
 } from "@batijs/lucia-auth/server/lucia-auth-handlers";
@@ -30,7 +31,8 @@ import installWhatwgNodeFetch from "@hattip/polyfills/whatwg-node";
 import { type NodeHTTPCreateContextFnOptions, nodeHTTPRequestHandler } from "@trpc/server/adapters/node-http";
 import { createApp, createRouter, eventHandler, fromNodeMiddleware, toNodeListener } from "h3";
 import serveStatic from "serve-static";
-import { createHandler, createMiddleware } from "@universal-middleware/h3";
+import { createHandler, createMiddleware, getContext } from "@universal-middleware/h3";
+import { dbMiddleware } from "@batijs/shared-db/server/db-middleware";
 
 installWhatwgNodeFetch();
 installGetSetCookie();
@@ -65,6 +67,13 @@ async function startServer() {
 
   const router = createRouter();
 
+  if (BATI.hasDatabase) {
+    /**
+     * Make database available in Context as `context.db`
+     */
+    app.use(createMiddleware(dbMiddleware)());
+  }
+
   if (BATI.has("authjs") || BATI.has("auth0")) {
     /**
      * Append Auth.js session to context
@@ -85,6 +94,7 @@ async function startServer() {
   }
 
   if (BATI.has("lucia-auth")) {
+    app.use(createMiddleware(luciaDbMiddleware)());
     app.use(createMiddleware(luciaCsrfMiddleware)());
     app.use(createMiddleware(luciaAuthContextMiddleware)());
     app.use(createMiddleware(luciaAuthCookieMiddleware)());
@@ -111,7 +121,7 @@ async function startServer() {
           path: event.context.params!.path,
           router: appRouter,
           createContext({ req, res }: NodeHTTPCreateContextFnOptions<IncomingMessage, ServerResponse>) {
-            return { req, res };
+            return { ...getContext(event)!, req, res } as BATI.Any;
           },
         }),
       ),

package/dist/boilerplates/@batijs/hattip/files/$package.json.js

@@ -48,9 +48,11 @@ var require_package = __commonJS({
         "@batijs/lucia-auth": "workspace:*",
         "@batijs/shared-server": "workspace:^",
         "@batijs/shared-todo": "workspace:^",
+        "@batijs/shared-db": "workspace:^",
         "@batijs/telefunc": "workspace:^",
         "@batijs/trpc": "workspace:^",
         "@batijs/ts-rest": "workspace:*",
+        "@cloudflare/workers-types": "^4.20240821.1",
         "@hattip/adapter-node": "^0.0.47",
         "@hattip/adapter-vercel-edge": "^0.0.47",
         "@hattip/core": "^0.0.47",
@@ -58,7 +60,7 @@ var require_package = __commonJS({
         "@hattip/vite": "^0.0.47",
         "@trpc/server": "^10.45.2",
         "@types/node": "^18.19.14",
-        "@universal-middleware/hattip": "^0.2.2",
+        "@universal-middleware/hattip": "^0.2.4",
         "cross-env": "^7.0.3",
         dotenv: "^16.4.5",
         hattip: "^0.0.33",

package/dist/boilerplates/@batijs/hattip/files/hattip-entry.ts

@@ -13,22 +13,30 @@ import {
   luciaAuthLogoutHandler,
   luciaAuthSignupHandler,
   luciaCsrfMiddleware,
+  luciaDbMiddleware,
   luciaGithubCallbackHandler,
   luciaGithubLoginHandler,
 } from "@batijs/lucia-auth/server/lucia-auth-handlers";
 import { createTodoHandler } from "@batijs/shared-server/server/create-todo-handler";
 import { vikeHandler } from "@batijs/shared-server/server/vike-handler";
 import { telefuncHandler } from "@batijs/telefunc/server/telefunc-handler";
-import { appRouter } from "@batijs/trpc/trpc/server";
 import { tsRestHandler } from "@batijs/ts-rest/server/ts-rest-handler";
 import type { HattipHandler } from "@hattip/core";
 import { createRouter } from "@hattip/router";
-import { fetchRequestHandler } from "@trpc/server/adapters/fetch";
 import vercelAdapter from "@hattip/adapter-vercel-edge";
 import { createHandler, createMiddleware } from "@universal-middleware/hattip";
+import { dbMiddleware } from "@batijs/shared-db/server/db-middleware";
+import { trpcHandler } from "@batijs/trpc/server/trpc-handler";
 
 const router = createRouter();
 
+if (BATI.hasDatabase) {
+  /**
+   * Make database available in Context as `context.db`
+   */
+  router.use(createMiddleware(dbMiddleware)());
+}
+
 if (BATI.has("telefunc")) {
   /**
    * Telefunc route
@@ -44,16 +52,7 @@ if (BATI.has("trpc")) {
    *
    * @link {@see https://trpc.io/docs/server/adapters/fetch}
    **/
-  router.use("/api/trpc/*", (context) => {
-    return fetchRequestHandler({
-      router: appRouter,
-      req: context.request,
-      endpoint: "/api/trpc",
-      createContext({ req }) {
-        return { req };
-      },
-    });
-  });
+  router.use("/api/trpc/*", createHandler(trpcHandler)("/api/trpc"));
 }
 
 if (BATI.has("ts-rest")) {
@@ -80,6 +79,7 @@ if (BATI.has("firebase-auth")) {
 }
 
 if (BATI.has("lucia-auth")) {
+  router.use(createMiddleware(luciaDbMiddleware)());
   router.use(createMiddleware(luciaCsrfMiddleware)());
   router.use(createMiddleware(luciaAuthContextMiddleware)());
   router.use(createMiddleware(luciaAuthCookieMiddleware)());

package/dist/boilerplates/@batijs/hono/files/$package.json.js

@@ -51,11 +51,13 @@ var require_package = __commonJS({
         "@batijs/telefunc": "workspace:^",
         "@batijs/trpc": "workspace:^",
         "@batijs/ts-rest": "workspace:*",
+        "@batijs/shared-db": "workspace:*",
+        "@cloudflare/workers-types": "^4.20240821.1",
         "@hono/node-server": "^1.12.2",
-        "@hono/vite-dev-server": "^0.15.0",
+        "@hono/vite-dev-server": "^0.15.1",
         "@trpc/server": "^10.45.2",
         "@types/node": "^18.19.14",
-        "@universal-middleware/hono": "^0.2.3",
+        "@universal-middleware/hono": "^0.2.5",
         "cross-env": "^7.0.3",
         dotenv: "^16.4.5",
         hono: "^4.5.8",
@@ -119,7 +121,16 @@ async function getPackageJson(props) {
   });
   return addDependency(packageJson, await Promise.resolve().then(() => __toESM(require_package(), 1)).then((x) => x.default), {
     devDependencies: ["@hono/vite-dev-server", "@types/node"],
-    dependencies: ["@hono/node-server", "@universal-middleware/hono", "cross-env", "hono", "tsx", "vite", "vike"]
+    dependencies: [
+      "@hono/node-server",
+      "@universal-middleware/hono",
+      "cross-env",
+      "hono",
+      "tsx",
+      "vite",
+      "vike",
+      "dotenv"
+    ]
   });
 }
 export {

package/dist/boilerplates/@batijs/hono/files/hono-entry.ts

@@ -13,21 +13,29 @@ import {
   luciaAuthLogoutHandler,
   luciaAuthSignupHandler,
   luciaCsrfMiddleware,
+  luciaDbMiddleware,
   luciaGithubCallbackHandler,
   luciaGithubLoginHandler,
 } from "@batijs/lucia-auth/server/lucia-auth-handlers";
 import { createTodoHandler } from "@batijs/shared-server/server/create-todo-handler";
 import { vikeHandler } from "@batijs/shared-server/server/vike-handler";
 import { telefuncHandler } from "@batijs/telefunc/server/telefunc-handler";
-import { appRouter } from "@batijs/trpc/trpc/server";
 import { tsRestHandler } from "@batijs/ts-rest/server/ts-rest-handler";
-import { type FetchCreateContextFnOptions, fetchRequestHandler } from "@trpc/server/adapters/fetch";
 import { Hono } from "hono";
 import { handle } from "hono/vercel";
 import { createHandler, createMiddleware } from "@universal-middleware/hono";
+import { dbMiddleware } from "@batijs/shared-db/server/db-middleware";
+import { trpcHandler } from "@batijs/trpc/server/trpc-handler";
 
 const app = new Hono();
 
+if (BATI.hasDatabase) {
+  /**
+   * Make database available in Context as `context.db`
+   */
+  app.use(createMiddleware(dbMiddleware)());
+}
+
 if (BATI.has("authjs") || BATI.has("auth0")) {
   /**
    * Append Auth.js session to context
@@ -48,6 +56,7 @@ if (BATI.has("firebase-auth")) {
 }
 
 if (BATI.has("lucia-auth")) {
+  app.use(createMiddleware(luciaDbMiddleware)());
   app.use(createMiddleware(luciaCsrfMiddleware)());
   app.use(createMiddleware(luciaAuthContextMiddleware)());
   app.use(createMiddleware(luciaAuthCookieMiddleware)());
@@ -65,16 +74,7 @@ if (BATI.has("trpc")) {
    *
    * @link {@see https://trpc.io/docs/server/adapters}
    **/
-  app.use("/api/trpc/*", (c) => {
-    return fetchRequestHandler({
-      endpoint: "/api/trpc",
-      req: c.req.raw,
-      router: appRouter,
-      createContext({ req, resHeaders }): FetchCreateContextFnOptions {
-        return { req, resHeaders };
-      },
-    });
-  });
+  app.use("/api/trpc/*", createHandler(trpcHandler)("/api/trpc"));
 }
 
 if (BATI.has("telefunc")) {

package/dist/boilerplates/@batijs/lucia-auth/files/$package.json.js

@@ -43,13 +43,16 @@ var require_package = __commonJS({
       devDependencies: {
         "@batijs/compile": "workspace:*",
         "@batijs/drizzle": "workspace:*",
+        "@batijs/d1": "workspace:*",
+        "@batijs/d1-sqlite": "workspace:*",
         "@batijs/sqlite": "workspace:*",
+        "@cloudflare/workers-types": "^4.20240821.1",
         "@lucia-auth/adapter-drizzle": "^1.1.0",
         "@lucia-auth/adapter-sqlite": "^3.0.2",
         "@types/better-sqlite3": "^7.6.11",
         "@types/cookie": "^0.6.0",
         "@types/node": "^18.19.14",
-        "@universal-middleware/core": "^0.2.5",
+        "@universal-middleware/core": "^0.2.6",
         arctic: "^1.9.2",
         "better-sqlite3": "^11.2.1",
         cookie: "^0.6.0",

package/dist/boilerplates/@batijs/lucia-auth/files/lib/lucia-auth.ts

@@ -1,11 +1,12 @@
 import "dotenv/config";
-import { Lucia } from "lucia";
-import { BetterSqlite3Adapter } from "@lucia-auth/adapter-sqlite";
+import { Lucia, type Register } from "lucia";
+import { BetterSqlite3Adapter, D1Adapter } from "@lucia-auth/adapter-sqlite";
 import { GitHub } from "arctic";
 import { DrizzleSQLiteAdapter } from "@lucia-auth/adapter-drizzle";
-import { db as drizzleDb } from "@batijs/drizzle/database/drizzle/db";
-import { sessionTable, userTable } from "@batijs/drizzle/database/drizzle/schema/lucia-auth";
+import { dbD1, dbSqlite } from "@batijs/drizzle/database/drizzle/db";
 import { db as sqliteDb } from "@batijs/sqlite/database/sqlite/db";
+import { sessionTable, userTable } from "@batijs/drizzle/database/drizzle/schema/lucia-auth";
+import { D1Database } from "@cloudflare/workers-types";
 
 /**
  * Polyfill needed if you're using Node.js 18 or below
@@ -20,40 +21,57 @@ if (!globalThis.crypto) {
   });
 }
 
-/**
- * Database setup
- *
- * @link {@see https://lucia-auth.com/database/#database-setup}
- **/
-const adapter = BATI.has("drizzle")
-  ? new DrizzleSQLiteAdapter(drizzleDb(), sessionTable, userTable)
-  : new BetterSqlite3Adapter(sqliteDb(), {
-      user: "users",
-      session: "sessions",
-    });
+export function initializeLucia(
+  db: BATI.If<
+    {
+      'BATI.has("sqlite") && !BATI.hasD1': ReturnType<typeof sqliteDb>;
+      'BATI.has("drizzle") && !BATI.hasD1': ReturnType<typeof dbSqlite>;
+      'BATI.has("drizzle")': ReturnType<typeof dbD1>;
+      "BATI.hasD1": D1Database;
+    },
+    "union"
+  >,
+) {
+  /**
+   * Database setup
+   *
+   * @link {@see https://lucia-auth.com/database/#database-setup}
+   **/
+  const adapter = BATI.has("drizzle")
+    ? new DrizzleSQLiteAdapter(db as BATI.Any, sessionTable, userTable)
+    : BATI.hasD1
+      ? new D1Adapter(db as BATI.Any, {
+          user: "users",
+          session: "sessions",
+        })
+      : new BetterSqlite3Adapter(db as BATI.Any, {
+          user: "users",
+          session: "sessions",
+        });
 
-/**
- * Initialize Lucia
- *
- * @link {@see https://lucia-auth.com/getting-started/#initialize-lucia}
- */
-export const lucia = new Lucia(adapter, {
   /**
-   * Lucia Configuration
+   * Initialize Lucia
    *
-   * @link {@see https://lucia-auth.com/basics/configuration}
+   * @link {@see https://lucia-auth.com/getting-started/#initialize-lucia}
    */
-  sessionCookie: {
-    attributes: {
-      secure: process.env.NODE_ENV === "production",
+  return new Lucia(adapter, {
+    /**
+     * Lucia Configuration
+     *
+     * @link {@see https://lucia-auth.com/basics/configuration}
+     */
+    sessionCookie: {
+      attributes: {
+        secure: process.env.NODE_ENV === "production",
+      },
+    },
+    getUserAttributes: (attributes) => {
+      return {
+        username: attributes.username,
+      };
     },
-  },
-  getUserAttributes: (attributes) => {
-    return {
-      username: attributes.username,
-    };
-  },
-});
+  });
+}
 
 /**
  * Initialize OAuth provider
@@ -69,25 +87,43 @@ export const github = new GitHub(process.env.GITHUB_CLIENT_ID as string, process
  */
 declare module "lucia" {
   interface Register {
-    Lucia: typeof lucia;
+    Lucia: ReturnType<typeof initializeLucia>;
     DatabaseUserAttributes: Omit<DatabaseUser, "id">;
   }
 }
 
+declare global {
+  namespace Universal {
+    interface Context {
+      lucia: Register["Lucia"];
+      db: BATI.If<{
+        'BATI.has("sqlite") && !BATI.hasD1': ReturnType<typeof sqliteDb>;
+        'BATI.has("drizzle") && !BATI.hasD1': ReturnType<typeof dbSqlite>;
+        'BATI.has("drizzle")': ReturnType<typeof dbD1>;
+        "BATI.hasD1": D1Database;
+      }>;
+    }
+  }
+}
+
 export interface DatabaseUser {
   id: string;
   username: string;
-  password?: string;
+  password?: string | null;
 }
 
+//# !BATI.has("drizzle")
 export interface DatabaseOAuthAccount {
   provider_id: string;
   provider_user_id: string;
-  /*{ @if (it.BATI.has("drizzle")) }*/
-  userId: string;
-  /*{ #else }*/
   user_id: string;
-  /*{ /if }*/
+}
+
+//# BATI.has("drizzle")
+export interface DatabaseOAuthAccount {
+  providerId: string;
+  providerUserId: string;
+  userId: string;
 }
 
 export interface GitHubUser {