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

package/src/codegen/templates/command/commands.ts.ejs

@@ -1,11 +1,16 @@
-import { Command } from "@event-driven-io/emmett";
+<%
+const enumList = collectEnumNames(commands.flatMap(c => c.fields));
+%>import { Command } from "@event-driven-io/emmett";
+<% if (enumList.length > 0) { -%>
+import { <%= enumList.join(', ') %> } from '../../../shared';
+<% } -%>
 <% for (const command of commands) { -%>
-    export type <%= pascalCase(command.type) %> = Command<
-    '<%= command.type %>',
-    {
-    <% for (const field of command.fields) { -%>
-        <%- field.name %>: <%- field.tsType %>;
-    <% } -%>
-    }
-    >;
+export type <%= pascalCase(command.type) %> = Command<
+  '<%= command.type %>',
+  {
+  <% for (const field of command.fields) { -%>
+    <%- field.name %>: <%- toTsFieldType(field.tsType) %>;
+  <% } -%>
+  }
+>;
 <% } -%>

package/src/codegen/templates/command/decide.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('spec.ts.ejs', () => {
   it('should generate a valid spec file', async () => {
     const spec: SpecsSchema = {
       variant: 'specs',
-      flows: [
+      narratives: [
         {
           name: 'Host creates a listing',
           slices: [
@@ -91,66 +91,66 @@ describe('spec.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 specFile = plans.find((p) => p.outputPath.endsWith('specs.ts'));
 
     expect(specFile?.contents).toMatchInlineSnapshot(`
-          "import { describe, it } from 'vitest';
-          import { DeciderSpecification } from '@event-driven-io/emmett';
-          import { decide } from './decide';
-          import { evolve } from './evolve';
-          import { initialState, State } from './state';
-          import type { ListingCreated } from './events';
-          import type { CreateListing } from './commands';
+      "import { describe, it } from 'vitest';
+      import { DeciderSpecification } from '@event-driven-io/emmett';
+      import { decide } from './decide';
+      import { evolve } from './evolve';
+      import { initialState, State } from './state';
+      import type { ListingCreated } from './events';
+      import type { CreateListing } from './commands';
 
-          describe('Should create listing successfully', () => {
-            type Events = ListingCreated;
+      describe('Should create listing successfully', () => {
+        type Events = ListingCreated;
 
-            const given = DeciderSpecification.for<CreateListing, Events, State>({
-              decide,
-              evolve,
-              initialState,
-            });
+        const given = DeciderSpecification.for<CreateListing, Events, State>({
+          decide,
+          evolve,
+          initialState,
+        });
 
-            it('User creates listing with valid data', () => {
-              given([])
-                .when({
-                  type: 'CreateListing',
-                  data: {
-                    propertyId: 'listing_123',
-                    title: 'blah',
-                    pricePerNight: 250,
-                    maxGuests: 4,
-                    amenities: ['wifi', 'kitchen'],
-                    available: true,
-                    tags: ['some tag'],
-                    rating: 4.8,
-                    metadata: { foo: 'bar' },
-                    listedAt: new Date('2024-01-15T10:00:00Z'),
-                  },
-                  metadata: { now: new Date() },
-                })
+        it('User creates listing with valid data', () => {
+          given([])
+            .when({
+              type: 'CreateListing',
+              data: {
+                propertyId: 'listing_123',
+                title: 'blah',
+                pricePerNight: 250,
+                maxGuests: 4,
+                amenities: ['wifi', 'kitchen'],
+                available: true,
+                tags: ['some tag'],
+                rating: 4.8,
+                metadata: { foo: 'bar' },
+                listedAt: new Date('2024-01-15T10:00:00Z'),
+              },
+              metadata: { now: new Date() },
+            })
 
-                .then([
-                  {
-                    type: 'ListingCreated',
-                    data: {
-                      propertyId: 'listing_123',
-                      listedAt: new Date('2024-01-15T10:00:00Z'),
-                      rating: 4.8,
-                      metadata: { foo: 'bar' },
-                    },
-                  },
-                ]);
-            });
-          });
-          "
-        `);
+            .then([
+              {
+                type: 'ListingCreated',
+                data: {
+                  propertyId: 'listing_123',
+                  listedAt: new Date('2024-01-15T10:00:00Z'),
+                  rating: 4.8,
+                  metadata: { foo: 'bar' },
+                },
+              },
+            ]);
+        });
+      });
+      "
+    `);
   });
   it('should include given events in the spec file when provided', async () => {
     const spec: SpecsSchema = {
       variant: 'specs',
-      flows: [
+      narratives: [
         {
           name: 'Guest removes a listing',
           slices: [
@@ -233,7 +233,7 @@ describe('spec.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 specFile = plans.find((p) => p.outputPath.endsWith('specs.ts'));
 
     expect(specFile?.contents).toMatchInlineSnapshot(`
@@ -292,7 +292,7 @@ describe('spec.ts.ejs', () => {
   it('should generate separate tests for multiple examples with different scenarios', async () => {
     const spec: SpecsSchema = {
       variant: 'specs',
-      flows: [
+      narratives: [
         {
           name: 'Questionnaires',
           slices: [
@@ -421,7 +421,7 @@ describe('spec.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 specFile = plans.find((p) => p.outputPath.endsWith('specs.ts'));
 
     expect(specFile?.contents).toMatchInlineSnapshot(`

package/src/codegen/templates/command/decide.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('decide.ts.ejs', () => {
   it('should generate a valid decide file when both command and event exist', async () => {
     const spec: SpecsSchema = {
       variant: 'specs',
-      flows: [
+      narratives: [
         {
           name: 'Host creates a listing',
           slices: [
@@ -72,7 +72,7 @@ describe('decide.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 decideFile = plans.find((p) => p.outputPath.endsWith('decide.ts'));
 
     expect(decideFile?.contents).toMatchInlineSnapshot(`
@@ -93,6 +93,7 @@ describe('decide.ts.ejs', () => {
              * - Validate the command input fields
              * - Inspect the current domain \`state\` to determine if the command is allowed
              * - If invalid, throw one of the following domain errors: \`NotFoundError\`, \`ValidationError\`, or \`IllegalStateError\`
+             *   ⚠️ Error constructors: NotFoundError takes { id, type, message? }, while IllegalStateError/ValidationError take string
              * - If valid, return one or more events with the correct structure
              *
              * ⚠️ Only read from inputs — never mutate them. \`evolve.ts\` handles state updates.
@@ -116,7 +117,7 @@ describe('decide.ts.ejs', () => {
   it('should include implementation instructions when prior events are required', async () => {
     const spec: SpecsSchema = {
       variant: 'specs',
-      flows: [
+      narratives: [
         {
           name: 'Host removes a listing',
           slices: [
@@ -197,7 +198,7 @@ describe('decide.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 decideFile = plans.find((p) => p.outputPath.endsWith('decide.ts'));
 
     expect(decideFile?.contents).toMatchInlineSnapshot(`
@@ -218,6 +219,7 @@ describe('decide.ts.ejs', () => {
              * - Validate the command input fields
              * - Inspect the current domain \`state\` to determine if the command is allowed
              * - If invalid, throw one of the following domain errors: \`NotFoundError\`, \`ValidationError\`, or \`IllegalStateError\`
+             *   ⚠️ Error constructors: NotFoundError takes { id, type, message? }, while IllegalStateError/ValidationError take string
              * - If valid, return one or more events with the correct structure
              *
              * ⚠️ Only read from inputs — never mutate them. \`evolve.ts\` handles state updates.
@@ -241,7 +243,7 @@ describe('decide.ts.ejs', () => {
   it('should generate a decide file that handles multiple GWTs including an error', async () => {
     const spec: SpecsSchema = {
       variant: 'specs',
-      flows: [
+      narratives: [
         {
           name: 'Host creates a listing',
           slices: [
@@ -337,7 +339,7 @@ describe('decide.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 decideFile = plans.find((p) => p.outputPath.endsWith('decide.ts'));
 
     expect(decideFile?.contents).toMatchInlineSnapshot(`
@@ -358,6 +360,7 @@ describe('decide.ts.ejs', () => {
              * - Validate the command input fields
              * - Inspect the current domain \`state\` to determine if the command is allowed
              * - If invalid, throw one of the following domain errors: \`NotFoundError\`, \`ValidationError\`, or \`IllegalStateError\`
+             *   ⚠️ Error constructors: NotFoundError takes { id, type, message? }, while IllegalStateError/ValidationError take string
              * - If valid, return one or more events with the correct structure
              *
              * ⚠️ Only read from inputs — never mutate them. \`evolve.ts\` handles state updates.
@@ -385,7 +388,7 @@ describe('decide.ts.ejs', () => {
   it('should include integration return type and usage in decide function', async () => {
     const spec: SpecsSchema = {
       variant: 'specs',
-      flows: [
+      narratives: [
         {
           name: 'Assistant suggests items',
           slices: [
@@ -522,7 +525,7 @@ describe('decide.ts.ejs', () => {
       ],
     };
 
-    const plans = await generateScaffoldFilePlans(spec.flows, spec.messages, spec.integrations);
+    const plans = await generateScaffoldFilePlans(spec.narratives, spec.messages, spec.integrations);
     const decideFile = plans.find((p) => p.outputPath.endsWith('decide.ts'));
 
     expect(decideFile?.contents).toMatchInlineSnapshot(`
@@ -545,6 +548,7 @@ describe('decide.ts.ejs', () => {
              * - Inspect the current domain \`state\` to determine if the command is allowed
              * - Use \`products\` (integration result) to enrich or filter the output
              * - If invalid, throw one of the following domain errors: \`NotFoundError\`, \`ValidationError\`, or \`IllegalStateError\`
+             *   ⚠️ Error constructors: NotFoundError takes { id, type, message? }, while IllegalStateError/ValidationError take string
              * - If valid, return one or more events with the correct structure
              *
              * ⚠️ Only read from inputs — never mutate them. \`evolve.ts\` handles state updates.

package/src/codegen/templates/command/decide.ts.ejs

@@ -71,6 +71,7 @@ case '<%= command %>': {
     * - Use `<%= camelCase(integrationReturnType) %>` (integration result) to enrich or filter the output
 <% } -%>
 * - If invalid, throw one of the following domain errors: `NotFoundError`, `ValidationError`, or `IllegalStateError`
+*   ⚠️ Error constructors: NotFoundError takes { id, type, message? }, while IllegalStateError/ValidationError take string
 * - If valid, return one or more events with the correct structure
 *
 * ⚠️ Only read from inputs — never mutate them. `evolve.ts` handles state updates.

package/src/codegen/templates/command/events.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('events.ts.ejs', () => {
   it('should generate an event file', async () => {
     const spec: SpecsSchema = {
       variant: 'specs',
-      flows: [
+      narratives: [
         {
           name: 'Host creates a listing',
           slices: [
@@ -93,7 +93,7 @@ describe('events.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 eventFile = plans.find((p) => p.outputPath.endsWith('events.ts'));
 
     expect(eventFile?.contents).toMatchInlineSnapshot(`

package/src/codegen/templates/command/events.ts.ejs

@@ -1,14 +1,17 @@
-<% if (localEvents.length) { -%>
-    import type { Event } from '@event-driven-io/emmett';
-
-    <% for (const event of localEvents) { -%>
-        export type <%= pascalCase(event.type) %> = Event<
-        '<%= event.type %>',
-        {
-        <% for (const field of event.fields) { -%>
-            <%- field.name %>: <%- field.tsType %>;
-        <% } -%>
-        }
-        >;
-    <% } -%>
+<%
+const enumList = collectEnumNames(localEvents.flatMap(e => e.fields));
+%><% if (localEvents.length) { -%>
+import type { Event } from '@event-driven-io/emmett';
+<% if (enumList.length > 0) { %>import { <%= enumList.join(', ') %> } from '../../../shared';
+<% } %>
+<% for (const event of localEvents) { -%>
+export type <%= pascalCase(event.type) %> = Event<
+  '<%= event.type %>',
+  {
+  <% for (const field of event.fields) { -%>
+    <%- field.name %>: <%- toTsFieldType(field.tsType) %>;
+  <% } -%>
+  }
+>;
+<% } -%>
 <% } -%>

package/src/codegen/templates/command/evolve.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('evolve.ts.ejs', () => {
   it('should generate a valid evolve file from event structure', async () => {
     const spec: SpecsSchema = {
       variant: 'specs',
-      flows: [
+      narratives: [
         {
           name: 'Host creates a listing',
           slices: [
@@ -72,7 +72,7 @@ describe('evolve.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 evolveFile = plans.find((p) => p.outputPath.endsWith('evolve.ts'));
 
     expect(evolveFile?.contents).toMatchInlineSnapshot(`

package/src/codegen/templates/command/handle.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('generateScaffoldFilePlans', () => {
   it('should generate a valid handle file', async () => {
     const spec: SpecsSchema = {
       variant: 'specs',
-      flows: [
+      narratives: [
         {
           name: 'Host creates a listing',
           slices: [
@@ -97,7 +97,7 @@ describe('generateScaffoldFilePlans', () => {
       ],
     };
 
-    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('handle.ts'));
 
     expect(handleFile?.contents).toMatchInlineSnapshot(`
@@ -131,7 +131,7 @@ describe('generateScaffoldFilePlans', () => {
   it('should generate a valid handle file with integration', async () => {
     const spec: SpecsSchema = {
       variant: 'specs',
-      flows: [
+      narratives: [
         {
           name: 'Assistant suggests items',
           slices: [
@@ -268,7 +268,12 @@ describe('generateScaffoldFilePlans', () => {
       ],
     };
 
-    const plans = await generateScaffoldFilePlans(spec.flows, spec.messages, spec.integrations, 'src/domain/flows');
+    const plans = await generateScaffoldFilePlans(
+      spec.narratives,
+      spec.messages,
+      spec.integrations,
+      'src/domain/flows',
+    );
     const handleFile = plans.find((p) => p.outputPath.endsWith('handle.ts'));
 
     expect(handleFile?.contents).toMatchInlineSnapshot(`

package/src/codegen/templates/command/mutation.resolver.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('mutation.resolver.ts.ejs', () => {
   it('should generate a valid mutation resolver file', async () => {
     const spec: SpecsSchema = {
       variant: 'specs',
-      flows: [
+      narratives: [
         {
           name: 'Host creates a listing',
           slices: [
@@ -72,7 +72,7 @@ describe('mutation.resolver.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 mutationFile = plans.find((p) => p.outputPath.endsWith('mutation.resolver.ts'));
 
     expect(mutationFile?.contents).toMatchInlineSnapshot(`
@@ -134,7 +134,7 @@ describe('mutation.resolver.ts.ejs', () => {
   it('should generate the mutation resolver for AnswerQuestion', async () => {
     const spec: SpecsSchema = {
       variant: 'specs',
-      flows: [
+      narratives: [
         {
           name: 'Questionnaires',
           slices: [
@@ -220,7 +220,7 @@ describe('mutation.resolver.ts.ejs', () => {
       integrations: [],
     };
 
-    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 mutationFile = plans.find(
       (p) =>
         p.outputPath.endsWith('mutation.resolver.ts') && p.contents.includes('export class AnswerQuestionResolver'),
@@ -267,7 +267,7 @@ describe('mutation.resolver.ts.ejs', () => {
   it('generates nested input types for inline object arrays in a mutation', async () => {
     const spec: SpecsSchema = {
       variant: 'specs',
-      flows: [
+      narratives: [
         {
           name: 'Cart',
           slices: [
@@ -315,7 +315,7 @@ describe('mutation.resolver.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 mutationFile = plans.find(
       (p) =>
         p.outputPath.endsWith('mutation.resolver.ts') && p.contents.includes('export class AddItemsToCartResolver'),
@@ -323,6 +323,7 @@ describe('mutation.resolver.ts.ejs', () => {
 
     expect(mutationFile?.contents).toMatchInlineSnapshot(`
 "import { Mutation, Resolver, Arg, Ctx, Field, InputType } from 'type-graphql';
+import { GraphQLJSON } from 'graphql-type-json';
 import { type GraphQLContext, sendCommand, MutationResponse } from '../../../shared';
 
 @InputType()

package/src/codegen/templates/command/mutation.resolver.ts.ejs

@@ -1,29 +1,8 @@
 <%
-function isInlineObject(ts) {
-    return /^\{[\s\S]*\}$/.test((ts ?? '').trim());
-}
-function isInlineObjectArray(ts) {
-    const t = (ts ?? '').trim();
-    return /^Array<\{[\s\S]*\}>$/.test(t) || /^\{[\s\S]*\}\[\]$/.test(t);
-}
-function baseTs(ts) {
-    return (ts ?? 'string').replace(/\s*\|\s*null\b/g, '').trim();
-}
-function fieldUsesDate(ts) {
-    const b = baseTs(ts);
-    if (b === 'Date') return true;
-    if (isInlineObject(b) || isInlineObjectArray(b)) return /:\s*Date\b/.test(b);
-    return false;
-}
-function fieldUsesJSON(ts) {
-    const b = baseTs(ts);
-    if (b === 'unknown' || b === 'any' || b === 'object') return true;
-    if (isInlineObject(b) || isInlineObjectArray(b)) return /:\s*(unknown|any|object)\b/.test(b);
-    return false;
-}
 const cmd = commands[0];
 const usesDate = cmd.fields.some(f => fieldUsesDate(f.tsType));
 const usesJSON = cmd.fields.some(f => fieldUsesJSON(f.tsType));
+const enumList = collectEnumNames(cmd.fields);
 
 const embeddedInputs = [];
 for (const f of cmd.fields) {
@@ -38,7 +17,7 @@ for (const f of cmd.fields) {
 %>
 import { Mutation, Resolver, Arg, Ctx, Field, InputType<% if (usesDate) { %>, GraphQLISODateTime<% } %> } from 'type-graphql';
 <% if (usesJSON) { %>import { GraphQLJSON } from 'graphql-type-json';
-<% } %>import { type GraphQLContext, sendCommand, MutationResponse } from '../../../shared';
+<% } %>import { type GraphQLContext, sendCommand, MutationResponse<% if (enumList.length > 0) { %>, <%= enumList.join(', ') %><% } %> } from '../../../shared';
 
 <% for (const { typeName, tsType } of embeddedInputs) {
     const inner = tsType.trim().startsWith('Array<')

package/src/codegen/templates/command/register.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('generateScaffoldFilePlans', () => {
   it('should generate a valid register file', async () => {
     const spec: SpecsSchema = {
       variant: 'specs',
-      flows: [
+      narratives: [
         {
           name: 'Host creates a listing',
           slices: [
@@ -98,7 +98,7 @@ describe('generateScaffoldFilePlans', () => {
       ],
     };
 
-    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('register.ts'));
 
     expect(registerFile?.contents).toMatchInlineSnapshot(`
@@ -107,7 +107,7 @@ describe('generateScaffoldFilePlans', () => {
           import type { CreateListing } from './commands';
 
           export function register(messageBus: CommandProcessor, eventStore: EventStore) {
-            messageBus.handle((command: CreateListing) => handle(eventStore, command), 'CreateListing');
+            messageBus.handle<CreateListing>((command: CreateListing) => handle(eventStore, command), 'CreateListing');
           }
           "
         `);

package/src/codegen/templates/command/register.ts.ejs

@@ -4,9 +4,6 @@ import type { <%= commands.map(c => pascalCase(c.type)).join(', ') %> } from './
 
 export function register(messageBus: CommandProcessor, eventStore: EventStore) {
 <% for (const command of commands) { -%>
-    messageBus.handle(
-    (command: <%= pascalCase(command.type) %>) => handle(eventStore, command),
-    '<%= command.type %>'
-    );
+  messageBus.handle<<%= pascalCase(command.type) %>>((command: <%= pascalCase(command.type) %>) => handle(eventStore, command), '<%= command.type %>');
 <% } -%>
 }