@izara_project/izara-core-generate-service-code 1.0.50 → 1.0.51

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-core-generate-service-code",
-  "version": "1.0.50",
+  "version": "1.0.51",
   "description": "Code for locally generating per service files",
   "homepage": "https://bitbucket.org/izara-core-support-services/izara-core-support-services-generate-service-code#readme",
   "repository": {

package/src/generateResources/IntTest/generateTests/pathIntTest/pathIntTest.js

@@ -38,7 +38,7 @@ async function data(_izContext, srcPath, settings) {
 
   for (const pathIntTestInBucket of pathIntTestInBuckets) {
     if (pathIntTestInBucket.key.endsWith(".json")) {
-      let path = pathIntTestInBucket.key.replace(/(events|tests|resources|dynamoDBSeedDataTags|graphSeedDataTags).json$/, '/');
+      let path = pathIntTestInBucket.key.replace(/(events|tests|resources|dynamoDBSeedDataTags|graphSeedDataTags).json$/,);
       intTestPaths.push(`${path}`);
     }
   }

package/src/generateResources/IntTest/upload/uploadIntTest.js

@@ -31,7 +31,7 @@ async function bucketPathForUpload(folderPath, settings) {
     // console.log({ files })
     for (const filePath of files) {
       const fileContent = fs.readFileSync(filePath);
-      const index = filePath.indexOf(settings.serviceTag);
+      const index = filePath.lastIndexOf(settings.serviceTag);
 
       let relativePath;
       if (index !== -1) {

package/src/generators/fromFlowSchema/env/template.ejs

@@ -0,0 +1,5 @@
+<%_ for (const [flowTag, flowStep] of Object.entries(flowTagWithFlowStepNames)) { -%>
+<% flowStep.forEach(flowStepName => { %>
+iz_<%- flowTag %><%- flowStepName _%>: <%- flowTag %><%- flowStepName _%>
+<% }) _%>
+<%_ } _%>

package/src/generators/fromFlowSchema/env/yaml.js

@@ -0,0 +1,73 @@
+/*
+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 path from 'path';
+import { fileURLToPath } from 'url';
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+import consts from '#libs/Consts.js';
+import utils from '#libs/Utils.js';
+
+const { firstLetterUpperCase: upperCase } = utils;
+const { SOURCE_PATH, HANDLER } = consts;
+
+const templatePath = path.join(__dirname, 'template.ejs');
+/**
+ * receive objectSchema
+ * create data for hdrInv template
+ *
+ * @param {Object} _izContext
+ * @param {Object} flowSchema
+ * @param {String} appPath
+ * @return {Object[]}
+ */
+function data(_izContext, allFlowSchemas, appPath) {
+  // console.log('allFlowSchemas', allFlowSchemas)
+  const flowTagWithFlowStepNames = {};
+  for (const flowSchema of allFlowSchemas) {
+    for (const flowStepName of Object.keys(flowSchema.flowSteps)) {
+      if (flowStepName === "In" || flowStepName === "Out") {
+        continue;
+      }
+      if (!flowTagWithFlowStepNames.hasOwnProperty(flowSchema.flowTag)) {
+        flowTagWithFlowStepNames[flowSchema.flowTag] = [];
+      }
+      flowTagWithFlowStepNames[flowSchema.flowTag].push(flowStepName);
+    }
+  }
+
+  // console.log('flowTagWithFlowStepNames', flowTagWithFlowStepNames)
+  return {
+    templatePath: templatePath,
+    templateData: {
+      flowTagWithFlowStepNames: flowTagWithFlowStepNames,
+    },
+    setting: {
+      savePath: path.join(
+        appPath,
+        SOURCE_PATH.appYaml),
+      saveFileName: 'flowSchema-env',
+      fileExtension: '.yml',
+      isAppend: false
+    }
+  };
+}
+
+
+
+export default data;

package/src/generators/fromFlowSchema/events/extTopic/process/handler/handler.js

@@ -55,7 +55,6 @@ function createSourceParams(_izContext, flowSchema, appPath) {
         appPath,
         SOURCE_PATH.flowSchema,
         upperCase(flowSchema.flowTag),
-        'MainHandler/',
         'source/'
       ),
       saveFileName: `${functionName}_${handlerType}`,

package/src/generators/fromFlowSchema/events/lambdaSyncApi/handler/handler.js

@@ -56,7 +56,6 @@ function createSourceParamsApi(_izContext, flowSchema, appPath) {
         appPath,
         SOURCE_PATH.flowSchema,
         upperCase(flowSchema.flowTag),
-        'MainHandler/',
         'source/'
       ),
       saveFileName: `${functionName}_${handlerType}`,

package/src/generators/fromFlowSchema/events/lambdaSyncInv/handler/handler.js

@@ -52,7 +52,6 @@ function createSourceParamsInvoke(_izContext, flowSchema, appPath) {
         appPath,
         SOURCE_PATH.flowSchema,
         upperCase(flowSchema.flowTag),
-        'MainHandler/',
         'source/'
       ),
       saveFileName: `${functionName}_${handlerType}`,

package/src/generators/fromFlowSchema/events/ownTopic/endpoint/functionYaml/yaml.js

@@ -41,7 +41,8 @@ const {
   createIamRole,
   shortNameHandler,
   resourceNames,
-  tableRoleForFlowSchema
+  tableRoleForFlowSchema,
+  getLocalOrS3ObjectSchema
 } = libs;
 
 const { firstLetterUpperCase: upperCase } = utils;
@@ -78,7 +79,6 @@ async function createSourceParams(_izContext, flowSchema, appPath) {
     handlerFilePath: path.join(
       SOURCE_PATH.resourceLocationFlowSchema,
       upperCase(flowSchema.flowTag),
-      'MainHandler/',
       'source/'
     ),
     functionName,
@@ -92,15 +92,17 @@ async function createSourceParams(_izContext, flowSchema, appPath) {
     flowSchema.statusType === 'triggerCache' ||
     flowSchema.statusType === 'statusField'
   ) {
-    objectSchema = await getObjectSchema
-      .getLocalObjectSchemas(
-        _izContext,
-        [flowSchema.objType.objectType],
-        path.join(appPath, 'src/schemas')
-      )
-      .then(res => res.records[0]);
-    if (!objectSchema) {
-      throw new NoRetryError('ObjectSchema not found');
+
+    let [objSchema, error] = await getLocalOrS3ObjectSchema(
+      _izContext,
+      flowSchema.objType,
+      path.join(
+        appPath,
+        'src/schemas')
+    )
+    objectSchema = objSchema;
+    if (error) {
+      console.log(error);
     }
   }
 

package/src/generators/fromFlowSchema/events/ownTopic/endpoint/handler/handler.js

@@ -57,7 +57,6 @@ function createParamsForCreateSource(_izContext, flowSchema, appPath) {
         appPath,
         SOURCE_PATH.flowSchema,
         upperCase(flowSchema.flowTag),
-        'MainHandler/',
         'source/'
       ),
       saveFileName: `${functionName}_${handlerTypeSqs}`,
@@ -80,7 +79,6 @@ function createParamsForCreateSource(_izContext, flowSchema, appPath) {
           appPath,
           SOURCE_PATH.flowSchema,
           upperCase(flowSchema.flowTag),
-          'MainHandler/',
           'source/'
         ),
         saveFileName: `${functionName}_${handlerTypeDsq}`,

package/src/generators/fromFlowSchema/events/ownTopic/flowSchema/handler/handler.js

@@ -54,7 +54,6 @@ function createParamsForCreateSource(_izContext, flowSchema, appPath) {
         appPath,
         SOURCE_PATH.flowSchema,
         upperCase(flowSchema.flowTag),
-        'MainHandler/',
         'source/'
       ),
       saveFileName: `${functionName}_${handlerType}`,

package/src/generators/fromFlowSchema/events/ownTopic/flowSchema/mainFunction/main.js

@@ -53,7 +53,6 @@ function createParamsForCreateSource(_izContext, flowSchema, appPath) {
         appPath,
         SOURCE_PATH.flowSchema,
         upperCase(flowSchema.flowTag),
-        'MainHandler/',
         'source/'
       ),
       saveFileName: `${functionName}_Main`,

package/src/generators/fromFlowSchema/flowSchemaMainFunction/main.js

@@ -112,7 +112,6 @@ async function createParamsForCreateSource(_izContext, flowSchema, appPath) {
         appPath,
         SOURCE_PATH.flowSchema,
         upperCase(flowSchema.flowTag),
-        'MainHandler/',
         'source/'
       ),
       saveFileName: `${functionName}_Main`,

package/src/generators/fromFlowSchema/flowStep/flowStep.js

@@ -389,7 +389,6 @@ function buildNoPluginHookResources(
         handlerFilePath: path.join(
           SOURCE_PATH.resourceLocationFlowSchema,
           upperCase(flowTag),
-          upperCase(flowStepName),
           'source/',
           `${upperCase(flowStepName)}_${upperCase(HANDLER.hdrSqs)}`
         ),
@@ -456,8 +455,8 @@ function buildFlowStepResources(_izContext, flowSchema, saveFilePath) {
       const flowSchemaSourcePath = path.join(
         saveFilePath,
         consts.SOURCE_PATH.flowSchema,
-        upperCase(flowTag) + '/',
-        `${upperCase(flowStepName)}/source/`
+        upperCase(flowTag),
+        `source/`
       );
 
       if (flowStepConfig.plugInHooks?.length) {

package/src/generators/fromFlowSchema/index.js

@@ -23,6 +23,8 @@ import createRegisterComponent from './register/index.js';
 import createWebSocketGenerateCodeLibs from './shared/wsCodeLibs.js';
 import createFlowSchemaEndpointMainFunction from './flowSchemaMainFunction/main.js';
 
+import envYaml from './env/yaml.js';
+
 import libs from '#libs/Libs.js';
 
 // Build handler maps from registry export names (key = export alias in registry.js)
@@ -175,6 +177,8 @@ async function generateTemplateDataFromFlowSchema(
 
       createSourceParams.push(...webSocketResults, ...registerResults);
 
+
+
       const wsAndRegisterFiles = libs.toUniqueFilePaths([
         ...webSocketResults,
         ...registerResults
@@ -189,6 +193,12 @@ async function generateTemplateDataFromFlowSchema(
         );
     }
 
+    const generateYamlEnv = envYaml(_izContext, allLocalFlowSchemas, appPath);
+
+    createSourceParams.push(
+      generateYamlEnv,
+    );
+
     console.info(
       `[FlowSchema:*] all completed flows=${allLocalFlowSchemas.length} generated=${createSourceParams.length} elapsedMs=${Date.now() - startAllMs}`
     );

package/src/generators/fromFlowSchema/webSocket/webSocketComplete/functionYaml/yaml.js

@@ -124,10 +124,8 @@ function createSourceParams(_izContext, allLocalFlowSchemas, srcPath) {
       functionName,
       handlerType,
       additionalResourcePermission,
-
       functionNameConfig:
         upperCase(functionName) + upperCase(shortNameHandler(handlerType)),
-
       roleName: 'WebSocketMain',
       queueName: queueName,
       upperFunctionName: upperCase(functionName),

package/src/generators/fromObjectSchema/endpointComplete/create/yaml/yaml.js

@@ -22,7 +22,7 @@ const __dirname = path.dirname(__filename);
 import consts from '#libs/Consts.js';
 import utils from '#libs/Utils.js';
 import libs from '#libs/Libs.js';
-
+import { getObjectSchema } from '@izara_project/izara-core-library-service-schemas';
 const {
   HANDLER,
   RESOURCE_CLASSES,
@@ -42,16 +42,17 @@ const {
   awaitingMultipleStepsRole,
   defaultIamRolePerAction,
   createIamRole,
-  resourceNames
+  resourceNames,
+  externalResourceYaml
 } = libs;
 
 const templatePath = path.join(__dirname, 'template.ejs');
 
-function data(_izContext, srcPath) {
-  return [createFunctionYamlOutUpdateComplete(_izContext, srcPath)];
+async function data(_izContext, allObjectSchema, srcPath) {
+  return [await createFunctionYamlOutUpdateComplete(_izContext, allObjectSchema, srcPath)];
 }
 
-function createFunctionYamlOutUpdateComplete(_izContext, srcPath) {
+async function createFunctionYamlOutUpdateComplete(_izContext, allObjectSchema, srcPath) {
   let functionName = upperCase(FUNCTION_NAME.createObjectComplete);
   let additionalResourcePermission = defaultIamRolePerAction();
   let handlerType = upperCase(HANDLER.hdrSqs);
@@ -89,6 +90,31 @@ function createFunctionYamlOutUpdateComplete(_izContext, srcPath) {
 
   additionalResourcePermission.push(awaitingMultipleStepsRole());
 
+  for (const objSchema of allObjectSchema.records) {
+    if (objSchema.hasOwnProperty('extendObjType')) {
+      const parentObjSchema = await getObjectSchema.getObjSchemaS3WithCache(
+        _izContext,
+        objSchema.extendObjType
+      );
+      for (const parentStorage of Object.values(parentObjSchema.storageResources)) {
+        if (parentStorage.storageType === consts.STORAGE_TYPES.dynamoDB) {
+          if (parentStorage.tableName === `${parentObjSchema.objectType}Records`) {
+            additionalResourcePermission.push(
+              createIamRole({
+                [RESOURCE_CLASSES.dynamoDbAcrossService]:
+                  DYNAMO_RESOURCE.putItem
+              },
+                externalResourceYaml(
+                  [RESOURCE_CLASSES.dynamoDbAcrossService],
+                  'Records',
+                  objSchema.extendObjType.serviceTag)
+              ))
+          }
+        }
+      }
+    }
+  }
+
   const resourceLocation = SOURCE_PATH.resourceLocationOutPerActionComplete;
   const roleName = SOURCE_GENERATE_IAM_ROLE.ObjectCompleteRole;
   const upperFunctionName = upperCase(functionName);

package/src/generators/fromObjectSchema/endpointComplete/index.js

@@ -34,12 +34,10 @@ import updateSnsOut from './update/sns-out/snsOut.js';
 import updateFunctionYaml from './update/yaml/yaml.js';
 
 const components = [
-  updateFunctionYaml,
   updateHandler,
   updateMainFunction,
   updateSnsInSqs,
   updateSnsOut,
-  createFunctionYaml,
   createSnsInSqs,
   createSnsOut,
   createHandler,
@@ -51,9 +49,14 @@ const components = [
   deleteSnsInSqs,
   getSnsOut
 ];
+const componentYml = [
+  updateFunctionYaml,
+  createFunctionYaml,
+]
 
-async function endpointCompleteComponent(_izContext, appPath) {
+async function endpointCompleteComponent(_izContext, allObjSchemas, appPath) {
   try {
+    const allCreateSource = [];
     const results = await Promise.all(
       components.map(async fn => {
         try {
@@ -67,7 +70,25 @@ async function endpointCompleteComponent(_izContext, appPath) {
       })
     );
 
-    return results.flat();
+    const resultsYml = await Promise.all(
+      componentYml.map(async fn => {
+        try {
+          return await fn(_izContext, allObjSchemas, appPath);
+        } catch (error) {
+          console.error(
+            `Error processing perActionComplete component: ${error.message}`
+          );
+          return [];
+        }
+      }
+      ))
+
+    allCreateSource.push(...results, ...resultsYml)
+
+
+
+
+    return allCreateSource.flat();
   } catch (error) {
     _izContext.logger.error(
       'Error generating code with template perActionComplete:',

package/src/generators/fromObjectSchema/endpointComplete/update/yaml/yaml.js

@@ -22,6 +22,8 @@ const __dirname = path.dirname(__filename);
 import consts from '#libs/Consts.js';
 import utils from '#libs/Utils.js';
 import libs from '#libs/Libs.js';
+import { getObjectSchema } from '@izara_project/izara-core-library-service-schemas';
+import { DYNAMO_RESOURCE } from '#libs/consts/resources.js';
 
 const {
   HANDLER,
@@ -42,16 +44,17 @@ const {
   awaitingMultipleStepsRole,
   defaultIamRolePerAction,
   createIamRole,
-  resourceNames
+  resourceNames,
+  externalResourceYaml
 } = libs;
 
 const templatePath = path.join(__dirname, 'template.ejs');
 
-function data(_izContext, srcPath) {
-  return [createFunctionYamlOutUpdateComplete(_izContext, srcPath)];
+async function data(_izContext, allObjectSchema, srcPath) {
+  return [await createFunctionYamlOutUpdateComplete(_izContext, allObjectSchema, srcPath)];
 }
 
-function createFunctionYamlOutUpdateComplete(_izContext, srcPath) {
+async function createFunctionYamlOutUpdateComplete(_izContext, allObjectSchema, srcPath) {
   let functionName = upperCase(FUNCTION_NAME.updateNodeComplete);
   let functionNameConfig = upperCase(
     SHORT_FUNCTION_NAME(FUNCTION_NAME.updateNodeComplete)
@@ -90,6 +93,31 @@ function createFunctionYamlOutUpdateComplete(_izContext, srcPath) {
   // console.log("additionalResourcePermission in update", JSON.stringify(additionalResourcePermission, null, 2))
   additionalResourcePermission.push(awaitingMultipleStepsRole());
 
+  for (const objSchema of allObjectSchema.records) {
+    if (objSchema.hasOwnProperty('extendObjType')) {
+      const parentObjSchema = await getObjectSchema.getObjSchemaS3WithCache(
+        _izContext,
+        objSchema.extendObjType
+      );
+      for (const parentStorage of Object.values(parentObjSchema.storageResources)) {
+        if (parentStorage.storageType === consts.STORAGE_TYPES.dynamoDB) {
+          if (parentStorage.tableName === `${parentObjSchema.objectType}Records`) {
+            additionalResourcePermission.push(
+              createIamRole({
+                [RESOURCE_CLASSES.dynamoDbAcrossService]:
+                  DYNAMO_RESOURCE.updateItem
+              },
+                externalResourceYaml(
+                  [RESOURCE_CLASSES.dynamoDbAcrossService],
+                  'Records',
+                  objSchema.extendObjType.serviceTag)
+              ))
+          }
+        }
+      }
+    }
+  }
+
   const resourceLocation = SOURCE_PATH.resourceLocationOutPerActionComplete;
   const roleName = SOURCE_GENERATE_IAM_ROLE.ObjectCompleteRole;
   const upperFunctionName = upperCase(functionName);

package/src/generators/fromObjectSchema/index.js

@@ -66,7 +66,7 @@ async function generateTemplateDataFromSchema(
         console.error('[Schema] endpointComponent error:', error);
         return [];
       }),
-      endpointCompleteComponent(_izContext, appPath),
+      endpointCompleteComponent(_izContext, allObjSchemas, appPath),
       resourceYamlComponent(
         _izContext,
         appPath,

package/src/generators/fromObjectSchema/relationship/create/action/mainFunction/template.ejs

@@ -80,11 +80,15 @@ export default async function createRelationship(
       secondObject,
       relType,
       relationshipDirection,
-      relationshipProperties
+      relationshipProperties,
+      deepPathConditional
+      settings
       //(<requestParamCreateRel>)
       //(</requestParamCreateRel>)
     } = requestParams;
 
+    const createOnConditionalFail = settings.createOnConditionalFail ?? false;
+
     let errorsFound = [];
     const parentFlowId = identifierUuid();
     //(<beforeValidateCreateRel>)
@@ -349,7 +353,9 @@ export default async function createRelationship(
         relType: relType,
         relationshipDirection,
         relationshipProperties,
+        deepPathConditional: deepPathConditional || [],
         parentFlowId,
+        settings: {createOnConditionalFail: createOnConditionalFail}
         //(<inCreateRelMessageBodyCreateRel>)
         //(</inCreateRelMessageBodyCreateRel>)
 

package/src/generators/fromPlugIn/afterFirstFlowStep/recievePlugIn/handler/handler.js

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

package/src/generators/fromPlugIn/afterFirstFlowStep/recievePlugIn/mainFunction/main.js

@@ -45,8 +45,7 @@ async function data(_izContext, data, appPath) {
       savePath: path.join(
         appPath,
         SOURCE_PATH.flowSchema,
-        `${upperCase(data.flowTag)}`,
-        `${upperCase(data.flowStepName)}`,
+        upperCase(data.flowTag),
         'source/'
       ),
       saveFileName: `${upperCase(functionName)}${upperCase(data.recieveType)}_Main`,

package/src/generators/fromPlugIn/afterFirstFlowStep/recievePlugIn/yaml/yaml.js

@@ -67,7 +67,10 @@ async function data(_izContext, data, appPath) {
       additionalResourcePermission,
       roleName,
       event: 'post',
-      resourceLocation: path.join(SOURCE_PATH.resourceLocationFlowSchema, `${data.flowTag}`, `${data.flowStepName}`, 'source/'),
+      resourceLocation: path.join(
+        SOURCE_PATH.resourceLocationFlowSchema,
+        data.flowTag,
+        'source/'),
       handlerType: upperCase(handlerType),
       lowerCase,
       route: functionName,

package/src/generators/fromPlugIn/byConfig/handler/handler.js

@@ -39,8 +39,7 @@ function data(_izContext, data, appPath) {
       savePath: path.join(
         appPath,
         SOURCE_PATH.flowSchema,
-        `${upperCase(data.flowTag)}`,
-        `${upperCase(data.flowStepName)}`,
+        upperCase(data.flowTag),
         'source/'
       ),
       saveFileName: upperCase(data.functionName) +

package/src/generators/fromPlugIn/byConfig/mainFunction/main.js

@@ -40,8 +40,7 @@ function data(_izContext, data, appPath) {
       savePath: path.join(
         appPath,
         SOURCE_PATH.flowSchema,
-        `${upperCase(data.flowTag)}`,
-        `${upperCase(data.flowStepName)}`,
+        upperCase(data.flowTag),
         'source/'
       ),
       saveFileName: upperCase(data.functionName) + '_Main',

package/src/generators/fromPlugIn/firstFlowStep/handler/handler.js

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

package/src/generators/fromPlugIn/firstFlowStep/mainFunction/main.js

@@ -54,8 +54,7 @@ async function data(_izContext, data, appPath) {
       savePath: path.join(
         appPath,
         SOURCE_PATH.flowSchema,
-        `${upperCase(data.flowTag)}`,
-        `${upperCase(data.flowStepName)}`,
+        upperCase(data.flowTag),
         'source/'
       ),
       saveFileName: `${upperCase(data.functionName)}_Main`,

package/src/generators/fromPlugIn/index.js

@@ -125,7 +125,6 @@ async function generatePlunIg(
           handlerPath: path.join(
             SOURCE_PATH.resourceLocationFlowSchema,
             upperCase(flowSchema.flowTag),
-            upperCase(flowStepName),
             'source/',
             `${upperCase(flowTag)}${upperCase(flowStepName)}_${upperCase(data.handlerType)}`
           ),

package/src/libs/Utils.js

@@ -140,7 +140,6 @@ const savePath = {
       appPath,
       SOURCE_PATH.flowSchema,
       firstLetterUpperCase(flowTag),
-      'MainHandler/',
       'source/'
     );
   },
@@ -148,7 +147,6 @@ const savePath = {
     return path.join(
       SOURCE_PATH.resourceLocationFlowSchema,
       firstLetterUpperCase(flowTag),
-      'MainHandler/',
       'source/'
     );
   }