auth 1.7.0-beta.2 → 1.7.0-beta.3

package/dist/index.mjs

@@ -1648,66 +1648,56 @@ const jitiOptions = (cwd) => {
 		alias: getVirtualModuleAliases()
 	};
 };
-const isDefaultExport = (object) => {
-	return typeof object === "object" && object !== null && !Array.isArray(object) && Object.keys(object).length > 0 && "options" in object;
+/**
+* Picks the auth instance from the loaded module, supporting `export const auth`,
+* `export default auth`, and `export default { auth }`. Falls back to the raw
+* module as a defensive default.
+*/
+const resolveAuthModule = (mod) => {
+	const m = mod;
+	return m?.auth ?? m?.default?.auth ?? m?.default ?? mod;
 };
+const isServerOnlyError = (e) => typeof e === "object" && e !== null && "message" in e && typeof e.message === "string" && e.message.includes("This module cannot be imported from a Client Component module");
+const SERVER_ONLY_HINT = `Please remove import 'server-only' from your auth config file temporarily. The CLI cannot resolve the configuration with it included. You can re-add it after running the CLI.`;
 async function getConfig({ cwd, configPath, shouldThrowOnError = false }) {
+	const fail = (message, error) => {
+		if (shouldThrowOnError) throw error instanceof Error ? error : new Error(message);
+		const log = `[#better-auth]: ${message}`;
+		if (error) console.error(log, error);
+		else console.error(log);
+		process.exit(1);
+	};
+	const load = (configFile) => loadConfig({
+		configFile,
+		dotenv: { fileName: [".env", ".env.local"] },
+		jitiOptions: jitiOptions(cwd),
+		resolveModule: resolveAuthModule,
+		cwd
+	});
 	try {
-		let configFile = null;
 		if (configPath) {
-			let resolvedPath = path.join(cwd, configPath);
-			if (existsSync(configPath)) resolvedPath = configPath;
-			const { config } = await loadConfig({
-				configFile: resolvedPath,
-				dotenv: { fileName: [".env", ".env.local"] },
-				jitiOptions: jitiOptions(cwd),
-				cwd
-			});
-			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.`);
-				process.exit(1);
-			}
-			configFile = "auth" in config ? config.auth?.options : config.options;
+			const resolvedPath = existsSync(configPath) ? configPath : path.join(cwd, configPath);
+			const { config } = await load(resolvedPath);
+			const options = config?.options;
+			if (!options) return fail(`Couldn't read your auth config in ${resolvedPath}. Make sure to default export your auth instance or to export as a variable named auth.`);
+			return options;
 		}
-		if (!configFile) for (const possiblePath of possiblePaths$1) try {
-			const { config } = await loadConfig({
-				configFile: possiblePath,
-				dotenv: { fileName: [".env", ".env.local"] },
-				jitiOptions: jitiOptions(cwd),
-				cwd
-			});
-			if (Object.keys(config).length > 0) {
-				configFile = config.auth?.options || config.default?.options || null;
-				if (!configFile) {
-					if (shouldThrowOnError) throw new Error("Couldn't read your auth config. 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.");
-					console.log("");
-					console.log("[#better-auth]: Make sure to default export your auth instance or to export as a variable named auth.");
-					process.exit(1);
-				}
-				break;
-			}
-		} catch (e) {
-			if (typeof e === "object" && e && "message" in e && typeof e.message === "string" && e.message.includes("This module cannot be imported from a Client Component module")) {
-				if (shouldThrowOnError) throw new Error(`Please remove import 'server-only' from your auth config file temporarily. The CLI cannot resolve the configuration with it included. You can re-add it after running the CLI.`);
-				console.error(`Please remove import 'server-only' from your auth config file temporarily. The CLI cannot resolve the configuration with it included. You can re-add it after running the CLI.`);
-				process.exit(1);
+		for (const possiblePath of possiblePaths$1) {
+			let config;
+			try {
+				({config} = await load(possiblePath));
+			} catch (e) {
+				if (isServerOnlyError(e)) return fail(SERVER_ONLY_HINT);
+				return fail("Couldn't read your auth config.", e);
 			}
-			if (shouldThrowOnError) throw e;
-			console.error("[#better-auth]: Couldn't read your auth config.", e);
-			process.exit(1);
+			if (Object.keys(config).length === 0) continue;
+			if (!config.options) return fail("Couldn't read your auth config. Make sure to default export your auth instance or to export as a variable named auth.");
+			return config.options;
 		}
-		return configFile;
+		return null;
 	} catch (e) {
-		if (typeof e === "object" && e && "message" in e && typeof e.message === "string" && e.message.includes("This module cannot be imported from a Client Component module")) {
-			if (shouldThrowOnError) throw new Error(`Please remove import 'server-only' from your auth config file temporarily. The CLI cannot resolve the configuration with it included. You can re-add it after running the CLI.`);
-			console.error(`Please remove import 'server-only' from your auth config file temporarily. The CLI cannot resolve the configuration with it included. You can re-add it after running the CLI.`);
-			process.exit(1);
-		}
-		if (shouldThrowOnError) throw e;
-		console.error("Couldn't read your auth config.", e);
-		process.exit(1);
+		if (isServerOnlyError(e)) return fail(SERVER_ONLY_HINT);
+		return fail("Couldn't read your auth config.", e);
 	}
 }
 //#endregion
@@ -5277,12 +5267,9 @@ const databasesConfig = [
 			imports: [createImport({ name: "createPool" })],
 			isNamedImport: false
 		}],
-		preCode: `const dialect = createPool({ host: "localhost", user: "root", password: "password", database: "database", timezone: "Z" })`,
+		preCode: `const database = createPool({ host: "localhost", user: "root", password: "password", database: "database", timezone: "Z" })`,
 		code({ additionalOptions }) {
-			return kyselyCode({
-				provider: "mysql",
-				additionalOptions
-			});
+			return `database`;
 		},
 		dependencies: ["mysql2"]
 	},
@@ -5293,12 +5280,9 @@ const databasesConfig = [
 			imports: [createImport({ name: "Pool" })],
 			isNamedImport: false
 		}],
-		preCode: `const dialect = new Pool({ connectionString: "postgresql://postgres:password@localhost:5432/database" })`,
+		preCode: `const database = new Pool({ connectionString: "postgresql://postgres:password@localhost:5432/database" })`,
 		code({ additionalOptions }) {
-			return kyselyCode({
-				provider: "postgresql",
-				additionalOptions
-			});
+			return `database`;
 		},
 		dependencies: ["pg"],
 		devDependencies: ["@types/pg"]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "auth",
-  "version": "1.7.0-beta.2",
+  "version": "1.7.0-beta.3",
   "description": "The CLI for Better Auth",
   "type": "module",
   "license": "MIT",
@@ -49,33 +49,33 @@
     "@better-auth/utils": "0.4.0",
     "@clack/prompts": "^0.11.0",
     "@mrleebo/prisma-ast": "^0.13.1",
-    "c12": "^3.3.3",
+    "c12": "^4.0.0-beta.5",
     "chalk": "^5.6.2",
     "commander": "^12.1.0",
     "dotenv": "^17.3.1",
     "get-tsconfig": "^4.13.6",
+    "jiti": "^2.7.0",
     "open": "^10.2.0",
     "prettier": "^3.8.1",
     "prompts": "^2.4.2",
     "semver": "^7.7.4",
     "yocto-spinner": "^0.2.3",
     "zod": "^4.3.6",
-    "@better-auth/core": "1.7.0-beta.2",
-    "@better-auth/telemetry": "1.7.0-beta.2",
-    "better-auth": "1.7.0-beta.2"
+    "@better-auth/core": "1.7.0-beta.3",
+    "@better-auth/telemetry": "1.7.0-beta.3",
+    "better-auth": "1.7.0-beta.3"
   },
   "devDependencies": {
     "@types/better-sqlite3": "^7.6.13",
     "@types/prompts": "^2.4.9",
     "@types/semver": "^7.7.1",
     "better-sqlite3": "^12.6.2",
-    "jiti": "^2.6.1",
     "memfs": "^4.56.10",
     "tsdown": "0.21.1",
     "tsx": "^4.21.0",
     "type-fest": "^5.4.4",
     "typescript": "^5.9.3",
-    "@better-auth/passkey": "1.7.0-beta.2"
+    "@better-auth/passkey": "1.7.0-beta.3"
   },
   "scripts": {
     "build": "tsdown",