@izara_project/izara-core-generate-service-code 1.0.60 → 1.0.62

package/src/codeGenerators/app/src/generatedCode/Flow/FlowRbac/RbacFlowGenerator.js

@@ -35,6 +35,10 @@ export async function generateRbacFlows(allSchemas, options) {
       path.join(templateDir, '..', '..', '_shared', 'handlers', 'FlowHandler_HdrSqs.ejs'),
       'utf-8'
     ),
+    dsq: await fs.readFile(
+      path.join(templateDir, '..', '..', '_shared', 'handlers', 'FlowHandler_HdrDsq.ejs'),
+      'utf-8'
+    ),
     api: await fs.readFile(
       path.join(templateDir, '..', '..', '_shared', 'handlers', 'FlowHandler_HdrApi.ejs'),
       'utf-8'

package/src/codeGenerators/app/src/generatedCode/Flow/FlowRelationships/RelationshipFlowGenerator.js

@@ -25,6 +25,7 @@ export async function generateRelationshipFlows(allSchemas, options) {
     // Read standard handler templates for reuse
     const templates = {
         sqs: await fs.readFile(path.join(templateDir, '..', '..', '_shared', 'handlers', 'FlowHandler_HdrSqs.ejs'), 'utf-8'),
+        dsq: await fs.readFile(path.join(templateDir, '..', '..', '_shared', 'handlers', 'FlowHandler_HdrDsq.ejs'), 'utf-8'),
         api: await fs.readFile(path.join(templateDir, '..', '..', '_shared', 'handlers', 'FlowHandler_HdrApi.ejs'), 'utf-8'),
         inv: await fs.readFile(path.join(templateDir, '..', '..', '_shared', 'handlers', 'FlowHandler_HdrInv.ejs'), 'utf-8')
     };
@@ -98,7 +99,7 @@ export async function generateRelationshipFlows(allSchemas, options) {
                 generatedCount++;
             } else if (event === 'dsq') {
                 handlerFunctionName = `${processFunction}_HdrDsq`;
-                handlerContent = ejs.render(templates.sqs, {
+                handlerContent = ejs.render(templates.dsq || templates.sqs, {
                     flowTag: flowTag,
                     flowStepName: '', 
                     mainFileName: actionFileName,

package/src/codeGenerators/app/src/generatedCode/Flow/FlowSchemas/templates/endpoint/FlowEndpoint_HdrWbs.ejs

@@ -27,7 +27,7 @@ const { createFlowTypeConcat } = utils;
 import { webSocket } from '@izara_project/izara-core-library-external-request';
 const { postToConnection } = webSocket;
 
-import <%- upperCaseFlowTag %> from './<%- upperCaseFlowTag %>_Main.js';
+import <%- typeof functionName !== 'undefined' ? functionName : upperCaseFlowTag %> from './<%- typeof mainFileName !== 'undefined' ? mainFileName : `${upperCaseFlowTag}_Main` %>.js';
 
 export const main = middleware.wrap(async (event, context) => {
 
@@ -82,7 +82,7 @@ export const main = middleware.wrap(async (event, context) => {
           }
 
           let callingFlow = eventParams?.callingFlow ? eventParams.callingFlow : {};
-          await <%- upperCaseFlowTag %>(
+          await <%- typeof functionName !== 'undefined' ? functionName : upperCaseFlowTag %>(
             event._izContext,
             eventParams,
             //(<additionalParams>)

package/src/codeGenerators/app/src/generatedCode/Flow/FlowSchemas/templates/endpoint/FlowEndpoint_Main.ejs

@@ -56,7 +56,7 @@ const { createFlowTypeConcat } = utils;
  * @returns {object} description of return value
  */
 
-export default async function Process<%- upperCaseFlowTag %>(
+export default async function <%- typeof functionName !== 'undefined' ? functionName : `Process${upperCaseFlowTag}` %>(
   _izContext,
   requestParams,
   callingFlowConfig = {},
@@ -65,11 +65,15 @@ export default async function Process<%- upperCaseFlowTag %>(
 ) {
 
   try {
-    _izContext.logger.debug("Process<%- upperCaseFlowTag %> _izContext", _izContext)
-    _izContext.logger.debug("Process<%- upperCaseFlowTag %> requestParams", requestParams)
-    _izContext.logger.debug("Process<%- upperCaseFlowTag %> callingFlowConfig", callingFlowConfig)
+    _izContext.logger.debug("<%- typeof functionName !== 'undefined' ? functionName : `Process${upperCaseFlowTag}` %> _izContext", _izContext)
+    _izContext.logger.debug("<%- typeof functionName !== 'undefined' ? functionName : `Process${upperCaseFlowTag}` %> requestParams", requestParams)
+    _izContext.logger.debug("<%- typeof functionName !== 'undefined' ? functionName : `Process${upperCaseFlowTag}` %> callingFlowConfig", callingFlowConfig)
 
 <% if (typeof flow !== 'undefined' && flow.statusType === 'storedCache') { %>
+
+    //(<beforeCheckCache>)
+    //(</beforeCheckCache>)
+
     let [ cacheMainStatus, cacheMain, cacheExist ] = await storedCacheSharedLib.checkStoredCacheStatus(
       _izContext,
       "<%= tableName %>",

package/src/codeGenerators/app/src/generatedCode/Flow/FlowSchemas/templates/endpoint/FlowMain_Wbs.ejs

@@ -48,7 +48,7 @@ const { postToConnection } = webSocket;
  * @returns {object} description of return value
  */
 
-export default async function <%- upperCaseFlowTag %>(
+export default async function <%- typeof functionName !== 'undefined' ? functionName : upperCaseFlowTag %>(
   _izContext,
   requestParams,
   //(<additionalParams>)
@@ -57,9 +57,9 @@ export default async function <%- upperCaseFlowTag %>(
 ) {
 
   try {
-    _izContext.logger.debug("<%- upperCaseFlowTag %> _izContext", _izContext)
-    _izContext.logger.debug("<%- upperCaseFlowTag %> requestParams", requestParams)
-    _izContext.logger.debug("<%- upperCaseFlowTag %> callingFlowConfig", callingFlowConfig)
+    _izContext.logger.debug("<%- typeof functionName !== 'undefined' ? functionName : upperCaseFlowTag %> _izContext", _izContext)
+    _izContext.logger.debug("<%- typeof functionName !== 'undefined' ? functionName : upperCaseFlowTag %> requestParams", requestParams)
+    _izContext.logger.debug("<%- typeof functionName !== 'undefined' ? functionName : upperCaseFlowTag %> callingFlowConfig", callingFlowConfig)
 
     let flowSchema = await getObjectSchema.getFlowSchemaS3WithCache(_izContext, {
       flowTag: "<%- flowTag %>",

package/src/codeGenerators/app/src/generatedCode/Flow/FlowSchemas/templates/s3/CreatePreSignUrl_Main.ejs

@@ -26,7 +26,7 @@ import { lambda, sns } from '@izara_project/izara-core-library-external-request'
 
 import { S3Client } from '@aws-sdk/client-s3';
 import { createPresignedPost } from '@aws-sdk/s3-presigned-post';
-const client = new S3Client({ region: 'us-east-2' });
+const client = new S3Client({ region: process.env.AWS_REGION });
 import { consts } from '@izara_project/izara-middleware';
 
 import { postToConnection, getNestObject } from '../../../../libs/source/GenerateCodeLibs.js'

package/src/codeGenerators/app/src/generatedCode/Flow/FlowSchemas/templates/s3/ProcessS3File_Main.ejs

@@ -16,7 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import { S3Client, GetObjectCommand, DeleteObjectCommand, PutObjectCommand, CopyObjectCommand } from '@aws-sdk/client-s3';
-const s3 = new S3Client({ region: 'us-east-2' });
+const s3 = new S3Client({ region: process.env.AWS_REGION });
 
 //(<optionalRequired>)
 //(</optionalRequired>)

package/src/codeGenerators/app/src/generatedCode/Flow/FlowSchemas/templates/step/FlowEndpointComplete_Main.ejs

@@ -39,7 +39,7 @@ const PREFIX = {
  * @param {*} graphServiceTag
  * @param {*} errorsFound
  */
-function validateInput(returnValue, status, graphServiceTag, errorsFound) {
+function _validateInput(returnValue, status, graphServiceTag, errorsFound) {
   if (!Object.prototype.hasOwnProperty.call(returnValue, 'queryResult')) {
     errorsFound.push(
       'message is not have property queryResult, should be not happen',
@@ -83,7 +83,7 @@ function validateInput(returnValue, status, graphServiceTag, errorsFound) {
 /**
  * @param {*} value
  */
-function isEmpty(value) {
+function _isEmpty(value) {
   if (value == null) return true;
 
   if (
@@ -108,7 +108,7 @@ function isEmpty(value) {
  * @param {*} returnValue
  * @returns {object|null}
  */
-function buildExistsNode(returnValue) {
+function _buildExistsNode(returnValue) {
   const { existsNode } = returnValue.queryResult.return<%- upperCaseFlowTag %>Node;
   if (!existsNode || !Object.keys(existsNode).length) return null;
 
@@ -129,7 +129,7 @@ function buildExistsNode(returnValue) {
  * @param {*} errorsFound
  * @returns {object}
  */
-function buildMessageObject(returnValue, existsNode, status, errorsFound) {
+function _buildMessageObject(returnValue, existsNode, status, errorsFound) {
   const { objType } = returnValue.requestParams;
   const { return<%- upperCaseFlowTag %>Node } = returnValue.queryResult;
 
@@ -152,15 +152,14 @@ function buildMessageObject(returnValue, existsNode, status, errorsFound) {
  * @param {*} passBackProperties
  * @param {*} messageObject
  */
-async function sendSnsMessage(_izContext, passBackProperties, messageObject) {
+async function _sendSnsMessage(_izContext, passBackProperties, messageObject) {
   const enrichedMessage =
     callingFlowSharedLib.addParentPassBackPropertiesToSnsResponseMessageObject(
       passBackProperties,
       messageObject,
     );
   const messageAttributes =
-    callingFlowSharedLib.addParentPassBackCallingFlowToSnsResponseMessageAttribu
-tes(
+    callingFlowSharedLib.addParentPassBackCallingFlowToSnsResponseMessageAttributes(
       passBackProperties,
       {},
     );
@@ -211,19 +210,19 @@ export default async function <%- functionName %>(
       passBackProperties,
     });
 
-    if (isEmpty(returnValue.requestParams)) {
+    if (_isEmpty(returnValue.requestParams)) {
       _izContext.logger.debug('message callingFlowProperties is empty');
       throw new NoRetryError('message not an object');
     }
 
-    validateInput(returnValue, status, graphServiceTag, errorsFound);
+    _validateInput(returnValue, status, graphServiceTag, errorsFound);
 
     if (errorsFound.length > 0) {
       _izContext.logger.debug('Have error form graphServerTag:', errorsFound);
       errorsFound.push(errorsFound.join(','));
     }
 
-    const existsNode = buildExistsNode(returnValue);
+    const existsNode = _buildExistsNode(returnValue);
 
     const awaitingStepId = await asyncFlowSharedLib.createAwaitingStepId(
       parentFlowId,
@@ -269,7 +268,7 @@ export default async function <%- functionName %>(
             }
             }))
 
-          const messageObject = buildMessageObject(
+          const messageObject = _buildMessageObject(
             returnValue,
             existsNode,
             status,
@@ -279,7 +278,7 @@ export default async function <%- functionName %>(
           //(<beforeSendMessage>)
           //(</beforeSendMessage>)
 
-          await sendSnsMessage(_izContext, passBackProperties, messageObject);
+          await _sendSnsMessage(_izContext, passBackProperties, messageObject);
 
           //(<afterSendMessage>)
           //(</afterSendMessage>)

package/src/codeGenerators/app/src/generatedCode/Flow/_shared/events/BaseDsqHandler.js

@@ -0,0 +1,55 @@
+import ejs from 'ejs';
+import fs from 'fs/promises';
+import path from 'path';
+import { normalizePropertyType } from '../shared/propertyNormalizer.js';
+
+export async function generateDsqHandler(flow, stepName, suffix, flowOutputDir, mainFileName, templates) {
+    const upperCase = (str) => str.charAt(0).toUpperCase() + str.slice(1);
+    const flowTag = flow.flowTag;
+
+    // For entry point stepName is empty
+    const handlerFileName = stepName ? `${flowTag}${stepName}_${suffix}` : `Process${upperCase(flowTag)}_${suffix}`;
+
+    // Function name: matches default export in the referenced _Main.js
+    const functionName = stepName ? `${flowTag}${stepName}` : `Process${upperCase(flowTag)}`;
+
+    // Queue name: keep the full handler suffix so handler code matches
+    const queueNameSuffix = suffix;
+    let queueName = '';
+    if (stepName) {
+        queueName = `${flowTag}${stepName}${queueNameSuffix}`;
+    } else {
+        if (flow.event && flow.event.includes('ownTopic')) {
+            queueName = `${flowTag}${queueNameSuffix}`;
+        } else {
+            queueName = `${functionName}${queueNameSuffix}`;
+        }
+    }
+
+    let startConfig = null;
+    if (!stepName && flow.flowSteps) {
+        const startStep = flow.flowSteps && flow.flowSteps.length > 0 ? flow.flowSteps[0] : null;
+        if (startStep) {
+            startConfig = { ...startStep };
+            // Map properties
+            if (startConfig.properties && Array.isArray(startConfig.properties)) {
+                startConfig.properties = startConfig.properties.map(p => normalizePropertyType(p, flow.stepProperties));
+            }
+            // Map messageAttributes
+            if (startConfig.messageAttributes && Array.isArray(startConfig.messageAttributes)) {
+                startConfig.messageAttributes = startConfig.messageAttributes.map(p => normalizePropertyType(p, flow.stepMessageAttributes));
+            }
+        }
+    }
+
+    const handlerContent = ejs.render(templates.dsq || templates.sqs, {
+        flowTag: flowTag,
+        flowStepName: stepName || '',
+        mainFileName: mainFileName,
+        functionName: functionName,
+        queueName: queueName,
+        startConfig: startConfig
+    });
+
+    await fs.writeFile(path.join(flowOutputDir, `${handlerFileName}.js`), handlerContent, 'utf-8');
+}

package/src/codeGenerators/app/src/generatedCode/Flow/_shared/events/BaseSqsHandler.js

@@ -1,18 +1,27 @@
+import { isCrudFlow, isRbacFlow, isRelationshipFlow } from '../shared/flowClassifier.js';
+import { ownTopicFunctionName, processFunctionName } from '../shared/flowNaming.js';
 import ejs from 'ejs';
 import fs from 'fs/promises';
 import path from 'path';
+import { normalizePropertyType } from '../shared/propertyNormalizer.js';
 
 export async function generateSqsHandler(flow, stepName, suffix, flowOutputDir, mainFileName, templates) {
     const upperCase = (str) => str.charAt(0).toUpperCase() + str.slice(1);
     const flowTag = flow.flowTag;
 
+    const isOwnTopic = !stepName && !isCrudFlow(flowTag) && !isRbacFlow(flowTag) && !isRelationshipFlow(flowTag) && flow.event && flow.event.includes('ownTopic');
+
     // For entry point stepName is empty
-    const handlerFileName = stepName ? `${flowTag}${stepName}_${suffix}` : `Process${upperCase(flowTag)}_${suffix}`;
+    const handlerFileName = stepName
+        ? `${flowTag}${stepName}_${suffix}`
+        : (isOwnTopic ? `${upperCase(flowTag)}_${suffix}` : `Process${upperCase(flowTag)}_${suffix}`);
 
     // Function name: matches default export in the referenced _Main.js
     // For entry point: Process${upperCase(flowTag)} (e.g. ProcessOwnTopicFlow)
     // For steps:      ${flowTag}${flowStepName} (e.g. OwnTopicFlowProcess)
-    const functionName = stepName ? `${flowTag}${stepName}` : `Process${upperCase(flowTag)}`;
+    const functionName = stepName
+        ? `${flowTag}${stepName}`
+        : (isOwnTopic ? ownTopicFunctionName(flowTag) : processFunctionName(flowTag));
 
     // Queue name: keep the full handler suffix so handler code matches
     // the generated queue/resource names.
@@ -28,28 +37,18 @@ export async function generateSqsHandler(flow, stepName, suffix, flowOutputDir,
         }
     }
 
-    let inTagConfig = null;
+    let startConfig = null;
     if (!stepName && flow.flowSteps) {
-        const inTagStep = flow.flowSteps.find(s => s.stepName === 'InTag');
-        if (inTagStep) {
-            inTagConfig = { ...inTagStep };
+        const startStep = flow.flowSteps && flow.flowSteps.length > 0 ? flow.flowSteps[0] : null;
+        if (startStep) {
+            startConfig = { ...startStep };
             // Map properties
-            if (inTagConfig.properties && Array.isArray(inTagConfig.properties)) {
-                inTagConfig.properties = inTagConfig.properties.map(p => {
-                    if (typeof p === 'string') {
-                        return (flow.stepProperties && flow.stepProperties[p]) ? flow.stepProperties[p] : { propertyName: p, type: 'string' };
-                    }
-                    return p;
-                });
+            if (startConfig.properties && Array.isArray(startConfig.properties)) {
+                startConfig.properties = startConfig.properties.map(p => normalizePropertyType(p, flow.stepProperties));
             }
             // Map messageAttributes
-            if (inTagConfig.messageAttributes && Array.isArray(inTagConfig.messageAttributes)) {
-                inTagConfig.messageAttributes = inTagConfig.messageAttributes.map(p => {
-                    if (typeof p === 'string') {
-                        return (flow.stepMessageAttributes && flow.stepMessageAttributes[p]) ? flow.stepMessageAttributes[p] : { propertyName: p, type: 'string' };
-                    }
-                    return p;
-                });
+            if (startConfig.messageAttributes && Array.isArray(startConfig.messageAttributes)) {
+                startConfig.messageAttributes = startConfig.messageAttributes.map(p => normalizePropertyType(p, flow.stepMessageAttributes));
             }
         }
     }
@@ -60,7 +59,7 @@ export async function generateSqsHandler(flow, stepName, suffix, flowOutputDir,
         mainFileName: mainFileName,
         functionName: functionName,
         queueName: queueName,
-        inTagConfig: inTagConfig
+        startConfig: startConfig
     });
 
     await fs.writeFile(path.join(flowOutputDir, `${handlerFileName}.js`), handlerContent, 'utf-8');

package/src/codeGenerators/app/src/generatedCode/Flow/_shared/events/__tests__/BaseDsqHandler.test.js

@@ -0,0 +1,93 @@
+import { describe, it, expect, beforeEach, afterEach } from '@jest/globals';
+import fs from 'fs/promises';
+import path from 'path';
+import os from 'os';
+import { fileURLToPath } from 'url';
+import { generateDsqHandler } from '../BaseDsqHandler.js';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+describe('generateDsqHandler', () => {
+  let tmpDir;
+  beforeEach(async () => {
+    tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), 'iz-dsq-handler-'));
+  });
+  afterEach(async () => {
+    await fs.rm(tmpDir, { recursive: true, force: true });
+  });
+
+  it('generates a DSQ handler file containing reformatDsqMessage and setValidatorSchema', async () => {
+    // Read the template
+    const templatePath = path.join(__dirname, '..', '..', 'handlers', 'FlowHandler_HdrDsq.ejs');
+    const dsqTemplate = await fs.readFile(templatePath, 'utf-8');
+    const templates = { dsq: dsqTemplate };
+
+    const mockFlow = {
+      flowTag: 'createOrder',
+      event: ['dsq']
+    };
+
+    await generateDsqHandler(
+      mockFlow,
+      '', // entry point
+      'HdrDsq', // suffix
+      tmpDir, // flowOutputDir
+      'ProcessCreateOrder_Main', // mainFileName
+      templates
+    );
+
+    const generatedFilePath = path.join(tmpDir, 'ProcessCreateOrder_HdrDsq.js');
+    const generatedContent = await fs.readFile(generatedFilePath, 'utf-8');
+
+    // Verify it contains setValidatorSchema on line 39 (approx or exactly depending on formatting, let's verify substring)
+    expect(generatedContent).toContain('middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema(');
+    expect(generatedContent).toContain('type: "object"');
+    expect(generatedContent).toContain('required: [\'body\', \'messageAttributes\']');
+
+    // Verify it contains reformatDsqMessage
+    expect(generatedContent).toContain('record = recordHandlerSharedLib.reformatDsqMessage(record._izContext, record);');
+    expect(generatedContent).toContain('record._izContext.logger.debug(\'record ReceiveMsgOutHdrSqs\', record);');
+  });
+
+  it('generates a DSQ handler for step containing step properties mapping', async () => {
+    const templatePath = path.join(__dirname, '..', '..', 'handlers', 'FlowHandler_HdrDsq.ejs');
+    const dsqTemplate = await fs.readFile(templatePath, 'utf-8');
+    const templates = { dsq: dsqTemplate };
+
+    const mockFlow = {
+      flowTag: 'createOrder',
+      event: ['dsq'],
+      flowSteps: [
+        {
+          stepName: 'Start',
+          properties: ['orderId'],
+          messageAttributes: ['userId']
+        }
+      ],
+      stepProperties: {
+        orderId: { propertyName: 'orderId', type: 'string', required: true }
+      },
+      stepMessageAttributes: {
+        userId: { propertyName: 'userId', type: 'string', required: true }
+      }
+    };
+
+    await generateDsqHandler(
+      mockFlow,
+      'StepOne', // step name
+      'HdrDsq', // suffix
+      tmpDir, // flowOutputDir
+      'CreateOrderStepOne_Main', // mainFileName
+      templates
+    );
+
+    const generatedFilePath = path.join(tmpDir, 'createOrderStepOne_HdrDsq.js');
+    const generatedContent = await fs.readFile(generatedFilePath, 'utf-8');
+
+    // Verify template rendering and function names
+    expect(generatedContent).toContain('import createOrderStepOne from \'./CreateOrderStepOne_Main.js\';');
+    expect(generatedContent).toContain('createOrderStepOne');
+    expect(generatedContent).toContain('"createOrderStepOneHdrDsq"');
+  });
+});

package/src/codeGenerators/app/src/generatedCode/Flow/_shared/events/dsq.js

@@ -0,0 +1,5 @@
+import { generateDsqHandler } from './BaseDsqHandler.js';
+
+export default async function generate(flow, stepName, flowOutputDir, mainFileName, templates) {
+    await generateDsqHandler(flow, stepName, 'HdrDsq', flowOutputDir, mainFileName, templates);
+}

package/src/codeGenerators/app/src/generatedCode/Flow/_shared/events/lambdaSyncApi.js

@@ -1,6 +1,7 @@
 import ejs from 'ejs';
 import fs from 'fs/promises';
 import path from 'path';
+import { normalizePropertyType } from '../shared/propertyNormalizer.js';
 
 export default async function generate(flow, stepName, flowOutputDir, mainFileName, templates) {
     const upperCase = (str) => str.charAt(0).toUpperCase() + str.slice(1);
@@ -13,28 +14,18 @@ export default async function generate(flow, stepName, flowOutputDir, mainFileNa
     // Function name matches default export of the referenced _Main.js
     const functionName = stepName ? `${flowTag}${stepName}` : `Process${upperCase(flowTag)}`;
 
-    let inTagConfig = null;
+    let startConfig = null;
     if (!stepName && flow.flowSteps) {
-        const inTagStep = flow.flowSteps.find(s => s.stepName === 'InTag');
-        if (inTagStep) {
-            inTagConfig = { ...inTagStep };
+        const startStep = flow.flowSteps && flow.flowSteps.length > 0 ? flow.flowSteps[0] : null;
+        if (startStep) {
+            startConfig = { ...startStep };
             // Map properties
-            if (inTagConfig.properties && Array.isArray(inTagConfig.properties)) {
-                inTagConfig.properties = inTagConfig.properties.map(p => {
-                    if (typeof p === 'string') {
-                        return (flow.stepProperties && flow.stepProperties[p]) ? flow.stepProperties[p] : { propertyName: p, type: 'string' };
-                    }
-                    return p;
-                });
+            if (startConfig.properties && Array.isArray(startConfig.properties)) {
+                startConfig.properties = startConfig.properties.map(p => normalizePropertyType(p, flow.stepProperties));
             }
             // Map messageAttributes
-            if (inTagConfig.messageAttributes && Array.isArray(inTagConfig.messageAttributes)) {
-                inTagConfig.messageAttributes = inTagConfig.messageAttributes.map(p => {
-                    if (typeof p === 'string') {
-                        return (flow.stepMessageAttributes && flow.stepMessageAttributes[p]) ? flow.stepMessageAttributes[p] : { propertyName: p, type: 'string' };
-                    }
-                    return p;
-                });
+            if (startConfig.messageAttributes && Array.isArray(startConfig.messageAttributes)) {
+                startConfig.messageAttributes = startConfig.messageAttributes.map(p => normalizePropertyType(p, flow.stepMessageAttributes));
             }
         }
     }
@@ -45,7 +36,7 @@ export default async function generate(flow, stepName, flowOutputDir, mainFileNa
         mainFileName: mainFileName,
         functionName: functionName,
         queueName: queueName,
-        inTagConfig: inTagConfig
+        startConfig: startConfig
     });
 
     await fs.writeFile(path.join(flowOutputDir, `${handlerFileName}.js`), handlerContent, 'utf-8');

package/src/codeGenerators/app/src/generatedCode/Flow/_shared/events/lambdaSyncInv.js

@@ -1,6 +1,7 @@
 import ejs from 'ejs';
 import fs from 'fs/promises';
 import path from 'path';
+import { normalizePropertyType } from '../shared/propertyNormalizer.js';
 
 export default async function generate(flow, stepName, flowOutputDir, mainFileName, templates) {
     const upperCase = (str) => str.charAt(0).toUpperCase() + str.slice(1);
@@ -13,28 +14,18 @@ export default async function generate(flow, stepName, flowOutputDir, mainFileNa
     // Function name matches default export of the referenced _Main.js
     const functionName = stepName ? `${flowTag}${stepName}` : `Process${upperCase(flowTag)}`;
 
-    let inTagConfig = null;
+    let startConfig = null;
     if (!stepName && flow.flowSteps) {
-        const inTagStep = flow.flowSteps.find(s => s.stepName === 'InTag');
-        if (inTagStep) {
-            inTagConfig = { ...inTagStep };
+        const startStep = flow.flowSteps && flow.flowSteps.length > 0 ? flow.flowSteps[0] : null;
+        if (startStep) {
+            startConfig = { ...startStep };
             // Map properties
-            if (inTagConfig.properties && Array.isArray(inTagConfig.properties)) {
-                inTagConfig.properties = inTagConfig.properties.map(p => {
-                    if (typeof p === 'string') {
-                        return (flow.stepProperties && flow.stepProperties[p]) ? flow.stepProperties[p] : { propertyName: p, type: 'string' };
-                    }
-                    return p;
-                });
+            if (startConfig.properties && Array.isArray(startConfig.properties)) {
+                startConfig.properties = startConfig.properties.map(p => normalizePropertyType(p, flow.stepProperties));
             }
             // Map messageAttributes
-            if (inTagConfig.messageAttributes && Array.isArray(inTagConfig.messageAttributes)) {
-                inTagConfig.messageAttributes = inTagConfig.messageAttributes.map(p => {
-                    if (typeof p === 'string') {
-                        return (flow.stepMessageAttributes && flow.stepMessageAttributes[p]) ? flow.stepMessageAttributes[p] : { propertyName: p, type: 'string' };
-                    }
-                    return p;
-                });
+            if (startConfig.messageAttributes && Array.isArray(startConfig.messageAttributes)) {
+                startConfig.messageAttributes = startConfig.messageAttributes.map(p => normalizePropertyType(p, flow.stepMessageAttributes));
             }
         }
     }
@@ -45,7 +36,7 @@ export default async function generate(flow, stepName, flowOutputDir, mainFileNa
         mainFileName: mainFileName,
         functionName: functionName,
         queueName: queueName,
-        inTagConfig: inTagConfig
+        startConfig: startConfig
     });
 
     await fs.writeFile(path.join(flowOutputDir, `${handlerFileName}.js`), handlerContent, 'utf-8');

package/src/codeGenerators/app/src/generatedCode/Flow/_shared/events/ownTopic.js

@@ -1,4 +1,6 @@
 import { generateSqsHandler } from './BaseSqsHandler.js';
+import { isCrudFlow, isRbacFlow, isRelationshipFlow } from '../shared/flowClassifier.js';
+import { ownTopicWebSocketMainFileName, ownTopicWebSocketFunctionName } from '../shared/flowNaming.js';
 import ejs from 'ejs';
 import fs from 'fs/promises';
 import path from 'path';
@@ -15,9 +17,18 @@ export default async function generate(flow, stepName, flowOutputDir, mainFileNa
     // ownTopic flows ALWAYS generate the WebSocket entry + SNS-publish main file,
     // regardless of initiateBy (legacy behavior: WebSocket is the universal entry point).
     if (!stepName) {
+        const isOwnTopicConvention = !isCrudFlow(flow.flowTag) && !isRbacFlow(flow.flowTag) && !isRelationshipFlow(flow.flowTag);
+        let entryPointFileName;
+        let wbsFunctionName;
+
+        if (isOwnTopicConvention) {
+            entryPointFileName = ownTopicWebSocketMainFileName(flow.flowTag);
+            wbsFunctionName = ownTopicWebSocketFunctionName(flow.flowTag);
+        } else {
+            entryPointFileName = `${upperCase(flow.flowTag)}_Main`;
+            wbsFunctionName = upperCase(flow.flowTag);
+        }
         const handlerFileName = `${upperCase(flow.flowTag)}_HdrWbs`;
-        const functionName = `${flow.flowTag}Main`;
-        const entryPointFileName = `${upperCase(flow.flowTag)}_Main`;
 
         // 1. Render HdrWbs.js
         const handlerContent = ejs.render(templates.endpointHdrWbs, {
@@ -25,7 +36,7 @@ export default async function generate(flow, stepName, flowOutputDir, mainFileNa
             upperCaseFlowTag: upperCase(flow.flowTag),
             flowStepName: '',
             mainFileName: entryPointFileName,
-            functionName: functionName,
+            functionName: wbsFunctionName,
             route: flow.flowTag
         });
         await fs.writeFile(path.join(flowOutputDir, `${handlerFileName}.js`), handlerContent, 'utf-8');
@@ -35,7 +46,8 @@ export default async function generate(flow, stepName, flowOutputDir, mainFileNa
             flowTag: flow.flowTag,
             upperCaseFlowTag: upperCase(flow.flowTag),
             topicArn: `${upperCase(flow.flowTag)}_In`,
-            generateCode: generateCode
+            generateCode: generateCode,
+            functionName: wbsFunctionName
         });
         await fs.writeFile(path.join(flowOutputDir, `${entryPointFileName}.js`), mainContent, 'utf-8');
     }

package/src/codeGenerators/app/src/generatedCode/Flow/_shared/events/registry.js

@@ -4,6 +4,7 @@ import lambdaSyncInv from './lambdaSyncInv.js';
 import lambdaSyncApi from './lambdaSyncApi.js';
 import eventBridge from './eventBridge.js';
 import s3 from './s3.js';
+import dsq from './dsq.js';
 
 export const EVENT_HANDLERS = {
     ownTopic,
@@ -11,5 +12,6 @@ export const EVENT_HANDLERS = {
     lambdaSyncInv,
     lambdaSyncApi,
     eventBridge,
-    s3
+    s3,
+    dsq
 };

package/src/codeGenerators/app/src/generatedCode/Flow/_shared/handlers/FlowHandler_HdrApi.ejs

@@ -5,14 +5,14 @@ import <%= functionName %> from './<%= mainFileName %>.js';
 
 const validatorSchema = {
     //(<validatorSchema>)
-<% if (typeof inTagConfig !== 'undefined' && inTagConfig !== null && inTagConfig.properties && inTagConfig.properties.length > 0) { -%>
+<% if (typeof startConfig !== 'undefined' && startConfig !== null && startConfig.properties && startConfig.properties.length > 0) { -%>
     type: 'object',
     properties: {
-    <% inTagConfig.properties.forEach(prop => { -%>
+    <% startConfig.properties.forEach(prop => { -%>
         <%- prop.propertyName %>: { type: '<%- prop.type || 'string' %>' },
     <% }) -%>
     },
-    required: [ <%- inTagConfig.properties.filter(p => p.required !== false).map(p => `'${p.propertyName}'`).join(', ') %> ]
+    required: [ <%- startConfig.properties.filter(p => p.required !== false).map(p => `'${p.propertyName}'`).join(', ') %> ]
 <% } -%>
     //(</validatorSchema>)
 };