auth 1.5.3 → 1.5.5

package/dist/index.mjs

@@ -23,6 +23,7 @@ import babelPresetReact from "@babel/preset-react";
 import babelPresetTypeScript from "@babel/preset-typescript";
 import { BetterAuthError } from "@better-auth/core/error";
 import { loadConfig } from "c12";
+import { getTsconfig, parseTsconfig } from "get-tsconfig";
 import * as os$1 from "node:os";
 import os from "node:os";
 import open from "open";
@@ -919,23 +920,6 @@ const reserved = new Set([
 	"instanceof"
 ]);
 
-//#endregion
-//#region src/utils/get-tsconfig-info.ts
-function stripJsonComments(jsonString) {
-	return jsonString.replace(/\\"|"(?:\\"|[^"])*"|(\/\/.*|\/\*[\s\S]*?\*\/)/g, (m, g) => g ? "" : m).replace(/,(?=\s*[}\]])/g, "");
-}
-function getTsconfigInfo(cwd, flatPath) {
-	let tsConfigPath;
-	if (flatPath) tsConfigPath = flatPath;
-	else tsConfigPath = cwd ? path.join(cwd, "tsconfig.json") : path.join("tsconfig.json");
-	try {
-		const text = fs.readFileSync(tsConfigPath, "utf-8");
-		return JSON.parse(stripJsonComments(text));
-	} catch (error) {
-		throw error;
-	}
-}
-
 //#endregion
 //#region src/utils/get-config.ts
 let possiblePaths$1 = [
@@ -966,49 +950,63 @@ possiblePaths$1 = [
 	...possiblePaths$1.map((it) => `src/${it}`),
 	...possiblePaths$1.map((it) => `app/${it}`)
 ];
-function resolveReferencePath(configDir, refPath) {
-	const resolvedPath = path.resolve(configDir, refPath);
-	if (refPath.endsWith(".json")) return resolvedPath;
-	if (fs.existsSync(resolvedPath)) try {
-		if (fs.statSync(resolvedPath).isFile()) return resolvedPath;
-	} catch {}
-	return path.resolve(configDir, refPath, "tsconfig.json");
+function mergeAliases(target, source) {
+	for (const [alias, aliasPath] of Object.entries(source)) if (!(alias in target)) target[alias] = aliasPath;
 }
-function getPathAliasesRecursive(tsconfigPath, visited = /* @__PURE__ */ new Set()) {
-	if (visited.has(tsconfigPath)) return {};
-	visited.add(tsconfigPath);
-	if (!fs.existsSync(tsconfigPath)) {
-		console.warn(`Referenced tsconfig not found: ${tsconfigPath}`);
-		return {};
+function extractAliases(tsconfig) {
+	const { paths = {}, baseUrl } = tsconfig.config.compilerOptions ?? {};
+	const result = {};
+	const configDir = path.dirname(tsconfig.path);
+	const resolvedBaseUrl = baseUrl ? path.resolve(configDir, baseUrl) : configDir;
+	for (const [alias, aliasPaths = []] of Object.entries(paths)) for (const aliasedPath of aliasPaths) {
+		const finalAlias = alias.slice(-1) === "*" ? alias.slice(0, -1) : alias;
+		const finalAliasedPath = aliasedPath.slice(-1) === "*" ? aliasedPath.slice(0, -1) : aliasedPath;
+		result[finalAlias || ""] = path.join(resolvedBaseUrl, finalAliasedPath);
 	}
+	return result;
+}
+/**
+* Reads raw tsconfig JSON to get `references` (which get-tsconfig strips out).
+*/
+function readRawTsconfigReferences(tsconfigPath) {
 	try {
-		const tsConfig = getTsconfigInfo(void 0, tsconfigPath);
-		const { paths = {}, baseUrl = "." } = tsConfig.compilerOptions || {};
-		const result = {};
-		const configDir = path.dirname(tsconfigPath);
-		const obj = Object.entries(paths);
-		for (const [alias, aliasPaths] of obj) for (const aliasedPath of aliasPaths) {
-			const resolvedBaseUrl = path.resolve(configDir, baseUrl);
-			const finalAlias = alias.slice(-1) === "*" ? alias.slice(0, -1) : alias;
-			const finalAliasedPath = aliasedPath.slice(-1) === "*" ? aliasedPath.slice(0, -1) : aliasedPath;
-			result[finalAlias || ""] = path.join(resolvedBaseUrl, finalAliasedPath);
-		}
-		if (tsConfig.references) for (const ref of tsConfig.references) {
-			const refAliases = getPathAliasesRecursive(resolveReferencePath(configDir, ref.path), visited);
-			for (const [alias, aliasPath] of Object.entries(refAliases)) if (!(alias in result)) result[alias] = aliasPath;
+		const stripped = fs.readFileSync(tsconfigPath, "utf-8").replace(/\\"|"(?:\\"|[^"])*"|(\/\/.*|\/\*[\s\S]*?\*\/)/g, (m, g) => g ? "" : m).replace(/,(?=\s*[}\]])/g, "");
+		return JSON.parse(stripped).references;
+	} catch {
+		return;
+	}
+}
+/**
+* Collect path aliases from tsconfig references recursively.
+*/
+function collectReferencesAliases(tsconfigPath, visited = /* @__PURE__ */ new Set()) {
+	const result = {};
+	const refs = readRawTsconfigReferences(tsconfigPath);
+	if (!refs) return result;
+	const configDir = path.dirname(tsconfigPath);
+	for (const ref of refs) {
+		const resolvedRef = path.resolve(configDir, ref.path);
+		const refTsconfigPath = resolvedRef.endsWith(".json") ? resolvedRef : path.join(resolvedRef, "tsconfig.json");
+		if (visited.has(refTsconfigPath)) continue;
+		visited.add(refTsconfigPath);
+		try {
+			mergeAliases(result, extractAliases({
+				path: refTsconfigPath,
+				config: parseTsconfig(refTsconfigPath)
+			}));
+		} catch {
+			continue;
 		}
-		return result;
-	} catch (error) {
-		console.warn(`Error parsing tsconfig at ${tsconfigPath}: ${error}`);
-		return {};
+		mergeAliases(result, collectReferencesAliases(refTsconfigPath, visited));
 	}
+	return result;
 }
 function getPathAliases(cwd) {
-	let tsConfigPath = path.join(cwd, "tsconfig.json");
-	if (!fs.existsSync(tsConfigPath)) tsConfigPath = path.join(cwd, "jsconfig.json");
-	if (!fs.existsSync(tsConfigPath)) return null;
+	const tsconfig = getTsconfig(cwd, fs.existsSync(path.join(cwd, "tsconfig.json")) ? "tsconfig.json" : "jsconfig.json");
+	if (!tsconfig) return null;
 	try {
-		const result = getPathAliasesRecursive(tsConfigPath);
+		const result = extractAliases(tsconfig);
+		mergeAliases(result, collectReferencesAliases(tsconfig.path));
 		addSvelteKitEnvModules(result);
 		addCloudflareModules(result);
 		return result;
@@ -6009,7 +6007,7 @@ export const auth = betterAuth({
 		return;
 	}
 	if (connectResponse.connect) {
-		await open("https://better-auth.com/onboarding");
+		await open("https://dash.better-auth.com/onboarding");
 		console.log(chalk.cyan("\n→ ") + "Opening Better Auth onboarding in your browser...\n");
 	}
 	console.log(chalk.green(`\n✔ `) + chalk.bold("Success! ") + "Project setup complete.\n");