@auto-engineer/server-generator-apollo-emmett 1.87.0 → 1.88.0

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

@@ -2,7 +2,9 @@
 const targetName = slice?.server?.data?.items?.[0]?.target?.name || 'UnknownState';
 const TargetType = pascalCase(targetName);
 const projName = projectionName || "UnknownProjection";
-const idField = projectionIdField ?? 'id';
+const isCompositeKey = Array.isArray(projectionIdField);
+const compositeKeyFields = isCompositeKey ? projectionIdField : [];
+const idField = typeof projectionIdField === 'string' ? projectionIdField : 'id';
 const uniqueEventTypes = allEventTypesArray;
 
 // Extract query name from the slice's request field for query action detection
@@ -70,6 +72,29 @@ function formatSpecValue(value, tsType) {
     return `'${value}'`;
 }
 
+function findIdFieldValue(fieldName, expectedState, allTestEvents, isQueryActionTest, testCase) {
+    let value = expectedState.exampleData?.[fieldName];
+    if (value === undefined) {
+        for (const evt of allTestEvents) {
+            if (evt.exampleData?.[fieldName] !== undefined) {
+                value = evt.exampleData[fieldName];
+                break;
+            }
+        }
+    }
+    if (value === undefined && isQueryActionTest && testCase.when?.args) {
+        value = testCase.when.args[fieldName];
+    }
+    return value;
+}
+
+function formatIdLookupValue(value) {
+    if (value === undefined || value === null) return null;
+    if (typeof value === 'object') return null;
+    const inferredType = typeof value === 'number' ? 'number' : typeof value === 'boolean' ? 'boolean' : 'string';
+    return formatSpecValue(value, inferredType);
+}
+
 const queryName = extractQueryName(slice?.request);
 const ruleGroups = new Map();
 
@@ -228,20 +253,21 @@ _%>
           .findOne(<% if (projectionSingleton) { %>);<%
 } else {
 %>(doc) => <%
-const idField = projectionIdField ?? 'id';
-if (idField.includes('-')) {
-    // Handle composite keys
-    const parts = idField.split('-');
-    const conditions = parts.map(part => {
-        const value = expectedState.exampleData?.[part];
-        const valueStr = typeof value === 'string' ? `'${value}'` : value || "'test-value'";
-        return `doc.${part} === ${valueStr}`;
+if (isCompositeKey) {
+    const conditions = compositeKeyFields.map(part => {
+        const value = findIdFieldValue(part, expectedState, allTestEvents, isQueryActionTest, testCase);
+        const formatted = formatIdLookupValue(value);
+        return `doc.${part} === ${formatted ?? "'test-id'"}`;
     }).join(' && ');
 %><%= conditions %><%
 } else {
-    const value = expectedState.exampleData?.[idField];
-    const valueStr = typeof value === 'string' ? `'${value}'` : value || "'test-id'";
-%>doc.<%= idField %> === <%= valueStr %><%
+    const value = findIdFieldValue(idField, expectedState, allTestEvents, isQueryActionTest, testCase);
+    const formatted = formatIdLookupValue(value);
+    if (formatted !== null) {
+%>doc.<%= idField %> === <%= formatted %><%
+    } else {
+%>doc.<%= idField %> === 'test-id'<%
+    }
 }
 %>);<%
 }