@izara_project/izara-core-generate-service-code 1.0.79 → 1.0.81

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-core-generate-service-code",
-  "version": "1.0.79",
+  "version": "1.0.81",
   "description": "Code for locally generating per service files",
   "homepage": "https://bitbucket.org/izara-core-support-services/izara-core-support-services-generate-service-code#readme",
   "repository": {
@@ -26,13 +26,13 @@
     "@izara_project/izara-shared-core": "^1.0.13",
     "ejs": "^6.0.1",
     "js-beautify": "^2.0.3",
-    "ws": "^8.21.2",
+    "ws": "^8.21.3",
     "yaml": "^2.9.0"
   },
   "devDependencies": {
     "@izara_project/izara-core-library-logger": "^1.0.11",
-    "@izara_project/izara-core-library-service-schemas": "1.0.161",
-    "@izara_project/izara-shared-service-schemas": "^1.0.70",
+    "@izara_project/izara-core-library-service-schemas": "1.0.162",
+    "@izara_project/izara-shared-service-schemas": "^1.0.71",
     "jest": "^30.4.2",
     "prettier": "^3.9.6",
     "prettier-plugin-ejs": "^1.0.3"

package/src/emit/coreFunction/templates/InitialSetupConfig.ejs

@@ -146,13 +146,44 @@ const tableConfigs = {
     }
   });
 
+  const stepSubs = [];
+  const seenStepSubs = new Set();
+  (flows || []).forEach(function(flow) {
+    const flowTag = flow?.flowTag ? flow.flowTag[0].toUpperCase() + flow.flowTag.slice(1) : '';
+    (flow?.flowSteps || []).forEach(function(step) {
+      if (Array.isArray(step?.previousSteps)) {
+        const stepName = step?.stepName ? step.stepName[0].toUpperCase() + step.stepName.slice(1) : '';
+        const functionName = stepName.startsWith(flowTag) ? stepName : `${flowTag}${stepName}`;
+        const queueName = `${functionName}HdrSqs`;
+        step.previousSteps.forEach(function(prev) {
+          if (prev && prev.sourceType === 'extTopic' && prev.serviceTag && prev.topicName) {
+            const key = `${prev.serviceTag}:${prev.topicName}:${queueName}`;
+            if (!seenStepSubs.has(key)) {
+              seenStepSubs.add(key);
+              stepSubs.push({
+                serviceTag: prev.serviceTag,
+                topicName: prev.topicName,
+                sqsEndpoint: queueName
+              });
+            }
+          }
+        });
+      }
+    });
+  });
+
   const rbacSubs = [];
   if (crud && typeof rbacValidatorServiceTags !== 'undefined' && rbacValidatorServiceTags && rbacValidatorServiceTags.length > 0) {
     const allRbacTags = Array.from(new Set(['Rbac', ...rbacValidatorServiceTags]));
+    const hasGraph = typeof objectGraphServiceTags !== 'undefined' && objectGraphServiceTags && objectGraphServiceTags.length > 0;
+    const updateEndpoint = hasGraph ? 'UpdateRbacCallbackHdrSqs' : 'UpdateCompleteHdrSqs';
+    const deleteEndpoint = hasGraph ? 'DeleteRbacCallbackHdrSqs' : 'DeleteCompleteHdrSqs';
     allRbacTags.forEach(function(tag) {
-      rbacSubs.push({ serviceTag: tag, topicName: 'ValidatorRbac_Out', sqsEndpoint: 'CreateCompleteHdrSqs' });
-      rbacSubs.push({ serviceTag: tag, topicName: 'ValidatorRbac_Out', sqsEndpoint: 'UpdateCompleteHdrSqs' });
-      rbacSubs.push({ serviceTag: tag, topicName: 'ValidatorRbac_Out', sqsEndpoint: 'DeleteCompleteHdrSqs' });
+      if (!hasGraph) {
+        rbacSubs.push({ serviceTag: tag, topicName: 'ValidatorRbac_Out', sqsEndpoint: 'CreateCompleteHdrSqs' });
+      }
+      rbacSubs.push({ serviceTag: tag, topicName: 'ValidatorRbac_Out', sqsEndpoint: updateEndpoint });
+      rbacSubs.push({ serviceTag: tag, topicName: 'ValidatorRbac_Out', sqsEndpoint: deleteEndpoint });
     });
   }
 -%>
@@ -195,6 +226,19 @@ const snsTopicSubscriptions = [
   },
 <% }); -%>
 <% } -%>
+<% if (stepSubs.length > 0) { -%>
+
+  // ------------------------------------------------------------
+  // Step Subscriptions (from previousSteps)
+  // ------------------------------------------------------------
+<% stepSubs.forEach(function(sub, idx) { -%>
+  {
+    serviceTag: '<%= sub.serviceTag %>',
+    topicName: '<%= sub.topicName %>',
+    sqsEndpoint: '<%= sub.sqsEndpoint %>'
+  },
+<% }); -%>
+<% } -%>
 <% if (rbacSubs.length > 0) { -%>
 
   // ------------------------------------------------------------

package/src/emit/crud/emitCrudApplicationArtifacts.js

@@ -89,7 +89,8 @@ async function emitAction(action, objects, serviceTag) {
     startConfig: null,
     objects: action === 'Create' ? [] : objects,
     isCrudObject,
-    hasRbacAddOn: (object) => hasRbacAddOn(object, objects)
+    hasRbacAddOn: (object) => hasRbacAddOn(object, objects),
+    plan
   };
   const artifacts = [
     {
@@ -276,13 +277,19 @@ async function emitAction(action, objects, serviceTag) {
 
   if (plan.hasComplete) {
     const completeMain = `${action}Complete_Main`;
+    const templateName =
+      plan.hasRbac && !plan.hasGraph
+        ? 'FlowEndpointRbacCallback_Main.ejs'
+        : `${action}Complete_Main.ejs`;
+    const templateContext =
+      plan.hasRbac && !plan.hasGraph
+        ? shared
+        : { action, ...shared };
+
     artifacts.push(
       {
         path: `${source}/${completeMain}.js`,
-        content: await render(
-          plan.hasRbac ? 'FlowEndpointRbacCallback_Main.ejs' : `${action}Complete_Main.ejs`,
-          plan.hasRbac ? shared : { action }
-        )
+        content: await render(templateName, templateContext)
       },
       {
         path: `${source}/${action}Complete_HdrSqs.js`,

package/src/emit/crud/templates/CreateComplete_Main.ejs

@@ -118,8 +118,10 @@ export default async function CreateComplete(
             }
           : null;
       if (status === 'complete') {
+        const listOfRecords =
+          result?.additionalAttributes?.listOfRecords ?? [];
         await Promise.all(
-          (pending.listOfRecords ?? []).flatMap((records) =>
+          (listOfRecords ?? []).flatMap((records) =>
             Object.values(records).map(async (record) =>
               dynamodbSharedLib.putItem(
                 _izContext,
@@ -137,9 +139,12 @@ export default async function CreateComplete(
           )
         );
       }
+      const callingFlowConfig =
+        result?.additionalAttributes?.callingFlowConfig ||
+        passBackProperties;
       const message =
         callingFlowSharedLib.addParentPassBackPropertiesToSnsResponseMessageObject(
-          passBackProperties,
+          callingFlowConfig,
           {
             objType: returnValue.requestParams.objType,
             objInstanceFull: node.objInstanceFull,
@@ -152,7 +157,7 @@ export default async function CreateComplete(
         );
       const messageAttributes =
         callingFlowSharedLib.addParentPassBackCallingFlowToSnsResponseMessageAttributes(
-          passBackProperties,
+          callingFlowConfig,
           {}
         );
       const topicArn = snsSharedLib.snsTopicArnByFlowSchema(

package/src/emit/crud/templates/CreateEndpoint_Main.ejs

@@ -375,7 +375,12 @@ export default async function <%- flowTag %>(
           _izContext.uniqueRequestId,
           'logical_<%= objectType %>'
         ),
-        awaitingMultipleStepIds
+        awaitingMultipleStepIds,
+        {
+          additionalAttributes: {
+            callingFlowConfig
+          }
+        }
       );
 
       //(<beforePublish_<%= objectType %>>)

package/src/emit/crud/templates/CreateLogicalLib.ejs

@@ -364,7 +364,12 @@ export async function <%- flowTag %>LogicalLib(
           _izContext.uniqueRequestId,
           PREFIX.CREATE_OBJECT_ASYNC_COMPLETE
         ),
-        allAwaitingStepsId
+        allAwaitingStepsId,
+        {
+          additionalAttributes: {
+            callingFlowConfig
+          }
+        }
       );
     }
 

package/src/emit/crud/templates/DeleteComplete_Main.ejs

@@ -118,8 +118,10 @@ export default async function DeleteComplete(
             }
           : null;
       if (status === 'complete') {
+        const listOfRecords =
+          result?.additionalAttributes?.listOfRecords ?? [];
         await Promise.all(
-          (pending.listOfRecords ?? []).flatMap((records) =>
+          (listOfRecords ?? []).flatMap((records) =>
             Object.values(records).map(async (record) =>
               dynamodbSharedLib.putItem(
                 _izContext,
@@ -137,9 +139,12 @@ export default async function DeleteComplete(
           )
         );
       }
+      const callingFlowConfig =
+        result?.additionalAttributes?.callingFlowConfig ||
+        passBackProperties;
       const message =
         callingFlowSharedLib.addParentPassBackPropertiesToSnsResponseMessageObject(
-          passBackProperties,
+          callingFlowConfig,
           {
             objType: returnValue.requestParams.objType,
             objInstanceFull: node.objInstanceFull,
@@ -152,7 +157,7 @@ export default async function DeleteComplete(
         );
       const messageAttributes =
         callingFlowSharedLib.addParentPassBackCallingFlowToSnsResponseMessageAttributes(
-          passBackProperties,
+          callingFlowConfig,
           {}
         );
       const topicArn = snsSharedLib.snsTopicArnByFlowSchema(

package/src/emit/crud/templates/DeleteEndpoint_Main.ejs

@@ -141,7 +141,7 @@ export default async function <%- flowTag %>(
             serviceTag: <%- rbacServiceTags.length === 1 ? rbacServiceTags[0] : `{ ${Object.entries(rbacServiceTagMap).map(([k, v]) => `'${k}': ${v}`).join(', ')} }[requestParams.objectType] || process.env.iz_serviceTag` %>
           },
           requestParams: requestParams,
-          nextFlowStepName: '<%- flowTag %>RbacCallback'
+          nextFlowStepName: '<%- plan?.hasRbacCallback ? `${flowTag}RbacCallback` : `${flowTag}Complete` %>'
         }
       );
 
@@ -250,7 +250,12 @@ export default async function <%- flowTag %>(
           _izContext.uniqueRequestId,
           'logical_<%= objectType %>'
         ),
-        awaitingMultipleStepIds
+        awaitingMultipleStepIds,
+        {
+          additionalAttributes: {
+            callingFlowConfig
+          }
+        }
       );
 
       //(<beforePublish_<%= objectType %>>)

package/src/emit/crud/templates/GetRangeEndpoint_Main.ejs

@@ -36,7 +36,7 @@ import dynamodbSharedLib from '@izara_project/izara-core-library-dynamodb';
 /**
  * Gets a range of objects by processing DynamoDB query
  * @param {Object} _izContext - Context object with logger
- * @param {Object} requestParams - { objectType, pk, sk, itemNum, additionalParams }
+ * @param {Object} requestParams - { objectType, identifierField, pk, startKey, sk, itemNumber, itemNum, additionalParams }
  * @param {Object} callingFlowConfig - Calling flow configuration
  * @returns {Promise<Object>} DynamoDB query result (Items, LastEvaluatedKey, etc.)
  */
@@ -63,22 +63,50 @@ export default async function <%- mainFileName %>(
     const getDataDetails = await createGetDataDetails(_izContext, objectSchema);
     _izContext.logger.debug('getDataDetails:', getDataDetails);
 
-    const { pk, sk, itemNum } = requestParams;
-
-    if (!pk) {
-      throw new Error('Partition key (pk) is required for getRange');
+    const {
+      identifierField,
+      pk,
+      startKey,
+      sk,
+      itemNumber,
+      itemNum
+    } = requestParams;
+
+    let partitionKeyValue = {};
+    if (
+      identifierField &&
+      typeof identifierField === 'object' &&
+      Object.keys(identifierField).length > 0
+    ) {
+      partitionKeyValue = identifierField;
+    } else if (pk) {
+      const pkIdentifier = objectSchema.identifiers?.find(
+        (id) => id.type === 'partitionKey'
+      );
+      const pkName =
+        pkIdentifier?.fieldName ||
+        pkIdentifier?.name ||
+        'pk';
+      partitionKeyValue = { [pkName]: pk };
+    } else {
+      throw new Error('Partition key (identifierField or pk) is required for getRange');
     }
 
     const queryElements = {};
-    if (itemNum) {
-      queryElements.limit = parseInt(itemNum, 10);
+    const limitVal = itemNumber || itemNum;
+    if (limitVal) {
+      queryElements.limit = parseInt(limitVal, 10);
     }
 
-    if (sk) {
-      if (typeof sk === 'object') {
-        queryElements.exclusiveStartKey = sk;
+    const effectiveStartKey = startKey || sk;
+    if (effectiveStartKey) {
+      if (typeof effectiveStartKey === 'object') {
+        queryElements.exclusiveStartKey = effectiveStartKey;
       } else {
-        queryElements.exclusiveStartKey = { pk: pk, sk: sk };
+        queryElements.exclusiveStartKey = {
+          ...partitionKeyValue,
+          sk: effectiveStartKey
+        };
       }
     }
 
@@ -86,17 +114,22 @@ export default async function <%- mainFileName %>(
     //(</beforeQuery>)
 
     // ── Process storage resources (DynamoDB only for getRange) ────────────────
-    let queryResult = null;
-
-    await Promise.all(
-      Object.entries(getDataDetails).map(async ([, getDataDetail]) => {
-        if (getDataDetail.storageType !== consts.STORAGE_TYPES.graph) {
-          const tableName = await dynamodbSharedLib.tableName(
-            _izContext,
-            getDataDetail.tableName,
-            getDataDetail.serviceTag
-          );
-
+    const queryResults = [];
+
+    for (const [, getDataDetail] of Object.entries(getDataDetails)) {
+      if (getDataDetail.storageType !== consts.STORAGE_TYPES.graph) {
+        const tableName = await dynamodbSharedLib.tableName(
+          _izContext,
+          getDataDetail.tableName,
+          getDataDetail.serviceTag
+        );
+
+        let queryPartitionKeyValue = partitionKeyValue;
+        if (
+          !identifierField ||
+          typeof identifierField !== 'object' ||
+          Object.keys(identifierField).length === 0
+        ) {
           const pkIdentifier = objectSchema.identifiers?.find(
             (id) => id.type === 'partitionKey'
           );
@@ -105,26 +138,67 @@ export default async function <%- mainFileName %>(
             pkIdentifier?.fieldName ||
             pkIdentifier?.name ||
             'pk';
-          const partitionKeyValue = { [pkName]: pk };
+          queryPartitionKeyValue = { [pkName]: pk };
+        }
 
-          //(<beforeGetRangeDynamoDb>)
-          //(</beforeGetRangeDynamoDb>)
+        //(<beforeGetRangeDynamoDb>)
+        //(</beforeGetRangeDynamoDb>)
 
-          let dataFromDynamoDb = await dynamodbSharedLib.query(
-            _izContext,
-            tableName,
-            partitionKeyValue,
-            queryElements
-          );
-          _izContext.logger.debug('dataFromDynamoDb:', dataFromDynamoDb);
+        const dataFromDynamoDb = await dynamodbSharedLib.query(
+          _izContext,
+          tableName,
+          queryPartitionKeyValue,
+          queryElements
+        );
+        _izContext.logger.debug('dataFromDynamoDb:', dataFromDynamoDb);
+
+        queryResults.push(dataFromDynamoDb);
 
-          queryResult = dataFromDynamoDb;
+        //(<afterGetRangeDynamoDb>)
+        //(</afterGetRangeDynamoDb>)
+      }
+    }
+
+    let queryResult = null;
+    if (queryResults.length === 1) {
+      queryResult = queryResults[0];
+    } else if (queryResults.length > 1) {
+      const mergedItemsMap = new Map();
+      const sortKeyIdentifier = objectSchema.identifiers?.find(
+        (id) => id.type === 'sortKey'
+      );
+      const skField =
+        sortKeyIdentifier?.fieldName ||
+        sortKeyIdentifier?.name ||
+        'sk';
+
+      for (const res of queryResults) {
+        let items = [];
+        if (Array.isArray(res)) {
+          items = res;
+        } else if (res && res.Items) {
+          items = res.Items;
+        }
 
-          //(<afterGetRangeDynamoDb>)
-          //(</afterGetRangeDynamoDb>)
+        for (const item of items) {
+          let key = item[skField];
+          if (typeof key === 'undefined' || key === null) {
+            key = JSON.stringify(item);
+          }
+          if (mergedItemsMap.has(key)) {
+            mergedItemsMap.set(key, { ...mergedItemsMap.get(key), ...item });
+          } else {
+            mergedItemsMap.set(key, { ...item });
+          }
         }
-      })
-    );
+      }
+
+      queryResult = {
+        Items: Array.from(mergedItemsMap.values()),
+        Count: mergedItemsMap.size,
+        queryResults: queryResults
+      };
+    }
 
     return queryResult;
   } catch (err) {

package/src/emit/crud/templates/UpdateComplete_Main.ejs

@@ -118,8 +118,10 @@ export default async function UpdateComplete(
             }
           : null;
       if (status === 'complete') {
+        const listOfRecords =
+          result?.additionalAttributes?.listOfRecords ?? [];
         await Promise.all(
-          (pending.listOfRecords ?? []).flatMap((records) =>
+          (listOfRecords ?? []).flatMap((records) =>
             Object.values(records).map(async (record) =>
               dynamodbSharedLib.putItem(
                 _izContext,
@@ -137,9 +139,12 @@ export default async function UpdateComplete(
           )
         );
       }
+      const callingFlowConfig =
+        result?.additionalAttributes?.callingFlowConfig ||
+        passBackProperties;
       const message =
         callingFlowSharedLib.addParentPassBackPropertiesToSnsResponseMessageObject(
-          passBackProperties,
+          callingFlowConfig,
           {
             objType: returnValue.requestParams.objType,
             objInstanceFull: node.objInstanceFull,
@@ -152,7 +157,7 @@ export default async function UpdateComplete(
         );
       const messageAttributes =
         callingFlowSharedLib.addParentPassBackCallingFlowToSnsResponseMessageAttributes(
-          passBackProperties,
+          callingFlowConfig,
           {}
         );
       const topicArn = snsSharedLib.snsTopicArnByFlowSchema(

package/src/emit/crud/templates/UpdateEndpoint_Main.ejs

@@ -137,7 +137,7 @@ export default async function <%- flowTag %>(
             serviceTag: <%- rbacServiceTags.length === 1 ? rbacServiceTags[0] : `{ ${Object.entries(rbacServiceTagMap).map(([k, v]) => `'${k}': ${v}`).join(', ')} }[requestParams.objectType] || process.env.iz_serviceTag` %>
           },
           requestParams: requestParams,
-          nextFlowStepName: '<%- flowTag %>RbacCallback'
+          nextFlowStepName: '<%- plan?.hasRbacCallback ? `${flowTag}RbacCallback` : `${flowTag}Complete` %>'
         }
       );
 
@@ -246,7 +246,12 @@ export default async function <%- flowTag %>(
           _izContext.uniqueRequestId,
           'logical_<%= objectType %>'
         ),
-        awaitingMultipleStepIds
+        awaitingMultipleStepIds,
+        {
+          additionalAttributes: {
+            callingFlowConfig
+          }
+        }
       );
 
       //(<beforePublish_<%= objectType %>>)

package/src/emit/crud/templates/UpdateLogicalLib.ejs

@@ -287,7 +287,12 @@ export async function <%- flowTag %>LogicalLib(
                   asyncFlowSharedLib.createPendingStepId(
                     _izContext.uniqueRequestId
                   ),
-                  awaitingStepIds
+                  awaitingStepIds,
+                  {
+                    additionalAttributes: {
+                      callingFlowConfig
+                    }
+                  }
                 );
               _izContext.logger.debug(
                 'awaitingMultipleStep',

package/src/emit/relationship/templates/ChangeRelationshipComplete_Main.ejs

@@ -110,9 +110,14 @@ export default async function changeRelationshipComplete(
         errorsFound: errorsFound
       };
 
+      const callingFlowConfig =
+        pending?.additionalAttributes?.callingFlowConfig ||
+        result?.additionalAttributes?.callingFlowConfig ||
+        passBackProperties;
+
       changeRelCompleteMsg =
         callingFlowSharedLib.addParentPassBackPropertiesToSnsResponseMessageObject(
-          passBackProperties,
+          callingFlowConfig,
           changeRelCompleteMsg
         );
       _izContext.logger.debug(
@@ -122,7 +127,7 @@ export default async function changeRelationshipComplete(
 
       let messageAttributes =
         callingFlowSharedLib.addParentPassBackCallingFlowToSnsResponseMessageAttributes(
-          passBackProperties,
+          callingFlowConfig,
           {}
         );
       _izContext.logger.debug(

package/src/emit/relationship/templates/ChangeRelationship_Main.ejs

@@ -421,7 +421,11 @@ export default async function <%- functionName %>(
           PREFIX.changeRel // prefix, use constant further
         ),
         awaitingStepIds,
-        {}
+        {
+          additionalAttributes: {
+            callingFlowConfig
+          }
+        }
       );
 
       // prepare message body

package/src/emit/relationship/templates/CreateRelationshipComplete_Main.ejs

@@ -109,9 +109,14 @@ export default async function createRelationshipComplete(
         errorsFound: errorsFound
       };
 
+      const callingFlowConfig =
+        pending?.additionalAttributes?.callingFlowConfig ||
+        result?.additionalAttributes?.callingFlowConfig ||
+        passBackProperties;
+
       createCompleteMsg =
         callingFlowSharedLib.addParentPassBackPropertiesToSnsResponseMessageObject(
-          passBackProperties,
+          callingFlowConfig,
           createCompleteMsg
         );
       _izContext.logger.debug(
@@ -121,7 +126,7 @@ export default async function createRelationshipComplete(
 
       let messageAttributes =
         callingFlowSharedLib.addParentPassBackCallingFlowToSnsResponseMessageAttributes(
-          passBackProperties,
+          callingFlowConfig,
           {}
         );
       _izContext.logger.debug(

package/src/emit/relationship/templates/CreateRelationship_Main.ejs

@@ -449,7 +449,11 @@ export default async function createRelationship(
           PREFIX.createRel // prefix, use constant further
         ),
         awaitingStepIds,
-        {}
+        {
+          additionalAttributes: {
+            callingFlowConfig
+          }
+        }
       );
 
       // prepare message body

package/src/emit/relationship/templates/DeleteRelationshipComplete_Main.ejs

@@ -107,9 +107,14 @@ export default async function deleteRelationshipComplete(
         errorsFound: errorsFound
       };
 
+      const callingFlowConfig =
+        pending?.additionalAttributes?.callingFlowConfig ||
+        result?.additionalAttributes?.callingFlowConfig ||
+        passBackProperties;
+
       deleteRelComp =
         callingFlowSharedLib.addParentPassBackPropertiesToSnsResponseMessageObject(
-          passBackProperties,
+          callingFlowConfig,
           deleteRelComp
         );
       _izContext.logger.debug(
@@ -119,7 +124,7 @@ export default async function deleteRelationshipComplete(
 
       let messageAttributes =
         callingFlowSharedLib.addParentPassBackCallingFlowToSnsResponseMessageAttributes(
-          passBackProperties,
+          callingFlowConfig,
           {}
         );
       _izContext.logger.debug(

package/src/emit/relationship/templates/DeleteRelationship_Main.ejs

@@ -332,7 +332,11 @@ export default async function deleteRelationship(
           PREFIX.deleteRel // prefix, use constant further
         ),
         awaitingStepIds,
-        {}
+        {
+          additionalAttributes: {
+            callingFlowConfig
+          }
+        }
       );
 
       // prepare message body

package/src/emit/relationship/templates/MoveRelationshipComplete_Main.ejs

@@ -112,9 +112,14 @@ export default async function <%- functionName %>(
         errorsFound: errorsFound
       };
 
+      const callingFlowConfig =
+        pending?.additionalAttributes?.callingFlowConfig ||
+        result?.additionalAttributes?.callingFlowConfig ||
+        passBackProperties;
+
       moveRelCompleteMsg =
         callingFlowSharedLib.addParentPassBackPropertiesToSnsResponseMessageObject(
-          passBackProperties,
+          callingFlowConfig,
           moveRelCompleteMsg
         );
       _izContext.logger.debug(
@@ -124,7 +129,7 @@ export default async function <%- functionName %>(
 
       let messageAttributes =
         callingFlowSharedLib.addParentPassBackCallingFlowToSnsResponseMessageAttributes(
-          passBackProperties,
+          callingFlowConfig,
           {}
         );
       _izContext.logger.debug(

package/src/emit/relationship/templates/MoveRelationship_Main.ejs

@@ -413,7 +413,11 @@ export default async function moveRelationship(
           PREFIX.changeRel // prefix, use constant further
         ),
         awaitingStepIds,
-        {}
+        {
+          additionalAttributes: {
+            callingFlowConfig
+          }
+        }
       );
 
       // prepare message body

package/src/emit/relationship/templates/UpdateRelationshipComplete_Main.ejs

@@ -109,9 +109,14 @@ export default async function updateRelationshipComplete(
         //(</inUpdateCompleteMsg>)
       };
 
+      const callingFlowConfig =
+        pending?.additionalAttributes?.callingFlowConfig ||
+        result?.additionalAttributes?.callingFlowConfig ||
+        passBackProperties;
+
       updateCompleteMsg =
         callingFlowSharedLib.addParentPassBackPropertiesToSnsResponseMessageObject(
-          passBackProperties,
+          callingFlowConfig,
           updateCompleteMsg
         );
       _izContext.logger.debug(
@@ -121,7 +126,7 @@ export default async function updateRelationshipComplete(
 
       let messageAttributes =
         callingFlowSharedLib.addParentPassBackCallingFlowToSnsResponseMessageAttributes(
-          passBackProperties,
+          callingFlowConfig,
           {}
         );
       _izContext.logger.debug(

package/src/emit/relationship/templates/UpdateRelationship_Main.ejs

@@ -407,7 +407,11 @@ export default async function updateRelationship(
             PREFIX.updateRel // prefix, use constant further
           ),
           awaitingStepIds,
-          {}
+          {
+            additionalAttributes: {
+              callingFlowConfig
+            }
+          }
         );
 
         // prepare message body

package/src/emit/resource/emitResourceArtifacts.js

@@ -808,17 +808,18 @@ function collectTables(schemas) {
     const identifiers = Array.isArray(schema.identifiers)
       ? schema.identifiers
       : [];
-    const pk =
-      keyName(
-        identifiers.find(
-          (identifier) =>
-            identifier.type === 'partitionKey' ||
-            identifier.type === 'identifier'
-        )
-      ) ?? 'PK';
-    const sk = keyName(
-      identifiers.find((identifier) => identifier.type === 'sortKey')
+    const pkIdentifier = identifiers.find(
+      (identifier) =>
+        identifier.type === 'partitionKey' ||
+        identifier.type === 'identifier'
     );
+    const skIdentifier = identifiers.find(
+      (identifier) => identifier.type === 'sortKey'
+    );
+    const pk = keyName(pkIdentifier) ?? 'PK';
+    const sk = keyName(skIdentifier);
+    const pkType = keyAttributeType(pkIdentifier, schema);
+    const skType = keyAttributeType(skIdentifier, schema);
     for (const resource of Object.values(schema.storageResources)) {
       if (
         (resource?.storageType === 'dynamo' ||
@@ -827,12 +828,66 @@ function collectTables(schemas) {
         resource.tableName &&
         !tables.has(resource.tableName)
       )
-        tables.set(resource.tableName, { pk, sk });
+        tables.set(resource.tableName, { pk, sk, pkType, skType });
     }
   }
   return tables;
 }
 
+function keyAttributeType(identifier, schema) {
+  if (!identifier) return 'S';
+  if (identifier.attributeType) {
+    return identifier.attributeType;
+  }
+  if (identifier.dataType) {
+    return mapTypeToAttributeType(identifier.dataType);
+  }
+  if (identifier.fieldType) {
+    return mapTypeToAttributeType(identifier.fieldType);
+  }
+  const fieldName = identifier.fieldName ?? identifier.name;
+  if (fieldName && schema) {
+    let fieldDef =
+      schema.fieldNames?.[fieldName] ?? schema.properties?.[fieldName];
+    if (!fieldDef && Array.isArray(schema.addOnDataStructure)) {
+      for (const addOn of schema.addOnDataStructure) {
+        if (addOn?.fieldNames?.[fieldName]) {
+          fieldDef = addOn.fieldNames[fieldName];
+          break;
+        }
+      }
+    }
+    if (fieldDef?.attributeType) {
+      return fieldDef.attributeType;
+    }
+    const type = fieldDef?.type ?? fieldDef?.dataType;
+    if (type) {
+      return mapTypeToAttributeType(type);
+    }
+  }
+  return 'S';
+}
+
+function mapTypeToAttributeType(type) {
+  if (typeof type !== 'string') return 'S';
+  const lower = type.toLowerCase();
+  if (
+    lower === 'number' ||
+    lower === 'numeric' ||
+    lower === 'integer' ||
+    lower === 'float' ||
+    lower === 'int' ||
+    lower === 'double' ||
+    lower === 'n'
+  ) {
+    return 'N';
+  }
+  if (lower === 'binary' || lower === 'b') {
+    return 'B';
+  }
+  return 'S';
+}
+
 function keyName(identifier) {
   if (!identifier) return null;
   return (

package/src/emit/resource/templates/DynamoDBTable_Yaml.ejs

@@ -6,10 +6,10 @@
     BillingMode: PAY_PER_REQUEST
     AttributeDefinitions:
       - AttributeName: '<%- pk %>'
-        AttributeType: 'S'
+        AttributeType: '<%- pkType || 'S' %>'
       <% if (sk) { %>
       - AttributeName: '<%- sk %>'
-        AttributeType: 'S'
+        AttributeType: '<%- skType || 'S' %>'
     <% } %>
     KeySchema:
       - AttributeName: '<%- pk %>'
@@ -18,6 +18,6 @@
       - AttributeName: '<%- sk %>'
         KeyType: 'RANGE'
 <% } %>
-    #<#<%- tableName %>TableSetting#>
-    #<#/<%- tableName %>TableSetting#>
+#<#<%- tableName %>TableSetting#>
+#<#/<%- tableName %>TableSetting#>
 

package/test/crudApplicationArtifacts.test.js

@@ -282,6 +282,17 @@ test('emits GetRangeHdrApi when an object defines a sortKey identifier', async (
   );
   assert.match(yaml, /GetRangeHdrApi:/);
   assert.match(yaml, /path: \/orders\/order\/getRange/);
+  const getRangeMain = await readFile(
+    join(
+      rootPath,
+      'app/src/generatedCode/FlowObjects/Get/source/GetRange_Main.js'
+    ),
+    'utf8'
+  );
+  assert.match(getRangeMain, /identifierField/);
+  assert.match(getRangeMain, /startKey/);
+  assert.match(getRangeMain, /itemNumber/);
+  assert.match(getRangeMain, /queryResults/);
 });
 
 test('removes managed CRUD artifacts when no applicable object remains', async () => {

package/test/customFlowApplicationArtifacts.test.js

@@ -914,9 +914,8 @@ test('renders RBAC Validator subscriptions in InitialSetupConfig when object has
   );
   assert.match(initialSetupConfigContent, /serviceTag: 'UserAccount'/);
   assert.match(initialSetupConfigContent, /topicName: 'ValidatorRbac_Out'/);
-  assert.match(initialSetupConfigContent, /sqsEndpoint: 'CreateCompleteHdrSqs'/);
-  assert.match(initialSetupConfigContent, /sqsEndpoint: 'UpdateCompleteHdrSqs'/);
-  assert.match(initialSetupConfigContent, /sqsEndpoint: 'DeleteCompleteHdrSqs'/);
+  assert.match(initialSetupConfigContent, /sqsEndpoint: 'UpdateRbacCallbackHdrSqs'/);
+  assert.match(initialSetupConfigContent, /sqsEndpoint: 'DeleteRbacCallbackHdrSqs'/);
 });
 
 test('deduplicates duplicate nextSteps topics across flowSteps in InitialSetupConfig', async () => {
@@ -1111,3 +1110,60 @@ test('renders multi-type array for mixed property and messageAttribute type in h
     /Value:\s*\{\s*type:\s*\['string',\s*'number',\s*'integer',\s*'boolean',\s*'null',\s*'object',\s*'array'\]/
   );
 });
+
+test('renders previousSteps extTopic subscriptions in InitialSetupConfig', async () => {
+  const rootPath = await mkdtemp(
+    join(tmpdir(), 'generate-service-code-v2-prevsteps-')
+  );
+  roots.add(rootPath);
+  const schemas = join(rootPath, 'app/src/schemas/FlowSchemas');
+  await mkdir(schemas, { recursive: true });
+  await writeFile(
+    join(schemas, 'Order.js'),
+    `export default [
+      {
+        flowTag: 'order',
+        event: ['ownTopic'],
+        flowSteps: [
+          {
+            stepName: 'Start'
+          },
+          {
+            stepName: 'BuildOrderSellOfferLinkAndReserveOrderData',
+            properties: ['returnValue', 'parentFlowId', 'status'],
+            messageAttributes: [],
+            event: ['extTopic'],
+            previousSteps: [
+              {
+                sourceType: 'extTopic',
+                serviceTag: 'GraphHandler',
+                topicName: 'CreateNode_Out',
+                fromStepNames: ['start']
+              }
+            ]
+          }
+        ]
+      }
+    ];\n`
+  );
+
+  const result = await generate(rootPath, {
+    serviceTag: 'Order'
+  });
+  assert.ok(result);
+
+  const initialSetupConfigContent = await readFile(
+    join(
+      rootPath,
+      'app/src/generatedCode/CoreFunctions/InitialSetupConfig.js'
+    ),
+    'utf8'
+  );
+
+  assert.match(initialSetupConfigContent, /serviceTag: 'GraphHandler'/);
+  assert.match(initialSetupConfigContent, /topicName: 'CreateNode_Out'/);
+  assert.match(
+    initialSetupConfigContent,
+    /sqsEndpoint: 'OrderBuildOrderSellOfferLinkAndReserveOrderDataHdrSqs'/
+  );
+});

package/test/resourceArtifacts.test.js

@@ -244,6 +244,47 @@ test('emits DynamoDB tables and hooks defined in flowSchemas storageResources',
   assert.match(dynamoYaml, /#<#\/FlowCustomTableTableSetting#>/);
 });
 
+test('emits DynamoDB table with number sortKey attribute type when field type is number', async () => {
+  const rootPath = await createProject();
+  await writeFile(
+    join(rootPath, 'app/src/schemas/ObjectSchemas/CartOrder.js'),
+    "export default { " +
+      "objectType: 'cartOrder', " +
+      "generatedBy: 'userGenerated', " +
+      "fieldNames: { " +
+      "  cartId: { type: 'string' }, " +
+      "  sortId: { type: 'number' } " +
+      "}, " +
+      "identifiers: [ " +
+      "  { type: 'partitionKey', fieldName: 'cartId' }, " +
+      "  { type: 'sortKey', fieldName: 'sortId' } " +
+      "], " +
+      "storageResources: { " +
+      "  main: { storageType: 'dynamoDB', tableName: 'CartOrders' } " +
+      "} " +
+      "};\n"
+  );
+
+  await generateResourceArtifacts(rootPath);
+
+  const dynamoYaml = await readFile(
+    join(
+      rootPath,
+      'resource/sls_yaml/generatedCode/source/generated-dynamoDB-table.yml'
+    ),
+    'utf8'
+  );
+  assert.match(dynamoYaml, /CartOrdersTable:/);
+  assert.match(
+    dynamoYaml,
+    /AttributeName:\s*'cartId'[\s\S]*?AttributeType:\s*'S'/
+  );
+  assert.match(
+    dynamoYaml,
+    /AttributeName:\s*'sortId'[\s\S]*?AttributeType:\s*'N'/
+  );
+});
+
 test('emits IAM role for generated DSQ flows in generate-shared-resource.yml', async () => {
   const rootPath = await createProject();
   const schemas = join(rootPath, 'app/src/schemas');