@better-auth/cli 1.4.4 → 1.4.6-beta.2

package/dist/index.mjs

@@ -1,13 +1,13 @@
 #!/usr/bin/env node
 import { Command } from "commander";
+import * as fs$2 from "node:fs";
+import fs, { existsSync, readFileSync } from "node:fs";
+import fs$1 from "node:fs/promises";
+import * as path$1 from "node:path";
+import path from "node:path";
 import { BetterAuthError, capitalizeFirstLetter, createTelemetry, getTelemetryAuthConfig, logger } from "better-auth";
 import { getAdapter, getAuthTables, getMigrations } from "better-auth/db";
 import chalk from "chalk";
-import * as fs$2 from "fs";
-import fs, { existsSync, readFileSync } from "fs";
-import fs$1 from "fs/promises";
-import * as path$1 from "path";
-import path from "path";
 import prompts from "prompts";
 import yoctoSpinner from "yocto-spinner";
 import * as z from "zod/v4";
@@ -17,13 +17,13 @@ import { produceSchema } from "@mrleebo/prisma-ast";
 import babelPresetReact from "@babel/preset-react";
 import babelPresetTypeScript from "@babel/preset-typescript";
 import { loadConfig } from "c12";
-import { exec, execSync } from "child_process";
-import * as os$1 from "os";
-import os from "os";
+import { exec, execSync } from "node:child_process";
+import * as os$1 from "node:os";
+import os from "node:os";
 import { cancel, confirm, intro, isCancel, log, multiselect, outro, select, spinner, text } from "@clack/prompts";
 import { parse } from "dotenv";
 import semver from "semver";
-import Crypto from "crypto";
+import Crypto from "node:crypto";
 import { createAuthClient } from "better-auth/client";
 import { deviceAuthorizationClient } from "better-auth/client/plugins";
 import open from "open";
@@ -80,7 +80,7 @@ const generateDrizzleSchema = async ({ options, file, adapter }) => {
 				mysql: `mysqlEnum([${type.map((x) => `'${x}'`).join(", ")}])`
 			}[databaseType];
 			else throw new TypeError(`Invalid field type for field ${name} in model ${modelName}`);
-			return {
+			const dbTypeMap = {
 				string: {
 					sqlite: `text('${name}')`,
 					pg: `text('${name}')`,
@@ -116,7 +116,9 @@ const generateDrizzleSchema = async ({ options, file, adapter }) => {
 					pg: `jsonb('${name}')`,
 					mysql: `json('${name}')`
 				}
-			}[type][databaseType];
+			}[type];
+			if (!dbTypeMap) throw new Error(`Unsupported field type '${field.type}' for field '${name}'.`);
+			return dbTypeMap[databaseType];
 		}
 		let id = "";
 		const useNumberId = options.advanced?.database?.useNumberId || options.advanced?.database?.generateId === "serial";
@@ -274,6 +276,24 @@ const generateMigrations = async ({ options, file }) => {
 	};
 };
 
+//#endregion
+//#region src/utils/get-package-info.ts
+function getPackageInfo(cwd) {
+	const packageJsonPath = cwd ? path.join(cwd, "package.json") : path.join("package.json");
+	return JSON.parse(fs.readFileSync(packageJsonPath, "utf-8"));
+}
+function getPrismaVersion(cwd) {
+	try {
+		const packageInfo = getPackageInfo(cwd);
+		const prismaVersion = packageInfo.dependencies?.prisma || packageInfo.devDependencies?.prisma || packageInfo.dependencies?.["@prisma/client"] || packageInfo.devDependencies?.["@prisma/client"];
+		if (!prismaVersion) return null;
+		const match = prismaVersion.match(/(\d+)/);
+		return match ? parseInt(match[1], 10) : null;
+	} catch (error) {
+		return null;
+	}
+}
+
 //#endregion
 //#region src/generators/prisma.ts
 const generatePrismaSchema = async ({ adapter, options, file }) => {
@@ -291,7 +311,15 @@ const generatePrismaSchema = async ({ adapter, options, file }) => {
 	});
 	let schemaPrisma = "";
 	if (schemaPrismaExist) schemaPrisma = await fs$1.readFile(path.join(process.cwd(), filePath), "utf-8");
-	else schemaPrisma = getNewPrisma(provider);
+	else schemaPrisma = getNewPrisma(provider, process.cwd());
+	const prismaVersion = getPrismaVersion(process.cwd());
+	if (prismaVersion && prismaVersion >= 7 && schemaPrismaExist) schemaPrisma = produceSchema(schemaPrisma, (builder) => {
+		const generator = builder.findByType("generator", { name: "client" });
+		if (generator && generator.properties) {
+			const providerProp = generator.properties.find((prop) => prop.type === "assignment" && prop.key === "provider");
+			if (providerProp && providerProp.value === "\"prisma-client-js\"") providerProp.value = "\"prisma-client\"";
+		}
+	});
 	const manyToManyRelations = /* @__PURE__ */ new Map();
 	for (const table in tables) {
 		const fields = tables[table]?.fields;
@@ -468,14 +496,17 @@ const generatePrismaSchema = async ({ adapter, options, file }) => {
 		overwrite: schemaPrismaExist && schemaChanged
 	};
 };
-const getNewPrisma = (provider) => `generator client {
-    provider = "prisma-client-js"
+const getNewPrisma = (provider, cwd) => {
+	const prismaVersion = getPrismaVersion(cwd);
+	return `generator client {
+    provider = "${prismaVersion && prismaVersion >= 7 ? "prisma-client" : "prisma-client-js"}"
   }
-  
+
   datasource db {
     provider = "${provider}"
     url      = ${provider === "sqlite" ? `"file:./dev.db"` : `env("DATABASE_URL")`}
   }`;
+};
 
 //#endregion
 //#region src/generators/index.ts
@@ -748,7 +779,13 @@ let possiblePaths = [
 	"auth.js",
 	"auth.jsx",
 	"auth.server.js",
-	"auth.server.ts"
+	"auth.server.ts",
+	"auth/index.ts",
+	"auth/index.tsx",
+	"auth/index.js",
+	"auth/index.jsx",
+	"auth/index.server.js",
+	"auth/index.server.ts"
 ];
 possiblePaths = [
 	...possiblePaths,
@@ -1020,13 +1057,6 @@ async function generateAction(opts) {
 }
 const generate = new Command("generate").option("-c, --cwd <cwd>", "the working directory. defaults to the current directory.", process.cwd()).option("--config <config>", "the path to the configuration file. defaults to the first configuration file found.").option("--output <output>", "the file to output to the generated schema").option("-y, --yes", "automatically answer yes to all prompts", false).option("--y", "(deprecated) same as --yes", false).action(generateAction);
 
-//#endregion
-//#region src/utils/get-package-info.ts
-function getPackageInfo(cwd) {
-	const packageJsonPath = cwd ? path.join(cwd, "package.json") : path.join("package.json");
-	return JSON.parse(fs.readFileSync(packageJsonPath, "utf-8"));
-}
-
 //#endregion
 //#region src/commands/info.ts
 function getSystemInfo() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@better-auth/cli",
-  "version": "1.4.4",
+  "version": "1.4.6-beta.2",
   "type": "module",
   "description": "The CLI for Better Auth",
   "module": "dist/index.mjs",
@@ -32,11 +32,12 @@
     "@types/better-sqlite3": "^7.6.13",
     "@types/prompts": "^2.4.9",
     "@types/semver": "^7.7.1",
+    "jiti": "^2.6.0",
     "tsdown": "^0.16.0",
     "tsx": "^4.20.6",
     "type-fest": "^5.2.0",
     "typescript": "^5.9.3",
-    "@better-auth/passkey": "1.4.4"
+    "@better-auth/passkey": "1.4.6-beta.2"
   },
   "dependencies": {
     "@babel/core": "^7.28.4",
@@ -53,19 +54,16 @@
     "commander": "^12.1.0",
     "dotenv": "^17.2.2",
     "drizzle-orm": "^0.33.0",
-    "get-tsconfig": "^4.10.1",
-    "jiti": "^2.6.0",
     "open": "^10.2.0",
     "pg": "^8.16.3",
     "prettier": "^3.6.2",
     "prisma": "^5.22.0",
     "prompts": "^2.4.2",
     "semver": "^7.7.2",
-    "tinyexec": "^0.3.2",
     "yocto-spinner": "^0.2.3",
     "zod": "^4.1.12",
-    "better-auth": "1.4.4",
-    "@better-auth/core": "1.4.4"
+    "@better-auth/core": "1.4.6-beta.2",
+    "better-auth": "1.4.6-beta.2"
   },
   "files": [
     "dist"
@@ -73,6 +71,7 @@
   "scripts": {
     "build": "tsdown",
     "start": "node ./dist/index.mjs",
+    "lint:package": "publint run --strict",
     "dev": "tsx ./src/index.ts",
     "test": "vitest",
     "typecheck": "tsc --project tsconfig.json"