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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-core-generate-service-code",
-  "version": "1.0.59",
+  "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/FlowSchemas/templates/endpoint/FlowEndpoint_Main.ejs

@@ -23,6 +23,10 @@ import asyncFlowSharedLib from '@izara_project/izara-core-library-asynchronous-f
 import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow';
 import lambdaSharedLib from '@izara_project/izara-core-library-lambda';
 
+<% if (typeof flow !== 'undefined' && flow.statusType === 'storedCache') { %>
+import storedCacheSharedLib from '@izara_project/izara-core-library-stored-cache';
+<% } %>
+
 //(<optionalImport>)
 import { getObjectSchema } from '@izara_project/izara-core-library-service-schemas';
 import {
@@ -65,6 +69,35 @@ export default async function Process<%- upperCaseFlowTag %>(
     _izContext.logger.debug("Process<%- upperCaseFlowTag %> requestParams", requestParams)
     _izContext.logger.debug("Process<%- upperCaseFlowTag %> callingFlowConfig", callingFlowConfig)
 
+<% if (typeof flow !== 'undefined' && flow.statusType === 'storedCache') { %>
+    let [ cacheMainStatus, cacheMain, cacheExist ] = await storedCacheSharedLib.checkStoredCacheStatus(
+      _izContext,
+      "<%= tableName %>",
+      {
+        //(<keyValueStoredCacheTable>)
+        //(</keyValueStoredCacheTable>)
+      },
+      //(<additionalAttributesWhenCreateStoredCache>)
+      //(</additionalAttributesWhenCreateStoredCache>),
+      createFlowTypeConcat(_izContext, { flowTag: "<%= flowTag %>", serviceTag: process.env.iz_serviceTag }),
+      //(<storedCacheConfig>)
+      //(</storedCacheConfig>)
+    )
+
+    //(<afterCheckStoredCache>)
+    //(</afterCheckStoredCache>)
+
+    if (cacheMainStatus !== "process") {
+      if (cacheMainStatus === "error" || cacheMainStatus === "complete") {
+        //(<afterValidateStoredCacheStatus>)
+        //(</afterValidateStoredCacheStatus>)
+      }
+
+      //(<checkStoredCacheHook>)
+      //(</checkStoredCacheHook>)
+    }
+<% } %>
+
 <% if (typeof flow !== 'undefined' && flow.isRbac) { %>
     const { checkRbacPermission } = await import('@izara_project/izara-authorization');
 

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);
+  }
+});