auth 1.6.22 → 1.6.24

package/dist/api.d.mts

@@ -1,6 +1,5 @@
 import { DBAdapter, DBAdapter as DBAdapter$1 } from "@better-auth/core/db/adapter";
 import { BetterAuthOptions } from "@better-auth/core";
-
 //#region src/generators/types.d.ts
 interface SchemaGeneratorResult {
   code?: string;

package/dist/api.mjs

@@ -125,15 +125,10 @@ const generateDrizzleSchema = async ({ options, file, adapter }) => {
 				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()`;
-			} else if (typeof attr.defaultValue === "string") type += `.default("${attr.defaultValue}")`;
+			} else if (typeof attr.defaultValue === "string") type += `.default(${JSON.stringify(attr.defaultValue)})`;
 			else if (Array.isArray(attr.defaultValue)) {
 				const elements = attr.defaultValue.map((value) => JSON.stringify(value)).join(", ");
 				type += `.default([${elements}])`;
@@ -157,11 +152,24 @@ const generateDrizzleSchema = async ({ options, file, adapter }) => {
 		const modelName = getModelName(tableKey);
 		const oneRelations = [];
 		const manyRelations = [];
-		const manyRelationsSet = /* @__PURE__ */ new Set();
 		const foreignFields = Object.entries(table.fields).filter(([_, field]) => field.references);
+		const foreignFieldCounts = /* @__PURE__ */ new Map();
+		for (const [_, field] of foreignFields) {
+			const referencedModel = getModelName(field.references.model);
+			foreignFieldCounts.set(referencedModel, (foreignFieldCounts.get(referencedModel) ?? 0) + 1);
+		}
+		const usedOneRelationKeys = /* @__PURE__ */ new Set();
 		for (const [fieldName, field] of foreignFields) {
 			const referencedModel = field.references.model;
-			const relationKey = getModelName(referencedModel);
+			const hasMultipleRelations = (foreignFieldCounts.get(getModelName(referencedModel)) ?? 0) > 1;
+			let relationKey = hasMultipleRelations ? fieldName.replace(/Id$/, "") : getModelName(referencedModel);
+			if (usedOneRelationKeys.has(relationKey)) relationKey = fieldName;
+			if (usedOneRelationKeys.has(relationKey)) {
+				let suffix = 2;
+				while (usedOneRelationKeys.has(`${relationKey}_${suffix}`)) suffix++;
+				relationKey = `${relationKey}_${suffix}`;
+			}
+			usedOneRelationKeys.add(relationKey);
 			const fieldRef = `${getModelName(tableKey)}.${getFieldName({
 				model: tableKey,
 				field: fieldName
@@ -174,81 +182,49 @@ const generateDrizzleSchema = async ({ options, file, adapter }) => {
 				key: relationKey,
 				model: getModelName(referencedModel),
 				type: "one",
+				relationName: hasMultipleRelations ? `${getModelName(tableKey)}_${fieldName}` : void 0,
 				reference: {
 					field: fieldRef,
-					references: referenceRef,
-					fieldName
+					references: referenceRef
 				}
 			});
 		}
 		const otherModels = Object.entries(tables).filter(([modelName]) => modelName !== tableKey);
-		const modelRelationsMap = /* @__PURE__ */ new Map();
 		for (const [modelName, otherTable] of otherModels) {
 			const foreignKeysPointingHere = Object.entries(otherTable.fields).filter(([_, field]) => field.references?.model === tableKey || field.references?.model === getModelName(tableKey));
 			if (foreignKeysPointingHere.length === 0) continue;
-			const hasUnique = foreignKeysPointingHere.some(([_, field]) => !!field.unique);
-			const hasMany = foreignKeysPointingHere.some(([_, field]) => !field.unique);
-			modelRelationsMap.set(modelName, {
-				modelName,
-				hasUnique,
-				hasMany
-			});
-		}
-		for (const { modelName, hasMany } of modelRelationsMap.values()) {
-			const relationType = hasMany ? "many" : "one";
-			let relationKey = getModelName(modelName);
-			if (!adapter.options?.adapterConfig?.usePlural && relationType === "many") relationKey = `${relationKey}s`;
-			if (!manyRelationsSet.has(relationKey)) {
-				manyRelationsSet.add(relationKey);
+			for (const [fieldName, field] of foreignKeysPointingHere) {
+				const relationType = field.unique ? "one" : "many";
+				let relationKey = getModelName(modelName);
+				if (!adapter.options?.adapterConfig?.usePlural && relationType === "many") relationKey = `${relationKey}s`;
+				const hasMultipleRelations = foreignKeysPointingHere.length > 1;
+				if (hasMultipleRelations) relationKey = `${relationKey}By${fieldName.charAt(0).toUpperCase()}${fieldName.slice(1)}`;
 				manyRelations.push({
 					key: relationKey,
 					model: getModelName(modelName),
-					type: relationType
+					type: relationType,
+					relationName: hasMultipleRelations ? `${getModelName(modelName)}_${fieldName}` : void 0
 				});
 			}
 		}
-		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}, {
+		const hasForwardOne = oneRelations.length > 0;
+		const hasReverseOne = manyRelations.some((relation) => relation.type === "one");
+		const hasReverseMany = manyRelations.some((relation) => relation.type === "many");
+		const hasOne = hasForwardOne || hasReverseOne;
+		const hasMany = hasReverseMany;
+		const renderOneRelation = (relation) => relation.reference ? ` ${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 ")}
-			}))`;
-			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 ")}
+					${relation.relationName ? `relationName: "${relation.relationName}",` : ""}
+				})` : "";
+		const renderReverseRelation = ({ key, model, type, relationName }) => {
+			return ` ${key}: ${type === "one" ? "one" : "many"}(${model}${relationName ? `, { relationName: "${relationName}" }` : ""})`;
+		};
+		if (hasOne || hasMany) {
+			const helpers = [hasOne ? "one" : null, hasMany ? "many" : null].filter(Boolean).join(", ");
+			const relationEntries = [...oneRelations.map(renderOneRelation).filter((x) => x !== ""), ...manyRelations.map(renderReverseRelation)].join(",\n ");
+			const tableRelation = `export const ${modelName}Relations = relations(${getModelName(table.modelName)}, ({ ${helpers} }) => ({
+				${relationEntries}
 			}))`;
 			relationsString += `\n${tableRelation}\n`;
 		}
@@ -294,10 +270,7 @@ function generateImport({ databaseType, tables, options }) {
 		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");
+	if (Object.values(tables).some((table) => Object.values(table.fields).some((field) => field.index && !field.unique))) coreImports.push("index");
 	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`;
 }
 //#endregion
@@ -333,7 +306,8 @@ const generatePrismaSchema = async ({ adapter, options, file }) => {
 	const provider = adapter.options?.provider || "postgresql";
 	const tables = getAuthTables(options);
 	const filePath = file || "./prisma/schema.prisma";
-	const schemaPrismaExist = existsSync(path.join(process.cwd(), filePath));
+	const resolvedFilePath = path.isAbsolute(filePath) ? filePath : path.join(process.cwd(), filePath);
+	const schemaPrismaExist = existsSync(resolvedFilePath);
 	const getModelName = initGetModelName({
 		schema: getAuthTables(options),
 		usePlural: adapter.options?.adapterConfig?.usePlural
@@ -343,7 +317,7 @@ const generatePrismaSchema = async ({ adapter, options, file }) => {
 		usePlural: false
 	});
 	let schemaPrisma = "";
-	if (schemaPrismaExist) schemaPrisma = await fs.readFile(path.join(process.cwd(), filePath), "utf-8");
+	if (schemaPrismaExist) schemaPrisma = await fs.readFile(resolvedFilePath, "utf-8");
 	else schemaPrisma = getNewPrisma(provider, process.cwd());
 	const prismaVersion = getPrismaVersion(process.cwd());
 	if (prismaVersion && prismaVersion >= 7 && schemaPrismaExist) schemaPrisma = produceSchema(schemaPrisma, (builder) => {

package/dist/index.d.mts

@@ -0,0 +1,5 @@
+import "dotenv/config";
+//#region src/index.d.ts
+declare let cliVersion: string;
+//#endregion
+export { cliVersion };

package/dist/index.mjs

@@ -695,15 +695,10 @@ const generateDrizzleSchema = async ({ options, file, adapter }) => {
 				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()`;
-			} else if (typeof attr.defaultValue === "string") type += `.default("${attr.defaultValue}")`;
+			} else if (typeof attr.defaultValue === "string") type += `.default(${JSON.stringify(attr.defaultValue)})`;
 			else if (Array.isArray(attr.defaultValue)) {
 				const elements = attr.defaultValue.map((value) => JSON.stringify(value)).join(", ");
 				type += `.default([${elements}])`;
@@ -727,11 +722,24 @@ const generateDrizzleSchema = async ({ options, file, adapter }) => {
 		const modelName = getModelName(tableKey);
 		const oneRelations = [];
 		const manyRelations = [];
-		const manyRelationsSet = /* @__PURE__ */ new Set();
 		const foreignFields = Object.entries(table.fields).filter(([_, field]) => field.references);
+		const foreignFieldCounts = /* @__PURE__ */ new Map();
+		for (const [_, field] of foreignFields) {
+			const referencedModel = getModelName(field.references.model);
+			foreignFieldCounts.set(referencedModel, (foreignFieldCounts.get(referencedModel) ?? 0) + 1);
+		}
+		const usedOneRelationKeys = /* @__PURE__ */ new Set();
 		for (const [fieldName, field] of foreignFields) {
 			const referencedModel = field.references.model;
-			const relationKey = getModelName(referencedModel);
+			const hasMultipleRelations = (foreignFieldCounts.get(getModelName(referencedModel)) ?? 0) > 1;
+			let relationKey = hasMultipleRelations ? fieldName.replace(/Id$/, "") : getModelName(referencedModel);
+			if (usedOneRelationKeys.has(relationKey)) relationKey = fieldName;
+			if (usedOneRelationKeys.has(relationKey)) {
+				let suffix = 2;
+				while (usedOneRelationKeys.has(`${relationKey}_${suffix}`)) suffix++;
+				relationKey = `${relationKey}_${suffix}`;
+			}
+			usedOneRelationKeys.add(relationKey);
 			const fieldRef = `${getModelName(tableKey)}.${getFieldName({
 				model: tableKey,
 				field: fieldName
@@ -744,81 +752,49 @@ const generateDrizzleSchema = async ({ options, file, adapter }) => {
 				key: relationKey,
 				model: getModelName(referencedModel),
 				type: "one",
+				relationName: hasMultipleRelations ? `${getModelName(tableKey)}_${fieldName}` : void 0,
 				reference: {
 					field: fieldRef,
-					references: referenceRef,
-					fieldName
+					references: referenceRef
 				}
 			});
 		}
 		const otherModels = Object.entries(tables).filter(([modelName]) => modelName !== tableKey);
-		const modelRelationsMap = /* @__PURE__ */ new Map();
 		for (const [modelName, otherTable] of otherModels) {
 			const foreignKeysPointingHere = Object.entries(otherTable.fields).filter(([_, field]) => field.references?.model === tableKey || field.references?.model === getModelName(tableKey));
 			if (foreignKeysPointingHere.length === 0) continue;
-			const hasUnique = foreignKeysPointingHere.some(([_, field]) => !!field.unique);
-			const hasMany = foreignKeysPointingHere.some(([_, field]) => !field.unique);
-			modelRelationsMap.set(modelName, {
-				modelName,
-				hasUnique,
-				hasMany
-			});
-		}
-		for (const { modelName, hasMany } of modelRelationsMap.values()) {
-			const relationType = hasMany ? "many" : "one";
-			let relationKey = getModelName(modelName);
-			if (!adapter.options?.adapterConfig?.usePlural && relationType === "many") relationKey = `${relationKey}s`;
-			if (!manyRelationsSet.has(relationKey)) {
-				manyRelationsSet.add(relationKey);
+			for (const [fieldName, field] of foreignKeysPointingHere) {
+				const relationType = field.unique ? "one" : "many";
+				let relationKey = getModelName(modelName);
+				if (!adapter.options?.adapterConfig?.usePlural && relationType === "many") relationKey = `${relationKey}s`;
+				const hasMultipleRelations = foreignKeysPointingHere.length > 1;
+				if (hasMultipleRelations) relationKey = `${relationKey}By${fieldName.charAt(0).toUpperCase()}${fieldName.slice(1)}`;
 				manyRelations.push({
 					key: relationKey,
 					model: getModelName(modelName),
-					type: relationType
+					type: relationType,
+					relationName: hasMultipleRelations ? `${getModelName(modelName)}_${fieldName}` : void 0
 				});
 			}
 		}
-		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}, {
+		const hasForwardOne = oneRelations.length > 0;
+		const hasReverseOne = manyRelations.some((relation) => relation.type === "one");
+		const hasReverseMany = manyRelations.some((relation) => relation.type === "many");
+		const hasOne = hasForwardOne || hasReverseOne;
+		const hasMany = hasReverseMany;
+		const renderOneRelation = (relation) => relation.reference ? ` ${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 ")}
-			}))`;
-			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 ")}
+					${relation.relationName ? `relationName: "${relation.relationName}",` : ""}
+				})` : "";
+		const renderReverseRelation = ({ key, model, type, relationName }) => {
+			return ` ${key}: ${type === "one" ? "one" : "many"}(${model}${relationName ? `, { relationName: "${relationName}" }` : ""})`;
+		};
+		if (hasOne || hasMany) {
+			const helpers = [hasOne ? "one" : null, hasMany ? "many" : null].filter(Boolean).join(", ");
+			const relationEntries = [...oneRelations.map(renderOneRelation).filter((x) => x !== ""), ...manyRelations.map(renderReverseRelation)].join(",\n ");
+			const tableRelation = `export const ${modelName}Relations = relations(${getModelName(table.modelName)}, ({ ${helpers} }) => ({
+				${relationEntries}
 			}))`;
 			relationsString += `\n${tableRelation}\n`;
 		}
@@ -864,10 +840,7 @@ function generateImport({ databaseType, tables, options }) {
 		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");
+	if (Object.values(tables).some((table) => Object.values(table.fields).some((field) => field.index && !field.unique))) coreImports.push("index");
 	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`;
 }
 //#endregion
@@ -988,7 +961,8 @@ const generatePrismaSchema = async ({ adapter, options, file }) => {
 	const provider = adapter.options?.provider || "postgresql";
 	const tables = getAuthTables(options);
 	const filePath = file || "./prisma/schema.prisma";
-	const schemaPrismaExist = existsSync(path.join(process.cwd(), filePath));
+	const resolvedFilePath = path.isAbsolute(filePath) ? filePath : path.join(process.cwd(), filePath);
+	const schemaPrismaExist = existsSync(resolvedFilePath);
 	const getModelName = initGetModelName({
 		schema: getAuthTables(options),
 		usePlural: adapter.options?.adapterConfig?.usePlural
@@ -998,7 +972,7 @@ const generatePrismaSchema = async ({ adapter, options, file }) => {
 		usePlural: false
 	});
 	let schemaPrisma = "";
-	if (schemaPrismaExist) schemaPrisma = await fs$1.readFile(path.join(process.cwd(), filePath), "utf-8");
+	if (schemaPrismaExist) schemaPrisma = await fs$1.readFile(resolvedFilePath, "utf-8");
 	else schemaPrisma = getNewPrisma(provider, process.cwd());
 	const prismaVersion = getPrismaVersion(process.cwd());
 	if (prismaVersion && prismaVersion >= 7 && schemaPrismaExist) schemaPrisma = produceSchema(schemaPrisma, (builder) => {
@@ -1387,6 +1361,11 @@ function addCloudflareVirtualModules(aliases) {
 * modules the real files depend on are not, which is why we stub `$app/*`
 * directly rather than resolving SvelteKit's on-disk files.
 *
+* The one exception is `$app/env/{private,public}` (explicit environment
+* variables): their exports are arbitrary names declared in the project's
+* `src/env.ts`, so they cannot be enumerated. They are stubbed with a Proxy
+* default export instead — see `createExplicitEnvModule`.
+*
 * The authoritative export surfaces this mirrors:
 *
 * @see https://github.com/sveltejs/kit/tree/main/packages/kit/src/runtime/app
@@ -1397,6 +1376,9 @@ function addSvelteKitVirtualModules(aliases) {
 	aliases["$env/dynamic/public"] = createStubModule(createDynamicEnvModule("public"));
 	aliases["$env/static/private"] = createStubModule(createStaticEnvModule(filterPrivateEnv("PUBLIC_", "")));
 	aliases["$env/static/public"] = createStubModule(createStaticEnvModule(filterPublicEnv("PUBLIC_", "")));
+	const explicitEnvStub = createStubModule(createExplicitEnvModule());
+	aliases["$app/env/private"] = explicitEnvStub;
+	aliases["$app/env/public"] = explicitEnvStub;
 	for (const [id, body] of Object.entries(appModuleStubs)) aliases[id] = createStubModule(body);
 }
 /**
@@ -1508,6 +1490,31 @@ export const env = new Proxy(
   },
 );`;
 }
+/**
+* Body for the explicit `$app/env/{private,public}` modules. Their exports are
+* named after the vars declared in `src/env.ts`, which the CLI cannot know, so
+* unlike the other stubs this cannot enumerate them. A Proxy exported as the
+* *default* sidesteps that: jiti compiles `import { FOO } from "..."` to a
+* member access on the (interop) default, which the Proxy answers from
+* process.env. No prefix filtering — the public/private split is a `src/env.ts`
+* config concern that does not affect schema generation.
+*/
+function createExplicitEnvModule() {
+	return `
+export default new Proxy(
+  {},
+  {
+    get: (_, key) =>
+      typeof key === "string" ? process.env[key] : undefined,
+    has: (_, key) => typeof key === "string" && key in process.env,
+    ownKeys: () => Object.keys(process.env),
+    getOwnPropertyDescriptor: (_, key) =>
+      typeof key === "string" && key in process.env
+        ? { value: process.env[key], enumerable: true, configurable: true }
+        : undefined,
+  },
+);`;
+}
 function filterPrivateEnv(publicPrefix, privatePrefix) {
 	return Object.fromEntries(Object.entries(process.env).filter(([k]) => k.startsWith(privatePrefix) && (publicPrefix === "" || !k.startsWith(publicPrefix))));
 }
@@ -1515,7 +1522,7 @@ function filterPublicEnv(publicPrefix, privatePrefix) {
 	return Object.fromEntries(Object.entries(process.env).filter(([k]) => k.startsWith(publicPrefix) && (privatePrefix === "" || !k.startsWith(privatePrefix))));
 }
 const validIdentifier = /^[a-zA-Z_$][a-zA-Z0-9_$]*$/;
-const reserved = new Set([
+const reserved = /* @__PURE__ */ new Set([
 	"do",
 	"if",
 	"in",
@@ -1735,7 +1742,7 @@ function resolveWithMatchers(specifier, matchers) {
 * a jiti-side preprocessor artifact observed in the AST; revisit on jiti
 * major version bumps (the regression suite catches a rename but not the why).
 */
-const LOADER_IDENTIFIERS = new Set([
+const LOADER_IDENTIFIERS = /* @__PURE__ */ new Set([
 	"require",
 	"import",
 	"jitiImport"
@@ -1809,18 +1816,62 @@ const jitiOptions = (cwd) => {
 const isDefaultExport = (object) => {
 	return typeof object === "object" && object !== null && !Array.isArray(object) && Object.keys(object).length > 0 && "options" in object;
 };
-async function getConfig({ cwd, configPath, shouldThrowOnError = false }) {
+/** Strips a source extension so paths can be compared regardless of `.ts`/`.js`/etc. */
+function withoutSourceExtension(filePath) {
+	const ext = path.extname(filePath);
+	return SOURCE_EXTENSIONS_SET.has(ext) ? filePath.slice(0, -ext.length) : filePath;
+}
+/**
+* Detects the specific first-run failure where a config file imports the
+* very file `auth generate --output <path>` is about to create (e.g. the
+* Convex integration guide's `auth.ts` template does `import schema from
+* "./schema"` before `schema.ts` has ever been generated).
+*
+* Deliberately narrow: only relative specifiers (`./`, `../`) are considered
+* — a bare package name that happens to share a name with the output file
+* must still fail normally — and the resolved specifier must point at
+* exactly the resolved `outputPath`, so unrelated missing imports are never
+* swallowed.
+*
+* @see https://github.com/better-auth/better-auth/issues/10136
+*/
+function resolvesMissingOutputModule(error, configFilePath, resolvedOutputPath) {
+	if (!error || typeof error !== "object" || error.code !== "MODULE_NOT_FOUND") return false;
+	const specifier = ("message" in error && typeof error.message === "string" ? error.message : "").match(/Cannot find module ['"](\.\.?\/[^'"]+)['"]/)?.[1];
+	if (!specifier) return false;
+	const requireStack = "requireStack" in error && Array.isArray(error.requireStack) ? error.requireStack : [];
+	const importedFrom = typeof requireStack[0] === "string" ? requireStack[0] : configFilePath;
+	return withoutSourceExtension(path.resolve(path.dirname(importedFrom), specifier)) === withoutSourceExtension(resolvedOutputPath);
+}
+async function getConfig({ cwd, configPath, outputPath, shouldThrowOnError = false }) {
 	try {
 		let configFile = null;
 		if (configPath) {
 			let resolvedPath = path.join(cwd, configPath);
 			if (existsSync(configPath)) resolvedPath = configPath;
-			const { config } = await loadConfig({
+			const resolvedOutputPath = outputPath ? path.resolve(cwd, outputPath) : void 0;
+			const loadOnce = () => loadConfig({
 				configFile: resolvedPath,
 				dotenv: { fileName: [".env", ".env.local"] },
 				jitiOptions: jitiOptions(cwd),
 				cwd
 			});
+			let loaded;
+			try {
+				loaded = await loadOnce();
+			} catch (e) {
+				if (resolvedOutputPath && !existsSync(resolvedOutputPath) && resolvesMissingOutputModule(e, resolvedPath, resolvedOutputPath)) {
+					await fs.promises.mkdir(path.dirname(resolvedOutputPath), { recursive: true });
+					await fs.promises.writeFile(resolvedOutputPath, "");
+					try {
+						loaded = await loadOnce();
+					} catch (retryError) {
+						await fs.promises.rm(resolvedOutputPath, { force: true }).catch(() => {});
+						throw retryError;
+					}
+				} else throw e;
+			}
+			const { config } = loaded;
 			if (!("auth" in config) && !isDefaultExport(config)) {
 				if (shouldThrowOnError) throw new Error(`Couldn't read your auth config in ${resolvedPath}. Make sure to default export your auth instance or to export as a variable named auth.`);
 				console.error(`[#better-auth]: Couldn't read your auth config in ${resolvedPath}. Make sure to default export your auth instance or to export as a variable named auth.`);
@@ -1940,28 +1991,38 @@ async function generateAction(opts) {
 			if ((await fs$1.stat(resolvedOutput)).isDirectory()) options.output = path.join(options.output, "auth-schema.ts");
 		} catch {}
 	}
+	const resolvedOutputPath = options.output ? path.resolve(cwd, options.output) : void 0;
+	const outputExistedBefore = resolvedOutputPath ? existsSync(resolvedOutputPath) : true;
+	const removeGeneratedStub = async () => {
+		if (!resolvedOutputPath || outputExistedBefore) return;
+		await fs$1.rm(resolvedOutputPath, { force: true }).catch(() => {});
+	};
 	const config = await getConfig({
 		cwd,
-		configPath: options.config
+		configPath: options.config,
+		outputPath: options.output
 	});
 	if (!config) {
+		await removeGeneratedStub();
 		console.error("No configuration file found. Add a `auth.ts` file to your project or pass the path to the configuration file using the `--config` flag.");
 		return;
 	}
 	let adapter;
 	if (options.adapter) adapter = createMockAdapter$1(options.adapter, options.dialect);
-	else adapter = await getAdapter(config).catch((e) => {
+	else adapter = await getAdapter(config).catch(async (e) => {
 		console.error(e.message);
+		await removeGeneratedStub();
 		process.exit(1);
 	});
 	const spinner = yoctoSpinner({ text: "preparing schema..." }).start();
 	const schema = await generateSchema({
 		adapter,
-		file: options.output,
+		file: resolvedOutputPath ?? options.output,
 		options: config
 	});
 	spinner.stop();
 	if (!schema.code) {
+		await removeGeneratedStub();
 		console.log("Your schema is already up to date.");
 		try {
 			await (await createTelemetry(config)).publish({
@@ -1985,9 +2046,10 @@ async function generateAction(opts) {
 			message: `The file ${schema.fileName} already exists. Do you want to ${chalk.yellow(`${schema.overwrite ? "overwrite" : "append"}`)} the schema to the file?`
 		})).confirm;
 		if (confirm) {
-			if (!existsSync(path.join(cwd, schema.fileName))) await fs$1.mkdir(path.dirname(path.join(cwd, schema.fileName)), { recursive: true });
-			if (schema.overwrite) await fs$1.writeFile(path.join(cwd, schema.fileName), schema.code);
-			else await fs$1.appendFile(path.join(cwd, schema.fileName), schema.code);
+			const schemaPath = path.isAbsolute(schema.fileName) ? schema.fileName : path.join(cwd, schema.fileName);
+			if (!existsSync(schemaPath)) await fs$1.mkdir(path.dirname(schemaPath), { recursive: true });
+			if (schema.overwrite) await fs$1.writeFile(schemaPath, schema.code);
+			else await fs$1.appendFile(schemaPath, schema.code);
 			console.log(`🚀 Schema was ${schema.overwrite ? "overwritten" : "appended"} successfully!`);
 			try {
 				await (await createTelemetry(config)).publish({
@@ -2001,6 +2063,7 @@ async function generateAction(opts) {
 			process.exit(0);
 		} else {
 			console.error("Schema generation aborted.");
+			await removeGeneratedStub();
 			try {
 				await (await createTelemetry(config)).publish({
 					type: "cli_generate",
@@ -2025,6 +2088,7 @@ async function generateAction(opts) {
 	})).confirm;
 	if (!confirm) {
 		console.error("Schema generation aborted.");
+		await removeGeneratedStub();
 		try {
 			await (await createTelemetry(config)).publish({
 				type: "cli_generate",
@@ -2036,10 +2100,9 @@ async function generateAction(opts) {
 		} catch {}
 		process.exit(1);
 	}
-	if (!options.output) {
-		if (!existsSync(path.dirname(path.join(cwd, schema.fileName)))) await fs$1.mkdir(path.dirname(path.join(cwd, schema.fileName)), { recursive: true });
-	}
-	await fs$1.writeFile(options.output || path.join(cwd, schema.fileName), schema.code);
+	const writePath = resolvedOutputPath ?? path.join(cwd, schema.fileName);
+	if (!existsSync(path.dirname(writePath))) await fs$1.mkdir(path.dirname(writePath), { recursive: true });
+	await fs$1.writeFile(writePath, schema.code);
 	console.log(`🚀 Schema was generated successfully!`);
 	try {
 		await (await createTelemetry(config)).publish({
@@ -5101,11 +5164,12 @@ const getAuthPluginsCode = async ({ plugins, options = {}, installDependency })
 	const getArguments = await getArgumentsPrompt(options, plugins, "auth");
 	const pluginsCode = [];
 	for (const plugin of plugins) {
-		const args = convertArgumentsCodeToStringArray(await buildArgumentsCode(plugin.auth.arguments, getArguments, plugin.auth.function));
+		const argumentsCode = await buildArgumentsCode(plugin.auth.arguments, getArguments, plugin.auth.function);
+		const args = convertArgumentsCodeToStringArray(argumentsCode);
 		removeTrailingUndefined(args);
 		pluginsCode.push(`${plugin.auth.function}(${args.join(", ")})`);
-		const dependencies = new Set([...plugin.dependencies || [], ...plugin.auth.dependencies || []]);
-		const devDependencies = new Set([...plugin.devDependencies || [], ...plugin.auth.devDependencies || []]);
+		const dependencies = /* @__PURE__ */ new Set([...plugin.dependencies || [], ...plugin.auth.dependencies || []]);
+		const devDependencies = /* @__PURE__ */ new Set([...plugin.devDependencies || [], ...plugin.auth.devDependencies || []]);
 		if (dependencies.size > 0) await installDependency([...dependencies]);
 		if (devDependencies.size > 0) await installDependency([...devDependencies], "dev");
 	}
@@ -5119,11 +5183,12 @@ const getAuthClientPluginsCode = async ({ plugins, options = {}, installDependen
 	const pluginsCode = [];
 	for (const plugin of pluginsWithClient) {
 		if (!plugin.authClient) continue;
-		const args = convertArgumentsCodeToStringArray(await buildArgumentsCode(plugin.authClient.arguments, getArguments, plugin.authClient.function));
+		const argumentsCode = await buildArgumentsCode(plugin.authClient.arguments, getArguments, plugin.authClient.function);
+		const args = convertArgumentsCodeToStringArray(argumentsCode);
 		removeTrailingUndefined(args);
 		pluginsCode.push(`${plugin.authClient.function}(${args.join(", ")})`);
-		const dependencies = new Set([...plugin.dependencies || [], ...plugin.authClient.dependencies || []]);
-		const devDependencies = new Set([...plugin.devDependencies || [], ...plugin.authClient.devDependencies || []]);
+		const dependencies = /* @__PURE__ */ new Set([...plugin.dependencies || [], ...plugin.authClient.dependencies || []]);
+		const devDependencies = /* @__PURE__ */ new Set([...plugin.devDependencies || [], ...plugin.authClient.devDependencies || []]);
 		if (dependencies.size > 0) await installDependency([...dependencies]);
 		if (devDependencies.size > 0) await installDependency([...devDependencies], "dev");
 	}
@@ -6296,9 +6361,10 @@ export const auth = betterAuth({
 		}
 		databaseChoice = dbChoice || null;
 		if (databaseChoice === "yes") {
+			const availableORMs = getAvailableORMs();
 			const selectedOption = await select({
 				message: `Select the database you want to use:`,
-				options: getAvailableORMs().map((opt) => ({
+				options: availableORMs.map((opt) => ({
 					value: opt.adapter || opt.value,
 					label: opt.label
 				}))
@@ -6332,9 +6398,10 @@ export const auth = betterAuth({
 				database = sqliteVariants;
 			} else if (isDirectAdapter(selectedOption)) database = selectedOption;
 			else {
+				const availableDialects = getDialectsForORM(selectedOption);
 				const selectedDialect = await select({
 					message: `Select the database dialect:`,
-					options: getDialectsForORM(selectedOption).map((d) => ({
+					options: availableDialects.map((d) => ({
 						value: d.adapter,
 						label: d.label
 					}))
@@ -6352,7 +6419,7 @@ export const auth = betterAuth({
 				const { shouldInstallDeps } = await prompts({
 					type: "confirm",
 					name: "shouldInstallDeps",
-					message: `Would you like to install the following dependencies: ${[...new Set([...databaseConfig.dependencies, ...databaseConfig.devDependencies || []])].map((x) => chalk.cyan(x)).join(", ")}?`,
+					message: `Would you like to install the following dependencies: ${[.../* @__PURE__ */ new Set([...databaseConfig.dependencies, ...databaseConfig.devDependencies || []])].map((x) => chalk.cyan(x)).join(", ")}?`,
 					initial: true
 				});
 				if (isCancel(shouldInstallDeps)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "auth",
-  "version": "1.6.22",
+  "version": "1.6.24",
   "description": "The CLI for Better Auth",
   "type": "module",
   "license": "MIT",
@@ -47,7 +47,7 @@
     "@babel/preset-react": "^7.28.5",
     "@babel/preset-typescript": "^7.28.5",
     "@better-auth/utils": "0.4.2",
-    "@clack/prompts": "^0.11.0",
+    "@clack/prompts": "^1.6.0",
     "@mrleebo/prisma-ast": "^0.13.1",
     "c12": "^3.3.3",
     "chalk": "^5.6.2",
@@ -60,9 +60,9 @@
     "semver": "^7.7.4",
     "yocto-spinner": "^0.2.3",
     "zod": "^4.3.6",
-    "@better-auth/core": "1.6.22",
-    "@better-auth/telemetry": "1.6.22",
-    "better-auth": "1.6.22"
+    "@better-auth/core": "1.6.24",
+    "@better-auth/telemetry": "1.6.24",
+    "better-auth": "1.6.24"
   },
   "devDependencies": {
     "@types/better-sqlite3": "^7.6.13",
@@ -71,11 +71,11 @@
     "better-sqlite3": "^12.6.2",
     "jiti": "^2.6.1",
     "memfs": "^4.56.10",
-    "tsdown": "0.21.1",
+    "tsdown": "0.22.7",
     "tsx": "^4.21.0",
     "type-fest": "^5.4.4",
-    "typescript": "^5.9.3",
-    "@better-auth/passkey": "1.6.22"
+    "typescript": "^6.0.3",
+    "@better-auth/passkey": "1.6.24"
   },
   "scripts": {
     "build": "tsdown",