@izara_project/izara-core-generate-service-code 1.0.3 → 1.0.5

package/index.js

@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import createSource from './src/SourceManager/CreateSource.js';
 import generateCode from './src/GenerateCode.js';
-import generateSchema from './src/GenerateSchema.js';
 import generateIntTest from './src/GenerateTests.js';
 import generateResourceIntTest from './src/GenerateResources.js';
 
@@ -30,7 +29,6 @@ export {
   createSource,
   // main generateCode
   generateCode,
-  generateSchema,
   generateIntTest,
   generateResourceIntTest,
   // libs

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-core-generate-service-code",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "Code for locally generating per service files",
   "main": "index.js",
   "scripts": {

package/src/TemplateData/EndpointPerService/mainFunction/create/template.ejs

@@ -357,18 +357,23 @@ export default async function createMain(
           _izContext.logger.debug("objInstanceFull before send to Graph", objInstanceFullForGraph)
 
           // allStorageTagComplete = false;
-          allAwaitingStepsId.push(await asyncFlowSharedLib.createAwaitingStepId(
-            (hash({
-              objType: objType,
-              graphServerTag: storageTag,
-              identifiers: objInstanceFullForGraph.identifiers,
-              callingFlowProperties: callingFlowConfig.callingFlowProperties || {}
-            })),
-            PREFIX.CREATE_OBJECT_ASYNC
-          ),
-            //(<additionalAttributeCreateObjectAsync>)
-            //(</additionalAttributeCreateObjectAsync>)
+          allAwaitingStepsId.push(
+            {
+              awaitingStepId: await asyncFlowSharedLib.createAwaitingStepId(
+                (hash({
+                  objType: objType,
+                  graphServerTag: storageTag,
+                  identifiers: objInstanceFullForGraph.identifiers,
+                  callingFlowProperties: callingFlowConfig.callingFlowProperties || {}
+                })),
+                PREFIX.CREATE_OBJECT_ASYNC
+              ),
+              //(<additionalAttributeCreateNode>)
+              additionalAttributes: {}
+              //(</additionalAttributeCreateNode>)
+            },
           );
+
           listOfObjectForCreates.push({
             [storageTag]: {
               objInstanceFull: {
@@ -388,17 +393,21 @@ export default async function createMain(
           Object.assign(objInstanceFullForExternalTopic.fields, createObjInstanceFullFieldsByStorageTag(_izContext, storageTag, createDataDetail))
           _izContext.logger.debug("objInstanceFull before send to external topic", objInstanceFullForExternalTopic)
 
-          allAwaitingStepsId.push(await asyncFlowSharedLib.createAwaitingStepId(
-            (hash({
-              objType: objType,
-              graphServerTag: storageTag,
-              identifiers: objInstanceFullForGraph.identifiers,
-              callingFlowProperties: callingFlowConfig.callingFlowProperties || {}
-            })),
-            PREFIX.CREATE_OBJECT_EXTERNAL_TOPIC
-          ),
-            //(<additionalAttributeCreateExternalObjectAsync>)
-            //(</additionalAttributeCreateExternalObjectAsync>)
+          allAwaitingStepsId.push(
+            {
+              awaitingStepId: await asyncFlowSharedLib.createAwaitingStepId(
+                (hash({
+                  objType: objType,
+                  graphServerTag: storageTag,
+                  identifiers: objInstanceFullForGraph.identifiers,
+                  callingFlowProperties: callingFlowConfig.callingFlowProperties || {}
+                })),
+                PREFIX.CREATE_OBJECT_EXTERNAL_TOPIC
+              ),
+              //(<additionalAttributeCreateExternalTopic>)
+              additionalAttributes: {}
+              //(</additionalAttributeCreateExternalTopic>)
+            }
           );
 
           let sendToCreateExternalTopic = {

package/src/TemplateData/EndpointPerService/mainFunction/update/template.ejs

@@ -270,19 +270,25 @@ export default async function updateMain(
               return
             } else {
 
+              //(<beforeUpdateNode>)
+              //(</beforeUpdateNode>)
+
               awaitingStepIds.push( // createAwaitingStepId if updateGraph
-                asyncFlowSharedLib.createAwaitingStepId(
-                  hash({
-                    objectType: objType.objectType,
-                    serviceTag: objType.serviceTag,
-                    identifiers: identifiers,
-                    fields: fields,
-                    // correlationIds: _izContext.correlationIds.get("id")
-                  }),
-                  PREFIX.updateNode
-                ),
-                //(<additionalAttributes>)
-                //(</additionalAttributes>)
+                {
+                  awaitingStepId: asyncFlowSharedLib.createAwaitingStepId(
+                    hash({
+                      objectType: objType.objectType,
+                      serviceTag: objType.serviceTag,
+                      identifiers: identifiers,
+                      fields: fields,
+                      // correlationIds: _izContext.correlationIds.get("id")
+                    }),
+                    PREFIX.updateNode
+                  ),
+                  //(<additionalAttributes>)
+                  additionalAttributes: {}
+                  //(</additionalAttributes>)
+                }
               )
               _izContext.logger.debug("awaitingStepIds", awaitingStepIds)
 

package/src/TemplateData/flowSchema/flowSchemaMainFunction/data.js

@@ -98,7 +98,7 @@ async function createParamsForCreateSource(_izContext, flowSchema, srcPath) {
       tableName,
       flowSchemaComplete,
       triggerType,
-      queueName: `${createFlowTypeConcat(_izContext, { serviceTag: getLocalConfig('iz_serviceTag'), flowTag: flowSchema.flowTag })}_Main`
+      queueName: `${createFlowTypeConcat(_izContext, { serviceTag: getLocalConfig('iz_serviceTag'), flowTag: upperCase(flowSchema.flowTag) })}_Main`
     },
     setting: {
       savePath: path.join(

package/src/TemplateData/flowSchema/flowSchemaOwnTopic/EndpointComponent/functionYaml/data.js

@@ -63,7 +63,6 @@ async function createSourceParams(_izContext, flowSchema, srcPath) {
   let functionName = 'Process' + upperCase(flowSchema.flowTag);
   let handlerType = upperCase(HANDLER.hdrSqs);
   let additionalResourcePermission = defaultIamRolePerAction();
-  let route = upperCase(flowSchema.flowTag);
   let queueName = upperCase(flowSchema.flowTag) + handlerType;
   let objectSchema;
 

package/src/TemplateData/flowSchema/flowSchemaOwnTopic/EndpointComponent/handler/DsqHandlerTemplate.ejs

@@ -28,7 +28,21 @@ let perRecordsValidatorSchema = {
   //(<validatorSchema>)
   //(</validatorSchema>)
 }
-middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema());
+
+middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema(
+  {
+    type: "object",
+    required: ['body', 'messageAttributes'],
+    properties: {
+      body: {
+        type: 'object',
+      },
+      messageAttributes: {
+        type: 'object'
+      }
+    }
+  }
+));
 
 export const main = middleware.wrap(async (event, context) => {
 

package/src/TemplateData/flowSchema/flowSchemaOwnTopic/sns-in/data.js

@@ -22,7 +22,7 @@ const __dirname = path.dirname(__filename);
 import consts from '../../../../libs/Consts.js';
 import utils from '../../../../libs/Utils.js';
 
-const { SOURCE_PATH, SAVE_FILE_NAME } = consts;
+const { SOURCE_PATH, SAVE_FILE_NAME, HANDLER } = consts;
 const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } = utils;
 
 const snsTemplatePath = path.join(
@@ -64,6 +64,15 @@ function createDataForDefaultSnsInSqs(_izContext, flowSchema, srcPath) {
 
   let defaultDsqQueueDataList = [];
 
+  if (flowSchema.statusType === 'triggerCache') {
+    defaultDsqQueueDataList.push(
+      {
+        queueName: upperCase(flowSchema.flowTag) + upperCase(HANDLER.hdrDsq)
+      }
+    )
+
+  }
+
   // if (flowSchema.outputTopic) {
   //   if (flowSteps.includes("Out")) {
   //     if (flowSchema.outputTopic) {

package/src/TemplateData/flowSchema/triggerCacheComponent/checkTriggerCacheComplete/handler/data.js

@@ -41,11 +41,7 @@ function createSourceParams(_izContext, flowSchema, srcPath) {
   let functionName =
     'CheckTriggerCache' + upperCase(flowSchema.flowTag) + 'Complete';
   let handlerType = upperCase(HANDLER.hdrSqs);
-  let queueName =
-    'CheckTriggerCache' +
-    upperCase(flowSchema.flowTag) +
-    'Complete' +
-    handlerType;
+  let queueName = 'CheckTriggerCache' + upperCase(flowSchema.flowTag) + 'Complete' + handlerType;
 
   return {
     templatePath: templatePath,

package/src/TemplateData/flowSchema/triggerCacheComponent/processTriggerCache/handler/data.js

@@ -58,12 +58,7 @@ function createSourceParams(_izContext, flowSchema, srcPath) {
       queueName
     },
     setting: {
-      savePath: path.join(
-        srcPath,
-        SOURCE_PATH.flowSchema,
-        upperCase(flowSchema.flowTag),
-        'source/'
-      ),
+      savePath: path.join(srcPath, SOURCE_PATH.flowSchema, upperCase(flowSchema.flowTag), 'source/'),
       saveFileName: `${upperCase(functionName)}_${upperCase(handlerType)}`,
       fileExtension: '.js',
       isAppend: true

package/src/TemplateData/flowSchema/triggerCacheComponent/processTriggerCache/handler/template.ejs

@@ -29,7 +29,21 @@ let perRecordsValidatorSchema = {
   //(<validatorSchema>)
   //(</validatorSchema>)
 }
-middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema());
+
+middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema(
+  {
+    type: "object",
+    required: ['body', 'messageAttributes'],
+    properties: {
+      body: {
+        type: 'object',
+      },
+      messageAttributes: {
+        type: 'object'
+      }
+    }
+  }
+));
 
 export const main = middleware.wrap(async (event, context) => {
 

package/src/TemplateData/flowSchema/triggerCacheComponent/triggerCacheComplete/handler/data.js

@@ -44,8 +44,7 @@ function createSourceParams(_izContext, flowSchema, srcPath) {
   let functionName =
     'TriggerCache' + upperCase(flowSchema.flowTag) + 'Complete';
   let handlerType = upperCase(HANDLER.hdrSqs);
-  let queueName =
-    'TriggerCache' + upperCase(flowSchema.flowTag) + 'Complete' + handlerType;
+  let queueName = 'TriggerCache' + upperCase(flowSchema.flowTag) + 'Complete' + handlerType;
 
   return {
     templatePath: templatePath,

package/src/TemplateData/flowSchema/triggerCacheComponent/triggerCacheComplete/mainFunction/template.ejs

@@ -50,16 +50,22 @@ export default async function <%- functionName %>(
     _izContext.logger.debug("<%- functionName %> requestParams", requestParams)
     _izContext.logger.debug("<%- functionName %> callingFlowConfig", callingFlowConfig)
 
+      //(<beforeCheckTriggeredCache>)
+      //(</beforeCheckTriggeredCache>)
+
     let checkTriggerResetedV2 = await triggeredCacheSharedLibV2.checkTriggerResetedV2(
       _izContext,
       {                                    // flowType
         serviceTag: process.env.iz_serviceTag,
         flowTag: "<%- flowTag %>"
       },
-      {                                    // identifiers of objType in flowType
-        trigger1Id: "frame1_1122"
-      },
-      "testUnique001"
+      //(<identifiers>)
+      {},
+      //(</identifiers>)// identifiers of objType in flowType
+      //(<uniqueRequestId>)
+      //(</uniqueRequestId>)
+      //(<settings>)
+      //(</settings>)
     )
 
     _izContext.logger.debug("checkTriggerResetedV2: ", checkTriggerResetedV2)

package/src/GenerateSchema.js

@@ -1,165 +0,0 @@
-/*
-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 { join } from 'path';
-import { readFileSync } from 'fs';
-
-import validatePathWithRootServicePath from './libs/GenerateCodeLibs.js';
-
-import { schemaConfig } from './SchemaConfig.js';
-
-import createSource from './SourceManager/CreateSource.js';
-import utils from './libs/Utils.js'
-
-const { deleteFileInDir } = utils;
-
-async function generateSchema(
-  _izContext,
-  objSchemaPath,
-  generateSchemaSettings
-) {
-  try {
-    // console.log('generateSchema', { objSchemaPath, generateSchemaSettings });
-    // ---------  Prepare path  -------------
-    // point to app/src
-    let saveFilePath = join(objSchemaPath, `../`);
-    // console.log("saveFilePath: ", saveFilePath);
-
-    // point to root folder of service
-    let localServicePath = join(saveFilePath, '../../');
-    // console.log("localServicePath: ", localServicePath);
-
-    //------ Start Create Source ------
-
-    // collect all result of template data for execute createSource
-    let allCreateSource = [];
-    // collect all path that need to empty before createSource
-    let allEmptyPath = new Set();
-
-    // Validate that all generateNames in generateSettings are present in the schemaConfig
-    const generateNameSet = new Set(Object.keys(schemaConfig.TemplateAndData));
-
-    // Find any missing generateNames that are not in the schemaConfig
-    let missingGenerateName = generateSchemaSettings.filter(
-      ({ generateName }) => !generateNameSet.has(generateName)
-    );
-
-    // If there are missing generateNames, throw an error with the list of missing names
-    if (missingGenerateName.length) {
-      throw Error(
-        `Invalid generateName:[ ${missingGenerateName.map(({ generateName }) => generateName).join(', ')} ]`
-      );
-    }
-
-    // start create generateSchema depend on
-    for (const generateSetting of generateSchemaSettings) {
-      console.log('Loading template:', generateSetting.generateName);
-      console.log('Setting data:', generateSetting);
-      // console.log('schemaPath:', schemaConfig.TemplateAndData[generateSetting.generateName]);
-      // console.log('schemaPath:', join(__dirname, schemaConfig.TemplateAndData[generateSetting.generateName]));
-
-      // get generateSchema template depend on generateName
-      let generateSchemaData = (
-        await import(
-          join(
-            __dirname,
-            schemaConfig.TemplateAndData[generateSetting.generateName]
-          )
-        )
-      ).default;
-      // sources[eventSourceTag] = await import(`../MiddlewareCore/EventSources/${eventSourceTag}.js`);
-      let createSourceResult = await generateSchemaData(
-        _izContext,
-        objSchemaPath,
-        generateSchemaSettings
-      );
-
-      // Filter out empty or invalid objects before adding to allCreateSource
-      if (Array.isArray(createSourceResult)) {
-        const validResults = createSourceResult.filter(
-          item => item && item.templatePath && item.templateData && item.setting
-        );
-        allCreateSource.push(...validResults);
-      }
-    }
-
-    // check each allCreateSource valid
-    for (let item of allCreateSource) {
-      // throw Error('Skipping invalid source item:', item);
-      if (!item || !item.templatePath || !item.templateData || !item.setting) {
-        console.log('throw Error Skipping invalid source item:', item);
-        throw Error('Skipping invalid source item:', item);
-      }
-
-      const {
-        templatePath,
-        templateData,
-        setting,
-        emptyPath: returnEmptyPath
-      } = item;
-      setting.checkCreateSourcePass = true;
-
-      let [status, errors] = await createSource(
-        readFileSync(templatePath, 'utf8'),
-        templateData,
-        setting
-      );
-
-      if (status === false) {
-        throw Error(errors);
-      }
-
-      allEmptyPath.add(setting.savePath);
-    }
-
-    // validate path before empty folder
-    for (let emptyPath of allEmptyPath) {
-      // console.log("emptyPath: ", emptyPath);
-      validatePathWithRootServicePath(localServicePath, emptyPath);
-    }
-
-    for (let emptyPath of allEmptyPath) {
-      await deleteFileInDir(emptyPath);
-    }
-
-    // generate all source
-    for (let item of allCreateSource) {
-      // throw error if item is invalid
-      if (!item || !item.templatePath || !item.templateData || !item.setting) {
-        console.log('Throwing invalid source item:', item);
-        throw Error('Throwing invalid source item:', item);
-      }
-
-      const { templatePath, templateData, setting } = item;
-      setting.checkCreateSourcePass = false;
-
-      await createSource(
-        readFileSync(templatePath, 'utf8'),
-        templateData,
-        setting
-      );
-    }
-
-    console.log('Generated all source files successfully');
-    return 'return values';
-  } catch (error) {
-    console.error('Error generating code:', error);
-    throw error;
-  }
-}
-
-export default generateSchema;

package/src/SchemaConfig.js

@@ -1,23 +0,0 @@
-/*
-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/>.
-*/
-
-export const schemaConfig = {
-  TemplateAndData: {
-    propertyValue: './TemplateData/propertyValueSchema/generateTemplateData.js'
-  },
-  Plugin: {}
-};