@better-auth/cli 1.4.0-beta.25 → 1.4.0-beta.27

package/dist/index.mjs

@@ -195,10 +195,12 @@ const generateDrizzleSchema = async ({ options, file, adapter }) => {
 			const foreignKeysPointingHere = Object.entries(otherTable.fields).filter(([_, field]) => field.references?.model === tableKey || field.references?.model === getModelName(tableKey));
 			for (const [fieldName, field] of foreignKeysPointingHere) {
 				const isUnique = !!field.unique;
-				const relationKey = isUnique ? getModelName(modelName) : `${getModelName(modelName)}s`;
+				let relationKey = getModelName(modelName);
+				if (!adapter.options?.adapterConfig?.usePlural && !isUnique) relationKey = `${relationKey}s`;
+				const model = getModelName(modelName);
 				relations.push({
 					key: relationKey,
-					model: getModelName(modelName),
+					model,
 					type: isUnique ? "one" : "many"
 				});
 			}
@@ -279,6 +281,14 @@ const generatePrismaSchema = async ({ adapter, options, file }) => {
 	const tables = getAuthTables(options);
 	const filePath = file || "./prisma/schema.prisma";
 	const schemaPrismaExist = existsSync(path.join(process.cwd(), filePath));
+	const getModelName = initGetModelName({
+		schema: getAuthTables(options),
+		usePlural: adapter.options?.adapterConfig?.usePlural
+	});
+	const getFieldName = initGetFieldName({
+		schema: getAuthTables(options),
+		usePlural: false
+	});
 	let schemaPrisma = "";
 	if (schemaPrismaExist) schemaPrisma = await fs$1.readFile(path.join(process.cwd(), filePath), "utf-8");
 	else schemaPrisma = getNewPrisma(provider);
@@ -289,9 +299,9 @@ const generatePrismaSchema = async ({ adapter, options, file }) => {
 			const attr = fields[field];
 			if (attr.references) {
 				const referencedOriginalModel = attr.references.model;
-				const referencedModelNameCap = capitalizeFirstLetter(tables[referencedOriginalModel]?.modelName || referencedOriginalModel);
+				const referencedModelNameCap = capitalizeFirstLetter(getModelName(tables[referencedOriginalModel]?.modelName || referencedOriginalModel));
 				if (!manyToManyRelations.has(referencedModelNameCap)) manyToManyRelations.set(referencedModelNameCap, /* @__PURE__ */ new Set());
-				const currentModelNameCap = capitalizeFirstLetter(tables[table]?.modelName || table);
+				const currentModelNameCap = capitalizeFirstLetter(getModelName(tables[table]?.modelName || table));
 				manyToManyRelations.get(referencedModelNameCap).add(currentModelNameCap);
 			}
 		}
@@ -299,7 +309,7 @@ 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);
+		const modelName = capitalizeFirstLetter(getModelName(tables[table]?.modelName || table));
 		indexedFields.set(modelName, []);
 		for (const field in fields) {
 			const attr = fields[field];
@@ -313,7 +323,7 @@ const generatePrismaSchema = async ({ adapter, options, file }) => {
 		for (const table in tables) {
 			const originalTableName = table;
 			const customModelName = tables[table]?.modelName || table;
-			const modelName = capitalizeFirstLetter(customModelName);
+			const modelName = capitalizeFirstLetter(getModelName(customModelName));
 			const fields = tables[table]?.fields;
 			function getType({ isBigint, isOptional, type }) {
 				if (type === "string") return isOptional ? "String?" : "String";
@@ -334,14 +344,6 @@ const generatePrismaSchema = async ({ adapter, options, file }) => {
 				else if (useUUIDs && provider === "postgresql") builder.model(modelName).field("id", "String").attribute("id").attribute("default(dbgenerated(\"pg_catalog.gen_random_uuid()\"))").attribute("db.Uuid");
 				else builder.model(modelName).field("id", "String").attribute("id");
 			}
-			const getModelName = initGetModelName({
-				schema: getAuthTables(options),
-				usePlural: adapter.options?.adapterConfig?.usePlural
-			});
-			const getFieldName = initGetFieldName({
-				schema: getAuthTables(options),
-				usePlural: false
-			});
 			for (const field in fields) {
 				const attr = fields[field];
 				const fieldName = attr.fieldName || field;
@@ -430,7 +432,7 @@ const generatePrismaSchema = async ({ adapter, options, file }) => {
 				const relatedFields = relatedTableName ? tables[relatedTableName]?.fields : {};
 				const [_fieldKey, fkFieldAttr] = Object.entries(relatedFields || {}).find(([_fieldName, fieldAttr]) => fieldAttr.references && getModelName(fieldAttr.references.model) === getModelName(originalTableName)) || [];
 				const isUnique = fkFieldAttr?.unique === true;
-				const fieldName = isUnique ? `${relatedModel.toLowerCase()}` : `${relatedModel.toLowerCase()}s`;
+				const fieldName = isUnique || adapter.options?.usePlural === true ? `${relatedModel.toLowerCase()}` : `${relatedModel.toLowerCase()}s`;
 				if (!builder.findByType("field", {
 					name: fieldName,
 					within: prismaModel?.properties
@@ -453,7 +455,7 @@ const generatePrismaSchema = async ({ adapter, options, file }) => {
 				within: prismaModel?.properties
 			});
 			const hasChanged = customModelName !== originalTableName;
-			if (!hasAttribute) builder.model(modelName).blockAttribute("map", `${hasChanged ? customModelName : originalTableName}`);
+			if (!hasAttribute) builder.model(modelName).blockAttribute("map", `${getModelName(hasChanged ? customModelName : originalTableName)}`);
 		}
 	});
 	const schemaChanged = schema.trim() !== schemaPrisma.trim();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@better-auth/cli",
-  "version": "1.4.0-beta.25",
+  "version": "1.4.0-beta.27",
   "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.25"
+    "@better-auth/passkey": "1.4.0-beta.27"
   },
   "dependencies": {
     "@babel/core": "^7.28.4",
@@ -62,8 +62,8 @@
     "tinyexec": "^0.3.2",
     "yocto-spinner": "^0.2.3",
     "zod": "^4.1.12",
-    "better-auth": "1.4.0-beta.25",
-    "@better-auth/core": "1.4.0-beta.25"
+    "better-auth": "1.4.0-beta.27",
+    "@better-auth/core": "1.4.0-beta.27"
   },
   "files": [
     "dist"