@auto-engineer/server-generator-apollo-emmett 1.69.0 → 1.71.0

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> @auto-engineer/server-generator-apollo-emmett@1.69.0 build /home/runner/work/auto-engineer/auto-engineer/packages/server-generator-apollo-emmett
+> @auto-engineer/server-generator-apollo-emmett@1.71.0 build /home/runner/work/auto-engineer/auto-engineer/packages/server-generator-apollo-emmett
 > 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
 
 Fixed ESM imports in dist/

package/.turbo/turbo-test.log

@@ -1,14 +1,14 @@
 
-> @auto-engineer/server-generator-apollo-emmett@1.68.0 test /home/runner/work/auto-engineer/auto-engineer/packages/server-generator-apollo-emmett
+> @auto-engineer/server-generator-apollo-emmett@1.70.0 test /home/runner/work/auto-engineer/auto-engineer/packages/server-generator-apollo-emmett
 > vitest run --reporter=dot
 
 
  RUN  v3.2.4 /home/runner/work/auto-engineer/auto-engineer/packages/server-generator-apollo-emmett
 
-·························································································································································-·················
+···························································································································································-·················
 
  Test Files  30 passed | 1 skipped (31)
-      Tests  170 passed | 1 skipped (171)
-   Start at  16:17:34
-   Duration  30.08s (transform 4.95s, setup 0ms, collect 64.51s, tests 12.33s, environment 7ms, prepare 4.71s)
+      Tests  172 passed | 1 skipped (173)
+   Start at  12:06:20
+   Duration  22.20s (transform 3.79s, setup 0ms, collect 45.99s, tests 8.68s, environment 6ms, prepare 4.29s)
 

package/.turbo/turbo-type-check.log

@@ -1,4 +1,4 @@
 
-> @auto-engineer/server-generator-apollo-emmett@1.68.0 type-check /home/runner/work/auto-engineer/auto-engineer/packages/server-generator-apollo-emmett
+> @auto-engineer/server-generator-apollo-emmett@1.70.0 type-check /home/runner/work/auto-engineer/auto-engineer/packages/server-generator-apollo-emmett
 > tsc --noEmit --project tsconfig.json
 

package/CHANGELOG.md

@@ -1,5 +1,70 @@
 # @auto-engineer/server-generator-apollo-emmett
 
+## 1.71.0
+
+### Minor Changes
+
+- [`82543ae`](https://github.com/BeOnAuto/auto-engineer/commit/82543aec90a4398696e148f9ea26e5f4df51eb91) Thanks [@rami-hatoum](https://github.com/rami-hatoum)! - - **server-generator-apollo-emmett**: seed event store with Given state data in react specs template
+
+- [`6a7a3f2`](https://github.com/BeOnAuto/auto-engineer/commit/6a7a3f237c1267e1835168afaccf21e482e48278) Thanks [@rami-hatoum](https://github.com/rami-hatoum)! - - **server-generator-apollo-emmett**: generate aggregateStream for Given states
+  - **server-generator-apollo-emmett**: add Burst 3 to ketchup plan for commandSender.send generation
+  - **server-generator-apollo-emmett**: mark all react Given states bursts done
+
+- [`560d192`](https://github.com/BeOnAuto/auto-engineer/commit/560d19212be145f358ab2176c2424f6a8849070f) Thanks [@rami-hatoum](https://github.com/rami-hatoum)! - - **server-generator-apollo-emmett**: generate real commandSender.send() in react scaffold
+
+- [`b5f823a`](https://github.com/BeOnAuto/auto-engineer/commit/b5f823a8b6e08c05518220aedad5b686e8bf37ac) Thanks [@rami-hatoum](https://github.com/rami-hatoum)! - - **server-generator-apollo-emmett**: generate aggregateStream for Given states
+
+### Patch Changes
+
+- [`dde21b9`](https://github.com/BeOnAuto/auto-engineer/commit/dde21b9f06c8aaba5d18cfa4f1a68eed3bf4c190) Thanks [@rami-hatoum](https://github.com/rami-hatoum)! - - **server-generator-apollo-emmett**: mark all react Given states bursts done
+
+- [`28efa44`](https://github.com/BeOnAuto/auto-engineer/commit/28efa44f51373af11febb3fff00d85d1b3350784) Thanks [@rami-hatoum](https://github.com/rami-hatoum)! - - **server-generator-apollo-emmett**: mark Burst 3 done in ketchup plan
+
+- [`8b1238a`](https://github.com/BeOnAuto/auto-engineer/commit/8b1238ab2c98ad7bf396987edabf642b43b730bd) Thanks [@rami-hatoum](https://github.com/rami-hatoum)! - - **server-generator-apollo-emmett**: add ketchup plan for react slice Given states fix
+
+- [`e7a4ddf`](https://github.com/BeOnAuto/auto-engineer/commit/e7a4ddff607260651ecbf504a881a21db4657f19) Thanks [@github-actions[bot]](https://github.com/github-actions%5Bbot%5D)! - - **job-graph-processor**: increase time tolerance for parallel job dispatch test
+  - **root**: update @event-driven-io/emmett and @event-driven-io/emmett-sqlite versions to 0.42.0
+  - **ci**: remove --reporter=append to show pnpm install errors
+  - **generate-react-client**: update landing page header text
+  - **pipeline**: emit to event store before SSE broadcast in broadcastPipelineRunStarted
+- Updated dependencies [[`82543ae`](https://github.com/BeOnAuto/auto-engineer/commit/82543aec90a4398696e148f9ea26e5f4df51eb91), [`dde21b9`](https://github.com/BeOnAuto/auto-engineer/commit/dde21b9f06c8aaba5d18cfa4f1a68eed3bf4c190), [`28efa44`](https://github.com/BeOnAuto/auto-engineer/commit/28efa44f51373af11febb3fff00d85d1b3350784), [`6a7a3f2`](https://github.com/BeOnAuto/auto-engineer/commit/6a7a3f237c1267e1835168afaccf21e482e48278), [`560d192`](https://github.com/BeOnAuto/auto-engineer/commit/560d19212be145f358ab2176c2424f6a8849070f), [`8b1238a`](https://github.com/BeOnAuto/auto-engineer/commit/8b1238ab2c98ad7bf396987edabf642b43b730bd), [`e7a4ddf`](https://github.com/BeOnAuto/auto-engineer/commit/e7a4ddff607260651ecbf504a881a21db4657f19), [`b5f823a`](https://github.com/BeOnAuto/auto-engineer/commit/b5f823a8b6e08c05518220aedad5b686e8bf37ac)]:
+  - @auto-engineer/message-bus@1.71.0
+  - @auto-engineer/narrative@1.71.0
+
+## 1.70.0
+
+### Minor Changes
+
+- [`d5b9b83`](https://github.com/BeOnAuto/auto-engineer/commit/d5b9b83ae2a40f0f34a9e5823fd7f582ffb578a5) Thanks [@github-actions[bot]](https://github.com/github-actions%5Bbot%5D)! - - **generate-react-client**: update landing page header text color and height
+  - **pipeline**: remove v1 SettledTracker, PhasedExecutor, and related projections
+  - **pipeline**: wire V2 bridges into PipelineServer
+  - **pipeline**: add phased bridge with V2 workflow processor integration
+  - **pipeline**: add V2RuntimeBridge for settled descriptor path
+
+### Patch Changes
+
+- [`5c8110b`](https://github.com/BeOnAuto/auto-engineer/commit/5c8110b45fcb7597e348ffc00386f69e1e4fcc13) Thanks [@SamHatoum](https://github.com/SamHatoum)! - - **pipeline**: emit to event store before SSE broadcast in broadcastPipelineRunStarted
+
+- [`3f7324f`](https://github.com/BeOnAuto/auto-engineer/commit/3f7324fa09b306b6ce67d6c337501e2f521f2d60) Thanks [@SamHatoum](https://github.com/SamHatoum)! - - Updated the landing page header text in the React client
+
+- [`a7a0616`](https://github.com/BeOnAuto/auto-engineer/commit/a7a06161e3bd923116c827a816b4df809e1807f5) Thanks [@SamHatoum](https://github.com/SamHatoum)! - - Updated Emmett and SQLite driver dependencies in the Apollo server generator
+
+- [`4c39d83`](https://github.com/BeOnAuto/auto-engineer/commit/4c39d8395445b7fe9c36c4943214cd216471366a) Thanks [@SamHatoum](https://github.com/SamHatoum)! - - **pipeline**: plan for fix emit-before-broadcast race
+
+- [`a83d744`](https://github.com/BeOnAuto/auto-engineer/commit/a83d74432c94c79fc7fee0beaa0e9bccc5721dd0) Thanks [@SamHatoum](https://github.com/SamHatoum)! - - **pipeline**: add settled correlationId fix bursts to plan
+
+- [`30579ce`](https://github.com/BeOnAuto/auto-engineer/commit/30579ce1382f0fe1856b478f25828c90eeecc698) Thanks [@SamHatoum](https://github.com/SamHatoum)! - - **ci**: remove --reporter=append to show pnpm install errors
+
+- [`d4c314e`](https://github.com/BeOnAuto/auto-engineer/commit/d4c314eb75e3de81d90b198422cb3538946cd08b) Thanks [@SamHatoum](https://github.com/SamHatoum)! - - Updated Emmett and Emmett SQLite dependencies to version 0.42.0
+
+- [`6e9516a`](https://github.com/BeOnAuto/auto-engineer/commit/6e9516a004d29eac3bdc8585f7b3cc70f2b624ef) Thanks [@SamHatoum](https://github.com/SamHatoum)! - - Improved stability of parallel job dispatch timing in the job graph processor
+
+- [`46bf3e7`](https://github.com/BeOnAuto/auto-engineer/commit/46bf3e7a2ffbce7f5a840689091ddaa061457ccc) Thanks [@SamHatoum](https://github.com/SamHatoum)! - - **pipeline**: use sessionCorrelationId for settled bridge keying
+
+- Updated dependencies [[`5c8110b`](https://github.com/BeOnAuto/auto-engineer/commit/5c8110b45fcb7597e348ffc00386f69e1e4fcc13), [`3f7324f`](https://github.com/BeOnAuto/auto-engineer/commit/3f7324fa09b306b6ce67d6c337501e2f521f2d60), [`a7a0616`](https://github.com/BeOnAuto/auto-engineer/commit/a7a06161e3bd923116c827a816b4df809e1807f5), [`4c39d83`](https://github.com/BeOnAuto/auto-engineer/commit/4c39d8395445b7fe9c36c4943214cd216471366a), [`a83d744`](https://github.com/BeOnAuto/auto-engineer/commit/a83d74432c94c79fc7fee0beaa0e9bccc5721dd0), [`d5b9b83`](https://github.com/BeOnAuto/auto-engineer/commit/d5b9b83ae2a40f0f34a9e5823fd7f582ffb578a5), [`30579ce`](https://github.com/BeOnAuto/auto-engineer/commit/30579ce1382f0fe1856b478f25828c90eeecc698), [`d4c314e`](https://github.com/BeOnAuto/auto-engineer/commit/d4c314eb75e3de81d90b198422cb3538946cd08b), [`6e9516a`](https://github.com/BeOnAuto/auto-engineer/commit/6e9516a004d29eac3bdc8585f7b3cc70f2b624ef), [`46bf3e7`](https://github.com/BeOnAuto/auto-engineer/commit/46bf3e7a2ffbce7f5a840689091ddaa061457ccc)]:
+  - @auto-engineer/message-bus@1.70.0
+  - @auto-engineer/narrative@1.70.0
+
 ## 1.69.0
 
 ### Minor Changes

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

@@ -368,4 +368,203 @@ describe('react.specs.ts.ejs (react slice)', () => {
     expect(specFile?.contents).not.toContain("tipAmount: '5.00'");
     expect(specFile?.contents).not.toContain('tipAmount: "5.00"');
   });
+
+  it('should seed event store with Given state data via appendToStream', async () => {
+    const spec: SpecsSchema = {
+      variant: 'specs',
+      narratives: [
+        {
+          name: 'barbershop flow',
+          slices: [
+            {
+              type: 'command',
+              name: 'cancel appointment',
+              client: { specs: [] },
+              server: {
+                description: '',
+                specs: [
+                  {
+                    type: 'gherkin',
+                    feature: 'Cancel appointment command',
+                    rules: [
+                      {
+                        name: 'Should cancel appointment',
+                        examples: [
+                          {
+                            name: 'Appointment cancelled',
+                            steps: [
+                              {
+                                keyword: 'When',
+                                text: 'CancelAppointment',
+                                docString: { appointmentId: 'apt_001', barberId: 'barber_001' },
+                              },
+                              {
+                                keyword: 'Then',
+                                text: 'AppointmentCancelled',
+                                docString: { appointmentId: 'apt_001', barberId: 'barber_001' },
+                              },
+                            ],
+                          },
+                        ],
+                      },
+                    ],
+                  },
+                ],
+              },
+            },
+            {
+              type: 'react',
+              name: 'notify barber of cancellation',
+              server: {
+                description: 'Notifies barber when appointment is cancelled',
+                data: {
+                  items: [
+                    {
+                      target: { type: 'Command', name: 'NotifyBarber' },
+                      destination: { type: 'stream', pattern: 'barber-${barberId}' },
+                    },
+                  ],
+                },
+                specs: [
+                  {
+                    type: 'gherkin',
+                    feature: 'Notify barber of cancellation reaction',
+                    rules: [
+                      {
+                        name: 'Should notify barber on cancellation',
+                        examples: [
+                          {
+                            name: 'Barber notified after cancellation',
+                            steps: [
+                              {
+                                keyword: 'Given',
+                                text: 'Appointment',
+                                docString: { barberId: 'barber_001', clientName: 'John' },
+                              },
+                              {
+                                keyword: 'When',
+                                text: 'AppointmentCancelled',
+                                docString: { appointmentId: 'apt_001', barberId: 'barber_001' },
+                              },
+                              {
+                                keyword: 'Then',
+                                text: 'NotifyBarber',
+                                docString: { barberId: 'barber_001', message: 'Appointment cancelled' },
+                              },
+                            ],
+                          },
+                        ],
+                      },
+                    ],
+                  },
+                ],
+              },
+            },
+          ],
+        },
+      ],
+      messages: [
+        {
+          type: 'command',
+          name: 'CancelAppointment',
+          fields: [
+            { name: 'appointmentId', type: 'string', required: true },
+            { name: 'barberId', type: 'string', required: true },
+          ],
+        },
+        {
+          type: 'event',
+          name: 'AppointmentCancelled',
+          source: 'internal',
+          fields: [
+            { name: 'appointmentId', type: 'string', required: true },
+            { name: 'barberId', type: 'string', required: true },
+          ],
+        },
+        {
+          type: 'command',
+          name: 'NotifyBarber',
+          fields: [
+            { name: 'barberId', type: 'string', required: true },
+            { name: 'message', type: 'string', required: true },
+          ],
+        },
+        {
+          type: 'state',
+          name: 'Appointment',
+          fields: [
+            { name: 'barberId', type: 'string', required: true },
+            { name: 'clientName', type: 'string', required: true },
+          ],
+        },
+      ],
+    };
+
+    const { plans } = await generateScaffoldFilePlans(spec.narratives, spec.messages, undefined, 'src/domain/flows');
+
+    const specFile = plans.find((p) => p.outputPath.endsWith('notify-barber-of-cancellation/react.specs.ts'));
+    expect(specFile?.contents).toMatchInlineSnapshot(`
+      "import { describe, it, beforeEach } from 'vitest';
+      import 'reflect-metadata';
+      import { getInMemoryEventStore, type InMemoryEventStore, type CommandSender } from '@event-driven-io/emmett';
+      import { type ReactorContext, ReactorSpecification } from '../../../shared';
+      import { react } from './react';
+      import type { AppointmentCancelled } from '../cancel-appointment/events';
+      import type { NotifyBarber } from './commands';
+
+      type ReactorEvent = AppointmentCancelled;
+      type ReactorCommand = NotifyBarber;
+
+      describe('Should notify barber on cancellation', () => {
+        let eventStore: InMemoryEventStore;
+        let given: ReactorSpecification<ReactorEvent, ReactorCommand, ReactorContext>;
+        let messageBus: CommandSender;
+
+        beforeEach(() => {
+          eventStore = getInMemoryEventStore({});
+          given = ReactorSpecification.for<ReactorEvent, ReactorCommand, ReactorContext>(
+            () => react({ eventStore, commandSender: messageBus, database: eventStore.database }),
+            (commandSender) => {
+              messageBus = commandSender;
+              return {
+                eventStore,
+                commandSender,
+                database: eventStore.database,
+              };
+            },
+          );
+        });
+
+        it('Barber notified after cancellation', async () => {
+          await eventStore.appendToStream('Appointment-barber_001', [
+            {
+              type: 'AppointmentInitialized',
+              data: {
+                barberId: 'barber_001',
+                clientName: 'John',
+              },
+            },
+          ]);
+          await given([])
+            .when({
+              type: 'AppointmentCancelled',
+              data: {
+                appointmentId: 'apt_001',
+                barberId: 'barber_001',
+              },
+            })
+
+            .then({
+              type: 'NotifyBarber',
+              kind: 'Command',
+              data: {
+                barberId: 'barber_001',
+                message: 'Appointment cancelled',
+              },
+            });
+        });
+      });
+      "
+    `);
+  });
 });

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

@@ -248,36 +248,28 @@ describe('handle.ts.ejs (react slice)', () => {
             /**
              * ## IMPLEMENTATION INSTRUCTIONS ##
              *
-             * - Inspect event data to determine if the command should be sent.
-             * - Replace the placeholder logic and \\\`throw\\\` below with real implementation.
-             * - Send one or more commands via: commandSender.send({...})
-             * - Optionally return a MessageHandlerResult for SKIP or error cases.
+             * - Review the generated send call below and adjust if needed.
+             * - Add business logic (validation, conditional sends) as required.
              */
 
             // Event (BookingRequested) fields: bookingId: string, hostId: string, message: string
 
             // Command (NotifyHost) fields: hostId: string, notificationType: string, priority: string, channels: string[], message: string, actionRequired: boolean
 
-            throw new IllegalStateError('Not yet implemented: react in response to BookingRequested');
-
-            // Example:
-            // if (event.data.status !== 'expected') {
-            //   return {
-            //     type: 'SKIP',
-            //     reason: 'Condition not met',
-            //   };
-            // }
-
-            // await commandSender.send({
-            //   type: 'NotifyHost',
-            //   kind: 'Command',
-            //   data: {
-            //     // Map event fields to command fields here
-            //     // e.g., userId: event.data.userId,
-            //   },
-            // });
+            await commandSender.send({
+              type: 'NotifyHost',
+              kind: 'Command',
+              data: {
+                hostId: event.data.hostId,
+                notificationType: undefined, // TODO: source unknown
+                priority: undefined, // TODO: source unknown
+                channels: undefined, // TODO: source unknown
+                message: event.data.message,
+                actionRequired: undefined, // TODO: source unknown
+              },
+            });
 
-            // return;
+            return;
           },
         });
       "
@@ -560,6 +552,7 @@ describe('handle.ts.ejs (react slice)', () => {
     expect(reactFile?.contents).toContain("canHandle: ['PaymentProcessed']");
     expect(reactFile?.contents).toContain("from '../../order-management/process-payment/events'");
     expect(reactFile?.contents).not.toContain('ReactToPaymentProcessed');
-    expect(reactFile?.contents).toContain('Context state available: InventoryReservation (readable from database)');
+    expect(reactFile?.contents).not.toContain('readable from database');
+    expect(reactFile?.contents).not.toContain('aggregateStream');
   });
 });

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

@@ -115,6 +115,26 @@ describe('<%= ruleDescription %>', () => {
             `should send ${thenCommands.map(c => c.commandRef).join(', ')} when ${exampleEvent.eventRef} is received`;
 %>
   it('<%= description %>', async () => {
+<%
+    const givenStates = testCase.given.filter(g =>
+      messages.some(m => m.type === 'state' && m.name === g.eventRef)
+    );
+    for (const gs of givenStates) {
+      const stateSchema = states.find(s => s.type === gs.eventRef);
+      const eventDef = messages.find(m => m.name === exampleEvent.eventRef);
+      const stateFieldNames = (stateSchema?.fields || []).map(f => f.name);
+      const eventFieldNames = (eventDef?.fields || []).map(f => f.name);
+      const linkingField = stateFieldNames.find(f => eventFieldNames.includes(f));
+      if (linkingField) {
+        const linkingValue = gs.exampleData[linkingField];
+-%>
+    await eventStore.appendToStream('<%= gs.eventRef %>-<%= linkingValue %>', [{
+      type: '<%= gs.eventRef %>Initialized',
+      data: <%- formatDataObject(gs.exampleData, stateSchema) %>
+    }]);
+<%    }
+    }
+-%>
     await given([])
       .when({
         type: '<%= exampleEvent.eventRef %>',

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

@@ -42,17 +42,15 @@ eachMessage: async (event, context): Promise<MessageHandlerResult> => {
     /**
     * ## IMPLEMENTATION INSTRUCTIONS ##
     *
-    * - Inspect event data to determine if the command should be sent.
-    * - Replace the placeholder logic and \`throw\` below with real implementation.
-    * - Send one or more commands via: commandSender.send({...})
-    * - Optionally return a MessageHandlerResult for SKIP or error cases.
-<% if (states.length > 0) { -%>
-    * - Context state available: <%= states.map(s => pascalCase(s.type)).join(', ') %> (readable from database)
-<% } -%>
+    * - Review the generated send call below and adjust if needed.
+    * - Add business logic (validation, conditional sends) as required.
     */
 <%
 const eventDef = messages.find(m => m.name === eventType);
 const commandDef = messages.find(m => m.name === commandType && m.type === 'command');
+const commandFields = (commandDef?.fields || []);
+const eventFieldSet = new Set((eventDef?.fields || []).map(f => f.name));
+const stateFieldSources = {};
 -%>
 <% if (eventDef?.fields?.length) { %>
     // Event (<%= eventType %>) fields: <%= eventDef.fields.map(f => f.name + ': ' + (f.tsType || f.type)).join(', ') %>
@@ -60,26 +58,58 @@ const commandDef = messages.find(m => m.name === commandType && m.type === 'comm
 <% if (commandDef?.fields?.length) { %>
     // Command (<%= commandType %>) fields: <%= commandDef.fields.map(f => f.name + ': ' + (f.tsType || f.type)).join(', ') %>
 <% } -%>
+<% if (states.length > 0) {
+  let hasAggregateStream = false;
+  for (const state of states) {
+    const stateFieldNames = state.fields.map(f => f.name);
+    const eventFieldNames = (eventDef?.fields || []).map(f => f.name);
+    const linkingField = stateFieldNames.find(f => eventFieldNames.includes(f));
+    if (linkingField) {
+      hasAggregateStream = true;
+      const varName = camelCase(state.type);
+      for (const f of state.fields) {
+        if (!stateFieldSources[f.name]) stateFieldSources[f.name] = varName;
+      }
+-%>
 
-    throw new IllegalStateError('Not yet implemented: react in response to <%= eventType %>');
+    const { state: <%= varName %> } = await eventStore.aggregateStream(
+      '<%= state.type %>-' + event.data.<%= linkingField %>,
+      {
+        evolve: (currentState, evt) => ({ ...currentState, ...evt.data }),
+        initialState: () => ({}),
+      },
+    );
+    // <%= state.type %> fields: <%= state.fields.map(f => f.name).join(', ') %>
+
+<%    }
+  }
+  if (!hasAggregateStream) {
+-%>
 
-    // Example:
-    // if (event.data.status !== 'expected') {
-    //   return {
-    //     type: 'SKIP',
-    //     reason: 'Condition not met',
-    //   };
-    // }
+<%  }
+} else {
+-%>
 
-    // await commandSender.send({
-    //   type: '<%= commandType %>',
-    //   kind: 'Command',
-    //   data: {
-    //     // Map event fields to command fields here
-    //     // e.g., userId: event.data.userId,
-    //   },
-    // });
+<% } -%>
+    await commandSender.send({
+      type: '<%= commandType %>',
+      kind: 'Command',
+      data: {
+<% for (const field of commandFields) {
+    const fieldName = field.name;
+    if (eventFieldSet.has(fieldName)) {
+-%>
+        <%= fieldName %>: event.data.<%= fieldName %>,
+<%  } else if (stateFieldSources[fieldName]) { -%>
+        <%= fieldName %>: <%= stateFieldSources[fieldName] %>.<%= fieldName %>,
+<%  } else { -%>
+        <%= fieldName %>: undefined, // TODO: source unknown
+<%  }
+  }
+-%>
+      },
+    });
 
-    // return;
+    return;
     },
     });