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

package/src/codeGenerators/app/src/generatedCode/Flow/_shared/handlers/FlowHandler_HdrDsq.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';
@@ -27,11 +27,9 @@ let perRecordsValidatorSchema = {
 <% 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(', ') %> ]
+<% 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>)
 };
@@ -40,90 +38,108 @@ let perRecordsValidatorSchema = {
 let messageAttributeValidatorSchema = {
   type: 'object',
   properties: {
-  <% startConfig.messageAttributes.forEach(prop => { -%>
-    '<%- prop.propertyName %>': {
+<% startConfig.messageAttributes.forEach((prop, index) => { %>    '<%- 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(', ') %> ]
+    }<%= 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'
+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
-    }))
+    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);
+<% if (functionName.endsWith('Complete')) { %>
+        passOnProperties.push(
+          callingFlowSharedLib.addPassBackPropertiesToPassOnProperties(
+            record.body.Message
+          )
+        );
+<% } else { %>
+        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/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';
@@ -27,11 +27,9 @@ let perRecordsValidatorSchema = {
 <% 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(', ') %> ]
+<% 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>)
 };
@@ -40,18 +38,16 @@ let perRecordsValidatorSchema = {
 let messageAttributeValidatorSchema = {
   type: 'object',
   properties: {
-  <% startConfig.messageAttributes.forEach(prop => { -%>
-    '<%- prop.propertyName %>': {
+<% startConfig.messageAttributes.forEach((prop, index) => { %>    '<%- 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(', ') %> ]
+    }<%= index < startConfig.messageAttributes.length - 1 ? ',' : '' %>
+<% }) %>  },
+  required: [<%- startConfig.messageAttributes.filter(p => p.required !== false).map(p => `'${p.propertyName}'`).join(', ') %>]
 };
 <% } else { -%>
 let messageAttributeValidatorSchema = null;
@@ -59,57 +55,73 @@ 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);
+<% if (functionName.endsWith('Complete')) { %>
+        passOnProperties.push(
+          callingFlowSharedLib.addPassBackPropertiesToPassOnProperties(
+            record.body.Message
+          )
+        );
+<% } else { %>
+        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/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);
@@ -41,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 startStep = flow.flowSteps && flow.flowSteps.find(
-      s => s.stepName === 'start'
-    );
+    const startStep = flow.flowSteps && flow.flowSteps.length > 0 ? flow.flowSteps[0] : null;
     let startConfig = startStep ? { ...startStep } : null;
 
     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;
-        });
+        startConfig.properties = startConfig.properties.map(p => normalizePropertyType(p, flow.stepProperties));
       }
       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;
-        });
+        startConfig.messageAttributes = startConfig.messageAttributes.map(p => normalizePropertyType(p, flow.stepMessageAttributes));
       }
     }
 
@@ -119,7 +107,8 @@ export async function generateFlowMainFunction(allSchemas, options) {
       generateCode: generateCode,
       flow: flow,
       startConfig: startConfig,
-      tableName: tableName
+      tableName: tableName,
+      functionName: functionName
     });
     await fs.writeFile(
       path.join(flowOutputDir, `${mainFileName}.js`),
@@ -127,34 +116,35 @@ 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,
         startConfig: startConfig,
-        tableName: tableName
+        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)
     const beforeLogicalConfigs = generateCode.filter(c => c.codeHookTag === 'beforeLogical');
     if (isCrud && beforeLogicalConfigs.length > 0) {
-      const beforeLogicalTemplateStr = await fs.readFile(
-        path.join(__dirname, '..', '..', 'FlowObjects', 'templates', 'FlowEndpointBeforeLogical_Main.ejs'),
-        'utf-8'
-      );
+      const beforeLogicalTemplatePath = path.join(__dirname, '..', '..', 'FlowObjects', 'templates', 'step', 'FlowEndpointBeforeLogical_Main.ejs');
+      const beforeLogicalTemplateStr = await fs.readFile(beforeLogicalTemplatePath, 'utf-8');
       
       const beforeLogicalFileName = `${upperCaseFlowTag}BeforeLogical_Main`;
       const beforeLogicalContent = ejs.render(beforeLogicalTemplateStr, {

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/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';
@@ -18,7 +18,7 @@ export async function generateFlowSteps(allSchemas, options) {
     // Read templates
     const templates = {
         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'),
+        complete: await fs.readFile(path.join(__dirname, '..', '..', 'FlowObjects', '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'),
@@ -52,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', 'start', '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 });
@@ -79,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;

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

@@ -40,35 +40,36 @@ export function normalizeUnifiedFlows(rawFlows) {
         // 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');
-        
+        // ponytail: root-level event is standard, flowStep[0] has no event.
         if (flow.event) {
-            if (!hasStart) {
+            const firstStep = flow.flowSteps[0];
+            const needsStartStep = !firstStep || firstStep.event;
+            
+            if (needsStartStep) {
                 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 || []
-                    });
+        }
+        // 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;
     });
 }