appflare 0.2.50 → 0.2.52

package/cli/commands/index.ts

@@ -1,8 +1,13 @@
 import chokidar from "chokidar";
-import { existsSync } from "node:fs";
 import { dirname, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
 import { generateArtifacts } from "../generate";
 import { loadConfig } from "../load-config";
+import {
+	findNearestPackageDir,
+	packageSearchDirs,
+	resolvePackageBin,
+} from "../utils/resolve-package";
 
 type MigrateOptions = {
 	local?: boolean;
@@ -10,23 +15,6 @@ type MigrateOptions = {
 	preview?: boolean;
 };
 
-function findNearestPackageDir(startDir: string): string {
-	let currentDir = startDir;
-
-	while (true) {
-		if (existsSync(resolve(currentDir, "package.json"))) {
-			return currentDir;
-		}
-
-		const parentDir = dirname(currentDir);
-		if (parentDir === currentDir) {
-			return startDir;
-		}
-
-		currentDir = parentDir;
-	}
-}
-
 export async function runBuild(
 	configPath?: string,
 	options: { build?: boolean } = {},
@@ -123,9 +111,18 @@ export async function runMigrate(
 		loadedConfig.outDirAbs,
 		"drizzle.config.js",
 	);
-	const npxCmd = process.platform === "win32" ? "npx.cmd" : "npx";
+	const moduleDir = dirname(fileURLToPath(import.meta.url));
+	const searchDirs = packageSearchDirs(moduleDir, [
+		loadedConfig.configDir,
+		packageDir,
+	]);
+	const drizzleKitBin = resolvePackageBin(
+		"drizzle-kit",
+		"bin.cjs",
+		searchDirs,
+	);
 	const drizzleGenerate = Bun.spawn(
-		[npxCmd, "drizzle-kit", "generate", "--config", drizzleConfigPath],
+		[process.execPath, drizzleKitBin, "generate", "--config", drizzleConfigPath],
 		{
 			cwd: packageDir,
 			stdin: "inherit",
@@ -142,9 +139,14 @@ export async function runMigrate(
 	}
 
 	const databaseName = loadedConfig.config.database[0].databaseName;
-	const wranglerArgs = [
-		npxCmd,
+	const wranglerBin = resolvePackageBin(
 		"wrangler",
+		"bin/wrangler.js",
+		searchDirs,
+	);
+	const wranglerArgs = [
+		process.execPath,
+		wranglerBin,
 		"d1",
 		"migrations",
 		"apply",
@@ -213,10 +215,16 @@ export async function runAddAdmin(
 	].join(" ");
 
 	const databaseName = loadedConfig.config.database[0].databaseName;
-	const npxCmd = process.platform === "win32" ? "npx.cmd" : "npx";
-	const wranglerArgs = [
-		npxCmd,
+	const moduleDir = dirname(fileURLToPath(import.meta.url));
+	const searchDirs = packageSearchDirs(moduleDir, [loadedConfig.configDir]);
+	const wranglerBin = resolvePackageBin(
 		"wrangler",
+		"bin/wrangler.js",
+		searchDirs,
+	);
+	const wranglerArgs = [
+		process.execPath,
+		wranglerBin,
 		"d1",
 		"execute",
 		databaseName,

package/cli/generate.ts

@@ -14,6 +14,10 @@ import type { LoadedAppflareConfig } from "./types";
 import { discoverHandlerOperations } from "./utils/handler-discovery";
 import { discoverSchema } from "./utils/schema-discovery";
 import { ensureRelativeImportPath } from "./utils/path-utils";
+import {
+	packageSearchDirs,
+	resolvePackageBin,
+} from "./utils/resolve-package";
 
 function extractRolesFromConfig(config: LoadedAppflareConfig["config"]): string[] {
 	const plugins = (config.auth.options as Record<string, unknown>).plugins;
@@ -103,15 +107,16 @@ export async function generateArtifacts(
 	process.stdout.write(`📁 Directories (${(performance.now() - t0).toFixed(0)}ms)\n`);
 
 	const moduleDir = dirname(fileURLToPath(import.meta.url));
-	const tscBin = join(
-		dirname(Bun.resolveSync("typescript/package.json", moduleDir)),
-		"bin",
-		"tsc",
+	const searchDirs = packageSearchDirs(moduleDir, [configDir]);
+	const tscBin = resolvePackageBin(
+		"typescript",
+		"bin/tsc",
+		searchDirs,
 	);
-	const betterAuthBin = join(
-		dirname(Bun.resolveSync("@better-auth/cli/package.json", moduleDir)),
-		"dist",
-		"index.mjs",
+	const betterAuthBin = resolvePackageBin(
+		"@better-auth/cli",
+		"dist/index.mjs",
+		searchDirs,
 	);
 
 	const serverPath = resolve(outDirAbs, "server.ts");

package/cli/templates/handlers/generators/types/query-definitions/schema-and-table-types.ts

@@ -274,6 +274,48 @@ type ManyToManyRelationRows<
 				>
 		  >
 		: Array<TableModel<TTargetTable>>;
+type NativeManyRelationRows<
+	TSourceTable extends TableName,
+	TRelationName extends string,
+	TRelationArgs,
+> = RuntimeRelationTargetTable<TSourceTable, TRelationName> extends infer TTarget
+	? TTarget extends TableName
+		? TRelationArgs extends true
+			? Array<TableModel<TTarget>>
+			: TRelationArgs extends Record<string, unknown>
+				? Awaited<
+						TableFindManyResult<
+							TTarget,
+							Extract<
+								Omit<TRelationArgs, "_count" | "_avg">,
+								QueryFindManyArgs<TTarget>
+							>
+						>
+				  >
+				: Array<TableModel<TTarget>>
+		: never
+	: never;
+type NativeOneRelationValue<
+	TSourceTable extends TableName,
+	TRelationName extends string,
+	TRelationArgs,
+> = RuntimeRelationTargetTable<TSourceTable, TRelationName> extends infer TTarget
+	? TTarget extends TableName
+		? TRelationArgs extends true
+			? TableModel<TTarget> | null
+			: TRelationArgs extends Record<string, unknown>
+				? Awaited<
+						TableFindFirstResult<
+							TTarget,
+							Extract<
+								Omit<TRelationArgs, "_count" | "_avg">,
+								QueryFindFirstArgs<TTarget>
+							>
+						>
+				  >
+				: TableModel<TTarget> | null
+		: never
+	: never;
 type ReplaceManyToManyRelationsInRow<
 	TSourceTable extends string,
 	TRow,
@@ -284,15 +326,33 @@ type ReplaceManyToManyRelationsInRow<
 				? TWith extends Record<string, unknown>
 					? K extends keyof TWith
 						? [ManyToManyTargetTableName<Extract<TSourceTable, TableName>, K>] extends [never]
-							? ReplaceManyToManyRelationsInRow<
-									[RuntimeRelationTargetTable<Extract<TSourceTable, TableName>, K>] extends [never] 
-										? K 
-										: RuntimeRelationTargetTable<Extract<TSourceTable, TableName>, K>,
-									TRow[K],
-									TWith[K] extends { with: infer TNestedWith }
-										? TNestedWith
-										: undefined
-							  >
+							? RuntimeRelationKind<Extract<TSourceTable, TableName>, K> extends "many"
+								? NativeManyRelationRows<
+										Extract<TSourceTable, TableName>,
+										K,
+										TWith[K]
+								  >
+								: RuntimeRelationKind<Extract<TSourceTable, TableName>, K> extends "one"
+									? NativeOneRelationValue<
+											Extract<TSourceTable, TableName>,
+											K,
+											TWith[K]
+									  >
+									: ReplaceManyToManyRelationsInRow<
+											[RuntimeRelationTargetTable<
+												Extract<TSourceTable, TableName>,
+												K
+											>] extends [never]
+												? K
+												: RuntimeRelationTargetTable<
+														Extract<TSourceTable, TableName>,
+														K
+												  >,
+											TRow[K],
+											TWith[K] extends { with: infer TNestedWith }
+												? TNestedWith
+												: undefined
+									  >
 							: ManyToManyRelationRows<
 									Extract<ManyToManyTargetTableName<Extract<TSourceTable, TableName>, K>, TableName>,
 									TWith[K]

package/cli/utils/resolve-package.ts

@@ -0,0 +1,59 @@
+import { existsSync } from "node:fs";
+import { dirname, resolve } from "node:path";
+
+export function findNearestPackageDir(startDir: string): string {
+	let currentDir = startDir;
+
+	while (true) {
+		if (existsSync(resolve(currentDir, "package.json"))) {
+			return currentDir;
+		}
+
+		const parentDir = dirname(currentDir);
+		if (parentDir === currentDir) {
+			return startDir;
+		}
+
+		currentDir = parentDir;
+	}
+}
+
+export function resolvePackageRoot(
+	packageName: string,
+	searchDirs: string[],
+): string {
+	for (const dir of searchDirs) {
+		try {
+			return dirname(Bun.resolveSync(`${packageName}/package.json`, dir));
+		} catch {
+			continue;
+		}
+	}
+
+	throw new Error(
+		`Could not resolve "${packageName}". Install it in your project (see appflare peerDependencies).`,
+	);
+}
+
+export function resolvePackageBin(
+	packageName: string,
+	binRelativePath: string,
+	searchDirs: string[],
+): string {
+	return resolve(
+		resolvePackageRoot(packageName, searchDirs),
+		binRelativePath,
+	);
+}
+
+export function packageSearchDirs(
+	moduleDir: string,
+	extraDirs: string[] = [],
+): string[] {
+	const dirs = [
+		moduleDir,
+		findNearestPackageDir(process.cwd()),
+		...extraDirs,
+	];
+	return [...new Set(dirs)];
+}