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

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

@@ -1,166 +1,144 @@
 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;
+  return 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/DynamoDBGenerator.js

@@ -72,15 +72,15 @@ export async function generateDynamoDBTables(allSchemas, options) {
         }
     }
 
-    let generatedCount = 0;
-    const yamlOutputPath = path.join(resourceYamlDir, 'generated-dynamoDB-table.yml');
+  let generatedCount = 0;
+  const yamlOutputPath = path.join(resourceYamlDir, 'generated-dynamoDB-table.yml');
 
-    // Generate system tables first
-    const systemYamlTplPath = path.join(__dirname, 'templates', 'SystemDynamoDB_Yaml.ejs');
-    const systemYamlTpl = await fs.readFile(systemYamlTplPath, 'utf-8');
-    const systemYamlContent = ejs.render(systemYamlTpl, {});
-    await appendToFile(yamlOutputPath, systemYamlContent);
-    generatedCount += 8; // 8 system tables
+  // Generate system tables first
+  const systemYamlTplPath = path.join(__dirname, 'templates', 'SystemDynamoDB_Yaml.ejs');
+  const systemYamlTpl = await fs.readFile(systemYamlTplPath, 'utf-8');
+  const systemYamlContent = ejs.render(systemYamlTpl, {});
+  await fs.writeFile(yamlOutputPath, `${systemYamlContent}\n`, 'utf-8');
+  generatedCount += 8; // 8 system tables
 
     for (const [tableName, keys] of tables.entries()) {
         const yamlContent = ejs.render(yamlTpl, {

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

@@ -2,63 +2,80 @@ 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);
 
 async function appendToFile(filePath, content) {
-    try {
-        await fs.mkdir(path.dirname(filePath), { recursive: true });
-        await fs.appendFile(filePath, content + '\n', 'utf-8');
-    } catch (error) {
-        console.error(`[Error] Failed to append to file: ${filePath}`, error);
-    }
+  try {
+    await fs.mkdir(path.dirname(filePath), { recursive: true });
+    await fs.appendFile(filePath, `${content}\n`, 'utf-8');
+  } catch (error) {
+    console.error(`[Error] Failed to append file: ${filePath}`, error);
+  }
 }
 
 export async function generateFlowOut(allSchemas, options) {
-    console.log('  [FlowOutGenerator] Generating Flow Out nodes (SNS Topics)...');
-    
-    const resourceYamlDir = path.join(options.outputPath, 'resource', 'sls_yaml', 'generatedCode', 'source');
-    await fs.mkdir(resourceYamlDir, { recursive: true });
+  console.log('  [FlowOutGenerator] Generating Flow Out nodes (SNS Topics)...');
+
+  const resourceYamlDir = path.join(options.outputPath, 'resource', 'sls_yaml', 'generatedCode', 'source');
+  await fs.mkdir(resourceYamlDir, { recursive: true });
+
+  const yamlTplPath = path.join(__dirname, 'templates', 'FlowOut_Yaml.ejs');
+  const yamlTpl = await fs.readFile(yamlTplPath, 'utf-8');
 
-    const yamlTplPath = path.join(__dirname, 'templates', 'FlowOut_Yaml.ejs');
-    const yamlTpl = await fs.readFile(yamlTplPath, 'utf-8');
+  let generatedCount = 0;
+  const yamlOutputPath = path.join(resourceYamlDir, 'generated-sns-out.yml');
+  await fs.writeFile(yamlOutputPath, '', 'utf-8');
 
-    let generatedCount = 0;
-    const yamlOutputPath = path.join(resourceYamlDir, 'generated-sns-out.yml');
+  const generatedTopics = new Set();
 
-    const flows = getFlowsForGeneration(allSchemas);
-    for (const flow of flows) {
-        if (flow.outputTopic === true) {
-            const upperCase = (str) => str.charAt(0).toUpperCase() + str.slice(1);
-            const topicName = upperCase(flow.flowTag);
+  async function appendTopic(topicName) {
+    if (generatedTopics.has(topicName)) return;
 
-            const yamlContent = ejs.render(yamlTpl, {
-                topicName: topicName
-            });
+    generatedTopics.add(topicName);
+    const yamlContent = ejs.render(yamlTpl, { topicName });
+    await appendToFile(yamlOutputPath, yamlContent);
+    generatedCount++;
+  }
 
-            await appendToFile(yamlOutputPath, yamlContent);
-            generatedCount++;
-        }
-    }
+  const flows = getFlowsForGeneration(allSchemas);
+  for (const flow of flows) {
+    if (flow.outputTopic !== true) continue;
+    await appendTopic(flow.flowTag.charAt(0).toUpperCase() + flow.flowTag.slice(1));
+  }
 
-    const systemTopics = [
-        'CreateObjectComplete',
-        'DeleteNodeComplete',
-        'UpdateNodeComplete',
-        'GetNodeComplete',
-        'ProcessLogicalComplete',
-        'FindDataComplete'
-    ];
+  const systemTopics = [
+    'CreateObjectComplete',
+    'DeleteNodeComplete',
+    'UpdateNodeComplete',
+    'ProcessLogicalComplete',
+    'FindDataComplete',
+    'Create',
+    'Update',
+    'Delete',
+    'CreateRelationship',
+    'UpdateRelationship',
+    'DeleteRelationship',
+    'GetRelationship',
+    'ChangeRelationship',
+    'MoveRelationship',
+    'CreateTargetRole',
+    'ListTargetRole',
+    'DeleteTargetRole',
+    'CreateRolePermissions',
+    'ListRolePermissions',
+    'DeleteRolePermissions',
+    'CreateUserRole',
+    'ListUserInRoles',
+    'DeleteUserFromRole'
+  ];
 
-    for (const topic of systemTopics) {
-        const yamlContent = ejs.render(yamlTpl, {
-            topicName: topic
-        });
-        await appendToFile(yamlOutputPath, yamlContent);
-        generatedCount++;
-    }
+  for (const topic of systemTopics) {
+    await appendTopic(topic);
+  }
 
-    console.log(`  [FlowOutGenerator] Generated ${generatedCount} SNS Topics for Flow Out nodes.`);
+  console.log(`  [FlowOutGenerator] Generated ${generatedCount} SNS Topics for Flow Out nodes.`);
 }