appflare 0.0.13 → 0.0.15

package/cli/core/build.ts

@@ -5,6 +5,7 @@ import {
 	AppflareConfig,
 	assertDirExists,
 	assertFileExists,
+	toImportPathFromGeneratedSrc,
 } from "../utils/utils";
 import { getSchemaTableNames, generateSchemaTypes } from "../schema/schema";
 import {
@@ -38,6 +39,17 @@ export async function buildFromConfig(params: {
 	await fs.mkdir(path.join(outDirAbs, "src"), { recursive: true });
 	await fs.mkdir(path.join(outDirAbs, "server"), { recursive: true });
 
+	// Re-export the user schema inside the generated output so downstream code can import it from the build directory.
+	const schemaImportPathForGeneratedSrc = toImportPathFromGeneratedSrc(
+		outDirAbs,
+		schemaPathAbs
+	);
+	const schemaReexport = `import schema from ${JSON.stringify(schemaImportPathForGeneratedSrc)};
+export type AppflareGeneratedSchema = typeof schema;
+export default schema;
+`;
+	await fs.writeFile(path.join(outDirAbs, "src", "schema.ts"), schemaReexport);
+
 	const schemaTypesTs = await generateSchemaTypes({
 		schemaPathAbs,
 		configPathAbs,
@@ -140,17 +152,18 @@ async function writeEmitTsconfig(params: {
 			declaration: true,
 			emitDeclarationOnly: false,
 			outDir: `./${outDirRel}/dist`,
-			rootDir: `./${outDirRel}/src`,
+			rootDir: `.`,
 			sourceMap: false,
 			declarationMap: false,
 			skipLibCheck: true,
 			target: "ES2022",
 			module: "ES2022",
 			moduleResolution: "Bundler",
-			types: [],
+			types: ["node"],
 		},
 		include: [
 			`./${outDirRel}/src/schema-types.ts`,
+			`./${outDirRel}/src/schema.ts`,
 			`./${outDirRel}/src/handlers/**/*`,
 		],
 	};

package/cli/core/discover-handlers.ts

@@ -29,6 +29,13 @@ export async function discoverHandlers(params: {
 		if (path.resolve(fileAbs) === path.resolve(params.schemaPathAbs)) continue;
 		if (path.resolve(fileAbs) === path.resolve(params.configPathAbs)) continue;
 
+		const relPathRaw = path.relative(params.projectDirAbs, fileAbs);
+		const relPath = relPathRaw.replace(/\\/g, "/");
+		const rawRoutePath = relPath.replace(/\.ts$/, "");
+		const routePath = rawRoutePath.endsWith("/index")
+			? rawRoutePath.slice(0, -"/index".length) || "index"
+			: rawRoutePath;
+
 		const content = await fs.readFile(fileAbs, "utf8");
 		const cronTriggersByHandler = extractCronTriggers(content);
 		const regex =
@@ -38,6 +45,7 @@ export async function discoverHandlers(params: {
 			const kind = match[2] as HandlerKind;
 			handlers.push({
 				fileName: path.basename(fileAbs, ".ts"),
+				routePath,
 				name: match[1],
 				kind,
 				sourceFileAbs: fileAbs,
@@ -50,7 +58,7 @@ export async function discoverHandlers(params: {
 	// De-dupe: keep first occurrence
 	const seen = new Set<string>();
 	const unique = handlers.filter((h) => {
-		const key = `${h.kind}:${h.fileName}:${h.name}`;
+		const key = `${h.kind}:${h.routePath}:${h.name}`;
 		if (seen.has(key)) return false;
 		seen.add(key);
 		return true;
@@ -58,6 +66,8 @@ export async function discoverHandlers(params: {
 
 	unique.sort((a, b) => {
 		if (a.kind !== b.kind) return a.kind.localeCompare(b.kind);
+		if (a.routePath !== b.routePath)
+			return a.routePath.localeCompare(b.routePath);
 		if (a.fileName !== b.fileName) return a.fileName.localeCompare(b.fileName);
 		return a.name.localeCompare(b.name);
 	});

package/cli/core/index.ts

@@ -14,12 +14,20 @@ import {
 } from "./handlers";
 import { generateSchemaTypes, getSchemaTableNames } from "../schema/schema";
 import { runTscEmit, writeEmitTsconfig } from "../utils/tsc";
-import { assertDirExists, assertFileExists } from "../utils/utils";
+import {
+	assertDirExists,
+	assertFileExists,
+	toImportPathFromGeneratedSrc,
+} from "../utils/utils";
 
 type AppflareConfig = {
 	dir: string;
 	schema: string;
 	outDir: string;
+	auth?: {
+		enabled?: boolean;
+		basePath?: string;
+	};
 };
 
 const program = new Command();
@@ -106,6 +114,16 @@ async function buildFromConfig(params: {
 	await fs.mkdir(path.join(outDirAbs, "src"), { recursive: true });
 	await fs.mkdir(path.join(outDirAbs, "server"), { recursive: true });
 
+	const schemaImportPathForGeneratedSrc = toImportPathFromGeneratedSrc(
+		outDirAbs,
+		schemaPathAbs
+	);
+	const schemaReexport = `import schema from ${JSON.stringify(schemaImportPathForGeneratedSrc)};
+export type AppflareGeneratedSchema = typeof schema;
+export default schema;
+`;
+	await fs.writeFile(path.join(outDirAbs, "src", "schema.ts"), schemaReexport);
+
 	const schemaTypesTs = await generateSchemaTypes({
 		schemaPathAbs,
 		configPathAbs,

package/cli/generators/generate-api-client/client.ts

@@ -3,91 +3,161 @@ import {
 	handlerTypePrefix,
 	normalizeTableName,
 	renderObjectKey,
-	sortedEntries,
 } from "./utils";
 
+type PathTree<T> = {
+	leaf?: { path: string; items: T[] };
+	children: Map<string, PathTree<T>>;
+};
+
+const buildPathTree = <T>(byPath: Map<string, T[]>): PathTree<T> => {
+	const root: PathTree<T> = { children: new Map() };
+	for (const [path, items] of Array.from(byPath.entries())) {
+		const segments = path.split("/").filter(Boolean);
+		let node = root;
+		for (const segment of segments) {
+			if (!node.children.has(segment)) {
+				node.children.set(segment, { children: new Map() });
+			}
+			node = node.children.get(segment)!;
+		}
+		node.leaf = { path, items };
+	}
+	return root;
+};
+
+const indent = (depth: number): string => "\t".repeat(depth);
+
+const renderPathTreeLines = <T>(
+	node: PathTree<T>,
+	depth: number,
+	renderLeaf: (leaf: { path: string; items: T[] }, depth: number) => string[]
+): string[] => {
+	const lines: string[] = [];
+	if (node.leaf) {
+		lines.push(...renderLeaf(node.leaf, depth));
+	}
+	const children = Array.from(node.children.entries()).sort((a, b) =>
+		a[0].localeCompare(b[0])
+	);
+	for (const [segment, child] of children) {
+		lines.push(`${indent(depth + 1)}${renderObjectKey(segment)}: {`);
+		lines.push(...renderPathTreeLines(child, depth + 1, renderLeaf));
+		lines.push(`${indent(depth + 1)}}`);
+	}
+	return lines;
+};
+
 export function generateQueriesClientLines(
 	queriesByFile: Map<string, DiscoveredHandler[]>,
 	importAliasBySource: Map<string, string>
 ): string {
-	return sortedEntries(queriesByFile)
-		.map(([fileName, list]) => {
-			const fileKey = renderObjectKey(fileName);
-			const inner = list
-				.slice()
-				.sort((a, b) => a.name.localeCompare(b.name))
-				.map((h) => {
-					const pascal = handlerTypePrefix(h);
-					const route = `/queries/${fileName}/${h.name}`;
-					const importAlias = importAliasBySource.get(h.sourceFileAbs)!;
-					const handlerAccessor = `${importAlias}.${h.name}`;
-					return (
-						`\t\t${h.name}: withHandlerMetadata<${pascal}Definition>(\n` +
-						`\t\t\tasync (args: ${pascal}Args, init) => {\n` +
-						`\t\t\t\tconst url = buildQueryUrl(baseUrl, ${JSON.stringify(route)}, args);\n` +
-						`\t\t\t\tconst response = await request(url, {\n` +
-						`\t\t\t\t\t...(init ?? {}),\n` +
-						`\t\t\t\t\tmethod: "GET",\n` +
-						`\t\t\t\t});\n` +
-						`\t\t\t\treturn parseJson<${pascal}Result>(response);\n` +
-						`\t\t\t},\n` +
-						`\t\t\t{\n` +
-						`\t\t\t\tschema: createHandlerSchema(${handlerAccessor}.args),\n` +
-						`\t\t\t\twebsocket: createHandlerWebsocket<${pascal}Args, ${pascal}Result>(realtime, {\n` +
-						`\t\t\t\t\tdefaultTable: ${JSON.stringify(normalizeTableName(fileName))},\n` +
-						`\t\t\t\t\tdefaultHandler: { file: ${JSON.stringify(fileName)}, name: ${JSON.stringify(h.name)} },\n` +
-						`\t\t\t\t}),\n` +
-						`\t\t\t\tpath: ${JSON.stringify(route)},\n` +
-						`\t\t\t}\n` +
-						`\t\t),`
-					);
-				})
-				.join("\n");
-			return `\t${fileKey}: {\n${inner || "\t\t// (none)"}\n\t},`;
-		})
-		.join("\n");
+	const tree = buildPathTree(queriesByFile);
+	const renderLeaf = (
+		leaf: { path: string; items: DiscoveredHandler[] },
+		depth: number
+	): string[] => {
+		const inner = leaf.items
+			.slice()
+			.sort((a, b) => a.name.localeCompare(b.name))
+			.map((h) => {
+				const pascal = handlerTypePrefix(h);
+				const route = `/queries/${leaf.path}/${h.name}`;
+				const importAlias = importAliasBySource.get(h.sourceFileAbs)!;
+				const handlerAccessor = `${importAlias}.${h.name}`;
+				const pad = indent(depth + 1);
+				return (
+					`${pad}${h.name}: withHandlerMetadata<${pascal}Definition>(\n` +
+					`${pad}\tasync (args: ${pascal}Args, init) => {\n` +
+					`${pad}\t\tconst url = buildQueryUrl(baseUrl, ${JSON.stringify(route)}, args);\n` +
+					`${pad}\t\tconst response = await request(url, {\n` +
+					`${pad}\t\t\t...(init ?? {}),\n` +
+					`${pad}\t\t\tmethod: "GET",\n` +
+					`${pad}\t\t});\n` +
+					`${pad}\t\treturn parseJson<${pascal}Result>(response);\n` +
+					`${pad}\t},\n` +
+					`${pad}\t{\n` +
+					`${pad}\t\tschema: createHandlerSchema(${handlerAccessor}.args),\n` +
+					`${pad}\t\twebsocket: createHandlerWebsocket<${pascal}Args, ${pascal}Result>(realtime, {\n` +
+					`${pad}\t\t\tdefaultTable: ${JSON.stringify(normalizeTableName(h.fileName))},\n` +
+					`${pad}\t\t\tdefaultHandler: { file: ${JSON.stringify(leaf.path)}, name: ${JSON.stringify(h.name)} },\n` +
+					`${pad}\t\t}),\n` +
+					`${pad}\t\tpath: ${JSON.stringify(route)},\n` +
+					`${pad}\t}\n` +
+					`${pad}),`
+				);
+			})
+			.join("\n");
+
+		return inner ? [inner] : [`${indent(depth + 1)}// (none)`];
+	};
+
+	const lines: string[] = [];
+	const children = Array.from(tree.children.entries()).sort((a, b) =>
+		a[0].localeCompare(b[0])
+	);
+	for (const [segment, child] of children) {
+		lines.push(`${indent(1)}${renderObjectKey(segment)}: {`);
+		lines.push(...renderPathTreeLines(child, 1, renderLeaf));
+		lines.push(`${indent(1)}}`);
+	}
+	return lines.join("\n");
 }
 
 export function generateMutationsClientLines(
 	mutationsByFile: Map<string, DiscoveredHandler[]>,
 	importAliasBySource: Map<string, string>
 ): string {
-	return sortedEntries(mutationsByFile)
-		.map(([fileName, list]) => {
-			const fileKey = renderObjectKey(fileName);
-			const inner = list
-				.slice()
-				.sort((a, b) => a.name.localeCompare(b.name))
-				.map((h) => {
-					const pascal = handlerTypePrefix(h);
-					const route = `/mutations/${fileName}/${h.name}`;
-					const importAlias = importAliasBySource.get(h.sourceFileAbs)!;
-					const handlerAccessor = `${importAlias}.${h.name}`;
-					return (
-						`\t\t${h.name}: withHandlerMetadata<${pascal}Definition>(\n` +
-						`\t\t\tasync (args: ${pascal}Args, init) => {\n` +
-						`\t\t\t\tconst url = buildUrl(baseUrl, ${JSON.stringify(route)});\n` +
-						`\t\t\t\tconst response = await request(url, {\n` +
-						`\t\t\t\t\t...(init ?? {}),\n` +
-						`\t\t\t\t\tmethod: "POST",\n` +
-						`\t\t\t\t\theaders: ensureJsonHeaders(init?.headers),\n` +
-						`\t\t\t\t\tbody: JSON.stringify(args),\n` +
-						`\t\t\t\t});\n` +
-						`\t\t\t\treturn parseJson<${pascal}Result>(response);\n` +
-						`\t\t\t},\n` +
-						`\t\t\t{\n` +
-						`\t\t\t\tschema: createHandlerSchema(${handlerAccessor}.args),\n` +
-						`\t\t\t\twebsocket: createHandlerWebsocket<${pascal}Args, ${pascal}Result>(realtime, {\n` +
-						`\t\t\t\t\tdefaultTable: ${JSON.stringify(normalizeTableName(fileName))},\n` +
-						`\t\t\t\t\tdefaultHandler: { file: ${JSON.stringify(fileName)}, name: ${JSON.stringify(h.name)} },\n` +
-						`\t\t\t\t}),\n` +
-						`\t\t\t\tpath: ${JSON.stringify(route)},\n` +
-						`\t\t\t}\n` +
-						`\t\t),`
-					);
-				})
-				.join("\n");
-			return `\t${fileKey}: {\n${inner || "\t\t// (none)"}\n\t},`;
-		})
-		.join("\n");
+	const tree = buildPathTree(mutationsByFile);
+	const renderLeaf = (
+		leaf: { path: string; items: DiscoveredHandler[] },
+		depth: number
+	): string[] => {
+		const inner = leaf.items
+			.slice()
+			.sort((a, b) => a.name.localeCompare(b.name))
+			.map((h) => {
+				const pascal = handlerTypePrefix(h);
+				const route = `/mutations/${leaf.path}/${h.name}`;
+				const importAlias = importAliasBySource.get(h.sourceFileAbs)!;
+				const handlerAccessor = `${importAlias}.${h.name}`;
+				const pad = indent(depth + 1);
+				return (
+					`${pad}${h.name}: withHandlerMetadata<${pascal}Definition>(\n` +
+					`${pad}\tasync (args: ${pascal}Args, init) => {\n` +
+					`${pad}\t\tconst url = buildUrl(baseUrl, ${JSON.stringify(route)});\n` +
+					`${pad}\t\tconst response = await request(url, {\n` +
+					`${pad}\t\t\t...(init ?? {}),\n` +
+					`${pad}\t\t\tmethod: "POST",\n` +
+					`${pad}\t\t\theaders: ensureJsonHeaders(init?.headers),\n` +
+					`${pad}\t\t\tbody: JSON.stringify(args),\n` +
+					`${pad}\t\t});\n` +
+					`${pad}\t\treturn parseJson<${pascal}Result>(response);\n` +
+					`${pad}\t},\n` +
+					`${pad}\t{\n` +
+					`${pad}\t\tschema: createHandlerSchema(${handlerAccessor}.args),\n` +
+					`${pad}\t\twebsocket: createHandlerWebsocket<${pascal}Args, ${pascal}Result>(realtime, {\n` +
+					`${pad}\t\t\tdefaultTable: ${JSON.stringify(normalizeTableName(h.fileName))},\n` +
+					`${pad}\t\t\tdefaultHandler: { file: ${JSON.stringify(leaf.path)}, name: ${JSON.stringify(h.name)} },\n` +
+					`${pad}\t\t}),\n` +
+					`${pad}\t\tpath: ${JSON.stringify(route)},\n` +
+					`${pad}\t}\n` +
+					`${pad}),`
+				);
+			})
+			.join("\n");
+
+		return inner ? [inner] : [`${indent(depth + 1)}// (none)`];
+	};
+
+	const lines: string[] = [];
+	const children = Array.from(tree.children.entries()).sort((a, b) =>
+		a[0].localeCompare(b[0])
+	);
+	for (const [segment, child] of children) {
+		lines.push(`${indent(1)}${renderObjectKey(segment)}: {`);
+		lines.push(...renderPathTreeLines(child, 1, renderLeaf));
+		lines.push(`${indent(1)}}`);
+	}
+	return lines.join("\n");
 }

package/cli/generators/generate-api-client/index.ts

@@ -369,6 +369,15 @@ export async function runInternalQuery<
 	args: HandlerArgsFromShape<TArgs>
 ): Promise<TResult> {
 	const parsed = parseHandlerArgs(handler as any, args as any);
+	if (handler.middleware) {
+		const middlewareResult = await handler.middleware(
+			ctx as any,
+			parsed as any
+		);
+		if (typeof middlewareResult !== "undefined") {
+			return middlewareResult as TResult;
+		}
+	}
 	return handler.handler(ctx as any, parsed as any);
 }
 
@@ -381,6 +390,15 @@ export async function runInternalMutation<
 	args: HandlerArgsFromShape<TArgs>
 ): Promise<TResult> {
 	const parsed = parseHandlerArgs(handler as any, args as any);
+	if (handler.middleware) {
+		const middlewareResult = await handler.middleware(
+			ctx as any,
+			parsed as any
+		);
+		if (typeof middlewareResult !== "undefined") {
+			return middlewareResult as TResult;
+		}
+	}
 	return handler.handler(ctx as any, parsed as any);
 }
 
@@ -663,7 +681,7 @@ function generateImports(params: {
 	const importLines: string[] = [];
 	const importAliasBySource = new Map<string, string>();
 	for (const [fileAbs, list] of Array.from(handlerImportsGrouped.entries())) {
-		const alias = `__appflare_${pascalCase(list[0].fileName)}`;
+		const alias = `__appflare_${pascalCase(list[0].routePath)}`;
 		importAliasBySource.set(fileAbs, alias);
 		const importPath = toImportPathFromGeneratedSrc(params.outDirAbs, fileAbs);
 		importLines.push(
@@ -686,10 +704,13 @@ function generateGroupedHandlers(handlers: DiscoveredHandler[]): {
 		(h) => h.kind === "internalMutation"
 	);
 
-	const queriesByFile = groupBy(queries, (h) => h.fileName);
-	const mutationsByFile = groupBy(mutations, (h) => h.fileName);
-	const internalQueriesByFile = groupBy(internalQueries, (h) => h.fileName);
-	const internalMutationsByFile = groupBy(internalMutations, (h) => h.fileName);
+	const queriesByFile = groupBy(queries, (h) => h.routePath);
+	const mutationsByFile = groupBy(mutations, (h) => h.routePath);
+	const internalQueriesByFile = groupBy(internalQueries, (h) => h.routePath);
+	const internalMutationsByFile = groupBy(
+		internalMutations,
+		(h) => h.routePath
+	);
 
 	return {
 		queriesByFile,

package/cli/generators/generate-api-client/types.ts

@@ -1,5 +1,48 @@
 import { DiscoveredHandler } from "../../utils/utils";
-import { handlerTypePrefix, renderObjectKey, sortedEntries } from "./utils";
+import { handlerTypePrefix, renderObjectKey } from "./utils";
+
+type PathTree<T> = {
+	leaf?: { path: string; items: T[] };
+	children: Map<string, PathTree<T>>;
+};
+
+const buildPathTree = <T>(byPath: Map<string, T[]>): PathTree<T> => {
+	const root: PathTree<T> = { children: new Map() };
+	for (const [path, items] of Array.from(byPath.entries())) {
+		const segments = path.split("/").filter(Boolean);
+		let node = root;
+		for (const segment of segments) {
+			if (!node.children.has(segment)) {
+				node.children.set(segment, { children: new Map() });
+			}
+			node = node.children.get(segment)!;
+		}
+		node.leaf = { path, items };
+	}
+	return root;
+};
+
+const indent = (depth: number): string => "\t".repeat(depth);
+
+const renderPathTreeLines = <T>(
+	node: PathTree<T>,
+	depth: number,
+	renderLeaf: (leaf: { path: string; items: T[] }, depth: number) => string[]
+): string[] => {
+	const lines: string[] = [];
+	if (node.leaf) {
+		lines.push(...renderLeaf(node.leaf, depth));
+	}
+	const children = Array.from(node.children.entries()).sort((a, b) =>
+		a[0].localeCompare(b[0])
+	);
+	for (const [segment, child] of children) {
+		lines.push(`${indent(depth + 1)}${renderObjectKey(segment)}: {`);
+		lines.push(...renderPathTreeLines(child, depth + 1, renderLeaf));
+		lines.push(`${indent(depth + 1)}}`);
+	}
+	return lines;
+};
 
 export function generateTypeBlocks(
 	handlers: DiscoveredHandler[],
@@ -23,57 +66,99 @@ export function generateTypeBlocks(
 export function generateQueriesTypeLines(
 	queriesByFile: Map<string, DiscoveredHandler[]>
 ): string {
-	return sortedEntries(queriesByFile)
-		.map(([fileName, list]) => {
-			const fileKey = renderObjectKey(fileName);
-			const inner = list
-				.slice()
-				.sort((a, b) => a.name.localeCompare(b.name))
-				.map((h) => {
-					const pascal = handlerTypePrefix(h);
-					return `\t\t${h.name}: ${pascal}Client;`;
-				})
-				.join("\n");
-			return `\t${fileKey}: {\n${inner || "\t\t// (none)"}\n\t};`;
-		})
-		.join("\n");
+	const tree = buildPathTree(queriesByFile);
+	const renderLeaf = (
+		leaf: { path: string; items: DiscoveredHandler[] },
+		depth: number
+	): string[] => {
+		const inner = leaf.items
+			.slice()
+			.sort((a, b) => a.name.localeCompare(b.name))
+			.map((h) => {
+				const pascal = handlerTypePrefix(h);
+				return `${indent(depth + 1)}${h.name}: ${pascal}Client;`;
+			})
+			.join("\n");
+
+		return inner ? [inner] : [`${indent(depth + 1)}// (none)`];
+	};
+
+	const lines: string[] = [];
+	const children = Array.from(tree.children.entries()).sort((a, b) =>
+		a[0].localeCompare(b[0])
+	);
+	for (const [segment, child] of children) {
+		lines.push(`${indent(1)}${renderObjectKey(segment)}: {`);
+		lines.push(...renderPathTreeLines(child, 1, renderLeaf));
+		lines.push(`${indent(1)}}`);
+	}
+
+	return lines.join("\n");
 }
 
 export function generateMutationsTypeLines(
 	mutationsByFile: Map<string, DiscoveredHandler[]>
 ): string {
-	return sortedEntries(mutationsByFile)
-		.map(([fileName, list]) => {
-			const fileKey = renderObjectKey(fileName);
-			const inner = list
-				.slice()
-				.sort((a, b) => a.name.localeCompare(b.name))
-				.map((h) => {
-					const pascal = handlerTypePrefix(h);
-					return `\t\t${h.name}: ${pascal}Client;`;
-				})
-				.join("\n");
-			return `\t${fileKey}: {\n${inner || "\t\t// (none)"}\n\t};`;
-		})
-		.join("\n");
+	const tree = buildPathTree(mutationsByFile);
+	const renderLeaf = (
+		leaf: { path: string; items: DiscoveredHandler[] },
+		depth: number
+	): string[] => {
+		const inner = leaf.items
+			.slice()
+			.sort((a, b) => a.name.localeCompare(b.name))
+			.map((h) => {
+				const pascal = handlerTypePrefix(h);
+				return `${indent(depth + 1)}${h.name}: ${pascal}Client;`;
+			})
+			.join("\n");
+
+		return inner ? [inner] : [`${indent(depth + 1)}// (none)`];
+	};
+
+	const lines: string[] = [];
+	const children = Array.from(tree.children.entries()).sort((a, b) =>
+		a[0].localeCompare(b[0])
+	);
+	for (const [segment, child] of children) {
+		lines.push(`${indent(1)}${renderObjectKey(segment)}: {`);
+		lines.push(...renderPathTreeLines(child, 1, renderLeaf));
+		lines.push(`${indent(1)}}`);
+	}
+
+	return lines.join("\n");
 }
 
 export function generateInternalTypeLines(
 	internalByFile: Map<string, DiscoveredHandler[]>,
 	importAliasBySource: Map<string, string>
 ): string {
-	return sortedEntries(internalByFile)
-		.map(([fileName, list]) => {
-			const fileKey = renderObjectKey(fileName);
-			const inner = list
-				.slice()
-				.sort((a, b) => a.name.localeCompare(b.name))
-				.map((h) => {
-					const alias = importAliasBySource.get(h.sourceFileAbs)!;
-					return `\t\t${h.name}: typeof ${alias}[${JSON.stringify(h.name)}];`;
-				})
-				.join("\n");
-			return `\t${fileKey}: {\n${inner || "\t\t// (none)"}\n\t};`;
-		})
-		.join("\n");
+	const tree = buildPathTree(internalByFile);
+	const renderLeaf = (
+		leaf: { path: string; items: DiscoveredHandler[] },
+		depth: number
+	): string[] => {
+		const inner = leaf.items
+			.slice()
+			.sort((a, b) => a.name.localeCompare(b.name))
+			.map((h) => {
+				const alias = importAliasBySource.get(h.sourceFileAbs)!;
+				return `${indent(depth + 1)}${h.name}: typeof ${alias}[${JSON.stringify(h.name)}];`;
+			})
+			.join("\n");
+
+		return inner ? [inner] : [`${indent(depth + 1)}// (none)`];
+	};
+
+	const lines: string[] = [];
+	const children = Array.from(tree.children.entries()).sort((a, b) =>
+		a[0].localeCompare(b[0])
+	);
+	for (const [segment, child] of children) {
+		lines.push(`${indent(1)}${renderObjectKey(segment)}: {`);
+		lines.push(...renderPathTreeLines(child, 1, renderLeaf));
+		lines.push(`${indent(1)}}`);
+	}
+
+	return lines.join("\n");
 }

package/cli/generators/generate-api-client/utils.ts

@@ -6,13 +6,17 @@ export const sortedEntries = <T>(map: Map<string, T[]>): Array<[string, T[]]> =>
 export const renderObjectKey = (key: string): string =>
 	isValidIdentifier(key) ? key : JSON.stringify(key);
 
-export const handlerTypePrefix = (h: any): string =>
-	h.fileName
-		.replace(/[^a-zA-Z0-9]/g, "")
-		.replace(/^./, (c: string) => c.toUpperCase()) +
-	h.name
-		.replace(/[^a-zA-Z0-9]/g, "")
-		.replace(/^./, (c: string) => c.toUpperCase());
+export const handlerTypePrefix = (h: any): string => {
+	const base = (h.routePath ?? h.fileName) as string;
+	return (
+		base
+			.replace(/[^a-zA-Z0-9]/g, "")
+			.replace(/^./, (c: string) => c.toUpperCase()) +
+		(h.name as string)
+			.replace(/[^a-zA-Z0-9]/g, "")
+			.replace(/^./, (c: string) => c.toUpperCase())
+	);
+};
 
 export const normalizeTableName = (fileName: string): string =>
 	fileName.endsWith("s") ? fileName : `${fileName}s`;

package/cli/generators/generate-cron-handlers/handler-entries.ts

@@ -14,11 +14,11 @@ export const buildCronHandlerEntries = (params: {
 	return params.handlers
 		.map((handler) => {
 			const local = params.localNameFor(handler);
-			const task = `${handler.fileName}/${handler.name}`;
+			const task = `${handler.routePath}/${handler.name}`;
 			const fallbackTriggers = stringifyTriggers(handler.cronTriggers);
 			return (
 				`\t${JSON.stringify(task)}: {\n` +
-				`\t\tfile: ${JSON.stringify(handler.fileName)},\n` +
+				`\t\tfile: ${JSON.stringify(handler.routePath)},\n` +
 				`\t\tname: ${JSON.stringify(handler.name)},\n` +
 				`\t\tcronTrigger: ${local}.cronTrigger ?? ${fallbackTriggers},\n` +
 				`\t\trun: ${local}.handler,\n` +