@izara_project/izara-core-generate-service-code 1.0.34 → 1.0.36

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-core-generate-service-code",
-  "version": "1.0.34",
+  "version": "1.0.36",
   "description": "Code for locally generating per service files",
   "author": "Sven Mason <thebarbariansven@gmail.com>",
   "license": "AGPL-3.0-or-later",

package/src/generateCode/generateFlowStepWithPlugIn/afterFirstFlowStep/recievePlugIn/yaml/data.js

@@ -39,13 +39,13 @@ async function data(_izContext, data, appPath) {
 
   const functionName = 'recievePlugInHook' + upperCase(data.recieveType)
   let handlerType;
-  const additionalResourcePremission = defaultIamRolePerAction();
+  const additionalResourcePermission = defaultIamRolePerAction();
 
   if (data.recieveType === 'sync') {
     handlerType = HANDLER.hdrApi;
   } else if (data.recieveType === 'async') {
     handlerType = 'hdrWbs';
-    additionalResourcePremission.push(
+    additionalResourcePermission.push(
       createIamRole(
         {
           'execute-api': ['ManageConnections']
@@ -64,7 +64,7 @@ async function data(_izContext, data, appPath) {
       serviceTag,
       functionName: upperCase(functionName),
       functionNameConfig,
-      additionalResourcePremission,
+      additionalResourcePermission,
       roleName,
       event: 'post',
       resourceLocation: path.join(SOURCE_PATH.resourceLocationFlowSchema, `${data.flowTag}`, `${data.flowStepName}`, 'source/'),

package/src/generateCode/generateFlowStepWithPlugIn/afterFirstFlowStep/recievePlugIn/yaml/template.ejs

@@ -7,7 +7,7 @@
   events:
   <% if (handlerType === 'HdrApi') { %>
     - httpApi:
-        path: /<%- serviceTag %>/<%- lowerCase(functionName) %>/
+        path: /<%- serviceTag %>/<%- lowerCase(functionName) %>
         method: <%- event %>
     - httpApi:
         path: /<%- serviceTag %>/<%- lowerCase(functionName) %>/{targetUserId}

package/src/generateCode/generateFlowStepWithPlugIn/afterFirstFlowStep/sendPlugIn/mainFunction/data.js

@@ -0,0 +1,45 @@
+/*
+Copyright (C) 2020 Sven Mason <http://izara.io>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+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 { fileURLToPath } from 'url';
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+import consts from '#libs/Consts.js';
+import utils from '#libs/Utils.js';
+
+const { firstLetterUpperCase: upperCase } = utils;
+const { SOURCE_PATH, SAVE_FILE_NAME } = consts;
+const templatePath = path.join(__dirname, 'template.ejs');
+
+
+async function data(_izContext, data, appPath) {
+  console.log("data", data)
+  return {
+    templatePath: templatePath,
+    templateData: { ...data },
+    setting: {
+      savePath: path.join(appPath, SOURCE_PATH.flowSchema, `${upperCase(data.flowTag)}`, `${data.flowStepName}`, 'source/'),
+      saveFileName: `${upperCase(data.functionName)}_Main`,
+      fileExtension: '.js',
+      isAppend: false
+    }
+  }
+}
+
+export default data;

package/src/generateCode/generateFlowStepWithPlugIn/afterFirstFlowStep/sendPlugIn/mainFunction/template.ejs

@@ -0,0 +1,82 @@
+/*
+Copyright (C) 2020 Sven Mason <http: //izara.io>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+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 />.
+*/
+<% if (havePlugIn) { -%>
+  <% if (invokeType === 'sync') { -%>
+import { api } from '@izara_project/izara-core-library-external-request';
+  <% } else if (invokeType === 'async') { -%>
+import { webSocket } from '@izara_project/izara-core-library-external-request'
+  <% } -%>
+<% } -%>
+
+//(<optionalRequire>)
+//(</optionalRequire>)
+
+/**
+ *
+ *
+ * description of function.
+ * @param {Object} _izContext
+ * @param {CorrelationIds} _izContext.correlationIds - property of _izContext
+ * @param {Logger} _izContext.logger - property of _izContext
+ * @param {Object} requestParams - request params
+ * @param {Object} requestParams.identifiers - identifiers for get data
+ * @param {Object} requestParams.additionalRequest - additionalRequest
+ *
+ *
+ * @returns {object} description of return value
+ */
+export default async function <%- functionName %>(
+  _izContext,
+  requestParams,
+  callingFlowConfig = {},
+  //(<additionalParams>)
+  //(</additionalParams>)
+) {
+
+
+  try {
+    _izContext.logger.debug('<%- functionName %> _izContext: ', _izContext);
+    _izContext.logger.debug('<%- functionName %> requestParams: ', requestParams);
+    _izContext.logger.debug('<%- functionName %> callingFlowConfig: ', callingFlowConfig);
+
+    //(<hookCode>)
+    <% if (havePlugIn) { -%>
+      <% if (invokeType === 'async') { -%>
+      let messageObject = {
+        action: "recievePlugInRequestAsync"
+      };
+      <% } -%>
+    <% } -%>
+
+
+    //(</hookCode>)
+
+
+    <% if (havePlugIn) { -%>
+      <% if (invokeType === 'sync') { -%>
+    await api.invokeLambdaApi(_izContext, "<%- targetUrl %>", messageObject)
+      <% } else if (invokeType === 'async') { -%>
+    await webSocket.invokeWebSocket(_izContext, "<%- targetUrl %>", messageObject)
+      <% } -%>
+    <% } -%>
+
+  } catch (err) {
+    _izContext.logger.error('error AFlowStepsMain: ', err)
+    throw (err)
+  }
+}

package/src/generateCode/generateFlowStepWithPlugIn/firstFlowStep/mainFunction/template.ejs

@@ -54,7 +54,7 @@ export default async function <%- functionName %>(
     _izContext.logger.debug('<%- functionName %> requestParams: ', requestParams);
     _izContext.logger.debug('<%- functionName %> callingFlowConfig: ', callingFlowConfig);
 
-    //(<AFlowStepsHook>)
+    //(<hookCode>)
     <% if (havePlugIn) { -%>
       <% if (invokeType === 'async') { -%>
       let messageObject = {
@@ -64,8 +64,7 @@ export default async function <%- functionName %>(
     <% } -%>
 
 
-    // add properties to messageObject invoke lambda
-    //(</AFlowStepsHook>)
+    //(</hookCode>)
 
 
     <% if (havePlugIn) { -%>

package/src/generateCode/generateFlowStepWithPlugIn/firstFlowStep/queueNtopic/data.js

@@ -26,9 +26,9 @@ import utils from '#libs/Utils.js';
 const { firstLetterUpperCase: upperCase } = utils;
 const { SOURCE_PATH, SAVE_FILE_NAME, HANDLER } = consts;
 const templatePathByHandler = {
-  [HANDLER.hdrDsq]: path.join(__dirname, '../../../resourceYamlComponent/sns-in-sqs/sqsTemplate.ejs'),
-  [HANDLER.hdrSqs]: path.join(__dirname, '../../../resourceYamlComponent/sns-in-sqs/snsTemplate.ejs'),
-  queueNoTopic: path.join(__dirname, '../../../resourceYamlComponent/sns-in-sqs/sqsTemplate.ejs')
+  [HANDLER.hdrDsq]: path.join(__dirname, './sqsTemplate.ejs'),
+  [HANDLER.hdrSqs]: path.join(__dirname, './snsTemplate.ejs'),
+  queueNoTopic: path.join(__dirname, './sqsTemplate.ejs')
 };
 
 async function data(_izContext, data, appPath) {

package/src/generateCode/generateFlowStepWithPlugIn/firstFlowStep/queueNtopic/snsTemplate.ejs

@@ -0,0 +1,58 @@
+##===== [Create topic in]
+  In<%- queueName %>:
+    Type: AWS::SNS::Topic
+    Properties:
+      DisplayName: "SNS Message in"
+      TopicName: ${self:custom.iz_serviceTag}_${self:custom.iz_stage}_<%- queueName %>_In
+##===== SNS Subscription [Topic In] =====##
+  SubscriptionIn<%- queueName %>:
+    Type: AWS::SNS::Subscription
+    Properties:
+      TopicArn: !Ref In<%- queueName %>
+      Endpoint: "arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- queueName %>HdrSqs"
+      Protocol: "sqs"
+##===== [Queue]
+  <%- queueName %>HdrSqs:
+    Type: "AWS::SQS::Queue"
+    Properties:
+      QueueName: ${self:custom.iz_resourcePrefix}<%- queueName %>HdrSqs
+      RedrivePolicy:
+        deadLetterTargetArn:
+        # !GetAtt
+          Fn::GetAtt:
+            - <%- queueName %>HdrSqsDLQ
+            - Arn
+        maxReceiveCount: 3
+      VisibilityTimeout: 120
+##==== [QueueDLQ]
+  <%- queueName %>HdrSqsDLQ:
+    Type: AWS::SQS::Queue
+    Properties:
+      QueueName: ${self:custom.iz_resourcePrefix}<%- queueName %>HdrSqsDLQ
+##==== [QueuePolicy]
+  <%- queueName %>HdrSqsPolicy:
+    Type: AWS::SQS::QueuePolicy
+    Properties:
+      PolicyDocument:
+        Version: "2012-10-17"
+        Statement:
+          - Sid: "allow-sns-messages"
+            Effect: Allow
+            Principal: "*"
+            Resource:
+            # !GetAtt
+              Fn::GetAtt:
+                - <%- queueName %>HdrSqs
+                - Arn
+            Action: "SQS:SendMessage"
+      Queues:
+        - Ref: <%- queueName %>HdrSqs
+  #<#<%- firstLetterUpperCase(queueName) %>QueueSetting#>
+  #<#/<%- firstLetterUpperCase(queueName) %>QueueSetting#>
+
+<%_ function firstLetterUpperCase(text){
+  return text.charAt(0).toUpperCase() + text.slice(1)
+} _%>
+<%_ function firstLetterLowerCase(str) {
+  return str.charAt(0).toLowerCase() + str.slice(1)
+} _%>

package/src/generateCode/generateFlowStepWithPlugIn/firstFlowStep/queueNtopic/sqsTemplate.ejs

@@ -0,0 +1,43 @@
+#------- queue ---------
+  <%- queueName %>:
+    Type: "AWS::SQS::Queue"
+    Properties:
+      QueueName: ${self:custom.iz_resourcePrefix}<%- queueName %>
+      RedrivePolicy:
+        deadLetterTargetArn: #!GetAtt
+          Fn::GetAtt:
+            - <%- queueName %>DLQ
+            - Arn
+        maxReceiveCount: 3
+      VisibilityTimeout: 120
+
+  <%- queueName %>DLQ:
+    Type: AWS::SQS::Queue
+    Properties:
+      QueueName: ${self:custom.iz_resourcePrefix}<%- queueName %>DLQ
+
+  <%- queueName %>Policy:
+    Type: AWS::SQS::QueuePolicy
+    Properties:
+      PolicyDocument:
+        Version: "2012-10-17"
+        Statement:
+          - Sid: "allow-sns-messages"
+            Effect: Allow
+            Principal: "*"
+            Resource: #!GetAtt
+              Fn::GetAtt:
+                - <%- queueName %>
+                - Arn
+            Action: "SQS:SendMessage"
+      Queues:
+        - Ref: <%- queueName %>
+  #<#<%- firstLetterUpperCase(queueName) %>QueueSetting#>
+  #<#/<%- firstLetterUpperCase(queueName) %>QueueSetting#>
+
+<%_ function firstLetterUpperCase(text){
+  return text.charAt(0).toUpperCase() + text.slice(1)
+} _%>
+<%_ function firstLetterLowerCase(str) {
+  return str.charAt(0).toLowerCase() + str.slice(1)
+} _%>

package/src/generateCode/generateFlowStepWithPlugIn/firstFlowStep/topicOut/data.js

@@ -28,7 +28,6 @@ const { SOURCE_PATH, SAVE_FILE_NAME, HANDLER } = consts;
 const templatePath = path.join(__dirname, '../../../resourceYamlComponent/sns-out/template.ejs')
 
 async function data(_izContext, data, appPath) {
-  console.log("generate sns out")
   const queueName = `${upperCase(data.flowTag)}_${upperCase(data.flowStepName)}`;
 
   return {

package/src/generateCode/generateFlowStepWithPlugIn/index.js

@@ -81,10 +81,10 @@ async function generatePlunIg(
           const roleName = upperCase(flowTag);
           const resourceApis = [];
           let handler;
-          const additionalResourcePremission = defaultIamRolePerAction();
+          const additionalResourcePermission = defaultIamRolePerAction();
 
           const data = {
-            additionalResourcePremission: additionalResourcePremission,
+            additionalResourcePermission: additionalResourcePermission,
             flowStepName: flowStepName,
             flowTag: flowTag,
             resourceApis: resourceApis,
@@ -96,7 +96,7 @@ async function generatePlunIg(
           if (flowStepConfig.event.includes("ownTopic")) {
             data['eventFlow'] = 'ownTopic'
             handler = HANDLER.hdrSqs;
-            additionalResourcePremission.push(
+            additionalResourcePermission.push(
               createSnsResource(
                 [
                   upperCase(flowSchema.flowTag) + upperCase(flowStepName) + "_In"
@@ -112,7 +112,7 @@ async function generatePlunIg(
           } else if (flowStepConfig.event.includes("extTopic")) {
             data['eventFlow'] = 'extTopic'
             handler = HANDLER.hdrSqs;
-            additionalResourcePremission.push(
+            additionalResourcePermission.push(
               createSqsResource(
                 [
                   upperCase(flowSchema.flowTag) + upperCase(flowStepName) + upperCase(handler),
@@ -133,7 +133,7 @@ async function generatePlunIg(
             })
           } else if (flowStepConfig.event.includes("queue")) {
             handler = HANDLER.hdrDsq;
-            additionalResourcePremission.push(
+            additionalResourcePermission.push(
               createSqsResource(
                 [
                   upperCase(flowSchema.flowTag) + upperCase(flowStepName) + upperCase(handler),
@@ -154,7 +154,7 @@ async function generatePlunIg(
             ),
             functionNameConfig: upperCase(flowSchema.flowTag) + upperCase(flowStepName) + upperCase(handler),
             event: resourceNames(RESOURCE_CLASSES.sqs, upperCase(flowSchema.flowTag) + upperCase(flowStepName) + upperCase(handler)),
-            queueName: upperCase(flowSchema.flowTag) + upperCase(flowStepName) + upperCase(handler),
+            queueName: upperCase(flowSchema.flowTag) + upperCase(flowStepName),
           })
 
           const yamlFlowStepRes = await yamlFlowStep(_izContext, data, appPath);
@@ -222,6 +222,9 @@ async function generatePlunIg(
                 }
               }
             }
+          } else {
+            mainResult = await mainFunctionFlowStep(_izContext, { ...data, havePlugIn: false }, appPath);
+            allCreateSourceParams.push(mainResult);
           }
         }
       }

package/src/generateCode/generateSchema/generateTextTag/systemText/data.js

@@ -68,7 +68,9 @@ function createSourceSystemText(
         };
         const systemTextObjectSchemas = {
           nameSpace: `${coreUtils.createObjTypeConcat(_izContext, objType)}_description`, // for each objectType
-          systemTextTag: `${fieldName}_${coreUtils.createObjTypeConcat(_izContext, objType)}` // for each fieldName
+          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);
       }
@@ -83,7 +85,9 @@ function createSourceSystemText(
       };
       const systemTextFlowSchemas = {
         nameSpace: `${coreUtils.createFlowTypeConcat(_izContext, flowType)}`, // for each flowType
-        systemTextTag: `errors_${coreUtils.createFlowTypeConcat(_izContext, flowType)}`
+        systemTextTag: `errors_${coreUtils.createFlowTypeConcat(_izContext, flowType)}`,
+        openHook: `//(<${coreUtils.createFlowTypeConcat(_izContext, flowType)}Hook>)`,
+        closeHook: `//(</${coreUtils.createFlowTypeConcat(_izContext, flowType)}Hook>)`
       };
       createSourceArray.push(systemTextFlowSchemas);
     }
@@ -101,7 +105,9 @@ function createSourceSystemText(
         for (const fieldName of Object.keys(relSchema[relTag].fieldNames)) {
           const systemTextRelSchemas = {
             nameSpace: `${coreUtils.createRelTypeConcat(_izContext, relType)}_description`,
-            systemTextTag: `${fieldName}_${coreUtils.createRelTypeConcat(_izContext, relType)}`
+            systemTextTag: `${fieldName}_${coreUtils.createRelTypeConcat(_izContext, relType)}`,
+            openHook: `//(<${coreUtils.createRelTypeConcat(_izContext, relType)}${fieldName}Hook>)`,
+            closeHook: `//(</${coreUtils.createRelTypeConcat(_izContext, relType)}${fieldName}Hook>)`
           }
           createSourceArray.push(systemTextRelSchemas);
         }
@@ -113,7 +119,9 @@ function createSourceSystemText(
     for (const notification of notificationSchemas) {
       const notificationSystemText = {
         nameSpace: `sysNotification_${notification.notificationGrouping}`,
-        systemTextTag: notification.notificationTag
+        systemTextTag: notification.notificationTag,
+        openHook: `//(<${notification.notificationTag}Hook>)`,
+        closeHook: `//(</${notification.notificationTag}Hook>)`
       }
       createSourceArray.push(notificationSystemText)
     }
@@ -127,7 +135,11 @@ function createSourceSystemText(
       saveFileName: SAVE_FILE_NAME.systemTextSchema,
       fileExtension: '.js',
       isAppend: true,
-      generateHookFile: false
+      hookPath: path.join(
+        schemaPath,
+        '../schemaHook/'
+      ),
+      // generateHookFile: false
     }
   };
 }

package/src/generateCode/generateSchema/generateTextTag/systemText/template.ejs

@@ -1,5 +1,10 @@
 export default [
 <% datas.forEach((data, index) => { -%>
-  <%- JSON.stringify(data,null,2) %><%= index < datas.length - 1 ? ',' : '' %>
+  {
+    nameSpace: "<%- data.nameSpace %>",
+    systemTextTag: "<%- data.systemTextTag %>",
+    <%- data.openHook %>
+    <%- data.closeHook %>
+  }<%= index < datas.length - 1 ? ',' : '' %>
 <% }); -%>
 ];