@izara_project/izara-core-generate-service-code 1.0.37 → 1.0.39

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-core-generate-service-code",
-  "version": "1.0.37",
+  "version": "1.0.39",
   "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/handler/data.js

@@ -49,7 +49,13 @@ async function data(_izContext, data, appPath) {
       route: functionName
     },
     setting: {
-      savePath: path.join(appPath, SOURCE_PATH.flowSchema, `${upperCase(data.flowTag)}`, `${data.flowStepName}`, 'source/'),
+      savePath: path.join(
+        appPath,
+        SOURCE_PATH.flowSchema,
+        `${upperCase(data.flowTag)}`,
+        `${upperCase(data.flowStepName)}`,
+        'source/'
+      ),
       saveFileName: `${upperCase(functionName)}_${upperCase(handlerType)}`,
       fileExtension: '.js',
       isAppend: true

package/src/generateCode/generateFlowStepWithPlugIn/afterFirstFlowStep/recievePlugIn/handler/templateWebSocket.ejs

@@ -20,6 +20,8 @@ import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow
 import { webSocket } from '@izara_project/izara-core-library-external-request';
 const { postToConnection } = webSocket;
 
+import <%- functionName %> from './<%- functionName %>_Main.js';
+
 export const main = middleware.wrap(async (event, context) => {
 
   event._izContext.logger.debug('Event:', event);

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

@@ -41,7 +41,13 @@ async function data(_izContext, data, appPath) {
       functionName
     },
     setting: {
-      savePath: path.join(appPath, SOURCE_PATH.flowSchema, `${upperCase(data.flowTag)}`, `${data.flowStepName}`, 'source/'),
+      savePath: path.join(
+        appPath,
+        SOURCE_PATH.flowSchema,
+        `${upperCase(data.flowTag)}`,
+        `${upperCase(data.flowStepName)}`,
+        'source/'
+      ),
       saveFileName: `${upperCase(functionName)}${upperCase(data.recieveType)}_Main`,
       fileExtension: '.js',
       isAppend: false

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

@@ -70,7 +70,7 @@ export default async function <%- functionName %> (
 
 
   } catch (err) {
-    _izContext.logger.error('error recievePlugInRequest: ', err)
+    _izContext.logger.error('error <%- functionName %>: ', err)
     throw (err)
  }
 }

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

@@ -42,7 +42,7 @@ async function data(_izContext, data, appPath) {
       ...data,
     },
     setting: {
-      savePath: path.join(appPath, SOURCE_PATH.flowSchema, `${upperCase(data.flowTag)}`, `${data.flowStepName}`, 'source/'),
+      savePath: path.join(appPath, SOURCE_PATH.flowSchema, `${upperCase(data.flowTag)}`, `${upperCase(data.flowStepName)}`, 'source/'),
       saveFileName: `${upperCase(data.functionName)}_${upperCase(data.handlerType)}`,
       fileExtension: '.js',
       isAppend: true

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

@@ -34,7 +34,13 @@ async function data(_izContext, data, appPath) {
     templatePath: templatePath,
     templateData: { ...data },
     setting: {
-      savePath: path.join(appPath, SOURCE_PATH.flowSchema, `${upperCase(data.flowTag)}`, `${data.flowStepName}`, 'source/'),
+      savePath: path.join(
+        appPath,
+        SOURCE_PATH.flowSchema,
+        `${upperCase(data.flowTag)}`,
+        `${upperCase(data.flowStepName)}`,
+        'source/'
+      ),
       saveFileName: `${upperCase(data.functionName)}_Main`,
       fileExtension: '.js',
       isAppend: false

package/src/generateCode/generateFlowStepWithPlugIn/index.js

@@ -170,6 +170,9 @@ async function generatePlunIg(
           allCreateSourceParams.push(snsOutResult);
 
           let mainResult;
+          if (flowStepConfig.hasOwnProperty("handleLogic")) {
+            
+          }
           if (flowStepConfig.hasOwnProperty("plugInHooks")) {
             // for (const plugInHookFlow of flowStepConfig.plugInHooks) {
             for (let i = 0; i < flowStepConfig.plugInHooks.length; i++) {
@@ -204,32 +207,36 @@ async function generatePlunIg(
                   }
                   allCreateSourceParams.push(mainResult);
                 };
-
-                if (objSchema.hasOwnProperty('recievePlugInHookTag')) {
-                  for (const recieveConfig of Object.values(objSchema.recievePlugInHookTag)) {
-                    if (recieveConfig.hasOwnProperty('flowType')) {
-                      data['recieveType'] = "async",
-                        data['flowType'] = recieveConfig.flowType
-                    } else {
-                      data['recieveType'] = 'sync'
-                    }
-                    const yamlRecievePlugInResult = await yamlRecievePlugIn(_izContext, data, appPath);
-                    const handlerRecievePlugInResult = await handlerRecievePlugIn(_izContext, data, appPath);
-                    const mainFunctionRecievePlugInResult = await mainFunctionRecievePlugIn(_izContext, data, appPath);
-                    // console.log("mainFunctionRecievePlugInResult", mainFunctionRecievePlugInResult)
-                    allCreateSourceParams.push(...yamlRecievePlugInResult, ...handlerRecievePlugInResult, mainFunctionRecievePlugInResult);
-                  }
-                }
               }
             }
           } else {
             mainResult = await mainFunctionFlowStep(_izContext, { ...data, havePlugIn: false }, appPath);
             allCreateSourceParams.push(mainResult);
+          };
+
+          for (const objSchema of allObjSchemas) {
+            if (!objSchema.hasOwnProperty("recievePlugInHookTag"))
+              continue;
+            for (const recieveConfig of Object.values(objSchema.recievePlugInHookTag)) {
+              if (recieveConfig.hasOwnProperty('flowType')) {
+                data['recieveType'] = "async",
+                  data['flowType'] = recieveConfig.flowType
+              } else {
+                data['recieveType'] = 'sync'
+              }
+              const yamlRecievePlugInResult = await yamlRecievePlugIn(_izContext, data, appPath);
+              const handlerRecievePlugInResult = await handlerRecievePlugIn(_izContext, data, appPath);
+              const mainFunctionRecievePlugInResult = await mainFunctionRecievePlugIn(_izContext, data, appPath);
+              // console.log("mainFunctionRecievePlugInResult", mainFunctionRecievePlugInResult)
+              allCreateSourceParams.push(...yamlRecievePlugInResult, ...handlerRecievePlugInResult, mainFunctionRecievePlugInResult);
+            }
           }
         }
       }
     };
 
+
+
     const uniqueSortedTargetFiles = Array.from(
       new Set(
         allCreateSourceParams

package/src/generateCode/generateSchema/actionEndpointComponent/mainFunction/beforeLogical/template.ejs

@@ -135,6 +135,16 @@ import { <%= action %>MainLogical } from './<%= functionName %>_Main.js';
       })
     );
 
+    if (callingFlowConfig.callingFlow === `${process.env.iz_resourcePrefix}CreateBeforeLogical`) {
+      callingFlowConfig =
+        callingFlowConfig.callingFlowProperties.parentPassBackProperties;
+    }
+
+    _izContext.logger.debug(
+      '[createBeforeLogicalMain] callingFlowConfig',
+      callingFlowConfig
+    );
+
     //(<beforeLogicalMain>)
     //(</beforeLogicalMain>)
 

package/src/generateCode/generateSchema/relationshipPerActionComponent/create/action/mainFunction/template.ejs

@@ -143,8 +143,8 @@ export default async function createRelationship(
       const { serviceTag: fromServiceTag, objectType: fromObjectType } = link.from.objType;
       const { serviceTag: toServiceTag, objectType: toObjType } = link.to.objType;
 
-      const { serviceTag: firstServiceTag, objectType: firstObjectType } = firstObjectHie.extendObjType || firstObject.objType;
-      const { serviceTag: secondServiceTag, objectType: secondObjectType } = secondObjectHie.extendObjType || secondObject.objType;
+      const { serviceTag: firstServiceTag, objectType: firstObjectType } = firstObject.objType;
+      const { serviceTag: secondServiceTag, objectType: secondObjectType } = secondObject.objType;
 
       const matchFromTo = fromServiceTag === firstServiceTag && fromObjectType === firstObjectType &&
         toServiceTag === secondServiceTag && toObjType === secondObjectType;

package/src/libs/Consts.js

@@ -94,7 +94,7 @@ const SOURCE_PATH = {
     'src/generatedCode/CreateRecordComplete/',
 
   // systemText
-  systemTextSchema: 'SystemTextSchema/generatedCode/',
+  systemTextSchema: 'SystemTextSchemas/generatedCode/',
 
   // rbac
   rbac: '/src/generatedCode/Rbac/source/',
@@ -161,7 +161,7 @@ const SAVE_FILE_NAME = {
   refObjectRelationship: 'RefObjectRelationships',
   objectSchema: 'ObjectFieldSchema',
   roleNameConfig: 'RoleNameConfig',
-  systemTextSchema: 'SystemTextSchema'
+  systemTextSchema: 'SystemTextSchemas'
 };
 
 const FUNCTION_NAME = {

package/src/libs/Libs.js

@@ -494,6 +494,7 @@ function createSnsResource(topicNames) {
       resourceNames(RESOURCE_CLASSES.sns, topicName))
   );
 }
+
 async function getLocalOrS3ObjectSchema(_izContext, objType, schemasPath) {
   console.log("objType, schemasPath", objType, schemasPath)
   const iz_serviceTag = getLocalConfig('iz_serviceTag');