@izara_project/izara-core-generate-service-code 1.0.68 → 1.0.69

package/src/emit/rbac/emitRbacApplicationArtifacts.js

@@ -1,4 +1,4 @@
-import ejs from 'ejs';
+import ejsLib from 'ejs';
 import { readFile } from 'node:fs/promises';
 
 import {
@@ -29,11 +29,11 @@ export async function emitRbacApplicationArtifacts(objects) {
     ...objects.filter(hasRbacAddOn).map(createUserRbacFlowHandler)
   ]);
   return [
-    ...handlers.flatMap(handler => handler.artifacts),
+    ...handlers.flatMap((handler) => handler.artifacts),
     {
       path: FLOW_RBAC_YAML_PATH,
       content: handlers
-        .flatMap(handler => handler.functions)
+        .flatMap((handler) => handler.functions)
         .map(renderFunctionYaml)
         .join('\n')
     }
@@ -109,7 +109,7 @@ export function rbacApplicationManagedPaths(objects = []) {
       `app/src/generatedCode/FlowRbac/${flowTag}/source/${flowTag}_WbsMain.js`,
       `app/src/generatedCode/FlowRbac/${flowTag}/source/${flowTag}_HdrWbs.js`
     ]),
-    ...objects.filter(hasRbacAddOn).flatMap(object => {
+    ...objects.filter(hasRbacAddOn).flatMap((object) => {
       const flowTag = rbacFlowTag(object);
       const sourcePath = `app/src/generatedCode/FlowRbac/${flowTag}/source`;
       return [
@@ -124,7 +124,7 @@ export function rbacApplicationManagedPaths(objects = []) {
 function hasRbacAddOn(object) {
   return (
     Array.isArray(object?.addOnDataStructure) &&
-    object.addOnDataStructure.some(addOn => addOn?.type === 'rbac')
+    object.addOnDataStructure.some((addOn) => addOn?.type === 'rbac')
   );
 }
 
@@ -362,7 +362,7 @@ function renderRbacTemplate(templateName, data = {}) {
 }
 
 async function renderTemplate(templateUrl, templateName, data) {
-  return ejs.render(
+  return ejsLib.render(
     await readFile(new URL(templateName, templateUrl), 'utf8'),
     data
   );

package/src/emit/rbac/generateCreateTargetRoleHandler.js

@@ -11,9 +11,11 @@ export async function generateCreateTargetRoleHandler(rootPath, options = {}) {
   const project = compileProject({ ...options, rootPath });
   const objects = await loadLocalSchemaDirectory(project, 'ObjectSchemas');
   const artifacts = await emitRbacApplicationArtifacts(objects);
-  const files = await commitArtifacts(buildGenerationPlan(project, artifacts, {
-    managedPaths: rbacApplicationManagedPaths(),
-    managedScope: 'rbac-application'
-  }));
+  const files = await commitArtifacts(
+    buildGenerationPlan(project, artifacts, {
+      managedPaths: rbacApplicationManagedPaths(),
+      managedScope: 'rbac-application'
+    })
+  );
   return { project, files };
 }

package/src/emit/rbac/generateDynamicRbacFlowSchemas.js

@@ -12,8 +12,14 @@ export async function generateDynamicRbacFlowSchemas(rootPath, options = {}) {
   const objects = await loadLocalSchemaDirectory(project, 'ObjectSchemas');
   const plan = buildGenerationPlan(
     project,
-    await emitDynamicRbacFlowSchemas({ objects, serviceTag: project.serviceTag }),
-    { managedPaths: rbacFlowSchemaManagedPaths(objects), managedScope: 'rbac-flow-schemas' }
+    await emitDynamicRbacFlowSchemas({
+      objects,
+      serviceTag: project.serviceTag
+    }),
+    {
+      managedPaths: rbacFlowSchemaManagedPaths(objects),
+      managedScope: 'rbac-flow-schemas'
+    }
   );
   const files = await commitArtifacts(plan);
 

package/src/emit/rbac/rbacFlowTag.js

@@ -1,7 +1,9 @@
 export function rbacFlowTag(object) {
   const objectType = object?.objectType;
   if (typeof objectType !== 'string' || objectType.trim() === '') {
-    throw new TypeError('RBAC ObjectSchema.objectType must be a non-empty string');
+    throw new TypeError(
+      'RBAC ObjectSchema.objectType must be a non-empty string'
+    );
   }
   return `${objectType[0].toUpperCase()}${objectType.slice(1)}RbacFlow`;
 }

package/src/emit/rbac/templates/UserRbacFlow_Main.ejs

@@ -143,7 +143,7 @@ function _matchesParameterGroups(groups, input) {
         if (val && typeof val === 'object') {
           val = val[key];
         } else {
-          val = undefined;
+          val = null;
           break;
         }
       }

package/src/emit/relationship/emitDynamicRelationshipFlowSchemas.js

@@ -1,5 +1,3 @@
-import { renderDynamicRelationshipFlowSchema } from './dynamicRelationshipFlowSchemaTemplate.js';
-
 const ACTIONS = [
   'CreateRelationship',
   'UpdateRelationship',
@@ -11,17 +9,33 @@ const ACTIONS = [
 const MESSAGE_ATTRIBUTES = ['userId', 'correlationId'];
 
 export const dynamicRelationshipFlowSchemaPaths = ACTIONS.map(
-  action => `app/src/schemas/FlowSchemas/generateCode/FlowRelationship/${action}.js`
+  (action) =>
+    `app/src/schemas/FlowSchemas/generateCode/FlowRelationship/${action}.js`
 );
 
 export function emitDynamicRelationshipFlowSchemas() {
   // Keep legacy compatibility: relationship flow endpoints exist even before a relationship is declared.
   return ACTIONS.map((action, index) => ({
     path: dynamicRelationshipFlowSchemaPaths[index],
-    content: renderDynamicRelationshipFlowSchema(action, createDynamicRelationshipFlow(action))
+    content: _renderDynamicRelationshipFlowSchema(
+      action,
+      createDynamicRelationshipFlow(action)
+    )
   }));
 }
 
+function _renderDynamicRelationshipFlowSchema(action, flow) {
+  return [
+    '/**',
+    ' * GENERATED DYNAMIC RELATIONSHIP FLOW SCHEMA',
+    ` * Action: ${action}`,
+    ' * Description: Handles dynamic relationship actions for all allowed RelationshipTypes via SQS/DSQ',
+    ' */',
+    `export default ${JSON.stringify(flow, null, 2)};`,
+    ''
+  ].join('\n');
+}
+
 function createDynamicRelationshipFlow(action) {
   const outputTopic = action !== 'GetRelationship';
   const flowSteps = [
@@ -29,12 +43,14 @@ function createDynamicRelationshipFlow(action) {
       stepName: 'start',
       properties: [],
       messageAttributes: MESSAGE_ATTRIBUTES,
-      ...(outputTopic ? {
-        returnValues: {
-          properties: [],
-          messageAttributes: MESSAGE_ATTRIBUTES
-        }
-      } : {})
+      ...(outputTopic
+        ? {
+            returnValues: {
+              properties: [],
+              messageAttributes: MESSAGE_ATTRIBUTES
+            }
+          }
+        : {})
     }
   ];
 

package/src/emit/relationship/emitRelationshipApplicationArtifacts.js

@@ -1,4 +1,4 @@
-import ejs from 'ejs';
+import ejsLib from 'ejs';
 import { readFile } from 'node:fs/promises';
 
 import {
@@ -19,22 +19,36 @@ const ACTIONS = [
 const YAML_PATH = 'app/sls_yaml/generatedCode/source/flow-relationships.yml';
 const TEMPLATE_URL = new URL('./templates/', import.meta.url);
 
-export async function emitRelationshipApplicationArtifacts({ relationships, flows = [], serviceTag }) {
+export async function emitRelationshipApplicationArtifacts({
+  relationships,
+  flows = [],
+  serviceTag
+}) {
   if (!Array.isArray(relationships) || !Array.isArray(flows)) {
     throw new TypeError('relationships and flows must be arrays');
   }
   if (relationships.length === 0) return [];
 
-  const handlers = await Promise.all(ACTIONS.map(action => emitAction(action, relationships, flows, serviceTag)));
+  const handlers = await Promise.all(
+    ACTIONS.map((action) =>
+      emitAction(action, relationships, flows, serviceTag)
+    )
+  );
   return [
-    ...handlers.flatMap(handler => handler.artifacts),
-    { path: YAML_PATH, content: handlers.flatMap(handler => handler.functions).map(renderFunction).join('\n') }
+    ...handlers.flatMap((handler) => handler.artifacts),
+    {
+      path: YAML_PATH,
+      content: handlers
+        .flatMap((handler) => handler.functions)
+        .map(renderFunction)
+        .join('\n')
+    }
   ];
 }
 
 export function relationshipApplicationManagedPaths() {
   return [
-    ...ACTIONS.flatMap(action => {
+    ...ACTIONS.flatMap((action) => {
       const source = `app/src/generatedCode/FlowRelationships/${action}/source`;
       return [
         `${source}/${action}_Main.js`,
@@ -55,75 +69,200 @@ export function relationshipApplicationManagedPaths() {
 async function emitAction(action, relationships, flows, serviceTag) {
   const source = `app/src/generatedCode/FlowRelationships/${action}/source`;
   const handlerRoot = `src/generatedCode/FlowRelationships/${action}/source`;
-  const flow = flows.find(candidate => candidate?.flowTag === action);
-  const events = normalizeEvents(flow?.event, action === 'GetRelationship'
-    ? ['lambdaSyncInv', 'lambdaSyncApi', 'dsq', 'ownTopic']
-    : ['ownTopic']);
-  const shared = { flowTag: action, flowStepName: '', mainFileName: `${action}_Main`, functionName: action, startConfig: null };
-  const artifacts = [{ path: `${source}/${action}_Main.js`, content: await render(`${action}_Main.ejs`, { functionName: action, upperFunctionName: action }) }];
+  const flow = flows.find((candidate) => candidate?.flowTag === action);
+  const events = normalizeEvents(
+    flow?.event,
+    action === 'GetRelationship'
+      ? ['lambdaSyncInv', 'lambdaSyncApi', 'dsq', 'ownTopic']
+      : ['ownTopic']
+  );
+  const shared = {
+    flowTag: action,
+    flowStepName: '',
+    mainFileName: `${action}_Main`,
+    functionName: action,
+    startConfig: null
+  };
+  const artifacts = [
+    {
+      path: `${source}/${action}_Main.js`,
+      content: await render(`${action}_Main.ejs`, {
+        functionName: action,
+        upperFunctionName: action
+      })
+    }
+  ];
   const functions = [];
 
   if (events.includes('ownTopic')) {
     artifacts.push(
-      { path: `${source}/${action}_WbsMain.js`, content: await renderShared('FlowMain_Wbs.ejs', { flowTag: action, upperCaseFlowTag: action, functionName: action }) },
-      { path: `${source}/${action}_HdrWbs.js`, content: await renderShared('FlowEndpoint_HdrWbs.ejs', { flowTag: action, upperCaseFlowTag: action, functionName: action, mainFileName: `${action}_WbsMain`, route: action }) }
+      {
+        path: `${source}/${action}_WbsMain.js`,
+        content: await renderShared('FlowMain_Wbs.ejs', {
+          flowTag: action,
+          upperCaseFlowTag: action,
+          functionName: action
+        })
+      },
+      {
+        path: `${source}/${action}_HdrWbs.js`,
+        content: await renderShared('FlowEndpoint_HdrWbs.ejs', {
+          flowTag: action,
+          upperCaseFlowTag: action,
+          functionName: action,
+          mainFileName: `${action}_WbsMain`,
+          route: action
+        })
+      }
     );
-    functions.push({ type: 'wbs', functionName: `${action}HdrWbs`, handlerPath: `${handlerRoot}/${action}_HdrWbs.main`, roleName: 'FlowRelationshipRole', routeName: action, flowTag: action, flowStepName: '' });
+    functions.push({
+      type: 'wbs',
+      functionName: `${action}HdrWbs`,
+      handlerPath: `${handlerRoot}/${action}_HdrWbs.main`,
+      roleName: 'FlowRelationshipRole',
+      routeName: action,
+      flowTag: action,
+      flowStepName: ''
+    });
   }
 
   for (const event of events) {
-    const handler = eventHandler(event, action, handlerRoot, relationships, serviceTag);
+    const handler = eventHandler(
+      event,
+      action,
+      handlerRoot,
+      relationships,
+      serviceTag
+    );
     if (!handler) continue;
-    artifacts.push({ path: `${source}/${handler.fileName}.js`, content: await render(handler.template, { ...shared, queueName: handler.queueName }) });
+    artifacts.push({
+      path: `${source}/${handler.fileName}.js`,
+      content: await render(handler.template, {
+        ...shared,
+        queueName: handler.queueName
+      })
+    });
     functions.push(handler.descriptor);
   }
 
   const complete = `${action}Complete`;
   artifacts.push(
-    { path: `${source}/${complete}_Main.js`, content: await render(`${action}Complete_Main.ejs`, { functionName: complete, upperFunctionName: complete }) },
-    { path: `${source}/${complete}_HdrSqs.js`, content: await renderShared('FlowHandler_HdrSqs.ejs', { ...shared, flowStepName: 'Complete', mainFileName: `${complete}_Main`, functionName: complete, queueName: `${complete}HdrSqs` }) }
+    {
+      path: `${source}/${complete}_Main.js`,
+      content: await render(`${action}Complete_Main.ejs`, {
+        functionName: complete,
+        upperFunctionName: complete
+      })
+    },
+    {
+      path: `${source}/${complete}_HdrSqs.js`,
+      content: await renderShared('FlowHandler_HdrSqs.ejs', {
+        ...shared,
+        flowStepName: 'Complete',
+        mainFileName: `${complete}_Main`,
+        functionName: complete,
+        queueName: `${complete}HdrSqs`
+      })
+    }
   );
-  functions.push({ type: 'sqs', functionName: `${action}CompleteHdrSqs`, handlerPath: `${handlerRoot}/${complete}_HdrSqs.main`, roleName: 'FlowRelationshipRole', queueName: `${complete}HdrSqs`, flowTag: action, flowStepName: 'Complete' });
+  functions.push({
+    type: 'sqs',
+    functionName: `${action}CompleteHdrSqs`,
+    handlerPath: `${handlerRoot}/${complete}_HdrSqs.main`,
+    roleName: 'FlowRelationshipRole',
+    queueName: `${complete}HdrSqs`,
+    flowTag: action,
+    flowStepName: 'Complete'
+  });
   return { artifacts, functions };
 }
 
 function eventHandler(event, action, handlerRoot, relationships, serviceTag) {
   if (event === 'ownTopic' || event === 'extTopic') {
     return {
-      fileName: `${action}_HdrSqs`, template: 'FlowHandler_HdrSqs.ejs', queueName: `${action}HdrSqs`,
-      descriptor: { type: 'sqs', functionName: `${action.replace('Relationship', 'Rel')}HdrSqs`, handlerPath: `${handlerRoot}/${action}_HdrSqs.main`, roleName: 'FlowRelationshipRole', queueName: `${action}HdrSqs`, flowTag: action, flowStepName: '' }
+      fileName: `${action}_HdrSqs`,
+      template: 'FlowHandler_HdrSqs.ejs',
+      queueName: `${action}HdrSqs`,
+      descriptor: {
+        type: 'sqs',
+        functionName: `${action.replace('Relationship', 'Rel')}HdrSqs`,
+        handlerPath: `${handlerRoot}/${action}_HdrSqs.main`,
+        roleName: 'FlowRelationshipRole',
+        queueName: `${action}HdrSqs`,
+        flowTag: action,
+        flowStepName: ''
+      }
     };
   }
   if (event === 'dsq') {
     return {
-      fileName: `${action}_HdrDsq`, template: 'FlowHandler_HdrDsq.ejs', queueName: `${action}HdrDsq`,
-      descriptor: { type: 'sqs', functionName: `${action.replace('Relationship', 'Rel')}HdrDsq`, handlerPath: `${handlerRoot}/${action}_HdrDsq.main`, roleName: 'FlowRelationshipRole', queueName: `${action}HdrDsq`, flowTag: action, flowStepName: '' }
+      fileName: `${action}_HdrDsq`,
+      template: 'FlowHandler_HdrDsq.ejs',
+      queueName: `${action}HdrDsq`,
+      descriptor: {
+        type: 'sqs',
+        functionName: `${action.replace('Relationship', 'Rel')}HdrDsq`,
+        handlerPath: `${handlerRoot}/${action}_HdrDsq.main`,
+        roleName: 'FlowRelationshipRole',
+        queueName: `${action}HdrDsq`,
+        flowTag: action,
+        flowStepName: ''
+      }
     };
   }
   if (event === 'lambdaSyncInv') {
     return {
-      fileName: `${action}_HdrInv`, template: 'FlowHandler_HdrInv.ejs',
-      descriptor: { type: 'inv', functionName: `${action.replace('Relationship', 'Rel')}HdrInv`, handlerPath: `${handlerRoot}/${action}_HdrInv.main`, roleName: 'FlowRelationshipRole', flowTag: action, flowStepName: '' }
+      fileName: `${action}_HdrInv`,
+      template: 'FlowHandler_HdrInv.ejs',
+      descriptor: {
+        type: 'inv',
+        functionName: `${action.replace('Relationship', 'Rel')}HdrInv`,
+        handlerPath: `${handlerRoot}/${action}_HdrInv.main`,
+        roleName: 'FlowRelationshipRole',
+        flowTag: action,
+        flowStepName: ''
+      }
     };
   }
   if (event === 'lambdaSyncApi') {
     return {
-      fileName: `${action}_HdrApi`, template: 'FlowHandler_HdrApi.ejs',
+      fileName: `${action}_HdrApi`,
+      template: 'FlowHandler_HdrApi.ejs',
       descriptor: {
-        type: 'api', functionName: `${action.replace('Relationship', 'Rel')}HdrApi`, handlerPath: `${handlerRoot}/${action}_HdrApi.main`, roleName: 'FlowRelationshipRole',
-        flowTag: action, flowStepName: '',
-        routes: relationships.map(relationship => {
-          const name = relationship.relationshipTag ?? Object.keys(relationship)[0];
-          return { path: `/${serviceTag ?? '${self:custom.iz_serviceName}'}/${name}/${action.toLowerCase().replace('relationship', '')}`, upperName: upperFirst(name) };
+        type: 'api',
+        functionName: `${action.replace('Relationship', 'Rel')}HdrApi`,
+        handlerPath: `${handlerRoot}/${action}_HdrApi.main`,
+        roleName: 'FlowRelationshipRole',
+        flowTag: action,
+        flowStepName: '',
+        routes: relationships.map((relationship) => {
+          let name = Object.keys(relationship)[0];
+          if (relationship.relationshipTag) {
+            name = relationship.relationshipTag;
+          }
+          let targetServiceTag = '${self:custom.iz_serviceName}';
+          if (serviceTag) {
+            targetServiceTag = serviceTag;
+          }
+          return {
+            path: `/${targetServiceTag}/${name}/${action.toLowerCase().replace('relationship', '')}`,
+            upperName: upperFirst(name)
+          };
         })
       }
     };
   }
-  return undefined;
+  return null;
 }
 
 function normalizeEvents(events, fallback) {
-  return events === undefined ? fallback : (Array.isArray(events) ? events : [events]);
+  if (events === undefined) {
+    return fallback;
+  }
+  if (Array.isArray(events)) {
+    return events;
+  }
+  return [events];
 }
 
 function upperFirst(value) {
@@ -132,12 +271,15 @@ function upperFirst(value) {
 
 async function render(templateName, data) {
   const template = await readFile(new URL(templateName, TEMPLATE_URL), 'utf8');
-  return ejs.render(template, data);
+  return ejsLib.render(template, data);
 }
 
 async function renderShared(templateName, data) {
-  const template = await readFile(new URL(`../crud/templates/${templateName}`, import.meta.url), 'utf8');
-  return ejs.render(template, data);
+  const template = await readFile(
+    new URL(`../crud/templates/${templateName}`, import.meta.url),
+    'utf8'
+  );
+  return ejsLib.render(template, data);
 }
 
 function renderFunction(descriptor) {

package/src/emit/relationship/generateDynamicRelationshipFlowSchemas.js

@@ -7,7 +7,10 @@ import {
   emitDynamicRelationshipFlowSchemas
 } from './emitDynamicRelationshipFlowSchemas.js';
 
-export async function generateDynamicRelationshipFlowSchemas(rootPath, options = {}) {
+export async function generateDynamicRelationshipFlowSchemas(
+  rootPath,
+  options = {}
+) {
   const project = compileProject({ ...options, rootPath });
   // The legacy generator creates these endpoints even with no relationships. Load now to
   // validate the V2 source-module contract before later slices consume relationship data.
@@ -15,7 +18,10 @@ export async function generateDynamicRelationshipFlowSchemas(rootPath, options =
   const plan = buildGenerationPlan(
     project,
     emitDynamicRelationshipFlowSchemas(),
-    { managedPaths: dynamicRelationshipFlowSchemaPaths, managedScope: 'relationship-flow-schemas' }
+    {
+      managedPaths: dynamicRelationshipFlowSchemaPaths,
+      managedScope: 'relationship-flow-schemas'
+    }
   );
   const files = await commitArtifacts(plan);
 

package/src/emit/relationship/generateRelationshipApplicationArtifacts.js

@@ -7,16 +7,25 @@ import {
   relationshipApplicationManagedPaths
 } from './emitRelationshipApplicationArtifacts.js';
 
-export async function generateRelationshipApplicationArtifacts(rootPath, options = {}) {
+export async function generateRelationshipApplicationArtifacts(
+  rootPath,
+  options = {}
+) {
   const project = compileProject({ ...options, rootPath });
   const [relationships, flows] = await Promise.all([
     loadLocalSchemaDirectory(project, 'RelationshipSchemas'),
     loadLocalSchemaDirectory(project, 'FlowSchemas')
   ]);
-  const artifacts = await emitRelationshipApplicationArtifacts({ relationships, flows, serviceTag: project.serviceTag });
-  const files = await commitArtifacts(buildGenerationPlan(project, artifacts, {
-    managedPaths: relationshipApplicationManagedPaths(),
-    managedScope: 'relationship-application'
-  }));
+  const artifacts = await emitRelationshipApplicationArtifacts({
+    relationships,
+    flows,
+    serviceTag: project.serviceTag
+  });
+  const files = await commitArtifacts(
+    buildGenerationPlan(project, artifacts, {
+      managedPaths: relationshipApplicationManagedPaths(),
+      managedScope: 'relationship-application'
+    })
+  );
   return { project, files };
 }