@better-auth/cli 1.4.6-beta.3 → 1.4.6-beta.6

package/dist/index.mjs

@@ -104,19 +104,19 @@ const generateDrizzleSchema = async ({ options, file, adapter }) => {
 					mysql: `timestamp('${name}', { fsp: 3 })`
 				},
 				"number[]": {
-					sqlite: `integer('${name}').array()`,
+					sqlite: `text('${name}', { mode: "json" })`,
 					pg: field.bigint ? `bigint('${name}', { mode: 'number' }).array()` : `integer('${name}').array()`,
-					mysql: field.bigint ? `bigint('${name}', { mode: 'number' }).array()` : `int('${name}').array()`
+					mysql: `text('${name}', { mode: 'json' })`
 				},
 				"string[]": {
-					sqlite: `text('${name}').array()`,
+					sqlite: `text('${name}', { mode: "json" })`,
 					pg: `text('${name}').array()`,
-					mysql: `text('${name}').array()`
+					mysql: `text('${name}', { mode: "json" })`
 				},
 				json: {
-					sqlite: `text('${name}')`,
+					sqlite: `text('${name}', { mode: "json" })`,
 					pg: `jsonb('${name}')`,
-					mysql: `json('${name}')`
+					mysql: `json('${name}', { mode: "json" })`
 				}
 			}[type];
 			if (!dbTypeMap) throw new Error(`Unsupported field type '${field.type}' for field '${name}'.`);
@@ -174,50 +174,104 @@ const generateDrizzleSchema = async ({ options, file, adapter }) => {
 	let relationsString = "";
 	for (const tableKey in tables) {
 		const table = tables[tableKey];
-		const relations = [];
+		const modelName = getModelName(tableKey);
+		const oneRelations = [];
+		const manyRelations = [];
+		const manyRelationsSet = /* @__PURE__ */ new Set();
 		const foreignFields = Object.entries(table.fields).filter(([_, field]) => field.references);
 		for (const [fieldName, field] of foreignFields) {
 			const referencedModel = field.references.model;
-			relations.push({
-				key: getModelName(referencedModel),
+			const relationKey = getModelName(referencedModel);
+			const fieldRef = `${getModelName(tableKey)}.${getFieldName({
+				model: tableKey,
+				field: fieldName
+			})}`;
+			const referenceRef = `${getModelName(referencedModel)}.${getFieldName({
+				model: referencedModel,
+				field: field.references.field || "id"
+			})}`;
+			oneRelations.push({
+				key: relationKey,
 				model: getModelName(referencedModel),
 				type: "one",
 				reference: {
-					field: `${getModelName(tableKey)}.${getFieldName({
-						model: tableKey,
-						field: fieldName
-					})}`,
-					references: `${getModelName(referencedModel)}.${getFieldName({
-						model: referencedModel,
-						field: field.references.field || "id"
-					})}`
+					field: fieldRef,
+					references: referenceRef,
+					fieldName
 				}
 			});
 		}
-		const otherModels = Object.entries(tables).filter(([modelName]) => modelName !== tableKey);
-		for (const [modelName, otherTable] of otherModels) {
+		const otherModels = Object.entries(tables).filter(([modelName$1]) => modelName$1 !== tableKey);
+		const modelRelationsMap = /* @__PURE__ */ new Map();
+		for (const [modelName$1, otherTable] of otherModels) {
 			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;
-				let relationKey = getModelName(modelName);
-				if (!adapter.options?.adapterConfig?.usePlural && !isUnique) relationKey = `${relationKey}s`;
-				const model = getModelName(modelName);
-				relations.push({
+			if (foreignKeysPointingHere.length === 0) continue;
+			const hasUnique = foreignKeysPointingHere.some(([_, field]) => !!field.unique);
+			const hasMany$1 = foreignKeysPointingHere.some(([_, field]) => !field.unique);
+			modelRelationsMap.set(modelName$1, {
+				modelName: modelName$1,
+				hasUnique,
+				hasMany: hasMany$1
+			});
+		}
+		for (const { modelName: modelName$1, hasUnique, hasMany: hasMany$1 } of modelRelationsMap.values()) {
+			const relationType = hasMany$1 ? "many" : "one";
+			let relationKey = getModelName(modelName$1);
+			if (!adapter.options?.adapterConfig?.usePlural && relationType === "many") relationKey = `${relationKey}s`;
+			if (!manyRelationsSet.has(relationKey)) {
+				manyRelationsSet.add(relationKey);
+				manyRelations.push({
 					key: relationKey,
-					model,
-					type: isUnique ? "one" : "many"
+					model: getModelName(modelName$1),
+					type: relationType
 				});
 			}
 		}
-		const hasOne = relations.some((relation) => relation.type === "one");
-		const hasMany = relations.some((relation) => relation.type === "many");
-		let tableRelation = `export const ${table.modelName}Relations = relations(${getModelName(table.modelName)}, ({ ${hasOne ? "one" : ""}${hasMany ? `${hasOne ? ", " : ""}many` : ""} }) => ({
-				${relations.map(({ key, type, model, reference }) => ` ${key}: ${type}(${model}${!reference ? "" : `, {
-								fields: [${reference.field}],
-								references: [${reference.references}],
-							}`})`).join(",\n ")}
+		const relationsByModel = /* @__PURE__ */ new Map();
+		for (const relation of oneRelations) if (relation.reference) {
+			const modelKey = relation.key;
+			if (!relationsByModel.has(modelKey)) relationsByModel.set(modelKey, []);
+			relationsByModel.get(modelKey).push(relation);
+		}
+		const duplicateRelations = [];
+		const singleRelations = [];
+		for (const [modelKey, relations] of relationsByModel.entries()) if (relations.length > 1) duplicateRelations.push(...relations);
+		else singleRelations.push(relations[0]);
+		for (const relation of duplicateRelations) if (relation.reference) {
+			const fieldName = relation.reference.fieldName;
+			const tableRelation = `export const ${`${modelName}${fieldName.charAt(0).toUpperCase() + fieldName.slice(1)}Relations`} = relations(${getModelName(table.modelName)}, ({ one }) => ({
+				${relation.key}: one(${relation.model}, {
+					fields: [${relation.reference.field}],
+					references: [${relation.reference.references}],
+				})
+			}))`;
+			relationsString += `\n${tableRelation}\n`;
+		}
+		const hasOne = singleRelations.length > 0;
+		const hasMany = manyRelations.length > 0;
+		if (hasOne && hasMany) {
+			const tableRelation = `export const ${modelName}Relations = relations(${getModelName(table.modelName)}, ({ one, many }) => ({
+				${singleRelations.map((relation) => relation.reference ? ` ${relation.key}: one(${relation.model}, {
+					fields: [${relation.reference.field}],
+					references: [${relation.reference.references}],
+				})` : "").filter((x) => x !== "").join(",\n ")}${singleRelations.length > 0 && manyRelations.length > 0 ? "," : ""}
+				${manyRelations.map(({ key, model }) => ` ${key}: many(${model})`).join(",\n ")}
+			}))`;
+			relationsString += `\n${tableRelation}\n`;
+		} else if (hasOne) {
+			const tableRelation = `export const ${modelName}Relations = relations(${getModelName(table.modelName)}, ({ one }) => ({
+				${singleRelations.map((relation) => relation.reference ? ` ${relation.key}: one(${relation.model}, {
+					fields: [${relation.reference.field}],
+					references: [${relation.reference.references}],
+				})` : "").filter((x) => x !== "").join(",\n ")}
 			}))`;
-		if (relations.length > 0) relationsString += `\n${tableRelation}\n`;
+			relationsString += `\n${tableRelation}\n`;
+		} else if (hasMany) {
+			const tableRelation = `export const ${modelName}Relations = relations(${getModelName(table.modelName)}, ({ many }) => ({
+				${manyRelations.map(({ key, model }) => ` ${key}: many(${model})`).join(",\n ")}
+			}))`;
+			relationsString += `\n${tableRelation}\n`;
+		}
 	}
 	code += `\n${relationsString}`;
 	return {
@@ -361,9 +415,18 @@ const generatePrismaSchema = async ({ adapter, options, file }) => {
 				if (type === "number") return isOptional ? "Int?" : "Int";
 				if (type === "boolean") return isOptional ? "Boolean?" : "Boolean";
 				if (type === "date") return isOptional ? "DateTime?" : "DateTime";
-				if (type === "json") return isOptional ? "Json?" : "Json";
-				if (type === "string[]") return isOptional ? "String[]" : "String[]";
-				if (type === "number[]") return isOptional ? "Int[]" : "Int[]";
+				if (type === "json") {
+					if (provider === "sqlite" || provider === "mysql") return isOptional ? "String?" : "String";
+					return isOptional ? "Json?" : "Json";
+				}
+				if (type === "string[]") {
+					if (provider === "sqlite" || provider === "mysql") return isOptional ? "String?" : "String";
+					return "String[]";
+				}
+				if (type === "number[]") {
+					if (provider === "sqlite" || provider === "mysql") return "String";
+					return "Int[]";
+				}
 			}
 			const prismaModel = builder.findByType("model", { name: modelName });
 			if (!prismaModel) if (provider === "mongodb") builder.model(modelName).field("id", "String").attribute("id").attribute(`map("_id")`);
@@ -2964,6 +3027,7 @@ const mcp = new Command("mcp").description("Add Better Auth MCP server to MCP Cl
 
 //#endregion
 //#region src/commands/migrate.ts
+/** @internal */
 async function migrateAction(opts) {
 	const options = z.object({
 		cwd: z.string(),

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@better-auth/cli",
-  "version": "1.4.6-beta.3",
+  "version": "1.4.6-beta.6",
   "type": "module",
   "description": "The CLI for Better Auth",
   "module": "dist/index.mjs",
   "repository": {
     "type": "git",
-    "url": "https://github.com/better-auth/better-auth",
+    "url": "git+https://github.com/better-auth/better-auth.git",
     "directory": "packages/cli"
   },
   "homepage": "https://www.better-auth.com/docs/concepts/cli",
@@ -37,7 +37,7 @@
     "tsx": "^4.20.6",
     "type-fest": "^5.2.0",
     "typescript": "^5.9.3",
-    "@better-auth/passkey": "1.4.6-beta.3"
+    "@better-auth/passkey": "1.4.6-beta.6"
   },
   "dependencies": {
     "@babel/core": "^7.28.4",
@@ -61,9 +61,9 @@
     "semver": "^7.7.2",
     "yocto-spinner": "^0.2.3",
     "zod": "^4.1.12",
-    "@better-auth/core": "1.4.6-beta.3",
-    "@better-auth/telemetry": "1.4.6-beta.3",
-    "better-auth": "^1.4.6-beta.3"
+    "@better-auth/telemetry": "1.4.6-beta.6",
+    "@better-auth/core": "1.4.6-beta.6",
+    "better-auth": "^1.4.6-beta.6"
   },
   "files": [
     "dist"
@@ -74,6 +74,7 @@
     "lint:package": "publint run --strict",
     "dev": "tsx ./src/index.ts",
     "test": "vitest",
+    "coverage": "vitest run --coverage",
     "typecheck": "tsc --project tsconfig.json"
   }
 }