@izara_project/izara-core-generate-service-code 1.0.31 → 1.0.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-core-generate-service-code",
-  "version": "1.0.31",
+  "version": "1.0.32",
   "description": "Code for locally generating per service files",
   "author": "Sven Mason <thebarbariansven@gmail.com>",
   "license": "AGPL-3.0-or-later",
@@ -27,7 +27,7 @@
     "@izara_project/izara-core-library-core": "^1.0.31",
     "@izara_project/izara-core-library-logger": "^1.0.8",
     "@izara_project/izara-core-library-s3": "^1.0.5",
-    "@izara_project/izara-core-library-service-schemas": "^1.0.133",
+    "@izara_project/izara-core-library-service-schemas": "^1.0.135",
     "@izara_project/izara-shared-core": "^1.0.9",
     "ejs": "^5.0.1",
     "js-beautify": "^1.15.4",

package/src/generateCode/generateFlowSchema/event/ownTopicComponent/flowSchemaComponent/functionYaml/data.js

@@ -105,7 +105,7 @@ function createSourceParams(_izContext, flowSchema, appPath) {
     templateData: {
       resourceLocation:
         savePath.flowSchemaFlowTag(flowSchema.flowTag) +
-        upperCase(flowSchema.flowTag) +
+        upperCase(flowSchema.flowTag) + "_" +
         upperCase('hdrWbs'),
       functionName: upperCase(flowSchema.flowTag),
       handlerType: upperCase('hdrWbs'),

package/src/generateCode/generateFlowSchema/event/ownTopicComponent/flowSchemaComponent/handler/template.ejs

@@ -21,7 +21,7 @@ import { middlewareHandler as middleware, validatorSchema, consts, response } fr
 import dynamodbSharedLib from '@izara_project/izara-core-library-dynamodb';
 import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow';
 import { objectHash as hash } from '@izara_project/izara-shared-core';
-import { postToConnection } from '../../../libs/source/GenerateCodeLibs.js';
+import { postToConnection } from '../../../../libs/source/GenerateCodeLibs.js';
 import <%- functionName %> from './<%- functionName %>_Main.js';
 import { utils, getObjectSchema } from "@izara_project/izara-core-library-service-schemas";
 const { createFlowTypeConcat } = utils

package/src/generateCode/generateFlowSchema/event/ownTopicComponent/flowSchemaComponent/mainFunction/template.ejs

@@ -29,7 +29,7 @@ import { NoRetryError } from '@izara_project/izara-core-library-core';
 import { consts as coreConsts } from "@izara_project/izara-middleware";
 import { consts as generateCodeConsts } from '@izara_project/izara-core-generate-service-code';
 const { TOPIC_NAME_GENERATE_CODE } = generateCodeConsts;
-import { postToConnection } from '../../../libs/source/GenerateCodeLibs.js'
+import { postToConnection } from '../../../../libs/source/GenerateCodeLibs.js';
 
 //(<optionalRequire>)
 //(</optionalRequire>)

package/src/generateCode/generateFlowSchema/flowStep/afterPluginHook/handler/templateDsq.ejs

@@ -118,6 +118,7 @@ export const main = middleware.wrap(async (event, context, callback) => {
 
       // add argument (to invoke lambda) to passOnProperties[]
       passOnProperties.push(record.body.Message);
+      passOnProperties.push(callingFlowSharedLib.addPassBackPropertiesToPassOnProperties(record.body.Message)) // is Ok PassBackProperties
       record._izContext.logger.debug('passOnProperties in handler', passOnProperties);
 
       // call recordHandlerSharedLib.recordHandler with 3 parameters and return promise(resolve)

package/src/generateCode/generateFlowSchema/flowStep/afterPluginHook/handler/templateSqs.ejs

@@ -51,11 +51,8 @@ export const main = middleware.wrap(async (event, context) => {
 
         // add argument (to invoke lambda) to passOnProperties[]
         passOnProperties.push(record.body.Message);
-        passOnProperties.push(
-          callingFlowSharedLib.addCallingFlowToPassOnProperties(
-            record.body.Message
-          )
-        );
+        passOnProperties.push(callingFlowSharedLib.addPassBackPropertiesToPassOnProperties(record.body.Message));
+
         record._izContext.logger.debug(
           'passOnProperties in handler',
           passOnProperties

package/src/generateCode/generateFlowSchema/flowStep/afterPluginHook/templateMain.ejs

@@ -43,18 +43,18 @@ export default async function <%- functionName %>Main (
   requestParams,
   //(<additionalParams>)
   //(</additionalParams>)
-  callingFlowConfig = {},
+  passBackProperties = {},
 ) {
   try {
     _izContext.logger.debug('<%- functionName %> _izContext', _izContext);
     _izContext.logger.debug('<%- functionName %> requestParams', requestParams);
-    _izContext.logger.debug('<%- functionName %> callingFlowConfig', callingFlowConfig);
+    _izContext.logger.debug('<%- functionName %> passBackProperties', passBackProperties);
 
     const result = await receivePlugInHookTag(
       _izContext,
       '<%- plugInHookTag %>',
       requestParams,
-      callingFlowConfig
+      passBackProperties
     );
 
     let plugInIdentifiers = null;

package/src/generateCode/generateFlowSchema/flowStep/firstFlowStep/templateMain.ejs

@@ -40,12 +40,12 @@ export default async function <%- functionName %>Main (
   requestParams,
   //(<additionalParams>)
   //(</additionalParams>)
-  callingFlowConfig = {},
+  passBackProperties = {},
 ) {
   try {
     _izContext.logger.debug('<%- functionName %> _izContext', _izContext);
     _izContext.logger.debug('<%- functionName %> requestParams', requestParams);
-    _izContext.logger.debug('<%- functionName %> callingFlowConfig', callingFlowConfig);
+    _izContext.logger.debug('<%- functionName %> passBackProperties', passBackProperties);
 
     //(<hookCode>)
     //(</hookCode>)

package/src/generateCode/generateFlowSchema/libs/template.ejs

@@ -96,14 +96,14 @@ function getNestObject(_izContext, nestedObj, paths) {
  * @returns {string|null}
  */
 function getResourcePart(arnString, index) {
-    try {
-        const resourceId = arnString.split(':').pop();
-        const parts = resourceId.split('_');
-        return parts[index] || null;
-    } catch (error) {
-        console.error("Invalid ARN format", error);
-        return null;
-    }
+  try {
+    const resourceId = arnString.split(':').pop();
+    const parts = resourceId.split('_');
+    return parts[index] || null;
+  } catch (error) {
+    console.error("Invalid ARN format", error);
+    return null;
+  }
 }
 
 export {

package/src/generateCode/generateSchema/actionEndpointComponent/mainFunction/create/main/template.ejs

@@ -89,9 +89,7 @@ const PREFIX = {
     }
 
     // ── Detect invocation type ────────────────────────────────────────────────
-    const userAgent    = !!_izContext.correlationIds.get(middlewareConsts.USER_AGENT);
-    const directInvoke = !userAgent &&
-                         requestParams.hasOwnProperty('__context__') &&
+    const directInvoke = requestParams.hasOwnProperty('__context__') &&
                          requestParams.izEventSource?.eventSourceTag === 'DirectInvoke';
 
     // ── Build createDataDetails ───────────────────────────────────────────────
@@ -220,17 +218,15 @@ const PREFIX = {
     }
 
     // ── Create awaiting multiple steps ────────────────────────────────────────
-    if (!userAgent) {
-      _izContext.logger.debug('not api will create awaitingStep');
-      await asyncFlowSharedLib.createAwaitingMultipleStepsWithAdditionalAttributes(
-        _izContext,
-        allAwaitingStepsId,
-        asyncFlowSharedLib.createPendingStepId(
-          hash({ objType, identifiers: objInstanceFull.identifiers }),
-          PREFIX.CREATE_OBJECT_ASYNC_COMPLETE
-        )
-      );
-    }
+    _izContext.logger.debug('not api will create awaitingStep');
+    await asyncFlowSharedLib.createAwaitingMultipleStepsWithAdditionalAttributes(
+      _izContext,
+      allAwaitingStepsId,
+      asyncFlowSharedLib.createPendingStepId(
+        hash({ objType, identifiers: objInstanceFull.identifiers }),
+        PREFIX.CREATE_OBJECT_ASYNC_COMPLETE
+      )
+    );
 
     // ── Process graph objects ─────────────────────────────────────────────────
     let messageObject = {};
@@ -244,7 +240,8 @@ const PREFIX = {
           messageObject = {
             objType,
             objInstanceFull: objectForCreate.objInstanceFull,
-            relationships:   requestParams.relationships || []
+            setFieldConditionals: requestParams.setFieldConditionals || [],
+            relationships: requestParams.relationships || []
           };
         }
 
@@ -252,15 +249,14 @@ const PREFIX = {
 
         Object.assign(messageObject, { settings: { updatePropertiesOnMatch: false }, originTimestamp: Date.now() });
 
-        if (userAgent || directInvoke) {
-          _izContext.logger.debug(userAgent ? 'have userAgent will invoke GraphHandler' : 'DirectInvoke case will invoke GraphHandlerInv');
+        if (directInvoke) {
+          _izContext.logger.debug('DirectInvoke case will invoke GraphHandlerInv');
           return await graphSharedLibs.createNodeV2(
             _izContext, graphServiceName, objType, objInstanceFullForGraph,
             requestParams.relationships || [], Date.now(), { updatePropertiesOnMatch: false }
           );
         }
 
-        _izContext.logger.debug('not have userAgent will send Message to GraphHandler');
         messageObject = callingFlowSharedLib.addCallingFlowToSnsRequestMessageObject(
           messageObject,
           callingFlowSharedLib.addParentCallingFlowConfig(

package/src/libs/Utils.js

@@ -82,7 +82,7 @@ function checkValidTableYaml(
       if (
         hash(
           existsTableSetting[
-            firstLetterUpperCase(dynamoDbYamlSetting.templateData.tableName)
+          firstLetterUpperCase(dynamoDbYamlSetting.templateData.tableName)
           ]
         ) === hash(dynamoDbYamlSetting.templateData.attributes.sort())
       ) {
@@ -144,7 +144,7 @@ const savePath = {
   },
   flowSchemaFlowTag: function (flowTag) {
     return path.join(
-      SOURCE_PATH.flowSchema,
+      SOURCE_PATH.resourceLocationFlowSchema,
       firstLetterUpperCase(flowTag),
       'MainHandler/',
       'source/'