@auto-engineer/server-generator-apollo-emmett 1.110.4 → 1.110.6

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

@@ -277,13 +277,23 @@ if (isCompositeKey) {
 }
 %>
 
-        const expected: <%= TargetType %> = {
-<% const stateKeys = Object.keys(expectedState.exampleData || {});
+<%
+   const stateKeys = Object.keys(expectedState.exampleData || {});
+   const queryArgs = isQueryActionTest
+     ? (testCase.when?.args
+       || (Array.isArray(testCase.when) && testCase.when[0]?.exampleData)
+       || {})
+     : {};
+   const queryArgKeys = new Set(Object.keys(queryArgs));
+   const assertionKeys = stateKeys.filter(k => !queryArgKeys.has(k));
    const stateMessage = messages.find(m => m.name === targetName);
-   for (let i = 0; i < stateKeys.length; i++) {
-     const key = stateKeys[i];
+   const isPartial = assertionKeys.length < stateKeys.length;
+-%>
+        const expected<%= isPartial ? '' : `: ${TargetType}` %> = {
+<% for (let i = 0; i < assertionKeys.length; i++) {
+     const key = assertionKeys[i];
      const value = expectedState.exampleData[key];
-     const isLast = i === stateKeys.length - 1;
+     const isLast = i === assertionKeys.length - 1;
      const field = stateMessage?.fields?.find(f => f.name === key);
      const tsType = field?.tsType || field?.type || 'string';
      const formattedValue = formatSpecValue(value, tsType);

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

@@ -132,6 +132,11 @@ case '<%= event.type %>': {
 * Preserve all import paths above — they are generated from the model.
 * ⚠️ `document` may be null (first event for this entity). Guard before accessing properties.
 *
+* CONSTRAINTS:
+* - NEVER use `as SomeType` type assertions. Declare typed variables instead: `const x: Type = value;`
+* - Only reference event.data fields listed in the "Event fields:" line below.
+* - Do NOT modify anything outside this case block: imports, type parameters, canHandle, collectionName, and getDocumentId are auto-generated.
+*
 <% if (isSingleton) { -%>
     * **SINGLETON AGGREGATION PATTERN**
     *
@@ -188,11 +193,12 @@ case '<%= event.type %>': {
     *      internalField: SomeType;
     *    }
     *
-    * 2. Cast document parameter to extended type:
+    * 2. Assign document to extended type:
     *    const current: Internal<%= pascalCase(targetName || 'State') %> = document ?? { ...defaults };
     *
-    * 3. Cast return values to extended type:
-    *    return { ...allFields, internalField } as Internal<%= pascalCase(targetName || 'State') %>;
+    * 3. Return via typed variable (preserves internal state for next event):
+    *    const result: Internal<%= pascalCase(targetName || 'State') %> = { ...allFields, internalField };
+    *    return result;
     *
     * This keeps internal state separate from the public GraphQL schema.
 <% } -%>

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

@@ -114,9 +114,9 @@ describe('query.resolver.ts.ejs', () => {
           return model.find((item) => {
             if (location !== undefined && item.location !== location) return false;
 
-            // TODO: 'maxPrice' has no matching field on the state type — implement custom filter logic.
+            // NOTE: 'maxPrice' has no matching field on the state type — add custom filter logic if needed.
 
-            // TODO: 'minGuests' has no matching field on the state type — implement custom filter logic.
+            // NOTE: 'minGuests' has no matching field on the state type — add custom filter logic if needed.
 
             return true;
           });
@@ -935,7 +935,7 @@ describe('query.resolver.ts.ejs', () => {
           // If this query should return a single item, switch to findOne().
 
           return model.find((item) => {
-            // TODO: 'pantryId' has no matching field on the state type — implement custom filter logic.
+            // NOTE: 'pantryId' has no matching field on the state type — add custom filter logic if needed.
 
             return true;
           });
@@ -1177,7 +1177,7 @@ describe('query.resolver.ts.ejs', () => {
           // If this query should return a single item, switch to findOne().
 
           return model.find((item) => {
-            // TODO: 'pantryId' has no matching field on the state type — implement custom filter logic.
+            // NOTE: 'pantryId' has no matching field on the state type — add custom filter logic if needed.
 
             return true;
           });

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

@@ -170,7 +170,7 @@ return model.find((<%= hasArgs ? 'item' : '_item' %>) => {
             if (stateFieldNames.has(arg.name)) { %>
     if (<%= arg.name %> !== undefined && item.<%= arg.name %> !== <%= arg.name %>) return false;
 <%          } else { %>
-    // TODO: '<%= arg.name %>' has no matching field on the state type — implement custom filter logic.
+    // NOTE: '<%= arg.name %>' has no matching field on the state type — add custom filter logic if needed.
 <%          }
         }
 } %>

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

@@ -256,6 +256,13 @@ describe('handle.ts.ejs (react slice)', () => {
              *   NEVER hardcode values copied from test assertions.
              *
              * Preserve all import paths above — they are generated from the model.
+             *
+             * CONSTRAINTS:
+             * - NEVER use \`as SomeType\` type assertions. Use typed variable declarations.
+             * - Only reference event.data fields listed in the "Event fields:" comment below. Check the type before accessing any field.
+             * - Do NOT modify the inMemoryReactor configuration, connectionOptions, import statements, or commandSender.send() call structure. Only fill in data fields marked TODO.
+             * - When event.data contains nested arrays/objects (e.g., exercises[].sets[]), iterate them to compute values. Do NOT cast arrays/objects to primitive types.
+             *
              * Add business logic (validation, conditional sends) as needed.
              */
 

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

@@ -60,6 +60,13 @@ const willHaveAggregateStream = states.some(state =>
 <% if (willHaveAggregateStream) { -%>
     * Do NOT modify or remove aggregateStream calls — they load required state.
 <% } -%>
+    *
+    * CONSTRAINTS:
+    * - NEVER use `as SomeType` type assertions. Use typed variable declarations.
+    * - Only reference event.data fields listed in the "Event fields:" comment below. Check the type before accessing any field.
+    * - Do NOT modify the inMemoryReactor configuration, connectionOptions, import statements, or commandSender.send() call structure. Only fill in data fields marked TODO.
+    * - When event.data contains nested arrays/objects (e.g., exercises[].sets[]), iterate them to compute values. Do NOT cast arrays/objects to primitive types.
+    *
     * Add business logic (validation, conditional sends) as needed.
     */
 <%

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

@@ -246,6 +246,12 @@ describe('register.ts.ejs (react slice)', () => {
            *   evolve: (s: Record<string, unknown>, e: { type: string; data: Record<string, unknown> }) => ...
            * - NEVER hardcode values copied from test assertions.
            * - Preserve all import paths above — they are generated from the model.
+           *
+           * CONSTRAINTS:
+           * - NEVER use \`as SomeType\` type assertions. Use typed variable declarations.
+           * - Only reference fields that exist on the event type (BookingRequested). Check the import above.
+           * - Do NOT modify the messageBus.subscribe() call, function signature, or import statements.
+           * - When event.data contains nested arrays/objects, iterate them. Do NOT cast to primitive types.
            */
 
           // await messageBus.send({

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

@@ -38,6 +38,12 @@ async (event: <%= pascalCase(eventType) %>) => {
 *   evolve: (s: Record<string, unknown>, e: { type: string; data: Record<string, unknown> }) => ...
 * - NEVER hardcode values copied from test assertions.
 * - Preserve all import paths above — they are generated from the model.
+*
+* CONSTRAINTS:
+* - NEVER use `as SomeType` type assertions. Use typed variable declarations.
+* - Only reference fields that exist on the event type (<%= pascalCase(eventType) %>). Check the import above.
+* - Do NOT modify the messageBus.subscribe() call, function signature, or import statements.
+* - When event.data contains nested arrays/objects, iterate them. Do NOT cast to primitive types.
 */
 
 // await messageBus.send({