@izara_project/izara-core-generate-service-code 1.0.53 → 1.0.54

package/src/codeGenerators/app/src/generatedCode/Flow/{_internal → _shared}/events/s3Components/CreateObjectGenerator.js

@@ -16,12 +16,10 @@ export default async function generateCreateObject(flow, flowOutputDir) {
     const handlerFileName = `${functionName}_${handlerType}`;
 
     const mainTemplatePath = path.join(
-        __dirname, '..', '..', '..', 'FlowSchemas', 'templates', 's3Legacy',
-        'upload', 'createObject', 'mainFunction', 'template.ejs'
+        __dirname, '..', '..', '..', 'FlowSchemas', 'templates', 's3', 'CreateObject_Main.ejs'
     );
     const handlerTemplatePath = path.join(
-        __dirname, '..', '..', '..', 'FlowSchemas', 'templates', 's3Legacy',
-        'upload', 'createObject', 'handler', 'template.ejs'
+        __dirname, '..', '..', '..', 'FlowSchemas', 'templates', 's3', 'CreateObject_HdrWbs.ejs'
     );
 
     let mainTemplateStr, handlerTemplateStr;

package/src/codeGenerators/app/src/generatedCode/Flow/{_internal → _shared}/events/s3Components/CreatePreSignUrlGenerator.js

@@ -15,12 +15,10 @@ export default async function generateCreatePreSignUrl(flow, flowOutputDir) {
     const handlerFileName = `${functionName}_${handlerType}`;
 
     const mainTemplatePath = path.join(
-        __dirname, '..', '..', '..', 'FlowSchemas', 'templates', 's3Legacy',
-        'upload', 'preSignUrl', 'createPreSignUrl', 'mainFunction', 'template.ejs'
+        __dirname, '..', '..', '..', 'FlowSchemas', 'templates', 's3', 'CreatePreSignUrl_Main.ejs'
     );
     const handlerTemplatePath = path.join(
-        __dirname, '..', '..', '..', 'FlowSchemas', 'templates', 's3Legacy',
-        'upload', 'preSignUrl', 'createPreSignUrl', 'handler', 'template.ejs'
+        __dirname, '..', '..', '..', 'FlowSchemas', 'templates', 's3', 'CreatePreSignUrl_HdrSqs.ejs'
     );
 
     let mainTemplateStr, handlerTemplateStr;

package/src/codeGenerators/app/src/generatedCode/Flow/{_internal → _shared}/events/s3Components/ProcessAfterUploadS3Generator.js

@@ -15,12 +15,10 @@ export default async function generateProcessAfterUploadS3(flow, flowOutputDir)
     const handlerFileName = `${functionName}_${handlerType}`;
 
     const mainTemplatePath = path.join(
-        __dirname, '..', '..', '..', 'FlowSchemas', 'templates', 's3Legacy',
-        'upload', 'processFile', 'mainFunction', 'template.ejs'
+        __dirname, '..', '..', '..', 'FlowSchemas', 'templates', 's3', 'ProcessS3File_Main.ejs'
     );
     const handlerTemplatePath = path.join(
-        __dirname, '..', '..', '..', 'FlowSchemas', 'templates', 's3Legacy',
-        'upload', 'processFile', 'handler', 'handlerS3', 'template.ejs'
+        __dirname, '..', '..', '..', 'FlowSchemas', 'templates', 's3', 'FlowHandler_HdrS3.ejs'
     );
 
     let mainTemplateStr, handlerTemplateStr;
@@ -37,8 +35,10 @@ export default async function generateProcessAfterUploadS3(flow, flowOutputDir)
     });
 
     const handlerContent = ejs.render(handlerTemplateStr, {
+        flowTag: flow.flowTag,
         functionName: functionName,
-        handlerType: handlerType
+        mainFileName,
+        s3Bucket: flow.bucketName || ''
     });
 
     const targetMainPath = path.join(flowOutputDir, `${mainFileName}.js`);

package/src/codeGenerators/app/src/generatedCode/Flow/{_internal → _shared}/events/s3Components/ReservedLimitGenerator.js

@@ -15,12 +15,10 @@ export default async function generateReservedLimit(flow, flowOutputDir) {
     const handlerFileName = `${functionName}_${handlerType}`;
 
     const mainTemplatePath = path.join(
-        __dirname, '..', '..', '..', 'FlowSchemas', 'templates', 's3Legacy',
-        'upload', 'preSignUrl', 'reservedLimit', 'mainFunction', 'template.ejs'
+        __dirname, '..', '..', '..', 'FlowSchemas', 'templates', 's3', 'ReservedLimit_Main.ejs'
     );
     const handlerTemplatePath = path.join(
-        __dirname, '..', '..', '..', 'FlowSchemas', 'templates', 's3Legacy',
-        'upload', 'preSignUrl', 'reservedLimit', 'handler', 'template.ejs'
+        __dirname, '..', '..', '..', 'FlowSchemas', 'templates', 's3', 'ReservedLimit_HdrSqs.ejs'
     );
 
     let mainTemplateStr, handlerTemplateStr;

package/src/codeGenerators/app/src/generatedCode/Flow/{_internal → _shared}/shared/flowEntryPointBase.js

@@ -17,12 +17,12 @@ export async function generateFlowEntryPoint(allSchemas, options) {
     const baseOutputDir = path.join(options.outputPath, 'app', 'src', 'generatedCode');
 
     const templates = {
-        sqs: await fs.readFile(path.join(__dirname, '..', '_shared', 'handlers', 'FlowHandler_HdrSqs.ejs'), 'utf-8'),
-        api: await fs.readFile(path.join(__dirname, '..', '_shared', 'handlers', 'FlowHandler_HdrApi.ejs'), 'utf-8'),
-        inv: await fs.readFile(path.join(__dirname, '..', '_shared', 'handlers', 'FlowHandler_HdrInv.ejs'), 'utf-8'),
-        endpointMain: await fs.readFile(path.join(__dirname, '..', '_shared', 'endpoint', 'FlowEndpoint_Main.ejs'), 'utf-8'),
-        wbsMain: await fs.readFile(path.join(__dirname, '..', '_shared', 'endpoint', 'FlowMain_Wbs.ejs'), 'utf-8'),
-        endpointHdrWbs: await fs.readFile(path.join(__dirname, '..', '_shared', 'endpoint', 'FlowEndpoint_HdrWbs.ejs'), 'utf-8')
+        sqs: await fs.readFile(path.join(__dirname, '..', 'handlers', 'FlowHandler_HdrSqs.ejs'), 'utf-8'),
+        api: await fs.readFile(path.join(__dirname, '..', 'handlers', 'FlowHandler_HdrApi.ejs'), 'utf-8'),
+        inv: await fs.readFile(path.join(__dirname, '..', 'handlers', 'FlowHandler_HdrInv.ejs'), 'utf-8'),
+        endpointMain: await fs.readFile(path.join(__dirname, '..', '..', 'FlowSchemas', 'templates', 'endpoint', 'FlowEndpoint_Main.ejs'), 'utf-8'),
+        wbsMain: await fs.readFile(path.join(__dirname, '..', '..', 'FlowSchemas', 'templates', 'endpoint', 'FlowMain_Wbs.ejs'), 'utf-8'),
+        endpointHdrWbs: await fs.readFile(path.join(__dirname, '..', '..', 'FlowSchemas', 'templates', 'endpoint', 'FlowEndpoint_HdrWbs.ejs'), 'utf-8')
     };
 
     let generatedCount = 0;

package/src/codeGenerators/app/src/generatedCode/Flow/{_internal → _shared}/shared/flowMainFunctionBase.js

@@ -62,7 +62,7 @@ export async function generateFlowMainFunction(allSchemas, options) {
     // shared endpoint templates (FlowEndpoint_Main, FlowMain_Wbs) live under _internal/_shared/endpoint
     const templateBaseDir = templateName.startsWith('crud/') || ['CreateEndpoint_Main.ejs', 'UpdateEndpoint_Main.ejs', 'DeleteEndpoint_Main.ejs', 'GetEndpoint_Main.ejs'].includes(templateName)
         ? path.join(__dirname, '..', '..', 'FlowEndpoints', 'templates', 'crud')
-        : path.join(__dirname, '..', '_shared', 'endpoint');
+        : path.join(__dirname, '..', '..', 'FlowSchemas', 'templates', 'endpoint');
     const mainTemplateStr = await fs.readFile(
       path.join(templateBaseDir, templateName),
       'utf-8'
@@ -109,7 +109,7 @@ export async function generateFlowMainFunction(allSchemas, options) {
     // For ownTopic flows: also generate Process${FlowTag}_Main.js (simple endpoint, triggered from SQS)
     if (isOwnTopic) {
       const processMainTemplateStr = await fs.readFile(
-        path.join(__dirname, '..', '_shared', 'endpoint', 'FlowEndpoint_Main.ejs'),
+        path.join(__dirname, '..', '..', 'FlowSchemas', 'templates', 'endpoint', 'FlowEndpoint_Main.ejs'),
         'utf-8'
       );
       const processMainContent = ejs.render(processMainTemplateStr, {
@@ -130,7 +130,7 @@ export async function generateFlowMainFunction(allSchemas, options) {
     const beforeLogicalConfigs = generateCode.filter(c => c.codeHookTag === 'beforeLogical');
     if (isCrud && beforeLogicalConfigs.length > 0) {
       const beforeLogicalTemplateStr = await fs.readFile(
-        path.join(__dirname, '..', '_shared', 'endpoint', 'FlowEndpointBeforeLogical_Main.ejs'),
+        path.join(__dirname, '..', '..', 'FlowEndpoints', 'templates', 'FlowEndpointBeforeLogical_Main.ejs'),
         'utf-8'
       );
       

package/src/codeGenerators/app/src/generatedCode/Flow/{_internal → _shared}/shared/flowStepBase.js

@@ -17,19 +17,19 @@ export async function generateFlowSteps(allSchemas, options) {
 
     // Read templates
     const templates = {
-        main: await fs.readFile(path.join(__dirname, '..', '_shared', 'step', 'FlowStep_Main.ejs'), 'utf-8'),
-        complete: await fs.readFile(path.join(__dirname, '..', '_shared', 'step', 'FlowEndpointComplete_Main.ejs'), 'utf-8'),
-        sqs: await fs.readFile(path.join(__dirname, '..', '_shared', 'handlers', 'FlowHandler_HdrSqs.ejs'), 'utf-8'),
-        api: await fs.readFile(path.join(__dirname, '..', '_shared', 'handlers', 'FlowHandler_HdrApi.ejs'), 'utf-8'),
-        inv: await fs.readFile(path.join(__dirname, '..', '_shared', 'handlers', 'FlowHandler_HdrInv.ejs'), 'utf-8'),
+        main: await fs.readFile(path.join(__dirname, '..', '..', 'FlowSchemas', 'templates', 'step', 'FlowStep_Main.ejs'), 'utf-8'),
+        complete: await fs.readFile(path.join(__dirname, '..', '..', 'FlowSchemas', 'templates', 'step', 'FlowEndpointComplete_Main.ejs'), 'utf-8'),
+        sqs: await fs.readFile(path.join(__dirname, '..', 'handlers', 'FlowHandler_HdrSqs.ejs'), 'utf-8'),
+        api: await fs.readFile(path.join(__dirname, '..', 'handlers', 'FlowHandler_HdrApi.ejs'), 'utf-8'),
+        inv: await fs.readFile(path.join(__dirname, '..', 'handlers', 'FlowHandler_HdrInv.ejs'), 'utf-8'),
 
         // Advanced Custom Flow Logic Templates
-        pluginMain: await fs.readFile(path.join(__dirname, '..', '_shared', 'step', 'plugIns', 'FlowStep_PlugIn_Main.ejs'), 'utf-8').catch(() => ''),
-        recievePluginMain: await fs.readFile(path.join(__dirname, '..', '_shared', 'step', 'plugIns', 'FlowStep_RecievePlugIn_Main.ejs'), 'utf-8').catch(() => ''),
-        byConfigAwaitingMain: await fs.readFile(path.join(__dirname, '..', '_shared', 'step', 'plugIns', 'FlowStep_ByConfig_Awaiting_Main.ejs'), 'utf-8').catch(() => ''),
-        byConfigPaginatedMain: await fs.readFile(path.join(__dirname, '..', '_shared', 'step', 'plugIns', 'FlowStep_ByConfig_Paginated_Main.ejs'), 'utf-8').catch(() => ''),
-        templateAwaitingStep: path.join(__dirname, '..', '_shared', 'step', 'plugIns', 'templateAwaitingStep.ejs'),
-        templateSendPlugin: path.join(__dirname, '..', '_shared', 'step', 'plugIns', 'templateSendPlugin.ejs')
+        pluginMain: await fs.readFile(path.join(__dirname, '..', '..', 'FlowSchemas', 'templates', 'step', 'plugIns', 'FlowStep_PlugIn_Main.ejs'), 'utf-8').catch(() => ''),
+        recievePluginMain: await fs.readFile(path.join(__dirname, '..', '..', 'FlowSchemas', 'templates', 'step', 'plugIns', 'FlowStep_RecievePlugIn_Main.ejs'), 'utf-8').catch(() => ''),
+        byConfigAwaitingMain: await fs.readFile(path.join(__dirname, '..', '..', 'FlowSchemas', 'templates', 'step', 'plugIns', 'FlowStep_ByConfig_Awaiting_Main.ejs'), 'utf-8').catch(() => ''),
+        byConfigPaginatedMain: await fs.readFile(path.join(__dirname, '..', '..', 'FlowSchemas', 'templates', 'step', 'plugIns', 'FlowStep_ByConfig_Paginated_Main.ejs'), 'utf-8').catch(() => ''),
+        templateAwaitingStep: path.join(__dirname, '..', '..', 'FlowSchemas', 'templates', 'step', 'plugIns', 'templateAwaitingStep.ejs'),
+        templateSendPlugin: path.join(__dirname, '..', '..', 'FlowSchemas', 'templates', 'step', 'plugIns', 'templateSendPlugin.ejs')
     };
     
     let generatedCount = 0;

package/src/codeGenerators/app/src/generatedCode/ProcessLogical/ProcessLogicalGenerator.js

@@ -1,26 +1,29 @@
 import fs from 'fs/promises';
 import path from 'path';
 import { fileURLToPath } from 'url';
+import { writeRenderedTemplate } from '../../../../../core/renderTemplateFile.js';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
 export async function generateProcessLogical(options) {
-    console.log('  [ProcessLogicalGenerator] Generating ProcessLogical flows...');
-    
-    const outputDir = path.join(options.outputPath, 'app', 'src', 'generatedCode', 'ProcessLogical', 'source');
-    await fs.mkdir(outputDir, { recursive: true });
+  console.log('  [ProcessLogicalGenerator] Generating ProcessLogical flows...');
 
-    const templatesDir = path.join(__dirname, 'templates');
-    const files = await fs.readdir(templatesDir);
+  const outputDir = path.join(options.outputPath, 'app', 'src', 'generatedCode', 'ProcessLogical', 'source');
+  const templatesDir = path.join(__dirname, 'templates');
+  const files = await fs.readdir(templatesDir);
 
-    for (const file of files) {
-        if (file.endsWith('.js')) {
-            const sourceFile = path.join(templatesDir, file);
-            const destFile = path.join(outputDir, file);
-            await fs.copyFile(sourceFile, destFile);
-        }
-    }
-    
-    console.log(`  [ProcessLogicalGenerator] Wrote ${files.length} ProcessLogical files.`);
+  let count = 0;
+  for (const file of files) {
+    if (!file.endsWith('.ejs')) continue;
+
+    await writeRenderedTemplate(
+      path.join(templatesDir, file),
+      path.join(outputDir, file.replace(/\.ejs$/, '.js')),
+      {}
+    );
+    count++;
+  }
+
+  console.log(`  [ProcessLogicalGenerator] Wrote ${count} ProcessLogical files.`);
 }

package/src/codeGenerators/app/src/generatedCode/ProcessLogical/templates/{PaginateProcessLogical_HdrDsq.js → PaginateProcessLogical_HdrDsq.ejs}

@@ -174,4 +174,4 @@ export const main = middleware.wrap(async (event, context, callback) => {
     Logger.error('Unhandled Error, PaginateProcessLogicalHdrDsq: ', err);
     throw err;
   }
-});
+});

package/src/codeGenerators/app/src/generatedCode/SystemFlowSchemas/RegisterGenerator.js

@@ -1,166 +1,150 @@
 import path from 'path';
-import fs from 'fs/promises';
 import { fileURLToPath } from 'url';
-import ejs from 'ejs';
+import {
+  appendRenderedTemplate,
+  writeRenderedTemplate
+} from '../../../../../core/renderTemplateFile.js';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
 function upperCase(str) {
-    if (!str) return str;
-    return str.charAt(0).toUpperCase() + str.slice(1);
+  if (!str) return str;
+  return str.charAt(0).toUpperCase() + str.slice(1);
 }
 
 function shortNameHandler(handlerType) {
-    const map = {
-        'HdrSqs': 'Sqs',
-        'HdrApi': 'Api',
-        'HdrWbs': 'Wbs',
-        'HdrDsq': 'Dsq'
-    };
-    return map[handlerType] || handlerType;
+  const map = {
+    HdrSqs: 'Sqs',
+    HdrApi: 'Api',
+    HdrWbs: 'Wbs',
+    HdrDsq: 'Dsq'
+  };
+  return map[handlerType] || handlerType;
 }
 
-export async function generateRegisterFlow(allLocalFlowSchemas, appPath, outputBaseDir) {
-    const hasRegisterFlow = allLocalFlowSchemas.some(flow => flow.flowTag === 'Register');
-    if (!hasRegisterFlow) {
-        console.log('  [RegisterGenerator] No Register flow descriptor found. Skipping.');
-        return;
+export async function generateRegisterFlow(allLocalFlowSchemas, _appPath, outputBaseDir) {
+  if (!allLocalFlowSchemas.some((flow) => flow.flowTag === 'Register')) {
+    console.log('  [RegisterGenerator] No Register flow descriptor found. Skipping.');
+    return;
+  }
+
+  console.log('  [RegisterGenerator] Generating Register flow files...');
+
+  const templatesDir = path.join(__dirname, 'templates', 'register');
+  const wsTemplatesDir = path.join(__dirname, '..', 'Flow', 'FlowSchemas', 'templates', 'webSocket');
+  const registerDir = path.join(
+    outputBaseDir,
+    'app',
+    'src',
+    'generatedCode',
+    'SystemFlowSchemas',
+    'Register',
+    'source'
+  );
+  const flowSchemaPath = path.join(
+    outputBaseDir,
+    'app',
+    'sls_yaml',
+    'generatedCode',
+    'source',
+    'flow-schema.yml'
+  );
+  const resourceYamlPath = path.join(
+    outputBaseDir,
+    'resource',
+    'sls_yaml',
+    'generatedCode',
+    'source',
+    'generated-sns-in-sqs.yml'
+  );
+
+  const wbsFunctionName = 'Register';
+  await writeRenderedTemplate(
+    path.join(templatesDir, 'Register_Main.ejs'),
+    path.join(registerDir, `${wbsFunctionName}_Main.js`),
+    { functionMain: `${wbsFunctionName}_Main` }
+  );
+  await writeRenderedTemplate(
+    path.join(templatesDir, 'Register_HdrWbs.ejs'),
+    path.join(registerDir, `${wbsFunctionName}_HdrWbs.js`),
+    { routeName: 'register' }
+  );
+  await appendRenderedTemplate(
+    path.join(__dirname, '..', '..', '..', 'sls_yaml', 'templates', 'FunctionYaml_Wbs.ejs'),
+    flowSchemaPath,
+    {
+      functionNameConfig: `${wbsFunctionName}Wbs`,
+      handlerPath: `src/generatedCode/SystemFlowSchemas/Register/source/${wbsFunctionName}_HdrWbs.main`,
+      roleName: 'RegisterRole',
+      routeName: 'register'
     }
-
-    console.log('  [RegisterGenerator] Generating Register flow files...');
-    const templatesDir = path.join(__dirname, 'templates', 'register');
-    const wsTemplatesDir = path.join(__dirname, '..', 'Flow', 'FlowSchemas', 'templates', 'webSocket');
-    
-    // Output paths
-    const registerDir = path.join(outputBaseDir, 'app', 'src', 'generatedCode', 'SystemFlowSchemas', 'Register', 'source');
-    await fs.mkdir(registerDir, { recursive: true });
-
-    const slsYamlDir = path.join(outputBaseDir, 'app', 'sls_yaml', 'generatedCode', 'source');
-    await fs.mkdir(slsYamlDir, { recursive: true });
-
-    const resourceYamlDir = path.join(outputBaseDir, 'resource', 'sls_yaml', 'generatedCode', 'source');
-    await fs.mkdir(resourceYamlDir, { recursive: true });
-
-    // Helper to render and write
-    async function renderAndWrite(tplPath, outPath, data) {
-        const tpl = await fs.readFile(tplPath, 'utf-8');
-        const content = ejs.render(tpl, data);
-        await fs.writeFile(outPath, content, 'utf-8');
+  );
+
+  const completeFunctionName = 'RegisterComplete';
+  const completeData = {
+    functionName: completeFunctionName,
+    handlerType: 'HdrSqs',
+    queueName: completeFunctionName,
+    handlerFilePath: `src/generatedCode/SystemFlowSchemas/Register/source/${completeFunctionName}_HdrSqs`,
+    roleName: 'RegisterComplete',
+    upperFunctionName: upperCase(completeFunctionName),
+    upperHandlerType: 'HDRSQS',
+    upperQueueName: upperCase(completeFunctionName),
+    functionNameConfig: `${upperCase(completeFunctionName)}${upperCase(shortNameHandler('HdrSqs'))}`
+  };
+
+  await writeRenderedTemplate(
+    path.join(templatesDir, 'RegisterComplete_Main.ejs'),
+    path.join(registerDir, `${completeFunctionName}_Main.js`),
+    completeData
+  );
+  await writeRenderedTemplate(
+    path.join(templatesDir, 'RegisterComplete_HdrSqs.ejs'),
+    path.join(registerDir, `${completeFunctionName}_HdrSqs.js`),
+    completeData
+  );
+  await writeRenderedTemplate(
+    path.join(templatesDir, 'RegisterComplete_HdrSqs.ejs'),
+    path.join(registerDir, `${completeFunctionName}_HdrDsq.js`),
+    { ...completeData, handlerType: 'HdrDsq' }
+  );
+  await appendRenderedTemplate(
+    path.join(wsTemplatesDir, 'ProcessWebSocketFlow_Yaml.ejs'),
+    flowSchemaPath,
+    completeData
+  );
+  await appendRenderedTemplate(
+    path.join(wsTemplatesDir, 'ProcessWebSocketFlow_Yaml.ejs'),
+    flowSchemaPath,
+    {
+      ...completeData,
+      handlerType: 'HdrDsq',
+      upperHandlerType: 'HDRDSQ',
+      functionNameConfig: `${upperCase(completeFunctionName)}Dsq`,
+      handlerFilePath: `src/generatedCode/SystemFlowSchemas/Register/source/${completeFunctionName}_HdrDsq`
     }
-
-    async function renderAndAppend(tplPath, outPath, data) {
-        const tpl = await fs.readFile(tplPath, 'utf-8');
-        const content = ejs.render(tpl, data);
-        await fs.appendFile(outPath, '\n' + content, 'utf-8');
-    }
-
-    // 1. WBS Handler and Main
-    const wbsFunctionName = 'Register';
-    await renderAndWrite(
-        path.join(templatesDir, 'Register_Main.ejs'),
-        path.join(registerDir, `${wbsFunctionName}_Main.js`),
-        { functionMain: `${wbsFunctionName}_Main` }
+  );
+
+  await appendRenderedTemplate(
+    path.join(wsTemplatesDir, 'ProcessWebSocket_Yaml.ejs'),
+    resourceYamlPath,
+    completeData
+  );
+
+  for (const flowSchema of allLocalFlowSchemas) {
+    if (!flowSchema.outputTopic) continue;
+
+    await appendRenderedTemplate(
+      path.join(wsTemplatesDir, 'ProcessWebSocketSub_Yaml.ejs'),
+      resourceYamlPath,
+      {
+        subscribeTo: upperCase(flowSchema.flowTag),
+        queueName: completeFunctionName,
+        upperQueueName: upperCase(completeFunctionName)
+      }
     );
-    
-    await renderAndWrite(
-        path.join(templatesDir, 'Register_HdrWbs.ejs'),
-        path.join(registerDir, `${wbsFunctionName}_HdrWbs.js`),
-        { routeName: 'register' }
-    );
-
-    const wbsYamlTemplatePath = path.join(__dirname, '..', '..', '..', 'sls_yaml', 'templates', 'FunctionYaml_Wbs.ejs');
-    await renderAndAppend(
-        wbsYamlTemplatePath, 
-        path.join(slsYamlDir, 'flow-schema.yml'),
-        {
-            functionNameConfig: wbsFunctionName + 'Wbs',
-            handlerPath: `src/generatedCode/SystemFlowSchemas/Register/source/${wbsFunctionName}_HdrWbs.main`,
-            roleName: 'RegisterRole',
-            routeName: 'register'
-        }
-    );
-
-    // 2. Complete Handler and Main
-    const completeFunctionName = 'RegisterComplete';
-    const processHandlerType = 'HdrSqs';
-    const queueName = completeFunctionName;
-
-    const completeData = {
-        functionName: completeFunctionName,
-        handlerType: processHandlerType,
-        queueName: queueName,
-        handlerFilePath: `src/generatedCode/SystemFlowSchemas/Register/source/${completeFunctionName}_${processHandlerType}`,
-        roleName: 'RegisterComplete',
-        upperFunctionName: upperCase(completeFunctionName),
-        upperHandlerType: upperCase(processHandlerType),
-        upperQueueName: upperCase(queueName),
-        functionNameConfig: upperCase(completeFunctionName) + upperCase(shortNameHandler(processHandlerType))
-    };
-
-    await renderAndWrite(
-        path.join(templatesDir, 'RegisterComplete_Main.ejs'),
-        path.join(registerDir, `${completeFunctionName}_Main.js`),
-        completeData
-    );
-
-    await renderAndWrite(
-        path.join(templatesDir, 'RegisterComplete_HdrSqs.ejs'),
-        path.join(registerDir, `${completeFunctionName}_${processHandlerType}.js`),
-        completeData
-    );
-    
-    // Also generate Dsq if needed, or legacy only had Sqs?
-    // Legacy RegisterComplete_HdrSqs template does both Sqs and Dsq based on yaml, but here we just write HdrSqs and HdrDsq.
-    await renderAndWrite(
-        path.join(templatesDir, 'RegisterComplete_HdrSqs.ejs'),
-        path.join(registerDir, `${completeFunctionName}_HdrDsq.js`),
-        { ...completeData, handlerType: 'HdrDsq' }
-    );
-
-    // Append to flow-schema.yml
-    await renderAndAppend(
-        path.join(wsTemplatesDir, 'ProcessWebSocketFlow_Yaml.ejs'),
-        path.join(slsYamlDir, 'flow-schema.yml'),
-        completeData
-    );
-
-    // Append Dsq to flow-schema
-    await renderAndAppend(
-        path.join(wsTemplatesDir, 'ProcessWebSocketFlow_Yaml.ejs'),
-        path.join(slsYamlDir, 'flow-schema.yml'),
-        {
-            ...completeData,
-            handlerType: 'HdrDsq',
-            upperHandlerType: 'HDRDSQ',
-            functionNameConfig: upperCase(completeFunctionName) + 'Dsq',
-            handlerFilePath: `src/generatedCode/SystemFlowSchemas/Register/source/${completeFunctionName}_HdrDsq`,
-        }
-    );
-
-    // 3. SQS and SNS Subscriptions
-    // We reuse ProcessWebSocket_Yaml.ejs which creates SQS queue
-    await renderAndAppend(
-        path.join(wsTemplatesDir, 'ProcessWebSocket_Yaml.ejs'),
-        path.join(resourceYamlDir, 'generated-sns-in-sqs.yml'),
-        completeData
-    );
-
-    // RegisterComplete subscribes to ALL output topics
-    for (const flowSchema of allLocalFlowSchemas) {
-        if (flowSchema.outputTopic) {
-            const topicOut = upperCase(flowSchema.flowTag);
-            await renderAndAppend(
-                path.join(wsTemplatesDir, 'ProcessWebSocketSub_Yaml.ejs'),
-                path.join(resourceYamlDir, 'generated-sns-in-sqs.yml'),
-                {
-                    subscribeTo: topicOut,
-                    queueName: queueName,
-                    upperQueueName: upperCase(queueName)
-                }
-            );
-        }
-    }
+  }
 
-    console.log(`  [RegisterGenerator] Finished generating Register flow files.`);
+  console.log('  [RegisterGenerator] Finished generating Register flow files.');
 }

package/src/codeGenerators/app/src/generatedCode/libs/ConstsGenerator.js

@@ -1,20 +1,28 @@
 import fs from 'fs/promises';
 import path from 'path';
 import { fileURLToPath } from 'url';
+import ejs from 'ejs';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
 export async function generateConsts(options) {
-    console.log('  [ConstsGenerator] Generating Consts...');
+  console.log('  [ConstsGenerator] Generating Consts...');
 
-    const outputDir = path.join(options.outputPath, 'app', 'src', 'generatedCode', 'libs', 'source');
-    await fs.mkdir(outputDir, { recursive: true });
+  const outputDir = path.join(
+    options.outputPath,
+    'app',
+    'src',
+    'generatedCode',
+    'libs',
+    'source'
+  );
+  await fs.mkdir(outputDir, { recursive: true });
 
-    const sourceFile = path.join(__dirname, 'templates', 'Consts.js');
-    const destFile = path.join(outputDir, 'Consts.js');
+  const sourceFile = path.join(__dirname, 'templates', 'Consts.ejs');
+  const destFile = path.join(outputDir, 'Consts.js');
+  const template = await fs.readFile(sourceFile, 'utf8');
 
-    await fs.copyFile(sourceFile, destFile);
-
-    console.log(`  [ConstsGenerator] Wrote Consts.js`);
+  await fs.writeFile(destFile, ejs.render(template, {}));
+  console.log('  [ConstsGenerator] Wrote Consts.js');
 }

package/src/codeGenerators/app/src/generatedCode/libs/GenerateCodeLibsGenerator.js

@@ -1,20 +1,28 @@
 import fs from 'fs/promises';
 import path from 'path';
 import { fileURLToPath } from 'url';
+import ejs from 'ejs';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
 export async function generateCodeLibs(options) {
-    console.log('  [GenerateCodeLibsGenerator] Generating Code Libs...');
-    
-    const outputDir = path.join(options.outputPath, 'app', 'src', 'generatedCode', 'libs', 'source');
-    await fs.mkdir(outputDir, { recursive: true });
+  console.log('  [GenerateCodeLibsGenerator] Generating Code Libs...');
 
-    const sourceFile = path.join(__dirname, 'templates', 'GenerateCodeLibs.js');
-    const destFile = path.join(outputDir, 'GenerateCodeLibs.js');
+  const outputDir = path.join(
+    options.outputPath,
+    'app',
+    'src',
+    'generatedCode',
+    'libs',
+    'source'
+  );
+  await fs.mkdir(outputDir, { recursive: true });
 
-    await fs.copyFile(sourceFile, destFile);
-    
-    console.log(`  [GenerateCodeLibsGenerator] Wrote GenerateCodeLibs.js`);
+  const sourceFile = path.join(__dirname, 'templates', 'GenerateCodeLibs.ejs');
+  const destFile = path.join(outputDir, 'GenerateCodeLibs.js');
+  const template = await fs.readFile(sourceFile, 'utf8');
+
+  await fs.writeFile(destFile, ejs.render(template, {}));
+  console.log('  [GenerateCodeLibsGenerator] Wrote GenerateCodeLibs.js');
 }

package/src/codeGenerators/resource/sls_yaml/FlowOutGenerator.js

@@ -2,7 +2,7 @@ import path from 'path';
 import fs from 'fs/promises';
 import { fileURLToPath } from 'url';
 import ejs from 'ejs';
-import { getFlowsForGeneration } from '../../app/src/generatedCode/Flow/_internal/shared/flowSelection.js';
+import { getFlowsForGeneration } from '../../app/src/generatedCode/Flow/_shared/shared/flowSelection.js';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -49,7 +49,16 @@ export async function generateFlowOut(allSchemas, options) {
         'UpdateNodeComplete',
         'GetNodeComplete',
         'ProcessLogicalComplete',
-        'FindDataComplete'
+        'FindDataComplete',
+        // CRUD Async Topics
+        'Create', 'Update', 'Delete',
+        // Relationship Topics
+        'CreateRelationship', 'UpdateRelationship', 'DeleteRelationship',
+        'GetRelationship', 'ChangeRelationship', 'MoveRelationship',
+        // RBAC Topics
+        'CreateTargetRole', 'ListTargetRole', 'DeleteTargetRole',
+        'CreateRolePermissions', 'ListRolePermissions', 'DeleteRolePermissions',
+        'CreateUserRole', 'ListUserInRoles', 'DeleteUserFromRole'
     ];
 
     for (const topic of systemTopics) {