@batijs/cli 0.0.255 → 0.0.258

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

@@ -42,6 +42,7 @@ var require_package = __commonJS({
       license: "MIT",
       devDependencies: {
         "@batijs/compile": "workspace:*",
+        "@cloudflare/workers-types": "^4.20240821.1",
         "@hattip/adapter-cloudflare-workers": "^0.0.47",
         "@types/node": "^18.19.14",
         "npm-run-all2": "^6.2.2",
@@ -102,7 +103,7 @@ async function getPackageJson(props) {
     }
   });
   return addDependency(packageJson, await Promise.resolve().then(() => __toESM(require_package(), 1)).then((x) => x.default), {
-    devDependencies: ["wrangler", "npm-run-all2"],
+    devDependencies: ["wrangler", "npm-run-all2", "@cloudflare/workers-types"],
     dependencies: [
       "vike-cloudflare",
       ...props.meta.BATI.has("hattip") ? ["@hattip/adapter-cloudflare-workers"] : []

package/dist/boilerplates/@batijs/d1/files/$README.md.js

@@ -0,0 +1,31 @@
+// files/$README.md.ts
+import { loadReadme } from "@batijs/core";
+async function getReadme(props) {
+  const content = await loadReadme(props);
+  const todo = `
+## *Cloudflare D1*
+
+> [!IMPORTANT]
+> D1 integration is incomplete, and some files are still refering to \`better-sqlite3\`.
+> It should be fixed within a few days.
+
+### Setup
+Create a D1 database:
+
+\`\`\`sh
+wrangler d1 create <your-db-name>
+\`\`\`
+
+> [!NOTE]
+> For reference, a good database name is:
+> - Typically a combination of ASCII characters, shorter than 32 characters, and uses dashes (-) instead of spaces.
+> - Descriptive of the use-case and environment. For example, \u201Cstaging-db-web\u201D or \u201Cproduction-db-backend\u201D.
+> - Only used for describing the database, and is not directly referenced in code.
+
+Then copy the output to \`wrangler.toml\``;
+  content.addTodo(todo);
+  return content.finalize();
+}
+export {
+  getReadme as default
+};

package/dist/boilerplates/@batijs/d1/files/$tsconfig.json.js

@@ -0,0 +1,10 @@
+// files/$tsconfig.json.ts
+import { loadAsJson } from "@batijs/core";
+async function getTsConfig(props) {
+  const tsConfig = await loadAsJson(props);
+  tsConfig.compilerOptions.types = [...tsConfig.compilerOptions.types ?? [], "@cloudflare/workers-types"];
+  return tsConfig;
+}
+export {
+  getTsConfig as default
+};

package/dist/boilerplates/@batijs/d1/files/$wrangler.toml.js

@@ -0,0 +1,21 @@
+// files/$wrangler.toml.ts
+import "@batijs/core";
+async function getToml(props) {
+  const content = await props.readfile?.();
+  if (!content) {
+    throw new Error("wrangler.toml should not be empty");
+  }
+  const dbSnippet = `
+# https://developers.cloudflare.com/d1/build-with-d1/local-development/#develop-locally-with-pages
+[[d1_databases]]
+binding = "DB" # Should match preview_database_id
+database_name = "YOUR_DATABASE_NAME"
+database_id = "the-id-of-your-D1-database-goes-here" # wrangler d1 info YOUR_DATABASE_NAME
+preview_database_id = "DB" # Required for Pages local development
+`;
+  return `${content}
+${dbSnippet}`;
+}
+export {
+  getToml as default
+};

package/dist/boilerplates/@batijs/d1/files/vike.d.ts

@@ -0,0 +1,8 @@
+import { D1Database } from "@cloudflare/workers-types";
+
+// Cloudflare typings
+interface Env {
+  DB: D1Database;
+}
+
+export {};

package/dist/boilerplates/@batijs/drizzle/files/$.env.js

@@ -0,0 +1,9 @@
+// files/$.env.ts
+import { appendToEnv } from "@batijs/core";
+async function getEnv(props) {
+  const envContent = await props.readfile?.();
+  return appendToEnv(envContent, "DATABASE_URL", "sqlite.db", "Path to the sqlite database");
+}
+export {
+  getEnv as default
+};

package/dist/boilerplates/@batijs/drizzle/files/$README.md.js

@@ -4,12 +4,12 @@ async function getReadme(props) {
   const content = await loadReadme(props);
   const todo = `
 ## *Drizzle*
-- First, ensure all dependencies are installed using your preferred package manager.
-- Execute the commands below with your preferred package manager, e.g., for pnpm:
+
+First, ensure that \`DATABASE_URL\` is configured in \`.env\` file, then create the database:
 \`\`\`bash
 pnpm drizzle:generate # a script that executes drizzle-kit generate.
 pnpm drizzle:migrate # a script that executes drizzle-kit migrate.
-pnpm drizzle:seed # a script that executes tsx ./database/seed.ts.
+pnpm drizzle:seed # a script that executes tsx ./database/drizzle/seed.ts.
 \`\`\`
 
 > [!NOTE]
@@ -17,7 +17,7 @@ pnpm drizzle:seed # a script that executes tsx ./database/seed.ts.
 >
 > The \`drizzle-kit migrate\` command is used to apply the generated migrations to your database.
 >
-> The \`tsx ./database/seed.ts\` command is used to run a custom seed script to populate data to your database. 
+> The \`tsx ./database/drizzle/seed.ts\` command is used to run a custom seed script to populate data to your database. 
 
 Read more on [Drizzle ORM documentation](https://orm.drizzle.team/docs/overview)
 `;

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

@@ -45,6 +45,7 @@ var require_package = __commonJS({
         "@types/better-sqlite3": "^7.6.11",
         "@types/node": "^18.19.14",
         "better-sqlite3": "^11.2.1",
+        dotenv: "^16.4.5",
         "drizzle-kit": "^0.24.1",
         "drizzle-orm": "^0.33.0",
         tsx: "^4.18.0"
@@ -64,14 +65,23 @@ var require_package = __commonJS({
         "./drizzle.config": {
           types: "./dist/types/drizzle.config.d.ts"
         },
-        "./database/drizzleDb": {
-          types: "./dist/types/database/drizzleDb.d.ts"
+        "./database/drizzle/db": {
+          types: "./dist/types/database/drizzle/db.d.ts"
         },
-        "./database/schema/todos": {
-          types: "./dist/types/database/schema/todos.d.ts"
+        "./database/drizzle/schema/todos": {
+          types: "./dist/types/database/drizzle/schema/todos.d.ts"
         },
-        "./database/seed": {
-          types: "./dist/types/database/seed.d.ts"
+        "./database/drizzle/seed": {
+          types: "./dist/types/database/drizzle/seed.d.ts"
+        },
+        "./database/drizzle/schema/lucia-auth": {
+          types: "./dist/types/database/drizzle/schema/lucia-auth.d.ts"
+        },
+        "./database/drizzle/queries/lucia-auth": {
+          types: "./dist/types/database/drizzle/queries/lucia-auth.d.ts"
+        },
+        "./database/drizzle/queries/todos": {
+          types: "./dist/types/database/drizzle/queries/todos.d.ts"
         }
       },
       typesVersions: {
@@ -79,14 +89,23 @@ var require_package = __commonJS({
           "drizzle.config": [
             "./dist/types/drizzle.config.d.ts"
           ],
-          "database/drizzleDb": [
-            "./dist/types/database/drizzleDb.d.ts"
+          "database/drizzle/db": [
+            "./dist/types/database/drizzle/db.d.ts"
+          ],
+          "database/drizzle/schema/todos": [
+            "./dist/types/database/drizzle/schema/todos.d.ts"
+          ],
+          "database/drizzle/seed": [
+            "./dist/types/database/drizzle/seed.d.ts"
+          ],
+          "database/drizzle/schema/lucia-auth": [
+            "./dist/types/database/drizzle/schema/lucia-auth.d.ts"
           ],
-          "database/schema/todos": [
-            "./dist/types/database/schema/todos.d.ts"
+          "database/drizzle/queries/lucia-auth": [
+            "./dist/types/database/drizzle/queries/lucia-auth.d.ts"
           ],
-          "database/seed": [
-            "./dist/types/database/seed.d.ts"
+          "database/drizzle/queries/todos": [
+            "./dist/types/database/drizzle/queries/todos.d.ts"
           ]
         }
       }
@@ -101,10 +120,10 @@ async function getPackageJson(props) {
   packageJson.scripts["drizzle:generate"] = "drizzle-kit generate";
   packageJson.scripts["drizzle:migrate"] = "drizzle-kit migrate";
   packageJson.scripts["drizzle:studio"] = "drizzle-kit studio";
-  packageJson.scripts["drizzle:seed"] = "tsx ./database/seed.ts";
+  packageJson.scripts["drizzle:seed"] = "tsx ./database/drizzle/seed.ts";
   return addDependency(packageJson, await Promise.resolve().then(() => __toESM(require_package(), 1)).then((x) => x.default), {
     devDependencies: ["@types/better-sqlite3", "tsx"],
-    dependencies: ["better-sqlite3", "drizzle-kit", "drizzle-orm"]
+    dependencies: ["better-sqlite3", "drizzle-kit", "drizzle-orm", "dotenv"]
   });
 }
 export {

package/dist/boilerplates/@batijs/drizzle/files/database/drizzle/db.ts

@@ -0,0 +1,16 @@
+import Database from "better-sqlite3";
+import { type BetterSQLite3Database, drizzle } from "drizzle-orm/better-sqlite3";
+
+let singleton: BetterSQLite3Database | undefined = undefined;
+
+export function db() {
+  if (!singleton) {
+    if (!process.env.DATABASE_URL) {
+      throw new Error("Missing DATABASE_URL in .env file");
+    }
+
+    const sqlite = new Database(process.env.DATABASE_URL);
+    singleton = drizzle(sqlite);
+  }
+  return singleton;
+}

package/dist/boilerplates/@batijs/drizzle/files/database/drizzle/queries/lucia-auth.ts

@@ -0,0 +1,27 @@
+/*# BATI include-if-imported #*/
+import { db } from "../db";
+import { oauthAccountTable, userTable } from "../schema/lucia-auth";
+import { and, eq } from "drizzle-orm";
+
+export function getExistingUser(username: string) {
+  return db().select().from(userTable).where(eq(userTable.username, username)).get();
+}
+
+export function getExistingAccount(providerId: string, providerUserId: number) {
+  return db()
+    .select()
+    .from(oauthAccountTable)
+    .where(and(eq(oauthAccountTable.providerId, providerId), eq(oauthAccountTable.providerUserId, providerUserId)))
+    .get();
+}
+
+export function signupWithGithub(userId: string, username: string, githubUserId: number) {
+  return db().transaction(async (tx) => {
+    await tx.insert(userTable).values({ id: userId, username: username });
+    await tx.insert(oauthAccountTable).values({ providerId: "github", providerUserId: githubUserId, userId });
+  });
+}
+
+export function signupWithCredentials(userId: string, username: string, passwordHash: string) {
+  return db().insert(userTable).values({ id: userId, username, password: passwordHash }).run();
+}

package/dist/boilerplates/@batijs/drizzle/files/database/drizzle/queries/todos.ts

@@ -0,0 +1,11 @@
+/*# BATI include-if-imported #*/
+import { db } from "../db";
+import { todoTable } from "../schema/todos";
+
+export function insertTodo(text: string) {
+  return db().insert(todoTable).values({ text });
+}
+
+export function getAllTodos() {
+  return db().select().from(todoTable).all();
+}

package/dist/boilerplates/@batijs/drizzle/files/database/{schema → drizzle/schema}/todos.ts

@@ -1,3 +1,4 @@
+/*# BATI include-if-imported #*/
 import { integer, sqliteTable, text } from "drizzle-orm/sqlite-core";
 
 // Example of defining a schema in Drizzle ORM:

package/dist/boilerplates/@batijs/drizzle/files/database/{seed.ts → drizzle/seed.ts}

@@ -1,8 +1,8 @@
-import { drizzleDb } from "./drizzleDb";
+import { db } from "./db";
 import { todoTable } from "./schema/todos";
 
 async function seed() {
-  drizzleDb
+  db()
     .insert(todoTable)
     .values([{ text: "Buy milk" }, { text: "Buy strawberries" }])
     .run();
@@ -10,4 +10,4 @@ async function seed() {
   console.log("Seed complete!");
 }
 
-seed();
+await seed();

package/dist/boilerplates/@batijs/drizzle/files/drizzle.config.ts

@@ -1,10 +1,14 @@
 import { defineConfig } from "drizzle-kit";
 
+if (!process.env.DATABASE_URL) {
+  throw new Error("Missing DATABASE_URL in .env file");
+}
+
 export default defineConfig({
   dialect: "sqlite",
-  schema: "./database/schema/*",
-  out: "./drizzle",
+  schema: "./database/drizzle/schema/*",
+  out: "./database/drizzle/migrations",
   dbCredentials: {
-    url: "sqlite.db",
+    url: process.env.DATABASE_URL,
   },
 });

package/dist/boilerplates/@batijs/drizzle/types/database/drizzle/db.d.ts

@@ -0,0 +1,2 @@
+import { type BetterSQLite3Database } from "drizzle-orm/better-sqlite3";
+export declare function db(): BetterSQLite3Database;

package/dist/boilerplates/@batijs/drizzle/types/database/drizzle/queries/lucia-auth.d.ts

@@ -0,0 +1,12 @@
+export declare function getExistingUser(username: string): {
+    id: string;
+    username: string;
+    password: string | null;
+} | undefined;
+export declare function getExistingAccount(providerId: string, providerUserId: number): {
+    providerId: string;
+    providerUserId: number;
+    userId: string;
+} | undefined;
+export declare function signupWithGithub(userId: string, username: string, githubUserId: number): Promise<void>;
+export declare function signupWithCredentials(userId: string, username: string, passwordHash: string): import("better-sqlite3").RunResult;

package/dist/boilerplates/@batijs/drizzle/types/database/drizzle/queries/todos.d.ts

@@ -0,0 +1,43 @@
+export declare function insertTodo(text: string): import("drizzle-orm/sqlite-core").SQLiteInsertBase<import("drizzle-orm/sqlite-core").SQLiteTableWithColumns<{
+    name: "todos";
+    schema: undefined;
+    columns: {
+        id: import("drizzle-orm/sqlite-core").SQLiteColumn<{
+            name: "id";
+            tableName: "todos";
+            dataType: "number";
+            columnType: "SQLiteInteger";
+            data: number;
+            driverParam: number;
+            notNull: true;
+            hasDefault: true;
+            isPrimaryKey: true;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: undefined;
+            baseColumn: never;
+            generated: undefined;
+        }, object>;
+        text: import("drizzle-orm/sqlite-core").SQLiteColumn<{
+            name: "text";
+            tableName: "todos";
+            dataType: "string";
+            columnType: "SQLiteText";
+            data: string;
+            driverParam: string;
+            notNull: true;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: [string, ...string[]];
+            baseColumn: never;
+            generated: undefined;
+        }, object>;
+    };
+    dialect: "sqlite";
+}>, "sync", import("better-sqlite3").RunResult, undefined, false, never>;
+export declare function getAllTodos(): {
+    id: number;
+    text: string;
+}[];

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

@@ -43,7 +43,7 @@ var require_package = __commonJS({
       devDependencies: {
         "@batijs/compile": "workspace:*",
         "@edgedb/generate": "^0.5.5",
-        "@prisma/client": "^5.18.0",
+        "@prisma/client": "^5.19.0",
         "@types/node": "^18.19.14",
         colorette: "^2.0.20",
         edgedb: "^1.5.10"

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

@@ -50,7 +50,7 @@ var require_package = __commonJS({
         "eslint-plugin-solid": "^0.14.2",
         "eslint-plugin-vue": "^9.27.0",
         globals: "^15.9.0",
-        "typescript-eslint": "^8.2.0",
+        "typescript-eslint": "^8.3.0",
         "vue-eslint-parser": "^9.4.3"
       },
       dependencies: {

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

@@ -1,4 +1,4 @@
-// BATI.has("auth0")
+// BATI.has("auth0") || BATI.hasDatabase
 import "dotenv/config";
 import { dirname } from "node:path";
 import { fileURLToPath } from "node:url";

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

@@ -1,4 +1,4 @@
-// BATI.has("auth0")
+// BATI.has("auth0") || BATI.hasDatabase
 import "dotenv/config";
 import { dirname } from "node:path";
 import { fileURLToPath } from "node:url";
@@ -130,7 +130,7 @@ async function startServer() {
   }
 
   if (BATI.has("ts-rest")) {
-    app.all("/api/*", createHandler(tsRestHandler));
+    app.all("/api/*", createHandler(tsRestHandler)());
   }
 
   if (!BATI.has("telefunc") && !BATI.has("trpc") && !BATI.has("ts-rest")) {

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

@@ -1,4 +1,4 @@
-// BATI.has("auth0")
+// BATI.has("auth0") || BATI.hasDatabase
 import "dotenv/config";
 import { createServer, type IncomingMessage, type ServerResponse } from "node:http";
 import { dirname } from "node:path";

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

@@ -1,4 +1,4 @@
-// BATI.has("auth0")
+// BATI.has("auth0") || BATI.hasDatabase
 import "dotenv/config";
 import { authjsHandler, authjsSessionMiddleware } from "@batijs/authjs/server/authjs-handler";
 import {

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

@@ -51,8 +51,8 @@ var require_package = __commonJS({
         "@batijs/telefunc": "workspace:^",
         "@batijs/trpc": "workspace:^",
         "@batijs/ts-rest": "workspace:*",
-        "@hono/node-server": "^1.12.1",
-        "@hono/vite-dev-server": "^0.14.0",
+        "@hono/node-server": "^1.12.2",
+        "@hono/vite-dev-server": "^0.15.0",
         "@trpc/server": "^10.45.2",
         "@types/node": "^18.19.14",
         "@universal-middleware/hono": "^0.2.3",

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

@@ -1,4 +1,4 @@
-// BATI.has("auth0")
+// BATI.has("auth0") || BATI.hasDatabase
 import "dotenv/config";
 import { authjsHandler, authjsSessionMiddleware } from "@batijs/authjs/server/authjs-handler";
 import {

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

@@ -43,6 +43,7 @@ var require_package = __commonJS({
       devDependencies: {
         "@batijs/compile": "workspace:*",
         "@batijs/drizzle": "workspace:*",
+        "@batijs/sqlite": "workspace:*",
         "@lucia-auth/adapter-drizzle": "^1.1.0",
         "@lucia-auth/adapter-sqlite": "^3.0.2",
         "@types/better-sqlite3": "^7.6.11",
@@ -70,15 +71,6 @@ var require_package = __commonJS({
         }
       },
       exports: {
-        "./database/sqliteDb": {
-          types: "./dist/types/database/sqliteDb.d.ts"
-        },
-        "./database/schema/auth": {
-          types: "./dist/types/database/schema/auth.d.ts"
-        },
-        "./database/auth-actions": {
-          types: "./dist/types/database/auth-actions.d.ts"
-        },
         "./lib/lucia-auth": {
           types: "./dist/types/lib/lucia-auth.d.ts"
         },
@@ -91,15 +83,6 @@ var require_package = __commonJS({
       },
       typesVersions: {
         "*": {
-          "database/sqliteDb": [
-            "./dist/types/database/sqliteDb.d.ts"
-          ],
-          "database/schema/auth": [
-            "./dist/types/database/schema/auth.d.ts"
-          ],
-          "database/auth-actions": [
-            "./dist/types/database/auth-actions.d.ts"
-          ],
           "lib/lucia-auth": [
             "./dist/types/lib/lucia-auth.d.ts"
           ],

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

@@ -2,10 +2,10 @@ import "dotenv/config";
 import { Lucia } from "lucia";
 import { BetterSqlite3Adapter } from "@lucia-auth/adapter-sqlite";
 import { GitHub } from "arctic";
-import { sqliteDb } from "../database/sqliteDb";
 import { DrizzleSQLiteAdapter } from "@lucia-auth/adapter-drizzle";
-import { drizzleDb } from "@batijs/drizzle/database/drizzleDb";
-import { sessionTable, userTable } from "../database/schema/auth";
+import { db as drizzleDb } from "@batijs/drizzle/database/drizzle/db";
+import { sessionTable, userTable } from "@batijs/drizzle/database/drizzle/schema/lucia-auth";
+import { db as sqliteDb } from "@batijs/sqlite/database/sqlite/db";
 
 /**
  * Polyfill needed if you're using Node.js 18 or below
@@ -26,8 +26,8 @@ if (!globalThis.crypto) {
  * @link {@see https://lucia-auth.com/database/#database-setup}
  **/
 const adapter = BATI.has("drizzle")
-  ? new DrizzleSQLiteAdapter(drizzleDb, sessionTable, userTable)
-  : new BetterSqlite3Adapter(sqliteDb, {
+  ? new DrizzleSQLiteAdapter(drizzleDb(), sessionTable, userTable)
+  : new BetterSqlite3Adapter(sqliteDb(), {
       user: "users",
       session: "sessions",
     });

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

@@ -3,12 +3,10 @@ import { generateId, Scrypt, verifyRequestOrigin } from "lucia";
 import type { DatabaseOAuthAccount, DatabaseUser, GitHubUser } from "../lib/lucia-auth";
 import { github, lucia } from "../lib/lucia-auth";
 import { SqliteError } from "better-sqlite3";
-import { sqliteDb } from "../database/sqliteDb";
 import { generateState, OAuth2RequestError } from "arctic";
 import { parse, serialize } from "cookie";
-import { drizzleDb } from "@batijs/drizzle/database/drizzleDb";
-import { oauthAccountTable, userTable } from "../database/schema/auth";
-import { getExistingAccount, getExistingUser, validateInput } from "../database/auth-actions";
+import * as drizzleQueries from "@batijs/drizzle/database/drizzle/queries/lucia-auth";
+import * as sqliteQueries from "@batijs/sqlite/database/sqlite/queries/lucia-auth";
 import type { Get, UniversalHandler, UniversalMiddleware } from "@universal-middleware/core";
 
 /**
@@ -108,13 +106,7 @@ export const luciaAuthSignupHandler = (() => async (request) => {
   const userId = generateId(15);
 
   try {
-    if (BATI.has("drizzle")) {
-      drizzleDb.insert(userTable).values({ id: userId, username, password: passwordHash }).run();
-    } else {
-      sqliteDb
-        .prepare("INSERT INTO users (id, username, password) VALUES(?, ?, ?)")
-        .run(userId, username, passwordHash);
-    }
+    (BATI.has("drizzle") ? drizzleQueries : sqliteQueries).signupWithCredentials(userId, username, passwordHash);
 
     const session = await lucia.createSession(userId, {});
 
@@ -165,7 +157,9 @@ export const luciaAuthLoginHandler = (() => async (request) => {
     });
   }
 
-  const existingUser = getExistingUser(username) as DatabaseUser | undefined;
+  const existingUser = (BATI.has("drizzle") ? drizzleQueries : sqliteQueries).getExistingUser(username) as
+    | DatabaseUser
+    | undefined;
   if (!existingUser) {
     return new Response(JSON.stringify({ error: { invalid: "Incorrect username or password" } }), {
       status: 422,
@@ -280,7 +274,10 @@ export const luciaGithubCallbackHandler = (() => async (request) => {
     });
     const githubUser = (await githubUserResponse.json()) as GitHubUser;
 
-    const existingAccount = getExistingAccount("github", githubUser.id) as DatabaseOAuthAccount | undefined;
+    const existingAccount = (BATI.has("drizzle") ? drizzleQueries : sqliteQueries).getExistingAccount(
+      "github",
+      githubUser.id,
+    ) as DatabaseOAuthAccount | undefined;
 
     if (existingAccount) {
       const session = await lucia.createSession(
@@ -298,19 +295,7 @@ export const luciaGithubCallbackHandler = (() => async (request) => {
 
     const userId = generateId(15);
 
-    if (BATI.has("drizzle")) {
-      await drizzleDb.transaction(async (tx) => {
-        await tx.insert(userTable).values({ id: userId, username: githubUser.login });
-        await tx.insert(oauthAccountTable).values({ providerId: "github", providerUserId: githubUser.id, userId });
-      });
-    } else {
-      sqliteDb.transaction(() => {
-        sqliteDb.prepare("INSERT INTO users (id, username) VALUES (?, ?)").run(userId, githubUser.login);
-        sqliteDb
-          .prepare("INSERT INTO oauth_accounts (provider_id, provider_user_id, user_id) VALUES (?, ?, ?)")
-          .run("github", githubUser.id, userId);
-      });
-    }
+    (BATI.has("drizzle") ? drizzleQueries : sqliteQueries).signupWithGithub(userId, githubUser.login, githubUser.id);
 
     const session = await lucia.createSession(userId, {});
 
@@ -338,3 +323,31 @@ export const luciaGithubCallbackHandler = (() => async (request) => {
     });
   }
 }) satisfies Get<[], UniversalHandler>;
+
+export function validateInput(username: string | null, password: string | null) {
+  const error: {
+    username: string | null;
+    password: string | null;
+  } = {
+    username: null,
+    password: null,
+  };
+
+  if (!username || username.length < 3 || username.length > 31 || !/^[a-z0-9_-]+$/.test(username)) {
+    error.username = "Invalid username";
+  }
+  if (!password || password.length < 6 || password.length > 255) {
+    error.password = "Invalid password";
+  }
+
+  if (error.username || error.password) {
+    return {
+      error,
+      success: false,
+    };
+  }
+  return {
+    error,
+    success: true,
+  };
+}

package/dist/boilerplates/@batijs/lucia-auth/types/server/lucia-auth-handlers.d.ts

@@ -56,3 +56,10 @@ export declare const luciaGithubLoginHandler: () => () => Promise<Response>;
  * @link {@see https://lucia-auth.com/guides/oauth/basics#validate-callback}
  */
 export declare const luciaGithubCallbackHandler: () => (request: Request) => Promise<Response>;
+export declare function validateInput(username: string | null, password: string | null): {
+    error: {
+        username: string | null;
+        password: string | null;
+    };
+    success: boolean;
+};

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

@@ -42,10 +42,10 @@ var require_package = __commonJS({
       license: "MIT",
       devDependencies: {
         "@batijs/compile": "workspace:*",
-        "@prisma/client": "^5.18.0",
+        "@prisma/client": "^5.19.0",
         "@types/node": "^18.19.14",
         colorette: "^2.0.20",
-        prisma: "^5.18.0"
+        prisma: "^5.19.0"
       },
       dependencies: {
         "@batijs/core": "workspace:*"