@izara_project/izara-core-generate-service-code 1.0.66 → 1.0.68

package/src/emit/custom/customFlows.js

@@ -1,15 +1,25 @@
-const SUPPORTED_EVENTS = new Set(['eventBridge', 'extTopic', 'lambdaSyncInv', 'lambdaSyncApi', 'ownTopic', 's3']);
+const SUPPORTED_EVENTS = new Set([
+  'eventBridge',
+  'extTopic',
+  'lambdaSyncInv',
+  'lambdaSyncApi',
+  'ownTopic',
+  's3',
+  'dsq'
+]);
 
 export function supportedCustomFlows(flows) {
   if (!Array.isArray(flows)) {
     throw new TypeError('flows must be an array');
   }
-  return flows.filter(flow => (
-    typeof flow?.flowTag === 'string' && flow.flowTag !== '' &&
-    !flow.generatedCodeConfig &&
-    Array.isArray(flow.event) &&
-    flow.event.some(event => SUPPORTED_EVENTS.has(event))
-  ));
+  return flows.filter(
+    flow =>
+      typeof flow?.flowTag === 'string' &&
+      flow.flowTag !== '' &&
+      !flow.generatedCodeConfig &&
+      Array.isArray(flow.event) &&
+      flow.event.some(event => SUPPORTED_EVENTS.has(event))
+  );
 }
 
 export function customFlowRoleName(flowTag) {
@@ -24,13 +34,74 @@ export function flowExtTopicSteps(flows) {
     if (typeof flow?.flowTag !== 'string' || flow.flowTag === '') {
       return [];
     }
-    return (flow.flowSteps ?? []).flatMap(step => (
-      typeof step?.stepName === 'string' && step.stepName !== '' &&
+    const hasTriggerFlowTypes = Array.isArray(flow.triggerFlowTypes) && flow.triggerFlowTypes.length > 0;
+    const steps = flow.flowSteps ?? [];
+    const hasCheckStep = steps.some(
+      step => typeof step?.stepName === 'string' && step.stepName.toLowerCase().includes('checktrigger')
+    );
+
+    const result = steps.flatMap(step => {
+      if (
+        typeof step?.stepName !== 'string' ||
+        step.stepName === '' ||
+        step.stepName.toLowerCase() === 'start' ||
+        !Array.isArray(step.event) ||
+        !step.event.includes('extTopic')
+      ) {
+        return [];
+      }
+      const isCheckStep = step.stepName.toLowerCase().includes('checktrigger');
+      if (isCheckStep && !hasTriggerFlowTypes) {
+        return [];
+      }
+      return [
+        {
+          flow,
+          step,
+          flowTag: upperFirst(flow.flowTag),
+          stepName: upperFirst(step.stepName)
+        }
+      ];
+    });
+
+    if (hasTriggerFlowTypes && !hasCheckStep) {
+      const defaultStepName = 'CheckTriggerFlows';
+      result.push({
+        flow,
+        step: { stepName: defaultStepName, event: ['extTopic'] },
+        flowTag: upperFirst(flow.flowTag),
+        stepName: defaultStepName
+      });
+    }
+
+    return result;
+  });
+}
+
+export function flowDsqSteps(flows) {
+  if (!Array.isArray(flows)) {
+    throw new TypeError('flows must be an array');
+  }
+  return flows.flatMap(flow => {
+    if (typeof flow?.flowTag !== 'string' || flow.flowTag === '') {
+      return [];
+    }
+    return (flow.flowSteps ?? []).flatMap(step =>
+      typeof step?.stepName === 'string' &&
+      step.stepName !== '' &&
       step.stepName.toLowerCase() !== 'start' &&
-      Array.isArray(step.event) && step.event.includes('extTopic')
-        ? [{ flow, step, flowTag: upperFirst(flow.flowTag), stepName: upperFirst(step.stepName) }]
+      Array.isArray(step.event) &&
+      step.event.includes('dsq')
+        ? [
+            {
+              flow,
+              step,
+              flowTag: upperFirst(flow.flowTag),
+              stepName: upperFirst(step.stepName)
+            }
+          ]
         : []
-    ));
+    );
   });
 }
 
@@ -38,33 +109,43 @@ export function generatedOwnTopicFlows(flows) {
   if (!Array.isArray(flows)) {
     throw new TypeError('flows must be an array');
   }
-  return flows.filter(flow => (
-    typeof flow?.flowTag === 'string' && flow.flowTag !== '' &&
-    flow.generatedCodeConfig &&
-    Array.isArray(flow.event) && flow.event.includes('ownTopic')
-  ));
+  return flows.filter(
+    flow =>
+      typeof flow?.flowTag === 'string' &&
+      flow.flowTag !== '' &&
+      flow.generatedCodeConfig &&
+      Array.isArray(flow.event) &&
+      flow.event.includes('ownTopic')
+  );
+}
+
+export function upperFirst(value) {
+  return value[0].toUpperCase() + value.slice(1);
 }
 
 export function triggerCacheFlows(flows) {
   if (!Array.isArray(flows)) {
     throw new TypeError('flows must be an array');
   }
-  return flows.filter(flow => (
-    typeof flow?.flowTag === 'string' && flow.flowTag !== '' &&
-    flow.statusType === 'triggerCache'
-  ));
+  return flows.filter(
+    flow =>
+      typeof flow?.flowTag === 'string' &&
+      flow.flowTag !== '' &&
+      flow.statusType === 'triggerCache'
+  );
 }
 
 export function triggerCacheQueueNames(flow) {
   const tag = upperFirst(flow.flowTag);
-  return [
-    `TriggerCache${tag}HdrDsq`,
-    `CheckTriggerCache${tag}CompleteHdrSqs`,
-    `TriggerCache${tag}CompleteHdrSqs`,
-    `TriggerCache${tag}CompleteHdrDsq`
-  ];
-}
-
-export function upperFirst(value) {
-  return value[0].toUpperCase() + value.slice(1);
+  const queues = [`TriggerCache${tag}HdrDsq`];
+  if (Array.isArray(flow.triggerFlowTypes) && flow.triggerFlowTypes.length > 0) {
+    const customCheckStep = (flow.flowSteps ?? []).find(
+      s => typeof s?.stepName === 'string' && s.stepName.toLowerCase().includes('checktrigger')
+    );
+    const checkStepName = customCheckStep
+      ? (upperFirst(customCheckStep.stepName).startsWith(tag) ? upperFirst(customCheckStep.stepName) : `${tag}${upperFirst(customCheckStep.stepName)}`)
+      : `${tag}CheckTriggerFlows`;
+    queues.push(`${checkStepName}HdrSqs`);
+  }
+  return queues;
 }

package/src/emit/custom/emitCustomFlowApplicationArtifacts.js

@@ -5,10 +5,11 @@ import {
   renderApiFunctionYaml,
   renderEventBridgeFunctionYaml,
   renderInvFunctionYaml,
+  renderS3FunctionYaml,
   renderSqsFunctionYaml,
   renderWbsFunctionYaml
 } from '../function/functionYamlArtifact.js';
-import { customFlowRoleName, flowExtTopicSteps, generatedOwnTopicFlows, supportedCustomFlows, triggerCacheFlows, triggerCacheQueueNames, upperFirst } from './customFlows.js';
+import { customFlowRoleName, flowDsqSteps, flowExtTopicSteps, generatedOwnTopicFlows, supportedCustomFlows, upperFirst } from './customFlows.js';
 
 const YAML_PATH = 'app/sls_yaml/generatedCode/source/flow-schema.yml';
 const TEMPLATE_URL = new URL('../crud/templates/', import.meta.url);
@@ -19,19 +20,19 @@ export async function emitCustomFlowApplicationArtifacts(flows, { systemFunction
   const customFlows = supportedCustomFlows(flows);
   const generatedRoots = generatedOwnTopicFlows(flows);
   const steps = flowExtTopicSteps(flows);
-  const triggerCache = triggerCacheFlows(flows);
-  if (customFlows.length === 0 && generatedRoots.length === 0 && steps.length === 0 && triggerCache.length === 0 && systemFunctions.length === 0) return [];
+  const dsqSteps = flowDsqSteps(flows);
+  if (customFlows.length === 0 && generatedRoots.length === 0 && steps.length === 0 && dsqSteps.length === 0 && systemFunctions.length === 0) return [];
 
   const emitted = await Promise.all(customFlows.map(flow => emitFlow(flow, objects)));
   const roots = await Promise.all(generatedRoots.map(flow => emitOwnTopicRoot(flow, objects)));
   const stepResults = await Promise.all(steps.map(emitExtTopicStep));
-  const triggerCacheResults = await Promise.all(triggerCache.map(emitTriggerCacheFlow));
+  const dsqStepResults = await Promise.all(dsqSteps.map(emitDsqStep));
   return [
     ...emitted.flatMap(result => result.artifacts),
     ...roots.flatMap(result => result.artifacts),
     ...stepResults.flatMap(result => result.artifacts),
-    ...triggerCacheResults.flatMap(result => result.artifacts),
-    { path: YAML_PATH, content: [...systemFunctions, ...emitted.flatMap(result => result.functions), ...roots.flatMap(result => result.functions), ...stepResults.map(result => result.function), ...triggerCacheResults.flatMap(result => result.functions)].join('\n') }
+    ...dsqStepResults.flatMap(result => result.artifacts),
+    { path: YAML_PATH, content: [...systemFunctions, ...emitted.flatMap(result => result.functions), ...roots.flatMap(result => result.functions), ...stepResults.flatMap(result => result.functions), ...dsqStepResults.flatMap(result => result.functions)].join('\n') }
   ];
 }
 
@@ -43,61 +44,23 @@ export function customFlowApplicationManagedPaths(flows, { includeYaml = false }
       const source = `app/src/generatedCode/FlowSchemas/${flowTag}/source`;
       return [`${source}/${flowTag}${stepName}_Main.js`, `${source}/${flowTag}${stepName}_HdrSqs.js`];
     }),
-    ...triggerCacheFlows(flows).flatMap(triggerCachePaths),
-    ...(supportedCustomFlows(flows).length > 0 || generatedOwnTopicFlows(flows).length > 0 || flowExtTopicSteps(flows).length > 0 || triggerCacheFlows(flows).length > 0 || includeYaml ? [YAML_PATH] : [])
+    ...flowDsqSteps(flows).flatMap(({ flowTag, stepName, step }) => {
+      const source = `app/src/generatedCode/FlowSchemas/${flowTag}/source`;
+      const stepEvents = Array.isArray(step.event) ? step.event : [];
+      return [
+        ...(stepEvents.includes('extTopic') ? [] : [`${source}/${flowTag}${stepName}_Main.js`]),
+        `${source}/${flowTag}${stepName}_HdrDsq.js`
+      ];
+    }),
+    ...(supportedCustomFlows(flows).length > 0 || generatedOwnTopicFlows(flows).length > 0 || flowExtTopicSteps(flows).length > 0 || flowDsqSteps(flows).length > 0 || includeYaml ? [YAML_PATH] : [])
   ];
 }
 
-async function emitTriggerCacheFlow(flow) {
-  const tag = upperFirst(flow.flowTag);
-  const source = `app/src/generatedCode/FlowSchemas/${tag}/source`;
-  const handlerRoot = `src/generatedCode/FlowSchemas/${tag}/source`;
-  const roleName = customFlowRoleName(flow.flowTag);
-  const [processQueue, checkQueue, completeSqsQueue, completeDsqQueue] = triggerCacheQueueNames(flow);
-  const process = `TriggerCache${tag}`;
-  const check = `CheckTriggerCache${tag}Complete`;
-  const complete = `TriggerCache${tag}Complete`;
-  const handler = (functionName, handlerType) => `${handlerRoot}/${functionName}_${handlerType}.main`;
-
-  return {
-    artifacts: [
-      { path: `${source}/${process}_Main.js`, content: await renderCustom('triggerCache/TriggerCache_Main.ejs', { functionName: process }) },
-      { path: `${source}/${process}_HdrDsq.js`, content: await renderDsq('FlowHandler_HdrDsq.ejs', { functionName: process, mainFileName: `${process}_Main`, queueName: processQueue, startConfig: null }) },
-      { path: `${source}/${check}_Main.js`, content: await renderCustom('triggerCache/CheckTriggerCache_Main.ejs', { functionName: check, flowTag: flow.flowTag }) },
-      { path: `${source}/${check}_HdrSqs.js`, content: await renderCustom('triggerCache/CheckTriggerCache_HdrSqs.ejs', { functionName: check, queueName: checkQueue }) },
-      { path: `${source}/${complete}_Main.js`, content: await renderCustom('triggerCache/TriggerCacheComplete_Main.ejs', { functionName: complete, flowTag: flow.flowTag }) },
-      { path: `${source}/${complete}_HdrSqs.js`, content: await render('FlowHandler_HdrSqs.ejs', { functionName: complete, mainFileName: `${complete}_Main`, queueName: completeSqsQueue, startConfig: null, usePassBack: false }) },
-      { path: `${source}/${complete}_HdrDsq.js`, content: await renderDsq('FlowHandler_HdrDsq.ejs', { functionName: complete, mainFileName: `${complete}_Main`, queueName: completeDsqQueue, startConfig: null, usePassBack: false }) }
-    ],
-    functions: [
-      renderSqsFunctionYaml({ functionName: `${process}HdrDsq`, handlerPath: handler(process, 'HdrDsq'), roleName, queueName: processQueue }),
-      renderSqsFunctionYaml({ functionName: `${check}HdrSqs`, handlerPath: handler(check, 'HdrSqs'), roleName, queueName: checkQueue }),
-      renderSqsFunctionYaml({ functionName: `${complete}HdrSqs`, handlerPath: handler(complete, 'HdrSqs'), roleName, queueName: completeSqsQueue }),
-      renderSqsFunctionYaml({ functionName: `${complete}HdrDsq`, handlerPath: handler(complete, 'HdrDsq'), roleName, queueName: completeDsqQueue })
-    ]
-  };
-}
 
-function triggerCachePaths(flow) {
-  const tag = upperFirst(flow.flowTag);
-  const source = `app/src/generatedCode/FlowSchemas/${tag}/source`;
-  const process = `TriggerCache${tag}`;
-  const check = `CheckTriggerCache${tag}Complete`;
-  const complete = `TriggerCache${tag}Complete`;
-  return [
-    `${source}/${process}_Main.js`,
-    `${source}/${process}_HdrDsq.js`,
-    `${source}/${check}_Main.js`,
-    `${source}/${check}_HdrSqs.js`,
-    `${source}/${complete}_Main.js`,
-    `${source}/${complete}_HdrSqs.js`,
-    `${source}/${complete}_HdrDsq.js`
-  ];
-}
 
 async function emitFlow(flow, objects) {
   const tag = upperFirst(flow.flowTag);
-  const process = `Process${tag}`;
+  const process = tag;
   const source = `app/src/generatedCode/FlowSchemas/${tag}/source`;
   const handlerRoot = `src/generatedCode/FlowSchemas/${tag}/source`;
   const shared = { flowTag: flow.flowTag, flowStepName: '', mainFileName: `${process}_Main`, functionName: process, startConfig: startConfig(flow) };
@@ -106,21 +69,25 @@ async function emitFlow(flow, objects) {
     : [];
   const functions = [];
 
-  if (flow.event.includes('extTopic')) {
+  if (flow.event.includes('extTopic') && !flow.event.includes('ownTopic')) {
     artifacts.push({ path: `${source}/${process}_HdrSqs.js`, content: await render('FlowHandler_HdrSqs.ejs', { ...shared, queueName: `${process}HdrSqs` }) });
-    functions.push(renderSqsFunctionYaml({ functionName: `${process}HdrSqs`, handlerPath: `${handlerRoot}/${process}_HdrSqs.main`, roleName: customFlowRoleName(flow.flowTag), queueName: `${process}HdrSqs` }));
+    functions.push(renderSqsFunctionYaml({ functionName: `${process}HdrSqs`, handlerPath: `${handlerRoot}/${process}_HdrSqs.main`, roleName: customFlowRoleName(flow.flowTag), queueName: `${process}HdrSqs`, flowTag: flow.flowTag, flowStepName: '' }));
+  }
+  if (flow.event.includes('dsq')) {
+    artifacts.push({ path: `${source}/${process}_HdrDsq.js`, content: await renderDsq('FlowHandler_HdrDsq.ejs', { ...shared, queueName: `${process}HdrDsq` }) });
+    functions.push(renderSqsFunctionYaml({ functionName: `${process}HdrDsq`, handlerPath: `${handlerRoot}/${process}_HdrDsq.main`, roleName: customFlowRoleName(flow.flowTag), queueName: `${process}HdrDsq`, flowTag: flow.flowTag, flowStepName: '' }));
   }
   if (flow.event.includes('lambdaSyncInv')) {
     artifacts.push({ path: `${source}/${process}_HdrInv.js`, content: await render('FlowHandler_HdrInv.ejs', shared) });
-    functions.push(renderInvFunctionYaml({ functionName: `${process}HdrInv`, handlerPath: `${handlerRoot}/${process}_HdrInv.main`, roleName: customFlowRoleName(flow.flowTag) }));
+    functions.push(renderInvFunctionYaml({ functionName: `${process}HdrInv`, handlerPath: `${handlerRoot}/${process}_HdrInv.main`, roleName: customFlowRoleName(flow.flowTag), flowTag: flow.flowTag, flowStepName: '' }));
   }
   if (flow.event.includes('lambdaSyncApi')) {
     artifacts.push({ path: `${source}/${process}_HdrApi.js`, content: await render('FlowHandler_HdrApi.ejs', shared) });
-    functions.push(renderApiFunctionYaml({ functionName: `${process}HdrApi`, handlerPath: `${handlerRoot}/${process}_HdrApi.main`, roleName: customFlowRoleName(flow.flowTag) }));
+    functions.push(renderApiFunctionYaml({ functionName: `${process}HdrApi`, handlerPath: `${handlerRoot}/${process}_HdrApi.main`, roleName: customFlowRoleName(flow.flowTag), flowTag: flow.flowTag, flowStepName: '' }));
   }
   if (flow.event.includes('eventBridge')) {
     artifacts.push({ path: `${source}/${process}_HdrInv.js`, content: await render('FlowHandler_HdrInv.ejs', shared) });
-    functions.push(renderEventBridgeFunctionYaml({ functionName: `${process}HdrInv`, handlerPath: `${handlerRoot}/${process}_HdrInv.main`, roleName: customFlowRoleName(flow.flowTag), flowTag: tag, schedules: flow.schedules ?? [] }));
+    functions.push(renderEventBridgeFunctionYaml({ functionName: `${process}HdrInv`, handlerPath: `${handlerRoot}/${process}_HdrInv.main`, roleName: customFlowRoleName(flow.flowTag), flowTag: flow.flowTag, flowStepName: '', schedules: flow.schedules ?? [] }));
   }
   if (flow.event.includes('ownTopic')) {
     const root = await emitOwnTopicRoot(flow, objects);
@@ -137,10 +104,11 @@ async function emitFlow(flow, objects) {
 
 function flowPaths(flow) {
   const tag = upperFirst(flow.flowTag);
-  const process = `Process${tag}`;
+  const process = tag;
   const source = `app/src/generatedCode/FlowSchemas/${tag}/source`;
   const paths = needsProcessMain(flow) ? [`${source}/${process}_Main.js`] : [];
-  if (flow.event.includes('extTopic')) paths.push(`${source}/${process}_HdrSqs.js`);
+  if (flow.event.includes('extTopic') && !flow.event.includes('ownTopic')) paths.push(`${source}/${process}_HdrSqs.js`);
+  if (flow.event.includes('dsq')) paths.push(`${source}/${process}_HdrDsq.js`);
   if (flow.event.includes('lambdaSyncInv') || flow.event.includes('eventBridge')) paths.push(`${source}/${process}_HdrInv.js`);
   if (flow.event.includes('lambdaSyncApi')) paths.push(`${source}/${process}_HdrApi.js`);
   if (flow.event.includes('ownTopic')) paths.push(...ownTopicRootPaths(flow));
@@ -154,19 +122,61 @@ function flowPaths(flow) {
 }
 
 async function emitExtTopicStep({ flow, step, flowTag, stepName }) {
+  const source = `app/src/generatedCode/FlowSchemas/${flowTag}/source`;
+  const handlerRoot = `src/generatedCode/FlowSchemas/${flowTag}/source`;
+  const functionName = stepName.startsWith(flowTag) ? stepName : `${flowTag}${stepName}`;
+  const mainFileName = `${functionName}_Main`;
+  const startConfig = stepConfig(flow, step);
+
+  const hasTriggerFlowTypes = Array.isArray(flow.triggerFlowTypes) && flow.triggerFlowTypes.length > 0;
+  const isCheckStep = stepName.toLowerCase().includes('checktrigger');
+
+  if (isCheckStep && hasTriggerFlowTypes) {
+    const queueName = `${functionName}HdrSqs`;
+    return {
+      artifacts: [
+        { path: `${source}/${mainFileName}.js`, content: await renderCustom('triggerCache/CheckTriggerCache_Main.ejs', { functionName, flowTag }) },
+        { path: `${source}/${functionName}_HdrSqs.js`, content: await renderCustom('triggerCache/CheckTriggerCache_HdrSqs.ejs', { functionName, queueName, startConfig }) }
+      ],
+      functions: [renderSqsFunctionYaml({ functionName: queueName, handlerPath: `${handlerRoot}/${functionName}_HdrSqs.main`, roleName: customFlowRoleName(flow.flowTag), queueName, flowTag, flowStepName: step.stepName })]
+    };
+  }
+
+  const artifacts = [{ path: `${source}/${mainFileName}.js`, content: await renderStepMain(functionName) }];
+  const functions = [];
+
+  const stepEvents = Array.isArray(step.event) ? step.event : [];
+  const hasSqs = stepEvents.includes('extTopic') || stepEvents.includes('sqs');
+
+  if (hasSqs) {
+    const queueName = `${functionName}HdrSqs`;
+    artifacts.push({ path: `${source}/${functionName}_HdrSqs.js`, content: await render('FlowHandler_HdrSqs.ejs', { flowTag: flow.flowTag, flowStepName: step.stepName, functionName, mainFileName, startConfig, queueName }) });
+    functions.push(renderSqsFunctionYaml({ functionName: queueName, handlerPath: `${handlerRoot}/${functionName}_HdrSqs.main`, roleName: customFlowRoleName(flow.flowTag), queueName, flowTag, flowStepName: step.stepName }));
+  }
+
+  return { artifacts, functions };
+}
+
+async function emitDsqStep({ flow, step, flowTag, stepName }) {
   const source = `app/src/generatedCode/FlowSchemas/${flowTag}/source`;
   const handlerRoot = `src/generatedCode/FlowSchemas/${flowTag}/source`;
   const functionName = `${flowTag}${stepName}`;
   const mainFileName = `${functionName}_Main`;
-  const queueName = `${functionName}HdrSqs`;
   const startConfig = stepConfig(flow, step);
-  return {
-    artifacts: [
-      { path: `${source}/${mainFileName}.js`, content: await renderStepMain(functionName) },
-      { path: `${source}/${functionName}_HdrSqs.js`, content: await render('FlowHandler_HdrSqs.ejs', { flowTag: flow.flowTag, flowStepName: step.stepName, functionName, mainFileName, startConfig, queueName }) }
-    ],
-    function: renderSqsFunctionYaml({ functionName: queueName, handlerPath: `${handlerRoot}/${functionName}_HdrSqs.main`, roleName: customFlowRoleName(flow.flowTag), queueName })
-  };
+
+  const stepEvents = Array.isArray(step.event) ? step.event : [];
+  const artifacts = stepEvents.includes('extTopic') ? [] : [{ path: `${source}/${mainFileName}.js`, content: await renderStepMain(functionName) }];
+  const functions = [];
+
+  const hasDsq = stepEvents.includes('dsq');
+
+  if (hasDsq) {
+    const queueName = `${functionName}HdrDsq`;
+    artifacts.push({ path: `${source}/${functionName}_HdrDsq.js`, content: await renderDsq('FlowHandler_HdrDsq.ejs', { flowTag: flow.flowTag, flowStepName: step.stepName, functionName, mainFileName, startConfig, queueName }) });
+    functions.push(renderSqsFunctionYaml({ functionName: queueName, handlerPath: `${handlerRoot}/${functionName}_HdrDsq.main`, roleName: customFlowRoleName(flow.flowTag), queueName, flowTag, flowStepName: step.stepName }));
+  }
+
+  return { artifacts, functions };
 }
 
 async function emitOwnTopicRoot(flow, objects) {
@@ -184,8 +194,8 @@ async function emitOwnTopicRoot(flow, objects) {
       { path: `${source}/${tag}_HdrWbs.js`, content: await render('FlowEndpoint_HdrWbs.ejs', { ...shared, functionName: tag, mainFileName: wbsMainFileName, route: tag }) }
     ],
     functions: [
-      renderWbsFunctionYaml({ functionName: `${tag}HdrWbs`, handlerPath: `${handlerRoot}/${tag}_HdrWbs.main`, roleName: customFlowRoleName(flow.flowTag), routeName: tag }),
-      renderSqsFunctionYaml({ functionName: `${tag}HdrSqs`, handlerPath: `${handlerRoot}/${tag}_HdrSqs.main`, roleName: customFlowRoleName(flow.flowTag), queueName: `${tag}HdrSqs` })
+      renderWbsFunctionYaml({ functionName: `${tag}HdrWbs`, handlerPath: `${handlerRoot}/${tag}_HdrWbs.main`, roleName: customFlowRoleName(flow.flowTag), routeName: tag, flowTag: flow.flowTag, flowStepName: '' }),
+      renderSqsFunctionYaml({ functionName: `${tag}HdrSqs`, handlerPath: `${handlerRoot}/${tag}_HdrSqs.main`, roleName: customFlowRoleName(flow.flowTag), queueName: `${tag}HdrSqs`, flowTag: flow.flowTag, flowStepName: '' })
     ]
   };
 }
@@ -197,7 +207,7 @@ function ownTopicRootPaths(flow) {
 }
 
 function needsProcessMain(flow) {
-  return !isS3Only(flow) && flow.event.some(event => event !== 'ownTopic' && event !== 's3');
+  return !isS3Only(flow) && !flow.event.includes('ownTopic') && flow.event.some(event => event !== 'ownTopic' && event !== 's3');
 }
 
 async function emitS3Flow(flow, source, handlerRoot) {
@@ -207,7 +217,7 @@ async function emitS3Flow(flow, source, handlerRoot) {
     { action: 'CreateObject', handler: 'HdrWbs', type: 'wbs', mainTemplate: 'CreateObject_Main.ejs', handlerTemplate: 'CreateObject_HdrWbs.ejs' },
     { action: 'ReservedLimit', handler: 'HdrSqs', type: 'sqs', mainTemplate: 'ReservedLimit_Main.ejs', handlerTemplate: 'ReservedLimit_HdrSqs.ejs' },
     { action: 'CreatePreSignUrl', handler: 'HdrSqs', type: 'sqs', mainTemplate: 'CreatePreSignUrl_Main.ejs', handlerTemplate: 'CreatePreSignUrl_HdrSqs.ejs' },
-    { action: 'ProcessAfterUpload', handler: 'HdrS3', type: 'inv', mainTemplate: 'ProcessS3File_Main.ejs', handlerTemplate: 'FlowHandler_HdrS3.ejs' },
+    { action: 'ProcessAfterUpload', handler: 'HdrS3', type: 's3', mainTemplate: 'ProcessS3File_Main.ejs', handlerTemplate: 'FlowHandler_HdrS3.ejs' },
     { action: 'ConfirmAfterUpload', handler: 'HdrSqs', type: 'sqs', mainTemplate: 'ConfirmReserved_Main.ejs', handlerTemplate: 'ConfirmReserved_HdrSqs.ejs' }
   ];
   const emitted = await Promise.all(parts.map(async ({ action, handler, type, mainTemplate, handlerTemplate }) => {
@@ -218,10 +228,12 @@ async function emitS3Flow(flow, source, handlerRoot) {
     const handlerContent = await renderCustom(`s3/${handlerTemplate}`, s3HandlerData({ action, flow, functionName, mainFileName, handler }));
     const descriptor = { functionName: `${functionName}${handler}`, handlerPath: `${handlerRoot}/${handlerFileName}.main`, roleName };
     const functionYaml = type === 'wbs'
-      ? renderWbsFunctionYaml({ ...descriptor, routeName: tag })
+      ? renderWbsFunctionYaml({ ...descriptor, routeName: tag, flowTag: flow.flowTag, flowStepName: '' })
       : type === 'sqs'
-        ? renderSqsFunctionYaml({ ...descriptor, queueName: handlerFileName })
-        : renderInvFunctionYaml(descriptor);
+        ? renderSqsFunctionYaml({ ...descriptor, queueName: descriptor.functionName, flowTag: flow.flowTag, flowStepName: '' })
+        : type === 's3'
+          ? renderS3FunctionYaml({ ...descriptor, bucketName: flow.bucketName ?? '', flowTag: flow.flowTag, flowStepName: '' })
+          : renderInvFunctionYaml({ ...descriptor, flowTag: flow.flowTag, flowStepName: '' });
     return {
       artifacts: [
         { path: `${source}/${mainFileName}.js`, content: mainContent },
@@ -248,7 +260,7 @@ function s3HandlerData({ action, flow, functionName, mainFileName, handler }) {
 }
 
 function startConfig(flow) {
-  const start = flow.flowSteps?.find(step => step.stepName?.toLowerCase() === 'start');
+  const start = flow.flowSteps?.[0];
   return start ? stepConfig(flow, start) : null;
 }
 

package/src/emit/custom/templates/FlowEndpoint_Main.ejs

@@ -40,7 +40,6 @@ import { utils } from '@izara_project/izara-core-library-service-schemas';
 const { createFlowTypeConcat } = utils;
 //(</optionalImport>)
 
-
 /**
  *
  *
@@ -56,43 +55,49 @@ const { createFlowTypeConcat } = utils;
  * @returns {object} description of return value
  */
 
-export default async function <%- typeof functionName !== 'undefined' ? functionName : `Process${upperCaseFlowTag}` %>(
+export default async function <%- typeof functionName !== 'undefined' ? functionName : upperCaseFlowTag %>(
   _izContext,
   requestParams,
-  callingFlowConfig = {},
+  callingFlowConfig = {}
   //(<additionalParams>)
   //(</additionalParams>)
 ) {
-
   try {
-    _izContext.logger.debug("<%- typeof functionName !== 'undefined' ? functionName : `Process${upperCaseFlowTag}` %> _izContext", _izContext)
-    _izContext.logger.debug("<%- typeof functionName !== 'undefined' ? functionName : `Process${upperCaseFlowTag}` %> requestParams", requestParams)
-    _izContext.logger.debug("<%- typeof functionName !== 'undefined' ? functionName : `Process${upperCaseFlowTag}` %> callingFlowConfig", callingFlowConfig)
+    _izContext.logger.debug('<%- typeof functionName !== 'undefined' ? functionName : upperCaseFlowTag %> _izContext', _izContext);
+    _izContext.logger.debug('<%- typeof functionName !== 'undefined' ? functionName : upperCaseFlowTag %> requestParams', requestParams);
+    _izContext.logger.debug(
+      '<%- typeof functionName !== 'undefined' ? functionName : upperCaseFlowTag %> callingFlowConfig',
+      callingFlowConfig
+    );
 
-<% if (typeof flow !== 'undefined' && flow.statusType === 'storedCache') { %>
+    <% if (typeof flow !== 'undefined' && flow.statusType === 'storedCache') { %>
 
     //(<beforeCheckCache>)
     //(</beforeCheckCache>)
 
-    let [ cacheMainStatus, cacheMain, cacheExist ] = await storedCacheSharedLib.checkStoredCacheStatus(
-      _izContext,
-      "<%= tableName %>",
-      {
-        //(<keyValueStoredCacheTable>)
-        //(</keyValueStoredCacheTable>)
-      },
-      //(<additionalAttributesWhenCreateStoredCache>)
-      //(</additionalAttributesWhenCreateStoredCache>),
-      createFlowTypeConcat(_izContext, { flowTag: "<%= flowTag %>", serviceTag: process.env.iz_serviceTag }),
-      //(<storedCacheConfig>)
-      //(</storedCacheConfig>)
-    )
+    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") {
+    if (cacheMainStatus !== 'process') {
+      if (cacheMainStatus === 'error' || cacheMainStatus === 'complete') {
         //(<afterValidateStoredCacheStatus>)
         //(</afterValidateStoredCacheStatus>)
       }
@@ -100,40 +105,47 @@ export default async function <%- typeof functionName !== 'undefined' ? function
       //(<checkStoredCacheHook>)
       //(</checkStoredCacheHook>)
     }
-<% } %>
+    <% } %>
 
-<% if (typeof flow !== 'undefined' && flow.isRbac) { %>
-    const { checkRbacPermission } = await import('@izara_project/izara-authorization');
+    <% if (typeof flow !== 'undefined' && flow.isRbac) { %>
+    const { checkRbacPermission } =
+      await import('@izara_project/izara-authorization');
 
     //(<additionalParams_parameterGroups>)
     const parameterGroups = {};
     //(</additionalParams_parameterGroups>)
 
-    const resultPermissionCheck = await checkRbacPermission(_izContext, { flowTag: '<%- flow.flowTag %>', serviceTag: '<%- flow.serviceTag || (flow.objType ? flow.objType.serviceTag : "") %>' }, parameterGroups);
+    const resultPermissionCheck = await checkRbacPermission(
+      _izContext,
+      { flowTag: '<%- flow.flowTag %>', serviceTag: '<%- flow.serviceTag || (flow.objType ? flow.objType.serviceTag : "") %>' },
+      parameterGroups
+    );
 
-    _izContext.logger.debug('[lib:auth:checkRbacPermission] resultPermissionCheck:', resultPermissionCheck);
+    _izContext.logger.debug(
+      '[lib:auth:checkRbacPermission] resultPermissionCheck:',
+      resultPermissionCheck
+    );
 
     if (resultPermissionCheck.permission === false) {
-
       //(<messageOutPutPermissionCheckFailed>)
-      const message = {
-
-      }
+      const message = {};
       //(</messageOutPutPermissionCheckFailed>)
 
       return await sns.publishAsync(_izContext, {
         Message: JSON.stringify(message),
-        TopicArn: await snsSharedLib.snsTopicArnByFlowSchema(_izContext, '<%- flow.flowTag %>_Out')
+        TopicArn: snsSharedLib.snsTopicArnByFlowSchema(
+          _izContext,
+          '<%- flow.flowTag %>_Out'
+        )
       });
     }
 
-<% } %>
+    <% } %>
 
     //(<endpointHook>)
     //(</endpointHook>)
-
   } catch (err) {
-    _izContext.logger.error('error WebSocketInvoke: ', err)
-    throw (err)
+    _izContext.logger.error('error WebSocketInvoke: ', err);
+    throw err;
   }
 }

package/src/emit/custom/templates/FlowStep_Main.ejs

@@ -37,24 +37,22 @@ import { identifierUuid } from '@izara_project/izara-shared-core';
 export default async function <%= functionName %>(
   _izContext,
   requestParams,
-  callingFlowConfig = {},
+  callingFlowConfig = {}
   //(<additionalParams>)
   //(</additionalParams>)
 ) {
-
-
   try {
     _izContext.logger.debug('<%= functionName %> _izContext: ', _izContext);
     _izContext.logger.debug('<%= functionName %> requestParams: ', requestParams);
-    _izContext.logger.debug('<%= functionName %> callingFlowConfig: ', callingFlowConfig);
+    _izContext.logger.debug(
+      '<%= functionName %> callingFlowConfig: ',
+      callingFlowConfig
+    );
 
     //(<hookCode>)
     //(</hookCode>)
-
-
-
   } catch (err) {
-    _izContext.logger.error('error <%= functionName %>Main: ', err)
-    throw (err)
+    _izContext.logger.error('error <%= functionName %>Main: ', err);
+    throw err;
   }
 }