@auto-engineer/server-generator-apollo-emmett 1.55.0 → 1.57.0

package/src/codegen/templates/query/query.resolver.specs.ts

@@ -65,7 +65,7 @@ describe('query.resolver.ts.ejs', () => {
       ],
     };
 
-    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
+    const { plans } = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
     const resolverFile = plans.find((p) => p.outputPath.endsWith('query.resolver.ts'));
 
     expect(resolverFile?.contents).toMatchInlineSnapshot(`
@@ -191,7 +191,7 @@ describe('query.resolver.ts.ejs', () => {
       ],
     };
 
-    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
+    const { plans } = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
     const resolverFile = plans.find((p) => p.outputPath.endsWith('query.resolver.ts'));
 
     expect(resolverFile?.contents).toMatchInlineSnapshot(`
@@ -359,7 +359,7 @@ describe('query.resolver.ts.ejs', () => {
       integrations: [],
     };
 
-    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
+    const { plans } = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
     const queryFile = plans.find(
       (p) => p.outputPath.endsWith('query.resolver.ts') && p.contents.includes('ViewsTheQuestionnaireQueryResolver'),
     );
@@ -489,7 +489,7 @@ describe('query.resolver.ts.ejs', () => {
       ],
     };
 
-    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
+    const { plans } = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
     const resolverFile = plans.find((p) => p.outputPath.endsWith('query.resolver.ts'));
 
     expect(resolverFile?.contents).toContain(
@@ -553,7 +553,7 @@ describe('query.resolver.ts.ejs', () => {
       ],
     };
 
-    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
+    const { plans } = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
     const resolverFile = plans.find((p) => p.outputPath.endsWith('query.resolver.ts'));
 
     expect(resolverFile?.contents).toContain('Float');
@@ -615,7 +615,7 @@ describe('query.resolver.ts.ejs', () => {
       ],
     };
 
-    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
+    const { plans } = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
     const resolverFile = plans.find((p) => p.outputPath.endsWith('query.resolver.ts'));
 
     expect(resolverFile?.contents).toContain('Float');
@@ -684,7 +684,7 @@ describe('query.resolver.ts.ejs', () => {
       ],
     };
 
-    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
+    const { plans } = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
     const resolverFile = plans.find((p) => p.outputPath.endsWith('query.resolver.ts'));
 
     // Should return single object, not array
@@ -757,7 +757,7 @@ describe('query.resolver.ts.ejs', () => {
       ],
     };
 
-    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
+    const { plans } = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
     const resolverFile = plans.find((p) => p.outputPath.endsWith('query.resolver.ts'));
 
     expect(resolverFile?.contents).not.toContain("mixedStatus: 'pending'");
@@ -825,7 +825,7 @@ describe('query.resolver.ts.ejs', () => {
       ],
     };
 
-    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
+    const { plans } = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
     const resolverFile = plans.find((p) => p.outputPath.endsWith('query.resolver.ts'));
 
     expect(resolverFile?.contents).toContain('export class WorkoutSessionPerformance');
@@ -899,7 +899,7 @@ describe('query.resolver.ts.ejs', () => {
       ],
     };
 
-    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
+    const { plans } = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
     const resolverFile = plans.find((p) => p.outputPath.endsWith('query.resolver.ts'));
 
     expect(resolverFile?.contents).toMatchInlineSnapshot(`
@@ -1022,7 +1022,7 @@ describe('query.resolver.ts.ejs', () => {
       ],
     };
 
-    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
+    const { plans } = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
     const resolverFile = plans.find((p) => p.outputPath.endsWith('query.resolver.ts'));
 
     expect(resolverFile?.contents).toMatchInlineSnapshot(`

package/src/codegen/templates/query/state.specs.ts

@@ -55,7 +55,7 @@ describe('state.ts.ejs', () => {
       ],
     };
 
-    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
+    const { plans } = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
     const stateFile = plans.find((p) => p.outputPath.endsWith('state.ts'));
 
     expect(stateFile?.contents).toMatchInlineSnapshot(`
@@ -93,7 +93,7 @@ describe('state.ts.ejs', () => {
       messages: [],
     };
 
-    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
+    const { plans } = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
     const stateFile = plans.find((p) => p.outputPath.endsWith('state.ts'));
 
     expect(stateFile?.contents).toMatchInlineSnapshot(`

package/src/codegen/templates/react/react.specs.specs.ts

@@ -171,7 +171,7 @@ describe('react.specs.ts.ejs (react slice)', () => {
       ],
     };
 
-    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
+    const { plans } = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
 
     const specFile = plans.find((p) => p.outputPath.endsWith('react.specs.ts'));
     expect(specFile?.contents).toMatchInlineSnapshot(`
@@ -358,7 +358,7 @@ describe('react.specs.ts.ejs (react slice)', () => {
       ],
     };
 
-    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
+    const { plans } = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
 
     const specFile = plans.find((p) => p.outputPath.endsWith('react.specs.ts'));
     expect(specFile?.contents).toBeDefined();

package/src/codegen/templates/react/react.specs.ts

@@ -229,7 +229,7 @@ describe('handle.ts.ejs (react slice)', () => {
       ],
     };
 
-    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
+    const { plans } = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
     const handleFile = plans.find((p) => p.outputPath.endsWith('react.ts'));
 
     expect(handleFile?.contents).toMatchInlineSnapshot(`
@@ -375,7 +375,7 @@ describe('handle.ts.ejs (react slice)', () => {
       ],
     };
 
-    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
+    const { plans } = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
     const reactFile = plans.find((p) => p.outputPath.endsWith('notify-warehouse/react.ts'));
 
     expect(reactFile?.contents).toContain("from '../../order-management/create-order/events'");
@@ -445,7 +445,7 @@ describe('handle.ts.ejs (react slice)', () => {
       ],
     };
 
-    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
+    const { plans } = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
     const reactFile = plans.find((p) => p.outputPath.endsWith('notify-on-external-event/react.ts'));
     const registerFile = plans.find((p) => p.outputPath.endsWith('notify-on-external-event/register.ts'));
     const specsFile = plans.find((p) => p.outputPath.endsWith('notify-on-external-event/react.specs.ts'));
@@ -553,7 +553,7 @@ describe('handle.ts.ejs (react slice)', () => {
       ],
     };
 
-    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
+    const { plans } = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
     const reactFile = plans.find((p) => p.outputPath.endsWith('adjust-inventory/react.ts'));
 
     expect(reactFile?.contents).toContain('inMemoryReactor<PaymentProcessed>');

package/src/codegen/templates/react/react.ts.specs.ts

@@ -183,7 +183,7 @@ describe('react.ts.ejs', () => {
       ],
     };
 
-    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
+    const { plans } = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
     const reactFile = plans.find((p) => p.outputPath.endsWith('send-order-confirmation/react.ts'));
     expect(reactFile?.contents).toBeDefined();
 
@@ -276,7 +276,7 @@ describe('react.ts.ejs', () => {
       ],
     };
 
-    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
+    const { plans } = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
 
     const reactFiles = plans.filter((p) => p.outputPath.includes('notify-barber-of-cancellation'));
     expect(reactFiles).toEqual([]);
@@ -394,7 +394,7 @@ describe('react.ts.ejs', () => {
       ],
     };
 
-    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
+    const { plans } = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
     const eventsFile = plans.find((p) => p.outputPath.endsWith('notify-barber-of-new-booking/events.ts'));
 
     expect(eventsFile?.contents).toMatchInlineSnapshot(`

package/src/codegen/templates/react/register.specs.ts

@@ -228,7 +228,7 @@ describe('register.ts.ejs (react slice)', () => {
       ],
     };
 
-    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
+    const { plans } = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
     const registerFile = plans.find((p) => p.outputPath.endsWith('send-notification-to-host/register.ts'));
 
     expect(registerFile?.contents).toMatchInlineSnapshot(`

package/src/commands/generate-server.ts

@@ -7,7 +7,11 @@ import type { Model, Narrative, Slice } from '@auto-engineer/narrative';
 import createDebug from 'debug';
 import { execa } from 'execa';
 import fs from 'fs-extra';
-import { generateScaffoldFilePlans, writeScaffoldFilePlans } from '../codegen/scaffoldFromSchema';
+import {
+  type DuplicateCommandInfo,
+  generateScaffoldFilePlans,
+  writeScaffoldFilePlans,
+} from '../codegen/scaffoldFromSchema';
 import { ensureDirExists, ensureDirPath, toKebabCase } from '../codegen/utils/path';
 
 const debug = createDebug('auto:server-generator-apollo-emmett');
@@ -88,7 +92,21 @@ export type SliceGeneratedEvent = Event<
   }
 >;
 
-export type GenerateServerEvents = ServerGeneratedEvent | ServerGenerationFailedEvent | SliceGeneratedEvent;
+export type SliceGenerationFailedEvent = Event<
+  'SliceGenerationFailed',
+  {
+    flowName: string;
+    sliceName: string;
+    sliceType: string;
+    error: string;
+  }
+>;
+
+export type GenerateServerEvents =
+  | ServerGeneratedEvent
+  | ServerGenerationFailedEvent
+  | SliceGeneratedEvent
+  | SliceGenerationFailedEvent;
 
 export const commandHandler = defineCommandHandler({
   name: 'GenerateServer',
@@ -101,6 +119,7 @@ export const commandHandler = defineCommandHandler({
     { name: 'ServerGenerated', displayName: 'Server Generated' },
     { name: 'ServerGenerationFailed', displayName: 'Server Generation Failed' },
     { name: 'SliceGenerated', displayName: 'Slice Generated' },
+    { name: 'SliceGenerationFailed', displayName: 'Slice Generation Failed' },
   ],
   fields: {
     model: {
@@ -173,13 +192,17 @@ async function cleanStaleCompiledFiles(serverDir: string): Promise<void> {
   debugScaffold('  Cleanup completed');
 }
 
-async function generateAndWriteScaffold(spec: Model, serverDir: string, affectedSliceIds?: Set<string>): Promise<void> {
+async function generateAndWriteScaffold(
+  spec: Model,
+  serverDir: string,
+  affectedSliceIds?: Set<string>,
+): Promise<DuplicateCommandInfo[]> {
   const domainFlowsPath = join(serverDir, 'src', 'domain', 'flows');
   debugScaffold('Generating scaffold file plans');
   debugScaffold('  Domain flows path: %s', domainFlowsPath);
   debugScaffold('  Number of flows: %d', spec.narratives?.length || 0);
 
-  const filePlans = await generateScaffoldFilePlans(
+  const { plans: filePlans, duplicateCommands } = await generateScaffoldFilePlans(
     spec.narratives,
     spec.messages,
     spec.integrations,
@@ -199,6 +222,8 @@ async function generateAndWriteScaffold(spec: Model, serverDir: string, affected
   debugScaffold('Written all scaffold files');
 
   await cleanStaleCompiledFiles(serverDir);
+
+  return duplicateCommands;
 }
 
 async function copyAllFiles(serverDir: string): Promise<void> {
@@ -313,11 +338,50 @@ export function createSliceGeneratedEvent(
   };
 }
 
+export function emitSliceGenerationFailedForDuplicates(
+  duplicateCommands: DuplicateCommandInfo[],
+  spec: Model,
+  command: GenerateServerCommand,
+  events: GenerateServerEvents[],
+): void {
+  for (const dup of duplicateCommands) {
+    for (const flow of spec.narratives) {
+      for (const slice of flow.slices) {
+        if (slice.type !== 'command') continue;
+        const gwtSpecs = slice.server?.specs;
+        if (!Array.isArray(gwtSpecs)) continue;
+        const hasCommand = gwtSpecs.some((spec) =>
+          spec.rules?.some((rule) =>
+            rule.examples?.some((ex) => ex.steps?.some((step) => step.keyword === 'When' && step.text === dup.command)),
+          ),
+        );
+        if (hasCommand && (flow.name !== dup.existingFlow || slice.name !== dup.existingSlice)) {
+          const event: SliceGenerationFailedEvent = {
+            type: 'SliceGenerationFailed',
+            data: {
+              flowName: flow.name,
+              sliceName: slice.name,
+              sliceType: slice.type,
+              error: `Duplicate command handler: '${dup.command}' is already registered in ${dup.existingFlow}/${dup.existingSlice}`,
+            },
+            timestamp: new Date(),
+            requestId: command.requestId,
+            correlationId: command.correlationId,
+          };
+          events.push(event);
+          debug('SliceGenerationFailed: %s.%s - duplicate command %s', flow.name, slice.name, dup.command);
+        }
+      }
+    }
+  }
+}
+
 // biome-ignore lint/complexity/noExcessiveCognitiveComplexity: nested iteration over model structure is inherent to the task
 export function emitSliceGeneratedForAll(
   spec: Model,
   command: GenerateServerCommand,
   events: GenerateServerEvents[],
+  duplicateCommands: DuplicateCommandInfo[] = [],
 ): void {
   if (Array.isArray(spec.narratives) && spec.narratives.length > 0) {
     for (const flow of spec.narratives) {
@@ -330,6 +394,7 @@ export function emitSliceGeneratedForAll(
       }
     }
   }
+  emitSliceGenerationFailedForDuplicates(duplicateCommands, spec, command, events);
 }
 
 export function emitSliceGeneratedForAffected(
@@ -337,6 +402,7 @@ export function emitSliceGeneratedForAffected(
   affectedIds: Set<string>,
   command: GenerateServerCommand,
   events: GenerateServerEvents[],
+  duplicateCommands: DuplicateCommandInfo[] = [],
 ): void {
   for (const flow of spec.narratives) {
     for (const slice of flow.slices) {
@@ -348,6 +414,7 @@ export function emitSliceGeneratedForAffected(
       }
     }
   }
+  emitSliceGenerationFailedForDuplicates(duplicateCommands, spec, command, events);
 }
 
 export async function handleGenerateServerCommandInternal(
@@ -379,8 +446,8 @@ export async function handleGenerateServerCommandInternal(
       debug('Full generation mode');
       await cleanServerDir(serverDir);
       await copyAllFiles(serverDir);
-      await generateAndWriteScaffold(spec, serverDir);
-      emitSliceGeneratedForAll(spec, command, events);
+      const duplicateCommands = await generateAndWriteScaffold(spec, serverDir);
+      emitSliceGeneratedForAll(spec, command, events, duplicateCommands);
       await writeConfigurationFiles(serverDir, absDest);
       debugDeps('Installing dependencies and generating GraphQL schema...');
       await installDependenciesAndGenerateSchema(serverDir, absDest);
@@ -399,8 +466,8 @@ export async function handleGenerateServerCommandInternal(
       await copyAllFiles(serverDir);
 
       const affectedIds = new Set(changeSet.allAffected);
-      await generateAndWriteScaffold(spec, serverDir, affectedIds);
-      emitSliceGeneratedForAffected(spec, affectedIds, command, events);
+      const duplicateCommands = await generateAndWriteScaffold(spec, serverDir, affectedIds);
+      emitSliceGeneratedForAffected(spec, affectedIds, command, events, duplicateCommands);
       await writeConfigurationFiles(serverDir, absDest);
       debugDeps('Installing dependencies and generating GraphQL schema...');
       await installDependenciesAndGenerateSchema(serverDir, absDest);