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

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

@@ -2,171 +2,171 @@ 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 generateFlowResourceYaml(allSchemas, options) {
-    console.log('  [FlowResourceYamlGenerator] Generating SQS/SNS YAML resources for flows...');
-    
-    const resourceYamlDir = path.join(options.outputPath, 'resource', 'sls_yaml', 'generatedCode', 'source');
-    await fs.mkdir(resourceYamlDir, { recursive: true });
-
-    const resourceYamlTplPath = path.join(__dirname, 'templates', 'crud', 'ResourceYaml.ejs');
-    const resourceBeforeLogicalYamlTplPath = path.join(__dirname, 'templates', 'crud', 'ResourceBeforeLogicalYaml.ejs');
-    
-    const resourceYamlTpl = await fs.readFile(resourceYamlTplPath, 'utf-8');
-    const resourceBeforeLogicalYamlTpl = await fs.readFile(resourceBeforeLogicalYamlTplPath, 'utf-8');
-
-    let generatedCount = 0;
-    const yamlOutputPath = path.join(resourceYamlDir, 'generated-sns-in-sqs.yml');
-
-    const flows = getFlowsForGeneration(allSchemas);
-    for (const flow of flows) {
-        const flowTag = flow.flowTag;
-        
-        // Generate In-Queue resources for any flow that listens on its own topic
-        if (flow.event && flow.event.includes('ownTopic')) {
-            // Render main ResourceYaml.ejs (e.g., InCreate, CreateHdrSqs)
-            const yamlContent = ejs.render(resourceYamlTpl, {
-                queueName: flowTag
-            });
-            await appendToFile(yamlOutputPath, yamlContent);
-            generatedCount++;
-
-            // Check if there are beforeLogical configs for this flow
-            const generateCodeConfigs = flows
-                .filter(f => f.generatedCodeConfig && f.generatedCodeConfig.generatedCodeTag.toLowerCase() === flowTag.toLowerCase())
-                .map(f => ({
-                    ...f.generatedCodeConfig,
-                    flowTag: f.flowTag
-                }));
-
-            const beforeLogicalConfigs = generateCodeConfigs.filter(c => c.codeHookTag === 'beforeLogical');
-
-            if (beforeLogicalConfigs.length > 0) {
-                // Collect unique flowTags (like ValidateUnitTrackedProperty) from the beforeLogical configs
-                const uniqueFlowTags = [...new Set(beforeLogicalConfigs.map(c => c.flowTag))];
-                
-                const beforeLogicalYamlContent = ejs.render(resourceBeforeLogicalYamlTpl, {
-                    queueName: `${flowTag}BeforeLogical`,
-                    flowTags: uniqueFlowTags
-                });
-
-                await appendToFile(yamlOutputPath, beforeLogicalYamlContent);
-                generatedCount++;
-            }
-        } else if (flow.event && flow.event.includes('extTopic')) {
-            // Custom flows using extTopic do not have ownTopic, but need an entry queue
-            const resourceSqsYamlTplPath = path.join(__dirname, 'templates', 'crud', 'ResourceSqsYaml.ejs');
-            const resourceSqsYamlTpl = await fs.readFile(resourceSqsYamlTplPath, 'utf-8');
-            const yamlContent = ejs.render(resourceSqsYamlTpl, {
-                queueName: `Process${flowTag}Sqs`
-            });
-            await appendToFile(yamlOutputPath, yamlContent);
-            generatedCount++;
-        }
-        
-        // Generate Complete queues for custom FlowSchema
-        // Also generate queues for any flowStep that uses sqs, dsq, or extTopic
-        if (flow.flowSteps && Array.isArray(flow.flowSteps)) {
-            for (const stepConfig of flow.flowSteps) {
-                const stepName = stepConfig.stepName;
-                if (stepName === 'InTag') continue;
-                
-                const events = stepConfig.event || ['sqs'];
-                for (const ev of events) {
-                    let queueName = flowTag + stepName;
-                    if (stepName === 'Complete') {
-                        queueName = flowTag + 'Complete';
-                    }
-
-                    if (ev === 'sqs' || ev === 'ownTopic') {
-                        // sqs and ownTopic create SNS Topic + Subscription + SQS Queue
-                        const yamlContent = ejs.render(resourceYamlTpl, {
-                            queueName: queueName
-                        });
-                        await appendToFile(yamlOutputPath, yamlContent);
-                        generatedCount++;
-                    } else if (ev === 'dsq' || ev === 'extTopic') {
-                        // extTopic and dsq create ONLY SQS Queue
-                        const resourceSqsYamlTplPath = path.join(__dirname, 'templates', 'crud', 'ResourceSqsYaml.ejs');
-                        const resourceSqsYamlTpl = await fs.readFile(resourceSqsYamlTplPath, 'utf-8');
-                        const yamlContent = ejs.render(resourceSqsYamlTpl, {
-                            queueName: queueName
-                        });
-                        await appendToFile(yamlOutputPath, yamlContent);
-                        generatedCount++;
-                    }
-                }
-            }
-        }
+  console.log('  [FlowResourceYamlGenerator] Generating SQS/SNS YAML resources for flows...');
 
-        // Generate SQS queues for S3 Event flows
-        if (flow.event && flow.event.includes('s3')) {
-            const queueNames = [
-                `${flowTag}CreatePreSignUrlSqs`,
-                `${flowTag}ReservedLimitSqs`
-            ];
-            
-            for (const qName of queueNames) {
-                const resourceSqsYamlTplPath = path.join(__dirname, 'templates', 'crud', 'ResourceSqsYaml.ejs');
-                const resourceSqsYamlTpl = await fs.readFile(resourceSqsYamlTplPath, 'utf-8');
-                const yamlContent = ejs.render(resourceSqsYamlTpl, {
-                    queueName: qName
-                });
-                await appendToFile(yamlOutputPath, yamlContent);
-                generatedCount++;
-            }
-        }
+  const resourceYamlDir = path.join(options.outputPath, 'resource', 'sls_yaml', 'generatedCode', 'source');
+  await fs.mkdir(resourceYamlDir, { recursive: true });
+
+  const resourceYamlTplPath = path.join(__dirname, 'templates', 'crud', 'ResourceYaml.ejs');
+  const resourceBeforeLogicalYamlTplPath = path.join(__dirname, 'templates', 'crud', 'ResourceBeforeLogicalYaml.ejs');
+  const resourceSqsYamlTplPath = path.join(__dirname, 'templates', 'crud', 'ResourceSqsYaml.ejs');
+
+  const resourceYamlTpl = await fs.readFile(resourceYamlTplPath, 'utf-8');
+  const resourceBeforeLogicalYamlTpl = await fs.readFile(resourceBeforeLogicalYamlTplPath, 'utf-8');
+  const resourceSqsYamlTpl = await fs.readFile(resourceSqsYamlTplPath, 'utf-8');
+
+  let generatedCount = 0;
+  const yamlOutputPath = path.join(resourceYamlDir, 'generated-sns-in-sqs.yml');
+  await fs.writeFile(yamlOutputPath, '', 'utf-8');
+
+  const generatedResources = new Set();
+
+  async function appendUnique(resourceKey, template, templateData) {
+    if (generatedResources.has(resourceKey)) return;
 
-        // Generate Dsq queues for Relationship
-        if (flow.isDynamicRelationshipType) {
-            // Usually Relationship has dead-letter queue processing
-            const resourceSqsYamlTplPath = path.join(__dirname, 'templates', 'crud', 'ResourceSqsYaml.ejs');
-            const resourceSqsYamlTpl = await fs.readFile(resourceSqsYamlTplPath, 'utf-8');
-            const queueName = flowTag + 'Dsq';
-            const yamlContent = ejs.render(resourceSqsYamlTpl, {
-                queueName: queueName
+    generatedResources.add(resourceKey);
+    const yamlContent = ejs.render(template, templateData);
+    await appendToFile(yamlOutputPath, yamlContent);
+    generatedCount++;
+  }
+
+  const flows = getFlowsForGeneration(allSchemas);
+
+  for (const flow of flows) {
+    const flowTag = flow.flowTag;
+
+    if (flow.event && flow.event.includes('ownTopic')) {
+      await appendUnique(flowTag, resourceYamlTpl, { queueName: flowTag });
+
+      const generateCodeConfigs = flows
+        .filter((candidate) => candidate.generatedCodeConfig
+          && candidate.generatedCodeConfig.generatedCodeTag?.toLowerCase() === flowTag.toLowerCase())
+        .map((candidate) => ({
+          ...candidate.generatedCodeConfig,
+          flowTag: candidate.flowTag
+        }));
+
+      const beforeLogicalConfigs = generateCodeConfigs.filter((config) => config.codeHookTag === 'beforeLogical');
+      if (beforeLogicalConfigs.length > 0) {
+        const uniqueFlowTags = [...new Set(beforeLogicalConfigs.map((config) => config.flowTag))];
+        await appendUnique(`${flowTag}BeforeLogical`, resourceBeforeLogicalYamlTpl, {
+          queueName: `${flowTag}BeforeLogical`,
+          flowTags: uniqueFlowTags
+        });
+      }
+    } else if (flow.event && flow.event.includes('extTopic')) {
+      await appendUnique(`Process${flowTag}HdrSqs`, resourceSqsYamlTpl, {
+        queueName: `Process${flowTag}HdrSqs`
+      });
+    }
+
+    if (Array.isArray(flow.flowSteps)) {
+      for (const stepConfig of flow.flowSteps) {
+        const stepName = stepConfig.stepName;
+        if (stepName === 'InTag') continue;
+
+        const events = stepConfig.event || ['sqs'];
+        for (const ev of events) {
+          let queueName = `${flowTag}${stepName}`;
+          if (stepName === 'Complete') {
+            queueName = `${flowTag}Complete`;
+          }
+
+          if (ev === 'sqs' || ev === 'ownTopic') {
+            await appendUnique(queueName, resourceYamlTpl, { queueName });
+          } else if (ev === 'dsq' || ev === 'extTopic') {
+            await appendUnique(`${queueName}HdrDsq`, resourceSqsYamlTpl, {
+              queueName: `${queueName}HdrDsq`
             });
-            await appendToFile(yamlOutputPath, yamlContent);
-            generatedCount++;
+          }
         }
+      }
     }
 
-    // Add System Queues
-    const systemQueues = [
-        'ProcessLogical',
-        'PaginateProcessLogical',
-        'FindData',
-        'Register',
-        'WebSocket',
-        'CreateObjectComplete',
-        'UpdateNodeComplete',
-        'DeleteNodeComplete',
-        'GetNodeComplete'
-    ];
-
-    const resourceSqsYamlTplPath = path.join(__dirname, 'templates', 'crud', 'ResourceSqsYaml.ejs');
-    const resourceSqsYamlTpl = await fs.readFile(resourceSqsYamlTplPath, 'utf-8');
-
-    for (const sysQueue of systemQueues) {
-        const yamlContent = ejs.render(resourceSqsYamlTpl, {
-            queueName: sysQueue
-        });
-        await appendToFile(yamlOutputPath, yamlContent);
-        generatedCount++;
+    if (flow.event && flow.event.includes('s3')) {
+      const queueNames = [
+        `${flowTag}CreatePreSignUrlHdrSqs`,
+        `${flowTag}ReservedLimitHdrSqs`
+      ];
+
+      for (const queueName of queueNames) {
+        await appendUnique(queueName, resourceSqsYamlTpl, { queueName });
+      }
     }
 
-    console.log(`  [FlowResourceYamlGenerator] Appended ${generatedCount} sections to generated-sns-in-sqs.yml.`);
+    if (flow.isDynamicRelationshipType) {
+      const queueName = `${flowTag}HdrDsq`;
+      await appendUnique(queueName, resourceSqsYamlTpl, { queueName });
+    }
+  }
+
+  const systemOwnTopicFlows = [
+    'Create',
+    'Update',
+    'Delete',
+    'CreateRelationship',
+    'UpdateRelationship',
+    'DeleteRelationship',
+    'ChangeRelationship',
+    'MoveRelationship',
+    'CreateTargetRole',
+    'DeleteTargetRole',
+    'CreateRolePermissions',
+    'DeleteRolePermissions',
+    'CreateUserRole',
+    'DeleteUserFromRole'
+  ];
+
+  for (const flowTag of systemOwnTopicFlows) {
+    await appendUnique(flowTag, resourceYamlTpl, { queueName: flowTag });
+  }
+
+  const relationshipActions = [
+    'CreateRelationship',
+    'UpdateRelationship',
+    'DeleteRelationship',
+    'GetRelationship',
+    'ChangeRelationship',
+    'MoveRelationship'
+  ];
+
+  for (const action of relationshipActions) {
+    const queueName = `${action}HdrDsq`;
+    await appendUnique(queueName, resourceSqsYamlTpl, { queueName });
+  }
+
+  const systemQueues = [
+    'ProcessLogical',
+    'PaginateProcessLogical',
+    'FindData',
+    'Register',
+    'WebSocket',
+    'CreateObjectComplete',
+    'UpdateNodeComplete',
+    'DeleteNodeComplete',
+    'GetNodeComplete'
+  ];
+
+  for (const sysQueue of systemQueues) {
+    const queueName = `${sysQueue}HdrSqs`;
+    await appendUnique(queueName, resourceSqsYamlTpl, { queueName });
+  }
+
+  console.log(`  [FlowResourceYamlGenerator] Appended ${generatedCount} sections to generated-sns-in-sqs.yml.`);
 }

package/src/codeGenerators/resource/sls_yaml/templates/crud/ResourceYaml.ejs

@@ -10,30 +10,30 @@
     Type: AWS::SNS::Subscription
     Properties:
       TopicArn: !Ref In<%- queueName %>
-      Endpoint: "arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- queueName %>Sqs"
+      Endpoint: "arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- queueName %>HdrSqs"
       Protocol: "sqs"
 
   ##===== [Queue]
-  <%- queueName %>Sqs:
+  <%- queueName %>HdrSqs:
     Type: "AWS::SQS::Queue"
     Properties:
-      QueueName: ${self:custom.iz_resourcePrefix}<%- queueName %>Sqs
+      QueueName: ${self:custom.iz_resourcePrefix}<%- queueName %>HdrSqs
       RedrivePolicy:
         deadLetterTargetArn:
           Fn::GetAtt:
-            - <%- queueName %>SqsDLQ
+            - <%- queueName %>HdrSqsDLQ
             - Arn
         maxReceiveCount: 3
       VisibilityTimeout: 120
 
   ##===== [Queue DLQ]
-  <%- queueName %>SqsDLQ:
+  <%- queueName %>HdrSqsDLQ:
     Type: AWS::SQS::Queue
     Properties:
-      QueueName: ${self:custom.iz_resourcePrefix}<%- queueName %>SqsDLQ
+      QueueName: ${self:custom.iz_resourcePrefix}<%- queueName %>HdrSqsDLQ
 
   ##===== [Queue Policy]
-  <%- queueName %>SqsPolicy:
+  <%- queueName %>HdrSqsPolicy:
     Type: AWS::SQS::QueuePolicy
     Properties:
       PolicyDocument:
@@ -44,11 +44,11 @@
             Principal: "*"
             Resource:
               Fn::GetAtt:
-                - <%- queueName %>Sqs
+                - <%- queueName %>HdrSqs
                 - Arn
             Action: "SQS:SendMessage"
       Queues:
-        - Ref: <%- queueName %>Sqs
+        - Ref: <%- queueName %>HdrSqs
 
   #<#<%- queueName %>QueueSetting#>
-  #<#/<%- queueName %>QueueSetting#>
+  #<#/<%- queueName %>QueueSetting#>

package/src/core/renderTemplateFile.js

@@ -0,0 +1,22 @@
+import fs from 'fs/promises';
+import path from 'path';
+import ejs from 'ejs';
+
+async function renderTemplateFile(templatePath, templateData = {}, { views } = {}) {
+  const template = await fs.readFile(templatePath, 'utf8');
+  return ejs.render(template, templateData, views ? { views } : undefined);
+}
+
+async function writeRenderedTemplate(templatePath, outputPath, templateData = {}, options = {}) {
+  const content = await renderTemplateFile(templatePath, templateData, options);
+  await fs.mkdir(path.dirname(outputPath), { recursive: true });
+  await fs.writeFile(outputPath, content, 'utf8');
+}
+
+async function appendRenderedTemplate(templatePath, outputPath, templateData = {}, options = {}) {
+  const content = await renderTemplateFile(templatePath, templateData, options);
+  await fs.mkdir(path.dirname(outputPath), { recursive: true });
+  await fs.appendFile(outputPath, `\n${content}`, 'utf8');
+}
+
+export { appendRenderedTemplate, renderTemplateFile, writeRenderedTemplate };