@better-auth/cli 1.4.0-beta.19 → 1.4.0-beta.20

package/dist/index.mjs

@@ -53,9 +53,12 @@ const generateDrizzleSchema = async ({ options, file, adapter }) => {
 			if (!databaseType) throw new Error(`Database provider type is undefined during Drizzle schema generation. Please define a \`provider\` in the Drizzle adapter config. Read more at https://better-auth.com/docs/adapters/drizzle`);
 			name = convertToSnakeCase(name, adapter.options?.camelCase);
 			if (field.references?.field === "id") {
-				if (options.advanced?.database?.useNumberId) if (databaseType === "pg") return `integer('${name}')`;
+				const useNumberId$1 = options.advanced?.database?.useNumberId || options.advanced?.database?.generateId === "serial";
+				const useUUIDs = options.advanced?.database?.generateId === "uuid";
+				if (useNumberId$1) if (databaseType === "pg") return `integer('${name}')`;
 				else if (databaseType === "mysql") return `int('${name}')`;
 				else return `integer('${name}')`;
+				if (useUUIDs && databaseType === "pg") return `uuid('${name}')`;
 				if (field.references.field) {
 					if (databaseType === "mysql") return `varchar('${name}', { length: 36 })`;
 				}
@@ -72,7 +75,7 @@ const generateDrizzleSchema = async ({ options, file, adapter }) => {
 				string: {
 					sqlite: `text('${name}')`,
 					pg: `text('${name}')`,
-					mysql: field.unique ? `varchar('${name}', { length: 255 })` : field.references ? `varchar('${name}', { length: 36 })` : `text('${name}')`
+					mysql: field.unique ? `varchar('${name}', { length: 255 })` : field.references ? `varchar('${name}', { length: 36 })` : field.sortable ? `varchar('${name}', { length: 255 })` : field.index ? `varchar('${name}', { length: 255 })` : `text('${name}')`
 				},
 				boolean: {
 					sqlite: `integer('${name}', { mode: 'boolean' })`,
@@ -107,18 +110,38 @@ const generateDrizzleSchema = async ({ options, file, adapter }) => {
 			}[type][databaseType];
 		}
 		let id = "";
-		if (options.advanced?.database?.useNumberId) if (databaseType === "pg") id = `serial("id").primaryKey()`;
+		const useNumberId = options.advanced?.database?.useNumberId || options.advanced?.database?.generateId === "serial";
+		if (options.advanced?.database?.generateId === "uuid" && databaseType === "pg") id = `uuid("id").default(sql\`pg_catalog.gen_random_uuid()\`).primaryKey()`;
+		else if (useNumberId) if (databaseType === "pg") id = `serial("id").primaryKey()`;
 		else if (databaseType === "sqlite") id = `integer("id", { mode: "number" }).primaryKey({ autoIncrement: true })`;
 		else id = `int("id").autoincrement().primaryKey()`;
 		else if (databaseType === "mysql") id = `varchar('id', { length: 36 }).primaryKey()`;
 		else if (databaseType === "pg") id = `text('id').primaryKey()`;
 		else id = `text('id').primaryKey()`;
+		let indexes = [];
+		const assignIndexes = (indexes$1) => {
+			if (!indexes$1.length) return "";
+			let code$1 = [`, (table) => [`];
+			for (const index of indexes$1) code$1.push(`  ${index.type}("${index.name}").on(table.${index.on}),`);
+			code$1.push(`]`);
+			return code$1.join("\n");
+		};
 		const schema = `export const ${modelName} = ${databaseType}Table("${convertToSnakeCase(modelName, adapter.options?.camelCase)}", {
 					id: ${id},
 					${Object.keys(fields).map((field) => {
 			const attr = fields[field];
 			const fieldName = attr.fieldName || field;
 			let type = getType(fieldName, attr);
+			if (attr.index && !attr.unique) indexes.push({
+				type: "index",
+				name: `${modelName}_${fieldName}_idx`,
+				on: fieldName
+			});
+			else if (attr.index && attr.unique) indexes.push({
+				type: "uniqueIndex",
+				name: `${modelName}_${fieldName}_uidx`,
+				on: fieldName
+			});
 			if (attr.defaultValue !== null && typeof attr.defaultValue !== "undefined") if (typeof attr.defaultValue === "function") {
 				if (attr.type === "date" && attr.defaultValue.toString().includes("new Date()")) if (databaseType === "sqlite") type += `.default(sql\`(cast(unixepoch('subsecond') * 1000 as integer))\`)`;
 				else type += `.defaultNow()`;
@@ -129,7 +152,7 @@ const generateDrizzleSchema = async ({ options, file, adapter }) => {
 			}
 			return `${fieldName}: ${type}${attr.required ? ".notNull()" : ""}${attr.unique ? ".unique()" : ""}${attr.references ? `.references(()=> ${getModelName(tables[attr.references.model]?.modelName || attr.references.model, adapter.options)}.${fields[attr.references.field]?.fieldName || attr.references.field}, { onDelete: '${attr.references.onDelete || "cascade"}' })` : ""}`;
 		}).join(",\n ")}
-				});`;
+					}${assignIndexes(indexes)});`;
 		code += `\n${schema}\n`;
 	}
 	return {
@@ -150,7 +173,8 @@ function generateImport({ databaseType, tables, options }) {
 		}
 		if (hasJson && hasBigint) break;
 	}
-	const useNumberId = options.advanced?.database?.useNumberId;
+	const useNumberId = options.advanced?.database?.useNumberId || options.advanced?.database?.generateId === "serial";
+	const useUUIDs = options.advanced?.database?.generateId === "uuid";
 	coreImports.push(`${databaseType}Table`);
 	coreImports.push(databaseType === "mysql" ? "varchar, text" : databaseType === "pg" ? "text" : "text");
 	coreImports.push(hasBigint ? databaseType !== "sqlite" ? "bigint" : "" : "");
@@ -160,16 +184,24 @@ function generateImport({ databaseType, tables, options }) {
 		if (!!useNumberId || hasNonBigintNumber) coreImports.push("int");
 		if (Object.values(tables).some((table) => Object.values(table.fields).some((field) => typeof field.type !== "string" && Array.isArray(field.type) && field.type.every((x) => typeof x === "string")))) coreImports.push("mysqlEnum");
 	} else if (databaseType === "pg") {
+		if (useUUIDs) rootImports.push("sql");
 		const hasNonBigintNumber = Object.values(tables).some((table) => Object.values(table.fields).some((field) => (field.type === "number" || field.type === "number[]") && !field.bigint));
 		const hasFkToId = Object.values(tables).some((table) => Object.values(table.fields).some((field) => field.references?.field === "id"));
-		if (hasNonBigintNumber || options.advanced?.database?.useNumberId && hasFkToId) coreImports.push("integer");
+		if (hasNonBigintNumber || (options.advanced?.database?.useNumberId || options.advanced?.database?.generateId === "serial") && hasFkToId) coreImports.push("integer");
 	} else coreImports.push("integer");
-	coreImports.push(useNumberId ? databaseType === "pg" ? "serial" : "" : "");
+	if (databaseType === "pg") {
+		if (useNumberId) coreImports.push("serial");
+		else if (useUUIDs) coreImports.push("uuid");
+	}
 	if (hasJson) {
 		if (databaseType === "pg") coreImports.push("jsonb");
 		if (databaseType === "mysql") coreImports.push("json");
 	}
 	if (databaseType === "sqlite" && Object.values(tables).some((table) => Object.values(table.fields).some((field) => field.type === "date" && field.defaultValue && typeof field.defaultValue === "function" && field.defaultValue.toString().includes("new Date()")))) rootImports.push("sql");
+	const hasIndexes = Object.values(tables).some((table) => Object.values(table.fields).some((field) => field.index && !field.unique));
+	const hasUniqueIndexes = Object.values(tables).some((table) => Object.values(table.fields).some((field) => field.unique && field.index));
+	if (hasIndexes) coreImports.push("index");
+	if (hasUniqueIndexes) coreImports.push("uniqueIndex");
 	return `${rootImports.length > 0 ? `import { ${rootImports.join(", ")} } from "drizzle-orm";\n` : ""}import { ${coreImports.map((x) => x.trim()).filter((x) => x !== "").join(", ")} } from "drizzle-orm/${databaseType}-core";\n`;
 }
 function getModelName(modelName, options) {
@@ -211,6 +243,19 @@ const generatePrismaSchema = async ({ adapter, options, file }) => {
 			}
 		}
 	}
+	const indexedFields = /* @__PURE__ */ new Map();
+	for (const table in tables) {
+		const fields = tables[table]?.fields;
+		const modelName = capitalizeFirstLetter(tables[table]?.modelName || table);
+		indexedFields.set(modelName, []);
+		for (const field in fields) {
+			const attr = fields[field];
+			if (attr.index && !attr.unique) {
+				const fieldName = attr.fieldName || field;
+				indexedFields.get(modelName).push(fieldName);
+			}
+		}
+	}
 	const schema = produceSchema(schemaPrisma, (builder) => {
 		for (const table in tables) {
 			const originalTableName = table;
@@ -229,8 +274,13 @@ const generatePrismaSchema = async ({ adapter, options, file }) => {
 			}
 			const prismaModel = builder.findByType("model", { name: modelName });
 			if (!prismaModel) if (provider === "mongodb") builder.model(modelName).field("id", "String").attribute("id").attribute(`map("_id")`);
-			else if (options.advanced?.database?.useNumberId) builder.model(modelName).field("id", "Int").attribute("id").attribute("default(autoincrement())");
-			else builder.model(modelName).field("id", "String").attribute("id");
+			else {
+				const useNumberId = options.advanced?.database?.useNumberId || options.advanced?.database?.generateId === "serial";
+				const useUUIDs = options.advanced?.database?.generateId === "uuid";
+				if (useNumberId) builder.model(modelName).field("id", "Int").attribute("id").attribute("default(autoincrement())");
+				else if (useUUIDs && provider === "postgresql") builder.model(modelName).field("id", "String").attribute("id").attribute("db.Uuid").attribute("default(dbgenerated(\"pg_catalog.gen_random_uuid()\"))");
+				else builder.model(modelName).field("id", "String").attribute("id");
+			}
 			for (const field in fields) {
 				const attr = fields[field];
 				const fieldName = attr.fieldName || field;
@@ -240,14 +290,16 @@ const generatePrismaSchema = async ({ adapter, options, file }) => {
 						within: prismaModel.properties
 					})) continue;
 				}
-				const fieldBuilder = builder.model(modelName).field(fieldName, field === "id" && options.advanced?.database?.useNumberId ? getType({
+				const useUUIDs = options.advanced?.database?.generateId === "uuid";
+				const useNumberId = options.advanced?.database?.useNumberId || options.advanced?.database?.generateId === "serial";
+				const fieldBuilder = builder.model(modelName).field(fieldName, field === "id" && useNumberId ? getType({
 					isBigint: false,
 					isOptional: false,
 					type: "number"
 				}) : getType({
 					isBigint: attr?.bigint || false,
 					isOptional: !attr?.required,
-					type: attr.references?.field === "id" ? options.advanced?.database?.useNumberId ? "number" : "string" : attr.type
+					type: attr.references?.field === "id" ? useNumberId ? "number" : "string" : attr.type
 				}));
 				if (field === "id") {
 					fieldBuilder.attribute("id");
@@ -255,13 +307,45 @@ const generatePrismaSchema = async ({ adapter, options, file }) => {
 				}
 				if (attr.unique) builder.model(modelName).blockAttribute(`unique([${fieldName}])`);
 				if (attr.defaultValue !== void 0) {
+					if (Array.isArray(attr.defaultValue)) {
+						if (attr.type === "json") {
+							if (Object.prototype.toString.call(attr.defaultValue[0]) === "[object Object]") {
+								fieldBuilder.attribute(`default("${JSON.stringify(attr.defaultValue).replace(/\\/g, "\\\\").replace(/"/g, "\\\"")}")`);
+								continue;
+							}
+							let jsonArray = [];
+							for (const value of attr.defaultValue) jsonArray.push(value);
+							fieldBuilder.attribute(`default("${JSON.stringify(jsonArray).replace(/"/g, "\\\"")}")`);
+							continue;
+						}
+						if (attr.defaultValue.length === 0) {
+							fieldBuilder.attribute(`default([])`);
+							continue;
+						} else if (typeof attr.defaultValue[0] === "string" && attr.type === "string[]") {
+							let valueArray = [];
+							for (const value of attr.defaultValue) valueArray.push(JSON.stringify(value));
+							fieldBuilder.attribute(`default([${valueArray}])`);
+						} else if (typeof attr.defaultValue[0] === "number") {
+							let valueArray = [];
+							for (const value of attr.defaultValue) valueArray.push(`${value}`);
+							fieldBuilder.attribute(`default([${valueArray}])`);
+						}
+					} else if (typeof attr.defaultValue === "object" && !Array.isArray(attr.defaultValue) && attr.defaultValue !== null) {
+						if (Object.entries(attr.defaultValue).length === 0) {
+							fieldBuilder.attribute(`default("{}")`);
+							continue;
+						}
+						fieldBuilder.attribute(`default("${JSON.stringify(attr.defaultValue).replace(/\\/g, "\\\\").replace(/"/g, "\\\"")}")`);
+					}
 					if (field === "createdAt") fieldBuilder.attribute("default(now())");
-					else if (typeof attr.defaultValue === "boolean") fieldBuilder.attribute(`default(${attr.defaultValue})`);
+					else if (typeof attr.defaultValue === "string" && provider !== "mysql") fieldBuilder.attribute(`default("${attr.defaultValue}")`);
+					else if (typeof attr.defaultValue === "boolean" || typeof attr.defaultValue === "number") fieldBuilder.attribute(`default(${attr.defaultValue})`);
 					else if (typeof attr.defaultValue === "function") {}
 				}
 				if (field === "updatedAt" && attr.onUpdate) fieldBuilder.attribute("updatedAt");
 				else if (attr.onUpdate) {}
 				if (attr.references) {
+					if (useUUIDs && provider === "postgresql") fieldBuilder.attribute(`db.Uuid`);
 					const referencedOriginalModelName = attr.references.model;
 					const referencedCustomModelName = tables[referencedOriginalModelName]?.modelName || referencedOriginalModelName;
 					let action = "Cascade";
@@ -269,7 +353,8 @@ const generatePrismaSchema = async ({ adapter, options, file }) => {
 					else if (attr.references.onDelete === "set null") action = "SetNull";
 					else if (attr.references.onDelete === "set default") action = "SetDefault";
 					else if (attr.references.onDelete === "restrict") action = "Restrict";
-					builder.model(modelName).field(`${referencedCustomModelName.toLowerCase()}`, `${capitalizeFirstLetter(referencedCustomModelName)}${!attr.required ? "?" : ""}`).attribute(`relation(fields: [${fieldName}], references: [${attr.references.field}], onDelete: ${action})`);
+					const relationField = `relation(fields: [${fieldName}], references: [${attr.references.field}], onDelete: ${action})`;
+					builder.model(modelName).field(referencedCustomModelName.toLowerCase(), `${capitalizeFirstLetter(referencedCustomModelName)}${!attr.required ? "?" : ""}`).attribute(relationField);
 				}
 				if (!attr.unique && !attr.references && provider === "mysql" && attr.type === "string") builder.model(modelName).field(fieldName).attribute("db.Text");
 			}
@@ -280,6 +365,18 @@ const generatePrismaSchema = async ({ adapter, options, file }) => {
 					within: prismaModel?.properties
 				})) builder.model(modelName).field(fieldName, `${relatedModel}[]`);
 			}
+			const indexedFieldsForModel = indexedFields.get(modelName);
+			if (indexedFieldsForModel && indexedFieldsForModel.length > 0) for (const fieldName of indexedFieldsForModel) {
+				const field = Object.entries(fields).find(([key, attr]) => (attr.fieldName || key) === fieldName)?.[1];
+				let indexField = fieldName;
+				if (provider === "mysql" && field && field.type === "string") {
+					const useNumberId = options.advanced?.database?.useNumberId || options.advanced?.database?.generateId === "serial";
+					const useUUIDs = options.advanced?.database?.generateId === "uuid";
+					if (field.references?.field === "id" && (useNumberId || useUUIDs)) indexField = `${fieldName}`;
+					else indexField = `${fieldName}(length: 191)`;
+				}
+				builder.model(modelName).blockAttribute(`index([${indexField}])`);
+			}
 			const hasAttribute = builder.findByType("attribute", {
 				name: "map",
 				within: prismaModel?.properties

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@better-auth/cli",
-  "version": "1.4.0-beta.19",
+  "version": "1.4.0-beta.20",
   "type": "module",
   "description": "The CLI for Better Auth",
   "module": "dist/index.mjs",
@@ -34,7 +34,7 @@
     "tsx": "^4.20.6",
     "type-fest": "^5.2.0",
     "typescript": "^5.9.3",
-    "@better-auth/passkey": "1.4.0-beta.19"
+    "@better-auth/passkey": "1.4.0-beta.20"
   },
   "dependencies": {
     "@babel/core": "^7.28.4",
@@ -62,7 +62,8 @@
     "tinyexec": "^0.3.2",
     "yocto-spinner": "^0.2.3",
     "zod": "^4.1.12",
-    "better-auth": "1.4.0-beta.19"
+    "better-auth": "1.4.0-beta.20",
+    "@better-auth/core": "1.4.0-beta.20"
   },
   "files": [
     "dist"