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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-core-generate-service-code",
-  "version": "1.0.53",
+  "version": "1.0.54",
   "description": "Code for locally generating per service files",
   "homepage": "https://bitbucket.org/izara-core-support-services/izara-core-support-services-generate-service-code#readme",
   "repository": {
@@ -28,7 +28,6 @@
     "@izara_project/izara-shared-service-schemas": "^1.0.64",
     "ejs": "^5.0.1",
     "js-beautify": "^1.15.4",
-    "lodash": "^4.18.1",
     "yaml": "^2.9.0"
   },
   "devDependencies": {

package/src/codeGenerators/app/initial_setup/InitialSetupGenerator.js

@@ -2,7 +2,7 @@ import path from 'path';
 import fs from 'fs/promises';
 import ejs from 'ejs';
 import { fileURLToPath } from 'url';
-import { getFlowsForGeneration } from '../src/generatedCode/Flow/_internal/shared/flowSelection.js';
+import { getFlowsForGeneration } from '../src/generatedCode/Flow/_shared/shared/flowSelection.js';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);

package/src/codeGenerators/app/sls_yaml/FindDataYamlGenerator.js

@@ -0,0 +1,23 @@
+import path from 'path';
+import { fileURLToPath } from 'url';
+import { renderYamlTemplate } from './renderYamlTemplate.js';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+export async function generateFindDataYaml(options) {
+  console.log('  [FindDataYamlGenerator] Generating FindData YAML...');
+
+  await renderYamlTemplate(
+    path.join(__dirname, 'templates', 'FindData_Yaml.ejs'),
+    path.join(options.outputPath, 'app', 'sls_yaml', 'generatedCode', 'source', 'find-data.yml'),
+    {
+      functionName: 'FindData',
+      handlerPath: 'src/generatedCode/FindData/source/FindData_HdrSqs.main',
+      roleName: 'ProcFindData',
+      upperFunctionName: 'FINDDATA',
+      upperHandlerType: 'HDRSQS'
+    },
+    'FindDataYamlGenerator'
+  );
+}

package/src/codeGenerators/app/sls_yaml/FunctionYamlGenerator.js

@@ -2,7 +2,7 @@ import fs from 'fs/promises';
 import path from 'path';
 import ejs from 'ejs';
 import { fileURLToPath } from 'url';
-import { getFlowsForGeneration } from '../src/generatedCode/Flow/_internal/shared/flowSelection.js';
+import { getFlowsForGeneration } from '../src/generatedCode/Flow/_shared/shared/flowSelection.js';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);

package/src/codeGenerators/app/sls_yaml/ProcessLogicalYamlGenerator.js

@@ -1,35 +1,21 @@
-import fs from 'fs/promises';
 import path from 'path';
-import ejs from 'ejs';
 import { fileURLToPath } from 'url';
+import { renderYamlTemplate } from './renderYamlTemplate.js';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
 export async function generateProcessLogicalYaml(allSchemas, options) {
-    console.log('  [ProcessLogicalYamlGenerator] Generating ProcessLogical YAML...');
-    
-    // We only generate if ProcessLogical actually exists in the schemas or if there are objects.
-    // In most cases, if there are objects, ProcessLogical is needed.
-    if (!allSchemas.objects || allSchemas.objects.length === 0) {
-        return;
-    }
+  console.log('  [ProcessLogicalYamlGenerator] Generating ProcessLogical YAML...');
 
-    const slsYamlDir = path.join(options.outputPath, 'app', 'sls_yaml', 'generatedCode', 'source');
-    await fs.mkdir(slsYamlDir, { recursive: true });
+  if (!allSchemas.objects || allSchemas.objects.length === 0) {
+    return;
+  }
 
-    const templatePath = path.join(__dirname, 'templates', 'ProcessLogical_Yaml.ejs');
-    let templateString;
-    try {
-        templateString = await fs.readFile(templatePath, 'utf-8');
-    } catch (e) {
-        console.error('Error reading ProcessLogical YAML template:', e);
-        return;
-    }
-
-    const fileContent = ejs.render(templateString, {});
-    const outputPath = path.join(slsYamlDir, 'process-logical.yml');
-    
-    await fs.writeFile(outputPath, fileContent, 'utf-8');
-    console.log(`  [ProcessLogicalYamlGenerator] Wrote process-logical.yml to ${outputPath}`);
+  await renderYamlTemplate(
+    path.join(__dirname, 'templates', 'ProcessLogical_Yaml.ejs'),
+    path.join(options.outputPath, 'app', 'sls_yaml', 'generatedCode', 'source', 'process-logical.yml'),
+    {},
+    'ProcessLogicalYamlGenerator'
+  );
 }

package/src/codeGenerators/app/sls_yaml/RoleNameConfigGenerator.js

@@ -2,7 +2,7 @@ import fs from 'fs/promises';
 import path from 'path';
 import ejs from 'ejs';
 import { fileURLToPath } from 'url';
-import { getFlowsForGeneration } from '../src/generatedCode/Flow/_internal/shared/flowSelection.js';
+import { getFlowsForGeneration } from '../src/generatedCode/Flow/_shared/shared/flowSelection.js';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);

package/src/codeGenerators/app/sls_yaml/SharedResourceYamlGenerator.js

@@ -3,7 +3,7 @@ import path from 'path';
 import ejs from 'ejs';
 import { fileURLToPath } from 'url';
 import { policyRegistry } from './_policy/PolicyRegistry.js';
-import { getFlowsForGeneration } from '../src/generatedCode/Flow/_internal/shared/flowSelection.js';
+import { getFlowsForGeneration } from '../src/generatedCode/Flow/_shared/shared/flowSelection.js';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -460,8 +460,8 @@ export async function generateSharedResourceYaml(allSchemas, options) {
     .join('\n');
     
   normalizedContent = normalizedContent
-    .replace(/^  [A-Za-z0-9]+:/gm, '\n$&')
-    .replace(/^Resources:\n+  /, 'Resources:\n  ') + '\n';
+    .replace(/^  [A-Za-z0-9]+:/gm, '\n\n$&')
+    .replace(/^Resources:\n+  /, 'Resources:\n\n  ') + '\n';
 
   const outputPath = path.join(slsYamlDir, 'generate-shared-resource.yml');
   await fs.writeFile(outputPath, normalizedContent, 'utf-8');

package/src/codeGenerators/app/sls_yaml/renderYamlTemplate.js

@@ -0,0 +1,13 @@
+import path from 'path';
+import { writeRenderedTemplate } from '../../../core/renderTemplateFile.js';
+
+async function renderYamlTemplate(templatePath, outputPath, templateData, logLabel) {
+  try {
+    await writeRenderedTemplate(templatePath, outputPath, templateData);
+    console.log(`  [${logLabel}] Wrote ${path.basename(outputPath)} to ${outputPath}`);
+  } catch (error) {
+    console.error(`  [${logLabel}] Error rendering ${path.basename(templatePath)}:`, error);
+  }
+}
+
+export { renderYamlTemplate };

package/src/codeGenerators/app/sls_yaml/templates/SharedResource_Yaml.ejs

@@ -11,10 +11,12 @@ Resources:
             Principal:
               Service: "lambda.amazonaws.com"
             Action: sts:AssumeRole
+          #<#<%- roleName %>AssumeRoleStatementHookCode#>
+          #<#/<%- roleName %>AssumeRoleStatementHookCode#>
       ManagedPolicyArns:
         - arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole
-        //(<<%- roleName %>ManagedPolicyArns>)
-        //(</<%- roleName %>ManagedPolicyArns>)
+        #<#<%- roleName %>ManagedPolicyArns#>
+        #<#/<%- roleName %>ManagedPolicyArns#>
       Policies:
         - PolicyName: ${self:custom.iz_resourcePrefix}<%- roleName %>Policy
           PolicyDocument:
@@ -31,5 +33,7 @@ Resources:
                   - "<%- r %>"
 <% }) %>
 <% }) %>
+        #<#<%- roleName %>StatementHookCode#>
+        #<#/<%- roleName %>StatementHookCode#>
 
 <% }) %>

package/src/codeGenerators/app/src/generatedCode/FindData/FindDataGenerator.js

@@ -2,6 +2,7 @@ import fs from 'fs/promises';
 import path from 'path';
 import ejs from 'ejs';
 import { fileURLToPath } from 'url';
+import { writeRenderedTemplate } from '../../../../../core/renderTemplateFile.js';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -22,16 +23,7 @@ export async function generateFindData(allSchemas, generatorOptions) {
     'FindData',
     'source'
   );
-  const yamlOutputPath = path.join(
-    generatorOptions.outputPath,
-    'app',
-    'sls_yaml',
-    'generatedCode',
-    'source'
-  );
-
   await fs.mkdir(outputPath, { recursive: true });
-  await fs.mkdir(yamlOutputPath, { recursive: true });
 
   const datas = [];
 
@@ -229,44 +221,18 @@ export async function generateFindData(allSchemas, generatorOptions) {
     objectTypeBlocks += `\n    }\n    //(<additionalObjectType>)\n    //(</additionalObjectType>)\n    else {\n      errorsFound.push('unrecognized objectType');\n      standardErrorParams.push(errorsFound);\n      await findDataSharedLib.completeFindDataMain(...standardErrorParams);\n      return { returnResponse: 'Function FindData Error' };\n    }`;
   }
 
-  // Generate FindData_Main.js
-  const mainTemplatePath = path.join(
-    __dirname,
-    'templates',
-    'FindData_Main.ejs'
+  await writeRenderedTemplate(
+    path.join(__dirname, 'templates', 'FindData_Main.ejs'),
+    path.join(outputPath, 'FindData_Main.js'),
+    { objectTypeBlocks }
   );
-  const mainTemplate = await fs.readFile(mainTemplatePath, 'utf8');
-  const mainContent = ejs.render(mainTemplate, { objectTypeBlocks });
-  await fs.writeFile(path.join(outputPath, 'FindData_Main.js'), mainContent);
-
-  // Generate FindData_HdrSqs.js
-  const sqsTemplatePath = path.join(
-    __dirname,
-    'templates',
-    'FindData_HdrSqs.ejs'
+  await writeRenderedTemplate(
+    path.join(__dirname, 'templates', 'FindData_HdrSqs.ejs'),
+    path.join(outputPath, 'FindData_HdrSqs.js'),
+    {}
   );
-  const sqsTemplate = await fs.readFile(sqsTemplatePath, 'utf8');
-  const sqsContent = ejs.render(sqsTemplate, {});
-  await fs.writeFile(path.join(outputPath, 'FindData_HdrSqs.js'), sqsContent);
 
-  // Generate FindData YAML
-  const yamlTemplatePath = path.join(
-    __dirname,
-    'templates',
-    'FindData_Yaml.ejs'
-  );
-  const yamlTemplate = await fs.readFile(yamlTemplatePath, 'utf8');
-  const yamlContent = ejs.render(yamlTemplate, {
-    functionName: 'FindData',
-    handlerPath: 'src/generatedCode/FindData/source/FindData_HdrSqs.main',
-    roleName: 'ProcFindData',
-    upperFunctionName: 'FINDDATA',
-    upperHandlerType: 'HDRSQS'
-  });
-  await fs.writeFile(
-    path.join(yamlOutputPath, 'find-data.yml'),
-    yamlContent
-  );
+
 
   console.log('  [FindDataGenerator] Finished generating FindData logic.');
 }

package/src/codeGenerators/app/src/generatedCode/Flow/FlowEndpoints/EndpointsGenerator.js

@@ -0,0 +1,119 @@
+import path from 'path';
+import fs from 'fs/promises';
+import { fileURLToPath } from 'url';
+import ejs from 'ejs';
+import { processFunctionName, processMainFileName, upperFirst } from '../_shared/shared/flowNaming.js';
+import { EVENT_HANDLERS } from '../_shared/events/registry.js';
+import { getGeneratedCodeConfigs } from '../_shared/shared/flowSelection.js';
+
+const CRUD_ACTIONS = ['Create', 'Update', 'Delete', 'Get'];
+const CRUD_ASYNC_ACTIONS = ['Create', 'Update', 'Delete'];
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+export async function generateEndpointsFlow(allSchemas, options) {
+  console.log('  [EndpointsGenerator] Generating CRUD Endpoint Flows...');
+  const baseOutputDir = path.join(options.outputPath, 'app', 'src', 'generatedCode');
+  const templateDir = path.join(__dirname, 'templates');
+
+  let generatedCount = 0;
+
+  // We only generate CRUD if there's at least one applicable object
+  const hasApplicableObject = (allSchemas.objects || []).some(
+    obj => obj.generatedBy === 'userGenerated' || obj.generatedBy === 'systemGenerated'
+  );
+  if (!hasApplicableObject) return;
+
+  const sharedTemplates = {
+    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'),
+    wbsMain: await fs.readFile(path.join(__dirname, '..', 'FlowSchemas', 'templates', 'endpoint', 'FlowMain_Wbs.ejs'), 'utf-8').catch(() => ''),
+    endpointHdrWbs: await fs.readFile(path.join(__dirname, '..', 'FlowSchemas', 'templates', 'endpoint', 'FlowEndpoint_HdrWbs.ejs'), 'utf-8').catch(() => '')
+  };
+
+  // We need to pass a mock flows array to getGeneratedCodeConfigs if it expects it
+  // Since we are decoupling, we will just use allSchemas.flows for custom logic filtering
+  const customFlows = allSchemas.flows || [];
+
+  for (const action of CRUD_ACTIONS) {
+    const isAsync = CRUD_ASYNC_ACTIONS.includes(action);
+    const upperAction = upperFirst(action);
+    const flowOutputDir = path.join(baseOutputDir, 'FlowEndpoints', upperAction, 'source');
+    await fs.mkdir(flowOutputDir, { recursive: true });
+
+    const mainFileName = processMainFileName(action);
+    const processFunction = processFunctionName(action);
+
+    // Mock flow object for registry handlers if needed
+    const mockFlow = {
+      flowTag: action,
+      event: isAsync ? ['ownTopic'] : ['lambdaSyncInv', 'lambdaSyncApi']
+    };
+
+    const generateCode = getGeneratedCodeConfigs(customFlows, action, { includeFlowTag: true });
+
+    // 1. Generate Main Logic File
+    const mainTemplatePath = path.join(templateDir, 'crud', `${action}Endpoint_Main.ejs`);
+    let mainTemplateStr;
+    try {
+      mainTemplateStr = await fs.readFile(mainTemplatePath, 'utf-8');
+    } catch (err) {
+      console.warn(`  [EndpointsGenerator] Warning: Main template not found for ${action}.`);
+      continue;
+    }
+
+    const mainContent = ejs.render(mainTemplateStr, {
+      flowTag: action,
+      upperCaseFlowTag: upperAction,
+      topicArn: `${upperAction}_In`,
+      generateCode: generateCode,
+      flow: mockFlow,
+      inTagConfig: null
+    });
+    await fs.writeFile(path.join(flowOutputDir, `${mainFileName}.js`), mainContent, 'utf-8');
+    generatedCount++;
+
+    // 2. Generate BeforeLogical Main Logic File if needed
+    const beforeLogicalConfigs = generateCode.filter(c => c.codeHookTag === 'beforeLogical');
+    if (beforeLogicalConfigs.length > 0) {
+      const beforeLogicalTemplateStr = await fs.readFile(
+        path.join(templateDir, 'FlowEndpointBeforeLogical_Main.ejs'),
+        'utf-8'
+      );
+      const beforeLogicalFileName = `${upperAction}BeforeLogical_Main`;
+      const beforeLogicalContent = ejs.render(beforeLogicalTemplateStr, {
+        flowTag: action,
+        upperCaseFlowTag: upperAction,
+        generateCode: generateCode,
+        flow: mockFlow,
+        inTagConfig: null
+      });
+      await fs.writeFile(path.join(flowOutputDir, `${beforeLogicalFileName}.js`), beforeLogicalContent, 'utf-8');
+      generatedCount++;
+
+      // BeforeLogical SQS Handler
+      const sqsContent = ejs.render(sharedTemplates.sqs, {
+          flowTag: action,
+          flowStepName: '',
+          mainFileName: beforeLogicalFileName,
+          functionName: `${action}BeforeLogicalMain`,
+          queueName: `${action}BeforeLogicalHdrSqs`
+      });
+      await fs.writeFile(path.join(flowOutputDir, `${upperAction}BeforeLogical_HdrSqs.js`), sqsContent, 'utf-8');
+      generatedCount++;
+    }
+
+    // 3. Generate Handlers based on event array using Registry
+    for (const ev of mockFlow.event) {
+        const handlerGenerator = EVENT_HANDLERS[ev];
+        if (handlerGenerator) {
+            await handlerGenerator(mockFlow, '', flowOutputDir, mainFileName, sharedTemplates, generateCode);
+            generatedCount++;
+        }
+    }
+  }
+
+  console.log(`  [EndpointsGenerator] Generated ${generatedCount} files for CRUD Endpoints.`);
+}

package/src/codeGenerators/app/src/generatedCode/Flow/FlowRbac/RbacFlowGenerator.js

@@ -2,72 +2,111 @@ import path from 'path';
 import fs from 'fs/promises';
 import { fileURLToPath } from 'url';
 import ejs from 'ejs';
-import { isRbacFlow } from '../_internal/shared/flowClassifier.js';
-import { getFlowsForGeneration } from '../_internal/shared/flowSelection.js';
-import { processFunctionName, processMainFileName, upperFirst } from '../_internal/shared/flowNaming.js';
+import { processFunctionName, processMainFileName, upperFirst } from '../_shared/shared/flowNaming.js';
+
+const RBAC_FLOW_DEFINITIONS = [
+  'CreateTargetRole', 'ListTargetRole', 'DeleteTargetRole',
+  'CreateRolePermissions', 'ListRolePermissions', 'DeleteRolePermissions',
+  'CreateUserRole', 'ListUserInRoles', 'DeleteUserFromRole'
+];
+
+function hasRbacAddOn(obj) {
+  return Array.isArray(obj.addOnDataStructure) && obj.addOnDataStructure.some(addOn => addOn.type === 'rbac');
+}
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
 export async function generateRbacFlows(allSchemas, options) {
-    console.log('  [RbacFlowGenerator] Generating Custom RBAC Flows...');
-    const baseOutputDir = path.join(options.outputPath, 'app', 'src', 'generatedCode', 'FlowRbac');
-    // Local templates/ folder (3-way shared handlers via symlink + rbac/ specific templates)
-    const templateDir = path.join(__dirname, 'templates');
+  console.log('  [RbacFlowGenerator] Generating Custom RBAC Flows...');
+  const baseOutputDir = path.join(
+    options.outputPath,
+    'app',
+    'src',
+    'generatedCode',
+    'FlowRbac'
+  );
+  // Local templates/ folder (3-way shared handlers via symlink + rbac/ specific templates)
+  const templateDir = path.join(__dirname, 'templates');
 
-    // Read handler templates
-    const templates = {
-        sqs: await fs.readFile(path.join(templateDir, 'FlowHandler_HdrSqs.ejs'), 'utf-8'),
-        api: await fs.readFile(path.join(templateDir, 'FlowHandler_HdrApi.ejs'), 'utf-8'),
-        inv: await fs.readFile(path.join(templateDir, 'FlowHandler_HdrInv.ejs'), 'utf-8')
-    };
+  // Read handler templates
+  const templates = {
+    sqs: await fs.readFile(
+      path.join(templateDir, '..', '..', '_shared', 'handlers', 'FlowHandler_HdrSqs.ejs'),
+      'utf-8'
+    ),
+    api: await fs.readFile(
+      path.join(templateDir, '..', '..', '_shared', 'handlers', 'FlowHandler_HdrApi.ejs'),
+      'utf-8'
+    ),
+    inv: await fs.readFile(
+      path.join(templateDir, '..', '..', '_shared', 'handlers', 'FlowHandler_HdrInv.ejs'),
+      'utf-8'
+    )
+  };
 
-    let generatedCount = 0;
+  let generatedCount = 0;
 
-    const flows = getFlowsForGeneration(allSchemas);
+  const rbacObjects = (allSchemas.objects || []).filter(hasRbacAddOn);
+  if (rbacObjects.length === 0) return;
 
-    for (const flow of flows) {
-        const flowTag = flow.flowTag;
+  // Since RBAC templates are generic, we only need to generate them once
+  // even if multiple objects have the rbac addOn.
+  for (const flowTag of RBAC_FLOW_DEFINITIONS) {
 
-        // Process only if it's an RBAC flow
-        if (!isRbacFlow(flowTag)) continue;
+    const flowOutputDir = path.join(baseOutputDir, flowTag, 'source');
+    await fs.mkdir(flowOutputDir, { recursive: true });
 
-        const flowOutputDir = path.join(baseOutputDir, flowTag, 'source');
-        await fs.mkdir(flowOutputDir, { recursive: true });
+    // Generate Process Step for RBAC
+    const mainFileName = processMainFileName(flowTag);
 
-        // Generate Process Step for RBAC
-        const mainFileName = processMainFileName(flowTag);
+    // 1. Generate Main Logic File (from specific RBAC templates)
+    const templatePath = path.join(
+      __dirname,
+      'templates',
+      'rbac',
+      `${flowTag}.ejs`
+    );
+    let mainTemplateStr;
+    try {
+      mainTemplateStr = await fs.readFile(templatePath, 'utf-8');
+    } catch (err) {
+      console.warn(
+        `  [RbacFlowGenerator] Warning: RBAC template not found for ${flowTag}. Skipping.`
+      );
+      continue;
+    }
 
-        // 1. Generate Main Logic File (from specific RBAC templates)
-        const templatePath = path.join(__dirname, 'templates', 'rbac', `${flowTag}.ejs`);
-        let mainTemplateStr;
-        try {
-            mainTemplateStr = await fs.readFile(templatePath, 'utf-8');
-        } catch (err) {
-            console.warn(`  [RbacFlowGenerator] Warning: RBAC template not found for ${flowTag}. Skipping.`);
-            continue;
-        }
+    const mainContent = ejs.render(mainTemplateStr, {
+      flowTag: flowTag
+    });
+    await fs.writeFile(
+      path.join(flowOutputDir, `${mainFileName}.js`),
+      mainContent,
+      'utf-8'
+    );
+    generatedCount++;
 
-        const mainContent = ejs.render(mainTemplateStr, {
-            flowTag: flowTag
-        });
-        await fs.writeFile(path.join(flowOutputDir, `${mainFileName}.js`), mainContent, 'utf-8');
-        generatedCount++;
+    // 2. Generate SQS Handler for Process Step
+    const handlerFileName = `Process${flowTag}_HdrSqs`;
 
-        // 2. Generate SQS Handler for Process Step
-        const handlerFileName = `Process${flowTag}_HdrSqs`;
-        
-        // Ensure to pass functionName that matches what the template exports
-        const handlerContent = ejs.render(templates.sqs, {
-            flowTag: flowTag,
-            flowStepName: '', 
-            mainFileName: mainFileName,
-            functionName: processFunctionName(flowTag),
-            queueName: `Process${upperFirst(flowTag)}HdrSqs`
-        });
-        await fs.writeFile(path.join(flowOutputDir, `${handlerFileName}.js`), handlerContent, 'utf-8');
-        generatedCount++;
-    }
+    // Ensure to pass functionName that matches what the template exports
+    const handlerContent = ejs.render(templates.sqs, {
+      flowTag: flowTag,
+      flowStepName: '',
+      mainFileName: mainFileName,
+      functionName: processFunctionName(flowTag),
+      queueName: `Process${upperFirst(flowTag)}HdrSqs`
+    });
+    await fs.writeFile(
+      path.join(flowOutputDir, `${handlerFileName}.js`),
+      handlerContent,
+      'utf-8'
+    );
+    generatedCount++;
+  }
 
-    console.log(`  [RbacFlowGenerator] Generated ${generatedCount} files for RBAC Flows.`);
+  console.log(
+    `  [RbacFlowGenerator] Generated ${generatedCount} files for RBAC Flows.`
+  );
 }

package/src/codeGenerators/app/src/generatedCode/Flow/FlowRelationshipEndpoints/RelationshipFlowGenerator.js

@@ -2,10 +2,16 @@ import path from 'path';
 import fs from 'fs/promises';
 import { fileURLToPath } from 'url';
 import ejs from 'ejs';
-import { isRelationshipFlow } from '../_internal/shared/flowClassifier.js';
-import { hasFlowStep } from '../_internal/shared/flowStepNormalizer.js';
-import { getFlowsForGeneration } from '../_internal/shared/flowSelection.js';
-import { processFunctionName, processMainFileName, upperFirst } from '../_internal/shared/flowNaming.js';
+import { processFunctionName, processMainFileName, upperFirst } from '../_shared/shared/flowNaming.js';
+
+const RELATIONSHIP_ACTIONS = [
+  'CreateRelationship',
+  'UpdateRelationship',
+  'DeleteRelationship',
+  'GetRelationship',
+  'ChangeRelationship',
+  'MoveRelationship'
+];
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -18,22 +24,19 @@ export async function generateRelationshipFlows(allSchemas, options) {
 
     // Read standard handler templates for reuse
     const templates = {
-        sqs: await fs.readFile(path.join(templateDir, 'FlowHandler_HdrSqs.ejs'), 'utf-8'),
-        api: await fs.readFile(path.join(templateDir, 'FlowHandler_HdrApi.ejs'), 'utf-8'),
-        inv: await fs.readFile(path.join(templateDir, 'FlowHandler_HdrInv.ejs'), 'utf-8')
+        sqs: await fs.readFile(path.join(templateDir, '..', '..', '_shared', 'handlers', 'FlowHandler_HdrSqs.ejs'), 'utf-8'),
+        api: await fs.readFile(path.join(templateDir, '..', '..', '_shared', 'handlers', 'FlowHandler_HdrApi.ejs'), 'utf-8'),
+        inv: await fs.readFile(path.join(templateDir, '..', '..', '_shared', 'handlers', 'FlowHandler_HdrInv.ejs'), 'utf-8')
     };
 
     let generatedCount = 0;
 
-    const flows = getFlowsForGeneration(allSchemas);
+    if (!allSchemas.relationships || allSchemas.relationships.length === 0) return;
 
-    for (const flow of flows) {
-        const flowTag = flow.flowTag;
+    for (const flowTag of RELATIONSHIP_ACTIONS) {
         const upperFlowTag = upperFirst(flowTag);
         const processFunction = processFunctionName(flowTag);
 
-        if (!isRelationshipFlow(flowTag)) continue;
-
         const flowOutputDir = path.join(baseOutputDir, 'FlowRelationshipEndpoints', upperFlowTag, 'source');
         await fs.mkdir(flowOutputDir, { recursive: true });
 
@@ -53,8 +56,9 @@ export async function generateRelationshipFlows(allSchemas, options) {
             console.warn(`  [RelationshipFlowGenerator] Warning: Action template not found for ${flowTag}. Skipping.`);
         }
 
-        // 2. Generate Action Step Handlers (based on flow.event)
-        for (const event of flow.event || []) {
+        // 2. Generate Action Step Handlers (based on fixed event ['ownTopic'])
+        const events = ['ownTopic'];
+        for (const event of events) {
             let handlerFileName, handlerContent, handlerFunctionName;
             if (event === 'ownTopic' || event === 'extTopic') {
                 handlerFunctionName = `${processFunction}_HdrSqs`;
@@ -90,8 +94,8 @@ export async function generateRelationshipFlows(allSchemas, options) {
             }
         }
 
-        // 3. Generate Complete Step (if any)
-        if (hasFlowStep(flow.flowSteps, 'Complete')) {
+        // 3. Generate Complete Step (Always generated for Relationship flows)
+        if (true) {
             const completeFunction = `${processFunction}Complete`;
             const completeFileName = `${completeFunction}_Main`;
             const completeTemplatePath = path.join(templateDir, 'relationship', `${completeFileName}.ejs`);

package/src/codeGenerators/app/src/generatedCode/Flow/FlowSchemas/StatusFieldGenerator.js

@@ -38,7 +38,7 @@ export async function generateStatusField(flowSchema, appPath, outputBaseDir) {
     const templatesDir = path.join(__dirname, 'templates', 'statusField');
     const mainTpl = await fs.readFile(path.join(templatesDir, 'CompleteStatusField_Main.ejs'), 'utf-8');
     const handlerTpl = await fs.readFile(path.join(templatesDir, 'CompleteStatusField_HdrSqs.ejs'), 'utf-8');
-    const yamlTpl = await fs.readFile(path.join(__dirname, '..', '_internal', '_shared', 'yaml', 'SharedFunctionSqs_Yaml.ejs'), 'utf-8');
+    const yamlTpl = await fs.readFile(path.join(__dirname, '..', '_shared', 'yaml', 'SharedFunctionSqs_Yaml.ejs'), 'utf-8');
     const snsTpl = await fs.readFile(path.join(templatesDir, 'CompleteStatusFieldSns_Yaml.ejs'), 'utf-8');
 
     // Shared variables

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

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