@auto-engineer/server-generator-apollo-emmett 1.63.0 → 1.64.0

package/ketchup-plan.md

@@ -1,9 +1,7 @@
-# Ketchup Plan: `{exercise:string: number}` — malformed map type crashes Prettier
+# Ketchup Plan: Fix stale enums in shared/types.ts
 
 ## TODO
 
 ## DONE
 
-- [x] Burst 1: `sanitizeFieldType` helper + tests (a90a25a2)
-- [x] Burst 2: Refactor `SkippedFieldInfo` → `FieldIssue` (da36c911)
-- [x] Burst 3: Wire `sanitizeFieldType` + emit event for sanitized types (ba39eefe)
+- [x] Burst 1: Replace appendEnumsToSharedTypes with from-scratch buildSharedTypesContent + writeSharedTypes + tests [depends: none] (4bc755b4)

package/package.json

@@ -32,8 +32,8 @@
     "uuid": "^11.0.0",
     "web-streams-polyfill": "^4.1.0",
     "zod": "^3.22.4",
-    "@auto-engineer/narrative": "1.63.0",
-    "@auto-engineer/message-bus": "1.63.0"
+    "@auto-engineer/narrative": "1.64.0",
+    "@auto-engineer/message-bus": "1.64.0"
   },
   "publishConfig": {
     "access": "public"
@@ -44,9 +44,9 @@
     "typescript": "^5.8.3",
     "vitest": "^3.2.4",
     "tsx": "^4.19.2",
-    "@auto-engineer/cli": "1.63.0"
+    "@auto-engineer/cli": "1.64.0"
   },
-  "version": "1.63.0",
+  "version": "1.64.0",
   "scripts": {
     "generate:server": "tsx src/cli/index.ts",
     "build": "tsc && tsx ../../scripts/fix-esm-imports.ts && rm -rf dist/src/codegen/templates && mkdir -p dist/src/codegen && cp -r src/codegen/templates dist/src/codegen/templates && cp src/server.ts dist/src && cp -r src/utils dist/src && cp -r src/domain dist/src",

package/src/codegen/buildSharedTypesContent.specs.ts

@@ -0,0 +1,89 @@
+import { describe, expect, it } from 'vitest';
+import { buildSharedTypesContent, type EnumDefinition } from './scaffoldFromSchema';
+
+const SHARED_TYPES_BASE = `import 'reflect-metadata';
+import type { CommandSender, EventStore, InMemoryDatabase } from '@event-driven-io/emmett';
+
+export interface ReactorContext {
+  eventStore: EventStore;
+  commandSender: CommandSender;
+  database: InMemoryDatabase;
+  [key: string]: unknown;
+}
+
+export interface GraphQLContext {
+  eventStore: EventStore;
+  messageBus: CommandSender;
+  database: InMemoryDatabase;
+}`;
+
+describe('buildSharedTypesContent', () => {
+  it('returns base template with no enum imports when enums is empty', () => {
+    const result = buildSharedTypesContent([]);
+
+    expect(result).toEqual(`${SHARED_TYPES_BASE}\n`);
+  });
+
+  it('includes registerEnumType import and enum code for a single enum', () => {
+    const enums: EnumDefinition[] = [
+      { name: 'Status', values: ['active', 'inactive'], unionString: "'active' | 'inactive'" },
+    ];
+
+    const result = buildSharedTypesContent(enums);
+
+    expect(result).toEqual(`import { registerEnumType } from 'type-graphql';
+
+${SHARED_TYPES_BASE}
+
+export enum Status {
+  ACTIVE = 'active',
+  INACTIVE = 'inactive',
+}
+
+registerEnumType(Status, {
+  name: 'Status',
+});
+`);
+  });
+
+  it('includes all enums when given multiple enum definitions', () => {
+    const enums: EnumDefinition[] = [
+      { name: 'Status', values: ['active', 'inactive'], unionString: "'active' | 'inactive'" },
+      { name: 'Priority', values: ['low', 'high'], unionString: "'high' | 'low'" },
+    ];
+
+    const result = buildSharedTypesContent(enums);
+
+    expect(result).toEqual(`import { registerEnumType } from 'type-graphql';
+
+${SHARED_TYPES_BASE}
+
+export enum Status {
+  ACTIVE = 'active',
+  INACTIVE = 'inactive',
+}
+
+registerEnumType(Status, {
+  name: 'Status',
+});
+
+export enum Priority {
+  LOW = 'low',
+  HIGH = 'high',
+}
+
+registerEnumType(Priority, {
+  name: 'Priority',
+});
+`);
+  });
+
+  it('produces identical output for the same input across multiple calls', () => {
+    const enums: EnumDefinition[] = [{ name: 'Color', values: ['red', 'blue'], unionString: "'blue' | 'red'" }];
+
+    const first = buildSharedTypesContent(enums);
+    const second = buildSharedTypesContent(enums);
+
+    expect(first).toEqual(second);
+  });
+});

package/src/codegen/scaffoldFromSchema.ts

@@ -59,7 +59,7 @@ const defaultFilesByType: Record<string, string[]> = {
   react: ['events.ts.ejs', 'react.ts.ejs', 'react.specs.ts.ejs', 'register.ts.ejs'],
 };
 
-interface EnumDefinition {
+export interface EnumDefinition {
   name: string;
   values: string[];
   unionString: string;
@@ -188,64 +188,38 @@ registerEnumType(${enumDef.name}, {
 });`;
 }
 
-async function appendEnumsToSharedTypes(baseDir: string, enums: EnumDefinition[]): Promise<void> {
-  if (enums.length === 0) return;
+const SHARED_TYPES_BASE = `import 'reflect-metadata';
+import type { CommandSender, EventStore, InMemoryDatabase } from '@event-driven-io/emmett';
 
-  const sharedTypesPath = path.join(baseDir, 'shared', 'types.ts');
-
-  let existingContent = '';
-  try {
-    existingContent = await fs.readFile(sharedTypesPath, 'utf8');
-  } catch {
-    debug('Types file does not exist yet at %s, will create it', sharedTypesPath);
-  }
+export interface ReactorContext {
+  eventStore: EventStore;
+  commandSender: CommandSender;
+  database: InMemoryDatabase;
+  [key: string]: unknown;
+}
 
-  const enumsToAdd = enums.filter((e) => {
-    const enumPattern = new RegExp(`export\\s+enum\\s+${e.name}\\s*\\{`, 'm');
-    return !enumPattern.test(existingContent);
-  });
+export interface GraphQLContext {
+  eventStore: EventStore;
+  messageBus: CommandSender;
+  database: InMemoryDatabase;
+}`;
 
-  if (enumsToAdd.length === 0) {
-    debug('All enums already exist in %s, skipping', sharedTypesPath);
-    return;
+export function buildSharedTypesContent(enums: EnumDefinition[]): string {
+  if (enums.length === 0) {
+    return `${SHARED_TYPES_BASE}\n`;
   }
 
-  debug('Adding %d new enums to %s', enumsToAdd.length, sharedTypesPath);
-
-  const hasRegisterEnumImport = existingContent.includes('registerEnumType');
-  const enumCode = enumsToAdd.map((e) => generateEnumTypeScript(e)).join('\n\n');
-
-  let newContent: string;
-  if (hasRegisterEnumImport) {
-    newContent = `${existingContent.trimEnd()}\n\n${enumCode}\n`;
-  } else {
-    const importMatch = existingContent.match(/^([\s\S]*?)(import.*from\s+['"]type-graphql['"];?\s*\n)/m);
-    if (importMatch !== null) {
-      const beforeImport = importMatch[1];
-      const typeGraphqlImport = importMatch[2];
-      const afterImport = existingContent.slice(beforeImport.length + typeGraphqlImport.length);
-
-      const updatedImport = typeGraphqlImport.replace(
-        /^import\s*\{([^}]*)\}\s*from\s*['"]type-graphql['"];?\s*$/m,
-        (_match: string, imports: string): string => {
-          const importsList = imports
-            .split(',')
-            .map((s) => s.trim())
-            .filter((item) => item.length > 0);
-          if (!importsList.includes('registerEnumType')) {
-            importsList.push('registerEnumType');
-          }
-          return `import { ${importsList.join(', ')} } from 'type-graphql';`;
-        },
-      );
+  const enumCode = enums.map((e) => generateEnumTypeScript(e)).join('\n\n');
+  return `import { registerEnumType } from 'type-graphql';\n\n${SHARED_TYPES_BASE}\n\n${enumCode}\n`;
+}
 
-      newContent = `${beforeImport}${updatedImport}${afterImport.trimEnd()}\n\n${enumCode}\n`;
-    } else {
-      newContent = `import { registerEnumType } from 'type-graphql';\n\n${existingContent.trimEnd()}\n\n${enumCode}\n`;
-    }
-  }
+async function writeSharedTypes(baseDir: string, enums: EnumDefinition[]): Promise<void> {
+  const sharedTypesPath = path.join(baseDir, 'shared', 'types.ts');
+  debug('Writing shared types to %s with %d enums', sharedTypesPath, enums.length);
+
+  const content = buildSharedTypesContent(enums);
 
-  const formatted = await prettier.format(newContent, {
+  const formatted = await prettier.format(content, {
     parser: 'typescript',
     filepath: sharedTypesPath,
     singleQuote: true,
@@ -256,7 +230,6 @@ async function appendEnumsToSharedTypes(baseDir: string, enums: EnumDefinition[]
 
   await fs.mkdir(path.dirname(sharedTypesPath), { recursive: true });
   await fs.writeFile(sharedTypesPath, formatted, 'utf8');
-  debug('Appended %d enums to %s', enums.length, sharedTypesPath);
 }
 
 export interface FilePlan {
@@ -878,7 +851,7 @@ export async function generateScaffoldFilePlans(
   debug('  Extracted %d enums from messages', enums.length);
 
   const domainBaseDir = baseDir.replace(/\/flows$/, '');
-  await appendEnumsToSharedTypes(domainBaseDir, enums);
+  await writeSharedTypes(domainBaseDir, enums);
 
   const allPlans: FilePlan[] = [];
   const allDuplicateCommands: DuplicateCommandInfo[] = [];

package/src/domain/shared/types.ts

@@ -1,5 +1,3 @@
-import { registerEnumType } from 'type-graphql';
-
 import 'reflect-metadata';
 import type { CommandSender, EventStore, InMemoryDatabase } from '@event-driven-io/emmett';
 
@@ -15,13 +13,3 @@ export interface GraphQLContext {
   messageBus: CommandSender;
   database: InMemoryDatabase;
 }
-
-export enum QuestionnaireProgressStatus {
-  IN_PROGRESS = 'in_progress',
-  READY_TO_SUBMIT = 'ready_to_submit',
-  SUBMITTED = 'submitted',
-}
-
-registerEnumType(QuestionnaireProgressStatus, {
-  name: 'QuestionnaireProgressStatus',
-});