@izara_project/izara-core-generate-service-code 1.0.40 → 1.0.42

package/package.json

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

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

@@ -21,10 +21,13 @@ 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 <%- functionName %> from './<%- functionName %>_Main.js';
 import { utils, getObjectSchema } from "@izara_project/izara-core-library-service-schemas";
-const { createFlowTypeConcat } = utils
+const { createFlowTypeConcat } = utils;
+
+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) => {
 

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

@@ -23,13 +23,13 @@ import { getObjectSchema } from '@izara_project/izara-core-library-service-schem
 import snsSharedLib from '@izara_project/izara-core-library-sns';
 import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow';
 import lambdaSharedLib from '@izara_project/izara-core-library-lambda';
-import { sns } from '@izara_project/izara-core-library-external-request';
+import { sns, webSocket } from '@izara_project/izara-core-library-external-request';
 
 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';
+const { postToConnection } = webSocket;
 
 //(<optionalRequire>)
 //(</optionalRequire>)
@@ -66,7 +66,11 @@ export default async function <%- functionName %> (
       serviceTag: process.env.iz_serviceTag,
     })
 
-    _izContext.logger.debug("flowSchema", flowSchema)
+    _izContext.logger.debug("flowSchema", flowSchema);
+
+    if (flowSchema.initiateBy === 'user') {
+      _izContext.correlationIds.set(coreConsts.USER_AGENT, 'webSocket');
+    };
 
     let connectionId = _izContext.correlationIds.get(coreConsts.CONNECTION_ID);
 

package/src/generateCode/generateFlowSchema/event/s3Component/upload/createObject/handler/template.ejs

@@ -20,7 +20,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import { middlewareHandler as middleware, consts, response } from "@izara_project/izara-middleware";
 import dynamodbSharedLib from '@izara_project/izara-core-library-dynamodb';
 import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow';
-import { postToConnection } from '../../../../libs/source/GenerateCodeLibs.js';
+import { webSocket } from '@izara_project/izara-core-library-external-request';
+const { postToConnection } = webSocket;
 import { utils } from "@izara_project/izara-core-library-service-schemas";
 const { createFlowTypeConcat } = utils
 

package/src/generateCode/generateFlowSchema/event/s3Component/upload/createObjectComplete/mainFunction/template.ejs

@@ -16,9 +16,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import dynamodbSharedLib from '@izara_project/izara-core-library-dynamodb';
-import { consts as coreConsts } from '@izara_project/izara-middleware'
+import { consts as coreConsts } from '@izara_project/izara-middleware';
+import { webSocket } from '@izara_project/izara-core-library-external-request';
+const { postToConnection } = webSocket;
 
-import { postToConnection } from '../../../../libs/source/GenerateCodeLibs.js'
 export async function webSocketTaskComplete(
   _izContext,
   updateItem

package/src/generateCode/generateFlowSchema/event/s3Component/upload/preSignUrl/reservedLimit/mainFunction/template.ejs

@@ -21,14 +21,15 @@ import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow
 import lambdaSharedLib from '@izara_project/izara-core-library-lambda';
 import snsSharedLib from '@izara_project/izara-core-library-sns';
 import asyncFlowSharedLib from "@izara_project/izara-core-library-asynchronous-flow";
-import { sns } from '@izara_project/izara-core-library-external-request';
+import { sns, webSocket } from '@izara_project/izara-core-library-external-request';
 import { consts as generateCodeConsts } from '@izara_project/izara-core-generate-service-code';
 import { consts as coreConsts } from '@izara_project/izara-middleware';
 import { objectHash as hash } from '@izara_project/izara-shared-core';
 import dynamodbSharedLib from '@izara_project/izara-core-library-dynamodb';
-import { processStaticLimit, postToConnection } from '../../../../libs/source/GenerateCodeLibs.js';
+import { processStaticLimit } from '../../../../libs/source/GenerateCodeLibs.js';
 import { utils } from "@izara_project/izara-core-library-service-schemas";
 const { createFlowTypeConcat } = utils
+const { postToConnection } = webSocket;
 
 //(<optionalRequired>)
 //(</optionalRequired>)

package/src/generateCode/generateFlowSchema/registerComponent/complete/mainFunction/template.ejs

@@ -24,8 +24,8 @@ import { getObjectSchema, identifiersObject } from '@izara_project/izara-core-li
 import dynamodbSharedLib from '@izara_project/izara-core-library-dynamodb';
 import lambdaSharedLib from '@izara_project/izara-core-library-lambda';
 
-import { lambda } from '@izara_project/izara-core-library-external-request';
-import { postToConnection } from "../../../libs/source/GenerateCodeLibs.js";
+import { lambda, webSocket } from '@izara_project/izara-core-library-external-request';
+const { postToConnection } = webSocket;
 
 /**
  * description of function.

package/src/generateCode/generateFlowSchema/registerComponent/wbs/handler/template.ejs

@@ -22,7 +22,9 @@ import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow
 
 import registerMain from './Register_Main.js';
 import dynamodbSharedLib from '@izara_project/izara-core-library-dynamodb';
-import { postToConnection } from "../../../libs/source/GenerateCodeLibs.js";
+
+import { webSocket } from '@izara_project/izara-core-library-external-request';
+const { postToConnection } = webSocket;
 
 export const main = middleware.wrap(async (event, context) => {
 

package/src/generateCode/generateFlowSchema/registerComponent/wbs/mainFunction/template.ejs

@@ -20,13 +20,12 @@ along with this program. If not, see
 
 import { objectHash as hash } from '@izara_project/izara-shared-core';
 import { getObjectSchema, identifiersObject } from '@izara_project/izara-core-library-service-schemas';
-import lodash from 'lodash'
 import dynamodbSharedLib from '@izara_project/izara-core-library-dynamodb';
 import lambdaSharedLib from '@izara_project/izara-core-library-lambda';
-import { lambda } from '@izara_project/izara-core-library-external-request'
+import { lambda, webSocket } from '@izara_project/izara-core-library-external-request'
 import { NoRetryError } from '@izara_project/izara-core-library-core';
 import { consts } from '@izara_project/izara-middleware';
-import { postToConnection } from '../../../libs/source/GenerateCodeLibs'
+const { postToConnection } = webSocket;
 
 /**
  *
@@ -123,7 +122,7 @@ export default async function registerMain(
           }
           identifier = identifier;
         } else {
-          let pureRequestParams = lodash.cloneDeep(requestParams);
+          let pureRequestParams = structuredClone(requestParams);
           delete pureRequestParams.flowTag
           identifier = pureRequestParams
         }

package/src/generateCode/generateFlowSchema/webSocketComponent/webSocketComplete/mainFunction/template.ejs

@@ -24,7 +24,8 @@ import { getObjectSchema, utils } from '@izara_project/izara-core-library-servic
 const { createFlowTypeConcat } = utils;
 import dynamodbSharedLib from '@izara_project/izara-core-library-dynamodb';
 
-import { postToConnection } from "../../../libs/source/GenerateCodeLibs.js";
+import { webSocket } from '@izara_project/izara-core-library-external-request';
+const { postToConnection } = webSocket;
 
 //(<optionalRequire>)
 //(</optionalRequire>)

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

@@ -31,7 +31,7 @@ const templateSendPlugin = path.join(__dirname, './templateByConfig/templateSend
 const templateAwaitingStep = path.join(__dirname, './templateByConfig/awaitingSteps.ejs');
 
 async function data(_izContext, data, appPath) {
-
+  console.log("dataInMain", data)
   const [mainFlow] = await getLocalOrS3FlowSchema(
     _izContext,
     {
@@ -42,25 +42,10 @@ async function data(_izContext, data, appPath) {
       appPath, './src/schemas')
   );
 
-  const [childFlow] = await getLocalOrS3FlowSchema(
-    _izContext,
-    data.childFlow,
-    path.join(
-      appPath, './src/schemas')
-  );
-
   if (mainFlow.hasOwnProperty('objType')) {
     data['mainObjType'] = mainFlow.objType;
   };
 
-  if (!childFlow) {
-    throw new NoRetryError(`can't get ${childFlow.flowTag} from s3 or local`);
-  };
-
-  if (childFlow && childFlow.hasOwnProperty('objType')) {
-    data['childObjType'] = childFlow.objType;
-  };
-
 
   return {
     templatePath: templatePath,

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

@@ -58,7 +58,7 @@ export default async function <%- functionName %>(
     //(<hookCode>)
 
     <% if (handleLogic === 'awaitingMultipleSteps') { %>
-    <%- include(templateAwaitingStep, { childFlow, mainObjType, childObjType }) %>
+    <%- include(templateAwaitingStep, { childFlow, mainObjType }) %>
     <% } %>
     <% if (havePlugIn) { -%>
     <%- include(templateSendPlugin, {havePlugIn: havePlugIn, invokeType: invokeType, targetUrl: targetUrl}) %>

package/src/generateCode/generateFlowStepWithPlugIn/firstFlowStep/mainFunction/templateByConfig/awaitingSteps.ejs

@@ -52,10 +52,6 @@ await asyncFlowSharedLib.createAwaitingMultipleStepsWithAdditionalAttributes(
     )
   );
 
-  await sns.publishAsync(_izContext, {
-    Message: JSON.stringify(messageObject),
-    TopicArn: await snsSharedLib.snsTopicArnByFlowSchema(_izContext, "<%- childFlow.flowTag %>_In", "<%- childFlow.serviceTag %>")
-  });
 //(</afterCreateAwatingSteps>)
 
 <%_ function firstLetterUpperCase(text) {

package/src/generateCode/generateFlowStepWithPlugIn/index.js

@@ -137,10 +137,6 @@ async function generatePlunIg(
         if (flowStepConfig.plugInHooks?.length) {
           for (let i = 0; i < flowStepConfig.plugInHooks.length; i++) {
             if (i === 0) {
-              if (flowStepConfig.hasOwnProperty("settings")) {
-                data["handleLogic"] = flowStepConfig.settings.handleLogic;
-                data["childFlow"] = flowStepConfig.settings.flowType;
-              };
               const firstResults = await buildFirstPluginHookResources(
                 _izContext,
                 data,
@@ -159,14 +155,10 @@ async function generatePlunIg(
             allCreateSourceParams.push(...afterResults);
           }
         } else {
-          if (flowStepConfig.hasOwnProperty("settings")) {
-            data["handleLogic"] = flowStepConfig.settings.handleLogic;
-            data["childFlow"] = flowStepConfig.settings.flowType;
-          };
-
           const noHookResults = await buildNoPluginHookResources(
             _izContext,
             data,
+            flowStepConfig,
             appPath
           );
           allCreateSourceParams.push(...noHookResults);
@@ -224,10 +216,9 @@ async function generatePlunIg(
 export default generatePlunIg;
 
 
-async function buildNoPluginHookResources(_izContext, data, appPath) {
+async function buildNoPluginHookResources(_izContext, data, flowStepConfig, appPath) {
   const results = [];
 
-
   const yamlRes = await yamlFlowStep(
     _izContext,
     data,
@@ -253,7 +244,13 @@ async function buildNoPluginHookResources(_izContext, data, appPath) {
 
   const mainRes = await mainFunctionFlowStep(
     _izContext,
-    { ...data, havePlugIn: false }, appPath);
+    {
+      ...data,
+      havePlugIn: false,
+      handleLogic: flowStepConfig.settings?.handleLogic || 'none'
+    },
+    appPath
+  );
 
   results.push(mainRes,
     // snsOutRes,
@@ -322,6 +319,7 @@ async function buildFirstPluginHookResources(_izContext, data, flowStepConfig, a
         havePlugIn: true,
         invokeType: targetPlugIn.invocationType,
         targetUrl,
+        handleLogic: flowStepConfig.settings?.handleLogic || 'none'
       };
     }
   }
@@ -442,14 +440,16 @@ function resolveHandlerConfig(data, flowStepConfig, additionalResourcePermission
       if (handleLogic === 'awaitingMultipleSteps') {
         handler = HANDLER.hdrSqs;
         additionalResourcePermission.push(awaitingMultipleStepsRole())
-        additionalResourcePermission.push(createIamRole({
-          [RESOURCE_CLASSES.sns]: Object.values(SNS_RESOURCE)
-        },
+        additionalResourcePermission.push(createSqsResource(
           [
-            externalResourceYaml(
-              RESOURCE_CLASSES.sns,
-              `${childFlow.flowTag}_In`,
-              childFlow.serviceTag)
+            upperCase(flowTag) +
+            upperCase(flowStepName) +
+            upperCase(flowStepConfig.settings.handleLogic) +
+            upperCase(HANDLER.hdrSqs),
+            upperCase(flowTag) +
+            upperCase(flowStepName) +
+            upperCase(flowStepConfig.settings.handleLogic) +
+            upperCase(HANDLER.hdrSqs) + "DLQ"
           ]
         ))
       } else if (handleLogic === 'paginated') {

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

@@ -138,8 +138,6 @@ export async function createMainLogical(
 
         // ── DynamoDB ──────────────────────────────────────────────────────────
         if (createDataDetail.storageType === consts.STORAGE_TYPES.dynamoDB) {
-          //(<beforeCreateRecordDynamo>)
-          //(</beforeCreateRecordDynamo>)
           _izContext.logger.debug('::::::DynamoDB::::::', { storageTag, objInstanceFull });
 
           if (parentObject && createDataDetail.tableName.includes(firstLetterUpperCase(`${parentObject.objectType}Records`))) {
@@ -152,25 +150,45 @@ export async function createMainLogical(
           _izContext.logger.debug('objInstanceFull before create item in dynamoDB', objInstanceFullForDynamoDb);
 
           const identifiersForCreateData = await dynamoDbIdentifiersByStorageResource(
-            _izContext, objectSchema, createDataDetails, objInstanceFullForDynamoDb.identifiers
+            _izContext,
+            objectSchema,
+            createDataDetails,
+            objInstanceFullForDynamoDb.identifiers
           );
           _izContext.logger.debug('identifiersForCreateData', identifiersForCreateData);
 
-          // await dynamodbSharedLib.putItem(
-          //  _izContext,
-          //  await dynamodbSharedLib.tableName(_izContext, createDataDetail.tableName, createDataDetail.serviceTag),
-          //  { ...identifiersForCreateData, ...objInstanceFullForDynamoDb.fields }
-          // );
+          //(<beforeCreateRecordDynamo>)
+          //(</beforeCreateRecordDynamo>)
 
-          listOfRecords.push({
-            [createDataDetail.tableName]: {
-              serviceTag: createDataDetail.serviceTag,
-              objInstanceFull: {
-                identifiers: identifiersForCreateData,
-                fields: objInstanceFullForDynamoDb.fields
+          if (Object.values(createDataDetails).some(
+            createDataDetail => createDataDetail.storageType === consts.STORAGE_TYPES.graph)) {
+            _izContext.logger.debug('must process graph first');
+            listOfRecords.push({
+              [createDataDetail.tableName]: {
+                serviceTag: createDataDetail.serviceTag,
+                objInstanceFull: {
+                  identifiers: identifiersForCreateData,
+                  fields: objInstanceFullForDynamoDb.fields
+                }
               }
-            }
-          })
+            })
+          } else {
+            _izContext.logger.debug('can process record dynamo')
+            await dynamodbSharedLib.putItem(
+              _izContext,
+              dynamodbSharedLib.tableName(_izContext,
+                createDataDetail.tableName,
+                createDataDetail.serviceTag
+              ),
+              {
+                ...identifiersForCreateData,
+                ...objInstanceFullForDynamoDb.fields
+              }
+            );
+
+            objInstanceFullForDynamoDb.fields = {}
+          }
+
           //(<afterCreateRecordDynamo>)
           //(</afterCreateRecordDynamo>)
 
@@ -338,10 +356,17 @@ export async function createMainLogical(
 
     // ── DynamoDB-only complete path ───────────────────────────────────────────
     if (allAwaitingStepsId.length === 0 && listOfObjectForCreates.length === 0) {
-      const outMessage = callingFlowSharedLib.addPassBackPropertiesToSnsResponseMessageObject(
-        callingFlowConfig,
-        { objType, objInstanceFull: { identifiers: objInstanceFullForDynamoDb.identifiers, fields: objInstanceFullForDynamoDb.fields } }
-      );
+      const outMessage =
+        callingFlowSharedLib.addPassBackPropertiesToSnsResponseMessageObject(
+          callingFlowConfig,
+          {
+            objType: objType,
+            objInstanceFull: {
+              identifiers: objInstanceFullForDynamoDb.identifiers,
+              fields: objInstanceFullForDynamoDb.fields
+            }
+          }
+        );
 
       if (callingFlowConfig[callingFlowSharedLib.consts.CALLINGFLOW_PROPERTYNAME]) {
         _izContext.logger.debug('HAVE CallingFlow');
@@ -358,7 +383,10 @@ export async function createMainLogical(
 
     return {
       objType,
-      objInstanceFull: objInstanceFullForDynamoDb,
+      objInstanceFull: {
+        identifiers: objInstanceFullForDynamoDb.identifiers,
+        fields: objInstanceFullForDynamoDb.fields
+      },
       relationships: requestParams.relationships || [],
       status: 'complete',
       errorsFound