@izara_project/izara-core-generate-service-code 1.0.67 → 1.0.69

package/src/emit/custom/emitCustomFlowApplicationArtifacts.js

@@ -1,92 +1,212 @@
-import ejs from 'ejs';
+import ejsLib from 'ejs';
 import { readFile } from 'node:fs/promises';
 
 import {
   renderApiFunctionYaml,
   renderEventBridgeFunctionYaml,
   renderInvFunctionYaml,
+  renderS3FunctionYaml,
   renderSqsFunctionYaml,
   renderWbsFunctionYaml
 } from '../function/functionYamlArtifact.js';
-import { customFlowRoleName, flowDsqSteps, flowExtTopicSteps, generatedOwnTopicFlows, supportedCustomFlows, 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);
 const CUSTOM_TEMPLATE_URL = new URL('./templates/', import.meta.url);
 const DSQ_TEMPLATE_URL = new URL('../relationship/templates/', import.meta.url);
 
-export async function emitCustomFlowApplicationArtifacts(flows, { systemFunctions = [], objects = [] } = {}) {
+export async function emitCustomFlowApplicationArtifacts(
+  flows,
+  { systemFunctions = [], objects = [] } = {}
+) {
   const customFlows = supportedCustomFlows(flows);
   const generatedRoots = generatedOwnTopicFlows(flows);
   const steps = flowExtTopicSteps(flows);
   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)));
+  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 dsqStepResults = await Promise.all(dsqSteps.map(emitDsqStep));
   return [
-    ...emitted.flatMap(result => result.artifacts),
-    ...roots.flatMap(result => result.artifacts),
-    ...stepResults.flatMap(result => result.artifacts),
-    ...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') }
+    ...emitted.flatMap((result) => result.artifacts),
+    ...roots.flatMap((result) => result.artifacts),
+    ...stepResults.flatMap((result) => result.artifacts),
+    ...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')
+    }
   ];
 }
 
-export function customFlowApplicationManagedPaths(flows, { includeYaml = false } = {}) {
+export function customFlowApplicationManagedPaths(
+  flows,
+  { includeYaml = false } = {}
+) {
   return [
-    ...supportedCustomFlows(flows).flatMap(flow => flowPaths(flow)),
+    ...supportedCustomFlows(flows).flatMap((flow) => flowPaths(flow)),
     ...generatedOwnTopicFlows(flows).flatMap(ownTopicRootPaths),
     ...flowExtTopicSteps(flows).flatMap(({ flowTag, stepName }) => {
       const source = `app/src/generatedCode/FlowSchemas/${flowTag}/source`;
-      return [`${source}/${flowTag}${stepName}_Main.js`, `${source}/${flowTag}${stepName}_HdrSqs.js`];
+      return [
+        `${source}/${flowTag}${stepName}_Main.js`,
+        `${source}/${flowTag}${stepName}_HdrSqs.js`
+      ];
     }),
     ...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`
-      ];
+      let stepEvents = [];
+      if (Array.isArray(step.event)) {
+        stepEvents = step.event;
+      }
+      const files = [`${source}/${flowTag}${stepName}_HdrDsq.js`];
+      if (!stepEvents.includes('extTopic')) {
+        files.unshift(`${source}/${flowTag}${stepName}_Main.js`);
+      }
+      return files;
     }),
-    ...(supportedCustomFlows(flows).length > 0 || generatedOwnTopicFlows(flows).length > 0 || flowExtTopicSteps(flows).length > 0 || flowDsqSteps(flows).length > 0 || includeYaml ? [YAML_PATH] : [])
+    ...(supportedCustomFlows(flows).length > 0 ||
+    generatedOwnTopicFlows(flows).length > 0 ||
+    flowExtTopicSteps(flows).length > 0 ||
+    flowDsqSteps(flows).length > 0 ||
+    includeYaml
+      ? [YAML_PATH]
+      : [])
   ];
 }
 
-
-
 async function emitFlow(flow, objects) {
   const tag = upperFirst(flow.flowTag);
   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) };
+  const shared = {
+    flowTag: flow.flowTag,
+    flowStepName: '',
+    mainFileName: `${process}_Main`,
+    functionName: process,
+    startConfig: startConfig(flow)
+  };
   const artifacts = needsProcessMain(flow)
-    ? [{ path: `${source}/${process}_Main.js`, content: await renderEndpointMain(flow, process, objects) }]
+    ? [
+        {
+          path: `${source}/${process}_Main.js`,
+          content: await renderEndpointMain(flow, process, objects)
+        }
+      ]
     : [];
   const functions = [];
 
   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`, flowTag: flow.flowTag, flowStepName: '' }));
+    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`,
+        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: '' }));
+    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), flowTag: flow.flowTag, flowStepName: '' }));
+    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),
+        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), flowTag: flow.flowTag, flowStepName: '' }));
+    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),
+        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: flow.flowTag, flowStepName: '', schedules: flow.schedules ?? [] }));
+    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: flow.flowTag,
+        flowStepName: '',
+        schedules: flow.schedules ?? []
+      })
+    );
   }
   if (flow.event.includes('ownTopic')) {
     const root = await emitOwnTopicRoot(flow, objects);
@@ -105,17 +225,48 @@ function flowPaths(flow) {
   const tag = upperFirst(flow.flowTag);
   const process = tag;
   const source = `app/src/generatedCode/FlowSchemas/${tag}/source`;
-  const paths = needsProcessMain(flow) ? [`${source}/${process}_Main.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));
+  const paths = [];
+  if (needsProcessMain(flow)) {
+    paths.push(`${source}/${process}_Main.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));
+  }
   if (flow.event.includes('s3')) {
-    ['ConfirmAfterUpload', 'CreateObject', 'CreatePreSignUrl', 'ProcessAfterUpload', 'ReservedLimit'].forEach(action => {
-      const handler = action === 'CreateObject' ? 'HdrWbs' : action === 'ProcessAfterUpload' ? 'HdrS3' : 'HdrSqs';
-      paths.push(`${source}/${tag}${action}_Main.js`, `${source}/${tag}${action}_${handler}.js`);
-    });
+    const s3Actions = [
+      'ConfirmAfterUpload',
+      'CreateObject',
+      'CreatePreSignUrl',
+      'ProcessAfterUpload',
+      'ReservedLimit'
+    ];
+    for (const action of s3Actions) {
+      let handler = 'HdrSqs';
+      if (action === 'CreateObject') {
+        handler = 'HdrWbs';
+      } else if (action === 'ProcessAfterUpload') {
+        handler = 'HdrS3';
+      }
+      paths.push(
+        `${source}/${tag}${action}_Main.js`,
+        `${source}/${tag}${action}_${handler}.js`
+      );
+    }
   }
   return paths;
 }
@@ -123,42 +274,85 @@ 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 = `${flowTag}${stepName}`;
+  const functionName = stepName.startsWith(flowTag)
+    ? stepName
+    : `${flowTag}${stepName}`;
   const mainFileName = `${functionName}_Main`;
   const startConfig = stepConfig(flow, step);
 
-  if (step.checkTriggerType === 'flowType') {
-    const completeStep = flow.flowSteps?.find(s => s.checkTriggerType === 'complete');
-    const completeStepName = completeStep ? completeStep.stepName : undefined;
-    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 }) }
-      ],
-      functions: [renderSqsFunctionYaml({ functionName: queueName, handlerPath: `${handlerRoot}/${functionName}_HdrSqs.main`, roleName: customFlowRoleName(flow.flowTag), queueName, flowTag, flowStepName: step.stepName, targetCompleteStepName: completeStepName })]
-    };
-  } else if (step.checkTriggerType === 'complete') {
+  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/TriggerCacheComplete_Main.ejs', { functionName, flowTag }) },
-        { path: `${source}/${functionName}_HdrSqs.js`, content: await render('FlowHandler_HdrSqs.ejs', { flowTag: flow.flowTag, flowStepName: step.stepName, functionName, mainFileName, startConfig, queueName, usePassBack: false }) }
+        {
+          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 })]
+      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 artifacts = [
+    {
+      path: `${source}/${mainFileName}.js`,
+      content: await renderStepMain(functionName)
+    }
+  ];
   const functions = [];
 
-  const stepEvents = Array.isArray(step.event) ? step.event : [];
+  let stepEvents = [];
+  if (Array.isArray(step.event)) {
+    stepEvents = 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 }));
+    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 };
@@ -171,16 +365,44 @@ async function emitDsqStep({ flow, step, flowTag, stepName }) {
   const mainFileName = `${functionName}_Main`;
   const startConfig = stepConfig(flow, step);
 
-  const stepEvents = Array.isArray(step.event) ? step.event : [];
-  const artifacts = stepEvents.includes('extTopic') ? [] : [{ path: `${source}/${mainFileName}.js`, content: await renderStepMain(functionName) }];
+  let stepEvents = [];
+  if (Array.isArray(step.event)) {
+    stepEvents = step.event;
+  }
+  const artifacts = [];
+  if (!stepEvents.includes('extTopic')) {
+    artifacts.push({
+      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 }));
+    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 };
@@ -192,17 +414,61 @@ async function emitOwnTopicRoot(flow, objects) {
   const handlerRoot = `src/generatedCode/FlowSchemas/${tag}/source`;
   const mainFileName = `${tag}_Main`;
   const wbsMainFileName = `${tag}_WbsMain`;
-  const shared = { flowTag: flow.flowTag, flowStepName: '', upperCaseFlowTag: tag, startConfig: startConfig(flow) };
+  const shared = {
+    flowTag: flow.flowTag,
+    flowStepName: '',
+    upperCaseFlowTag: tag,
+    startConfig: startConfig(flow)
+  };
   return {
     artifacts: [
-      { path: `${source}/${mainFileName}.js`, content: await renderEndpointMain(flow, mainFileName, objects) },
-      { path: `${source}/${tag}_HdrSqs.js`, content: await render('FlowHandler_HdrSqs.ejs', { ...shared, functionName: mainFileName, mainFileName, queueName: `${tag}HdrSqs` }) },
-      { path: `${source}/${wbsMainFileName}.js`, content: await render('FlowMain_Wbs.ejs', { ...shared, functionName: wbsMainFileName }) },
-      { path: `${source}/${tag}_HdrWbs.js`, content: await render('FlowEndpoint_HdrWbs.ejs', { ...shared, functionName: tag, mainFileName: wbsMainFileName, route: tag }) }
+      {
+        path: `${source}/${mainFileName}.js`,
+        content: await renderEndpointMain(flow, mainFileName, objects)
+      },
+      {
+        path: `${source}/${tag}_HdrSqs.js`,
+        content: await render('FlowHandler_HdrSqs.ejs', {
+          ...shared,
+          functionName: mainFileName,
+          mainFileName,
+          queueName: `${tag}HdrSqs`
+        })
+      },
+      {
+        path: `${source}/${wbsMainFileName}.js`,
+        content: await render('FlowMain_Wbs.ejs', {
+          ...shared,
+          functionName: wbsMainFileName
+        })
+      },
+      {
+        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, flowTag: flow.flowTag, flowStepName: '' }),
-      renderSqsFunctionYaml({ functionName: `${tag}HdrSqs`, handlerPath: `${handlerRoot}/${tag}_HdrSqs.main`, roleName: customFlowRoleName(flow.flowTag), queueName: `${tag}HdrSqs`, flowTag: flow.flowTag, flowStepName: '' })
+      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: ''
+      })
     ]
   };
 }
@@ -210,75 +476,187 @@ async function emitOwnTopicRoot(flow, objects) {
 function ownTopicRootPaths(flow) {
   const tag = upperFirst(flow.flowTag);
   const source = `app/src/generatedCode/FlowSchemas/${tag}/source`;
-  return [`${source}/${tag}_Main.js`, `${source}/${tag}_HdrSqs.js`, `${source}/${tag}_WbsMain.js`, `${source}/${tag}_HdrWbs.js`];
+  return [
+    `${source}/${tag}_Main.js`,
+    `${source}/${tag}_HdrSqs.js`,
+    `${source}/${tag}_WbsMain.js`,
+    `${source}/${tag}_HdrWbs.js`
+  ];
 }
 
 function needsProcessMain(flow) {
-  return !isS3Only(flow) && !flow.event.includes('ownTopic') && 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) {
   const tag = upperFirst(flow.flowTag);
   const roleName = customFlowRoleName(flow.flowTag);
   const parts = [
-    { 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: 'ConfirmAfterUpload', handler: 'HdrSqs', type: 'sqs', mainTemplate: 'ConfirmReserved_Main.ejs', handlerTemplate: 'ConfirmReserved_HdrSqs.ejs' }
+    {
+      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: '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 }) => {
-    const functionName = `${tag}${action}`;
-    const mainFileName = `${functionName}_Main`;
-    const handlerFileName = `${functionName}_${handler}`;
-    const mainContent = await renderCustom(`s3/${mainTemplate}`, s3TemplateData({ action, flow, functionName }));
-    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, flowTag: flow.flowTag, flowStepName: '' })
-      : type === 'sqs'
-        ? renderSqsFunctionYaml({ ...descriptor, queueName: handlerFileName, flowTag: flow.flowTag, flowStepName: '' })
-        : renderInvFunctionYaml({ ...descriptor, flowTag: flow.flowTag, flowStepName: '' });
-    return {
-      artifacts: [
-        { path: `${source}/${mainFileName}.js`, content: mainContent },
-        { path: `${source}/${handlerFileName}.js`, content: handlerContent }
-      ],
-      functionYaml
-    };
-  }));
-  return { artifacts: emitted.flatMap(item => item.artifacts), functions: emitted.map(item => item.functionYaml) };
+  const emitted = await Promise.all(
+    parts.map(
+      async ({ action, handler, type, mainTemplate, handlerTemplate }) => {
+        const functionName = `${tag}${action}`;
+        const mainFileName = `${functionName}_Main`;
+        const handlerFileName = `${functionName}_${handler}`;
+        const mainContent = await renderCustom(
+          `s3/${mainTemplate}`,
+          _s3TemplateData({ action, flow, functionName })
+        );
+        const handlerContent = await renderCustom(
+          `s3/${handlerTemplate}`,
+          _s3HandlerData({ action, flow, functionName, mainFileName, handler })
+        );
+        const descriptor = {
+          functionName: `${functionName}${handler}`,
+          handlerPath: `${handlerRoot}/${handlerFileName}.main`,
+          roleName
+        };
+        let functionYaml;
+        if (type === 'wbs') {
+          functionYaml = renderWbsFunctionYaml({
+            ...descriptor,
+            routeName: tag,
+            flowTag: flow.flowTag,
+            flowStepName: ''
+          });
+        } else if (type === 'sqs') {
+          functionYaml = renderSqsFunctionYaml({
+            ...descriptor,
+            queueName: descriptor.functionName,
+            flowTag: flow.flowTag,
+            flowStepName: ''
+          });
+        } else if (type === 's3') {
+          let bucketName = '';
+          if (flow.bucketName) {
+            bucketName = flow.bucketName;
+          }
+          functionYaml = renderS3FunctionYaml({
+            ...descriptor,
+            bucketName,
+            flowTag: flow.flowTag,
+            flowStepName: ''
+          });
+        } else {
+          functionYaml = renderInvFunctionYaml({
+            ...descriptor,
+            flowTag: flow.flowTag,
+            flowStepName: ''
+          });
+        }
+        return {
+          artifacts: [
+            { path: `${source}/${mainFileName}.js`, content: mainContent },
+            { path: `${source}/${handlerFileName}.js`, content: handlerContent }
+          ],
+          functionYaml
+        };
+      }
+    )
+  );
+  return {
+    artifacts: emitted.flatMap((item) => item.artifacts),
+    functions: emitted.map((item) => item.functionYaml)
+  };
 }
 
-function s3TemplateData({ action, flow, functionName }) {
-  return action === 'CreateObject'
-    ? { flowTag: flow.flowTag, objectType: flow.objType?.objectType, functionName }
-    : action === 'CreatePreSignUrl'
-      ? { flowTag: flow.flowTag }
-      : { flowTag: flow.flowTag, functionName };
+function _s3TemplateData({ action, flow, functionName }) {
+  if (action === 'CreateObject') {
+    return {
+      flowTag: flow.flowTag,
+      objectType: flow.objType?.objectType,
+      functionName
+    };
+  }
+  if (action === 'CreatePreSignUrl') {
+    return { flowTag: flow.flowTag };
+  }
+  return { flowTag: flow.flowTag, functionName };
 }
 
-function s3HandlerData({ action, flow, functionName, mainFileName, handler }) {
-  if (action === 'CreateObject') return { functionName, handlerType: handler, route: flow.flowTag };
-  if (action === 'ProcessAfterUpload') return { flowTag: flow.flowTag, functionName, mainFileName, s3Bucket: flow.bucketName ?? '' };
+function _s3HandlerData({ action, flow, functionName, mainFileName, handler }) {
+  if (action === 'CreateObject') {
+    return { functionName, handlerType: handler, route: flow.flowTag };
+  }
+  if (action === 'ProcessAfterUpload') {
+    let bucketName = '';
+    if (flow.bucketName) {
+      bucketName = flow.bucketName;
+    }
+    return {
+      flowTag: flow.flowTag,
+      functionName,
+      mainFileName,
+      s3Bucket: bucketName
+    };
+  }
   return { functionName, handlerType: handler };
 }
 
 function startConfig(flow) {
-  const start = flow.flowSteps?.find(step => step.stepName?.toLowerCase() === 'start');
-  return start ? stepConfig(flow, start) : null;
+  const start = flow.flowSteps?.[0];
+  if (start) {
+    return stepConfig(flow, start);
+  }
+  return null;
 }
 
 function stepConfig(flow, step) {
   return {
     ...step,
     properties: mapFields(step.properties, flow.stepProperties),
-    messageAttributes: mapFields(step.messageAttributes, flow.stepMessageAttributes)
+    messageAttributes: mapFields(
+      step.messageAttributes,
+      flow.stepMessageAttributes
+    )
   };
 }
 
 function mapFields(names = [], definitions = {}) {
-  return names.map(name => ({ propertyName: name, ...(definitions?.[name] ?? {}) }));
+  return names.map((name) => ({
+    propertyName: name,
+    ...(definitions?.[name] ?? {})
+  }));
 }
 
 function isS3Only(flow) {
@@ -297,11 +675,19 @@ async function renderEndpointMain(flow, functionName, objects) {
 
 function storedCacheTableName(flow, objects) {
   if (flow.statusType !== 'storedCache') return null;
-  const candidates = objects.filter(object => object.objectType === flow.objType?.objectType);
+  const candidates = objects.filter(
+    (object) => object.objectType === flow.objType?.objectType
+  );
   const object = flow.objType?.serviceTag
-    ? candidates.find(object => object.serviceTag === flow.objType.serviceTag) ?? candidates.find(object => object.serviceTag === undefined)
+    ? (candidates.find(
+        (object) => object.serviceTag === flow.objType.serviceTag
+      ) ?? candidates.find((object) => object.serviceTag === undefined))
     : candidates[0];
-  return Object.values(object?.storageResources ?? {}).find(resource => resource?.storageType === 'dynamoDB')?.tableName ?? null;
+  return (
+    Object.values(object?.storageResources ?? {}).find(
+      (resource) => resource?.storageType === 'dynamoDB'
+    )?.tableName ?? null
+  );
 }
 
 async function renderStepMain(functionName) {
@@ -313,13 +699,24 @@ function renderMain(functionName) {
 }
 
 async function render(templateName, data) {
-  return ejs.render(await readFile(new URL(templateName, TEMPLATE_URL), 'utf8'), data);
+  return ejsLib.render(
+    await readFile(new URL(templateName, TEMPLATE_URL), 'utf8'),
+    data
+  );
 }
 
 async function renderDsq(templateName, data) {
-  return ejs.render(await readFile(new URL(templateName, DSQ_TEMPLATE_URL), 'utf8'), data);
+  return ejsLib.render(
+    await readFile(new URL(templateName, DSQ_TEMPLATE_URL), 'utf8'),
+    data
+  );
 }
 
 async function renderCustom(templateName, data) {
-  return ejs.render(await readFile(new URL(templateName, CUSTOM_TEMPLATE_URL), 'utf8'), data).replace(/\n$/, '');
+  return ejsLib
+    .render(
+      await readFile(new URL(templateName, CUSTOM_TEMPLATE_URL), 'utf8'),
+      data
+    )
+    .replace(/\n$/, '');
 }