@izara_project/izara-core-generate-service-code 1.0.61 → 1.0.63

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

@@ -85,7 +85,6 @@ export function validateFlowsForGeneration(flows) {
     const flowSteps = Array.isArray(flow.flowSteps) ? flow.flowSteps : [];
     const seenStepNames = new Set();
     let anyStepHasPlugInHooks = false;
-    let startStepCount = 0;
 
     for (const step of flowSteps) {
       const stepName = step?.stepName;
@@ -99,13 +98,6 @@ export function validateFlowsForGeneration(flows) {
       }
       seenStepNames.add(stepName);
 
-      if (stepName === 'In') {
-        errors.push(`Flow '${flowTag}' uses legacy stepName 'In'. Use 'start'.`);
-      }
-      if (stepName === 'start') {
-        startStepCount += 1;
-      }
-
       if (step.plugInHooks && step.plugInHooks.length > 0) {
         anyStepHasPlugInHooks = true;
       }
@@ -120,11 +112,7 @@ export function validateFlowsForGeneration(flows) {
       validateNamedRefs(flowTag, stepName, step.messageAttributes, flow.stepMessageAttributes, 'messageAttributes', errors);
     }
 
-    if (startStepCount > 1) {
-      errors.push(`Flow '${flowTag}' has multiple 'start' steps. Only one is allowed.`);
-    }
-
-    // ponytail: relaxed anyStepHasPlugInHooks && startStepCount === 0 requirement 
+    // ponytail: relaxed anyStepHasPlugInHooks requirement 
     // since unified entry points (step 0) can now handle plugins directly without start.
 
     if (anyStepHasPlugInHooks) {

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

@@ -0,0 +1,20 @@
+const TYPE_MAP = {
+    string: 'string', number: 'number', integer: 'number',
+    currency: 'string', currencyValue: 'number', numeric: 'number',
+    float: 'number', special: 'string', object: 'object',
+    boolean: 'boolean', array: 'array', arrayMixed: 'array',
+    arrayObject: 'array', arrayNumeric: 'array', arrayString: 'array',
+    timestamp: 'number'
+};
+
+export function normalizePropertyType(p, lookupSource) {
+    let prop = typeof p === 'string'
+        ? ((lookupSource && lookupSource[p]) ? lookupSource[p] : { propertyName: p, type: 'string' })
+        : p;
+    
+    if (prop && prop.type) {
+        prop = { ...prop, type: TYPE_MAP[prop.type] || prop.type };
+    }
+    
+    return prop;
+}

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

@@ -0,0 +1,49 @@
+import { getFlowsForGeneration } from './flowSelection.js';
+import { isCrudFlow, isRbacFlow, isRelationshipFlow } from './flowClassifier.js';
+
+export const FLOW_OBJECTS_ROLE = 'FlowObjectsRole';
+export const FLOW_RBAC_ROLE = 'FlowRbacRole';
+export const FLOW_RELATIONSHIP_ROLE = 'FlowRelationshipRole';
+export const WEB_SOCKET_MAIN_ROLE = 'WebSocketMainRole';
+export const PROC_FIND_DATA_ROLE = 'ProcFindDataRole';
+
+function upperCase(str) {
+  if (!str) return str;
+  return str.charAt(0).toUpperCase() + str.slice(1);
+}
+
+function isCustomRbacFlow(flowTag) {
+  return String(flowTag || '').toLowerCase().endsWith('rbacflow');
+}
+
+export function detectRoleNames(allSchemas) {
+  const flows = getFlowsForGeneration(allSchemas);
+  const roleNames = new Set([PROC_FIND_DATA_ROLE]);
+
+  for (const flow of flows) {
+    if (!flow.flowTag) continue;
+
+    if (isCrudFlow(flow.flowTag)) {
+      roleNames.add(FLOW_OBJECTS_ROLE);
+      continue;
+    }
+
+    if (isRbacFlow(flow.flowTag) || isCustomRbacFlow(flow.flowTag)) {
+      roleNames.add(FLOW_RBAC_ROLE);
+      continue;
+    }
+
+    if (isRelationshipFlow(flow.flowTag)) {
+      roleNames.add(FLOW_RELATIONSHIP_ROLE);
+      continue;
+    }
+
+    if ((flow.event || []).includes('ownTopic')) {
+      roleNames.add(WEB_SOCKET_MAIN_ROLE);
+    }
+
+    roleNames.add(`${upperCase(flow.flowTag)}Role`);
+  }
+
+  return { flows, roleNames };
+}

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

@@ -6,15 +6,6 @@ import ejs from 'ejs';
 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);
-    }
-}
-
 export async function generateDynamoDBTables(allSchemas, options) {
     console.log('  [DynamoDBGenerator] Generating DynamoDB Tables...');
 
@@ -88,7 +79,7 @@ export async function generateDynamoDBTables(allSchemas, options) {
             pk: keys.pk,
             sk: keys.sk
         });
-        await appendToFile(yamlOutputPath, yamlContent);
+    await fs.appendFile(yamlOutputPath, `${yamlContent}\n`, 'utf-8');
         generatedCount++;
     }
 

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

@@ -8,15 +8,6 @@ import { getFlowsForGeneration } from '../../app/src/generatedCode/Flow/_shared/
 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 file: ${filePath}`, error);
-  }
-}
-
 export async function generateFlowOut(allSchemas, options) {
   console.log('  [FlowOutGenerator] Generating Flow Out nodes (SNS Topics)...');
 
@@ -37,7 +28,7 @@ export async function generateFlowOut(allSchemas, options) {
 
     generatedTopics.add(topicName);
     const yamlContent = ejs.render(yamlTpl, { topicName });
-    await appendToFile(yamlOutputPath, yamlContent);
+    await fs.appendFile(yamlOutputPath, `${yamlContent}\n`, 'utf-8');
     generatedCount++;
   }
 
@@ -53,6 +44,7 @@ export async function generateFlowOut(allSchemas, options) {
     'Create',
     'Update',
     'Delete',
+    'Get',
     'CreateRelationship',
     'UpdateRelationship',
     'DeleteRelationship',

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

@@ -8,15 +8,6 @@ import { getFlowsForGeneration } from '../../app/src/generatedCode/Flow/_shared/
 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 file: ${filePath}`, error);
-  }
-}
-
 export async function generateFlowResourceYaml(allSchemas, options) {
   console.log('  [FlowResourceYamlGenerator] Generating SQS/SNS YAML resources for flows...');
 
@@ -42,7 +33,7 @@ export async function generateFlowResourceYaml(allSchemas, options) {
 
     generatedResources.add(resourceKey);
     const yamlContent = ejs.render(template, templateData);
-    await appendToFile(yamlOutputPath, yamlContent);
+    await fs.appendFile(yamlOutputPath, `${yamlContent}\n`, 'utf-8');
     generatedCount++;
   }
 
@@ -79,7 +70,7 @@ export async function generateFlowResourceYaml(allSchemas, options) {
     if (Array.isArray(flow.flowSteps)) {
       for (const stepConfig of flow.flowSteps) {
         const stepName = stepConfig.stepName;
-        if (stepName === 'start') continue;
+        if (stepName?.toLowerCase() === 'start') continue;
 
         const events = stepConfig.event || ['extTopic'];
         for (const ev of events) {

package/src/core/validate.js

@@ -20,17 +20,21 @@ export async function validateSchemas(rootPath) {
     // 1. Read config for bucket name and service tag
     let configStr = '';
     let iz_serviceTag = '';
+    let iz_serviceName = '';
     let iz_serviceSchemaBucketName = '';
     try {
         configStr = await fs.readFile(serviceConfigPath, 'utf8');
         const config = yaml.parse(configStr);
         iz_serviceTag = config?.main_config?.iz_serviceTag;
+        iz_serviceName = config?.main_config?.iz_serviceName || iz_serviceTag;
         iz_serviceSchemaBucketName = config?.main_config?.iz_serviceSchemaBucketName || 'unknown-bucket';
         
-        if (!iz_serviceTag) {
-            validateStatus.validateErrors.push('Missing iz_serviceTag in serverless.config.yml. This is a critical configuration field.');
-        } else if (!/^[a-zA-Z0-9]+$/.test(iz_serviceTag)) {
-            validateStatus.validateErrors.push(`iz_serviceTag '${iz_serviceTag}' must contain only alphanumeric characters ([a-zA-Z0-9]).`);
+        if (!iz_serviceName) {
+            validateStatus.validateErrors.push('Missing iz_serviceName or iz_serviceTag in serverless.config.yml. This is a critical configuration field.');
+        } else if (!/^[a-zA-Z0-9]+$/.test(iz_serviceName)) {
+            validateStatus.validateErrors.push(`Service Name '${iz_serviceName}' must contain only alphanumeric characters ([a-zA-Z0-9]).`);
+        } else {
+            console.log(`  [Validator] Validating with serviceName: '${iz_serviceName}'`);
         }
     } catch (e) {
         validateStatus.validateErrors.push(`Could not read or parse serverless.config.yml at ${serviceConfigPath}: ${e.message}`);
@@ -124,7 +128,7 @@ export async function validateSchemas(rootPath) {
                 if (flow.objType && flow.objType.objectType) {
                     const targetObj = objectSchemasMap[flow.objType.objectType];
                     if (targetObj) {
-                        const expectedPrefix = `TST_${flow.flowTag}`; // Example prefix logic
+                        const expectedPrefix = `${iz_serviceName}_${flow.flowTag}`; // Prefix logic based on service name
                         const isMissingFields = !targetObj.fieldNames || !targetObj.fieldNames[`${expectedPrefix}Status`];
                         
                         if (isMissingFields) {

package/src/generate.js

@@ -87,13 +87,13 @@ async function generate(rootPath, options = {}) {
   }
 
   const startTime = Date.now();
-  await generateCode(rootPath, { outputPath });
+  await generateCode(rootPath, { outputPath, configPath });
   return { durationMs: Date.now() - startTime };
 }
 
 function patchFlowStepsValidationSchema() {
   const flowStepsSchema = basicValidatorSchema.basicFlowSchema?.properties?.flowSteps;
-  if (!flowStepsSchema || flowStepsSchema.oneOf) {
+  if (!flowStepsSchema || flowStepsSchema.oneOf || !flowStepsSchema.items) {
     return;
   }
 

package/src/generateCode.js

@@ -1,5 +1,6 @@
 import fs from 'fs';
 import path from 'path';
+import yaml from 'yaml';
 
 import { parseObjectSchemas } from './parsers/objectSchemaParser.js';
 import { parseRelationshipSchemas } from './parsers/relationshipSchemaParser.js';
@@ -54,6 +55,26 @@ export async function generateCode(rootPath, options = {}) {
   const generatorOptions = createGeneratorOptions(rootPath, options);
   const { outputPath } = generatorOptions;
 
+  let serviceName;
+  try {
+    const configPath = options.configPath || path.join(rootPath, 'config', 'serverless.config.yml');
+    if (!fs.existsSync(configPath)) {
+      throw new Error(`serverless.config.yml not found at path: ${configPath}`);
+    }
+    const configStr = fs.readFileSync(configPath, 'utf8');
+    const config = yaml.parse(configStr);
+    serviceName = config?.main_config?.iz_serviceName || config?.main_config?.iz_serviceTag;
+    
+    if (!serviceName) {
+      throw new Error('main_config.iz_serviceName or main_config.iz_serviceTag is missing in serverless.config.yml');
+    }
+    
+    console.log(`[INFO] [generateCode] Loaded config - serviceName: '${serviceName}' from ${configPath}`);
+  } catch (e) {
+    throw new Error(`[Developer Error] Failed to read service name from config: ${e.message}`);
+  }
+  generatorOptions.serviceName = serviceName;
+
   // Clean workspace
   const generatedCodePath = path.join(
     outputPath,

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

@@ -41,50 +41,7 @@ export async function generateDynamicFlowSchemas(
     return;
   }
 
-  const validMainEvents = [
-    'ownTopic',
-    'extTopic',
-    'dsq',
-    's3',
-    'eventBridge',
-    'lambdaSyncInv',
-    'lambdaSyncApi'
-  ];
-  const validStepEvents = [
-    'sqs',
-    'extTopic',
-    'dsq',
-    'lambdaSyncInv',
-    'lambdaSyncApi',
-    'queue'
-  ];
 
-  if (flowData && flowData.flows) {
-    for (const flow of flowData.flows) {
-      const flowName = flow.flowTag || 'UnknownFlow';
-      // Check main flow events
-      if (flow.event && Array.isArray(flow.event)) {
-        for (const ev of flow.event) {
-          if (!validMainEvents.includes(ev)) {
-            throw new Error(`[FlowSchemaGenerator] Invalid event type '${ev}' in main flow '${flowName}'. Allowed: ${validMainEvents.join(', ')}`);
-          }
-        }
-      }
-      // Check flow steps events
-      if (flow.flowSteps && Array.isArray(flow.flowSteps)) {
-        for (const step of flow.flowSteps) {
-          const stepName = step.stepName || 'UnknownStep';
-          if (step.event && Array.isArray(step.event)) {
-            for (const ev of step.event) {
-              if (!validStepEvents.includes(ev)) {
-                throw new Error(`[FlowSchemaGenerator] Invalid event type '${ev}' in flow '${flowName}' step '${stepName}'. Allowed: ${validStepEvents.join(', ')}`);
-              }
-            }
-          }
-        }
-      }
-    }
-  }
 
   // Ensure directory exists
   await fs.mkdir(schemasOutputDir, { recursive: true });

package/test_schema.js

@@ -0,0 +1,2 @@
+import { basicValidatorSchema } from '@izara_project/izara-shared-service-schemas';
+console.log(JSON.stringify(basicValidatorSchema.basicFlowSchema?.properties?.flowSteps, null, 2));

package/test_generate.js

@@ -1,7 +0,0 @@
-import { generateCode } from './src/generateCode.js';
-
-async function run() {
-  const rootPath = '/home/azure/Working/test/test-lib-generateCode/test-cases/real/case01-UnitType/workspace';
-  await generateCode(rootPath);
-}
-run().catch(console.error);

package/test_normalize.js

@@ -1,17 +0,0 @@
-import { normalizeUnifiedFlows, normalizeFlowSteps } from './src/codeGenerators/app/src/generatedCode/Flow/_shared/shared/flowStepNormalizer.js';
-
-const rawFlows = [
-  {
-    event: 'api',
-    flowSteps: {
-      MyStep: { properties: [] }
-    }
-  }
-];
-
-try {
-  const result = normalizeUnifiedFlows(rawFlows);
-  console.log(JSON.stringify(result, null, 2));
-} catch (e) {
-  console.error(e.message);
-}