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

package/src/emit/crud/emitCrudApplicationArtifacts.js

@@ -1,4 +1,4 @@
-import ejs from 'ejs';
+import ejsLib from 'ejs';
 import { readFile } from 'node:fs/promises';
 
 import {
@@ -12,30 +12,42 @@ const ACTIONS = ['Create', 'Update', 'Delete', 'Get'];
 const YAML_PATH = 'app/sls_yaml/generatedCode/source/flow-objects.yml';
 const TEMPLATE_URL = new URL('./templates/', import.meta.url);
 
-export async function emitCrudApplicationArtifacts({ objects, flows = [], serviceTag }) {
+export async function emitCrudApplicationArtifacts({
+  objects,
+  flows = [],
+  serviceTag
+}) {
   if (!Array.isArray(objects) || !Array.isArray(flows)) {
     throw new TypeError('objects and flows must be arrays');
   }
   if (!objects.some(isCrudObject)) return [];
 
-  const handlers = await Promise.all(ACTIONS.map(action => emitAction(action, objects, flows, serviceTag)));
+  const handlers = await Promise.all(
+    ACTIONS.map((action) => emitAction(action, objects, flows, serviceTag))
+  );
   return [
-    ...handlers.flatMap(handler => handler.artifacts),
+    ...handlers.flatMap((handler) => handler.artifacts),
     {
       path: YAML_PATH,
-      content: handlers.flatMap(handler => handler.functions).map(renderFunction).join('\n')
+      content: handlers
+        .flatMap((handler) => handler.functions)
+        .map(renderFunction)
+        .join('\n')
     }
   ];
 }
 
 export function crudApplicationManagedPaths() {
   return [
-    ...ACTIONS.flatMap(action => {
+    ...ACTIONS.flatMap((action) => {
       const source = `app/src/generatedCode/FlowObjects/${action}/source`;
       const paths = [`${source}/${action}_Main.js`];
       if (action === 'Get') {
         paths.push(`${source}/Get_HdrInv.js`, `${source}/Get_HdrApi.js`);
-        paths.push(`${source}/GetRange_Main.js`, `${source}/GetRange_HdrApi.js`);
+        paths.push(
+          `${source}/GetRange_Main.js`,
+          `${source}/GetRange_HdrApi.js`
+        );
       } else {
         paths.push(
           `${source}/${action}_HdrSqs.js`,
@@ -44,7 +56,10 @@ export function crudApplicationManagedPaths() {
           `${source}/${action}BeforeLogical_Main.js`,
           `${source}/${action}BeforeLogical_HdrSqs.js`
         );
-        paths.push(`${source}/${action}Complete_Main.js`, `${source}/${action}Complete_HdrSqs.js`);
+        paths.push(
+          `${source}/${action}Complete_Main.js`,
+          `${source}/${action}Complete_HdrSqs.js`
+        );
       }
       return paths;
     }),
@@ -56,8 +71,12 @@ async function emitAction(action, objects, flows, serviceTag) {
   const source = `app/src/generatedCode/FlowObjects/${action}/source`;
   const handlerRoot = `src/generatedCode/FlowObjects/${action}/source`;
   const generateCode = flows
-    .filter(flow => flow?.generatedCodeConfig?.generatedCodeTag?.toLowerCase() === action.toLowerCase())
-    .map(flow => ({ ...flow.generatedCodeConfig, flowTag: flow.flowTag }));
+    .filter(
+      (flow) =>
+        flow?.generatedCodeConfig?.generatedCodeTag?.toLowerCase() ===
+        action.toLowerCase()
+    )
+    .map((flow) => ({ ...flow.generatedCodeConfig, flowTag: flow.flowTag }));
   const mainFileName = `${action}_Main`;
   const shared = {
     flowTag: action,
@@ -68,22 +87,66 @@ async function emitAction(action, objects, flows, serviceTag) {
     flowStepName: '',
     startConfig: null
   };
-  const artifacts = [{
-    path: `${source}/${mainFileName}.js`,
-    content: await render(`${action}Endpoint_Main.ejs`, shared)
-  }];
+  const artifacts = [
+    {
+      path: `${source}/${mainFileName}.js`,
+      content: await render(`${action}Endpoint_Main.ejs`, shared)
+    }
+  ];
 
+  let targetServiceTag = '${self:custom.iz_serviceName}';
+  if (serviceTag) {
+    targetServiceTag = serviceTag;
+  }
   if (action === 'Get') {
     artifacts.push(
-      { path: `${source}/Get_HdrInv.js`, content: await render('FlowHandler_HdrInv.ejs', { ...shared, mainFileName, functionName: 'Get', queueName: 'GetHdrInv' }) },
-      { path: `${source}/Get_HdrApi.js`, content: await render('FlowHandler_HdrApi.ejs', { ...shared, mainFileName, functionName: 'Get', queueName: 'GetHdrApi' }) },
-      { path: `${source}/GetRange_Main.js`, content: await render('GetRangeEndpoint_Main.ejs', { ...shared, mainFileName: 'GetRange_Main', functionName: 'GetRange' }) },
-      { path: `${source}/GetRange_HdrApi.js`, content: await render('FlowHandler_HdrApi.ejs', { ...shared, mainFileName: 'GetRange_Main', functionName: 'GetRange', queueName: 'GetRangeHdrApi' }) }
+      {
+        path: `${source}/Get_HdrInv.js`,
+        content: await render('FlowHandler_HdrInv.ejs', {
+          ...shared,
+          mainFileName,
+          functionName: 'Get',
+          queueName: 'GetHdrInv'
+        })
+      },
+      {
+        path: `${source}/Get_HdrApi.js`,
+        content: await render('FlowHandler_HdrApi.ejs', {
+          ...shared,
+          mainFileName,
+          functionName: 'Get',
+          queueName: 'GetHdrApi'
+        })
+      },
+      {
+        path: `${source}/GetRange_Main.js`,
+        content: await render('GetRangeEndpoint_Main.ejs', {
+          ...shared,
+          mainFileName: 'GetRange_Main',
+          functionName: 'GetRange'
+        })
+      },
+      {
+        path: `${source}/GetRange_HdrApi.js`,
+        content: await render('FlowHandler_HdrApi.ejs', {
+          ...shared,
+          mainFileName: 'GetRange_Main',
+          functionName: 'GetRange',
+          queueName: 'GetRangeHdrApi'
+        })
+      }
     );
     return {
       artifacts,
       functions: [
-        { type: 'inv', functionName: 'GetHdrInv', handlerPath: `${handlerRoot}/Get_HdrInv.main`, roleName: 'FlowObjectsRole', flowTag: action, flowStepName: '' },
+        {
+          type: 'inv',
+          functionName: 'GetHdrInv',
+          handlerPath: `${handlerRoot}/Get_HdrInv.main`,
+          roleName: 'FlowObjectsRole',
+          flowTag: action,
+          flowStepName: ''
+        },
         {
           type: 'api',
           functionName: 'GetHdrApi',
@@ -91,8 +154,8 @@ async function emitAction(action, objects, flows, serviceTag) {
           roleName: 'FlowObjectsRole',
           flowTag: action,
           flowStepName: '',
-          routes: objects.filter(isCrudObject).map(object => ({
-            path: `/${serviceTag ?? '${self:custom.iz_serviceName}'}/${object.objectType}/get`,
+          routes: objects.filter(isCrudObject).map((object) => ({
+            path: `/${targetServiceTag}/${object.objectType}/get`,
             upperName: upperFirst(object.objectType)
           }))
         },
@@ -103,45 +166,129 @@ async function emitAction(action, objects, flows, serviceTag) {
           roleName: 'FlowObjectsRole',
           flowTag: 'GetRange',
           flowStepName: '',
-          routes: objects.filter(isCrudObject)
-            .filter(object => object.identifiers && object.identifiers.some(i => i.type === 'sortKey'))
-            .map(object => ({
-            path: `/${serviceTag ?? '${self:custom.iz_serviceName}'}/${object.objectType}/getRange`,
-            upperName: upperFirst(object.objectType)
-          }))
+          routes: objects
+            .filter(isCrudObject)
+            .filter(
+              (object) =>
+                object.identifiers &&
+                object.identifiers.some((i) => i.type === 'sortKey')
+            )
+            .map((object) => ({
+              path: `/${targetServiceTag}/${object.objectType}/getRange`,
+              upperName: upperFirst(object.objectType)
+            }))
         }
       ]
     };
   }
 
   artifacts.push(
-    { path: `${source}/${action}_HdrSqs.js`, content: await render('FlowHandler_HdrSqs.ejs', { ...shared, mainFileName, functionName: action, queueName: `${action}HdrSqs` }) },
-    { path: `${source}/${action}_WbsMain.js`, content: await render('FlowMain_Wbs.ejs', { ...shared, functionName: action }) },
-    { path: `${source}/${action}_HdrWbs.js`, content: await render('FlowEndpoint_HdrWbs.ejs', { ...shared, mainFileName: `${action}_WbsMain`, functionName: action, route: action }) }
+    {
+      path: `${source}/${action}_HdrSqs.js`,
+      content: await render('FlowHandler_HdrSqs.ejs', {
+        ...shared,
+        mainFileName,
+        functionName: action,
+        queueName: `${action}HdrSqs`
+      })
+    },
+    {
+      path: `${source}/${action}_WbsMain.js`,
+      content: await render('FlowMain_Wbs.ejs', {
+        ...shared,
+        functionName: action
+      })
+    },
+    {
+      path: `${source}/${action}_HdrWbs.js`,
+      content: await render('FlowEndpoint_HdrWbs.ejs', {
+        ...shared,
+        mainFileName: `${action}_WbsMain`,
+        functionName: action,
+        route: action
+      })
+    }
   );
   const functions = [
-    { type: 'wbs', functionName: `${action}HdrWbs`, handlerPath: `${handlerRoot}/${action}_HdrWbs.main`, roleName: 'FlowObjectsRole', routeName: action, flowTag: action, flowStepName: '' },
-    { type: 'sqs', functionName: `${action}HdrSqs`, handlerPath: `${handlerRoot}/${action}_HdrSqs.main`, roleName: 'FlowObjectsRole', queueName: `${action}HdrSqs`, flowTag: action, flowStepName: '' }
+    {
+      type: 'wbs',
+      functionName: `${action}HdrWbs`,
+      handlerPath: `${handlerRoot}/${action}_HdrWbs.main`,
+      roleName: 'FlowObjectsRole',
+      routeName: action,
+      flowTag: action,
+      flowStepName: ''
+    },
+    {
+      type: 'sqs',
+      functionName: `${action}HdrSqs`,
+      handlerPath: `${handlerRoot}/${action}_HdrSqs.main`,
+      roleName: 'FlowObjectsRole',
+      queueName: `${action}HdrSqs`,
+      flowTag: action,
+      flowStepName: ''
+    }
   ];
   const complete = `${action}Complete`;
   artifacts.push(
-    { path: `${source}/${complete}_Main.js`, content: await render('FlowEndpointComplete_Main.ejs', { action }) },
-    { path: `${source}/${complete}_HdrSqs.js`, content: await render('FlowHandler_HdrSqs.ejs', { ...shared, mainFileName: `${complete}_Main`, functionName: complete, queueName: `${action}CompleteHdrSqs` }) }
+    {
+      path: `${source}/${complete}_Main.js`,
+      content: await render('FlowEndpointComplete_Main.ejs', { action })
+    },
+    {
+      path: `${source}/${complete}_HdrSqs.js`,
+      content: await render('FlowHandler_HdrSqs.ejs', {
+        ...shared,
+        mainFileName: `${complete}_Main`,
+        functionName: complete,
+        queueName: `${action}CompleteHdrSqs`
+      })
+    }
   );
-  functions.push({ type: 'sqs', functionName: `${action}CompleteHdrSqs`, handlerPath: `${handlerRoot}/${complete}_HdrSqs.main`, roleName: 'FlowObjectsRole', queueName: `${action}CompleteHdrSqs`, flowTag: action, flowStepName: 'Complete' });
-  if (generateCode.some(config => config.codeHookTag === 'beforeLogical')) {
+  functions.push({
+    type: 'sqs',
+    functionName: `${action}CompleteHdrSqs`,
+    handlerPath: `${handlerRoot}/${complete}_HdrSqs.main`,
+    roleName: 'FlowObjectsRole',
+    queueName: `${action}CompleteHdrSqs`,
+    flowTag: action,
+    flowStepName: 'Complete'
+  });
+  if (generateCode.some((config) => config.codeHookTag === 'beforeLogical')) {
     const beforeMain = `${action}BeforeLogical_Main`;
     artifacts.push(
-      { path: `${source}/${beforeMain}.js`, content: await render('FlowEndpointBeforeLogical_Main.ejs', shared) },
-      { path: `${source}/${action}BeforeLogical_HdrSqs.js`, content: await render('FlowHandler_HdrSqs.ejs', { ...shared, mainFileName: beforeMain, functionName: `${action}BeforeLogicalMain`, queueName: `${action}BeforeLogicalHdrSqs` }) }
+      {
+        path: `${source}/${beforeMain}.js`,
+        content: await render('FlowEndpointBeforeLogical_Main.ejs', shared)
+      },
+      {
+        path: `${source}/${action}BeforeLogical_HdrSqs.js`,
+        content: await render('FlowHandler_HdrSqs.ejs', {
+          ...shared,
+          mainFileName: beforeMain,
+          functionName: `${action}BeforeLogicalMain`,
+          queueName: `${action}BeforeLogicalHdrSqs`
+        })
+      }
     );
-    functions.push({ type: 'sqs', functionName: `${action}BeforeLogicalHdrSqs`, handlerPath: `${handlerRoot}/${action}BeforeLogical_HdrSqs.main`, roleName: 'FlowObjectsRole', queueName: `${action}BeforeLogicalHdrSqs`, flowTag: action, flowStepName: 'BeforeLogical' });
+    functions.push({
+      type: 'sqs',
+      functionName: `${action}BeforeLogicalHdrSqs`,
+      handlerPath: `${handlerRoot}/${action}BeforeLogical_HdrSqs.main`,
+      roleName: 'FlowObjectsRole',
+      queueName: `${action}BeforeLogicalHdrSqs`,
+      flowTag: action,
+      flowStepName: 'BeforeLogical'
+    });
   }
   return { artifacts, functions };
 }
 
 function isCrudObject(object) {
-  return object?.generatedBy === 'userGenerated' || object?.generatedBy === 'systemGenerated';
+  return (
+    object?.generatedBy === 'userGenerated' ||
+    object?.generatedBy === 'systemGenerated'
+  );
 }
 
 function upperFirst(value) {
@@ -150,7 +297,7 @@ 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);
 }
 
 function renderFunction(descriptor) {

package/src/emit/crud/emitDynamicCrudFlowSchemas.js

@@ -4,19 +4,26 @@ const ACTIONS = ['Create', 'Update', 'Delete', 'Get'];
 const MESSAGE_ATTRIBUTES = ['userId', 'correlationId'];
 
 export const dynamicCrudFlowSchemaPaths = ACTIONS.map(
-  action => `app/src/schemas/FlowSchemas/generateCode/${action}.js`
+  (action) =>
+    `app/src/schemas/FlowSchemas/generateCode/FlowObjects/${action}.js`
 );
 
 export function emitDynamicCrudFlowSchemas({ objects, flows = [] }) {
   if (!Array.isArray(objects) || !Array.isArray(flows)) {
     throw new TypeError('objects and flows must be arrays');
   }
-  if (!objects.some(object => object?.generatedBy === 'userGenerated' || object?.generatedBy === 'systemGenerated')) {
+  if (
+    !objects.some(
+      (object) =>
+        object?.generatedBy === 'userGenerated' ||
+        object?.generatedBy === 'systemGenerated'
+    )
+  ) {
     return [];
   }
 
   return ACTIONS.map((action, index) => {
-    const flow = createDynamicFlow(action, hasBeforeLogicalStep(flows, action));
+    const flow = _createDynamicFlow(action, _hasBeforeLogicalStep(flows, action));
     return {
       path: dynamicCrudFlowSchemaPaths[index],
       content: renderDynamicCrudFlowSchema(action, flow)
@@ -24,19 +31,21 @@ export function emitDynamicCrudFlowSchemas({ objects, flows = [] }) {
   });
 }
 
-function createDynamicFlow(action, hasBeforeLogicalStep) {
+function _createDynamicFlow(action, hasBeforeLogicalStep) {
   const outputTopic = action !== 'Get';
   const flowSteps = [
     {
       stepName: 'start',
       properties: [],
       messageAttributes: MESSAGE_ATTRIBUTES,
-      ...(outputTopic ? {
-        returnValues: {
-          properties: [],
-          messageAttributes: MESSAGE_ATTRIBUTES
-        }
-      } : {})
+      ...(outputTopic
+        ? {
+            returnValues: {
+              properties: [],
+              messageAttributes: MESSAGE_ATTRIBUTES
+            }
+          }
+        : {})
     }
   ];
 
@@ -48,6 +57,7 @@ function createDynamicFlow(action, hasBeforeLogicalStep) {
       messageAttributes: MESSAGE_ATTRIBUTES
     });
   }
+
   if (action !== 'Get') {
     flowSteps.push({
       stepName: 'Complete',
@@ -57,13 +67,17 @@ function createDynamicFlow(action, hasBeforeLogicalStep) {
     });
   }
 
+  let eventTypes = ['lambdaSyncInv', 'lambdaSyncApi'];
+  if (outputTopic) {
+    eventTypes = ['ownTopic'];
+  }
+
   return {
     flowTag: action,
-    isDynamicObjectType: true,
     initiateBy: 'system',
     handleObj: 'one',
     statusType: 'none',
-    event: outputTopic ? ['ownTopic'] : ['lambdaSyncInv', 'lambdaSyncApi'],
+    event: eventTypes,
     outputTopic,
     stepMessageAttributes: {
       userId: { propertyName: 'x-correlation-base-user-id', type: 'string' },
@@ -73,12 +87,14 @@ function createDynamicFlow(action, hasBeforeLogicalStep) {
   };
 }
 
-function hasBeforeLogicalStep(flows, action) {
-  return flows.some(flow => {
+function _hasBeforeLogicalStep(flows, action) {
+  return flows.some((flow) => {
     const config = flow?.generatedCodeConfig;
-    return config?.generatedCodeTag === action.toLowerCase()
-      && config.codeHookTag === 'beforeLogical'
-      && Array.isArray(flow.event)
-      && flow.event.includes(config.invocationType);
+    return (
+      config?.generatedCodeTag === action.toLowerCase() &&
+      config.codeHookTag === 'beforeLogical' &&
+      Array.isArray(flow.event) &&
+      flow.event.includes(config.invocationType)
+    );
   });
 }

package/src/emit/crud/generateCrudApplicationArtifacts.js

@@ -2,15 +2,23 @@ import { buildGenerationPlan } from '../../plan/buildGenerationPlan.js';
 import { commitArtifacts } from '../../output/commitArtifacts.js';
 import { compileProject } from '../../compile/compileProject.js';
 import { loadLocalSchemaArrays } from './loadLocalSchemaArrays.js';
-import { crudApplicationManagedPaths, emitCrudApplicationArtifacts } from './emitCrudApplicationArtifacts.js';
+import {
+  crudApplicationManagedPaths,
+  emitCrudApplicationArtifacts
+} from './emitCrudApplicationArtifacts.js';
 
 export async function generateCrudApplicationArtifacts(rootPath, options = {}) {
   const project = compileProject({ ...options, rootPath });
   const schemas = await loadLocalSchemaArrays(project);
-  const artifacts = await emitCrudApplicationArtifacts({ ...schemas, serviceTag: project.serviceTag });
-  const files = await commitArtifacts(buildGenerationPlan(project, artifacts, {
-    managedPaths: crudApplicationManagedPaths(),
-    managedScope: 'crud-application'
-  }));
+  const artifacts = await emitCrudApplicationArtifacts({
+    ...schemas,
+    serviceTag: project.serviceTag
+  });
+  const files = await commitArtifacts(
+    buildGenerationPlan(project, artifacts, {
+      managedPaths: crudApplicationManagedPaths(),
+      managedScope: 'crud-application'
+    })
+  );
   return { project, files };
 }

package/src/emit/crud/generateDynamicCrudFlowSchemas.js

@@ -13,7 +13,10 @@ export async function generateDynamicCrudFlowSchemas(rootPath, options = {}) {
   const plan = buildGenerationPlan(
     project,
     emitDynamicCrudFlowSchemas(schemaInputs),
-    { managedPaths: dynamicCrudFlowSchemaPaths, managedScope: 'crud-flow-schemas' }
+    {
+      managedPaths: dynamicCrudFlowSchemaPaths,
+      managedScope: 'crud-flow-schemas'
+    }
   );
   const files = await commitArtifacts(plan);