@auto-engineer/server-generator-apollo-emmett 0.1.4 → 0.8.1

package/src/codegen/scaffoldFromSchema.ts

@@ -272,8 +272,19 @@ function findEventSource(flows: Flow[], eventType: string): { flowName: string;
     for (const slice of flow.slices) {
       if (!['command', 'react'].includes(slice.type)) continue;
 
-      const gwt = slice.server?.gwt ?? [];
-      if (gwt.some((g) => g.then.some((t) => 'eventRef' in t && t.eventRef === eventType))) {
+      const specs = slice.server?.specs;
+      const rules = specs?.rules;
+      const gwtSpecs =
+        Array.isArray(rules) && rules.length > 0
+          ? rules.flatMap((rule) =>
+              rule.examples.map((example) => ({
+                given: example.given,
+                when: example.when,
+                then: example.then,
+              })),
+            )
+          : [];
+      if (gwtSpecs.some((g) => g.then.some((t) => 'eventRef' in t && t.eventRef === eventType))) {
         debugSlice('  Found event source in flow: %s, slice: %s', flow.name, slice.name);
         return { flowName: flow.name, sliceName: slice.name };
       }
@@ -304,8 +315,19 @@ function findCommandSource(flows: Flow[], commandType: string): { flowName: stri
     for (const slice of flow.slices) {
       if (slice.type !== 'command') continue;
 
-      const gwt = slice.server?.gwt ?? [];
-      if (gwt.some((g) => 'commandRef' in g.when && g.when.commandRef === commandType)) {
+      const specs = slice.server?.specs;
+      const rules = specs?.rules;
+      const gwtSpecs =
+        Array.isArray(rules) && rules.length > 0
+          ? rules.flatMap((rule) =>
+              rule.examples.map((example) => ({
+                given: example.given,
+                when: example.when,
+                then: example.then,
+              })),
+            )
+          : [];
+      if (gwtSpecs.some((g) => !Array.isArray(g.when) && 'commandRef' in g.when && g.when.commandRef === commandType)) {
         debugSlice('  Found command source in flow: %s, slice: %s', flow.name, slice.name);
         return { flowName: flow.name, sliceName: slice.name };
       }
@@ -339,7 +361,7 @@ async function generateFilesForSlice(
   debugSlice('    Commands: %d', extracted.commands.length);
   debugSlice('    Events: %d', extracted.events.length);
   debugSlice('    States: %d', extracted.states.length);
-  console.log(
+  debugSlice(
     '💡 Events for slice',
     slice.name,
     extracted.events.map((e) => e.type),
@@ -416,7 +438,6 @@ export async function writeScaffoldFilePlans(plans: FilePlan[]) {
     await fs.writeFile(outputPath, contents, 'utf8');
     writtenCount++;
     debugPlan('    File written successfully (%d/%d)', writtenCount, plans.length);
-    console.log(`✅ Created: ${outputPath}`);
   }
 
   debugPlan('All %d files written successfully', writtenCount);

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

@@ -19,26 +19,35 @@ describe('commands.ts.ejs', () => {
               },
               server: {
                 description: 'test',
-                gwt: [
-                  {
-                    when: {
-                      commandRef: 'CreateListing',
-                      exampleData: {
-                        propertyId: 'listing_123',
-                        title: 'nice apartment',
-                        pricePerNight: 250,
-                        maxGuests: 4,
-                        amenities: ['wifi', 'kitchen', 'parking'],
-                        available: true,
-                        tags: ['sea view', 'balcony'],
-                        rating: 4.8,
-                        metadata: { petsAllowed: true },
-                        listedAt: '2024-01-15T10:00:00Z',
-                      },
+                specs: {
+                  name: 'Create listing command',
+                  rules: [
+                    {
+                      description: 'Should accept valid listing data',
+                      examples: [
+                        {
+                          description: 'User creates listing with valid data',
+                          when: {
+                            commandRef: 'CreateListing',
+                            exampleData: {
+                              propertyId: 'listing_123',
+                              title: 'nice apartment',
+                              pricePerNight: 250,
+                              maxGuests: 4,
+                              amenities: ['wifi', 'kitchen', 'parking'],
+                              available: true,
+                              tags: ['sea view', 'balcony'],
+                              rating: 4.8,
+                              metadata: { petsAllowed: true },
+                              listedAt: '2024-01-15T10:00:00Z',
+                            },
+                          },
+                          then: [],
+                        },
+                      ],
                     },
-                    then: [],
-                  },
-                ],
+                  ],
+                },
               },
             },
           ],

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

@@ -16,36 +16,45 @@ describe('spec.ts.ejs', () => {
               client: { description: '', specs: [] },
               server: {
                 description: '',
-                gwt: [
-                  {
-                    when: {
-                      commandRef: 'CreateListing',
-                      exampleData: {
-                        propertyId: 'listing_123',
-                        title: 'blah',
-                        pricePerNight: 250,
-                        maxGuests: 4,
-                        amenities: ['wifi', 'kitchen'],
-                        available: true,
-                        tags: ['some tag'],
-                        rating: 4.8,
-                        metadata: { foo: 'bar' },
-                        listedAt: '2024-01-15T10:00:00Z',
-                      },
-                    },
-                    then: [
-                      {
-                        eventRef: 'ListingCreated',
-                        exampleData: {
-                          propertyId: 'listing_123',
-                          listedAt: '2024-01-15T10:00:00Z',
-                          rating: 4.8,
-                          metadata: { foo: 'bar' },
+                specs: {
+                  name: 'Create listing spec',
+                  rules: [
+                    {
+                      description: 'Should create listing successfully',
+                      examples: [
+                        {
+                          description: 'User creates listing with valid data',
+                          when: {
+                            commandRef: 'CreateListing',
+                            exampleData: {
+                              propertyId: 'listing_123',
+                              title: 'blah',
+                              pricePerNight: 250,
+                              maxGuests: 4,
+                              amenities: ['wifi', 'kitchen'],
+                              available: true,
+                              tags: ['some tag'],
+                              rating: 4.8,
+                              metadata: { foo: 'bar' },
+                              listedAt: '2024-01-15T10:00:00Z',
+                            },
+                          },
+                          then: [
+                            {
+                              eventRef: 'ListingCreated',
+                              exampleData: {
+                                propertyId: 'listing_123',
+                                listedAt: '2024-01-15T10:00:00Z',
+                                rating: 4.8,
+                                metadata: { foo: 'bar' },
+                              },
+                            },
+                          ],
                         },
-                      },
-                    ],
-                  },
-                ],
+                      ],
+                    },
+                  ],
+                },
               },
             },
           ],
@@ -147,36 +156,45 @@ describe('spec.ts.ejs', () => {
               client: { description: '', specs: [] },
               server: {
                 description: '',
-                gwt: [
-                  {
-                    given: [
-                      {
-                        eventRef: 'ListingCreated',
-                        exampleData: {
-                          propertyId: 'listing_123',
-                          listedAt: '2024-01-15T10:00:00Z',
-                          rating: 4.8,
-                          metadata: { foo: 'bar' },
+                specs: {
+                  name: 'Remove listing spec',
+                  rules: [
+                    {
+                      description: 'Should remove existing listing',
+                      examples: [
+                        {
+                          description: 'Existing listing can be removed',
+                          given: [
+                            {
+                              eventRef: 'ListingCreated',
+                              exampleData: {
+                                propertyId: 'listing_123',
+                                listedAt: '2024-01-15T10:00:00Z',
+                                rating: 4.8,
+                                metadata: { foo: 'bar' },
+                              },
+                            },
+                          ],
+                          when: {
+                            commandRef: 'RemoveListing',
+                            exampleData: {
+                              propertyId: 'listing_123',
+                            },
+                          },
+                          then: [
+                            {
+                              eventRef: 'ListingRemoved',
+                              exampleData: {
+                                propertyId: 'listing_123',
+                                removedAt: '2024-01-16T10:00:00Z',
+                              },
+                            },
+                          ],
                         },
-                      },
-                    ],
-                    when: {
-                      commandRef: 'RemoveListing',
-                      exampleData: {
-                        propertyId: 'listing_123',
-                      },
+                      ],
                     },
-                    then: [
-                      {
-                        eventRef: 'ListingRemoved',
-                        exampleData: {
-                          propertyId: 'listing_123',
-                          removedAt: '2024-01-16T10:00:00Z',
-                        },
-                      },
-                    ],
-                  },
-                ],
+                  ],
+                },
               },
             },
           ],

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

@@ -19,31 +19,40 @@ describe('decide.ts.ejs', () => {
               },
               server: {
                 description: 'test',
-                gwt: [
-                  {
-                    when: {
-                      commandRef: 'CreateListing',
-                      exampleData: {
-                        propertyId: 'listing_123',
-                        title: 'Some apartment',
-                        listedAt: '2024-01-15T10:00:00Z',
-                        rating: 4.8,
-                        metadata: { foo: 'bar' },
-                      },
-                    },
-                    then: [
-                      {
-                        eventRef: 'ListingCreated',
-                        exampleData: {
-                          propertyId: 'listing_123',
-                          listedAt: '2024-01-15T10:00:00Z',
-                          rating: 4.8,
-                          metadata: { foo: 'bar' },
+                specs: {
+                  name: 'Create listing command',
+                  rules: [
+                    {
+                      description: 'Should create listing with valid data',
+                      examples: [
+                        {
+                          description: 'User creates listing successfully',
+                          when: {
+                            commandRef: 'CreateListing',
+                            exampleData: {
+                              propertyId: 'listing_123',
+                              title: 'Some apartment',
+                              listedAt: '2024-01-15T10:00:00Z',
+                              rating: 4.8,
+                              metadata: { foo: 'bar' },
+                            },
+                          },
+                          then: [
+                            {
+                              eventRef: 'ListingCreated',
+                              exampleData: {
+                                propertyId: 'listing_123',
+                                listedAt: '2024-01-15T10:00:00Z',
+                                rating: 4.8,
+                                metadata: { foo: 'bar' },
+                              },
+                            },
+                          ],
                         },
-                      },
-                    ],
-                  },
-                ],
+                      ],
+                    },
+                  ],
+                },
               },
             },
           ],
@@ -121,34 +130,43 @@ describe('decide.ts.ejs', () => {
               },
               server: {
                 description: 'test',
-                gwt: [
-                  {
-                    given: [
-                      {
-                        eventRef: 'ListingCreated',
-                        exampleData: {
-                          propertyId: 'listing_123',
-                          listedAt: '2024-01-15T10:00:00Z',
+                specs: {
+                  name: 'Remove listing command',
+                  rules: [
+                    {
+                      description: 'Should remove existing listing',
+                      examples: [
+                        {
+                          description: 'Existing listing can be removed',
+                          given: [
+                            {
+                              eventRef: 'ListingCreated',
+                              exampleData: {
+                                propertyId: 'listing_123',
+                                listedAt: '2024-01-15T10:00:00Z',
+                              },
+                            },
+                          ],
+                          when: {
+                            commandRef: 'RemoveListing',
+                            exampleData: {
+                              propertyId: 'listing_123',
+                            },
+                          },
+                          then: [
+                            {
+                              eventRef: 'ListingRemoved',
+                              exampleData: {
+                                propertyId: 'listing_123',
+                                removedAt: '2024-01-16T12:00:00Z',
+                              },
+                            },
+                          ],
                         },
-                      },
-                    ],
-                    when: {
-                      commandRef: 'RemoveListing',
-                      exampleData: {
-                        propertyId: 'listing_123',
-                      },
+                      ],
                     },
-                    then: [
-                      {
-                        eventRef: 'ListingRemoved',
-                        exampleData: {
-                          propertyId: 'listing_123',
-                          removedAt: '2024-01-16T12:00:00Z',
-                        },
-                      },
-                    ],
-                  },
-                ],
+                  ],
+                },
               },
             },
           ],
@@ -238,49 +256,59 @@ describe('decide.ts.ejs', () => {
               },
               server: {
                 description: 'test',
-                gwt: [
-                  {
-                    when: {
-                      commandRef: 'CreateListing',
-                      exampleData: {
-                        propertyId: 'listing_123',
-                        title: 'Some Apartment',
-                        listedAt: '2024-01-15T10:00:00Z',
-                        rating: 4.8,
-                        metadata: { foo: 'bar' },
-                      },
-                    },
-                    then: [
-                      {
-                        eventRef: 'ListingCreated',
-                        exampleData: {
-                          propertyId: 'listing_123',
-                          listedAt: '2024-01-15T10:00:00Z',
-                          rating: 4.8,
-                          metadata: { foo: 'bar' },
+                specs: {
+                  name: 'Create listing command',
+                  rules: [
+                    {
+                      description: 'Should handle multiple scenarios including errors',
+                      examples: [
+                        {
+                          description: 'User creates listing successfully',
+                          when: {
+                            commandRef: 'CreateListing',
+                            exampleData: {
+                              propertyId: 'listing_123',
+                              title: 'Some Apartment',
+                              listedAt: '2024-01-15T10:00:00Z',
+                              rating: 4.8,
+                              metadata: { foo: 'bar' },
+                            },
+                          },
+                          then: [
+                            {
+                              eventRef: 'ListingCreated',
+                              exampleData: {
+                                propertyId: 'listing_123',
+                                listedAt: '2024-01-15T10:00:00Z',
+                                rating: 4.8,
+                                metadata: { foo: 'bar' },
+                              },
+                            },
+                          ],
                         },
-                      },
-                    ],
-                  },
-                  {
-                    when: {
-                      commandRef: 'CreateListing',
-                      exampleData: {
-                        propertyId: 'listing_123',
-                        title: '',
-                        listedAt: '2024-01-15T10:00:00Z',
-                        rating: 4.8,
-                        metadata: {},
-                      },
+                        {
+                          description: 'User creates listing with empty title should fail',
+                          when: {
+                            commandRef: 'CreateListing',
+                            exampleData: {
+                              propertyId: 'listing_123',
+                              title: '',
+                              listedAt: '2024-01-15T10:00:00Z',
+                              rating: 4.8,
+                              metadata: {},
+                            },
+                          },
+                          then: [
+                            {
+                              errorType: 'ValidationError',
+                              message: 'Title must not be empty',
+                            },
+                          ],
+                        },
+                      ],
                     },
-                    then: [
-                      {
-                        errorType: 'ValidationError',
-                        message: 'Title must not be empty',
-                      },
-                    ],
-                  },
-                ],
+                  ],
+                },
               },
             },
           ],
@@ -411,26 +439,35 @@ describe('decide.ts.ejs', () => {
                     },
                   },
                 ],
-                gwt: [
-                  {
-                    when: {
-                      commandRef: 'SuggestItems',
-                      exampleData: {
-                        sessionId: 'session-123',
-                        prompt: 'What should I buy?',
-                      },
-                    },
-                    then: [
-                      {
-                        eventRef: 'ItemsSuggested',
-                        exampleData: {
-                          sessionId: 'session-123',
-                          items: [],
+                specs: {
+                  name: 'Suggest items command',
+                  rules: [
+                    {
+                      description: 'Should suggest items successfully',
+                      examples: [
+                        {
+                          description: 'User requests item suggestions',
+                          when: {
+                            commandRef: 'SuggestItems',
+                            exampleData: {
+                              sessionId: 'session-123',
+                              prompt: 'What should I buy?',
+                            },
+                          },
+                          then: [
+                            {
+                              eventRef: 'ItemsSuggested',
+                              exampleData: {
+                                sessionId: 'session-123',
+                                items: [],
+                              },
+                            },
+                          ],
                         },
-                      },
-                    ],
-                  },
-                ],
+                      ],
+                    },
+                  ],
+                },
               },
             },
           ],

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

@@ -19,36 +19,45 @@ describe('events.ts.ejs', () => {
               },
               server: {
                 description: 'test',
-                gwt: [
-                  {
-                    when: {
-                      commandRef: 'CreateListing',
-                      exampleData: {
-                        propertyId: 'listing_123',
-                        title: 'blah',
-                        pricePerNight: 250,
-                        maxGuests: 4,
-                        amenities: ['wifi', 'kitchen'],
-                        available: true,
-                        tags: ['some tag'],
-                        rating: 4.8,
-                        metadata: { foo: 'bar' },
-                        listedAt: '2024-01-15T10:00:00Z',
-                      },
-                    },
-                    then: [
-                      {
-                        eventRef: 'ListingCreated',
-                        exampleData: {
-                          propertyId: 'listing_123',
-                          listedAt: '2024-01-15T10:00:00Z',
-                          rating: 4.8,
-                          metadata: { foo: 'bar' },
+                specs: {
+                  name: 'Create listing command',
+                  rules: [
+                    {
+                      description: 'Should create listing successfully',
+                      examples: [
+                        {
+                          description: 'User creates listing with valid data',
+                          when: {
+                            commandRef: 'CreateListing',
+                            exampleData: {
+                              propertyId: 'listing_123',
+                              title: 'blah',
+                              pricePerNight: 250,
+                              maxGuests: 4,
+                              amenities: ['wifi', 'kitchen'],
+                              available: true,
+                              tags: ['some tag'],
+                              rating: 4.8,
+                              metadata: { foo: 'bar' },
+                              listedAt: '2024-01-15T10:00:00Z',
+                            },
+                          },
+                          then: [
+                            {
+                              eventRef: 'ListingCreated',
+                              exampleData: {
+                                propertyId: 'listing_123',
+                                listedAt: '2024-01-15T10:00:00Z',
+                                rating: 4.8,
+                                metadata: { foo: 'bar' },
+                              },
+                            },
+                          ],
                         },
-                      },
-                    ],
-                  },
-                ],
+                      ],
+                    },
+                  ],
+                },
               },
             },
           ],