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

package/src/generators/fromFlowSchema/events/registry.js

@@ -0,0 +1,6 @@
+export { default as ownTopic }      from './ownTopic/index.js';
+export { default as extTopic }      from './extTopic/index.js';
+export { default as s3 }            from './s3/index.js';
+export { default as eventBridge }   from './eventBridge/index.js';
+export { default as lambdaSyncInv } from './lambdaSyncInv/index.js';
+export { default as lambdaSyncApi } from './lambdaSyncApi/index.js';

package/src/{generateCode/generateFlowSchema/event/s3Component → generators/fromFlowSchema/events/s3}/index.js

@@ -1,36 +1,36 @@
 // Create S3 Component
-import createFunctionYamlCreateObjectWebSocket from './upload/createObject/functionYaml/data.js';
-import createHandlerCreateObjectWebSocket from './upload/createObject/handler/data.js';
-import createMainFunctionCreateObjectWebSocket from './upload/createObject/mainFunction/data.js';
+import createFunctionYamlCreateObjectWebSocket from './upload/createObject/functionYaml/yaml.js';
+import createHandlerCreateObjectWebSocket from './upload/createObject/handler/handler.js';
+import createMainFunctionCreateObjectWebSocket from './upload/createObject/mainFunction/main.js';
 
 // Create PreSigned URL Component
 // reservedLimit
-import createReservedLimitFunctionYaml from './upload/preSignUrl/reservedLimit/functionYaml/data.js';
-import createReservedLimitHandler from './upload/preSignUrl/reservedLimit/handler/data.js';
-import createReservedLimitMainFunction from './upload/preSignUrl/reservedLimit/mainFunction/data.js';
-import createReservedLimitQueueName from './upload/preSignUrl/reservedLimit/sqs/data.js';
+import createReservedLimitFunctionYaml from './upload/preSignUrl/reservedLimit/functionYaml/yaml.js';
+import createReservedLimitHandler from './upload/preSignUrl/reservedLimit/handler/handler.js';
+import createReservedLimitMainFunction from './upload/preSignUrl/reservedLimit/mainFunction/main.js';
+import createReservedLimitQueueName from './upload/preSignUrl/reservedLimit/sqs/sqs.js';
 // createPreSignUrl
-import createPreSignUrlFunctionYaml from './upload/preSignUrl/createPreSignUrl/functionYaml/data.js';
-import createPreSignUrlHandler from './upload/preSignUrl/createPreSignUrl/handler/data.js';
-import createPreSignUrlMainFunction from './upload/preSignUrl/createPreSignUrl/mainFunction/data.js';
-import createPreSignUrlQueueName from './upload/preSignUrl/createPreSignUrl/queue/data.js';
+import createPreSignUrlFunctionYaml from './upload/preSignUrl/createPreSignUrl/functionYaml/yaml.js';
+import createPreSignUrlHandler from './upload/preSignUrl/createPreSignUrl/handler/handler.js';
+import createPreSignUrlMainFunction from './upload/preSignUrl/createPreSignUrl/mainFunction/main.js';
+import createPreSignUrlQueueName from './upload/preSignUrl/createPreSignUrl/queue/queue.js';
 // Process After Upload S3
-import createProcessAfterUploadS3FunctionYmlS3 from './upload/processFile/functionYml/HdrS3/data.js';
-import createProcessAfterUploadS3HandlerS3 from './upload/processFile/handler/handlerS3/data.js';
-import createProcessAfterUploadS3MainFunction from './upload/processFile/mainFunction/data.js';
+import createProcessAfterUploadS3FunctionYmlS3 from './upload/processFile/functionYml/HdrS3/yaml.js';
+import createProcessAfterUploadS3HandlerS3 from './upload/processFile/handler/handlerS3/handlerS3.js';
+import createProcessAfterUploadS3MainFunction from './upload/processFile/mainFunction/main.js';
 // confirm After Upload S3
-import createConfirmAfterUploadS3FunctionYaml from './upload/confirmReserved/functionYaml/data.js';
-import createConfirmAfterUploadS3Handler from './upload/confirmReserved/handler/data.js';
-import createConfirmAfterUploadS3MainFunction from './upload/confirmReserved/mainFunction/data.js';
-import createConfirmAfterUploadS3Queue from './upload/confirmReserved/queue/data.js';
+import createConfirmAfterUploadS3FunctionYaml from './upload/confirmReserved/functionYaml/yaml.js';
+import createConfirmAfterUploadS3Handler from './upload/confirmReserved/handler/handler.js';
+import createConfirmAfterUploadS3MainFunction from './upload/confirmReserved/mainFunction/main.js';
+import createConfirmAfterUploadS3Queue from './upload/confirmReserved/queue/queue.js';
 // Relate Resources
-import createBucketS3 from './upload/relate/S3/data.js';
+import createBucketS3 from './upload/relate/S3/s3.js';
 // Other Resources
 import createReservedDataMainTable from './websocket/dynamoDb/ReservedTableData.js';
-import createSnsTopicForUploadS3 from './upload/relate/sns-out/data.js';
+import createSnsTopicForUploadS3 from './upload/relate/sns-out/snsOut.js';
 
 //
-import createFlowSchemaEndpointMainFunction from './flowSchemaMainFunction/data.js';
+import createFlowSchemaEndpointMainFunction from './flowSchemaMainFunction/main.js';
 
 async function createS3Component(_izContext, flowSchema, appPath) {
   const component = [
@@ -77,4 +77,5 @@ async function createS3Component(_izContext, flowSchema, appPath) {
   return component.flat();
 }
 
+export const eventKey = 's3';
 export default createS3Component;

package/src/{generateCode/generateFlowSchema/event/s3Component/upload/relate/sns-out/data.js → generators/fromFlowSchema/events/s3/upload/relate/sns-out/snsOut.js}

@@ -59,7 +59,7 @@ function createDataForDefaultSnsOut(_izContext, flowSchema, appPath) {
         saveFileName: SAVE_FILE_NAME.snsOutYaml,
         fileExtension: '.yml',
         isAppend: true,
-        fromFile: 's3/sns-out/data.js'
+        fromFile: 's3/sns-out/snsOut.js'
       }
     });
   }

package/src/generators/fromFlowSchema/index.js

@@ -0,0 +1,166 @@
+/*
+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 * as eventRegistry      from './events/registry.js';
+import * as statusTypeRegistry from './statusTypes/registry.js';
+
+import createWebSocketComponent          from './webSocket/index.js';
+import createRegisterComponent           from './register/index.js';
+import createWebSocketGenerateCodeLibs   from './shared/wsCodeLibs.js';
+import createFlowSchemaEndpointMainFunction from './flowSchemaMainFunction/main.js';
+
+import libs from '#libs/Libs.js';
+
+// Build handler maps from registry export names (key = export alias in registry.js)
+const EVENT_HANDLERS  = { ...eventRegistry };
+const STATUS_HANDLERS = { ...statusTypeRegistry };
+
+// 'generatedCode' is intentionally a no-op placeholder
+const NO_OP_EVENTS = new Set(['generatedCode']);
+
+/**
+ * Generates template data from flow schemas.
+ * @param {Object} _izContext
+ * @param {string} appPath
+ * @param {Array}  allLocalFlowSchemas
+ * @param {Object} settings
+ * @returns {Promise<Array>}
+ */
+async function generateTemplateDataFromFlowSchema(
+  _izContext,
+  appPath,
+  allLocalFlowSchemas,
+  settings
+) {
+  try {
+    const startAllMs = Date.now();
+
+    const shouldGenerateWebSocketAndRegister = allLocalFlowSchemas.some(
+      flowSchema =>
+        Array.isArray(flowSchema?.event) &&
+        flowSchema.event.some(e => e === 'ownTopic' || e === 'extTopic')
+    );
+
+    const flowResults = await Promise.all(
+      allLocalFlowSchemas.map(async flowSchema => {
+        const flowStartMs = Date.now();
+        const flowTag = flowSchema?.flowTag ?? '(unknownFlowTag)';
+        const events = Array.isArray(flowSchema?.event) ? flowSchema.event : [];
+
+        console.info(
+          `[FlowSchema:${flowTag}] start events=${JSON.stringify(events)} statusType=${flowSchema?.statusType}`
+        );
+
+        // ── per-flowSchema shared resources ─────────────────────────────────
+        const perFlowParams = [
+          createWebSocketGenerateCodeLibs(_izContext, flowSchema, appPath)
+        ];
+
+        if (!flowSchema.event.includes('s3')) {
+          perFlowParams.push(
+            await createFlowSchemaEndpointMainFunction(_izContext, flowSchema, appPath)
+          );
+        }
+
+        // ── event handlers (driven by registry) ─────────────────────────────
+        const eventPromises = events
+          .filter(event => {
+            if (NO_OP_EVENTS.has(event)) {
+              console.info(`[FlowSchema:${flowTag}] skip no-op event=${event}`);
+              return false;
+            }
+            if (!(event in EVENT_HANDLERS)) {
+              console.warn(`[FlowSchema:${flowTag}] skip unsupported event=${event}`);
+              return false;
+            }
+            return true;
+          })
+          .map(event =>
+            Promise.resolve(EVENT_HANDLERS[event](_izContext, flowSchema, appPath)).then(result => {
+              console.info(
+                `[FlowSchema:${flowTag}] done event=${event} generated=${Array.isArray(result) ? result.flat(5).length : 0}`
+              );
+              return result;
+            })
+          );
+
+        // ── statusType handler (driven by registry) ──────────────────────────
+        const { statusType, event } = flowSchema;
+        const statusPromise = (() => {
+          if (statusType === 'statusField' && event.includes('ownTopic') && event.includes('extTopic')) {
+            return Promise.resolve(STATUS_HANDLERS.statusField(_izContext, flowSchema, appPath)).then(result => {
+              console.info(`[FlowSchema:${flowTag}] done statusType=statusField generated=${Array.isArray(result) ? result.flat(5).length : 0}`);
+              return result;
+            });
+          }
+          if (statusType in STATUS_HANDLERS) {
+            return Promise.resolve(STATUS_HANDLERS[statusType](_izContext, flowSchema, appPath)).then(result => {
+              console.info(`[FlowSchema:${flowTag}] done statusType=${statusType} generated=${Array.isArray(result) ? result.flat(5).length : 0}`);
+              return result;
+            });
+          }
+          if (statusType === 'storedCache' || statusType === 'none') {
+            console.info(`[FlowSchema:${flowTag}] skip statusType=${statusType} (noop)`);
+            return Promise.resolve([]);
+          }
+          if (statusType === 'statusField') {
+            return Promise.resolve([]);
+          }
+          throw new Error('Not supported statusType: ' + statusType);
+        })();
+
+        const results = [
+          ...perFlowParams,
+          ...(await Promise.all([...eventPromises, statusPromise])).flat(5)
+        ];
+
+        const targetFiles = libs.toUniqueFilePaths(results);
+        console.info(`[FlowSchema:${flowTag}] completed generated=${results.length} elapsedMs=${Date.now() - flowStartMs}`);
+        if (targetFiles.length) console.info(`[FlowSchema:${flowTag}] targetFiles: `, targetFiles);
+
+        return results;
+      })
+    );
+
+    const createSourceParams = flowResults.flat(5);
+
+    if (shouldGenerateWebSocketAndRegister) {
+      const [webSocketResults, registerResults] = await Promise.all([
+        Promise.resolve(createWebSocketComponent(_izContext, appPath, allLocalFlowSchemas)),
+        Promise.resolve(createRegisterComponent(_izContext, allLocalFlowSchemas, appPath))
+      ]);
+
+      createSourceParams.push(...webSocketResults, ...registerResults);
+
+      const wsAndRegisterFiles = libs.toUniqueFilePaths([...webSocketResults, ...registerResults]);
+      console.info(`[FlowSchema:*] completed webSocket+register generated=${webSocketResults.length + registerResults.length}`);
+      if (wsAndRegisterFiles.length)
+        console.info('[FlowSchema:*] targetFiles (webSocket+register) : ', wsAndRegisterFiles);
+    }
+
+    console.info(
+      `[FlowSchema:*] all completed flows=${allLocalFlowSchemas.length} generated=${createSourceParams.length} elapsedMs=${Date.now() - startAllMs}`
+    );
+
+    return createSourceParams;
+  } catch (error) {
+    console.error('Error in generateTemplateDataFromFlowSchema:', error);
+    throw error;
+  }
+}
+
+export default generateTemplateDataFromFlowSchema;

package/src/{generateCode/generateFlowSchema/registerComponent → generators/fromFlowSchema/register}/index.js

@@ -1,11 +1,11 @@
-import createFlowSchemaRegisterHandlerComplete from './complete/handler/data.js';
-import createFlowSchemaRegisterMainCompleteFunc from './complete/mainFunction/data.js';
-import createFlowSchemaRegisterHandlerWbsFunc from './wbs/handler/data.js';
-import createFlowSchemaRegisterMainWbsFunc from './wbs/mainFunction/data.js';
-import createFlowSchemaRegisterMainCompleteFuncYaml from './complete/functionYaml/data.js';
-import createFlowSchemaRegisterMainWbsFuncYaml from './wbs/functionYaml/data.js';
-import createFlowSchemaRegisterSnsInSqs from './sns-in/data.js';
-import createFlowSchemaRegisterSubscribeOutAll from './subscriptionOutAll/data.js';
+import createFlowSchemaRegisterHandlerComplete from './complete/handler/handler.js';
+import createFlowSchemaRegisterMainCompleteFunc from './complete/mainFunction/main.js';
+import createFlowSchemaRegisterHandlerWbsFunc from './wbs/handler/handler.js';
+import createFlowSchemaRegisterMainWbsFunc from './wbs/mainFunction/main.js';
+import createFlowSchemaRegisterMainCompleteFuncYaml from './complete/functionYaml/yaml.js';
+import createFlowSchemaRegisterMainWbsFuncYaml from './wbs/functionYaml/yaml.js';
+import createFlowSchemaRegisterSnsInSqs from './sns-in/snsIn.js';
+import createFlowSchemaRegisterSubscribeOutAll from './subscriptionOutAll/subscriptionOutAll.js';
 import createFlowSchemaRegisterDynamoDb from './dynamoDB/register.js';
 
 /**

package/src/generators/fromFlowSchema/statusTypes/registry.js

@@ -0,0 +1,2 @@
+export { default as statusField }   from './statusField/index.js';
+export { default as triggerCache }  from './triggerCache/index.js';

package/src/{generateCode/generateFlowSchema/statusType/statusFieldComponent/functionYaml/data.js → generators/fromFlowSchema/statusTypes/statusField/functionYaml/yaml.js}

@@ -82,13 +82,13 @@ async function createSourceParams(_izContext, flowSchema, appPath) {
 
   let tableNames = [];
   let objectSchema = undefined;
-  if (flowSchema.objType.service === serviceTag) {
+  if (flowSchema.objType.serviceTag === serviceTag) {
     // console.log("find objSchema in Local")
     objectSchema = await getObjectSchema
       .getLocalObjectSchemasWithHierarchy(
         _izContext,
         [flowSchema.objType.objectType],
-        path.join(appPath, './schemas')
+        path.join(appPath, 'src/schemas')
       )
       .then(res => res.records[0]);
   } else {

package/src/{generateCode/generateFlowSchema/statusType/statusFieldComponent → generators/fromFlowSchema/statusTypes/statusField}/index.js

@@ -1,7 +1,7 @@
-import createCompleteStatusFieldMainFunction from './mainFunction/data.js';
-import createCompleteStatusFieldFunctionYaml from './functionYaml/data.js';
-import createCompleteStatusFieldHandler from './handler/data.js';
-import createCompleteStatusFieldTopicAndQueue from './sns/data.js';
+import createCompleteStatusFieldMainFunction from './mainFunction/main.js';
+import createCompleteStatusFieldFunctionYaml from './functionYaml/yaml.js';
+import createCompleteStatusFieldHandler from './handler/handler.js';
+import createCompleteStatusFieldTopicAndQueue from './sns/sns.js';
 
 async function createStatusFieldComponent(_izContext, flowSchema, appPath) {
   const component = [
@@ -18,4 +18,5 @@ async function createStatusFieldComponent(_izContext, flowSchema, appPath) {
   return component;
 }
 
+export const statusKey = 'statusField';
 export default createStatusFieldComponent;

package/src/{generateCode/generateFlowSchema/statusType/triggerCacheComponent → generators/fromFlowSchema/statusTypes/triggerCache}/index.js

@@ -1,15 +1,15 @@
-import createProcessTriggerCacheYaml from './processTriggerCache/functionYaml/data.js';
-import createCheckTriggerCacheYaml from './checkTriggerCacheComplete/functionYaml/data.js';
-import createTriggerCacheCompleteYamlSqs from './triggerCacheComplete/functionYaml/sqs/data.js';
-import createTriggerCacheCompleteYamlDsq from './triggerCacheComplete/functionYaml/dsq/data.js';
-import createProcessTriggerCacheHandler from './processTriggerCache/handler/data.js';
-import createCheckTriggerCacheHandler from './checkTriggerCacheComplete/handler/data.js';
-import createTriggerCacheCompleteHandlerSqs from './triggerCacheComplete/handler/sqs/data.js';
-import createTriggerCacheCompleteHandlerDsq from './triggerCacheComplete/handler/dsq/data.js';
-import createProcessTriggerCacheMainFunction from './processTriggerCache/mainFunction/data.js';
-import createCheckTriggerCacheMainFunction from './checkTriggerCacheComplete/mainFunction/data.js';
-import createTriggerCacheCompleteMainFunction from './triggerCacheComplete/mainFunction/data.js';
-import createFlowSchemaTriggerCacheQueue from './triggerCacheQueue/data.js';
+import createProcessTriggerCacheYaml from './processTriggerCache/functionYaml/yaml.js';
+import createCheckTriggerCacheYaml from './checkTriggerCacheComplete/functionYaml/yaml.js';
+import createTriggerCacheCompleteYamlSqs from './triggerCacheComplete/functionYaml/sqs/sqs.js';
+import createTriggerCacheCompleteYamlDsq from './triggerCacheComplete/functionYaml/dsq/dsq.js';
+import createProcessTriggerCacheHandler from './processTriggerCache/handler/handler.js';
+import createCheckTriggerCacheHandler from './checkTriggerCacheComplete/handler/handler.js';
+import createTriggerCacheCompleteHandlerSqs from './triggerCacheComplete/handler/sqs/sqs.js';
+import createTriggerCacheCompleteHandlerDsq from './triggerCacheComplete/handler/dsq/dsq.js';
+import createProcessTriggerCacheMainFunction from './processTriggerCache/mainFunction/main.js';
+import createCheckTriggerCacheMainFunction from './checkTriggerCacheComplete/mainFunction/main.js';
+import createTriggerCacheCompleteMainFunction from './triggerCacheComplete/mainFunction/main.js';
+import createFlowSchemaTriggerCacheQueue from './triggerCacheQueue/queue.js';
 
 async function createTriggerCacheComponent(_izContext, flowSchema, appPath) {
   const triggerCacheComponents = [
@@ -37,4 +37,5 @@ async function createTriggerCacheComponent(_izContext, flowSchema, appPath) {
   return triggerCacheComponents.flat();
 }
 
+export const statusKey = 'triggerCache';
 export default createTriggerCacheComponent;

package/src/{generateCode/generateFlowSchema/webSocketComponent → generators/fromFlowSchema/webSocket}/index.js

@@ -1,13 +1,13 @@
 // import webSocket
 import createWebSocketDynamoDb from './webSocket/dynamoDb/WebSocketTaskData.js';
-import createWebSocketConnectYaml from './webSocket/connect/functionYaml/data.js';
-import createWebSocketConnectHandler from './webSocket/connect/handler/data.js';
+import createWebSocketConnectYaml from './webSocket/connect/functionYaml/yaml.js';
+import createWebSocketConnectHandler from './webSocket/connect/handler/handler.js';
 import createUserUploadRecordTable from './webSocket/dynamoDb/userUploadRecords.js';
 // import webSocket Complete
-import createWebSocketCompleteMainFunctionYaml from './webSocketComplete/functionYaml/data.js';
-import createWebSocketCompleteMainHandler from './webSocketComplete/handler/data.js';
-import createWebSocketCompleteMainMainFunction from './webSocketComplete/mainFunction/data.js';
-import createWebSocketCompleteMainSqs from './webSocketComplete/sqs/data.js';
+import createWebSocketCompleteMainFunctionYaml from './webSocketComplete/functionYaml/yaml.js';
+import createWebSocketCompleteMainHandler from './webSocketComplete/handler/handler.js';
+import createWebSocketCompleteMainMainFunction from './webSocketComplete/mainFunction/main.js';
+import createWebSocketCompleteMainSqs from './webSocketComplete/sqs/sqs.js';
 
 /**
  *

package/src/{generateCode/generateSchema/actionEndpointComponent/handler/api/data.js → generators/fromObjectSchema/endpoint/handler/api.js}

@@ -27,7 +27,7 @@ const __dirname = path.dirname(__filename);
 const { HANDLER, SOURCE_PATH } = consts;
 const { firstLetterUpperCase: upperCase } = utils;
 
-const templatePath = path.join(__dirname, 'template.ejs');
+const templatePath = path.join(__dirname, 'apiTemplate.ejs');
 
 /**
  * Generates hdrApi handler source params for a given action

package/src/{generateCode/generateSchema/actionEndpointComponent/handler/beforeLogical/data.js → generators/fromObjectSchema/endpoint/handler/beforeLogical.js}

@@ -27,7 +27,7 @@ const __dirname = path.dirname(__filename);
 const { HANDLER, SOURCE_PATH } = consts;
 const { firstLetterUpperCase: upperCase } = utils;
 
-const templatePath = path.join(__dirname, 'template.ejs');
+const templatePath = path.join(__dirname, 'beforeLogicalTemplate.ejs');
 
 /**
  * Generates hdrSqs handler source params for a given action

package/src/{generateCode/generateSchema/actionEndpointComponent/handler/dsq/data.js → generators/fromObjectSchema/endpoint/handler/dsq.js}

@@ -27,7 +27,7 @@ const __dirname = path.dirname(__filename);
 const { HANDLER, SOURCE_PATH } = consts;
 const { firstLetterUpperCase: upperCase } = utils;
 
-const templatePath = path.join(__dirname, 'template.ejs');
+const templatePath = path.join(__dirname, 'dsqTemplate.ejs');
 
 /**
  * Generates hdrDsq handler source params for a given action

package/src/{generateCode/generateSchema/actionEndpointComponent/handler/inv/data.js → generators/fromObjectSchema/endpoint/handler/inv.js}

@@ -27,7 +27,7 @@ const __dirname = path.dirname(__filename);
 const { HANDLER, SOURCE_PATH } = consts;
 const { firstLetterUpperCase: upperCase } = utils;
 
-const templatePath = path.join(__dirname, 'template.ejs');
+const templatePath = path.join(__dirname, 'invTemplate.ejs');
 
 /**
  * Generates hdrInv handler source params for a given action

package/src/{generateCode/generateSchema/actionEndpointComponent/handler/sqs/data.js → generators/fromObjectSchema/endpoint/handler/sqs.js}

@@ -27,7 +27,7 @@ const __dirname = path.dirname(__filename);
 const { HANDLER, SOURCE_PATH } = consts;
 const { firstLetterUpperCase: upperCase } = utils;
 
-const templatePath = path.join(__dirname, 'template.ejs');
+const templatePath = path.join(__dirname, 'sqsTemplate.ejs');
 
 /**
  * Generates hdrSqs handler source params for a given action

package/src/{generateCode/generateSchema/actionEndpointComponent → generators/fromObjectSchema/endpoint}/index.js

@@ -17,21 +17,21 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import { NoRetryError } from '@izara_project/izara-core-library-core';
 
-import invHandler from './handler/inv/data.js';
-import apiHandler from './handler/api/data.js';
-import sqsHandler from './handler/sqs/data.js';
-import dsqHandler from './handler/dsq/data.js';
+import invHandler from './handler/inv.js';
+import apiHandler from './handler/api.js';
+import sqsHandler from './handler/sqs.js';
+import dsqHandler from './handler/dsq.js';
 
-import getMain from './mainFunction/get/data.js';
-import createMain from './mainFunction/create/main/data.js';
-import updateMain from './mainFunction/update/main/data.js';
-import deleteMain from './mainFunction/delete/main/data.js';
+import getMain from './main/get/get.js';
+import createMain from './main/create/create.js';
+import updateMain from './main/update/update.js';
+import deleteMain from './main/delete/delete.js';
 
-import beforeLogicalMain from './mainFunction/beforeLogical/data.js';
-import beforeLogicalHandler from './handler/beforeLogical/data.js';
+import beforeLogicalMain from './main/beforeLogical/beforeLogical.js';
+import beforeLogicalHandler from './handler/beforeLogical.js';
 
-import yamlGenerator from './yaml/data.js';
-import createResource from './resource/data.js';
+import yamlGenerator from './yaml.js';
+import createResource from './resource.js';
 
 import consts from '#libs/Consts.js';
 const { HANDLER } = consts;

package/src/{generateCode/generateSchema/actionEndpointComponent/mainFunction → generators/fromObjectSchema/endpoint/main}/beforeLogical/template.ejs

@@ -77,15 +77,17 @@ import { <%= action %>MainLogical } from './<%= functionName %>_Main.js';
       <%_ } _%>
     }
     _izContext.logger.debug('identifiers:::: ', identifiers);
-
+    // build parentFlowId
+    const parentFlowId = identifierUuid();
+    
     // ── Verify + remove awaitingStep ──────────────────────────────────────────
     const awaitingStepId = asyncFlowSharedLib.createAwaitingStepId(
-      hash(identifiers),
+      parentFlowId,
       `beforeLogical_${requestParams.returnRequestParams.objectType}_${flowTag}`
     );
 
     const pendingStepId = asyncFlowSharedLib.createPendingStepId(
-      hash(identifiers),
+      parentFlowId,
       `beforeLogical_${requestParams.returnRequestParams.objectType}`
     );
 
@@ -95,7 +97,7 @@ import { <%= action %>MainLogical } from './<%= functionName %>_Main.js';
     });
 
     const [allComplete, collectedAttributes, errorsFound] =
-      await asyncFlowSharedLib.syncAndCheckStepsCompletion(
+      await asyncFlowSharedLib.checkAllAwaitingStepsFinishedWithReturnParams(
         _izContext,
         pendingStepId,
         awaitingStepId,

package/src/{generateCode/generateSchema/actionEndpointComponent/mainFunction/create/main → generators/fromObjectSchema/endpoint/main/create}/template.ejs

@@ -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 { objectHash as hash } from '@izara_project/izara-shared-core';
+import { objectHash as hash , identifierUuid } from '@izara_project/izara-shared-core';
 import dynamodbSharedLib from '@izara_project/izara-core-library-dynamodb';
 import snsSharedLib from '@izara_project/izara-core-library-sns';
 import asyncFlowSharedLib from '@izara_project/izara-core-library-asynchronous-flow';
@@ -41,9 +41,9 @@ const { TOPIC_NAME_GENERATE_CODE, TOPIC_NAME_GRAPH_HANDLER } = consts;
 const PREFIX = {
   ONE: 'one',
   MANY: 'many',
-  CREATE_OBJECT_ASYNC: 'createObjectAsync',
-  CREATE_OBJECT_ASYNC_COMPLETE: 'createObjectAsyncComplete',
-  CREATE_OBJECT_EXTERNAL_TOPIC: 'createObjectExternalTopic'
+  CREATE_OBJECT_ASYNC: 'createObjectAsyncEndpoint',
+  CREATE_OBJECT_ASYNC_COMPLETE: 'createObjectAsyncEndpointComplete',
+  CREATE_OBJECT_EXTERNAL_TOPIC: 'createObjectExternalTopicEndpoint'
 };
 
 /**
@@ -124,6 +124,7 @@ export async function createMainLogical(
     const objInstanceFullForDynamoDb = structuredClone(objInstanceFull);
     const objInstanceFullForGraph = structuredClone(objInstanceFull);
     const objInstanceFullForExternalTopic = structuredClone(objInstanceFull);
+    const parentFlowId = identifierUuid();
     const allAwaitingStepsId = [];
     const listOfObjectForCreates = [];
     const listOfRecords = [];
@@ -164,8 +165,9 @@ export async function createMainLogical(
             createDataDetail => createDataDetail.storageType === consts.STORAGE_TYPES.graph)) {
             _izContext.logger.debug('must process graph first');
             listOfRecords.push({
-              [createDataDetail.tableName]: {
+              [storageTag]: {
                 serviceTag: createDataDetail.serviceTag,
+                tableName: createDataDetail.tableName,
                 objInstanceFull: {
                   identifiers: identifiersForCreateData,
                   fields: objInstanceFullForDynamoDb.fields
@@ -202,17 +204,14 @@ export async function createMainLogical(
            createObjInstanceFullFieldsByStorageTag(_izContext, storageTag, createDataDetail));
           _izContext.logger.debug('objInstanceFull before send to Graph', objInstanceFullForGraph);
 
+          const records = allAwaitingStepsId.length === 0 ? listOfRecords : [];
           allAwaitingStepsId.push({
             awaitingStepId: await asyncFlowSharedLib.createAwaitingStepId(
-              hash({ objType,
-                graphServerTag: storageTag,
-                identifiers: objInstanceFullForGraph.identifiers,
-                callingFlowProperties: callingFlowConfig.callingFlowProperties || {}
-              }),
+              parentFlowId,
               PREFIX.CREATE_OBJECT_ASYNC
             ),
             //(<additionalAttributeCreateNode>)
-            additionalAttributes: { listOfRecords: listOfRecords }
+            additionalAttributes: { listOfRecords: records }
             //(</additionalAttributeCreateNode>)
           });
 
@@ -237,7 +236,7 @@ export async function createMainLogical(
 
           allAwaitingStepsId.push({
             awaitingStepId: await asyncFlowSharedLib.createAwaitingStepId(
-              hash({ objType, graphServerTag: storageTag, identifiers: objInstanceFullForGraph.identifiers, callingFlowProperties: callingFlowConfig.callingFlowProperties || {} }),
+              parentFlowId,
               PREFIX.CREATE_OBJECT_EXTERNAL_TOPIC
             ),
             //(<additionalAttributeCreateExternalTopic>)
@@ -245,6 +244,8 @@ export async function createMainLogical(
             //(</additionalAttributeCreateExternalTopic>)
           });
 
+          Object.assign(objInstanceFullForExternalTopic, { parentFlowId: parentFlowId });
+
           await sns.publishAsync(_izContext, {
             Message: JSON.stringify(objInstanceFullForExternalTopic),
             TopicArn: `arn:aws:sns:${createDataDetail.region}:${createDataDetail.accountId}:${createDataDetail.serviceTag}_${createDataDetail.stage}_Create_In`
@@ -278,7 +279,8 @@ export async function createMainLogical(
             objInstanceFull: objectForCreate.objInstanceFull,
             deepPathConditional: requestParams.deepPathConditional || [],
             setFieldConditionals: requestParams.setFieldConditionals || [],
-            relationships: requestParams.relationships || []
+            relationships: requestParams.relationships || [],
+            parentFlowId: parentFlowId
           };
         }
 
@@ -286,14 +288,6 @@ export async function createMainLogical(
 
         Object.assign(messageObject, { settings: { updatePropertiesOnMatch: false }, originTimestamp: Date.now() });
 
-        if (directInvoke) {
-          _izContext.logger.debug('DirectInvoke case will invoke GraphHandlerInv');
-          return await graphSharedLibs.createNodeV2(
-            _izContext, graphServiceName, objType, objInstanceFullForGraph,
-            requestParams.relationships || [], Date.now(), { updatePropertiesOnMatch: false }
-          );
-        }
-
         messageObject = callingFlowSharedLib.addCallingFlowToSnsRequestMessageObject(
           messageObject,
           callingFlowSharedLib.addParentCallingFlowConfig(

package/src/{generateCode/generateSchema/actionEndpointComponent/mainFunction/delete/main → generators/fromObjectSchema/endpoint/main/delete}/template.ejs

@@ -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 { objectHash as hash } from '@izara_project/izara-shared-core';
+import { objectHash as hash, identifierUuid } from '@izara_project/izara-shared-core';
 import { consts as coreConsts } from '@izara_project/izara-core-library-core';
 import { consts as middlewareConsts } from '@izara_project/izara-middleware';
 import { sns, lambda } from '@izara_project/izara-core-library-external-request';