@izara_project/izara-core-generate-service-code 1.0.56 → 1.0.57

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-core-generate-service-code",
-  "version": "1.0.56",
+  "version": "1.0.57",
   "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": {

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

@@ -56,8 +56,13 @@ export async function generateRelationshipFlows(allSchemas, options) {
             console.warn(`  [RelationshipFlowGenerator] Warning: Action template not found for ${flowTag}. Skipping.`);
         }
 
-        // 2. Generate Action Step Handlers (based on fixed event ['ownTopic'])
-        const events = ['ownTopic'];
+        // 2. Generate Action Step Handlers
+        const flowSchema = allSchemas.flows?.find(f => f.flowTag === flowTag);
+        let events = ['ownTopic'];
+        if (flowSchema && flowSchema.event) {
+            events = Array.isArray(flowSchema.event) ? flowSchema.event : [flowSchema.event];
+        }
+
         for (const event of events) {
             let handlerFileName, handlerContent, handlerFunctionName;
             if (event === 'ownTopic' || event === 'extTopic') {
@@ -91,6 +96,17 @@ export async function generateRelationshipFlows(allSchemas, options) {
                 });
                 await fs.writeFile(path.join(flowOutputDir, `${handlerFunctionName}.js`), handlerContent, 'utf-8');
                 generatedCount++;
+            } else if (event === 'dsq') {
+                handlerFunctionName = `${processFunction}_HdrDsq`;
+                handlerContent = ejs.render(templates.sqs, {
+                    flowTag: flowTag,
+                    flowStepName: '', 
+                    mainFileName: actionFileName,
+                    functionName: processFunction,
+                    queueName: `${processFunction}HdrDsq`
+                });
+                await fs.writeFile(path.join(flowOutputDir, `${handlerFunctionName}.js`), handlerContent, 'utf-8');
+                generatedCount++;
             }
         }
 

package/src/codeGenerators/app/src/generatedCode/Flow/FlowRelationships/templates/relationship/ProcessCreateRelationship_Main.ejs

@@ -81,7 +81,7 @@ export default async function createRelationship(
       relType,
       relationshipDirection,
       relationshipProperties,
-      deepPathConditional
+      deepPathConditional,
       settings
       //(<requestParamCreateRel>)
       //(</requestParamCreateRel>)

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

@@ -22,7 +22,7 @@ export async function generateWebSocket(allLocalFlowSchemas, appPath, outputBase
         return;
     }
 
-    console.log('  [WebSocketGenerator] Generated WebSocket files with ProcessWebSocketMain_Main convention.');
+    console.log('  [WebSocketGenerator] Generated WebSocket files with WebSocketComplete_Main convention.');
     const templatesDir = path.join(__dirname, 'templates', 'webSocket');
     const wsDir = path.join(outputBaseDir, 'app', 'src', 'generatedCode', 'SystemFlowSchemas', 'WebSocketMain', 'source');
     await fs.mkdir(wsDir, { recursive: true });
@@ -79,8 +79,8 @@ export async function generateWebSocket(allLocalFlowSchemas, appPath, outputBase
         upperFunctionName: upperCase(wsConnectName)
     });
 
-    // 3. ProcessWebSocketMain
-    const processFunctionName = 'ProcessWebSocketMain';
+    // 3. WebSocketComplete
+    const processFunctionName = 'WebSocketComplete';
     const processHandlerType = 'HdrSqs';
     const queueName = processFunctionName + shortNameHandler(processHandlerType);
     
@@ -114,5 +114,5 @@ export async function generateWebSocket(allLocalFlowSchemas, appPath, outputBase
         }
     }
 
-    console.log(`  [WebSocketGenerator] Generated WebSocket files with ProcessWebSocketMain_Main convention.`);
+    console.log(`  [WebSocketGenerator] Generated WebSocket files with WebSocketComplete_Main convention.`);
 }

package/src/codeGenerators/app/src/generatedCode/Flow/_shared/shared/flowValidator.js

@@ -1,4 +1,4 @@
-const ALLOWED_MAIN_EVENTS = ['ownTopic', 'extTopic', 'lambdaSyncInv', 'lambdaSyncApi', 'eventBridge', 's3'];
+const ALLOWED_MAIN_EVENTS = ['ownTopic', 'extTopic', 'lambdaSyncInv', 'lambdaSyncApi', 'eventBridge', 's3', 'dsq'];
 const MAIN_ASYNC_EVENTS = ['ownTopic', 'extTopic', 's3'];
 const ALLOWED_STEP_EVENTS = ['sqs', 'ownTopic', 'extTopic', 'dsq', 'lambdaSyncInv', 'lambdaSyncApi'];
 const RESERVED_SYSTEM_FLOW_TAGS = new Set([

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

@@ -49,7 +49,6 @@ export async function generateFlowOut(allSchemas, options) {
 
   const systemTopics = [
     'ProcessLogical',
-    'PaginateProcessLogical',
     'FindData',
     'Create',
     'Update',

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

@@ -127,7 +127,6 @@ export async function generateFlowResourceYaml(allSchemas, options) {
 
   const systemOwnTopicFlows = [
     'ProcessLogical',
-    'PaginateProcessLogical',
     'FindData',
     'Create',
     'Update',
@@ -135,6 +134,7 @@ export async function generateFlowResourceYaml(allSchemas, options) {
     'CreateRelationship',
     'UpdateRelationship',
     'DeleteRelationship',
+    'GetRelationship',
     'ChangeRelationship',
     'MoveRelationship',
     'CreateTargetRole',
@@ -163,14 +163,17 @@ export async function generateFlowResourceYaml(allSchemas, options) {
     await appendUnique(queueName, resourceSqsYamlTpl, { queueName });
   }
 
+  // ponytail: add Dsq queue for PaginateProcessLogical
+  await appendUnique('PaginateProcessLogicalHdrDsq', resourceSqsYamlTpl, { queueName: 'PaginateProcessLogicalHdrDsq' });
+
   const systemQueues = [
     'Register',
     'WebSocket',
+    'PaginateProcessLogical',
     'CreateComplete',
     'UpdateComplete',
     'DeleteComplete',
     'GetComplete',
-    'GetRelationship',
     'CreateRelationshipComplete',
     'UpdateRelationshipComplete',
     'DeleteRelationshipComplete',

package/src/generateCode.js

@@ -130,9 +130,11 @@ export async function generateCode(rootPath, options = {}) {
   );
   collectHookBackups(outputPath);
 
-  console.log(
-    '[INFO] [generateCode] STATUS=CLEANUP | Removing old generatedCode directories...'
-  );
+  // ponytail: ensure hooks are restored even if generation fails
+  try {
+    console.log(
+      '[INFO] [generateCode] STATUS=CLEANUP | Removing old generatedCode directories...'
+    );
   await fs.promises.rm(generatedCodePath, {
     recursive: true,
     force: true
@@ -258,8 +260,9 @@ export async function generateCode(rootPath, options = {}) {
     }
   }
 
-  // Restore backed-up hooks
-  if (hookDirs.size > 0 || hookBackups.length > 0) {
+  } finally {
+    // Restore backed-up hooks
+    if (hookDirs.size > 0 || hookBackups.length > 0) {
     console.log(
       `[INFO] [generateCode] STATUS=RESTORE | Restoring ${hookBackups.length} hook files...`
     );

package/src/schemaGenerators/app/src/schemas/FlowSchemas/RelationshipFlowSchemaGenerator.js

@@ -65,8 +65,8 @@ export async function generateRelationshipFlowSchemas(
     let outputTopic = true;
     let hasCompleteStep = true;
 
-    if (action === 'getRelationship') {
-      events = "['lambdaSyncInv', 'lambdaSyncApi']";
+    if (action === 'GetRelationship') {
+      events = "['lambdaSyncInv', 'lambdaSyncApi', 'dsq', 'ownTopic']";
       outputTopic = false;
       hasCompleteStep = false;
     }