@donkeylabs/cli 2.2.0 → 2.3.0

package/package.json

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

package/src/commands/generate-utils.ts

@@ -45,6 +45,7 @@ export interface ProcessInfo {
 export interface ServerOutput {
   routes: RouteInfo[];
   processes: ProcessInfo[];
+  coreEvents?: Record<string, string>;
 }
 
 /**
@@ -124,7 +125,7 @@ export async function extractRoutesFromServer(entryPath: string): Promise<Server
           commands: p.commands,
         }));
 
-        resolve({ routes, processes });
+        resolve({ routes, processes, coreEvents: result.coreEvents });
       } catch (e) {
         console.warn(pc.yellow("Failed to parse route data from server"));
         resolve({ routes: [], processes: [] });

package/src/commands/generate.ts

@@ -954,7 +954,7 @@ export async function generateCommand(_args: string[]): Promise<void> {
   await generateRegistry(plugins, outPath);
   await generateContext(plugins, services, outPath);
   await generateRouteTypes(fileRoutes, outPath);
-  await generateEventTypes(serverEvents, outPath);
+  await generateEventTypes(serverEvents, outPath, serverOutput.coreEvents);
   await generateProcessTypes(serverProcesses, outPath);
 
   const generated = ["registry", "context", "routes", "events", "processes"];
@@ -1373,9 +1373,17 @@ function parseZodObjectFields(objectContent: string): string {
 
 /**
  * Generate events.ts with namespace-nested types and EventMap.
+ * Includes both core framework events and user-defined events.
  */
-async function generateEventTypes(events: EventDefinitionInfo[], outPath: string): Promise<void> {
-  if (events.length === 0) {
+async function generateEventTypes(
+  events: EventDefinitionInfo[],
+  outPath: string,
+  coreEvents?: Record<string, string>
+): Promise<void> {
+  const hasCoreEvents = coreEvents && Object.keys(coreEvents).length > 0;
+  const hasUserEvents = events.length > 0;
+
+  if (!hasCoreEvents && !hasUserEvents) {
     // Still generate an empty file for consistency
     const content = `// Auto-generated by donkeylabs generate
 // Events - import as: import { type EventMap, type EventName } from ".@donkeylabs/server/events";
@@ -1398,10 +1406,32 @@ declare module "@donkeylabs/server" {
     return;
   }
 
-  // Group events by namespace (first part of event name)
+  // Group ALL events by namespace (first part of event name)
   // e.g., "order.created" -> namespace "Order", event "Created"
-  const byNamespace = new Map<string, { eventName: string; pascalName: string; schemaSource: string; fullName: string }[]>();
+  // e.g., "workflow.step.started" -> namespace "Workflow", event "StepStarted"
+  const byNamespace = new Map<string, { eventName: string; pascalName: string; tsType: string; fullName: string; isCore: boolean }[]>();
+
+  // Add core events first (using pre-computed TS type strings)
+  if (hasCoreEvents) {
+    for (const [eventFullName, tsTypeString] of Object.entries(coreEvents!)) {
+      const parts = eventFullName.split(".");
+      const namespace = toPascalCase(parts[0] || "App");
+      const eventName = parts.slice(1).map(p => toPascalCase(p)).join("") || toPascalCase(parts[0] || "Event");
+
+      if (!byNamespace.has(namespace)) {
+        byNamespace.set(namespace, []);
+      }
+      byNamespace.get(namespace)!.push({
+        eventName,
+        pascalName: eventName,
+        tsType: tsTypeString,
+        fullName: eventFullName,
+        isCore: true,
+      });
+    }
+  }
 
+  // Add user-defined events (from Zod schemas)
   for (const event of events) {
     const parts = event.name.split(".");
     const namespace = toPascalCase(parts[0] || "App");
@@ -1413,25 +1443,41 @@ declare module "@donkeylabs/server" {
     byNamespace.get(namespace)!.push({
       eventName,
       pascalName: eventName,
-      schemaSource: event.schemaSource,
+      tsType: zodSchemaToTypeScript(event.schemaSource),
       fullName: event.name,
+      isCore: false,
     });
   }
 
   // Generate namespace blocks
   const namespaceBlocks: string[] = [];
+  const coreNamespaceBlocks: string[] = [];
+  const userNamespaceBlocks: string[] = [];
   const eventMapEntries: string[] = [];
   const eventRegistryEntries: string[] = [];
   const eventNames: string[] = [];
 
+  // Track which namespaces are core-only, user-only, or mixed
   for (const [namespace, nsEvents] of byNamespace) {
+    const hasCoreInNs = nsEvents.some(e => e.isCore);
+    const hasUserInNs = nsEvents.some(e => !e.isCore);
+
     const eventTypeDecls = nsEvents.map(e => {
-      const tsType = zodSchemaToTypeScript(e.schemaSource);
       return `  /** Event data for "${e.fullName}" */
-  export type ${e.pascalName} = ${tsType};`;
+  export type ${e.pascalName} = ${e.tsType};`;
     }).join("\n\n");
 
-    namespaceBlocks.push(`export namespace ${namespace} {\n${eventTypeDecls}\n}`);
+    const block = `export namespace ${namespace} {\n${eventTypeDecls}\n}`;
+
+    if (hasCoreInNs && !hasUserInNs) {
+      coreNamespaceBlocks.push(block);
+    } else if (!hasCoreInNs && hasUserInNs) {
+      userNamespaceBlocks.push(block);
+    } else {
+      // Mixed - put in core section
+      coreNamespaceBlocks.push(block);
+    }
+    namespaceBlocks.push(block);
 
     // Add to EventMap and EventRegistry
     for (const e of nsEvents) {
@@ -1441,11 +1487,20 @@ declare module "@donkeylabs/server" {
     }
   }
 
+  // Build the output with clear sections
+  const sections: string[] = [];
+
+  if (coreNamespaceBlocks.length > 0) {
+    sections.push(`// Core framework events\n${coreNamespaceBlocks.join("\n\n")}`);
+  }
+  if (userNamespaceBlocks.length > 0) {
+    sections.push(`// User-defined events\n${userNamespaceBlocks.join("\n\n")}`);
+  }
+
   const content = `// Auto-generated by donkeylabs generate
 // Events - import as: import { type EventMap, type EventName, Order, User } from ".@donkeylabs/server/events";
 
-// Event type namespaces - use as Order.Created, User.Signup, etc.
-${namespaceBlocks.join("\n\n")}
+${sections.join("\n\n")}
 
 /** Map of all event names to their data types */
 export interface EventMap {