@izara_project/izara-core-generate-service-code 1.0.73 → 1.0.74

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-core-generate-service-code",
-  "version": "1.0.73",
+  "version": "1.0.74",
   "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/emit/coreFunction/emitCoreFunctionArtifacts.js

@@ -1,6 +1,8 @@
 import ejsLib from 'ejs';
 import { readFile } from 'node:fs/promises';
 
+import { customFlowNextSteps } from '../custom/customFlows.js';
+
 const TEMPLATE_URL = new URL('./templates/', import.meta.url);
 const APP_ROOT = 'app/sls_yaml/generatedCode/source';
 const SRC_ROOT = 'app/src/generatedCode/CoreFunctions';
@@ -94,6 +96,7 @@ export async function emitCoreFunctionArtifacts({ project, objects = [], relatio
     objects, 
     relationships,
     flows,
+    customFlowNextSteps: customFlowNextSteps(flows),
     objectGraphServiceTags,
     relationshipGraphServiceTags,
     crud,

package/src/emit/coreFunction/templates/InitialSetupConfig.ejs

@@ -50,9 +50,9 @@ const externalServices = {
 const tableConfigs = {
   prod: {
     Config: {},
-    <% dynamoTableNames.forEach(tableName => { -%>
-    <%= tableName %>: {}
-    <% }); -%>
+<% dynamoTableNames.forEach(tableName => { -%>
+    <%= tableName %>: {},
+<% }); -%>
     // <#InitialSetupConfig_ExtraProdTableConfigs#>
     // <#/InitialSetupConfig_ExtraProdTableConfigs#>
   },
@@ -61,11 +61,11 @@ const tableConfigs = {
       clearDataWhenRefresh: true,
       rawSource: false
     },
-    <% dynamoTableNames.forEach(tableName => { -%>
+<% dynamoTableNames.forEach(tableName => { -%>
     <%= tableName %>: {
       clearDataWhenRefresh: true
-    }
-    <% }); -%>
+    },
+<% }); -%>
     // <#InitialSetupConfig_ExtraTestTableConfigs#>
     // <#/InitialSetupConfig_ExtraTestTableConfigs#>
   }
@@ -91,31 +91,31 @@ const tableConfigs = {
   });
 -%>
 const snsTopicSubscriptions = [
-  <% if (relSubs.length > 0) { -%>
+<% if (relSubs.length > 0) { -%>
   // ------------------------------------------------------------
   // Relationship Subscriptions
   // ------------------------------------------------------------
-  <% relSubs.forEach(function(sub, idx) { -%>
+<% relSubs.forEach(function(sub, idx) { -%>
   {
     serviceTag: '<%= sub.serviceTag %>',
     topicName: '<%= sub.topicName %>',
     sqsEndpoint: '<%= sub.sqsEndpoint %>'
   },
-  <% }); -%>
-  <% } -%>
-  <% if (nodeSubs.length > 0) { -%>
+<% }); -%>
+<% } -%>
+<% if (nodeSubs.length > 0) { -%>
 
   // ------------------------------------------------------------
   // Node Subscriptions
   // ------------------------------------------------------------
-  <% nodeSubs.forEach(function(sub, idx) { -%>
+<% nodeSubs.forEach(function(sub, idx) { -%>
   {
     serviceTag: '<%= sub.serviceTag %>',
     topicName: '<%= sub.topicName %>',
     sqsEndpoint: '<%= sub.sqsEndpoint %>'
   },
-  <% }); -%>
-  <% } -%>
+<% }); -%>
+<% } -%>
 
   //(<additionalSubscription>)
   //(</additionalSubscription>)
@@ -126,11 +126,11 @@ const snsTopicSubscriptions = [
 // ============================================================
 function roleConfigs() {
   const externalLambdaRole = [
-    <% if (crud && objectGraphServiceTags && objectGraphServiceTags.length > 0) { -%>
+<% if (crud && objectGraphServiceTags && objectGraphServiceTags.length > 0) { -%>
     {
       roleName: 'FlowObjects',
       statement: [
-        <% objectGraphServiceTags.forEach(function(tag, idx) { -%>
+<% objectGraphServiceTags.forEach(function(tag, idx) { -%>
         {
           Sid: 'FlowObjectsInvokeGetNode<%= tag %>',
           Effect: 'Allow',
@@ -149,7 +149,7 @@ function roleConfigs() {
             `arn:aws:sns:${process.env.iz_region}:${process.env.iz_accountId}:${snsSharedLib.snsTopicNameByFlowSchema(_izContext, 'CreateNode_In', '<%= tag %>')}`
           ]
         },
-        <% }); -%>
+<% }); -%>
         //(<createFlowObjectsRole>)
         //(</createFlowObjectsRole>)
       ]
@@ -158,7 +158,7 @@ function roleConfigs() {
     {
       roleName: 'ProcFindData',
       statement: [
-        <% objectGraphServiceTags.forEach(function(tag, idx) { -%>
+<% objectGraphServiceTags.forEach(function(tag, idx) { -%>
         {
           Sid: 'ProcFindDataInvokeGetNode<%= tag %>',
           Effect: 'Allow',
@@ -167,18 +167,17 @@ function roleConfigs() {
             `arn:aws:lambda:${process.env.iz_region}:${process.env.iz_accountId}:function:${lambdaSharedLib.lambdaFunctionName(_izContext, 'GetNodeHdrInv', '<%= tag %>')}`
           ]
         }
-        <% }); -%>
+<% }); -%>
         //(<createProcFindDataRole>)
         //(</createProcFindDataRole>)
       ]
     },
-    <% } -%>
-
-    <% if (hasRelationships && relationshipGraphServiceTags && relationshipGraphServiceTags.length > 0) { -%>
+<% } -%>
+<% if (hasRelationships && relationshipGraphServiceTags && relationshipGraphServiceTags.length > 0) { -%>
     {
       roleName: 'FlowRelationship',
       statement: [
-        <% relationshipGraphServiceTags.forEach(function(tag, idx) { -%>
+<% relationshipGraphServiceTags.forEach(function(tag, idx) { -%>
         {
           Sid: 'FlowRelationshipInvokeGetRelationship<%= tag %>',
           Effect: 'Allow',
@@ -200,13 +199,14 @@ function roleConfigs() {
             `arn:aws:sns:${process.env.iz_region}:${process.env.iz_accountId}:${snsSharedLib.snsTopicNameByFlowSchema(_izContext, 'MoveRelationship_In', '<%= tag %>')}`
           ]
         }
-        <% }); -%>
+<% }); -%>
         //(<createFlowRelationshipRole>)
         //(</createFlowRelationshipRole>)
       ]
-    }
-    <% } -%>
-    <% s3Flows.forEach(function(flow) { -%> {
+    },
+<% } -%>
+<% s3Flows.forEach(function(flow) { -%>
+    {
       roleName: '<%= flow.roleName %>',
       statement: [
         {
@@ -229,7 +229,79 @@ function roleConfigs() {
         //(<create<%= flow.roleName %>Role>)
         //(</create<%= flow.roleName %>Role>)
       ]
-    } <% }); %>
+    },
+<% }); -%>
+<%
+  let nextStepsFlows = [];
+  if (typeof customFlowNextSteps !== 'undefined' && customFlowNextSteps) {
+    nextStepsFlows = customFlowNextSteps;
+  }
+  for (let flowIdx = 0; flowIdx < nextStepsFlows.length; flowIdx++) {
+    const flow = nextStepsFlows[flowIdx];
+    const snsTopicItems = [];
+    const lambdaInvItems = [];
+    for (const s of flow.nextSteps) {
+      if (s.targetType === 'extTopic' || s.targetType === 'ownTopic') {
+        snsTopicItems.push(s);
+      } else if (s.targetType === 'lambdaSyncInv') {
+        lambdaInvItems.push(s);
+      }
+    }
+-%>
+    {
+      roleName: '<%= flow.roleName %>',
+      statement: [
+<%   if (snsTopicItems.length > 0) { -%>
+        {
+          Sid: '<%= flow.roleName %>PublishNextStepsTopics',
+          Effect: 'Allow',
+          Action: ['sns:Publish'],
+          Resource: [
+<%
+      for (let idx = 0; idx < snsTopicItems.length; idx++) {
+        const item = snsTopicItems[idx];
+        let tagArg = '';
+        if (item.serviceTag) {
+          tagArg = `, '${item.serviceTag}'`;
+        }
+        let comma = '';
+        if (idx < snsTopicItems.length - 1) {
+          comma = ',';
+        }
+-%>
+            `arn:aws:sns:${process.env.iz_region}:${process.env.iz_accountId}:${snsSharedLib.snsTopicNameByFlowSchema(_izContext, '<%- item.topic %>'<%- tagArg %>)}`<%= comma %>
+<%    } -%>
+          ]
+        }<% if (lambdaInvItems.length > 0) { %>,<% } %>
+<%   } -%>
+<%   if (lambdaInvItems.length > 0) { -%>
+        {
+          Sid: '<%= flow.roleName %>InvokeNextStepsFunctions',
+          Effect: 'Allow',
+          Action: ['lambda:InvokeFunction'],
+          Resource: [
+<%
+      for (let idx = 0; idx < lambdaInvItems.length; idx++) {
+        const item = lambdaInvItems[idx];
+        let tagArg = '';
+        if (item.serviceTag) {
+          tagArg = `, '${item.serviceTag}'`;
+        }
+        let comma = '';
+        if (idx < lambdaInvItems.length - 1) {
+          comma = ',';
+        }
+-%>
+            `arn:aws:lambda:${process.env.iz_region}:${process.env.iz_accountId}:function:${lambdaSharedLib.lambdaFunctionName(_izContext, '<%- item.topic %>'<%- tagArg %>)}`<%= comma %>
+<%    } -%>
+          ]
+        }
+<%   } -%>
+        //(<create<%= flow.roleName %>Role>)
+        //(</create<%= flow.roleName %>Role>)
+      ]
+    }<% if (flowIdx < nextStepsFlows.length - 1) { %>,<% } %>
+<% } -%>
     //(<additionalRole>)
     //(</additionalRole>)
   ];

package/src/emit/coreFunction/templates/InitialSetupRunner_uploadSchema.ejs

@@ -8,6 +8,7 @@ const SERVICE_TAG = {
   MEDIA: 'Media'
 };
 
+//(<ignoreExternalServices>)
 const ignoreExternalServices = {
   [SERVICE_TAG.TRANSLATIONS]: false,
   [SERVICE_TAG.GRAPH_HANDLER]: false,
@@ -15,6 +16,7 @@ const ignoreExternalServices = {
   [SERVICE_TAG.TRANSLATE_IDS]: false,
   [SERVICE_TAG.MEDIA]: false
 };
+//(</ignoreExternalServices>)
 
 export default async function uploadSchema(_izContext) {
   console.log('======== UploadSchema ========');

package/src/emit/coreFunction/templates/UploadSchema_Main.ejs

@@ -25,6 +25,7 @@ const SERVICE_TAG = {
   MEDIA: 'Media'
 };
 
+//(<ignoreExternalServices>)
 const ignoreExternalServices = {
   [SERVICE_TAG.TRANSLATIONS]: false,
   [SERVICE_TAG.GRAPH_HANDLER]: false,
@@ -32,6 +33,7 @@ const ignoreExternalServices = {
   [SERVICE_TAG.TRANSLATE_IDS]: false,
   [SERVICE_TAG.MEDIA]: false
 };
+//(</ignoreExternalServices>)
 
 const uploadSchema = async (_izContext) => {
   try {

package/src/emit/custom/customFlows.js

@@ -159,3 +159,45 @@ export function triggerCacheQueueNames(flow) {
   }
   return queues;
 }
+
+function _stepNextSteps(step) {
+  if (!step || !Array.isArray(step.nextSteps)) {
+    return [];
+  }
+  return step.nextSteps.filter(
+    (item) =>
+      typeof item === 'object' &&
+      item !== null &&
+      typeof item.targetType === 'string'
+  );
+}
+
+export function customFlowNextSteps(flows) {
+  if (!Array.isArray(flows)) {
+    return [];
+  }
+  const results = [];
+  for (const flow of flows) {
+    if (typeof flow?.flowTag !== 'string' || flow.flowTag === '') {
+      continue;
+    }
+    const roleName = customFlowRoleName(flow.flowTag);
+    const steps = flow.flowSteps ?? [];
+    const nextStepsList = [];
+    for (const step of steps) {
+      const items = _stepNextSteps(step);
+      for (const item of items) {
+        nextStepsList.push(item);
+      }
+    }
+    if (nextStepsList.length > 0) {
+      results.push({
+        flowTag: flow.flowTag,
+        roleName,
+        nextSteps: nextStepsList
+      });
+    }
+  }
+  return results;
+}
+

package/src/emit/custom/emitCustomFlowApplicationArtifacts.js

@@ -112,7 +112,7 @@ async function emitFlow(flow, objects) {
     flowStepName: '',
     mainFileName: `${process}_Main`,
     functionName: process,
-    startConfig: startConfig(flow)
+    startConfig: _startConfig(flow)
   };
   const artifacts = needsProcessMain(flow)
     ? [
@@ -319,7 +319,7 @@ async function emitExtTopicStep({ flow, step, flowTag, stepName }) {
   const artifacts = [
     {
       path: `${source}/${mainFileName}.js`,
-      content: await renderStepMain(functionName)
+      content: await renderStepMain(functionName, _startConfig(flow))
     }
   ];
   const functions = [];
@@ -373,7 +373,7 @@ async function emitDsqStep({ flow, step, flowTag, stepName }) {
   if (!stepEvents.includes('extTopic')) {
     artifacts.push({
       path: `${source}/${mainFileName}.js`,
-      content: await renderStepMain(functionName)
+      content: await renderStepMain(functionName, startConfig)
     });
   }
   const functions = [];
@@ -418,7 +418,7 @@ async function emitOwnTopicRoot(flow, objects) {
     flowTag: flow.flowTag,
     flowStepName: '',
     upperCaseFlowTag: tag,
-    startConfig: startConfig(flow)
+    startConfig: _startConfig(flow)
   };
   return {
     artifacts: [
@@ -638,8 +638,20 @@ function _s3HandlerData({ action, flow, functionName, mainFileName, handler }) {
   return { functionName, handlerType: handler };
 }
 
-function startConfig(flow) {
-  const start = flow.flowSteps?.[0];
+function _startConfig(flow) {
+  const steps = flow.flowSteps ?? [];
+  const start =
+    steps.find(
+      (s) =>
+        typeof s?.stepName === 'string' &&
+        s.stepName.toLowerCase() === 'inprocess'
+    ) ??
+    steps.find(
+      (s) =>
+        typeof s?.stepName === 'string' &&
+        s.stepName.toLowerCase() === 'start'
+    ) ??
+    steps[0];
   if (start) {
     return stepConfig(flow, start);
   }
@@ -691,7 +703,8 @@ async function renderEndpointMain(flow, functionName, objects) {
     flowTag: flow.flowTag,
     upperCaseFlowTag: upperFirst(flow.flowTag),
     functionName,
-    tableName: storedCacheTableName(flow, objects)
+    tableName: storedCacheTableName(flow, objects),
+    startConfig: _startConfig(flow)
   });
 }
 
@@ -715,8 +728,8 @@ function storedCacheTableName(flow, objects) {
   );
 }
 
-async function renderStepMain(functionName) {
-  return renderCustom('FlowStep_Main.ejs', { functionName });
+async function renderStepMain(functionName, startConfig = null) {
+  return renderCustom('FlowStep_Main.ejs', { functionName, startConfig });
 }
 
 function renderMain(functionName) {

package/src/emit/custom/templates/triggerCache/CheckTriggerCache_HdrSqs.ejs

@@ -11,7 +11,8 @@ let perRecordsValidatorSchema = {
   properties: {
 <%_ startConfig.properties.forEach((prop, index) => { _%>
     <%- /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(prop.propertyName) ? prop.propertyName : `'${prop.propertyName}'` %>: {
-      type: '<%- prop.type || 'string' %>'
+      type: '<%- prop.type || 'string' %>'<% if (typeof prop.default !== 'undefined') { %>,
+      default: <%- typeof prop.default === 'string' ? `'${prop.default.replace(/'/g, "\\'")}'` : JSON.stringify(prop.default) %><% } %>
     }<%- index < startConfig.properties.length - 1 ? ',' : '' %>
 <%_ }) _%>
   },

package/src/emit/function/functionYamlArtifact.js

@@ -305,17 +305,22 @@ function _functionSetting(functionName) {
   return `  #<#${functionName}FunctionSetting#>\n  #<#/${functionName}FunctionSetting#>`;
 }
 
-function _sqsFilterPatterns(functionName) {
-  return `        filterPatterns:
+function _sqsFilterPatterns(
+  callingFlowName,
+  hookFunctionName = callingFlowName
+) {
+  return `        #<#${hookFunctionName}FilterPatterns#>
+        filterPatterns:
           - body:
               MessageAttributes:
                 callingFlow:
                   Value:
-                    - \${self:custom.iz_resourcePrefix}${functionName}
+                    - \${self:custom.iz_resourcePrefix}${callingFlowName}
           - body:
               MessageAttributes:
                 callingFlow:
                   Value:
                     - exists: false
+        #<#/${hookFunctionName}FilterPatterns#>
 `;
 }

package/src/emit/relationship/templates/ChangeRelationshipComplete_Main.ejs

@@ -36,13 +36,17 @@ const { TOPIC_NAME_GENERATE_CODE, PREFIX } = consts;
 
 export default async function changeRelationshipComplete(
   _izContext,
-  returnValue,
-  status,
-  errorsFound,
-  graphServiceTag,
+  requestParams,
   passBackProperties = {}
 ) {
   try {
+    const {
+      returnValue,
+      status,
+      errorsFound,
+      graphServiceTag
+    } = requestParams;
+
     _izContext.logger.debug('Function:ChangeRelationshipComplete', {
       returnValue: returnValue,
       status: status,
@@ -51,15 +55,6 @@ export default async function changeRelationshipComplete(
       passBackProperties: passBackProperties
     });
 
-    // start create awaitingStepId
-    const linkTypeId = createLinkTypeId(
-      _izContext,
-      returnValue.requestParams.firstObject.objType,
-      returnValue.requestParams.secondObject.objType,
-      returnValue.requestParams.newRelType,
-      returnValue.requestParams.oldRelTypeAndDirection.relationshipDirection
-    );
-
     let awaitingStepId = asyncFlowSharedLib.createAwaitingStepId(
       returnValue.parentFlowId, // hash id
       PREFIX.changeRel // prefix, use constant further

package/src/emit/relationship/templates/ChangeRelationship_Main.ejs

@@ -390,15 +390,6 @@ export default async function <%- functionName %>(
       return changeRelCompleteMsg;
     }
 
-    // before create awaitingStepId per graph storageResource
-    const linkTypeId = createLinkTypeId(
-      _izContext,
-      firstObject.objType,
-      secondObject.objType,
-      newRelType,
-      oldRelTypeAndDirection.relationshipDirection
-    );
-
     let usedGraphServiceTag = []; // collect used graph serviceTag, use to check duplicate graph serviceTag across graph serverTag
     let targetGraphStorageResources = []; // collect used graph storageResources, filtered duplicate graphServiceTag from graphServerTag out
     let awaitingStepIds = [];
@@ -412,12 +403,12 @@ export default async function <%- functionName %>(
         targetGraphStorageResources.push(targetStorageResource);
 
         // awaitingStepId per graphServiceTag
-        awaitingStepIds.push(
-          asyncFlowSharedLib.createAwaitingStepId(
+        awaitingStepIds.push({
+          awaitingStepId: asyncFlowSharedLib.createAwaitingStepId(
             parentFlowId, // hash id
             PREFIX.changeRel // prefix, use constant further
           )
-        );
+        });
       }
     }
 
@@ -426,11 +417,11 @@ export default async function <%- functionName %>(
       await asyncFlowSharedLib.createAwaitingMultipleSteps(
         _izContext,
         asyncFlowSharedLib.createPendingStepId(
-          // pendingStepId
           _izContext.uniqueRequestId, // hash id
           PREFIX.changeRel // prefix, use constant further
         ),
-        awaitingStepIds // awaitingStepIds
+        awaitingStepIds,
+        {}
       );
 
       // prepare message body

package/src/emit/relationship/templates/CreateRelationshipComplete_Main.ejs

@@ -36,13 +36,17 @@ const { TOPIC_NAME_GENERATE_CODE, PREFIX } = consts;
 
 export default async function createRelationshipComplete(
   _izContext,
-  returnValue,
-  status,
-  errorsFound,
-  graphServiceTag,
+  requestParams,
   passBackProperties = {}
 ) {
   try {
+    const {
+      returnValue,
+      status,
+      errorsFound,
+      graphServiceTag
+    } = requestParams;
+
     _izContext.logger.debug('Function:createRelationshipComplete', {
       returnValue: returnValue,
       status: status,
@@ -51,15 +55,6 @@ export default async function createRelationshipComplete(
       passBackProperties: passBackProperties
     });
 
-    // start create awaitingStepId
-    const linkTypeId = createLinkTypeId(
-      _izContext,
-      returnValue.requestParams.firstObject.objType,
-      returnValue.requestParams.secondObject.objType,
-      returnValue.requestParams.relType,
-      returnValue.requestParams.relationshipDirection
-    );
-
     let awaitingStepId = asyncFlowSharedLib.createAwaitingStepId(
       returnValue.parentFlowId, // hash id
       PREFIX.createRel // prefix, use constant further

package/src/emit/relationship/templates/CreateRelationship_Main.ejs

@@ -83,7 +83,7 @@ export default async function createRelationship(
       relationshipDirection,
       relationshipProperties,
       deepPathConditional,
-      settings
+      settings = {}
       //(<requestParamCreateRel>)
       //(</requestParamCreateRel>)
     } = requestParams;
@@ -376,15 +376,6 @@ export default async function createRelationship(
       return createRelCompleteMsg;
     }
 
-    // before create awaitingStepId per graph storageResource
-    const linkTypeId = createLinkTypeId(
-      _izContext,
-      firstObject.objType,
-      secondObject.objType,
-      relType,
-      relationshipDirection
-    );
-
     let usedGraphServiceTag = []; // collect used graph serviceTag, use to check duplicate graph serviceTag across graph serverTag
     let targetGraphStorageResources = []; // collect used graph storageResources, filtered duplicate graphServiceTag from graphServerTag out
     let awaitingStepIds = [];
@@ -398,12 +389,12 @@ export default async function createRelationship(
         targetGraphStorageResources.push(targetStorageResource);
 
         // awaitingStepId per graphServiceTag
-        awaitingStepIds.push(
-          asyncFlowSharedLib.createAwaitingStepId(
+        awaitingStepIds.push({
+          awaitingStepId: asyncFlowSharedLib.createAwaitingStepId(
             parentFlowId, // hash id
             PREFIX.createRel // prefix, use constant further
           )
-        );
+        });
       }
 
       // if have storageResource.storageType === "dynamoDB" will create relationship here
@@ -453,12 +444,12 @@ export default async function createRelationship(
       // save awaiting
       await asyncFlowSharedLib.createAwaitingMultipleSteps(
         _izContext,
-        awaitingStepIds, // awaitingStepIds
         asyncFlowSharedLib.createPendingStepId(
-          // pendingStepId
           _izContext.uniqueRequestId, // hash id
           PREFIX.createRel // prefix, use constant further
-        )
+        ),
+        awaitingStepIds,
+        {}
       );
 
       // prepare message body

package/src/emit/relationship/templates/DeleteRelationshipComplete_Main.ejs

@@ -36,13 +36,17 @@ const { TOPIC_NAME_GENERATE_CODE, PREFIX } = consts;
 
 export default async function deleteRelationshipComplete(
   _izContext,
-  returnValue,
-  status,
-  errorsFound,
-  graphServiceTag,
+  requestParams,
   passBackProperties = {}
 ) {
   try {
+    const {
+      returnValue,
+      status,
+      errorsFound,
+      graphServiceTag
+    } = requestParams;
+
     _izContext.logger.debug('Function:deleteRelationshipComplete', {
       returnValue: returnValue,
       status: status,