better-auth 0.2.9-beta.2 → 0.2.9-beta.3

package/dist/adapters/drizzle.js

@@ -172,7 +172,7 @@ var getAuthTables = (options) => {
 
 // src/adapters/drizzle-adapter/index.ts
 import { existsSync } from "fs";
-import fs from "fs/promises";
+import "fs/promises";
 
 // src/error/better-auth-error.ts
 var BetterAuthError = class extends Error {
@@ -306,7 +306,6 @@ var drizzleAdapter = (db, options) => {
       let code = `import { ${databaseType}Table, text, ${int}, ${timestampAndBoolean} } from "drizzle-orm/${databaseType}-core";
 			`;
       const fileExist = existsSync(filePath);
-      let fileContent = fileExist ? await fs.readFile(filePath, "utf-8") : "";
       for (const table in tables) {
         let getType2 = function(name, type) {
           if (type === "string") {

package/dist/cli.js

@@ -56,6 +56,20 @@ var logger = createLogger();
 import path from "path";
 import babelPresetTypescript from "@babel/preset-typescript";
 import babelPresetReact from "@babel/preset-react";
+import fs from "fs";
+
+// src/error/better-auth-error.ts
+var BetterAuthError = class extends Error {
+  constructor(message, cause) {
+    super(message);
+    this.name = "BetterAuthError";
+    this.message = message;
+    this.cause = cause;
+    this.stack = "";
+  }
+};
+
+// src/cli/get-config.ts
 var possiblePaths = ["auth.ts", "auth.tsx"];
 possiblePaths = [
   ...possiblePaths,
@@ -63,16 +77,55 @@ possiblePaths = [
   ...possiblePaths.map((it) => `utils/${it}`)
 ];
 possiblePaths = [...possiblePaths, ...possiblePaths.map((it) => `src/${it}`)];
-var jitiOptions = {
-  transformOptions: {
-    babel: {
-      presets: [
-        [babelPresetTypescript, { isTSX: true, allExtensions: true }],
-        [babelPresetReact, { runtime: "automatic" }]
-      ]
+function stripJsonComments(jsonString) {
+  return jsonString.replace(
+    /\\"|"(?:\\"|[^"])*"|(\/\/.*|\/\*[\s\S]*?\*\/)/g,
+    (m, g) => g ? "" : m
+  );
+}
+function getPathAliases(cwd) {
+  const tsConfigPath = path.join(cwd, "tsconfig.json");
+  if (!fs.existsSync(tsConfigPath)) {
+    logger.warn("[#better-auth]: tsconfig.json not found.");
+    return null;
+  }
+  try {
+    const tsConfigContent = fs.readFileSync(tsConfigPath, "utf8");
+    const strippedTsConfigContent = stripJsonComments(tsConfigContent);
+    const tsConfig = JSON.parse(strippedTsConfigContent);
+    const { paths = {} } = tsConfig.compilerOptions || {};
+    const result = {};
+    const obj = Object.entries(paths);
+    for (const [alias, aliasPaths] of obj) {
+      for (const _ of aliasPaths) {
+        result[alias[0]] = "../";
+      }
     }
-  },
-  extensions: [".ts", ".tsx", ".js", ".jsx"]
+    return result;
+  } catch (error) {
+    throw new BetterAuthError("Error parsing tsconfig.json");
+  }
+}
+var jitiOptions = (cwd) => {
+  const alias = getPathAliases(cwd) || {};
+  return {
+    transformOptions: {
+      babel: {
+        presets: [
+          [
+            babelPresetTypescript,
+            {
+              isTSX: true,
+              allExtensions: true
+            }
+          ],
+          [babelPresetReact, { runtime: "automatic" }]
+        ]
+      }
+    },
+    extensions: [".ts", ".tsx", ".js", ".jsx"],
+    alias
+  };
 };
 async function getConfig({
   cwd,
@@ -81,10 +134,11 @@ async function getConfig({
   try {
     let configFile = null;
     if (configPath) {
+      const alias = getPathAliases(cwd);
       const { config } = await loadConfig({
         configFile: path.join(cwd, configPath),
         dotenv: true,
-        jitiOptions
+        jitiOptions: jitiOptions(cwd)
       });
       if (!config.auth && !config.default) {
         logger.error(
@@ -99,7 +153,7 @@ async function getConfig({
         try {
           const { config } = await loadConfig({
             configFile: possiblePath,
-            jitiOptions
+            jitiOptions: jitiOptions(cwd)
           });
           const hasConfig = Object.keys(config).length > 0;
           if (hasConfig) {
@@ -547,17 +601,6 @@ async function getMigrations(config) {
   return { toBeCreated, toBeAdded, runMigrations, compileMigrations };
 }
 
-// src/error/better-auth-error.ts
-var BetterAuthError = class extends Error {
-  constructor(message, cause) {
-    super(message);
-    this.name = "BetterAuthError";
-    this.message = message;
-    this.cause = cause;
-    this.stack = "";
-  }
-};
-
 // src/cli/utils/install-dep.ts
 import ora from "ora";
 import prompts from "prompts";
@@ -844,14 +887,14 @@ async function getAdapter(options, isCli) {
 }
 
 // src/cli/commands/generate.ts
-import fs2 from "fs/promises";
+import fs3 from "fs/promises";
 import chalk2 from "chalk";
 
 // src/adapters/prisma-adapter/generate-cli.ts
 import { produceSchema } from "@mrleebo/prisma-ast";
 import { existsSync as existsSync2 } from "fs";
 import path3 from "path";
-import fs from "fs/promises";
+import fs2 from "fs/promises";
 
 // src/utils/misc.ts
 function capitalizeFirstLetter(str) {
@@ -869,7 +912,7 @@ async function generatePrismaSchema({
   const schemaPrismaExist = existsSync2(path3.join(process.cwd(), filePath));
   let schemaPrisma = "";
   if (schemaPrismaExist) {
-    schemaPrisma = await fs.readFile(
+    schemaPrisma = await fs2.readFile(
       path3.join(process.cwd(), filePath),
       "utf-8"
     );
@@ -961,7 +1004,6 @@ var generate = new Command2("generate").option(
     config: z2.string().optional(),
     output: z2.string().optional()
   }).parse(opts);
-  const spinner = ora3("preparing schema...").start();
   const cwd = path4.resolve(options.cwd);
   if (!existsSync3(cwd)) {
     logger.error(`The directory "${cwd}" does not exist.`);
@@ -977,6 +1019,7 @@ var generate = new Command2("generate").option(
     );
     return;
   }
+  const spinner = ora3("preparing schema...").start();
   const adapter = await getAdapter(config, true).catch((e) => {
     logger.error(e.message);
     process.exit(1);
@@ -1019,10 +1062,16 @@ var generate = new Command2("generate").option(
       )} the schema to the file?`
     });
     if (confirm2) {
+      const exist = existsSync3(path4.join(cwd, fileName));
+      if (!exist) {
+        await fs3.mkdir(path4.dirname(path4.join(cwd, fileName)), {
+          recursive: true
+        });
+      }
       if (overwrite) {
-        await fs2.writeFile(path4.join(cwd, fileName), code);
+        await fs3.writeFile(path4.join(cwd, fileName), code);
       } else {
-        await fs2.appendFile(path4.join(cwd, fileName), code);
+        await fs3.appendFile(path4.join(cwd, fileName), code);
       }
       logger.success(`\u{1F680} schema was appended successfully!`);
       process.exit(0);
@@ -1042,13 +1091,15 @@ var generate = new Command2("generate").option(
     logger.error("Schema generation aborted.");
     process.exit(1);
   }
-  const dirExist = existsSync3(path4.dirname(path4.join(cwd, fileName)));
-  if (!dirExist) {
-    await fs2.mkdir(path4.dirname(path4.join(cwd, fileName)), {
-      recursive: true
-    });
+  if (!options.output) {
+    const dirExist = existsSync3(path4.dirname(path4.join(cwd, fileName)));
+    if (!dirExist) {
+      await fs3.mkdir(path4.dirname(path4.join(cwd, fileName)), {
+        recursive: true
+      });
+    }
   }
-  await fs2.writeFile(options.output || path4.join(cwd, fileName), code);
+  await fs3.writeFile(options.output || path4.join(cwd, fileName), code);
   logger.success(`\u{1F680} schema was generated successfully!`);
   process.exit(0);
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "better-auth",
-  "version": "0.2.9-beta.2",
+  "version": "0.2.9-beta.3",
   "description": "The most comprehensive authentication library for TypeScript.",
   "type": "module",
   "main": "./dist/index.js",