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

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

@@ -0,0 +1,137 @@
+/*
+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, index) => { %>    <%- prop.propertyName %>: { type: '<%- prop.type || 'string' %>' }<%= index < startConfig.properties.length - 1 ? ',' : '' %>
+<% }) %>  },
+  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, index) => { %>    '<%- prop.propertyName %>': {
+      type: 'object',
+      properties: {
+        Type: { type: 'string' },
+        Value: { type: '<%- prop.type || 'string' %>' }
+      },
+      required: ['Type', 'Value']
+    }<%= index < startConfig.messageAttributes.length - 1 ? ',' : '' %>
+<% }) %>  },
+  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

@@ -15,8 +15,8 @@ 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 { 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';
@@ -24,27 +24,30 @@ 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' %>' },
-  <% }) -%>
-  },
-  required: [ <%- inTagConfig.properties.filter(p => p.required !== false).map(p => `'${p.propertyName}'`).join(', ') %> ]
+<% startConfig.properties.forEach((prop, index) => { %>    <%- prop.propertyName %>: { type: '<%- prop.type || 'string' %>' }<%= index < startConfig.properties.length - 1 ? ',' : '' %>
+<% }) %>  },
+  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' %>' },
-  <% }) -%>
-  },
-  required: [ <%- inTagConfig.messageAttributes.filter(p => p.required !== false).map(p => `'${p.propertyName}'`).join(', ') %> ]
+<% startConfig.messageAttributes.forEach((prop, index) => { %>    '<%- prop.propertyName %>': {
+      type: 'object',
+      properties: {
+        Type: { type: 'string' },
+        Value: { type: '<%- prop.type || 'string' %>' }
+      },
+      required: ['Type', 'Value']
+    }<%= index < startConfig.messageAttributes.length - 1 ? ',' : '' %>
+<% }) %>  },
+  required: [<%- startConfig.messageAttributes.filter(p => p.required !== false).map(p => `'${p.propertyName}'`).join(', ') %>]
 };
 <% } else { -%>
 let messageAttributeValidatorSchema = null;
@@ -52,57 +55,65 @@ let messageAttributeValidatorSchema = null;
 middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema());
 
 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._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
-    }))
+    await Promise.all(
+      event.Records.map(async record => {
+        // promise.all for map() function
+
+        let passOnProperties = [];
+        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
-
+      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(
+        '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);
+    throw err;
   }
 });

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

@@ -4,9 +4,9 @@ import { fileURLToPath } from 'url';
 import ejs from 'ejs';
 import { EVENT_HANDLERS } from '../events/registry.js';
 import { STATUS_HANDLERS } from './registry.js';
-import { getFlowOutputSubDir, isRbacFlow, isRelationshipFlow } from './flowClassifier.js';
+import { getFlowOutputSubDir, isCrudFlow, isRbacFlow, isRelationshipFlow } from './flowClassifier.js';
 import { normalizeEvents } from './eventTypes.js';
-import { processMainFileName, upperFirst } from './flowNaming.js';
+import { processMainFileName, ownTopicMainFileName, upperFirst } from './flowNaming.js';
 import { getFlowsForGeneration, getGeneratedCodeConfigs } from './flowSelection.js';
 
 const __filename = fileURLToPath(import.meta.url);
@@ -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'),
@@ -40,10 +41,13 @@ export async function generateFlowEntryPoint(allSchemas, options) {
         const flowOutputDir = path.join(baseOutputDir, subDir, upperCaseFlowTag, 'source');
         await fs.mkdir(flowOutputDir, { recursive: true });
 
-        // NOTE: Changed to Process${upperCaseFlowTag}_Main to match legacy.
-        const mainFileName = processMainFileName(flowTag);
         // 2. Generate Handlers based on event array using Registry
         const events = normalizeEvents(flow.event, ['ownTopic']);
+
+        const isOwnTopic = !isCrudFlow(flowTag) && !isRbacFlow(flowTag) && !isRelationshipFlow(flowTag) && events.includes('ownTopic');
+        const mainFileName = isOwnTopic
+            ? ownTopicMainFileName(flowTag)
+            : processMainFileName(flowTag);
         
         // Use invocationType from generatedCodeConfig if available
         if (flow.generatedCodeConfig && flow.generatedCodeConfig.invocationType) {

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

@@ -3,8 +3,9 @@ import fs from 'fs/promises';
 import { fileURLToPath } from 'url';
 import ejs from 'ejs';
 import { getFlowOutputSubDir, isCrudFlow, isRbacFlow, isRelationshipFlow } from './flowClassifier.js';
-import { processMainFileName, upperFirst } from './flowNaming.js';
+import { processMainFileName, processFunctionName, ownTopicMainFileName, ownTopicFunctionName, ownTopicWebSocketMainFileName, ownTopicWebSocketFunctionName, upperFirst } from './flowNaming.js';
 import { getFlowsForGeneration, getGeneratedCodeConfigs } from './flowSelection.js';
+import { normalizePropertyType } from './propertyNormalizer.js';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -41,11 +42,13 @@ export async function generateFlowMainFunction(allSchemas, options) {
     const flowOutputDir = path.join(baseOutputDir, subDir, upperCaseFlowTag, 'source');
     await fs.mkdir(flowOutputDir, { recursive: true });
 
-    // For ownTopic flows the SNS-publish file is <FlowTag>_Main.js; others stay Process<FlowTag>_Main.js
     const isOwnTopic = !isCrud && flow.event && flow.event.includes('ownTopic');
     const mainFileName = isOwnTopic
-      ? `${upperCaseFlowTag}_Main`
+      ? ownTopicMainFileName(flowTag)
       : processMainFileName(flowTag);
+    const functionName = isOwnTopic
+      ? ownTopicFunctionName(flowTag)
+      : processFunctionName(flowTag);
     const topicArn = `${upperCaseFlowTag}_In`;
 
     const generateCode = getGeneratedCodeConfigs(flows, flowTag, { includeFlowTag: true });
@@ -55,9 +58,6 @@ export async function generateFlowMainFunction(allSchemas, options) {
       templateName = `${flowTag}Endpoint_Main.ejs`;
     } else if (String(flowTag || '').toLowerCase().endsWith('rbacflow')) {
       templateName = 'FlowRbac_Main.ejs';
-    } else if (isOwnTopic) {
-      // Non-CRUD flow with ownTopic: WebSocket entry that fetches flowSchema and publishes to SNS In topic
-      templateName = 'FlowMain_Wbs.ejs';
     }
 
     // crud templates live under FlowObjects (the only output child that uses them);
@@ -75,27 +75,15 @@ export async function generateFlowMainFunction(allSchemas, options) {
       'utf-8'
     );
 
-    const inTagStep = flow.flowSteps && flow.flowSteps.find(
-      s => s.stepName === 'InTag'
-    );
-    let inTagConfig = inTagStep ? { ...inTagStep } : null;
+    const startStep = flow.flowSteps && flow.flowSteps.length > 0 ? flow.flowSteps[0] : null;
+    let startConfig = startStep ? { ...startStep } : null;
 
-    if (inTagConfig) {
-      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) {
+      if (startConfig.properties && Array.isArray(startConfig.properties)) {
+        startConfig.properties = startConfig.properties.map(p => normalizePropertyType(p, flow.stepProperties));
       }
-      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));
       }
     }
 
@@ -118,8 +106,9 @@ export async function generateFlowMainFunction(allSchemas, options) {
       topicArn: topicArn,
       generateCode: generateCode,
       flow: flow,
-      inTagConfig: inTagConfig,
-      tableName: tableName
+      startConfig: startConfig,
+      tableName: tableName,
+      functionName: functionName
     });
     await fs.writeFile(
       path.join(flowOutputDir, `${mainFileName}.js`),
@@ -127,25 +116,28 @@ export async function generateFlowMainFunction(allSchemas, options) {
       'utf-8'
     );
 
-    // For ownTopic flows: also generate Process${FlowTag}_Main.js (simple endpoint, triggered from SQS)
+    // For ownTopic flows: generate WebSocket main that publishes to SNS In topic
     if (isOwnTopic) {
-      const processMainTemplateStr = await fs.readFile(
-        path.join(__dirname, '..', '..', 'FlowSchemas', 'templates', 'endpoint', 'FlowEndpoint_Main.ejs'),
+      const wbsMainTemplateStr = await fs.readFile(
+        path.join(__dirname, '..', '..', 'FlowSchemas', 'templates', 'endpoint', 'FlowMain_Wbs.ejs'),
         'utf-8'
       );
-      const processMainContent = ejs.render(processMainTemplateStr, {
+      const wbsMainContent = ejs.render(wbsMainTemplateStr, {
         flowTag: flowTag,
         upperCaseFlowTag: upperCaseFlowTag,
+        topicArn: topicArn,
         generateCode: generateCode,
         flow: flow,
-        inTagConfig: inTagConfig,
-        tableName: tableName
+        startConfig: startConfig,
+        tableName: tableName,
+        functionName: ownTopicWebSocketFunctionName(flowTag)
       });
       await fs.writeFile(
-        path.join(flowOutputDir, `${processMainFileName(flowTag)}.js`),
-        processMainContent,
+        path.join(flowOutputDir, `${ownTopicWebSocketMainFileName(flowTag)}.js`),
+        wbsMainContent,
         'utf-8'
       );
+      generatedCount++;
     }
 
     // 2. Generate BeforeLogical Main Logic File if needed (CRUD flows only)
@@ -162,7 +154,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/flowNaming.js

@@ -16,6 +16,22 @@ export function processFunctionName(flowTag) {
     return `Process${upperFirst(flowTag)}`;
 }
 
+export function ownTopicMainFileName(flowTag) {
+    return `${upperFirst(flowTag)}_Main`;
+}
+
+export function ownTopicFunctionName(flowTag) {
+    return `${upperFirst(flowTag)}_Main`;
+}
+
+export function ownTopicWebSocketMainFileName(flowTag) {
+    return `${upperFirst(flowTag)}_WbsMain`;
+}
+
+export function ownTopicWebSocketFunctionName(flowTag) {
+    return `${upperFirst(flowTag)}_WbsMain`;
+}
+
 export function flowSourceLocation(subDir, flowTag) {
     return `src/generatedCode/${subDir}/${upperFirst(flowTag)}/source/`;
 }

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

@@ -2,7 +2,7 @@ import path from 'path';
 import fs from 'fs/promises';
 import { fileURLToPath } from 'url';
 import ejs from 'ejs';
-import { getFlowOutputSubDir, isRbacFlow, isRelationshipFlow } from './flowClassifier.js';
+import { getFlowOutputSubDir, isRbacFlow, isRelationshipFlow, isCrudFlow } from './flowClassifier.js';
 import { getStepEventHandlerConfig, normalizeEvents } from './eventTypes.js';
 import { normalizeFlowSteps } from './flowStepNormalizer.js';
 import { getFlowsForGeneration } from './flowSelection.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'),
 
@@ -51,9 +52,14 @@ export async function generateFlowSteps(allSchemas, options) {
 
         let createdDir = false;
 
-        for (const stepConfig of normalizeFlowSteps(flow.flowSteps)) {
+        const normalizedSteps = normalizeFlowSteps(flow.flowSteps);
+        for (let index = 0; index < normalizedSteps.length; index++) {
+            const stepConfig = normalizedSteps[index];
             const stepName = stepConfig.stepName;
-            if (['In', 'InTag', 'Out', 'beforeLogical'].includes(stepName)) continue;
+            
+            // Skip the first step (which is the entry point, handled by flowMainFunctionBase)
+            // Also skip traditional skipped steps by name for backward compatibility
+            if (index === 0 || ['in', 'start', 'out', 'beforelogical'].includes(stepName?.toLowerCase())) continue;
 
             if (!createdDir) {
                 await fs.mkdir(flowOutputDir, { recursive: true });
@@ -78,7 +84,7 @@ export async function generateFlowSteps(allSchemas, options) {
                 functionName: `${flowTag}${stepName}`,
             };
 
-            const isCompleteStep = stepName === 'Complete';
+            const isCompleteStep = stepName === 'Complete' && isCrudFlow(flowTag);
             // Base Step Generation
             if (isCompleteStep) {
                 templateToUse = templates.complete;
@@ -179,7 +185,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,55 @@ 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;
+        
+        // ponytail: root-level event is standard, flowStep[0] has no event.
+        if (flow.event) {
+            const firstStep = flow.flowSteps[0];
+            const needsStartStep = !firstStep || firstStep.event;
+            
+            if (needsStartStep) {
+                flow.flowSteps.unshift({
+                    stepName: 'Start',
+                    properties: flow.properties || [],
+                    messageAttributes: flow.messageAttributes || []
+                });
+            }
+        }
+        // Validate flowStep events
+        flow.flowSteps.forEach((step, index) => {
+            if (index === 0) {
+                if (step.event) {
+                    throw new Error(`[Schema Error] Flow '${flow.flowTag || 'Unknown'}' -> stepName '${step.stepName}' (Index 0) must not have an 'event'. Set it at the flow root instead.`);
+                }
+            } else {
+                if (step.event) {
+                    const validStepEvents = ['extTopic', 'lambdaSyncInv', 'dsq'];
+                    const invalidEvents = step.event.filter(e => !validStepEvents.includes(e));
+                    if (invalidEvents.length > 0) {
+                        throw new Error(`[Schema Error] Flow '${flow.flowTag || 'Unknown'}' -> stepName '${step.stepName}' has invalid event: ${invalidEvents.join(', ')}. Allowed: ${validStepEvents.join(', ')}`);
+                    }
+                }
+            }
+        });
+
+        return flow;
+    });
+}