@donkeylabs/cli 2.0.6 → 2.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@donkeylabs/cli",
-  "version": "2.0.6",
+  "version": "2.0.7",
   "type": "module",
   "description": "CLI for @donkeylabs/server - project scaffolding and code generation",
   "main": "./src/index.ts",

package/src/commands/generate.ts

@@ -568,7 +568,7 @@ async function extractRoutesFromServer(entryPath: string): Promise<RouteInfo[]>
       timedOut = true;
       child.kill("SIGTERM");
       console.warn(pc.yellow(`Route extraction timed out after ${TIMEOUT_MS / 1000}s`));
-      console.warn(pc.dim("Make sure your entry file handles DONKEYLABS_GENERATE=1 and calls process.exit(0)"));
+      console.warn(pc.dim("Make sure routes are registered with server.use() before any blocking operations"));
       resolve([]);
     }, TIMEOUT_MS);
 
@@ -767,31 +767,38 @@ export async function generateCommand(_args: string[]): Promise<void> {
   // Determine client output path
   const clientOutput = config.client?.output || join(outPath, "client.ts");
 
-  // Check if adapter provides a custom generator
+  // Generate client using adapter (required for SvelteKit projects)
   if (config.adapter) {
+    // Resolve the adapter path from the project's node_modules
+    const adapterPath = join(process.cwd(), "node_modules", config.adapter, "src/generator/index.ts");
+
+    if (!existsSync(adapterPath)) {
+      console.error(pc.red(`Adapter not found: ${config.adapter}`));
+      console.error(pc.dim(`Expected path: ${adapterPath}`));
+      console.error(pc.dim(`Run: bun install`));
+      process.exit(1);
+    }
+
     try {
-      // Resolve the adapter path from the project's node_modules
-      const adapterPath = join(process.cwd(), "node_modules", config.adapter, "src/generator/index.ts");
-      if (existsSync(adapterPath)) {
-        const adapterModule = await import(adapterPath);
-        if (adapterModule.generateClient) {
-          await adapterModule.generateClient(config, serverRoutes, clientOutput);
-          generated.push(`client (${config.adapter})`);
-          console.log(pc.green("Generated:"), generated.map(g => pc.dim(g)).join(", "));
-          return;
-        }
+      const adapterModule = await import(adapterPath);
+      if (!adapterModule.generateClient) {
+        console.error(pc.red(`Adapter ${config.adapter} does not export generateClient`));
+        process.exit(1);
       }
+      await adapterModule.generateClient(config, serverRoutes, clientOutput);
+      generated.push(`client (${config.adapter})`);
     } catch (e: any) {
-      // Adapter doesn't provide generator or import failed, fall back to default
-      console.log(pc.dim(`Note: Adapter ${config.adapter} has no custom generator, using default`));
-      console.log(pc.dim(`Error: ${e.message}`));
+      console.error(pc.red(`Failed to run adapter generator: ${config.adapter}`));
+      console.error(pc.dim(e.message));
+      if (e.stack) console.error(pc.dim(e.stack));
+      process.exit(1);
     }
+  } else {
+    // No adapter - skip client generation (user must specify adapter for typed clients)
+    console.log(pc.yellow("No adapter specified - skipping client generation"));
+    console.log(pc.dim('Add adapter: "@donkeylabs/adapter-sveltekit" to donkeylabs.config.ts for typed client'));
   }
 
-  // Default client generation
-  await generateClientFromRoutes(serverRoutes, clientOutput);
-  generated.push("client");
-
   console.log(pc.green("Generated:"), generated.map(g => pc.dim(g)).join(", "));
 }
 
@@ -938,7 +945,7 @@ async function generateContext(
   const hasServices = serviceEntries.length > 0;
   const servicesTypeDecl = hasServices
     ? `export interface AppServices {\n${serviceEntries.join("\n")}\n  }`
-    : "export type AppServices = Record<string, never>;";
+    : "// eslint-disable-next-line @typescript-eslint/no-empty-interface\n  export interface AppServices {}";
 
   const content = `// Auto-generated by donkeylabs generate
 // App context - import as: import type { AppContext } from ".@donkeylabs/server/context";
@@ -1266,97 +1273,3 @@ ${eventRegistryEntries.join("\n")}
   await writeFile(join(outPath, "events.ts"), content);
 }
 
-async function generateClientFromRoutes(
-  routes: ExtractedRoute[],
-  outputPath: string
-): Promise<void> {
-  // Group routes by namespace (first part of route name)
-  // e.g., "api.hello.test" -> namespace "api", sub "hello", method "test"
-  const tree = new Map<string, Map<string, { method: string; fullName: string }[]>>();
-
-  for (const route of routes) {
-    const parts = route.name.split(".");
-    if (parts.length < 2) {
-      // Single-level route like "ping" -> namespace "", method "ping"
-      const ns = "";
-      if (!tree.has(ns)) tree.set(ns, new Map());
-      const rootMethods = tree.get(ns)!;
-      if (!rootMethods.has("")) rootMethods.set("", []);
-      rootMethods.get("")!.push({ method: parts[0]!, fullName: route.name });
-    } else if (parts.length === 2) {
-      // Two-level route like "health.ping" -> namespace "health", method "ping"
-      const [ns, method] = parts;
-      if (!tree.has(ns!)) tree.set(ns!, new Map());
-      const nsMethods = tree.get(ns!)!;
-      if (!nsMethods.has("")) nsMethods.set("", []);
-      nsMethods.get("")!.push({ method: method!, fullName: route.name });
-    } else {
-      // Multi-level route like "api.hello.test" -> namespace "api", sub "hello", method "test"
-      const [ns, sub, ...rest] = parts;
-      const method = rest.join(".");
-      if (!tree.has(ns!)) tree.set(ns!, new Map());
-      const nsMethods = tree.get(ns!)!;
-      if (!nsMethods.has(sub!)) nsMethods.set(sub!, []);
-      nsMethods.get(sub!)!.push({ method: method || sub!, fullName: route.name });
-    }
-  }
-
-  // Generate method definitions
-  const namespaceBlocks: string[] = [];
-
-  for (const [namespace, subNamespaces] of tree) {
-    if (namespace === "") {
-      // Root-level methods
-      const rootMethods = subNamespaces.get("");
-      if (rootMethods && rootMethods.length > 0) {
-        for (const { method, fullName } of rootMethods) {
-          const methodName = method.replace(/-([a-z])/g, (_: string, c: string) => c.toUpperCase());
-          namespaceBlocks.push(`  ${methodName} = (input: any) => this.request("${fullName}", input);`);
-        }
-      }
-      continue;
-    }
-
-    const subBlocks: string[] = [];
-    for (const [sub, methods] of subNamespaces) {
-      if (sub === "") {
-        // Direct methods on namespace
-        for (const { method, fullName } of methods) {
-          const methodName = method.replace(/-([a-z])/g, (_: string, c: string) => c.toUpperCase());
-          subBlocks.push(`    ${methodName}: (input: any) => this.request("${fullName}", input)`);
-        }
-      } else {
-        // Sub-namespace methods
-        const subMethods = methods.map(({ method, fullName }) => {
-          const methodName = method.replace(/-([a-z])/g, (_: string, c: string) => c.toUpperCase());
-          return `      ${methodName}: (input: any) => this.request("${fullName}", input)`;
-        });
-        subBlocks.push(`    ${sub}: {\n${subMethods.join(",\n")}\n    }`);
-      }
-    }
-
-    namespaceBlocks.push(`  ${namespace} = {\n${subBlocks.join(",\n")}\n  };`);
-  }
-
-  const content = `// Auto-generated by donkeylabs generate
-// API Client
-
-import { ApiClientBase, type ApiClientOptions } from "@donkeylabs/server/client";
-
-export class ApiClient extends ApiClientBase<{}> {
-  constructor(baseUrl: string, options?: ApiClientOptions) {
-    super(baseUrl, options);
-  }
-
-${namespaceBlocks.join("\n\n") || "  // No routes defined"}
-}
-
-export function createApiClient(baseUrl: string, options?: ApiClientOptions) {
-  return new ApiClient(baseUrl, options);
-}
-`;
-
-  const outputDir = dirname(outputPath);
-  await mkdir(outputDir, { recursive: true });
-  await writeFile(outputPath, content);
-}

package/templates/starter/package.json

@@ -9,13 +9,13 @@
     "gen:types": "donkeylabs generate"
   },
   "dependencies": {
-    "@donkeylabs/server": "latest",
+    "@donkeylabs/server": "^2.0.10",
     "kysely": "^0.27.0",
     "kysely-bun-sqlite": "^0.3.0",
     "zod": "^3.24.0"
   },
   "devDependencies": {
-    "@donkeylabs/cli": "latest",
+    "@donkeylabs/cli": "^2.0.7",
     "@types/bun": "latest"
   }
 }

package/templates/sveltekit-app/package.json

@@ -4,8 +4,7 @@
   "version": "0.0.1",
   "type": "module",
   "scripts": {
-    "dev": "bun scripts/dev.ts",
-    "dev:watch": "bun --watch --no-clear-screen scripts/watch-server.ts",
+    "dev": "bun --bun vite dev",
     "build": "bun run gen:types && vite build",
     "preview": "bun build/server/entry.js",
     "prepare": "bun --bun svelte-kit sync || echo ''",
@@ -24,9 +23,9 @@
     "vite": "^7.2.6"
   },
   "dependencies": {
-    "@donkeylabs/cli": "^1.1.19",
-    "@donkeylabs/adapter-sveltekit": "^1.1.19",
-    "@donkeylabs/server": "^1.1.19",
+    "@donkeylabs/cli": "^2.0.7",
+    "@donkeylabs/adapter-sveltekit": "^2.0.9",
+    "@donkeylabs/server": "^2.0.10",
     "bits-ui": "^2.15.4",
     "clsx": "^2.1.1",
     "kysely": "^0.27.6",

package/templates/sveltekit-app/src/server/index.ts

@@ -26,6 +26,11 @@ export const server = new AppServer({
   generateTypes: {
     output: "./src/lib/api.ts",
   },
+  // Admin dashboard - enabled in dev mode
+  admin: {
+    enabled: true,
+    prefix: "admin",
+  },
 });
 
 // =============================================================================
@@ -119,6 +124,3 @@ server.use(permissionsRouter);
 server.use(tenantsRouter);
 server.use(demoRoutes);
 server.use(exampleRouter);
-
-// Handle CLI type generation (must be after routes are registered)
-server.handleGenerateMode();

package/templates/sveltekit-app/src/server/plugins/demo/index.ts

@@ -157,7 +157,11 @@ export const demoPlugin = createPlugin.define({
         return { success: true };
       },
       wsGetClients: (channel?: string) => {
-        const clients = ctx.core.websocket.getClients(channel);
+        const allClients = ctx.core.websocket.getClients();
+        // Filter by channel if provided
+        const clients = channel
+          ? allClients.filter((c) => c.channels.includes(channel))
+          : allClients;
         return {
           count: clients.length,
           clients,

package/templates/sveltekit-app/src/server/routes/demo.ts

@@ -435,7 +435,13 @@ demo.route("websocket.clients").typed(
     }),
     output: z.object({
       count: z.number(),
-      clients: z.array(z.string()),
+      clients: z.array(
+        z.object({
+          id: z.string(),
+          connectedAt: z.date(),
+          channels: z.array(z.string()),
+        })
+      ),
     }),
     handle: async (input, ctx) => {
       return ctx.plugins.demo.wsGetClients(input.channel);

package/templates/sveltekit-app/scripts/dev.ts

@@ -1,53 +0,0 @@
-#!/usr/bin/env bun
-// Dev script that runs vite and watcher together, ensuring cleanup on exit
-
-import { spawn, type Subprocess } from "bun";
-
-const children: Subprocess[] = [];
-
-function cleanup() {
-  for (const child of children) {
-    try {
-      child.kill();
-    } catch {}
-  }
-  process.exit(0);
-}
-
-// Handle all exit signals
-process.on("SIGTERM", cleanup);
-process.on("SIGINT", cleanup);
-process.on("exit", cleanup);
-
-// Generate types first
-console.log("\x1b[36m[dev]\x1b[0m Generating types...");
-const genResult = Bun.spawnSync(["bun", "run", "gen:types"], {
-  stdout: "inherit",
-  stderr: "inherit",
-});
-
-if (genResult.exitCode !== 0) {
-  console.error("\x1b[31m[dev]\x1b[0m Failed to generate types");
-  process.exit(1);
-}
-
-// Start watcher
-console.log("\x1b[36m[dev]\x1b[0m Starting file watcher...");
-const watcher = spawn(["bun", "--watch", "--no-clear-screen", "scripts/watch-server.ts"], {
-  stdout: "inherit",
-  stderr: "inherit",
-});
-children.push(watcher);
-
-// Start vite
-console.log("\x1b[36m[dev]\x1b[0m Starting Vite dev server...");
-const vite = spawn(["bun", "--bun", "vite", "dev"], {
-  stdout: "inherit",
-  stderr: "inherit",
-  stdin: "inherit",
-});
-children.push(vite);
-
-// When vite exits, cleanup everything
-await vite.exited;
-cleanup();

package/templates/sveltekit-app/scripts/watch-server.ts

@@ -1,79 +0,0 @@
-// Watch server files and regenerate types on changes
-import { watch } from "node:fs";
-import { exec } from "node:child_process";
-import { promisify } from "node:util";
-import { join } from "node:path";
-
-const execAsync = promisify(exec);
-
-const serverDir = join(import.meta.dir, "..", "src", "server");
-let isGenerating = false;
-let lastGenerationTime = 0;
-
-// Files/patterns we generate - ignore changes to these
-const IGNORED_PATTERNS = [
-  /schema\.ts$/,           // Generated schema files
-  /\.d\.ts$/,              // Type declaration files
-];
-
-// Cooldown period after generation (ms)
-const COOLDOWN_MS = 2000;
-const DEBOUNCE_MS = 500;
-
-// Handle signals for clean shutdown (from parent dev.ts)
-process.on("SIGTERM", () => process.exit(0));
-process.on("SIGINT", () => process.exit(0));
-
-function shouldIgnoreFile(filename: string): boolean {
-  return IGNORED_PATTERNS.some(pattern => pattern.test(filename));
-}
-
-async function regenerate() {
-  // Check cooldown
-  const now = Date.now();
-  if (now - lastGenerationTime < COOLDOWN_MS) {
-    return;
-  }
-
-  if (isGenerating) {
-    return;
-  }
-
-  isGenerating = true;
-  lastGenerationTime = now;
-  console.log("\x1b[36m[watch]\x1b[0m Server files changed, regenerating types...");
-
-  try {
-    await execAsync("bun run gen:types");
-    console.log("\x1b[32m[watch]\x1b[0m Types regenerated successfully");
-  } catch (e: any) {
-    console.error("\x1b[31m[watch]\x1b[0m Error regenerating types:", e.message);
-  } finally {
-    isGenerating = false;
-    lastGenerationTime = Date.now(); // Update after generation completes
-  }
-}
-
-// Debounce to avoid multiple rapid regenerations
-let debounceTimer: Timer | null = null;
-
-function debouncedRegenerate() {
-  if (debounceTimer) clearTimeout(debounceTimer);
-  debounceTimer = setTimeout(regenerate, DEBOUNCE_MS);
-}
-
-// Watch server directory recursively
-watch(serverDir, { recursive: true }, (eventType, filename) => {
-  if (!filename) return;
-  if (!filename.endsWith(".ts")) return;
-
-  // Ignore generated files
-  if (shouldIgnoreFile(filename)) return;
-
-  debouncedRegenerate();
-});
-
-console.log("\x1b[36m[watch]\x1b[0m Watching src/server/ for changes...");
-
-// Keep process alive
-await new Promise(() => {});