auth 1.6.1 → 1.6.3

package/dist/index.mjs

@@ -25,7 +25,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 { createPathsMatcher, getTsconfig, parseTsconfig } from "get-tsconfig";
 import open from "open";
 import { env } from "@better-auth/core/env";
 import { log } from "@clack/prompts";
@@ -1485,24 +1485,7 @@ possiblePaths$1 = [
 	...possiblePaths$1.map((it) => `src/${it}`),
 	...possiblePaths$1.map((it) => `app/${it}`)
 ];
-function mergeAliases(target, source) {
-	for (const [alias, aliasPath] of Object.entries(source)) if (!(alias in target)) target[alias] = aliasPath;
-}
-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).
-*/
+/** Reads `references` from raw tsconfig JSON (stripped out by `parseTsconfig`). */
 function readRawTsconfigReferences(tsconfigPath) {
 	try {
 		const stripped = fs.readFileSync(tsconfigPath, "utf-8").replace(/\\"|"(?:\\"|[^"])*"|(\/\/.*|\/\*[\s\S]*?\*\/)/g, (m, g) => g ? "" : m).replace(/,(?=\s*[}\]])/g, "");
@@ -1511,11 +1494,9 @@ function readRawTsconfigReferences(tsconfigPath) {
 		return;
 	}
 }
-/**
-* Collect path aliases from tsconfig references recursively.
-*/
-function collectReferencesAliases(tsconfigPath, visited = /* @__PURE__ */ new Set()) {
-	const result = {};
+/** Recursively collects tsconfigs reachable via `references`. */
+function collectReferencedTsconfigs(tsconfigPath, visited = /* @__PURE__ */ new Set()) {
+	const result = [];
 	const refs = readRawTsconfigReferences(tsconfigPath);
 	if (!refs) return result;
 	const configDir = path.dirname(tsconfigPath);
@@ -1525,48 +1506,146 @@ function collectReferencesAliases(tsconfigPath, visited = /* @__PURE__ */ new Se
 		if (visited.has(refTsconfigPath)) continue;
 		visited.add(refTsconfigPath);
 		try {
-			mergeAliases(result, extractAliases({
+			const refConfig = parseTsconfig(refTsconfigPath);
+			result.push({
 				path: refTsconfigPath,
-				config: parseTsconfig(refTsconfigPath)
-			}));
+				config: refConfig
+			});
 		} catch {
 			continue;
 		}
-		mergeAliases(result, collectReferencesAliases(refTsconfigPath, visited));
+		result.push(...collectReferencedTsconfigs(refTsconfigPath, visited));
 	}
 	return result;
 }
-function getPathAliases(cwd) {
+/**
+* Ordered `paths` matchers from the project tsconfig and any referenced
+* tsconfigs, following TypeScript canonical resolution semantics.
+* @see https://github.com/microsoft/TypeScript/blob/main/src/compiler/moduleNameResolver.ts
+*/
+function collectPathsMatchers(cwd) {
 	const tsconfig = getTsconfig(cwd, fs.existsSync(path.join(cwd, "tsconfig.json")) ? "tsconfig.json" : "jsconfig.json");
-	if (!tsconfig) return null;
+	if (!tsconfig) return [];
+	const matchers = [];
 	try {
-		const result = extractAliases(tsconfig);
-		mergeAliases(result, collectReferencesAliases(tsconfig.path));
-		addSvelteKitEnvModules(result);
-		addCloudflareModules(result);
-		return result;
+		const mainMatcher = createPathsMatcher(tsconfig);
+		if (mainMatcher) matchers.push(mainMatcher);
+		for (const refTsconfig of collectReferencedTsconfigs(tsconfig.path)) {
+			const refMatcher = createPathsMatcher(refTsconfig);
+			if (refMatcher) matchers.push(refMatcher);
+		}
 	} catch (error) {
 		console.error(error);
 		throw new BetterAuthError("Error parsing tsconfig.json");
 	}
+	return matchers;
+}
+/**
+* Source file extensions jiti can load. Shared between the jiti `extensions`
+* option and `resolveCandidateFile` so both stay in sync.
+*/
+const SOURCE_EXTENSIONS = [
+	".ts",
+	".tsx",
+	".mts",
+	".cts",
+	".js",
+	".jsx",
+	".mjs",
+	".cjs"
+];
+const SOURCE_EXTENSIONS_SET = new Set(SOURCE_EXTENSIONS);
+/** Probes a candidate as-is, with known extensions, and as a directory index. */
+function resolveCandidateFile(candidate) {
+	try {
+		if (fs.existsSync(candidate) && fs.statSync(candidate).isFile()) return candidate;
+	} catch {}
+	if (SOURCE_EXTENSIONS_SET.has(path.extname(candidate))) return;
+	for (const ext of SOURCE_EXTENSIONS) {
+		const withExt = candidate + ext;
+		if (fs.existsSync(withExt)) return withExt;
+	}
+	for (const ext of SOURCE_EXTENSIONS) {
+		const asIndex = path.join(candidate, `index${ext}`);
+		if (fs.existsSync(asIndex)) return asIndex;
+	}
+}
+function resolveWithMatchers(specifier, matchers) {
+	for (const matcher of matchers) for (const candidate of matcher(specifier)) {
+		const resolved = resolveCandidateFile(candidate);
+		if (resolved) return resolved;
+	}
+}
+/**
+* Callees whose first string argument is a module specifier. `jitiImport` is
+* 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([
+	"require",
+	"import",
+	"jitiImport"
+]);
+/**
+* Rewrites aliased specifiers at AST level. Required because jiti's `alias`
+* option only supports prefix matching and cannot express mid-path wildcards.
+*
+* Matchers always take precedence over native resolution, mirroring
+* TypeScript's own `paths` → `node_modules` order.
+*/
+function createRewriteImportPathsPlugin(matchers) {
+	return ({ types: t }) => {
+		const rewrite = (source) => {
+			if (!source) return;
+			const resolved = resolveWithMatchers(source.value, matchers);
+			if (resolved) source.value = resolved;
+		};
+		return { visitor: {
+			ImportDeclaration(p) {
+				rewrite(p.node.source);
+			},
+			ExportNamedDeclaration(p) {
+				rewrite(p.node.source);
+			},
+			ExportAllDeclaration(p) {
+				rewrite(p.node.source);
+			},
+			ImportExpression(p) {
+				if (t.isStringLiteral(p.node.source)) rewrite(p.node.source);
+			},
+			CallExpression(p) {
+				const { callee, arguments: args } = p.node;
+				const first = args[0];
+				if (!t.isStringLiteral(first)) return;
+				if (!(t.isIdentifier(callee) && LOADER_IDENTIFIERS.has(callee.name) || t.isImport(callee))) return;
+				rewrite(first);
+			}
+		} };
+	};
+}
+/** Virtual module aliases; real tsconfig paths go through the babel plugin. */
+function getVirtualModuleAliases() {
+	const result = {};
+	addSvelteKitEnvModules(result);
+	addCloudflareModules(result);
+	return result;
 }
 /**
 * .tsx files are not supported by Jiti.
 */
 const jitiOptions = (cwd) => {
-	const alias = getPathAliases(cwd) || {};
+	const matchers = collectPathsMatchers(cwd);
+	const plugins = matchers.length > 0 ? [createRewriteImportPathsPlugin(matchers)] : [];
 	return {
-		transformOptions: { babel: { presets: [[babelPresetTypeScript, {
-			isTSX: true,
-			allExtensions: true
-		}], [babelPresetReact, { runtime: "automatic" }]] } },
-		extensions: [
-			".ts",
-			".tsx",
-			".js",
-			".jsx"
-		],
-		alias
+		transformOptions: { babel: {
+			presets: [[babelPresetTypeScript, {
+				isTSX: true,
+				allExtensions: true
+			}], [babelPresetReact, { runtime: "automatic" }]],
+			plugins
+		} },
+		extensions: [...SOURCE_EXTENSIONS],
+		alias: getVirtualModuleAliases()
 	};
 };
 const isDefaultExport = (object) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "auth",
-  "version": "1.6.1",
+  "version": "1.6.3",
   "description": "The CLI for Better Auth",
   "type": "module",
   "license": "MIT",
@@ -60,9 +60,9 @@
     "semver": "^7.7.4",
     "yocto-spinner": "^0.2.3",
     "zod": "^4.3.6",
-    "@better-auth/core": "1.6.1",
-    "@better-auth/telemetry": "1.6.1",
-    "better-auth": "1.6.1"
+    "@better-auth/core": "1.6.3",
+    "@better-auth/telemetry": "1.6.3",
+    "better-auth": "1.6.3"
   },
   "devDependencies": {
     "@types/better-sqlite3": "^7.6.13",
@@ -75,7 +75,7 @@
     "tsx": "^4.21.0",
     "type-fest": "^5.4.4",
     "typescript": "^5.9.3",
-    "@better-auth/passkey": "1.6.1"
+    "@better-auth/passkey": "1.6.3"
   },
   "scripts": {
     "build": "tsdown",