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

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,49 @@ export function flowExtTopicSteps(flows) {
     if (typeof flow?.flowTag !== 'string' || flow.flowTag === '') {
       return [];
     }
-    return (flow.flowSteps ?? []).flatMap(step => (
-      typeof step?.stepName === 'string' && step.stepName !== '' &&
+    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('extTopic')
+        ? [
+            {
+              flow,
+              step,
+              flowTag: upperFirst(flow.flowTag),
+              stepName: upperFirst(step.stepName)
+            }
+          ]
         : []
-    ));
+    );
+  });
+}
+
+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('dsq')
+        ? [
+            {
+              flow,
+              step,
+              flowTag: upperFirst(flow.flowTag),
+              stepName: upperFirst(step.stepName)
+            }
+          ]
+        : []
+    );
   });
 }
 
@@ -38,21 +84,30 @@ 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) {
@@ -64,7 +119,3 @@ export function triggerCacheQueueNames(flow) {
     `TriggerCache${tag}CompleteHdrDsq`
   ];
 }
-
-export function upperFirst(value) {
-  return value[0].toUpperCase() + value.slice(1);
-}

package/src/emit/custom/emitCustomFlowApplicationArtifacts.js

@@ -8,7 +8,7 @@ import {
   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 +19,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 +43,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 +68,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 +103,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));
@@ -158,15 +125,65 @@ async function emitExtTopicStep({ flow, step, flowTag, stepName }) {
   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 })
-  };
+
+  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 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 }) }
+      ],
+      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 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) }];
+  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 +201,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 +214,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) {
@@ -218,10 +235,10 @@ 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: handlerFileName, flowTag: flow.flowTag, flowStepName: '' })
+        : renderInvFunctionYaml({ ...descriptor, flowTag: flow.flowTag, flowStepName: '' });
     return {
       artifacts: [
         { path: `${source}/${mainFileName}.js`, content: mainContent },

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

@@ -56,7 +56,7 @@ 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 = {},
@@ -65,9 +65,9 @@ export default async function <%- typeof functionName !== 'undefined' ? function
 ) {
 
   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') { %>
 

package/src/emit/custom/templates/triggerCache/CheckTriggerCache_Main.ejs

@@ -39,7 +39,7 @@ export default async function <%- functionName %>(
         _izContext,
         { serviceTag: topicName[0], flowTag: topicName[2] },
         identifiers,
-        { flowTag: '<%- flowTag %>', serviceTag: process.env.iz_serviceTag }
+        { flowTag: '<%- flowTag %>', serviceTag: process.env.iz_serviceTag, targetCompleteStep: process.env.iz_targetCompleteStepName }
       );
 
     _izContext.logger.debug(

package/src/emit/function/functionYamlArtifact.js

@@ -1,14 +1,14 @@
-export function createSqsFunctionYamlArtifact({ functionName, handlerPath, roleName, queueName, fileName }) {
+export function createSqsFunctionYamlArtifact({ functionName, handlerPath, roleName, queueName, fileName, flowTag, flowStepName, targetCompleteStepName }) {
   if (![functionName, handlerPath, roleName, queueName, fileName].every(value => typeof value === 'string' && value !== '')) {
     throw new TypeError('Function descriptor must include functionName, handlerPath, roleName, queueName, and fileName');
   }
   return {
     path: `app/sls_yaml/generatedCode/source/${fileName}`,
-    content: renderSqsFunctionYaml({ functionName, handlerPath, roleName, queueName })
+    content: renderSqsFunctionYaml({ functionName, handlerPath, roleName, queueName, flowTag, flowStepName })
   };
 }
 
-export function renderSqsFunctionYaml({ functionName, handlerPath, roleName, queueName }) {
+export function renderSqsFunctionYaml({ functionName, handlerPath, roleName, queueName, flowTag, flowStepName, targetCompleteStepName }) {
   if (![functionName, handlerPath, roleName, queueName].every(value => typeof value === 'string' && value !== '')) {
     throw new TypeError('SQS function descriptor must include functionName, handlerPath, roleName, and queueName');
   }
@@ -16,7 +16,7 @@ export function renderSqsFunctionYaml({ functionName, handlerPath, roleName, que
   handler: ${handlerPath}
   name: \${self:custom.iz_resourcePrefix}${functionName}
   role: ${roleName}
-${functionSetting(functionName)}
+${environmentSetting(functionName, flowTag, flowStepName, targetCompleteStepName)}${functionSetting(functionName)}
   events:
     - sqs:
         arn: arn:aws:sqs:\${self:custom.iz_region}:\${self:custom.iz_accountId}:\${self:custom.iz_resourcePrefix}${queueName}
@@ -24,7 +24,7 @@ ${functionSetting(functionName)}
 ${completionFilter(functionName)}`;
 }
 
-export function renderApiFunctionYaml({ functionName, handlerPath, roleName, routes = [] }) {
+export function renderApiFunctionYaml({ functionName, handlerPath, roleName, routes = [], flowTag, flowStepName }) {
   if (!Array.isArray(routes)) {
     throw new TypeError('API function routes must be an array');
   }
@@ -41,12 +41,12 @@ export function renderApiFunctionYaml({ functionName, handlerPath, roleName, rou
   handler: ${handlerPath}
   name: \${self:custom.iz_resourcePrefix}${functionName}
   role: ${roleName}
-${functionSetting(functionName)}
+${environmentSetting(functionName, flowTag, flowStepName)}${functionSetting(functionName)}
   events:
 ${routeEvents ? `${routeEvents}\n` : ''}`;
 }
 
-export function renderWbsFunctionYaml({ functionName, handlerPath, roleName, routeName }) {
+export function renderWbsFunctionYaml({ functionName, handlerPath, roleName, routeName, flowTag, flowStepName }) {
   if (![functionName, handlerPath, roleName, routeName].every(value => typeof value === 'string' && value !== '')) {
     throw new TypeError('WebSocket function descriptor must include functionName, handlerPath, roleName, and routeName');
   }
@@ -54,7 +54,7 @@ export function renderWbsFunctionYaml({ functionName, handlerPath, roleName, rou
   handler: ${handlerPath}
   name: \${self:custom.iz_resourcePrefix}${functionName}
   role: ${roleName}
-${functionSetting(functionName)}
+${environmentSetting(functionName, flowTag, flowStepName)}${functionSetting(functionName)}
   events:
     - websocket:
         route: ${routeName}
@@ -63,16 +63,16 @@ ${functionSetting(functionName)}
 `;
 }
 
-export function renderInvFunctionYaml({ functionName, handlerPath, roleName }) {
+export function renderInvFunctionYaml({ functionName, handlerPath, roleName, flowTag, flowStepName }) {
   return `${functionName}:
   handler: ${handlerPath}
   name: \${self:custom.iz_resourcePrefix}${functionName}
   role: ${roleName}
-${functionSetting(functionName)}
+${environmentSetting(functionName, flowTag, flowStepName)}${functionSetting(functionName)}
 `;
 }
 
-export function renderEventBridgeFunctionYaml({ functionName, handlerPath, roleName, flowTag, schedules = [] }) {
+export function renderEventBridgeFunctionYaml({ functionName, handlerPath, roleName, flowTag, flowStepName, schedules = [] }) {
   if (![functionName, handlerPath, roleName, flowTag].every(value => typeof value === 'string' && value !== '') || !Array.isArray(schedules)) {
     throw new TypeError('EventBridge function descriptor must include functionName, handlerPath, roleName, flowTag, and schedules');
   }
@@ -85,11 +85,25 @@ export function renderEventBridgeFunctionYaml({ functionName, handlerPath, roleN
   return `\${self:custom.iz_resourcePrefix}${functionName}:
   handler: ${handlerPath}
   role: ${roleName}
-${functionSetting(functionName)}
+${environmentSetting(functionName, flowTag, flowStepName)}${functionSetting(functionName)}
   description: ${flowTag} (EventBridge Schedule)
 ${schedules.length === 0 ? '' : `  events:\n${schedules.map(schedule => `    - schedule:\n        name: \${self:custom.iz_resourcePrefix}${schedule.name}\n        description: '${schedule.description ?? ''}'\n        rate: ${schedule.rate?.[0]}\n        enabled: true`).join('\n')}\n`}`;
 }
 
+function environmentSetting(functionName, flowTag, flowStepName, targetCompleteStepName) {
+  if (flowTag === undefined && flowStepName === undefined && targetCompleteStepName === undefined) return '';
+  let envs = [];
+  if (flowTag !== undefined) envs.push(`    iz_flowTag: ${flowTag === '' ? "''" : flowTag}`);
+  if (flowStepName !== undefined) envs.push(`    iz_flowStepName: ${flowStepName === '' ? "''" : flowStepName}`);
+  if (targetCompleteStepName !== undefined) envs.push(`    iz_targetCompleteStepName: ${flowTag}${targetCompleteStepName}`);
+  
+  if (envs.length === 0) return '';
+  return `  environment:
+${envs.join('\n')}
+    #<#${functionName}Environment#>
+    #<#/${functionName}Environment#>\n`;
+}
+
 function functionSetting(functionName) {
   return `  #<#${functionName}FunctionSetting#>\n  #<#/${functionName}FunctionSetting#>`;
 }

package/src/emit/rbac/emitRbacApplicationArtifacts.js

@@ -115,7 +115,9 @@ async function createTargetRoleHandler() {
         functionName: 'ProcessCreateTargetRoleHdrSqs',
         handlerPath: 'src/generatedCode/FlowRbac/CreateTargetRole/source/ProcessCreateTargetRole_HdrSqs.main',
         roleName: 'FlowRbacRole',
-        queueName: 'ProcessCreateTargetRoleHdrSqs'
+        queueName: 'ProcessCreateTargetRoleHdrSqs',
+        flowTag: 'CreateTargetRole',
+        flowStepName: ''
       },
       ...webSocket.functions
     ]
@@ -137,13 +139,17 @@ async function createListHandler(definition) {
         functionName: `Process${definition.flowTag}HdrSqs`,
         handlerPath: `${handlerPath}/Process${definition.flowTag}_HdrSqs.main`,
         roleName: 'FlowRbacRole',
-        queueName: `Process${definition.flowTag}HdrSqs`
+        queueName: `Process${definition.flowTag}HdrSqs`,
+        flowTag: definition.flowTag,
+        flowStepName: ''
       },
       {
         type: 'api',
         functionName: `Process${definition.flowTag}HdrApi`,
         handlerPath: `${handlerPath}/Process${definition.flowTag}_HdrApi.main`,
-        roleName: 'FlowRbacRole'
+        roleName: 'FlowRbacRole',
+        flowTag: definition.flowTag,
+        flowStepName: ''
       }
     ]
   };
@@ -165,7 +171,9 @@ async function createMutationHandler(definition) {
         functionName: `Process${definition.flowTag}HdrSqs`,
         handlerPath: `${handlerPath}/Process${definition.flowTag}_HdrSqs.main`,
         roleName: 'FlowRbacRole',
-        queueName: `Process${definition.flowTag}HdrSqs`
+        queueName: `Process${definition.flowTag}HdrSqs`,
+        flowTag: definition.flowTag,
+        flowStepName: ''
       },
       ...webSocket.functions
     ]
@@ -188,7 +196,9 @@ async function createUserRoleMutationHandler(definition) {
         functionName: `Process${definition.flowTag}HdrSqs`,
         handlerPath: `${handlerPath}/Process${definition.flowTag}_HdrSqs.main`,
         roleName: 'FlowRbacRole',
-        queueName: `Process${definition.flowTag}HdrSqs`
+        queueName: `Process${definition.flowTag}HdrSqs`,
+        flowTag: definition.flowTag,
+        flowStepName: ''
       },
       ...webSocket.functions
     ]
@@ -208,7 +218,9 @@ async function createUserRbacFlowHandler(object) {
       type: 'inv',
       functionName: `Process${flowTag}HdrInv`,
       handlerPath: `${handlerPath}/Process${flowTag}_HdrInv.main`,
-      roleName: 'FlowRbacRole'
+      roleName: 'FlowRbacRole',
+      flowTag: flowTag,
+      flowStepName: ''
     }]
   };
 }
@@ -238,7 +250,9 @@ async function createWebSocketEntry(flowTag, sourcePath, handlerPath) {
       functionName: `${flowTag}HdrWbs`,
       handlerPath: `${handlerPath}/${flowTag}_HdrWbs.main`,
       roleName: 'FlowRbacRole',
-      routeName: flowTag
+      routeName: flowTag,
+      flowTag: flowTag,
+      flowStepName: ''
     }]
   };
 }