@izara_project/izara-core-generate-service-code 1.0.44 → 1.0.46

package/src/{generateCode/generateSchema/generateTextTag/systemText/data.js → generators/fromObjectSchema/textTag/systemText/systemText.js}

@@ -22,6 +22,7 @@ const __dirname = path.dirname(__filename);
 
 import consts from '#libs/Consts.js';
 import utils from '#libs/Utils.js';
+import libs from '#libs/Libs.js';
 
 const {
   firstLetterLowerCase: lowerCase,
@@ -67,10 +68,10 @@ function createSourceSystemText(
           serviceTag: getLocalConfig('iz_serviceTag')
         };
         const systemTextObjectSchemas = {
-          nameSpace: `${coreUtils.createObjTypeConcat(_izContext, objType)}_description`, // for each objectType
-          systemTextTag: `${fieldName}_${coreUtils.createObjTypeConcat(_izContext, objType)}`, // for each fieldName
-          openHook: `//(<${coreUtils.createObjTypeConcat(_izContext, objType)}${fieldName}Hook>)`,
-          closeHook: `//(</${coreUtils.createObjTypeConcat(_izContext, objType)}${fieldName}Hook>)`
+          nameSpace: `${coreUtils.createObjTypeConcat(_izContext, objType, '|')}|description`, // for each objectType
+          systemTextTag: `${fieldName}|${coreUtils.createObjTypeConcat(_izContext, objType, '|')}`, // for each fieldName
+          openHook: `//(<${coreUtils.createObjTypeConcat(_izContext, objType, '|')}${fieldName}Hook>)`,
+          closeHook: `//(</${coreUtils.createObjTypeConcat(_izContext, objType, '|')}${fieldName}Hook>)`
         };
         createSourceArray.push(systemTextObjectSchemas);
       }
@@ -84,10 +85,10 @@ function createSourceSystemText(
         serviceTag: getLocalConfig('iz_serviceTag')
       };
       const systemTextFlowSchemas = {
-        nameSpace: `${coreUtils.createFlowTypeConcat(_izContext, flowType)}`, // for each flowType
-        systemTextTag: `errors_${coreUtils.createFlowTypeConcat(_izContext, flowType)}`,
-        openHook: `//(<${coreUtils.createFlowTypeConcat(_izContext, flowType)}Hook>)`,
-        closeHook: `//(</${coreUtils.createFlowTypeConcat(_izContext, flowType)}Hook>)`
+        nameSpace: `${coreUtils.createFlowTypeConcat(_izContext, flowType, '|')}`, // for each flowType
+        systemTextTag: `errors|${coreUtils.createFlowTypeConcat(_izContext, flowType, '|')}`,
+        openHook: `//(<${coreUtils.createFlowTypeConcat(_izContext, flowType, '|')}Hook>)`,
+        closeHook: `//(</${coreUtils.createFlowTypeConcat(_izContext, flowType, '|')}Hook>)`
       };
       createSourceArray.push(systemTextFlowSchemas);
     }
@@ -104,10 +105,10 @@ function createSourceSystemText(
       if (relSchema[relTag].hasOwnProperty('fieldNames') && Object.keys(relSchema[relTag].fieldNames).length > 0) {
         for (const fieldName of Object.keys(relSchema[relTag].fieldNames)) {
           const systemTextRelSchemas = {
-            nameSpace: `${coreUtils.createRelTypeConcat(_izContext, relType)}_description`,
-            systemTextTag: `${fieldName}_${coreUtils.createRelTypeConcat(_izContext, relType)}`,
-            openHook: `//(<${coreUtils.createRelTypeConcat(_izContext, relType)}${fieldName}Hook>)`,
-            closeHook: `//(</${coreUtils.createRelTypeConcat(_izContext, relType)}${fieldName}Hook>)`
+            nameSpace: `${coreUtils.createRelTypeConcat(_izContext, relType, '|')}|description`,
+            systemTextTag: `${fieldName}_${coreUtils.createRelTypeConcat(_izContext, relType, '|')} `,
+            openHook: `//(<${coreUtils.createRelTypeConcat(_izContext, relType, '|')}${fieldName}Hook>)`,
+            closeHook: `//(</${coreUtils.createRelTypeConcat(_izContext, relType, '|')}${fieldName}Hook>)`
           }
           createSourceArray.push(systemTextRelSchemas);
         }
@@ -118,7 +119,7 @@ function createSourceSystemText(
   if (notificationSchemas.length > 0) {
     for (const notification of notificationSchemas) {
       const notificationSystemText = {
-        nameSpace: `sysNotification_${notification.notificationGrouping}`,
+        nameSpace: `sysNotification'|'${notification.notificationGrouping}`,
         systemTextTag: notification.notificationTag,
         openHook: `//(<${notification.notificationTag}Hook>)`,
         closeHook: `//(</${notification.notificationTag}Hook>)`

package/src/{generateCode/generateFlowStepWithPlugIn/byConfig/mainFunction/data.js → generators/fromPlugIn/byConfig/mainFunction/main.js}

@@ -30,9 +30,7 @@ const templateByHandleLogic = {
   paginated: path.join(__dirname, 'templatePaginated.ejs')
 }
 
-
 function data(_izContext, data, appPath) {
-  console.log("data main", data)
   return {
     templatePath: templateByHandleLogic[data.handleLogic],
     templateData: {

package/src/{generateCode/generateFlowStepWithPlugIn → generators/fromPlugIn}/byConfig/mainFunction/templateAwaitingStep.ejs

@@ -48,7 +48,7 @@ const PREFIX = {
  *
  * @returns {object} description of return value
  */
-export default async function AFlowStepsAwaitingMultipleSteps(
+export default async function <%- functionName %>(
   _izContext,
   returnValue,
   status,
@@ -58,22 +58,19 @@ export default async function AFlowStepsAwaitingMultipleSteps(
   //(</additionalParams>)
 ) {
   try {
-    _izContext.logger.debug('AFlowStepsAwaitingMultipleSteps _izContext: ', _izContext);
-    _izContext.logger.debug('AFlowStepsAwaitingMultipleSteps requestParams: ', {
+    _izContext.logger.debug('<%- functionName %> _izContext: ', _izContext);
+    _izContext.logger.debug('<%- functionName %> requestParams: ', {
       returnValue: returnValue,
       status: status
     });
-    _izContext.logger.debug('AFlowStepsAwaitingMultipleSteps passBackProperties: ', passBackProperties);
+    _izContext.logger.debug('<%- functionName %> passBackProperties: ', passBackProperties);
 
     //(<beforeCheckAwaitingStep>)
     //(</beforeCheckAwaitingStep>)
 
     const awaitingStepId = await asyncFlowSharedLib.createAwaitingStepId(
-      hash({
-        //(<createAwaitingStep>)
-        //(</createAwaitingStep>)
-      }),
-      "<%- firstLetterUpperCase(flowTag) %><%- firstLetterUpperCase(flowStepName) %>"
+      returnValue.parentFlowId,
+      "<%- firstLetterUpperCase(flowStepName) %>"
     );
     _izContext.logger.debug('awaitingStepId:', awaitingStepId);
 

package/src/{generateCode/generateFlowStepWithPlugIn → generators/fromPlugIn}/firstFlowStep/mainFunction/template.ejs

@@ -22,6 +22,7 @@ import { api } from '@izara_project/izara-core-library-external-request';
 import { webSocket } from '@izara_project/izara-core-library-external-request'
   <% } -%>
 <% } -%>
+import { identifierUuid } from '@izara_project/izara-shared-core';
 
 //(<optionalRequire>)
 //(</optionalRequire>)

package/src/{generateCode/generateFlowStepWithPlugIn → generators/fromPlugIn}/firstFlowStep/mainFunction/templateByConfig/awaitingSteps.ejs

@@ -1,13 +1,11 @@
 const allAwaitingStepsId = [];
+const parentFlowId = identifierUuid();
 
 allAwaitingStepsId.push(
   {
     awaitingStepId: asyncFlowSharedLib.createAwaitingStepId(
-      hash({
-        //(<createAwaitingStepIds>)
-        //(</createAwaitingStepIds>)
-      }),
-      "<%- firstLetterUpperCase(flowTag) %><%- firstLetterUpperCase(flowStepName)%>"
+      parentFlowId,
+      "<%- firstLetterUpperCase(flowStepName)%>"
     )
   }
 )
@@ -35,9 +33,12 @@ await asyncFlowSharedLib.createAwaitingMultipleStepsWithAdditionalAttributes(
 );
 
 //(<afterCreateAwatingSteps>)
+//(</afterCreateAwatingSteps>)
 
   let messageObject = {
-
+    parentFlowId: parentFlowId,
+    //(<messageObject>)
+    //(</messageObject>)
   };
 
   messageObject =  messageObject = callingFlowSharedLib.addCallingFlowToSnsRequestMessageObject(
@@ -52,7 +53,7 @@ await asyncFlowSharedLib.createAwaitingMultipleStepsWithAdditionalAttributes(
     )
   );
 
-//(</afterCreateAwatingSteps>)
+
 
 <%_ function firstLetterUpperCase(text) {
   return text.charAt(0).toUpperCase() + text.slice(1);

package/src/{generateCode/generateFlowStepWithPlugIn → generators/fromPlugIn}/firstFlowStep/yaml/template.ejs

@@ -1,5 +1,5 @@
 <%- functionNameConfig %>:
-  handler: <%- handlerPath %>
+  handler: <%- handlerPath %>.main
   name: ${self:custom.iz_resourcePrefix}<%- functionName %>
   role: <%- roleName %>Role
   #<#<%- hookTagSetting %>#>
@@ -9,6 +9,18 @@
     - sqs:
         arn: <%- event %>
         batchSize: 10
+        <%_ if (eventFlow === 'extTopic') { _%>
+        filterPatterns: #**** need to update serverless framework upper v.2.69.1
+          - body: { 'MessageAttributes': {
+                'callingFlow': {
+                  'Value': ['${self:custom.iz_resourcePrefix}<%- functionName %>']
+                }
+              }
+            } # functionName of callingFlow
+          - body: {
+              'MessageAttributes': { 'callingFlow': { 'Value': [{ 'exists': false }] } }
+            }
+        <%_ } _%>
 <%_ } else if (handlerType === 'hdrApi' && resourceApis.length > 0) { _%>
   events:
 <%_ resourceApis.forEach(api => { _%>

package/src/{generateCode/generateFlowStepWithPlugIn → generators/fromPlugIn}/index.js

@@ -15,7 +15,8 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import path from 'path'
+import path from 'path';
+import fs from 'fs';
 import yaml from 'yaml';
 import libs from '#libs/Libs.js';
 import utils from '#libs/Utils.js';
@@ -23,20 +24,20 @@ const { firstLetterUpperCase: upperCase, firstLetterLowerCase: lowerCase } = uti
 import consts from '#libs/Consts.js';
 const { SOURCE_PATH, HANDLER, RESOURCE_CLASSES, SNS_RESOURCE } = consts;
 
-import yamlFlowStep from './firstFlowStep/yaml/data.js';
-import handlerFlowStep from './firstFlowStep/handler/data.js';
-import mainFunctionFlowStep from './firstFlowStep/mainFunction/data.js';
-import sqsFlowStep from './firstFlowStep/queueNtopic/data.js';
-import snsOut from './firstFlowStep/topicOut/data.js';
+import yamlFlowStep from './firstFlowStep/yaml/yaml.js';
+import handlerFlowStep from './firstFlowStep/handler/handler.js';
+import mainFunctionFlowStep from './firstFlowStep/mainFunction/main.js';
+import sqsFlowStep from './firstFlowStep/queueNtopic/queueNtopic.js';
+import snsOut from './firstFlowStep/topicOut/topicOut.js';
 
-import yamlRecievePlugIn from './afterFirstFlowStep/recievePlugIn/yaml/data.js';
-import handlerRecievePlugIn from './afterFirstFlowStep/recievePlugIn/handler/data.js';
-import mainFunctionRecievePlugIn from './afterFirstFlowStep/recievePlugIn/mainFunction/data.js';
+import yamlRecievePlugIn from './afterFirstFlowStep/recievePlugIn/yaml/yaml.js';
+import handlerRecievePlugIn from './afterFirstFlowStep/recievePlugIn/handler/handler.js';
+import mainFunctionRecievePlugIn from './afterFirstFlowStep/recievePlugIn/mainFunction/main.js';
 
-import handlerFlowConfig from './byConfig/handler/data.js';
-import mainFunctionFlowConfig from './byConfig/mainFunction/data.js';
-import sqsFlowConfig from './byConfig/sns-sqs/data.js';
-import yamlFlowConfig from './byConfig/yaml/data.js';
+import handlerFlowConfig from './byConfig/handler/handler.js';
+import mainFunctionFlowConfig from './byConfig/mainFunction/main.js';
+import sqsFlowConfig from './byConfig/sns-sqs/snsSqs.js';
+import yamlFlowConfig from './byConfig/yaml/yaml.js';
 
 const {
   createSnsResource,
@@ -49,9 +50,9 @@ const {
   externalResourceYaml
 } = libs;
 
-// import yamlSendPlugIn from './afterFirstFlowStep/sendPlugIn/yaml/data.js';
-// import handlerSendPlugIn from './afterFirstFlowStep/sendPlugIn/handler/data.js';
-// import mainFunctionSendPlugIn from './afterFirstFlowStep/sendPlugIn/mainFunction/data.js';
+// import yamlSendPlugIn from './afterFirstFlowStep/sendPlugIn/yaml/yaml.js';
+// import handlerSendPlugIn from './afterFirstFlowStep/sendPlugIn/handler/handler.js';
+// import mainFunctionSendPlugIn from './afterFirstFlowStep/sendPlugIn/mainFunction/main.js';
 
 
 /**
@@ -65,6 +66,7 @@ const {
  */
 async function generatePlunIg(
   _izContext,
+  rootServicePath,
   appPath,
   allObjSchemas,
   allLocalFlowSchemas,
@@ -81,7 +83,7 @@ async function generatePlunIg(
     console.info(`[plugIn] start totalSchemas=${totalSchemas}`);
     if (totalSchemas === 0) return [];
 
-    const configPath = path.join(appPath, '../config/serverless.config.yml');
+    const configPath = path.join(rootServicePath, 'config/serverless.config.yml');
     const serverlessConfig = fs.readFileSync(configPath, 'utf8');
     const config = yaml.parse(serverlessConfig);
     const serviceTag = config.main_config.iz_serviceTag;

package/src/{generateCode/generateOther/generateCodeOther.js → generators/other/index.js}

@@ -15,7 +15,7 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import generateAuth from './generateAuthYml/data.js';
+import generateAuth from './generateAuthYml/yaml.js';
 
 // Import code libs generator
 // const createGenerateCodeLibs = require('./libs/data');

package/src/{generateCode → generators}/resourceYamlComponent/index.js

@@ -22,9 +22,9 @@ import createDefaultDynamoDb from './dynamodb/defaultDynamoDbTable.js';
 import createDynamoPerRelationshipLink from './dynamodb/generateDynamoPerLink.js';
 // import createSourceSnsAndSqs from './sns-in-sqs/snsAndSqsPerActionData.js';
 import createFindDataAndProcessLogicalDefaultSnsInSqs from './sns-in-sqs/defaultSnsInSqsForFindDataAndProcessLogical.js';
-import createDataForCreateSourceSnsOut from './sns-out/data.js';
+import createDataForCreateSourceSnsOut from './sns-out/snsOut.js';
 import createDefaultSnsOutForFindDataAndProcessLogical from './sns-out/defaultSnsOutForFindDataAndProcessLogical.js';
-import filterCreateResourceYaml from './filterGenerateResource/data.js';
+import filterCreateResourceYaml from './filterGenerateResource/filter.js';
 
 import libs from '#libs/Utils.js';
 

package/src/{generateCode/resourceYamlComponent/sns-out/data.js → generators/resourceYamlComponent/sns-out/snsOut.js}

@@ -70,7 +70,7 @@ function createSourceSnsOut(_izContext, srcPath) {
         saveFileName: SAVE_FILE_NAME.snsOutYaml,
         fileExtension: '.yml',
         isAppend: true,
-        fromFile: 'resourceYaml/sns-out/data.js'
+        fromFile: 'resourceYaml/sns-out/snsOut.js'
       }
     });
   }

package/src/{generateCode/generateRole/generateCodeRole.js → generators/roles/index.js}

@@ -1,5 +1,5 @@
-import generateRoleNameConfig from './generateRoleNameConfig/data.js';
-import generateRole from './generateSharedResource/data.js';
+import generateRoleNameConfig from './roleNameConfig/roleNameConfig.js';
+import generateRole from './sharedResource/sharedResource.js';
 
 export default function generateRoleAndSharedResource(
   _izContext,