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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-core-generate-service-code",
-  "version": "1.0.60",
+  "version": "1.0.61",
   "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": {
@@ -22,15 +22,19 @@
     "@izara_project/izara-core-library-core": "^1.0.32",
     "@izara_project/izara-core-library-logger": "^1.0.9",
     "@izara_project/izara-core-library-s3": "^1.0.10",
-    "@izara_project/izara-core-library-service-schemas": "^1.0.155",
     "@izara_project/izara-property-nodes": "^1.0.16",
     "@izara_project/izara-shared-core": "^1.0.12",
-    "@izara_project/izara-shared-service-schemas": "^1.0.64",
     "ejs": "^5.0.1",
     "js-beautify": "^1.15.4",
     "yaml": "^2.9.0"
   },
+  "peerDependencies": {
+    "@izara_project/izara-core-library-service-schemas": "^1.0.157",
+    "@izara_project/izara-shared-service-schemas": "^1.0.65"
+  },
   "devDependencies": {
+    "@izara_project/izara-core-library-service-schemas": "^1.0.157",
+    "@izara_project/izara-shared-service-schemas": "^1.0.65",
     "jest": "^30.4.2"
   }
 }

package/src/codeGenerators/app/initial_setup/InitialSetupGenerator.js

@@ -98,37 +98,37 @@ export async function generateInitialSetup(allSchemas, options) {
     {
       serviceTag: 'GraphHandler',
       topicName: 'UpdateRelationship_Out',
-      sqsEndpoint: 'UpdateRelationshipComplete'
+      sqsEndpoint: 'UpdateRelationshipCompleteHdrSqs'
     },
     {
       serviceTag: 'GraphHandler',
       topicName: 'CreateRelationship_Out',
-      sqsEndpoint: 'CreateRelationshipComplete'
+      sqsEndpoint: 'CreateRelationshipCompleteHdrSqs'
     },
     {
       serviceTag: 'GraphHandler',
       topicName: 'DeleteRelationship_Out',
-      sqsEndpoint: 'DeleteRelationshipComplete'
+      sqsEndpoint: 'DeleteRelationshipCompleteHdrSqs'
     },
     {
       serviceTag: 'GraphHandler',
       topicName: 'UpdateNode_Out',
-      sqsEndpoint: 'UpdateComplete'
+      sqsEndpoint: 'UpdateCompleteHdrSqs'
     },
     {
       serviceTag: 'GraphHandler',
       topicName: 'CreateNode_Out',
-      sqsEndpoint: 'CreateComplete'
+      sqsEndpoint: 'CreateCompleteHdrSqs'
     },
     {
       serviceTag: 'GraphHandler',
       topicName: 'ChangeRelationshipType_Out',
-      sqsEndpoint: 'ChangeRelationshipComplete'
+      sqsEndpoint: 'ChangeRelationshipCompleteHdrSqs'
     },
     {
       serviceTag: 'GraphHandler',
       topicName: 'MoveRelationship_Out',
-      sqsEndpoint: 'MoveRelationshipComplete'
+      sqsEndpoint: 'MoveRelationshipCompleteHdrSqs'
     }
   ];
   const snsTpl = await fs.readFile(

package/src/codeGenerators/app/sls_yaml/FunctionYamlGenerator.js

@@ -163,15 +163,14 @@ export async function generateFunctionYaml(allSchemas, options) {
       functionNameConfig = `${upperCase(flowTag).replace('Relationship', 'Rel')}${suffixType}`;
     }
     if (handlerBaseName.endsWith('Complete')) {
-      // e.g. CreateObjectComp or CreateCompleteSqs
+      // e.g. CreateCompleteHdrSqs or CreateCompleteSqs
       if (isCrud) {
-        // Legacy: DeleteNodeComp, UpdateNodeComp, CreateObjectComp
+        // Legacy: DeleteCompleteHdrSqs, UpdateCompleteHdrSqs, CreateCompleteHdrSqs
         const crudType = upperCase(flowTag);
-        if (crudType === 'Create') functionNameConfig = `CreateObjectComp`;
-        else functionNameConfig = `${crudType}NodeComp`;
+        functionNameConfig = `${crudType}CompleteHdrSqs`;
       } else if (isRel) {
         // Legacy: UpdateRelComp
-        functionNameConfig = `${upperCase(flowTag).replace('Relationship', 'Rel')}Comp`;
+        functionNameConfig = `${upperCase(flowTag)}CompleteHdrSqs`;
       } else {
         functionNameConfig = `${handlerBaseName}${suffixType}`;
       }

package/src/codeGenerators/app/src/generatedCode/Flow/FlowObjects/EndpointsGenerator.js

@@ -27,6 +27,7 @@ export async function generateEndpointsFlow(allSchemas, options) {
 
   const sharedTemplates = {
     sqs: await fs.readFile(path.join(__dirname, '..', '_shared', 'handlers', 'FlowHandler_HdrSqs.ejs'), 'utf-8'),
+    dsq: await fs.readFile(path.join(__dirname, '..', '_shared', 'handlers', 'FlowHandler_HdrDsq.ejs'), 'utf-8'),
     api: await fs.readFile(path.join(__dirname, '..', '_shared', 'handlers', 'FlowHandler_HdrApi.ejs'), 'utf-8'),
     inv: await fs.readFile(path.join(__dirname, '..', '_shared', 'handlers', 'FlowHandler_HdrInv.ejs'), 'utf-8'),
     wbsMain: await fs.readFile(path.join(__dirname, '..', 'FlowSchemas', 'templates', 'endpoint', 'FlowMain_Wbs.ejs'), 'utf-8').catch(() => ''),
@@ -70,7 +71,7 @@ export async function generateEndpointsFlow(allSchemas, options) {
       topicArn: `${upperAction}_In`,
       generateCode: generateCode,
       flow: mockFlow,
-      inTagConfig: null
+      startConfig: null
     });
     await fs.writeFile(path.join(flowOutputDir, `${mainFileName}.js`), mainContent, 'utf-8');
     generatedCount++;
@@ -88,7 +89,7 @@ export async function generateEndpointsFlow(allSchemas, options) {
         upperCaseFlowTag: upperAction,
         generateCode: generateCode,
         flow: mockFlow,
-        inTagConfig: null
+        startConfig: null
       });
       await fs.writeFile(path.join(flowOutputDir, `${beforeLogicalFileName}.js`), beforeLogicalContent, 'utf-8');
       generatedCount++;

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/_shared/events/BaseDsqHandler.js

@@ -0,0 +1,64 @@
+import ejs from 'ejs';
+import fs from 'fs/promises';
+import path from 'path';
+
+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.find(s => s.stepName === 'start');
+        if (startStep) {
+            startConfig = { ...startStep };
+            // Map properties
+            if (startConfig.properties && Array.isArray(startConfig.properties)) {
+                startConfig.properties = startConfig.properties.map(p => {
+                    if (typeof p === 'string') {
+                        return (flow.stepProperties && flow.stepProperties[p]) ? flow.stepProperties[p] : { propertyName: p, type: 'string' };
+                    }
+                    return p;
+                });
+            }
+            // Map messageAttributes
+            if (startConfig.messageAttributes && Array.isArray(startConfig.messageAttributes)) {
+                startConfig.messageAttributes = startConfig.messageAttributes.map(p => {
+                    if (typeof p === 'string') {
+                        return (flow.stepMessageAttributes && flow.stepMessageAttributes[p]) ? flow.stepMessageAttributes[p] : { propertyName: p, type: 'string' };
+                    }
+                    return p;
+                });
+            }
+        }
+    }
+
+    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

@@ -28,14 +28,14 @@ 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.find(s => s.stepName === 'start');
+        if (startStep) {
+            startConfig = { ...startStep };
             // Map properties
-            if (inTagConfig.properties && Array.isArray(inTagConfig.properties)) {
-                inTagConfig.properties = inTagConfig.properties.map(p => {
+            if (startConfig.properties && Array.isArray(startConfig.properties)) {
+                startConfig.properties = startConfig.properties.map(p => {
                     if (typeof p === 'string') {
                         return (flow.stepProperties && flow.stepProperties[p]) ? flow.stepProperties[p] : { propertyName: p, type: 'string' };
                     }
@@ -43,8 +43,8 @@ export async function generateSqsHandler(flow, stepName, suffix, flowOutputDir,
                 });
             }
             // Map messageAttributes
-            if (inTagConfig.messageAttributes && Array.isArray(inTagConfig.messageAttributes)) {
-                inTagConfig.messageAttributes = inTagConfig.messageAttributes.map(p => {
+            if (startConfig.messageAttributes && Array.isArray(startConfig.messageAttributes)) {
+                startConfig.messageAttributes = startConfig.messageAttributes.map(p => {
                     if (typeof p === 'string') {
                         return (flow.stepMessageAttributes && flow.stepMessageAttributes[p]) ? flow.stepMessageAttributes[p] : { propertyName: p, type: 'string' };
                     }
@@ -60,7 +60,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

@@ -13,14 +13,14 @@ 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.find(s => s.stepName === 'start');
+        if (startStep) {
+            startConfig = { ...startStep };
             // Map properties
-            if (inTagConfig.properties && Array.isArray(inTagConfig.properties)) {
-                inTagConfig.properties = inTagConfig.properties.map(p => {
+            if (startConfig.properties && Array.isArray(startConfig.properties)) {
+                startConfig.properties = startConfig.properties.map(p => {
                     if (typeof p === 'string') {
                         return (flow.stepProperties && flow.stepProperties[p]) ? flow.stepProperties[p] : { propertyName: p, type: 'string' };
                     }
@@ -28,8 +28,8 @@ export default async function generate(flow, stepName, flowOutputDir, mainFileNa
                 });
             }
             // Map messageAttributes
-            if (inTagConfig.messageAttributes && Array.isArray(inTagConfig.messageAttributes)) {
-                inTagConfig.messageAttributes = inTagConfig.messageAttributes.map(p => {
+            if (startConfig.messageAttributes && Array.isArray(startConfig.messageAttributes)) {
+                startConfig.messageAttributes = startConfig.messageAttributes.map(p => {
                     if (typeof p === 'string') {
                         return (flow.stepMessageAttributes && flow.stepMessageAttributes[p]) ? flow.stepMessageAttributes[p] : { propertyName: p, type: 'string' };
                     }
@@ -45,7 +45,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

@@ -13,14 +13,14 @@ 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.find(s => s.stepName === 'start');
+        if (startStep) {
+            startConfig = { ...startStep };
             // Map properties
-            if (inTagConfig.properties && Array.isArray(inTagConfig.properties)) {
-                inTagConfig.properties = inTagConfig.properties.map(p => {
+            if (startConfig.properties && Array.isArray(startConfig.properties)) {
+                startConfig.properties = startConfig.properties.map(p => {
                     if (typeof p === 'string') {
                         return (flow.stepProperties && flow.stepProperties[p]) ? flow.stepProperties[p] : { propertyName: p, type: 'string' };
                     }
@@ -28,8 +28,8 @@ export default async function generate(flow, stepName, flowOutputDir, mainFileNa
                 });
             }
             // Map messageAttributes
-            if (inTagConfig.messageAttributes && Array.isArray(inTagConfig.messageAttributes)) {
-                inTagConfig.messageAttributes = inTagConfig.messageAttributes.map(p => {
+            if (startConfig.messageAttributes && Array.isArray(startConfig.messageAttributes)) {
+                startConfig.messageAttributes = startConfig.messageAttributes.map(p => {
                     if (typeof p === 'string') {
                         return (flow.stepMessageAttributes && flow.stepMessageAttributes[p]) ? flow.stepMessageAttributes[p] : { propertyName: p, type: 'string' };
                     }
@@ -45,7 +45,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/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>)
 };

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

@@ -0,0 +1,129 @@
+/*
+Copyright (C) 2020 Sven Mason <http://izara.io>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+import { middlewareHandler as middleware } from "@izara_project/izara-middleware";
+import { recordHandlerSharedLib } from "@izara_project/izara-core-library-record-handler";
+import Logger from '@izara_project/izara-core-library-logger';
+import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow';
+import <%= functionName %> from './<%= mainFileName %>.js';
+
+// validate event properties in body.Message of sqs event
+let perRecordsValidatorSchema = {
+  //(<validatorSchema>)
+<% if (typeof startConfig !== 'undefined' && startConfig !== null && startConfig.properties && startConfig.properties.length > 0) { -%>
+  type: 'object',
+  properties: {
+  <% startConfig.properties.forEach(prop => { -%>
+    '<%- prop.propertyName %>': { type: '<%- prop.type || 'string' %>' },
+  <% }) -%>
+  },
+  required: [ <%- startConfig.properties.filter(p => p.required !== false).map(p => `'${p.propertyName}'`).join(', ') %> ]
+<% } -%>
+  //(</validatorSchema>)
+};
+
+<% if (typeof startConfig !== 'undefined' && startConfig !== null && startConfig.messageAttributes && startConfig.messageAttributes.length > 0) { -%>
+let messageAttributeValidatorSchema = {
+  type: 'object',
+  properties: {
+  <% startConfig.messageAttributes.forEach(prop => { -%>
+    '<%- prop.propertyName %>': {
+      type: 'object',
+      properties: {
+        Type: { type: 'string' },
+        Value: { type: '<%- prop.type || 'string' %>' }
+      },
+      required: ['Type', 'Value']
+    },
+  <% }) -%>
+  },
+  required: [ <%- startConfig.messageAttributes.filter(p => p.required !== false).map(p => `'${p.propertyName}'`).join(', ') %> ]
+};
+<% } else { -%>
+let messageAttributeValidatorSchema = null;
+<% } -%>
+
+middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema(
+{
+  type: "object",
+  required: ['body', 'messageAttributes'],
+  properties: {
+    body: {
+      type: 'object',
+    },
+    messageAttributes: {
+      type: 'object'
+    }
+  }
+}));
+
+export const main = middleware.wrap(async (event, context) => {
+
+  try {
+
+    let recordPromises = [];
+
+    // loop each record and send to mainFunction
+    await Promise.all(event.Records.map(async record => { // promise.all for map() function
+
+      let passOnProperties = []
+      record = recordHandlerSharedLib.reformatDsqMessage(record._izContext, record);
+      record._izContext.logger.debug('record ReceiveMsgOutHdrSqs', record);
+
+      //validate message (and MessageAttributes)
+      await recordHandlerSharedLib.validateRecord(
+        record, // one record will send to mainFunction
+        "<%= queueName %>", // queue name that need to retry or send to dlq
+        perRecordsValidatorSchema, // schema for record.Message
+        messageAttributeValidatorSchema
+      );
+
+      // add argument (to invoke lambda) to passOnProperties[]
+      passOnProperties.push(record.body.Message);
+      passOnProperties.push(callingFlowSharedLib.addCallingFlowToPassOnProperties(record.body.Message));
+      //(<additionalParams>)
+      //(</additionalParams>)
+      record._izContext.logger.debug('passOnProperties in handler', passOnProperties);
+
+      // call recordHandlerSharedLib.recordHandler with 3 parameters and return promise(resolve)
+      let recordPromise = recordHandlerSharedLib.recordHandler(
+        record, // one record will send to mainFunction
+        <%= functionName %>, // mainFunction that need to invoke.
+        "<%= queueName %>", // queue name that need to retry or send to dlq
+        passOnProperties, // all parameters that mainFunction needed.
+      );
+      record._izContext.logger.debug('after recordPromise in handler');
+      recordPromises.push(recordPromise); // push promise to recordPromises
+    }))
+
+    Logger.debug('before Promise.all(recordPromises) in handler');
+    try {
+      // --- main await all promises
+      await Promise.all(recordPromises); // await all promises
+
+      return event.Records // return all for local testing
+
+    } catch {
+      Logger.debug('Promise.all(recordPromises) in handler threw error (at least one record did no resolve)');
+    }
+    Logger.debug('after Promise.all(recordPromises) in handler');
+
+  } catch (err) {
+    Logger.error('Unhandled Error, LambdaFunctionHdrSqs: ', err);
+    throw (err);
+  }
+});

package/src/codeGenerators/app/src/generatedCode/Flow/_shared/handlers/FlowHandler_HdrInv.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>)
 };

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

@@ -24,27 +24,34 @@ import <%= functionName %> from './<%= mainFileName %>.js';
 // validate event properties in body.Message of sqs event
 let perRecordsValidatorSchema = {
   //(<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 => { -%>
-    <%- prop.propertyName %>: { type: '<%- prop.type || 'string' %>' },
+  <% 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>)
 };
 
-<% if (typeof inTagConfig !== 'undefined' && inTagConfig !== null && inTagConfig.messageAttributes && inTagConfig.messageAttributes.length > 0) { -%>
+<% if (typeof startConfig !== 'undefined' && startConfig !== null && startConfig.messageAttributes && startConfig.messageAttributes.length > 0) { -%>
 let messageAttributeValidatorSchema = {
   type: 'object',
   properties: {
-  <% inTagConfig.messageAttributes.forEach(prop => { -%>
-    <%- prop.propertyName %>: { type: '<%- prop.type || 'string' %>' },
+  <% startConfig.messageAttributes.forEach(prop => { -%>
+    '<%- prop.propertyName %>': {
+      type: 'object',
+      properties: {
+        Type: { type: 'string' },
+        Value: { type: '<%- prop.type || 'string' %>' }
+      },
+      required: ['Type', 'Value']
+    },
   <% }) -%>
   },
-  required: [ <%- inTagConfig.messageAttributes.filter(p => p.required !== false).map(p => `'${p.propertyName}'`).join(', ') %> ]
+  required: [ <%- startConfig.messageAttributes.filter(p => p.required !== false).map(p => `'${p.propertyName}'`).join(', ') %> ]
 };
 <% } else { -%>
 let messageAttributeValidatorSchema = null;

package/src/codeGenerators/app/src/generatedCode/Flow/_shared/shared/eventTypes.js

@@ -2,7 +2,7 @@ export const STEP_EVENT_HANDLER_CONFIG = {
     sqs: { suffix: 'HdrSqs', template: 'sqs' },
     ownTopic: { suffix: 'HdrSqs', template: 'sqs' },
     extTopic: { suffix: 'HdrSqs', template: 'sqs' },
-    dsq: { suffix: 'HdrDsq', template: 'sqs' },
+    dsq: { suffix: 'HdrDsq', template: 'dsq' },
     lambdaSyncInv: { suffix: 'HdrInv', template: 'inv' },
     lambdaSyncApi: { suffix: 'HdrApi', template: 'api' }
 };
@@ -17,7 +17,7 @@ export function getStepEventHandlerConfig(eventType) {
     };
 }
 
-export function normalizeEvents(events, fallback = ['sqs']) {
+export function normalizeEvents(events, fallback = ['extTopic']) {
     if (!events) return [...fallback];
     return Array.isArray(events) ? [...events] : [events];
 }

package/src/codeGenerators/app/src/generatedCode/Flow/_shared/shared/flowEntryPointBase.js

@@ -18,6 +18,7 @@ export async function generateFlowEntryPoint(allSchemas, options) {
 
     const templates = {
         sqs: await fs.readFile(path.join(__dirname, '..', 'handlers', 'FlowHandler_HdrSqs.ejs'), 'utf-8'),
+        dsq: await fs.readFile(path.join(__dirname, '..', 'handlers', 'FlowHandler_HdrDsq.ejs'), 'utf-8'),
         api: await fs.readFile(path.join(__dirname, '..', 'handlers', 'FlowHandler_HdrApi.ejs'), 'utf-8'),
         inv: await fs.readFile(path.join(__dirname, '..', 'handlers', 'FlowHandler_HdrInv.ejs'), 'utf-8'),
         endpointMain: await fs.readFile(path.join(__dirname, '..', '..', 'FlowSchemas', 'templates', 'endpoint', 'FlowEndpoint_Main.ejs'), 'utf-8'),

package/src/codeGenerators/app/src/generatedCode/Flow/_shared/shared/flowMainFunctionBase.js

@@ -75,22 +75,22 @@ export async function generateFlowMainFunction(allSchemas, options) {
       'utf-8'
     );
 
-    const inTagStep = flow.flowSteps && flow.flowSteps.find(
-      s => s.stepName === 'InTag'
+    const startStep = flow.flowSteps && flow.flowSteps.find(
+      s => s.stepName === 'start'
     );
-    let inTagConfig = inTagStep ? { ...inTagStep } : null;
+    let startConfig = startStep ? { ...startStep } : null;
 
-    if (inTagConfig) {
-      if (inTagConfig.properties && Array.isArray(inTagConfig.properties)) {
-        inTagConfig.properties = inTagConfig.properties.map(p => {
+    if (startConfig) {
+      if (startConfig.properties && Array.isArray(startConfig.properties)) {
+        startConfig.properties = startConfig.properties.map(p => {
           if (typeof p === 'string') {
             return (flow.stepProperties && flow.stepProperties[p]) ? flow.stepProperties[p] : { propertyName: p, type: 'string' };
           }
           return p;
         });
       }
-      if (inTagConfig.messageAttributes && Array.isArray(inTagConfig.messageAttributes)) {
-        inTagConfig.messageAttributes = inTagConfig.messageAttributes.map(p => {
+      if (startConfig.messageAttributes && Array.isArray(startConfig.messageAttributes)) {
+        startConfig.messageAttributes = startConfig.messageAttributes.map(p => {
           if (typeof p === 'string') {
             return (flow.stepMessageAttributes && flow.stepMessageAttributes[p]) ? flow.stepMessageAttributes[p] : { propertyName: p, type: 'string' };
           }
@@ -118,7 +118,7 @@ export async function generateFlowMainFunction(allSchemas, options) {
       topicArn: topicArn,
       generateCode: generateCode,
       flow: flow,
-      inTagConfig: inTagConfig,
+      startConfig: startConfig,
       tableName: tableName
     });
     await fs.writeFile(
@@ -138,7 +138,7 @@ export async function generateFlowMainFunction(allSchemas, options) {
         upperCaseFlowTag: upperCaseFlowTag,
         generateCode: generateCode,
         flow: flow,
-        inTagConfig: inTagConfig,
+        startConfig: startConfig,
         tableName: tableName
       });
       await fs.writeFile(
@@ -162,7 +162,7 @@ export async function generateFlowMainFunction(allSchemas, options) {
         upperCaseFlowTag: upperCaseFlowTag,
         generateCode: generateCode,
         flow: flow,
-        inTagConfig: inTagConfig
+        startConfig: startConfig
       });
       
       await fs.writeFile(

package/src/codeGenerators/app/src/generatedCode/Flow/_shared/shared/flowSelection.js

@@ -1,7 +1,6 @@
 export function getFlowsForGeneration(allSchemas) {
     return allSchemas.flowsForGeneration || allSchemas.flows || [];
 }
-
 export function getGeneratedCodeConfigs(flows, flowTag, options = {}) {
     return flows
         .filter(flow => {

package/src/codeGenerators/app/src/generatedCode/Flow/_shared/shared/flowStepBase.js

@@ -20,6 +20,7 @@ export async function generateFlowSteps(allSchemas, options) {
         main: await fs.readFile(path.join(__dirname, '..', '..', 'FlowSchemas', 'templates', 'step', 'FlowStep_Main.ejs'), 'utf-8'),
         complete: await fs.readFile(path.join(__dirname, '..', '..', 'FlowSchemas', 'templates', 'step', 'FlowEndpointComplete_Main.ejs'), 'utf-8'),
         sqs: await fs.readFile(path.join(__dirname, '..', 'handlers', 'FlowHandler_HdrSqs.ejs'), 'utf-8'),
+        dsq: await fs.readFile(path.join(__dirname, '..', 'handlers', 'FlowHandler_HdrDsq.ejs'), 'utf-8'),
         api: await fs.readFile(path.join(__dirname, '..', 'handlers', 'FlowHandler_HdrApi.ejs'), 'utf-8'),
         inv: await fs.readFile(path.join(__dirname, '..', 'handlers', 'FlowHandler_HdrInv.ejs'), 'utf-8'),
 
@@ -53,7 +54,7 @@ export async function generateFlowSteps(allSchemas, options) {
 
         for (const stepConfig of normalizeFlowSteps(flow.flowSteps)) {
             const stepName = stepConfig.stepName;
-            if (['In', 'InTag', 'Out', 'beforeLogical'].includes(stepName)) continue;
+            if (['In', 'start', 'Out', 'beforeLogical'].includes(stepName)) continue;
 
             if (!createdDir) {
                 await fs.mkdir(flowOutputDir, { recursive: true });
@@ -179,7 +180,7 @@ export async function generateFlowSteps(allSchemas, options) {
             }
 
             // 2. Generate Handlers based on stepConfig.event
-            const events = normalizeEvents(stepConfig.event, ['sqs']); // Default to sqs if missing
+            const events = normalizeEvents(stepConfig.event, ['extTopic']); // Default to extTopic if missing
             for (const ev of events) {
                 if (ev === 'sns') continue;
                 const handlerConfig = getStepEventHandlerConfig(ev);

package/src/codeGenerators/app/src/generatedCode/Flow/_shared/shared/flowStepNormalizer.js

@@ -21,8 +21,54 @@ export function hasFlowStep(flowSteps, stepName) {
 function inferStepName(step) {
     const reservedKeys = new Set([
         'event', 'settings', 'plugInHooks', 'properties', 'messageAttributes',
-        'returnValues', 'inTag', 'stepName'
+        'returnValues', 'startStep', 'stepName'
     ]);
     const key = Object.keys(step).find(item => !reservedKeys.has(item));
     return typeof step[key] === 'string' ? step[key] : key;
 }
+
+export function normalizeUnifiedFlows(rawFlows) {
+    return rawFlows.map(flow => {
+        if (!flow.flowSteps) return flow;
+        
+        // Handle both array and object empty cases
+        if (Array.isArray(flow.flowSteps) && flow.flowSteps.length === 0) return flow;
+        if (!Array.isArray(flow.flowSteps) && Object.keys(flow.flowSteps).length === 0) return flow;
+
+        const normalizedSteps = normalizeFlowSteps(flow.flowSteps);
+        
+        // Ensure flowSteps is always an Array for the rest of the generation process
+        flow.flowSteps = normalizedSteps;
+        
+        const hasStart = flow.flowSteps.some(s => s.stepName?.toLowerCase() === 'start');
+        
+        if (flow.event) {
+            if (!hasStart) {
+                flow.flowSteps.unshift({
+                    stepName: 'Start',
+                    properties: flow.properties || [],
+                    messageAttributes: flow.messageAttributes || []
+                });
+            }
+        } else {
+            const firstStep = flow.flowSteps[0];
+            
+            if (firstStep) {
+                flow.event = firstStep.event;
+                if (firstStep.generatedCodeConfig) flow.generatedCodeConfig = firstStep.generatedCodeConfig;
+                if (firstStep.schedules) flow.schedules = firstStep.schedules;
+                if (firstStep.bucketName) flow.bucketName = firstStep.bucketName;
+                if (firstStep.createBucket !== undefined) flow.createBucket = firstStep.createBucket;
+                
+                if (!hasStart) {
+                    flow.flowSteps.unshift({
+                        stepName: 'Start',
+                        properties: firstStep.properties || [],
+                        messageAttributes: firstStep.messageAttributes || []
+                    });
+                }
+            }
+        }
+        return flow;
+    });
+}

package/src/codeGenerators/app/src/generatedCode/Flow/_shared/shared/flowValidator.js

@@ -1,6 +1,5 @@
-const ALLOWED_MAIN_EVENTS = ['ownTopic', 'extTopic', 'lambdaSyncInv', 'lambdaSyncApi', 'eventBridge', 's3', 'dsq'];
+const ALLOWED_EVENTS = ['ownTopic', 'extTopic', 'lambdaSyncInv', 'lambdaSyncApi', 'eventBridge', 's3', 'dsq'];
 const MAIN_ASYNC_EVENTS = ['ownTopic', 'extTopic', 's3'];
-const ALLOWED_STEP_EVENTS = ['sqs', 'ownTopic', 'extTopic', 'dsq', 'lambdaSyncInv', 'lambdaSyncApi'];
 const RESERVED_SYSTEM_FLOW_TAGS = new Set([
   'Create',
   'Update',
@@ -73,9 +72,9 @@ export function validateFlowsForGeneration(flows) {
     }
 
     const events = asArray(flow.event);
-    const invalidMainEvents = events.filter(event => !ALLOWED_MAIN_EVENTS.includes(event));
+    const invalidMainEvents = events.filter(event => !ALLOWED_EVENTS.includes(event));
     if (invalidMainEvents.length > 0) {
-      errors.push(`Flow '${flowTag}' uses unsupported main events: ${invalidMainEvents.join(', ')}. Allowed are: ${ALLOWED_MAIN_EVENTS.join(', ')}.`);
+      errors.push(`Flow '${flowTag}' uses unsupported main events: ${invalidMainEvents.join(', ')}. Allowed are: ${ALLOWED_EVENTS.join(', ')}.`);
     }
 
     const mainAsyncEvents = events.filter(event => MAIN_ASYNC_EVENTS.includes(event));
@@ -86,7 +85,7 @@ export function validateFlowsForGeneration(flows) {
     const flowSteps = Array.isArray(flow.flowSteps) ? flow.flowSteps : [];
     const seenStepNames = new Set();
     let anyStepHasPlugInHooks = false;
-    let inTagCount = 0;
+    let startStepCount = 0;
 
     for (const step of flowSteps) {
       const stepName = step?.stepName;
@@ -101,10 +100,10 @@ export function validateFlowsForGeneration(flows) {
       seenStepNames.add(stepName);
 
       if (stepName === 'In') {
-        errors.push(`Flow '${flowTag}' uses legacy stepName 'In'. Use 'InTag'.`);
+        errors.push(`Flow '${flowTag}' uses legacy stepName 'In'. Use 'start'.`);
       }
-      if (stepName === 'InTag') {
-        inTagCount += 1;
+      if (stepName === 'start') {
+        startStepCount += 1;
       }
 
       if (step.plugInHooks && step.plugInHooks.length > 0) {
@@ -112,22 +111,21 @@ export function validateFlowsForGeneration(flows) {
       }
 
       const stepEvents = asArray(step.event);
-      const invalidStepEvents = stepEvents.filter(event => !ALLOWED_STEP_EVENTS.includes(event));
+      const invalidStepEvents = stepEvents.filter(event => !ALLOWED_EVENTS.includes(event));
       if (invalidStepEvents.length > 0) {
-        errors.push(`Flow '${flowTag}' step '${stepName}' uses unsupported step events: ${invalidStepEvents.join(', ')}. Allowed are: ${ALLOWED_STEP_EVENTS.join(', ')}.`);
+        errors.push(`Flow '${flowTag}' step '${stepName}' uses unsupported step events: ${invalidStepEvents.join(', ')}. Allowed are: ${ALLOWED_EVENTS.join(', ')}.`);
       }
 
       validateNamedRefs(flowTag, stepName, step.properties, flow.stepProperties, 'properties', errors);
       validateNamedRefs(flowTag, stepName, step.messageAttributes, flow.stepMessageAttributes, 'messageAttributes', errors);
     }
 
-    if (inTagCount > 1) {
-      errors.push(`Flow '${flowTag}' has multiple 'InTag' steps. Only one is allowed.`);
+    if (startStepCount > 1) {
+      errors.push(`Flow '${flowTag}' has multiple 'start' steps. Only one is allowed.`);
     }
 
-    if (anyStepHasPlugInHooks && inTagCount === 0) {
-      errors.push(`Flow '${flowTag}' uses plugInHooks but does not have an 'InTag' step. If flow needs plugin-aware main lambda, it must include an 'InTag' step.`);
-    }
+    // ponytail: relaxed anyStepHasPlugInHooks && startStepCount === 0 requirement 
+    // since unified entry points (step 0) can now handle plugins directly without start.
 
     if (anyStepHasPlugInHooks) {
       const forbiddenEvents = ['lambdaSyncInv', 'lambdaSyncApi', 's3', 'eventBridge'];

package/src/codeGenerators/app/src/generatedCode/libs/templates/Consts.ejs

@@ -316,30 +316,30 @@ const TOPIC_NAME_GRAPH_HANDLER = {
 };
 
 const TOPIC_NAME_GENERATE_CODE = {
-  updateRelComplete: 'UpdateRelationshipComplete',
-  createRelComplete: 'CreateRelationshipComplete',
-  deleteRelComplete: 'DeleteRelationshipComplete',
-  getRelComplete: 'GetRelationshipComplete',
+  updateRelComplete: 'UpdateRelationshipCompleteHdrSqs',
+  createRelComplete: 'CreateRelationshipCompleteHdrSqs',
+  deleteRelComplete: 'DeleteRelationshipCompleteHdrSqs',
+  getRelComplete: 'GetRelationshipCompleteHdrSqs',
   outUpdateRelComplete: 'UpdateRelationship_Out',
   outCreateRelComplete: 'CreateRelationship_Out',
   outDeleteRelComplete: 'DeleteRelationship_Out',
   outGetRelComplete: 'GetRelationship_Out',
-  updateNodeComplete: 'UpdateComplete',
+  updateNodeComplete: 'UpdateCompleteHdrSqs',
   outUpdateNodeComplete: 'Update_Out',
-  createNodeComplete: 'CreateComplete',
+  createNodeComplete: 'CreateCompleteHdrSqs',
   outCreateNodeComplete: 'Create_Out',
-  deleteNodeComplete: 'DeleteComplete',
+  deleteNodeComplete: 'DeleteCompleteHdrSqs',
   outDeleteNodeComplete: 'Delete_Out',
-  getNodeComplete: 'GetComplete',
+  getNodeComplete: 'GetCompleteHdrSqs',
   outGetNodeComplete: 'Get_Out',
   reservedLimitComplete: 'ReservedLimitComplete',
   createPreSignUrl: 'CreatePreSignUrl',
   flowSchemaOwnTopicComplete: 'FlowSchemaOwnTopicComplete',
   flowSchemaOwnTopicEndpointComplete: 'FlowSchemaOwnTopicEndpointComplete',
   createRecordComplete: 'CreateRecordComplete',
-  changeRelationshipComplete: 'ChangeRelationshipComplete',
+  changeRelationshipComplete: 'ChangeRelationshipCompleteHdrSqs',
   outChangeRelationshipComplete: 'ChangeRelationship_Out',
-  moveRelationshipComplete: 'MoveRelationshipComplete',
+  moveRelationshipComplete: 'MoveRelationshipCompleteHdrSqs',
   outMoveRelationshipComplete: 'MoveRelationship_Out'
 };
 

package/src/codeGenerators/resource/sls_yaml/FlowResourceYamlGenerator.js

@@ -79,9 +79,9 @@ export async function generateFlowResourceYaml(allSchemas, options) {
     if (Array.isArray(flow.flowSteps)) {
       for (const stepConfig of flow.flowSteps) {
         const stepName = stepConfig.stepName;
-        if (stepName === 'InTag') continue;
+        if (stepName === 'start') continue;
 
-        const events = stepConfig.event || ['sqs'];
+        const events = stepConfig.event || ['extTopic'];
         for (const ev of events) {
           let queueName = `${flowTag}${stepName}`;
           if (stepName === 'Complete') {

package/src/generateCode.js

@@ -8,6 +8,7 @@ import { parseFlowSchemas } from './parsers/flowSchemaParser.js';
 import { generateFlowEntryPoint } from './codeGenerators/app/src/generatedCode/Flow/_shared/shared/flowEntryPointBase.js';
 import { generateFlowMainFunction } from './codeGenerators/app/src/generatedCode/Flow/_shared/shared/flowMainFunctionBase.js';
 import { generateFlowSteps } from './codeGenerators/app/src/generatedCode/Flow/_shared/shared/flowStepBase.js';
+import { normalizeUnifiedFlows } from './codeGenerators/app/src/generatedCode/Flow/_shared/shared/flowStepNormalizer.js';
 
 import { generateEndpointsFlow } from './codeGenerators/app/src/generatedCode/Flow/FlowObjects/EndpointsGenerator.js';
 import { generateFlowOut } from './codeGenerators/resource/sls_yaml/FlowOutGenerator.js';
@@ -189,25 +190,19 @@ export async function generateCode(rootPath, options = {}) {
     }
   }
 
+  let cleanupStarted = false;
+  let generationSucceeded = false;
+  const backedUpDirs = new Set();
+  const dirsToBackup = [
+    generatedCodePath,
+    path.join(outputPath, 'app', 'sls_yaml', 'generatedCode'),
+    path.join(outputPath, 'resource', 'sls_yaml', 'generatedCode')
+  ];
+
   // ponytail: ensure hooks are restored even if generation fails
   try {
-    console.log(
-      '[INFO] [generateCode] STATUS=CLEANUP | Removing old generatedCode directories...'
-    );
-  await fs.promises.rm(generatedCodePath, {
-    recursive: true,
-    force: true
-  });
-  await fs.promises.rm(
-    path.join(outputPath, 'app', 'sls_yaml', 'generatedCode'),
-    { recursive: true, force: true }
-  );
-  await fs.promises.rm(
-    path.join(outputPath, 'resource', 'sls_yaml', 'generatedCode'),
-    { recursive: true, force: true }
-  );
+    policyRegistry.clear();
 
-  policyRegistry.clear();
 
   // 1. Parsing & Hydration Pipeline
   console.log('[INFO] [generateCode] STATUS=PARSING | ObjectSchemas...');
@@ -227,9 +222,34 @@ export async function generateCode(rootPath, options = {}) {
     flowsForGeneration: flowData.flows || []
   };
 
+  console.log('[INFO] [generateCode] STATUS=NORMALIZING | Adapting Unified Flows...');
+  normalizeUnifiedFlows(allSchemas.flowsForGeneration);
+
   console.log('[INFO] [generateCode] STATUS=VALIDATING | Validating Flows...');
   validateFlowsForGeneration(allSchemas.flowsForGeneration);
 
+  console.log(
+    '[INFO] [generateCode] STATUS=BACKUP_DIRS | Backing up old generatedCode directories...'
+  );
+  for (const dir of dirsToBackup) {
+    if (fs.existsSync(dir)) {
+      if (fs.existsSync(`${dir}.bak`)) {
+        await fs.promises.rm(`${dir}.bak`, { recursive: true, force: true });
+      }
+      await fs.promises.rename(dir, `${dir}.bak`);
+      backedUpDirs.add(dir);
+    }
+  }
+
+  cleanupStarted = true;
+
+  console.log(
+    '[INFO] [generateCode] STATUS=CLEANUP | Removing old generatedCode directories before generating new files...'
+  );
+  for (const dir of dirsToBackup) {
+    await fs.promises.rm(dir, { recursive: true, force: true });
+  }
+
   // 2. Generation Pipeline
   await generateEndpointsFlow(allSchemas, generatorOptions);
   await generateFlowMainFunction(allSchemas, generatorOptions);
@@ -263,8 +283,28 @@ export async function generateCode(rootPath, options = {}) {
   await generateSharedResourceYaml(allSchemas, generatorOptions);
   await generateInitialSetup(allSchemas, generatorOptions);
 
+  generationSucceeded = true;
 
   } finally {
+    if (generationSucceeded) {
+      console.log('[INFO] [generateCode] STATUS=CLEANUP_BAK | Generation successful, removing .bak directories...');
+      for (const dir of dirsToBackup) {
+        if (fs.existsSync(`${dir}.bak`)) {
+          await fs.promises.rm(`${dir}.bak`, { recursive: true, force: true });
+        }
+      }
+    } else if (cleanupStarted) {
+      console.log('[INFO] [generateCode] STATUS=FAILED | Generation failed, rolling back directories...');
+      for (const dir of dirsToBackup) {
+        if (fs.existsSync(dir)) {
+          await fs.promises.rm(dir, { recursive: true, force: true });
+        }
+        if (backedUpDirs.has(dir) && fs.existsSync(`${dir}.bak`)) {
+          await fs.promises.rename(`${dir}.bak`, dir);
+        }
+      }
+    }
+
     // Restore backed-up hooks
     if (hookDirs.size > 0 || hookBackups.length > 0) {
       console.log(
@@ -279,14 +319,19 @@ export async function generateCode(rootPath, options = {}) {
       }
     }
 
-    console.log(
-      '[INFO] [generateCode] STATUS=HOOKS | Processing hook folders beside source folders...'
-    );
-    processSourceHooks(generatorOptions.outputPath);
+    if (generationSucceeded) {
+      console.log(
+        '[INFO] [generateCode] STATUS=HOOKS | Processing hook folders beside source folders...'
+      );
+      processSourceHooks(generatorOptions.outputPath);
 
-    console.log(
-      '[INFO] [generateCode] STATUS=FINISHED | Code generation complete.'
-    );
+      console.log(
+        '[INFO] [generateCode] STATUS=FINISHED | Code generation complete.'
+      );
+    } else {
+      console.log(
+        '[INFO] [generateCode] STATUS=FAILED | Code generation failed. Hook files were restored, but processSourceHooks was skipped.'
+      );
+    }
   }
 }
-

package/src/schemaGenerators/app/src/schemas/FlowSchemas/templates/DynamicFlowSchemaTemplate.ejs

@@ -17,14 +17,14 @@ export default {
   },
   flowSteps: [
     {
-      stepName: 'InTag',
+      stepName: 'start',
       properties: [],
       messageAttributes: ['userId', 'correlationId']
     },
     <% if (hasBeforeLogicalStep) { %>
     {
       stepName: 'BeforeLogical',
-      event: ['sqs'],
+      event: ['extTopic'],
       properties: [],
       messageAttributes: ['userId', 'correlationId']
     },
@@ -32,7 +32,7 @@ export default {
     <% if (['Create', 'Update', 'Delete'].includes(action)) { %>
     {
       stepName: 'Complete',
-      event: ['sqs'],
+      event: ['extTopic'],
       properties: [],
       messageAttributes: ['userId', 'correlationId']
     }

package/src/schemaGenerators/app/src/schemas/FlowSchemas/templates/DynamicRbacFlowSchemaTemplate.ejs

@@ -12,7 +12,7 @@ export default {
   outputTopic: true,
   flowSteps: [
     {
-      stepName: 'InTag',
+      stepName: 'start',
       properties: [],
       messageAttributes: []
     }

package/src/schemaGenerators/app/src/schemas/FlowSchemas/templates/RelationshipFlowSchemaTemplate.ejs

@@ -17,14 +17,14 @@ export default {
   },
   flowSteps: [
     {
-      stepName: 'InTag',
+      stepName: 'start',
       properties: [],
       messageAttributes: ['userId', 'correlationId']
     }
     <% if (hasCompleteStep) { %>,
   {
     stepName: 'Complete',
-    event: ['sqs'],
+    event: ['extTopic'],
     properties: [],
     messageAttributes: ['userId', 'correlationId']
   }

package/src/schemaGenerators/app/src/schemas/FlowSchemas/templates/UserRbacFlowSchemaTemplate.ejs

@@ -15,7 +15,7 @@ export default {
   },
   steps: [
     {
-      stepName: 'InTag',
+      stepName: 'start',
       messageAttributes: ['userId', 'correlationId']
     }
   ]

package/test_generate.js

@@ -0,0 +1,7 @@
+import { generateCode } from './src/generateCode.js';
+
+async function run() {
+  const rootPath = '/home/azure/Working/test/test-lib-generateCode/test-cases/real/case01-UnitType/workspace';
+  await generateCode(rootPath);
+}
+run().catch(console.error);

package/test_normalize.js

@@ -0,0 +1,17 @@
+import { normalizeUnifiedFlows, normalizeFlowSteps } from './src/codeGenerators/app/src/generatedCode/Flow/_shared/shared/flowStepNormalizer.js';
+
+const rawFlows = [
+  {
+    event: 'api',
+    flowSteps: {
+      MyStep: { properties: [] }
+    }
+  }
+];
+
+try {
+  const result = normalizeUnifiedFlows(rawFlows);
+  console.log(JSON.stringify(result, null, 2));
+} catch (e) {
+  console.error(e.message);
+}