create-better-t-stack 3.5.3 → 3.6.1

package/dist/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { n as createBtsCli } from "./src-C_MeUxmG.js";
+import { n as createBtsCli } from "./src-DaTuAN3w.js";
 
 //#region src/cli.ts
 createBtsCli().run();

package/dist/index.d.ts

@@ -122,8 +122,16 @@ declare const DirectoryConflictSchema: z.ZodEnum<{
   increment: "increment";
 }>;
 type DirectoryConflict = z.infer<typeof DirectoryConflictSchema>;
+declare const TemplateSchema: z.ZodEnum<{
+  mern: "mern";
+  pern: "pern";
+  t3: "t3";
+  none: "none";
+}>;
+type Template = z.infer<typeof TemplateSchema>;
 type CreateInput = {
   projectName?: string;
+  template?: Template;
   yes?: boolean;
   yolo?: boolean;
   verbose?: boolean;
@@ -209,6 +217,12 @@ interface InitResult {
 //#region src/index.d.ts
 declare const router: {
   init: _orpc_server0.Procedure<_orpc_server0.MergedInitialContext<Record<never, never>, Record<never, never>, Record<never, never>>, Record<never, never>, z$1.ZodTuple<[z$1.ZodOptional<z$1.ZodString>, z$1.ZodObject<{
+    template: z$1.ZodOptional<z$1.ZodEnum<{
+      mern: "mern";
+      pern: "pern";
+      t3: "t3";
+      none: "none";
+    }>>;
     yes: z$1.ZodDefault<z$1.ZodOptional<z$1.ZodBoolean>>;
     yolo: z$1.ZodDefault<z$1.ZodOptional<z$1.ZodBoolean>>;
     verbose: z$1.ZodDefault<z$1.ZodOptional<z$1.ZodBoolean>>;
@@ -470,4 +484,4 @@ declare function sponsors(): Promise<void>;
 declare function docs(): Promise<void>;
 declare function builder(): Promise<void>;
 //#endregion
-export { type API, type AddInput, type Addons, type Backend, type BetterTStackConfig, type CreateInput, type Database, type DatabaseSetup, type DirectoryConflict, type Examples, type Frontend, type InitResult, type ORM, type PackageManager, type ProjectConfig, type Runtime, type ServerDeploy, type WebDeploy, builder, createBtsCli, docs, init, router, sponsors };
+export { type API, type AddInput, type Addons, type Backend, type BetterTStackConfig, type CreateInput, type Database, type DatabaseSetup, type DirectoryConflict, type Examples, type Frontend, type InitResult, type ORM, type PackageManager, type ProjectConfig, type Runtime, type ServerDeploy, type Template, type WebDeploy, builder, createBtsCli, docs, init, router, sponsors };

package/dist/index.js

@@ -1,4 +1,4 @@
 #!/usr/bin/env node
-import { a as router, i as init, n as createBtsCli, o as sponsors, r as docs, t as builder } from "./src-C_MeUxmG.js";
+import { a as router, i as init, n as createBtsCli, o as sponsors, r as docs, t as builder } from "./src-DaTuAN3w.js";
 
 export { builder, createBtsCli, docs, init, router, sponsors };

package/dist/{src-C_MeUxmG.js → src-DaTuAN3w.js}

@@ -62,8 +62,8 @@ function getDefaultConfig() {
 }
 const DEFAULT_CONFIG = getDefaultConfig();
 const dependencyVersionMap = {
-	"better-auth": "^1.3.28",
-	"@better-auth/expo": "^1.3.28",
+	"better-auth": "^1.4.0",
+	"@better-auth/expo": "^1.4.0",
 	"@clerk/nextjs": "^6.31.5",
 	"@clerk/clerk-react": "^5.45.0",
 	"@clerk/tanstack-react-start": "^0.26.3",
@@ -291,6 +291,12 @@ const DirectoryConflictSchema = z.enum([
 	"increment",
 	"error"
 ]).describe("How to handle existing directory conflicts");
+const TemplateSchema = z.enum([
+	"mern",
+	"pern",
+	"t3",
+	"none"
+]).describe("Predefined project template");
 
 //#endregion
 //#region src/utils/compatibility.ts
@@ -1578,6 +1584,71 @@ const renderTitle = () => {
 	else console.log(gradient(Object.values(catppuccinTheme)).multiline(TITLE_TEXT));
 };
 
+//#endregion
+//#region src/utils/templates.ts
+const TEMPLATE_PRESETS = {
+	mern: {
+		database: "mongodb",
+		orm: "mongoose",
+		backend: "express",
+		runtime: "node",
+		frontend: ["react-router"],
+		api: "orpc",
+		auth: "better-auth",
+		payments: "none",
+		addons: ["turborepo"],
+		examples: ["todo"],
+		dbSetup: "mongodb-atlas",
+		webDeploy: "none",
+		serverDeploy: "none"
+	},
+	pern: {
+		database: "postgres",
+		orm: "drizzle",
+		backend: "express",
+		runtime: "node",
+		frontend: ["tanstack-router"],
+		api: "trpc",
+		auth: "better-auth",
+		payments: "none",
+		addons: ["turborepo"],
+		examples: ["todo"],
+		dbSetup: "none",
+		webDeploy: "none",
+		serverDeploy: "none"
+	},
+	t3: {
+		database: "postgres",
+		orm: "prisma",
+		backend: "self",
+		runtime: "none",
+		frontend: ["next"],
+		api: "trpc",
+		auth: "better-auth",
+		payments: "none",
+		addons: ["biome", "turborepo"],
+		examples: ["none"],
+		dbSetup: "none",
+		webDeploy: "none",
+		serverDeploy: "none"
+	},
+	none: null
+};
+function getTemplateConfig(template) {
+	if (template === "none" || !template) return null;
+	const config = TEMPLATE_PRESETS[template];
+	if (!config) throw new Error(`Unknown template: ${template}`);
+	return config;
+}
+function getTemplateDescription(template) {
+	return {
+		mern: "MongoDB + Express + React + Node.js - Classic MERN stack",
+		pern: "PostgreSQL + Express + React + Node.js - Popular PERN stack",
+		t3: "T3 Stack - Next.js + tRPC + Prisma + PostgreSQL + Better Auth",
+		none: "No template - Full customization"
+	}[template] || "";
+}
+
 //#endregion
 //#region src/utils/config-processing.ts
 function processArrayOption(options) {
@@ -1829,6 +1900,7 @@ const CORE_STACK_FLAGS = new Set([
 ]);
 function validateYesFlagCombination(options, providedFlags) {
 	if (!options.yes) return;
+	if (options.template && options.template !== "none") return;
 	const coreStackFlagsProvided = Array.from(providedFlags).filter((flag) => CORE_STACK_FLAGS.has(flag));
 	if (coreStackFlagsProvided.length > 0) exitWithError(`Cannot combine --yes with core stack configuration flags: ${coreStackFlagsProvided.map((f) => `--${f}`).join(", ")}. The --yes flag uses default configuration. Remove these flags or use --yes without them.`);
 }
@@ -3784,6 +3856,7 @@ async function setupCatalogs(projectDir, options) {
 	const packagePaths = [
 		"apps/server",
 		"apps/web",
+		"apps/native",
 		"apps/fumadocs",
 		"apps/docs",
 		"packages/api",
@@ -3822,15 +3895,17 @@ function findDuplicateDependencies(packagesInfo, projectName) {
 			if (depName.startsWith(projectScope)) continue;
 			if (version.startsWith("workspace:")) continue;
 			const existing = depCount.get(depName);
-			if (existing) existing.packages.push(pkg.path);
-			else depCount.set(depName, {
-				version,
+			if (existing) {
+				existing.versions.add(version);
+				existing.packages.push(pkg.path);
+			} else depCount.set(depName, {
+				versions: new Set([version]),
 				packages: [pkg.path]
 			});
 		}
 	}
 	const catalog = {};
-	for (const [depName, info] of depCount.entries()) if (info.packages.length > 1) catalog[depName] = info.version;
+	for (const [depName, info] of depCount.entries()) if (info.packages.length > 1 && info.versions.size === 1) catalog[depName] = Array.from(info.versions)[0];
 	return catalog;
 }
 async function setupBunCatalogs(projectDir, catalog) {
@@ -5654,6 +5729,7 @@ async function setupDatabase(config, cliInput) {
 	const s = spinner();
 	const dbPackageDir = path.join(projectDir, "packages/db");
 	const webDir = path.join(projectDir, "apps/web");
+	const webDirExists = await fs.pathExists(webDir);
 	if (!await fs.pathExists(dbPackageDir)) return;
 	try {
 		if (orm === "prisma") {
@@ -5702,7 +5778,7 @@ async function setupDatabase(config, cliInput) {
 					devDependencies: ["drizzle-kit"],
 					projectDir: dbPackageDir
 				});
-				await addPackageDependency({
+				if (webDirExists) await addPackageDependency({
 					dependencies: ["@libsql/client", "libsql"],
 					projectDir: webDir
 				});
@@ -6825,13 +6901,31 @@ async function createProjectHandler(input) {
 		};
 	}
 	const { finalResolvedPath, finalBaseName } = await setupProjectDirectory(finalPathInput, shouldClearDirectory);
-	const cliInput = {
+	const originalInput = {
 		...input,
 		projectDirectory: input.projectName
 	};
-	const providedFlags = getProvidedFlags(cliInput);
+	const providedFlags = getProvidedFlags(originalInput);
+	let cliInput = originalInput;
+	if (input.template && input.template !== "none") {
+		const templateConfig = getTemplateConfig(input.template);
+		if (templateConfig) {
+			const templateName = input.template.toUpperCase();
+			const templateDescription = getTemplateDescription(input.template);
+			log.message(pc.bold(pc.cyan(`Using template: ${pc.white(templateName)}`)));
+			log.message(pc.dim(`   ${templateDescription}`));
+			const userOverrides = {};
+			for (const [key, value] of Object.entries(originalInput)) if (value !== void 0) userOverrides[key] = value;
+			cliInput = {
+				...templateConfig,
+				...userOverrides,
+				template: input.template,
+				projectDirectory: originalInput.projectDirectory
+			};
+		}
+	}
 	let config;
-	if (input.yes) {
+	if (cliInput.yes) {
 		const flagConfig = processProvidedFlagsWithoutValidation(cliInput, finalBaseName);
 		config = {
 			...getDefaultConfig(),
@@ -6843,7 +6937,6 @@ async function createProjectHandler(input) {
 		validateConfigCompatibility(config, providedFlags, cliInput);
 		log.info(pc.yellow("Using default/flag options (config prompts skipped):"));
 		log.message(displayConfig(config));
-		log.message("");
 	} else {
 		const flagConfig = processAndValidateFlags(cliInput, providedFlags, finalBaseName);
 		const { projectName: _projectNameFromFlags,...otherFlags } = flagConfig;
@@ -6854,7 +6947,7 @@ async function createProjectHandler(input) {
 		}
 		config = await gatherConfig(flagConfig, finalBaseName, finalResolvedPath, finalPathInput);
 	}
-	await createProject(config, { manualDb: input.manualDb });
+	await createProject(config, { manualDb: cliInput.manualDb ?? input.manualDb });
 	const reproducibleCommand = generateReproducibleCommand(config);
 	log.success(pc.blue(`You can reproduce this setup with the following command:\n${reproducibleCommand}`));
 	await trackProjectCreation(config, input.disableAnalytics);
@@ -7045,6 +7138,7 @@ const router = os.router({
 		default: true,
 		negateBooleans: true
 	}).input(z$1.tuple([ProjectNameSchema.optional(), z$1.object({
+		template: TemplateSchema.optional().describe("Use a predefined template"),
 		yes: z$1.boolean().optional().default(false).describe("Use default configuration"),
 		yolo: z$1.boolean().optional().default(false).describe("(WARNING - NOT RECOMMENDED) Bypass validations and compatibility checks"),
 		verbose: z$1.boolean().optional().default(false).describe("Show detailed result information"),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-better-t-stack",
-  "version": "3.5.3",
+  "version": "3.6.1",
   "description": "A modern CLI tool for scaffolding end-to-end type-safe TypeScript projects with best practices and customizable configurations",
   "type": "module",
   "license": "MIT",

package/templates/auth/better-auth/server/db/drizzle/mysql/src/schema/auth.ts.hbs

@@ -1,58 +1,100 @@
+import { relations } from "drizzle-orm";
 import {
   mysqlTable,
   varchar,
   text,
   timestamp,
   boolean,
+  index,
 } from "drizzle-orm/mysql-core";
 
 export const user = mysqlTable("user", {
   id: varchar("id", { length: 36 }).primaryKey(),
-  name: text("name").notNull(),
+  name: varchar("name", { length: 255 }).notNull(),
   email: varchar("email", { length: 255 }).notNull().unique(),
-  emailVerified: boolean("email_verified").notNull(),
+  emailVerified: boolean("email_verified").default(false).notNull(),
   image: text("image"),
-  createdAt: timestamp("created_at").notNull(),
-  updatedAt: timestamp("updated_at").notNull(),
+  createdAt: timestamp("created_at", { fsp: 3 }).defaultNow().notNull(),
+  updatedAt: timestamp("updated_at", { fsp: 3 })
+    .defaultNow()
+    .$onUpdate(() => /* @__PURE__ */ new Date())
+    .notNull(),
 });
 
-export const session = mysqlTable("session", {
-  id: varchar("id", { length: 36 }).primaryKey(),
-  expiresAt: timestamp("expires_at").notNull(),
-  token: varchar("token", { length: 255 }).notNull().unique(),
-  createdAt: timestamp("created_at").notNull(),
-  updatedAt: timestamp("updated_at").notNull(),
-  ipAddress: text("ip_address"),
-  userAgent: text("user_agent"),
-  userId: varchar("user_id", { length: 36 })
-    .notNull()
-    .references(() => user.id, { onDelete: "cascade" }),
-});
+export const session = mysqlTable(
+  "session",
+  {
+    id: varchar("id", { length: 36 }).primaryKey(),
+    expiresAt: timestamp("expires_at", { fsp: 3 }).notNull(),
+    token: varchar("token", { length: 255 }).notNull().unique(),
+    createdAt: timestamp("created_at", { fsp: 3 }).defaultNow().notNull(),
+    updatedAt: timestamp("updated_at", { fsp: 3 })
+      .$onUpdate(() => /* @__PURE__ */ new Date())
+      .notNull(),
+    ipAddress: text("ip_address"),
+    userAgent: text("user_agent"),
+    userId: varchar("user_id", { length: 36 })
+      .notNull()
+      .references(() => user.id, { onDelete: "cascade" }),
+  },
+  (table) => [index("session_userId_idx").on(table.userId)],
+);
 
-export const account = mysqlTable("account", {
-  id: varchar("id", { length: 36 }).primaryKey(),
-  accountId: text("account_id").notNull(),
-  providerId: text("provider_id").notNull(),
-  userId: varchar("user_id", { length: 36 })
-    .notNull()
-    .references(() => user.id, { onDelete: "cascade" }),
-  accessToken: text("access_token"),
-  refreshToken: text("refresh_token"),
-  idToken: text("id_token"),
+export const account = mysqlTable(
+  "account",
+  {
+    id: varchar("id", { length: 36 }).primaryKey(),
+    accountId: text("account_id").notNull(),
+    providerId: text("provider_id").notNull(),
+    userId: varchar("user_id", { length: 36 })
+      .notNull()
+      .references(() => user.id, { onDelete: "cascade" }),
+    accessToken: text("access_token"),
+    refreshToken: text("refresh_token"),
+    idToken: text("id_token"),
+    accessTokenExpiresAt: timestamp("access_token_expires_at", { fsp: 3 }),
+    refreshTokenExpiresAt: timestamp("refresh_token_expires_at", { fsp: 3 }),
+    scope: text("scope"),
+    password: text("password"),
+    createdAt: timestamp("created_at", { fsp: 3 }).defaultNow().notNull(),
+    updatedAt: timestamp("updated_at", { fsp: 3 })
+      .$onUpdate(() => /* @__PURE__ */ new Date())
+      .notNull(),
+  },
+  (table) => [index("account_userId_idx").on(table.userId)],
+);
 
-  accessTokenExpiresAt: timestamp("access_token_expires_at"),
-  refreshTokenExpiresAt: timestamp("refresh_token_expires_at"),
-  scope: text("scope"),
-  password: text("password"),
-  createdAt: timestamp("created_at").notNull(),
-  updatedAt: timestamp("updated_at").notNull(),
-});
+export const verification = mysqlTable(
+  "verification",
+  {
+    id: varchar("id", { length: 36 }).primaryKey(),
+    identifier: varchar("identifier", { length: 255 }).notNull(),
+    value: text("value").notNull(),
+    expiresAt: timestamp("expires_at", { fsp: 3 }).notNull(),
+    createdAt: timestamp("created_at", { fsp: 3 }).defaultNow().notNull(),
+    updatedAt: timestamp("updated_at", { fsp: 3 })
+      .defaultNow()
+      .$onUpdate(() => /* @__PURE__ */ new Date())
+      .notNull(),
+  },
+  (table) => [index("verification_identifier_idx").on(table.identifier)],
+);
 
-export const verification = mysqlTable("verification", {
-  id: varchar("id", { length: 36 }).primaryKey(),
-  identifier: text("identifier").notNull(),
-  value: text("value").notNull(),
-  expiresAt: timestamp("expires_at").notNull(),
-  createdAt: timestamp("created_at"),
-  updatedAt: timestamp("updated_at"),
-});
+export const userRelations = relations(user, ({ many }) => ({
+  sessions: many(session),
+  accounts: many(account),
+}));
+
+export const sessionRelations = relations(session, ({ one }) => ({
+  user: one(user, {
+    fields: [session.userId],
+    references: [user.id],
+  }),
+}));
+
+export const accountRelations = relations(account, ({ one }) => ({
+  user: one(user, {
+    fields: [account.userId],
+    references: [user.id],
+  }),
+}));

package/templates/auth/better-auth/server/db/drizzle/postgres/src/schema/auth.ts.hbs

@@ -1,47 +1,93 @@
-import { pgTable, text, timestamp, boolean, serial } from "drizzle-orm/pg-core";
+import { relations } from "drizzle-orm";
+import { pgTable, text, timestamp, boolean, index } from "drizzle-orm/pg-core";
 
 export const user = pgTable("user", {
-					id: text("id").primaryKey(),
-					name: text('name').notNull(),
- email: text('email').notNull().unique(),
- emailVerified: boolean('email_verified').notNull(),
- image: text('image'),
- createdAt: timestamp('created_at').notNull(),
- updatedAt: timestamp('updated_at').notNull()
-				});
+  id: text("id").primaryKey(),
+  name: text("name").notNull(),
+  email: text("email").notNull().unique(),
+  emailVerified: boolean("email_verified").default(false).notNull(),
+  image: text("image"),
+  createdAt: timestamp("created_at").defaultNow().notNull(),
+  updatedAt: timestamp("updated_at")
+    .defaultNow()
+    .$onUpdate(() => /* @__PURE__ */ new Date())
+    .notNull(),
+});
 
-export const session = pgTable("session", {
-					id: text("id").primaryKey(),
-					expiresAt: timestamp('expires_at').notNull(),
- token: text('token').notNull().unique(),
- createdAt: timestamp('created_at').notNull(),
- updatedAt: timestamp('updated_at').notNull(),
- ipAddress: text('ip_address'),
- userAgent: text('user_agent'),
- userId: text('user_id').notNull().references(()=> user.id, { onDelete: 'cascade' })
-				});
+export const session = pgTable(
+  "session",
+  {
+    id: text("id").primaryKey(),
+    expiresAt: timestamp("expires_at").notNull(),
+    token: text("token").notNull().unique(),
+    createdAt: timestamp("created_at").defaultNow().notNull(),
+    updatedAt: timestamp("updated_at")
+      .$onUpdate(() => /* @__PURE__ */ new Date())
+      .notNull(),
+    ipAddress: text("ip_address"),
+    userAgent: text("user_agent"),
+    userId: text("user_id")
+      .notNull()
+      .references(() => user.id, { onDelete: "cascade" }),
+  },
+  (table) => [index("session_userId_idx").on(table.userId)],
+);
 
-export const account = pgTable("account", {
-					id: text("id").primaryKey(),
-					accountId: text('account_id').notNull(),
- providerId: text('provider_id').notNull(),
- userId: text('user_id').notNull().references(()=> user.id, { onDelete: 'cascade' }),
- accessToken: text('access_token'),
- refreshToken: text('refresh_token'),
- idToken: text('id_token'),
- accessTokenExpiresAt: timestamp('access_token_expires_at'),
- refreshTokenExpiresAt: timestamp('refresh_token_expires_at'),
- scope: text('scope'),
- password: text('password'),
- createdAt: timestamp('created_at').notNull(),
- updatedAt: timestamp('updated_at').notNull()
-				});
+export const account = pgTable(
+  "account",
+  {
+    id: text("id").primaryKey(),
+    accountId: text("account_id").notNull(),
+    providerId: text("provider_id").notNull(),
+    userId: text("user_id")
+      .notNull()
+      .references(() => user.id, { onDelete: "cascade" }),
+    accessToken: text("access_token"),
+    refreshToken: text("refresh_token"),
+    idToken: text("id_token"),
+    accessTokenExpiresAt: timestamp("access_token_expires_at"),
+    refreshTokenExpiresAt: timestamp("refresh_token_expires_at"),
+    scope: text("scope"),
+    password: text("password"),
+    createdAt: timestamp("created_at").defaultNow().notNull(),
+    updatedAt: timestamp("updated_at")
+      .$onUpdate(() => /* @__PURE__ */ new Date())
+      .notNull(),
+  },
+  (table) => [index("account_userId_idx").on(table.userId)],
+);
 
-export const verification = pgTable("verification", {
-					id: text("id").primaryKey(),
-					identifier: text('identifier').notNull(),
- value: text('value').notNull(),
- expiresAt: timestamp('expires_at').notNull(),
- createdAt: timestamp('created_at'),
- updatedAt: timestamp('updated_at')
-				});
+export const verification = pgTable(
+  "verification",
+  {
+    id: text("id").primaryKey(),
+    identifier: text("identifier").notNull(),
+    value: text("value").notNull(),
+    expiresAt: timestamp("expires_at").notNull(),
+    createdAt: timestamp("created_at").defaultNow().notNull(),
+    updatedAt: timestamp("updated_at")
+      .defaultNow()
+      .$onUpdate(() => /* @__PURE__ */ new Date())
+      .notNull(),
+  },
+  (table) => [index("verification_identifier_idx").on(table.identifier)],
+);
+
+export const userRelations = relations(user, ({ many }) => ({
+  sessions: many(session),
+  accounts: many(account),
+}));
+
+export const sessionRelations = relations(session, ({ one }) => ({
+  user: one(user, {
+    fields: [session.userId],
+    references: [user.id],
+  }),
+}));
+
+export const accountRelations = relations(account, ({ one }) => ({
+  user: one(user, {
+    fields: [account.userId],
+    references: [user.id],
+  }),
+}));

package/templates/auth/better-auth/server/db/drizzle/sqlite/src/schema/auth.ts.hbs

@@ -1,55 +1,107 @@
-import { sqliteTable, text, integer } from "drizzle-orm/sqlite-core";
+import { relations, sql } from "drizzle-orm";
+import { sqliteTable, text, integer, index } from "drizzle-orm/sqlite-core";
 
 export const user = sqliteTable("user", {
   id: text("id").primaryKey(),
   name: text("name").notNull(),
   email: text("email").notNull().unique(),
-  emailVerified: integer("email_verified", { mode: "boolean" }).notNull(),
+  emailVerified: integer("email_verified", { mode: "boolean" })
+    .default(false)
+    .notNull(),
   image: text("image"),
-  createdAt: integer("created_at", { mode: "timestamp" }).notNull(),
-  updatedAt: integer("updated_at", { mode: "timestamp" }).notNull(),
+  createdAt: integer("created_at", { mode: "timestamp_ms" })
+    .default(sql`(cast(unixepoch('subsecond') * 1000 as integer))`)
+    .notNull(),
+  updatedAt: integer("updated_at", { mode: "timestamp_ms" })
+    .default(sql`(cast(unixepoch('subsecond') * 1000 as integer))`)
+    .$onUpdate(() => /* @__PURE__ */ new Date())
+    .notNull(),
 });
 
-export const session = sqliteTable("session", {
-  id: text("id").primaryKey(),
-  expiresAt: integer("expires_at", { mode: "timestamp" }).notNull(),
-  token: text("token").notNull().unique(),
-  createdAt: integer("created_at", { mode: "timestamp" }).notNull(),
-  updatedAt: integer("updated_at", { mode: "timestamp" }).notNull(),
-  ipAddress: text("ip_address"),
-  userAgent: text("user_agent"),
-  userId: text("user_id")
-    .notNull()
-    .references(() => user.id),
-});
+export const session = sqliteTable(
+  "session",
+  {
+    id: text("id").primaryKey(),
+    expiresAt: integer("expires_at", { mode: "timestamp_ms" }).notNull(),
+    token: text("token").notNull().unique(),
+    createdAt: integer("created_at", { mode: "timestamp_ms" })
+      .default(sql`(cast(unixepoch('subsecond') * 1000 as integer))`)
+      .notNull(),
+    updatedAt: integer("updated_at", { mode: "timestamp_ms" })
+      .$onUpdate(() => /* @__PURE__ */ new Date())
+      .notNull(),
+    ipAddress: text("ip_address"),
+    userAgent: text("user_agent"),
+    userId: text("user_id")
+      .notNull()
+      .references(() => user.id, { onDelete: "cascade" }),
+  },
+  (table) => [index("session_userId_idx").on(table.userId)],
+);
 
-export const account = sqliteTable("account", {
-  id: text("id").primaryKey(),
-  accountId: text("account_id").notNull(),
-  providerId: text("provider_id").notNull(),
-  userId: text("user_id")
-    .notNull()
-    .references(() => user.id),
-  accessToken: text("access_token"),
-  refreshToken: text("refresh_token"),
-  idToken: text("id_token"),
-  accessTokenExpiresAt: integer("access_token_expires_at", {
-    mode: "timestamp",
-  }),
-  refreshTokenExpiresAt: integer("refresh_token_expires_at", {
-    mode: "timestamp",
+export const account = sqliteTable(
+  "account",
+  {
+    id: text("id").primaryKey(),
+    accountId: text("account_id").notNull(),
+    providerId: text("provider_id").notNull(),
+    userId: text("user_id")
+      .notNull()
+      .references(() => user.id, { onDelete: "cascade" }),
+    accessToken: text("access_token"),
+    refreshToken: text("refresh_token"),
+    idToken: text("id_token"),
+    accessTokenExpiresAt: integer("access_token_expires_at", {
+      mode: "timestamp_ms",
+    }),
+    refreshTokenExpiresAt: integer("refresh_token_expires_at", {
+      mode: "timestamp_ms",
+    }),
+    scope: text("scope"),
+    password: text("password"),
+    createdAt: integer("created_at", { mode: "timestamp_ms" })
+      .default(sql`(cast(unixepoch('subsecond') * 1000 as integer))`)
+      .notNull(),
+    updatedAt: integer("updated_at", { mode: "timestamp_ms" })
+      .$onUpdate(() => /* @__PURE__ */ new Date())
+      .notNull(),
+  },
+  (table) => [index("account_userId_idx").on(table.userId)],
+);
+
+export const verification = sqliteTable(
+  "verification",
+  {
+    id: text("id").primaryKey(),
+    identifier: text("identifier").notNull(),
+    value: text("value").notNull(),
+    expiresAt: integer("expires_at", { mode: "timestamp_ms" }).notNull(),
+    createdAt: integer("created_at", { mode: "timestamp_ms" })
+      .default(sql`(cast(unixepoch('subsecond') * 1000 as integer))`)
+      .notNull(),
+    updatedAt: integer("updated_at", { mode: "timestamp_ms" })
+      .default(sql`(cast(unixepoch('subsecond') * 1000 as integer))`)
+      .$onUpdate(() => /* @__PURE__ */ new Date())
+      .notNull(),
+  },
+  (table) => [index("verification_identifier_idx").on(table.identifier)],
+);
+
+export const userRelations = relations(user, ({ many }) => ({
+  sessions: many(session),
+  accounts: many(account),
+}));
+
+export const sessionRelations = relations(session, ({ one }) => ({
+  user: one(user, {
+    fields: [session.userId],
+    references: [user.id],
   }),
-  scope: text("scope"),
-  password: text("password"),
-  createdAt: integer("created_at", { mode: "timestamp" }).notNull(),
-  updatedAt: integer("updated_at", { mode: "timestamp" }).notNull(),
-});
+}));
 
-export const verification = sqliteTable("verification", {
-  id: text("id").primaryKey(),
-  identifier: text("identifier").notNull(),
-  value: text("value").notNull(),
-  expiresAt: integer("expires_at", { mode: "timestamp" }).notNull(),
-  createdAt: integer("created_at", { mode: "timestamp" }),
-  updatedAt: integer("updated_at", { mode: "timestamp" }),
-});
+export const accountRelations = relations(account, ({ one }) => ({
+  user: one(user, {
+    fields: [account.userId],
+    references: [user.id],
+  }),
+}));

package/templates/auth/better-auth/server/db/prisma/mongodb/prisma/schema/auth.prisma.hbs

@@ -2,10 +2,10 @@ model User {
   id            String    @id @map("_id")
   name          String
   email         String
-  emailVerified Boolean
+  emailVerified Boolean   @default(false)
   image         String?
-  createdAt     DateTime
-  updatedAt     DateTime
+  createdAt     DateTime  @default(now())
+  updatedAt     DateTime  @updatedAt
   sessions      Session[]
   accounts      Account[]
 
@@ -17,14 +17,15 @@ model Session {
   id        String   @id @map("_id")
   expiresAt DateTime
   token     String
-  createdAt DateTime
-  updatedAt DateTime
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
   ipAddress String?
   userAgent String?
   userId    String
   user      User     @relation(fields: [userId], references: [id], onDelete: Cascade)
 
   @@unique([token])
+  @@index([userId])
   @@map("session")
 }
 
@@ -41,19 +42,21 @@ model Account {
   refreshTokenExpiresAt DateTime?
   scope                 String?
   password              String?
-  createdAt             DateTime
-  updatedAt             DateTime
+  createdAt             DateTime  @default(now())
+  updatedAt             DateTime  @updatedAt
 
+  @@index([userId])
   @@map("account")
 }
 
 model Verification {
-  id         String    @id @map("_id")
+  id         String   @id @map("_id")
   identifier String
   value      String
   expiresAt  DateTime
-  createdAt  DateTime?
-  updatedAt  DateTime?
+  createdAt  DateTime @default(now())
+  updatedAt  DateTime @updatedAt
 
+  @@index([identifier])
   @@map("verification")
 }

package/templates/auth/better-auth/server/db/prisma/mysql/prisma/schema/auth.prisma.hbs

@@ -2,10 +2,10 @@ model User {
   id            String    @id
   name          String    @db.Text
   email         String
-  emailVerified Boolean
+  emailVerified Boolean   @default(false)
   image         String?   @db.Text
-  createdAt     DateTime
-  updatedAt     DateTime
+  createdAt     DateTime  @default(now())
+  updatedAt     DateTime  @updatedAt
   sessions      Session[]
   accounts      Account[]
 
@@ -17,14 +17,15 @@ model Session {
   id        String   @id
   expiresAt DateTime
   token     String
-  createdAt DateTime
-  updatedAt DateTime
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
   ipAddress String?  @db.Text
   userAgent String?  @db.Text
   userId    String
   user      User     @relation(fields: [userId], references: [id], onDelete: Cascade)
 
   @@unique([token])
+  @@index([userId(length: 191)])
   @@map("session")
 }
 
@@ -41,19 +42,21 @@ model Account {
   refreshTokenExpiresAt DateTime?
   scope                 String?   @db.Text
   password              String?   @db.Text
-  createdAt             DateTime
-  updatedAt             DateTime
+  createdAt             DateTime  @default(now())
+  updatedAt             DateTime  @updatedAt
 
+  @@index([userId(length: 191)])
   @@map("account")
 }
 
 model Verification {
-  id         String    @id
-  identifier String    @db.Text
-  value      String    @db.Text
+  id         String   @id
+  identifier String   @db.Text
+  value      String   @db.Text
   expiresAt  DateTime
-  createdAt  DateTime?
-  updatedAt  DateTime?
+  createdAt  DateTime @default(now())
+  updatedAt  DateTime @updatedAt
 
+  @@index([identifier(length: 191)])
   @@map("verification")
 }

package/templates/auth/better-auth/server/db/prisma/postgres/prisma/schema/auth.prisma.hbs

@@ -1,11 +1,11 @@
 model User {
-  id            String    @id @map("_id")
+  id            String    @id
   name          String
   email         String
-  emailVerified Boolean
+  emailVerified Boolean   @default(false)
   image         String?
-  createdAt     DateTime
-  updatedAt     DateTime
+  createdAt     DateTime  @default(now())
+  updatedAt     DateTime  @updatedAt
   sessions      Session[]
   accounts      Account[]
 
@@ -14,22 +14,23 @@ model User {
 }
 
 model Session {
-  id        String   @id @map("_id")
+  id        String   @id
   expiresAt DateTime
   token     String
-  createdAt DateTime
-  updatedAt DateTime
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
   ipAddress String?
   userAgent String?
   userId    String
   user      User     @relation(fields: [userId], references: [id], onDelete: Cascade)
 
   @@unique([token])
+  @@index([userId])
   @@map("session")
 }
 
 model Account {
-  id                    String    @id @map("_id")
+  id                    String    @id
   accountId             String
   providerId            String
   userId                String
@@ -41,19 +42,21 @@ model Account {
   refreshTokenExpiresAt DateTime?
   scope                 String?
   password              String?
-  createdAt             DateTime
-  updatedAt             DateTime
+  createdAt             DateTime  @default(now())
+  updatedAt             DateTime  @updatedAt
 
+  @@index([userId])
   @@map("account")
 }
 
 model Verification {
-  id         String    @id @map("_id")
+  id         String   @id
   identifier String
   value      String
   expiresAt  DateTime
-  createdAt  DateTime?
-  updatedAt  DateTime?
+  createdAt  DateTime @default(now())
+  updatedAt  DateTime @updatedAt
 
+  @@index([identifier])
   @@map("verification")
 }

package/templates/auth/better-auth/server/db/prisma/sqlite/prisma/schema/auth.prisma.hbs

@@ -1,11 +1,11 @@
 model User {
-  id            String    @id @map("_id")
+  id            String    @id
   name          String
   email         String
-  emailVerified Boolean
+  emailVerified Boolean   @default(false)
   image         String?
-  createdAt     DateTime
-  updatedAt     DateTime
+  createdAt     DateTime  @default(now())
+  updatedAt     DateTime  @updatedAt
   sessions      Session[]
   accounts      Account[]
 
@@ -14,22 +14,23 @@ model User {
 }
 
 model Session {
-  id        String   @id @map("_id")
+  id        String   @id
   expiresAt DateTime
   token     String
-  createdAt DateTime
-  updatedAt DateTime
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
   ipAddress String?
   userAgent String?
   userId    String
   user      User     @relation(fields: [userId], references: [id], onDelete: Cascade)
 
   @@unique([token])
+  @@index([userId])
   @@map("session")
 }
 
 model Account {
-  id                    String    @id @map("_id")
+  id                    String    @id
   accountId             String
   providerId            String
   userId                String
@@ -41,19 +42,21 @@ model Account {
   refreshTokenExpiresAt DateTime?
   scope                 String?
   password              String?
-  createdAt             DateTime
-  updatedAt             DateTime
+  createdAt             DateTime  @default(now())
+  updatedAt             DateTime  @updatedAt
 
+  @@index([userId])
   @@map("account")
 }
 
 model Verification {
-  id         String    @id @map("_id")
+  id         String   @id
   identifier String
   value      String
   expiresAt  DateTime
-  createdAt  DateTime?
-  updatedAt  DateTime?
+  createdAt  DateTime @default(now())
+  updatedAt  DateTime @updatedAt
 
+  @@index([identifier])
   @@map("verification")
 }

package/templates/frontend/native/bare/package.json.hbs

@@ -25,6 +25,7 @@
     "expo-crypto": "~15.0.6",
     "expo-linking": "~8.0.7",
     "expo-navigation-bar": "~5.0.8",
+    "expo-network": "~8.0.7",
     "expo-router": "~6.0.0",
     "expo-secure-store": "~15.0.6",
     "expo-splash-screen": "~31.0.8",

package/templates/frontend/native/uniwind/package.json.hbs

@@ -25,6 +25,7 @@
     "expo-font": "~14.0.9",
     "expo-haptics": "^15.0.7",
     "expo-linking": "~8.0.8",
+    "expo-network": "~8.0.7",
     "expo-router": "~6.0.14",
     "expo-secure-store": "~15.0.7",
     "expo-status-bar": "~3.0.8",