@beignet/cli 0.0.34 → 0.0.36

package/src/make/tenancy.ts

@@ -2041,13 +2041,7 @@ export const WorkspaceInviteNotification = defineNotification(
 }
 
 export function tenancyRoutesFile(config: ResolvedBeignetConfig): string {
-  const routeFilePath = path.join(
-    config.paths.features,
-    "workspaces/routes.ts",
-  );
-
-  return `import { defineRouteGroup } from "@beignet/core/server";
-import type { AppContext } from "${relativeModule(routeFilePath, config.paths.appContext)}";
+  return `import { defineRouteGroup } from "${aliasModule(config.paths.routesBuilder)}";
 import * as workspaceContracts from "@/features/workspaces/contracts";
 import * as workspaceUseCases from "@/features/workspaces/use-cases";
 import { WORKSPACE_COOKIE_NAME } from "@/lib/tenant";
@@ -2064,7 +2058,7 @@ function workspaceCookie(workspaceId: string): string {
 \t].join("; ");
 }
 
-export const workspaceRoutes = defineRouteGroup<AppContext>()({
+export const workspaceRoutes = defineRouteGroup({
 \tname: "workspaces",
 \troutes: [
 \t\t{

package/src/make.ts

@@ -4871,8 +4871,8 @@ function listenerFile(
   return `import { defineListener } from "${aliasModule(config.paths.listenersBuilder)}";
 import { ${names.event.eventExportName} } from "${relativeModule(filePath, eventFilePath(names.event, config))}";
 
-export const ${names.listenerExportName} = defineListener(${names.event.eventExportName}, {
-\tname: "${names.listenerName}",
+export const ${names.listenerExportName} = defineListener("${names.listenerName}", {
+\tevent: ${names.event.eventExportName},
 \tasync handle({ payload, ctx }) {
 \t\tctx.ports.logger.info("Listener handled", {
 \t\t\tlistenerName: "${names.listenerName}",
@@ -5249,8 +5249,7 @@ function routeGroupFile(
   const useCasesPath = resourceUseCaseIndexPath(names, config);
 
   return `import "@beignet/core/server-only";
-import { defineRouteGroup } from "@beignet/core/server";
-import type { AppContext } from "${relativeModule(routeFilePath, config.paths.appContext)}";
+import { defineRouteGroup } from "${relativeModule(routeFilePath, config.paths.routesBuilder)}";
 import {
 	create${names.singularPascal},
 ${mode === "resource" ? `	delete${names.singularPascal},\n	get${names.singularPascal},\n` : ""}	list${names.pluralPascal},
@@ -5260,7 +5259,7 @@ import {
 ${mode === "resource" ? `	delete${names.singularPascal}UseCase,\n	get${names.singularPascal}UseCase,\n` : ""}	list${names.pluralPascal}UseCase,
 ${mode === "resource" ? `	update${names.singularPascal}UseCase,\n` : ""}} from "${relativeModule(routeFilePath, useCasesPath)}";
 
-export const ${names.singularCamel}Routes = defineRouteGroup<AppContext>()({
+export const ${names.singularCamel}Routes = defineRouteGroup({
 	name: "${names.pluralKebab}",
 	routes: [
 		{ contract: list${names.pluralPascal}, useCase: list${names.pluralPascal}UseCase },

package/src/schedule.ts

@@ -1,8 +1,8 @@
 import { readFile, stat } from "node:fs/promises";
 import path from "node:path";
+import type { ProviderInstrumentationPort } from "@beignet/core/providers";
 import type {
   ScheduleDef,
-  ScheduleInstrumentation,
   ScheduleRunOptions,
   StandardSchema,
 } from "@beignet/core/schedules";
@@ -54,7 +54,8 @@ type ScheduleContext = {
   traceId?: string;
   ports?: {
     logger?: ScheduleLogger;
-    devtools?: ScheduleInstrumentation;
+    devtools?: ProviderInstrumentationPort;
+    instrumentation?: ProviderInstrumentationPort;
   };
 };
 
@@ -107,7 +108,7 @@ export async function runAppSchedule(
     );
     const runner = createInlineScheduleRunner<unknown>({
       ctx,
-      instrumentation: scheduleContext.ports?.devtools,
+      instrumentation: scheduleContext.ports,
       instrumentationContext: {
         requestId: scheduleContext.requestId,
         traceId: scheduleContext.traceId,

package/src/templates/agents.ts

@@ -48,6 +48,8 @@ is a silent failure — the file exists but never runs:
 
 - Feature route groups in \`features/<feature>/routes.ts\` must be composed in
   \`server/routes.ts\` via \`defineRoutes([...])\`.
+- Feature route files import the app-bound \`defineRouteGroup\` from
+  \`lib/routes.ts\`; that builder owns the shared \`AppContext\` binding.
 - Schedules must be added to the \`schedules\` array in \`server/schedules.ts\`.
 - Tasks must be added to \`defineTasks([...])\` in \`server/tasks.ts\`.
 - Outbox events and jobs must be registered in \`defineOutboxRegistry({...})\`

package/src/templates/index.ts

@@ -136,6 +136,7 @@ export function getTemplateFiles(ctx: TemplateContext): TemplateFile[] {
     { path: "lib/tenant.ts", content: serverFiles.tenantHelper },
     ...testSupportTemplateFiles,
     { path: "lib/use-case.ts", content: serverFiles.useCaseBuilder },
+    { path: "lib/routes.ts", content: serverFiles.routesBuilder },
     { path: "server/index.ts", content: server(ctx) },
     { path: "server/context.ts", content: serverFiles.serverContext },
     { path: "server/routes.ts", content: serverFiles.serverRoutes },

package/src/templates/server.ts

@@ -10,7 +10,7 @@ export function serverProviders(ctx: TemplateContext): string {
   const imports = [
     'import "@beignet/core/server-only";',
     'import { createDevtoolsProvider } from "@beignet/devtools";',
-    'import { createAuthBetterAuthProvider } from "@beignet/provider-auth-better-auth";',
+    'import { createBetterAuthProvider } from "@beignet/provider-auth-better-auth";',
     `import { ${db.providerFactory} } from "@beignet/provider-db-drizzle/${db.subpath}";`,
     hasIntegration(ctx, "inngest")
       ? 'import { createInngestJobsProvider } from "@beignet/provider-jobs-inngest";'
@@ -30,7 +30,7 @@ export function serverProviders(ctx: TemplateContext): string {
 
   const entries = [
     "\tcreateDevtoolsProvider(),",
-    "\tcreateAuthBetterAuthProvider<AuthUser, AuthSessionMetadata>(auth),",
+    "\tcreateBetterAuthProvider<AuthUser, AuthSessionMetadata>(auth),",
     "\tcreatePinoLoggerProvider(),",
     `\t${db.providerInstance},`,
     "\tstarterDatabaseProvider,",
@@ -396,6 +396,12 @@ import { createUseCase } from "@beignet/core/application";
 import type { AppContext } from "@/app-context";
 
 export const useCase = createUseCase<AppContext>();
+`,
+  routesBuilder: `import "@beignet/core/server-only";
+import { createRoutes } from "@beignet/core/server";
+import type { AppContext } from "@/app-context";
+
+export const { defineRoute, defineRouteGroup } = createRoutes<AppContext>();
 `,
   authHelpers: `import type { AppContext } from "@/app-context";
 import type { AuthSession, AuthUser } from "@/ports/auth";

package/src/templates/testing.ts

@@ -406,6 +406,7 @@ export const testRunnerTemplateFile: TemplateFile = {
   content: `import { spawnSync } from "node:child_process";
 import { existsSync, readFileSync, readdirSync, statSync } from "node:fs";
 import path from "node:path";
+import { pathToFileURL } from "node:url";
 
 const defaultTestRoots = [
   "app",
@@ -428,11 +429,18 @@ const ignoredDirectories = new Set([
 ]);
 const testFilePattern = /\\.(test|spec)\\.[cm]?[tj]sx?$/;
 
+const configFileNames = [
+  "beignet.config.ts",
+  "beignet.config.json",
+  "beignet.config.mjs",
+  "beignet.config.js",
+];
+
 const explicitArgs = process.argv.slice(2);
 const testArgs =
   explicitArgs.length > 0
     ? resolveTestArgs(process.cwd(), explicitArgs)
-    : discoverTestFiles(process.cwd());
+    : await discoverTestFiles(process.cwd());
 
 if (testArgs.length === 0) {
   console.log("No test files found.");
@@ -456,9 +464,9 @@ if (result.error) {
 
 process.exit(result.status ?? 1);
 
-function discoverTestFiles(cwd: string): string[] {
+async function discoverTestFiles(cwd: string): Promise<string[]> {
   const files: string[] = [];
-  for (const root of testRoots(cwd)) {
+  for (const root of await testRoots(cwd)) {
     const rootPath = path.join(cwd, root);
     if (existsSync(rootPath)) {
       walk(rootPath, cwd, files);
@@ -494,32 +502,53 @@ function resolveTestArgs(cwd: string, args: string[]): string[] {
   return Array.from(new Set(resolved));
 }
 
-function testRoots(cwd: string): string[] {
-  return Array.from(new Set([...defaultTestRoots, ...configuredRoots(cwd)]));
+async function testRoots(cwd: string): Promise<string[]> {
+  return Array.from(
+    new Set([...defaultTestRoots, ...(await configuredRoots(cwd))]),
+  );
 }
 
-function configuredRoots(cwd: string): string[] {
-  const configPath = path.join(cwd, "beignet.config.json");
-  if (!existsSync(configPath)) return [];
-  try {
-    const config = JSON.parse(readFileSync(configPath, "utf8")) as {
-      paths?: Record<string, string>;
-    };
-    const paths = config.paths ?? {};
-    return [
-      paths.tests,
-      paths.features,
-      paths.routes ? path.dirname(paths.routes) : undefined,
-      paths.server ? path.dirname(paths.server) : undefined,
-      paths.infrastructurePorts
-        ? path.dirname(paths.infrastructurePorts)
-        : undefined,
-      paths.ports ? path.dirname(paths.ports) : undefined,
-      paths.useCaseBuilder ? path.dirname(paths.useCaseBuilder) : undefined,
-    ].filter((root): root is string => Boolean(root) && root !== ".");
-  } catch {
-    return [];
+async function configuredRoots(cwd: string): Promise<string[]> {
+  const configFiles = configFileNames.filter((file) =>
+    existsSync(path.join(cwd, file)),
+  );
+  if (configFiles.length === 0) return [];
+  if (configFiles.length > 1) {
+    throw new Error(
+      "Multiple Beignet config files found: " +
+        configFiles.join(", ") +
+        ". Keep only one config file.",
+    );
   }
+
+  const configFile = configFiles[0];
+  const configPath = path.join(cwd, configFile);
+  const config = configFile.endsWith(".json")
+    ? JSON.parse(readFileSync(configPath, "utf8"))
+    : ((await import(pathToFileURL(configPath).href)) as { default?: unknown })
+        .default;
+  if (!isObjectRecord(config)) {
+    throw new Error(configFile + " must export a Beignet config object.");
+  }
+  const paths = isObjectRecord(config.paths) ? config.paths : {};
+  return [
+    paths.tests,
+    paths.features,
+    parentPath(paths.routes),
+    parentPath(paths.server),
+    parentPath(paths.infrastructurePorts),
+    parentPath(paths.ports),
+    parentPath(paths.useCaseBuilder),
+    parentPath(paths.routesBuilder),
+  ].filter((root): root is string => Boolean(root) && root !== ".");
+}
+
+function parentPath(value: unknown): string | undefined {
+  return typeof value === "string" ? path.dirname(value) : undefined;
+}
+
+function isObjectRecord(value: unknown): value is Record<string, unknown> {
+  return value !== null && typeof value === "object" && !Array.isArray(value);
 }
 
 function walk(directory: string, cwd: string, files: string[]): void {

package/src/templates/todos.ts

@@ -175,8 +175,7 @@ export const todoPolicy = definePolicy({
 });
 `,
   routes: `import "@beignet/core/server-only";
-import { defineRouteGroup } from "@beignet/core/server";
-import type { AppContext } from "@/app-context";
+import { defineRouteGroup } from "@/lib/routes";
 import {
 	createTodo,
 	deleteTodo,
@@ -190,7 +189,7 @@ import {
 	updateTodoUseCase,
 } from "@/features/todos/use-cases";
 
-export const todoRoutes = defineRouteGroup<AppContext>()({
+export const todoRoutes = defineRouteGroup({
 	name: "todos",
 	routes: [
 		{ contract: listTodos, useCase: listTodosUseCase },

package/src/test-helpers/generated-app.ts

@@ -116,7 +116,7 @@ export async function linkSmokeDependencies(
       "packages/provider-mail-resend/node_modules/resend",
     ),
     "next-themes": path.join(repoRoot, "packages/cli/node_modules/next-themes"),
-    tsx: path.join(repoRoot, "node_modules/tsx"),
+    tsx: path.join(repoRoot, "packages/cli/node_modules/tsx"),
   };
 
   for (const packageName of externalPackages) {