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

package/src/codeGenerators/app/src/generatedCode/libs/templates/Consts.ejs

@@ -166,12 +166,12 @@ const FUNCTION_NAME = {
   outTranslateIds: 'processTranslateIdsComplete',
   findData: 'findData',
   processLogical: 'processLogical',
-  updateNodeComplete: 'updateNodeComplete',
-  createObjectComplete: 'createObjectComplete',
-  getNodeComplete: 'getNodeComplete',
+  updateNodeComplete: 'updateComplete',
+  createObjectComplete: 'createComplete',
+  getNodeComplete: 'getComplete',
   paginateProcessLogical: 'paginateProcessLogical',
   deleteNode: 'deleteNode',
-  deleteNodeComplete: 'deleteNodeComplete',
+  deleteNodeComplete: 'deleteComplete',
   createObjectS3: 'createObjectS3',
   createObjectS3Complete: 'webSocketTaskComplete',
   processAfterUploadS3: 'processAfterUploadS3',
@@ -203,12 +203,12 @@ const SHORT_FUNCTION_NAME = functionName => {
     [FUNCTION_NAME.deleteRelComplete]: 'deleteRelComp',
     [FUNCTION_NAME.findData]: 'findData',
     [FUNCTION_NAME.processLogical]: 'processLogical',
-    [FUNCTION_NAME.updateNodeComplete]: 'updateNodeComp',
-    [FUNCTION_NAME.createObjectComplete]: 'createObjectComp',
-    [FUNCTION_NAME.getNodeComplete]: 'getNodeComp',
+    [FUNCTION_NAME.updateNodeComplete]: 'updateComp',
+    [FUNCTION_NAME.createObjectComplete]: 'createComp',
+    [FUNCTION_NAME.getNodeComplete]: 'getComp',
     [FUNCTION_NAME.paginateProcessLogical]: 'paginateProLogical',
     [FUNCTION_NAME.deleteNode]: 'deleteNode',
-    [FUNCTION_NAME.deleteNodeComplete]: 'deleteNodeComp',
+    [FUNCTION_NAME.deleteNodeComplete]: 'deleteComp',
     [FUNCTION_NAME.createObjectS3Complete]: 'webSocketTaskComp',
     [FUNCTION_NAME.getRel]: 'getRel',
     [FUNCTION_NAME.getRelComplete]: 'getRelComp',
@@ -238,7 +238,7 @@ const SOURCE_GENERATE_IAM_ROLE = {
   ProcessFindDataRole: 'ProcFindData',
   ObjectCompleteRole: 'ObjectCom',
   NodeCompleteRole: 'NodeCom',
-  RelationshipRole: 'Relationship',
+  FlowRelationshipRole: 'Relationship',
   RelationshipCompleteRole: 'RelationshipCom',
   FlowSchemaUploadS3Role: 'FlowSchemaUploadS3',
   FlowSchemaOwnTopic: 'FlowSchemaOwnTopic',
@@ -320,27 +320,27 @@ const TOPIC_NAME_GENERATE_CODE = {
   createRelComplete: 'CreateRelationshipComplete',
   deleteRelComplete: 'DeleteRelationshipComplete',
   getRelComplete: 'GetRelationshipComplete',
-  outUpdateRelComplete: 'UpdateRelationshipComplete_Out',
-  outCreateRelComplete: 'CreateRelationshipComplete_Out',
-  outDeleteRelComplete: 'DeleteRelationshipComplete_Out',
-  outGetRelComplete: 'GetRelationshipComplete_Out',
-  updateNodeComplete: 'UpdateNodeComplete',
-  outUpdateNodeComplete: 'UpdateNodeComplete_Out',
-  createNodeComplete: 'CreateObjectComplete',
-  outCreateNodeComplete: 'CreateObjectComplete_Out',
-  deleteNodeComplete: 'DeleteNodeComplete',
-  outDeleteNodeComplete: 'DeleteNodeComplete_Out',
-  getNodeComplete: 'GetNodeComplete',
-  outGetNodeComplete: 'GetNodeComplete_Out',
+  outUpdateRelComplete: 'UpdateRelationship_Out',
+  outCreateRelComplete: 'CreateRelationship_Out',
+  outDeleteRelComplete: 'DeleteRelationship_Out',
+  outGetRelComplete: 'GetRelationship_Out',
+  updateNodeComplete: 'UpdateComplete',
+  outUpdateNodeComplete: 'Update_Out',
+  createNodeComplete: 'CreateComplete',
+  outCreateNodeComplete: 'Create_Out',
+  deleteNodeComplete: 'DeleteComplete',
+  outDeleteNodeComplete: 'Delete_Out',
+  getNodeComplete: 'GetComplete',
+  outGetNodeComplete: 'Get_Out',
   reservedLimitComplete: 'ReservedLimitComplete',
   createPreSignUrl: 'CreatePreSignUrl',
   flowSchemaOwnTopicComplete: 'FlowSchemaOwnTopicComplete',
   flowSchemaOwnTopicEndpointComplete: 'FlowSchemaOwnTopicEndpointComplete',
   createRecordComplete: 'CreateRecordComplete',
   changeRelationshipComplete: 'ChangeRelationshipComplete',
-  outChangeRelationshipComplete: 'ChangeRelationshipComplete_Out',
+  outChangeRelationshipComplete: 'ChangeRelationship_Out',
   moveRelationshipComplete: 'MoveRelationshipComplete',
-  outMoveRelationshipComplete: 'MoveRelationshipComplete_Out'
+  outMoveRelationshipComplete: 'MoveRelationship_Out'
 };
 
 const GRAPH_HANDLER_SERVICE_NAME = {

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

@@ -80,7 +80,7 @@ export async function generateDynamoDBTables(allSchemas, options) {
   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
+  generatedCount += 12; // 12 system tables
 
     for (const [tableName, keys] of tables.entries()) {
         const yamlContent = ejs.render(yamlTpl, {

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

@@ -28,7 +28,7 @@ export async function generateFlowOut(allSchemas, options) {
 
   let generatedCount = 0;
   const yamlOutputPath = path.join(resourceYamlDir, 'generated-sns-out.yml');
-  await fs.writeFile(yamlOutputPath, '', 'utf-8');
+  await fs.writeFile(yamlOutputPath, 'Resources:\n', 'utf-8'); // ponytail: simplest one-line fix
 
   const generatedTopics = new Set();
 
@@ -48,11 +48,8 @@ export async function generateFlowOut(allSchemas, options) {
   }
 
   const systemTopics = [
-    'CreateObjectComplete',
-    'DeleteNodeComplete',
-    'UpdateNodeComplete',
-    'ProcessLogicalComplete',
-    'FindDataComplete',
+    'ProcessLogical',
+    'FindData',
     'Create',
     'Update',
     'Delete',

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

@@ -33,7 +33,7 @@ export async function generateFlowResourceYaml(allSchemas, options) {
 
   let generatedCount = 0;
   const yamlOutputPath = path.join(resourceYamlDir, 'generated-sns-in-sqs.yml');
-  await fs.writeFile(yamlOutputPath, '', 'utf-8');
+  await fs.writeFile(yamlOutputPath, 'Resources:\n', 'utf-8'); // ponytail: build minimum that works, one-line initialization fix
 
   const generatedResources = new Set();
 
@@ -88,12 +88,21 @@ export async function generateFlowResourceYaml(allSchemas, options) {
             queueName = `${flowTag}Complete`;
           }
 
-          if (ev === 'sqs' || ev === 'ownTopic') {
+          if (ev === 'ownTopic') {
             await appendUnique(queueName, resourceYamlTpl, { queueName });
-          } else if (ev === 'dsq' || ev === 'extTopic') {
+          } else if (ev === 'sqs') {
+            // ponytail: purely SQS events don't need SNS topics, use resourceSqsYamlTpl
+            await appendUnique(`${queueName}HdrSqs`, resourceSqsYamlTpl, {
+              queueName: `${queueName}HdrSqs`
+            });
+          } else if (ev === 'dsq') {
             await appendUnique(`${queueName}HdrDsq`, resourceSqsYamlTpl, {
               queueName: `${queueName}HdrDsq`
             });
+          } else if (ev === 'extTopic') {
+            await appendUnique(`${queueName}HdrSqs`, resourceSqsYamlTpl, {
+              queueName: `${queueName}HdrSqs`
+            });
           }
         }
       }
@@ -117,12 +126,15 @@ export async function generateFlowResourceYaml(allSchemas, options) {
   }
 
   const systemOwnTopicFlows = [
+    'ProcessLogical',
+    'FindData',
     'Create',
     'Update',
     'Delete',
     'CreateRelationship',
     'UpdateRelationship',
     'DeleteRelationship',
+    'GetRelationship',
     'ChangeRelationship',
     'MoveRelationship',
     'CreateTargetRole',
@@ -151,16 +163,23 @@ 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 = [
-    'ProcessLogical',
-    'PaginateProcessLogical',
-    'FindData',
     'Register',
     'WebSocket',
-    'CreateObjectComplete',
-    'UpdateNodeComplete',
-    'DeleteNodeComplete',
-    'GetNodeComplete'
+    'PaginateProcessLogical',
+    'CreateComplete',
+    'UpdateComplete',
+    'DeleteComplete',
+    'GetComplete',
+    'CreateRelationshipComplete',
+    'UpdateRelationshipComplete',
+    'DeleteRelationshipComplete',
+    'GetRelationshipComplete',
+    'ChangeRelationshipComplete',
+    'MoveRelationshipComplete'
   ];
 
   for (const sysQueue of systemQueues) {

package/src/codeGenerators/resource/sls_yaml/templates/SystemDynamoDB_Yaml.ejs

@@ -136,3 +136,67 @@ Resources:
         KeyType: HASH
       - AttributeName: pendingStepId
         KeyType: RANGE
+
+  TargetRolesTable:
+    Type: "AWS::DynamoDB::Table"
+    Properties:
+      TableName: ${self:custom.iz_resourcePrefix}TargetRoles
+      BillingMode: PAY_PER_REQUEST
+      AttributeDefinitions:
+      - AttributeName: targetId
+        AttributeType: S
+      - AttributeName: roleIdKey
+        AttributeType: S
+      KeySchema:
+      - AttributeName: targetId
+        KeyType: HASH
+      - AttributeName: roleIdKey
+        KeyType: RANGE
+
+  RolePermissionsTable:
+    Type: "AWS::DynamoDB::Table"
+    Properties:
+      TableName: ${self:custom.iz_resourcePrefix}RolePermissions
+      BillingMode: PAY_PER_REQUEST
+      AttributeDefinitions:
+      - AttributeName: roleIdKey
+        AttributeType: S
+      - AttributeName: flowTypeConcat
+        AttributeType: S
+      KeySchema:
+      - AttributeName: roleIdKey
+        KeyType: HASH
+      - AttributeName: flowTypeConcat
+        KeyType: RANGE
+
+  RoleUsersTable:
+    Type: "AWS::DynamoDB::Table"
+    Properties:
+      TableName: ${self:custom.iz_resourcePrefix}RoleUsers
+      BillingMode: PAY_PER_REQUEST
+      AttributeDefinitions:
+      - AttributeName: roleIdKey
+        AttributeType: S
+      - AttributeName: userId
+        AttributeType: S
+      KeySchema:
+      - AttributeName: roleIdKey
+        KeyType: HASH
+      - AttributeName: userId
+        KeyType: RANGE
+
+  UserRolesTable:
+    Type: "AWS::DynamoDB::Table"
+    Properties:
+      TableName: ${self:custom.iz_resourcePrefix}UserRoles
+      BillingMode: PAY_PER_REQUEST
+      AttributeDefinitions:
+      - AttributeName: userId
+        AttributeType: S
+      - AttributeName: roleIdKey
+        AttributeType: S
+      KeySchema:
+      - AttributeName: userId
+        KeyType: HASH
+      - AttributeName: roleIdKey
+        KeyType: RANGE

package/src/generate.js

@@ -52,7 +52,7 @@ async function generate(rootPath, options = {}) {
 
   // Auto-generate dynamic schemas before validation (unless skipped)
   if (!skipGenerateSchema) {
-    await generateSchema(rootPath, { outputPath });
+    await generateSchema(rootPath, { outputPath, configPath });
   }
 
   // Validate schemas before generating (unless skipped)

package/src/generateCode.js

@@ -9,11 +9,11 @@ import { generateFlowEntryPoint } from './codeGenerators/app/src/generatedCode/F
 import { generateFlowMainFunction } from './codeGenerators/app/src/generatedCode/Flow/_shared/shared/flowMainFunctionBase.js';
 import { generateFlowSteps } from './codeGenerators/app/src/generatedCode/Flow/_shared/shared/flowStepBase.js';
 
-import { generateEndpointsFlow } from './codeGenerators/app/src/generatedCode/Flow/FlowEndpoints/EndpointsGenerator.js';
+import { generateEndpointsFlow } from './codeGenerators/app/src/generatedCode/Flow/FlowObjects/EndpointsGenerator.js';
 import { generateFlowOut } from './codeGenerators/resource/sls_yaml/FlowOutGenerator.js';
 import { generateFlowResourceYaml } from './codeGenerators/resource/sls_yaml/FlowResourceYamlGenerator.js';
 import { generateRbacFlows } from './codeGenerators/app/src/generatedCode/Flow/FlowRbac/RbacFlowGenerator.js';
-import { generateRelationshipFlows } from './codeGenerators/app/src/generatedCode/Flow/FlowRelationshipEndpoints/RelationshipFlowGenerator.js';
+import { generateRelationshipFlows } from './codeGenerators/app/src/generatedCode/Flow/FlowRelationships/RelationshipFlowGenerator.js';
 import { generateWebSocket } from './codeGenerators/app/src/generatedCode/Flow/FlowSchemas/WebSocketGenerator.js';
 import { validateFlowsForGeneration } from './codeGenerators/app/src/generatedCode/Flow/_shared/shared/flowValidator.js';
 import { generateRegisterFlow } from './codeGenerators/app/src/generatedCode/SystemFlowSchemas/RegisterGenerator.js';
@@ -130,9 +130,11 @@ export async function generateCode(rootPath, options = {}) {
   );
   collectHookBackups(outputPath);
 
-  console.log(
-    '[INFO] [generateCode] STATUS=CLEANUP | Removing old generatedCode and resource 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
@@ -141,10 +143,10 @@ export async function generateCode(rootPath, options = {}) {
     path.join(outputPath, 'app', 'sls_yaml', 'generatedCode'),
     { recursive: true, force: true }
   );
-  await fs.promises.rm(path.join(outputPath, 'resource'), {
-    recursive: true,
-    force: true
-  });
+  await fs.promises.rm(
+    path.join(outputPath, 'resource', 'sls_yaml', 'generatedCode'),
+    { recursive: true, force: true }
+  );
 
   policyRegistry.clear();
 
@@ -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/generateSchema.js

@@ -21,7 +21,7 @@ export async function generateSchema(rootPath, options) {
   );
 
   // Parse service config to get serviceTag
-  const configPath = path.join(rootPath, 'config', 'serverless.config.yml');
+  const configPath = options?.configPath || path.join(rootPath, 'config', 'serverless.config.yml');
   let serviceTag = 'unknownService';
   try {
     const serviceConfigStr = fs.readFileSync(configPath, 'utf8');

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

@@ -41,7 +41,6 @@ export async function generateDynamicFlowSchemas(
     return;
   }
 
-  // Validate event types in custom flow schemas
   const validMainEvents = [
     'ownTopic',
     'extTopic',

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

@@ -61,8 +61,8 @@ export async function generateRbacFlowSchemas(hydratedObjectData, options) {
 
     for (const def of rbacFlowDefinitions) {
       const flowTag = def.flowTag;
-      // Use the old naming convention: {objectType}{flowTag}Flow.js
-      const filePath = path.join(schemasOutputDir, `${objectType}${flowTag}Flow.js`);
+      // Use flowTag as filename directly
+      const filePath = path.join(schemasOutputDir, `${flowTag}.js`);
 
       const eventsArrayStr = JSON.stringify(def.eventNames).replace(/"/g, "'");
 
@@ -76,6 +76,20 @@ export async function generateRbacFlowSchemas(hydratedObjectData, options) {
       await fs.writeFile(filePath, fileContent, 'utf-8');
       generatedCount++;
     }
+
+    // Generate specific UserRbacFlow
+    const userRbacFlowTag = `${objectType.charAt(0).toUpperCase() + objectType.slice(1)}RbacFlow`;
+    const userRbacFilePath = path.join(schemasOutputDir, `${userRbacFlowTag}.js`);
+    const userRbacTemplatePath = path.join(__dirname, 'templates', 'UserRbacFlowSchemaTemplate.ejs');
+    const userRbacTemplateString = await fs.readFile(userRbacTemplatePath, 'utf-8');
+    const userRbacContent = ejs.render(userRbacTemplateString, {
+      flowTag: userRbacFlowTag,
+      serviceTag: options.serviceTag,
+      objectType: objectType
+    });
+    
+    await fs.writeFile(userRbacFilePath, userRbacContent, 'utf-8');
+    generatedCount++;
   }
 
   console.log(

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;
     }

package/src/schemaGenerators/app/src/schemas/FlowSchemas/templates/DynamicFlowSchemaTemplate.ejs

@@ -22,20 +22,20 @@ export default {
       messageAttributes: ['userId', 'correlationId']
     },
     <% if (hasBeforeLogicalStep) { %>
-  {
-    stepName: 'beforeLogical',
-    event: ['sqs'],
-    properties: [],
-    messageAttributes: ['userId', 'correlationId']
-  },
+    {
+      stepName: 'BeforeLogical',
+      event: ['sqs'],
+      properties: [],
+      messageAttributes: ['userId', 'correlationId']
+    },
     <% } %>
     <% if (['Create', 'Update', 'Delete'].includes(action)) { %>
-  {
-    stepName: 'Complete',
-    event: ['sqs'],
-    properties: [],
-    messageAttributes: ['userId', 'correlationId']
-  }
+    {
+      stepName: 'Complete',
+      event: ['sqs'],
+      properties: [],
+      messageAttributes: ['userId', 'correlationId']
+    }
     <% } %>
   ]
 };

package/src/schemaGenerators/app/src/schemas/FlowSchemas/templates/DynamicRbacFlowSchemaTemplate.ejs

@@ -5,6 +5,7 @@
  */
 export default {
   flowTag: '<%= flowTag %>',
+  fileName: 'flow-rbac',
   initiateBy: 'system',
   statusType: 'none',
   event: <%- events %>,

package/src/schemaGenerators/app/src/schemas/FlowSchemas/templates/UserRbacFlowSchemaTemplate.ejs

@@ -0,0 +1,22 @@
+export default {
+  flowTag: '<%= flowTag %>',
+  fileName: 'flow-rbac',
+  objType: {
+    serviceTag: '<%= serviceTag %>',
+    objectType: '<%= objectType %>'
+  },
+  event: ['lambdaSyncInv'],
+  initiateBy: 'system',
+  handleObj: 'one',
+  statusType: 'none',
+  stepMessageAttributes: {
+    userId: { propertyName: 'x-correlation-base-user-id', type: 'string' },
+    correlationId: { propertyName: 'x-correlation-id', type: 'string' }
+  },
+  steps: [
+    {
+      stepName: 'InTag',
+      messageAttributes: ['userId', 'correlationId']
+    }
+  ]
+};