@auto-engineer/server-generator-apollo-emmett 0.11.14 → 0.11.15

package/package.json

@@ -31,8 +31,8 @@
     "graphql-type-json": "^0.3.2",
     "uuid": "^11.0.0",
     "web-streams-polyfill": "^4.1.0",
-    "@auto-engineer/message-bus": "0.11.14",
-    "@auto-engineer/narrative": "0.11.14"
+    "@auto-engineer/narrative": "0.11.15",
+    "@auto-engineer/message-bus": "0.11.15"
   },
   "publishConfig": {
     "access": "public"
@@ -43,9 +43,9 @@
     "typescript": "^5.8.3",
     "vitest": "^3.2.4",
     "tsx": "^4.19.2",
-    "@auto-engineer/cli": "0.11.14"
+    "@auto-engineer/cli": "0.11.15"
   },
-  "version": "0.11.14",
+  "version": "0.11.15",
   "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/extract/messages.ts

@@ -3,7 +3,7 @@ import { CommandExample, EventExample, Slice } from '@auto-engineer/narrative';
 import { Message, MessageDefinition } from '../types';
 import { extractEventsFromGiven, extractEventsFromThen, extractEventsFromWhen } from './events';
 import { extractFieldsFromMessage } from './fields';
-import { extractProjectionIdField } from './projection';
+import { extractProjectionIdField, extractProjectionSingleton } from './projection';
 import { extractStatesFromData, extractStatesFromTarget } from './states';
 import createDebug from 'debug';
 
@@ -19,6 +19,7 @@ export interface ExtractedMessages {
   states: Message[];
   commandSchemasByName: Record<string, Message>;
   projectionIdField?: string;
+  projectionSingleton?: boolean;
 }
 
 export interface ReactGwtSpec {
@@ -122,6 +123,9 @@ function extractMessagesForQuery(slice: Slice, allMessages: MessageDefinition[])
   const projectionIdField = extractProjectionIdField(slice);
   debugQuery('  Projection ID field: %s', projectionIdField ?? 'none');
 
+  const projectionSingleton = extractProjectionSingleton(slice);
+  debugQuery('  Projection singleton: %s', projectionSingleton);
+
   const events: Message[] = gwtSpecs.flatMap((gwt) => {
     const eventsFromGiven = Array.isArray(gwt.given)
       ? gwt.given.filter((item): item is EventExample => 'eventRef' in item)
@@ -166,6 +170,7 @@ function extractMessagesForQuery(slice: Slice, allMessages: MessageDefinition[])
     states,
     commandSchemasByName: {},
     projectionIdField,
+    projectionSingleton,
   };
 
   debugQuery('  Final result: %d events, %d states', result.events.length, result.states.length);

package/src/codegen/extract/projection.ts

@@ -4,6 +4,7 @@ interface ProjectionOrigin {
   type: 'projection';
   idField?: string;
   name?: string;
+  singleton?: boolean;
 }
 
 interface HasOrigin {
@@ -46,3 +47,16 @@ export function extractProjectionIdField(slice: Slice): string | undefined {
 export function extractProjectionName(slice: Slice): string | undefined {
   return extractProjectionField(slice, 'name');
 }
+
+export function extractProjectionSingleton(slice: Slice): boolean {
+  if (!('server' in slice)) return false;
+  const dataSource = slice.server?.data?.[0];
+  if (!hasOrigin(dataSource)) return false;
+
+  const origin = dataSource.origin;
+  if (isProjectionOrigin(origin)) {
+    return origin.singleton === true;
+  }
+
+  return false;
+}

package/src/codegen/scaffoldFromSchema.ts

@@ -490,6 +490,7 @@ async function prepareTemplateData(
   states: Message[],
   commandSchemasByName: Record<string, Message>,
   projectionIdField: string | undefined,
+  projectionSingleton: boolean | undefined,
   allMessages?: MessageDefinition[],
   integrations?: Model['integrations'],
 ): Promise<Record<string, unknown>> {
@@ -538,6 +539,7 @@ async function prepareTemplateData(
     usedErrors,
     commandSchemasByName,
     projectionIdField,
+    projectionSingleton,
     projectionName,
     projectionType: projectionName != null ? pascalCase(projectionName) : undefined,
     parsedRequest: slice.type === 'query' && slice.request != null ? parseGraphQlRequest(slice.request) : undefined,
@@ -693,6 +695,7 @@ async function generateFilesForSlice(
     extracted.states,
     extracted.commandSchemasByName,
     extracted.projectionIdField,
+    extracted.projectionSingleton,
     messages,
     integrations,
   );

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

@@ -783,9 +783,7 @@ describe('projection.specs.ts.ejs', () => {
               },
             ])
             .then(async (state) => {
-              const document = await state.database
-                .collection<TodoSummary>('TodoSummaryProjection')
-                .findOne((doc) => doc.id === 'test-id');
+              const document = await state.database.collection<TodoSummary>('TodoSummaryProjection').findOne();
 
               const expected: TodoSummary = {
                 totalCount: 1,

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

@@ -239,7 +239,7 @@ describe('projection.ts.ejs', () => {
                *    }
                *
                * 2. Cast document parameter to extended type:
-               *    const current: InternalAvailableListings = (document as InternalAvailableListings) || { ...defaults };
+               *    const current: InternalAvailableListings = document ?? { ...defaults };
                *
                * 3. Cast return values to extended type:
                *    return { ...allFields, internalField } as InternalAvailableListings;
@@ -549,12 +549,16 @@ describe('projection.ts.ejs', () => {
                * CRITICAL: Use internal state to track individual entity information:
                *
                * 1. Access current state:
-               *    const current = (document as InternalTodoSummary) || { ...initialState, _entities: {} };
+               *    const current: InternalTodoSummary = document ?? { ...initialState, _entities: {} };
                *
                * 2. Track entity changes:
-               *    const entityId = event.data.todoId; // or relevant ID field
-               *    const prevStatus = current._entities?.[entityId]?.status;
-               *    current._entities[entityId] = { status: 'new_status', ...otherData };
+               *    // a) Extract the unique identifier that distinguishes this entity
+               *    //    Examine event.data to find the ID field (often 'id' or '<entity>Id')
+               *    const entityId = event.data.[ENTITY_ID_FIELD];
+               *
+               *    // b) Store/update entity state with relevant properties from event.data
+               *    //    Include only fields needed for aggregation calculations
+               *    current._entities[entityId] = { [field]: value, ... };
                *
                * 3. Calculate aggregates from entity states:
                *    const counts = Object.values(current._entities).reduce((acc, entity) => {

package/src/codegen/templates/query/projection.specs.ts.ejs

@@ -141,7 +141,9 @@ _%>
       .then(async (state) => {
         const document = await state.database
           .collection<<%= TargetType %>>('<%= projName %>')
-          .findOne((doc) => <%
+          .findOne(<% if (projectionSingleton) { %>);<%
+} else {
+%>(doc) => <%
 const idField = projectionIdField ?? 'id';
 if (idField.includes('-')) {
     // Handle composite keys
@@ -157,7 +159,9 @@ if (idField.includes('-')) {
     const valueStr = typeof value === 'string' ? `'${value}'` : value || "'test-id'";
 %>doc.<%= idField %> === <%= valueStr %><%
 }
-%>);
+%>);<%
+}
+%>
 
         const expected: <%= TargetType %> = {
 <% const stateKeys = Object.keys(expectedState.exampleData || {});

package/src/codegen/templates/query/projection.ts.ejs

@@ -114,12 +114,16 @@ case '<%= event.type %>': {
     * CRITICAL: Use internal state to track individual entity information:
     *
     * 1. Access current state:
-    *    const current = (document as Internal<%= pascalCase(targetName || 'State') %>) || { ...initialState, _entities: {} };
+    *    const current: Internal<%= pascalCase(targetName || 'State') %> = document ?? { ...initialState, _entities: {} };
     *
     * 2. Track entity changes:
-    *    const entityId = event.data.todoId; // or relevant ID field
-    *    const prevStatus = current._entities?.[entityId]?.status;
-    *    current._entities[entityId] = { status: 'new_status', ...otherData };
+    *    // a) Extract the unique identifier that distinguishes this entity
+    *    //    Examine event.data to find the ID field (often 'id' or '<entity>Id')
+    *    const entityId = event.data.[ENTITY_ID_FIELD];
+    *
+    *    // b) Store/update entity state with relevant properties from event.data
+    *    //    Include only fields needed for aggregation calculations
+    *    current._entities[entityId] = { [field]: value, ... };
     *
     * 3. Calculate aggregates from entity states:
     *    const counts = Object.values(current._entities).reduce((acc, entity) => {
@@ -165,7 +169,7 @@ case '<%= event.type %>': {
     *    }
     *
     * 2. Cast document parameter to extended type:
-    *    const current: Internal<%= pascalCase(targetName || 'State') %> = (document as Internal<%= pascalCase(targetName || 'State') %>) || { ...defaults };
+    *    const current: Internal<%= pascalCase(targetName || 'State') %> = document ?? { ...defaults };
     *
     * 3. Cast return values to extended type:
     *    return { ...allFields, internalField } as Internal<%= pascalCase(targetName || 'State') %>;