@auto-engineer/server-generator-apollo-emmett 0.11.9 → 0.11.11

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

@@ -1,12 +1,12 @@
 import { describe, it, expect } from 'vitest';
 import { generateScaffoldFilePlans } from '../../scaffoldFromSchema';
-import { Model as SpecsSchema } from '@auto-engineer/flow';
+import { Model as SpecsSchema } from '@auto-engineer/narrative';
 
 describe('state.ts.ejs', () => {
   it('should generate a valid state definition file for a query slice with a state message', async () => {
     const spec: SpecsSchema = {
       variant: 'specs',
-      flows: [
+      narratives: [
         {
           name: 'Inventory management',
           slices: [
@@ -52,7 +52,7 @@ describe('state.ts.ejs', () => {
       ],
     };
 
-    const plans = await generateScaffoldFilePlans(spec.flows, 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

@@ -1,12 +1,12 @@
 import { describe, it, expect } from 'vitest';
-import { Model as SpecsSchema } from '@auto-engineer/flow';
+import { Model as SpecsSchema } from '@auto-engineer/narrative';
 import { generateScaffoldFilePlans } from '../../scaffoldFromSchema';
 
 describe('react.specs.ts.ejs (react slice)', () => {
   it('should generate correct react.specs.ts', async () => {
     const spec: SpecsSchema = {
       variant: 'specs',
-      flows: [
+      narratives: [
         {
           name: 'manage bookings',
           slices: [
@@ -161,7 +161,7 @@ describe('react.specs.ts.ejs (react slice)', () => {
       ],
     };
 
-    const plans = await generateScaffoldFilePlans(spec.flows, 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(`

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

@@ -1,12 +1,12 @@
 import { describe, it, expect } from 'vitest';
-import { Model as SpecsSchema } from '@auto-engineer/flow';
+import { Model as SpecsSchema } from '@auto-engineer/narrative';
 import { generateScaffoldFilePlans } from '../../scaffoldFromSchema';
 
 describe('handle.ts.ejs (react slice)', () => {
   it('should generate correct react.ts', async () => {
     const spec: SpecsSchema = {
       variant: 'specs',
-      flows: [
+      narratives: [
         {
           name: 'manage bookings',
           slices: [
@@ -215,7 +215,7 @@ describe('handle.ts.ejs (react slice)', () => {
       ],
     };
 
-    const plans = await generateScaffoldFilePlans(spec.flows, 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(`

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

@@ -1,5 +1,4 @@
 <%
-// Extract the first example from specs/rules structure
 const specs = slice.server?.specs;
 const firstExample = specs?.rules?.flatMap(rule => rule.examples)[0] ?? null;
 const gwt = firstExample ? {

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

@@ -1,12 +1,12 @@
 import { describe, it, expect } from 'vitest';
-import { Model as SpecsSchema } from '@auto-engineer/flow';
+import { Model as SpecsSchema } from '@auto-engineer/narrative';
 import { generateScaffoldFilePlans } from '../../scaffoldFromSchema';
 
 describe('register.ts.ejs (react slice)', () => {
   it('should generate correct register.ts', async () => {
     const spec: SpecsSchema = {
       variant: 'specs',
-      flows: [
+      narratives: [
         {
           name: 'manage bookings',
           slices: [
@@ -215,7 +215,7 @@ describe('register.ts.ejs (react slice)', () => {
       ],
     };
 
-    const plans = await generateScaffoldFilePlans(spec.flows, 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/codegen/templates/react/register.ts.ejs

@@ -1,5 +1,4 @@
 <%
-// Extract the first example from specs/rules structure
 const specs = slice.server?.specs;
 const firstExample = specs?.rules?.flatMap(rule => rule.examples)[0] ?? null;
 const gwt = firstExample ? {

package/src/codegen/test-data/specVariant1.ts

@@ -1,8 +1,8 @@
-import { Model as SpecsSchema } from '@auto-engineer/flow';
+import { Model as SpecsSchema } from '@auto-engineer/narrative';
 
 const specVariant1: SpecsSchema = {
   variant: 'specs',
-  flows: [
+  narratives: [
     {
       name: 'Add item',
       description: 'Flow to add items to a system',

package/src/codegen/types.ts

@@ -1,4 +1,4 @@
-import { CommandExample, EventExample, StateExample } from '@auto-engineer/flow';
+import { CommandExample, EventExample, StateExample } from '@auto-engineer/narrative';
 
 export interface Message {
   type: string;

package/src/commands/generate-server.ts

@@ -1,4 +1,3 @@
-import 'reflect-metadata';
 import fs from 'fs-extra';
 import * as path from 'path';
 import { readFile, writeFile } from 'fs/promises';
@@ -6,7 +5,7 @@ import { resolve, join } from 'path';
 import { existsSync } from 'fs';
 import { generateScaffoldFilePlans, writeScaffoldFilePlans } from '../codegen/scaffoldFromSchema';
 import { ensureDirExists, ensureDirPath, toKebabCase } from '../codegen/utils/path';
-import { Model } from '@auto-engineer/flow';
+import { Model } from '@auto-engineer/narrative';
 import { fileURLToPath } from 'url';
 import { dirname } from 'path';
 import { execa } from 'execa';
@@ -124,7 +123,7 @@ async function readAndParseModel(absModel: string): Promise<Model> {
   const spec = JSON.parse(content) as Model;
 
   debugModel('Parsed model:');
-  debugModel('  Flows: %d', spec.flows?.length || 0);
+  debugModel('  Flows: %d', spec.narratives?.length || 0);
   debugModel('  Messages: %d', spec.messages?.length || 0);
   debugModel('  Integrations: %d', spec.integrations?.length ?? 0);
 
@@ -133,12 +132,12 @@ async function readAndParseModel(absModel: string): Promise<Model> {
 }
 
 function logFlowDetails(spec: Model): void {
-  if (spec.flows !== undefined && spec.flows.length > 0) {
+  if (spec.narratives !== undefined && spec.narratives.length > 0) {
     debugModel(
       'Flow names: %o',
-      spec.flows.map((f) => f.name),
+      spec.narratives.map((f) => f.name),
     );
-    spec.flows.forEach((flow) => {
+    spec.narratives.forEach((flow) => {
       debugModel('  Flow "%s" has %d slices', flow.name, flow.slices?.length || 0);
       flow.slices?.forEach((slice) => {
         debugModel('    Slice: %s (type: %s)', slice.name, slice.type);
@@ -147,13 +146,40 @@ function logFlowDetails(spec: Model): void {
   }
 }
 
+async function cleanStaleCompiledFiles(serverDir: string): Promise<void> {
+  const sharedTypesDir = join(serverDir, 'src', 'domain', 'shared');
+  debugScaffold('Cleaning stale compiled files from %s', sharedTypesDir);
+
+  if (!(await fs.pathExists(sharedTypesDir))) {
+    debugScaffold('  Shared types directory does not exist, skipping cleanup');
+    return;
+  }
+
+  const files = await fs.readdir(sharedTypesDir);
+  const staleFiles = files.filter((file) => file.endsWith('.js') || file.endsWith('.d.ts') || file.endsWith('.js.map'));
+
+  if (staleFiles.length === 0) {
+    debugScaffold('  No stale compiled files found');
+    return;
+  }
+
+  debugScaffold('  Found %d stale compiled files to remove', staleFiles.length);
+  for (const file of staleFiles) {
+    const filePath = join(sharedTypesDir, file);
+    await fs.remove(filePath);
+    debugScaffold('    Removed: %s', file);
+  }
+
+  debugScaffold('  Cleanup completed');
+}
+
 async function generateAndWriteScaffold(spec: Model, serverDir: string): Promise<void> {
   const domainFlowsPath = join(serverDir, 'src', 'domain', 'flows');
   debugScaffold('Generating scaffold file plans');
   debugScaffold('  Domain flows path: %s', domainFlowsPath);
-  debugScaffold('  Number of flows: %d', spec.flows?.length || 0);
+  debugScaffold('  Number of flows: %d', spec.narratives?.length || 0);
 
-  const filePlans = await generateScaffoldFilePlans(spec.flows, spec.messages, spec.integrations, domainFlowsPath);
+  const filePlans = await generateScaffoldFilePlans(spec.narratives, spec.messages, spec.integrations, domainFlowsPath);
 
   debugScaffold('Generated %d file plans', filePlans.length);
   if (filePlans.length > 0) {
@@ -165,6 +191,8 @@ async function generateAndWriteScaffold(spec: Model, serverDir: string): Promise
 
   await writeScaffoldFilePlans(filePlans);
   debugScaffold('Written all scaffold files');
+
+  await cleanStaleCompiledFiles(serverDir);
 }
 
 async function copyAllFiles(serverDir: string): Promise<void> {
@@ -257,13 +285,19 @@ export async function handleGenerateServerCommandInternal(
     debug('Server directory: %s', serverDir);
     debug('🔄 Generating server... %s', serverDir);
 
+    debug('Clearing existing server directory if it exists');
+    await fs.remove(serverDir);
+    debug('Server directory cleared');
+
     await ensureDirExists(serverDir);
     debugFiles('Created server directory: %s', serverDir);
 
+    await copyAllFiles(serverDir);
+
     await generateAndWriteScaffold(spec, serverDir);
 
-    if (Array.isArray(spec.flows) && spec.flows.length > 0) {
-      for (const flow of spec.flows) {
+    if (Array.isArray(spec.narratives) && spec.narratives.length > 0) {
+      for (const flow of spec.narratives) {
         if (Array.isArray(flow.slices) && flow.slices.length > 0) {
           for (const slice of flow.slices) {
             if (slice.type === 'experience') continue; // skip experience slices
@@ -287,9 +321,6 @@ export async function handleGenerateServerCommandInternal(
       }
     }
 
-    // Copy files
-    await copyAllFiles(serverDir);
-
     // Write configuration files
     await writeConfigurationFiles(serverDir, absDest);
 
@@ -348,7 +379,16 @@ async function copySharedAndRootFiles(from: string, to: string): Promise<void> {
   const sharedFrom = path.join(from, 'shared');
   const sharedTo = path.join(to, 'shared');
   if (await fs.pathExists(sharedFrom)) {
-    await fs.copy(sharedFrom, sharedTo);
+    await fs.ensureDir(sharedTo);
+    const sharedFiles = await fs.readdir(sharedFrom);
+    for (const file of sharedFiles) {
+      if (file.endsWith('.ts')) {
+        const srcFile = path.join(sharedFrom, file);
+        const destFile = path.join(sharedTo, file);
+        await fs.copy(srcFile, destFile);
+        debugFiles('  Copied shared file: %s', file);
+      }
+    }
   }
   await fs.ensureDir(to);
   const rootFiles = await fs.readdir(from);
@@ -529,27 +569,16 @@ async function installDependenciesAndGenerateSchema(serverDir: string, workingDi
   debugDeps('Starting dependency installation in %s', serverDir);
   debugDeps('Hint: You can debug by manually running: cd server && pnpm install && npx tsx scripts/generate-schema.ts');
 
-  try {
-    debugDeps('Running pnpm install');
-    await execa('pnpm', ['install', '--ignore-workspace'], { cwd: serverDir });
-    debugDeps('Dependencies installed successfully');
-  } catch (error) {
-    debugDeps('Failed to pnpm install: %s', error instanceof Error ? error.message : 'Unknown error');
-  }
+  debugDeps('Running pnpm install');
+  await execa('pnpm', ['install', '--ignore-workspace'], { cwd: serverDir });
+  debugDeps('Dependencies installed successfully');
 
-  try {
-    debugDeps('Generating GraphQL schema...');
-    debugDeps('Running: tsx scripts/generate-schema.ts', serverDir + '/scripts/generate-schema.ts');
-    await execa('tsx', ['scripts/generate-schema.ts'], { cwd: serverDir });
-    const schemaPath = join(workingDir, '.context', 'schema.graphql');
-    debugDeps('GraphQL schema generated at: %s', schemaPath);
-  } catch (error) {
-    debugDeps(
-      'Failed to run tsx scripts/generate-schema.ts: %s',
-      error instanceof Error ? error.message : 'Unknown error',
-    );
-  }
+  debugDeps('Generating GraphQL schema...');
+  debugDeps('Running: npx tsx scripts/generate-schema.ts');
+  const result = await execa('npx', ['tsx', 'scripts/generate-schema.ts'], { cwd: serverDir });
+  debugDeps('Schema generation output: %s', result.stdout);
+  const schemaPath = join(workingDir, '.context', 'schema.graphql');
+  debugDeps('GraphQL schema generated at: %s', schemaPath);
 }
 
-// Default export is the command handler
 export default commandHandler;

package/src/domain/shared/graphql-types.ts

@@ -0,0 +1,20 @@
+import 'reflect-metadata';
+import { Field, ObjectType } from 'type-graphql';
+
+@ObjectType()
+export class MutationError {
+  @Field(() => String)
+  type!: string;
+
+  @Field(() => String, { nullable: true })
+  message?: string;
+}
+
+@ObjectType()
+export class MutationResponse {
+  @Field(() => Boolean)
+  success!: boolean;
+
+  @Field(() => MutationError, { nullable: true })
+  error?: MutationError;
+}

package/src/domain/shared/index.ts

@@ -1,4 +1,5 @@
 export * from './types';
+export * from './graphql-types';
 export * from './ReadModel';
 export * from './reactorSpecification';
 export * from './sendCommand';

package/src/domain/shared/sendCommand.ts

@@ -1,5 +1,5 @@
 import type { Command, CommandSender } from '@event-driven-io/emmett';
-import type { MutationResponse } from './types';
+import type { MutationResponse } from './graphql-types';
 
 export async function sendCommand<T extends Command>(
   commandSender: CommandSender,

package/src/domain/shared/types.ts

@@ -1,5 +1,7 @@
+import { registerEnumType } from 'type-graphql';
+
+import 'reflect-metadata';
 import { CommandSender, EventStore, type InMemoryDatabase } from '@event-driven-io/emmett';
-import { Field, ObjectType } from 'type-graphql';
 
 export interface ReactorContext {
   eventStore: EventStore;
@@ -14,20 +16,12 @@ export interface GraphQLContext {
   database: InMemoryDatabase;
 }
 
-@ObjectType()
-export class MutationError {
-  @Field(() => String)
-  type!: string;
-
-  @Field(() => String, { nullable: true })
-  message?: string;
+export enum QuestionnaireProgressStatus {
+  IN_PROGRESS = 'in_progress',
+  READY_TO_SUBMIT = 'ready_to_submit',
+  SUBMITTED = 'submitted',
 }
 
-@ObjectType()
-export class MutationResponse {
-  @Field(() => Boolean)
-  success!: boolean;
-
-  @Field(() => MutationError, { nullable: true })
-  error?: MutationError;
-}
+registerEnumType(QuestionnaireProgressStatus, {
+  name: 'QuestionnaireProgressStatus',
+});