@izara_project/izara-core-generate-service-code 1.0.22 → 1.0.24

package/src/generateCode/generateSchema/actionEndpointComponent/yaml/data.js

@@ -68,7 +68,7 @@ const HTTP_METHOD = {
  * Generates yaml source params for a given action and handler
  * @param {Object} _izContext - Context object with logger
  * @param {Array} allObjSchemas - All object schemas
- * @param {string} srcPath - Source path
+ * @param {string} appPath - Source path
  * @param {string} action - Action name (create/update/get/delete)
  * @param {string} handler - Handler type (hdrApi/hdrSqs/hdrDsq/hdrInv)
  * @param {string|null} functionNameConfig - Override for yaml key (null = derive from action+handler)
@@ -78,7 +78,7 @@ const HTTP_METHOD = {
 async function data(
   _izContext,
   allObjSchemas,
-  srcPath,
+  appPath,
   action,
   handler,
   handlerSuffix = '',
@@ -187,7 +187,9 @@ async function data(
   }
 
   // ── Service config ────────────────────────────────────────────────────────
-  const configPath = path.join(srcPath, '../config/serverless.config.yml');
+  const configPath = path.join(appPath, '../config/serverless.config.yml');
+
+  // console.debug('###### configPath:', configPath);
   const ownServiceTag = yaml.parse(fs.readFileSync(configPath, 'utf8'))
     .main_config.iz_serviceTag;
 
@@ -294,7 +296,7 @@ async function data(
         }))
       },
       setting: {
-        savePath: path.join(srcPath, SOURCE_PATH.appYaml),
+        savePath: path.join(appPath, SOURCE_PATH.appYaml),
         saveFileName: SAVE_FILE_NAME.functionPerActionYaml,
         fileExtension: '.yml',
         isAppend: true

package/src/generateCode/generateSchema/findDataComponent/mainFunction/data.js

@@ -74,7 +74,7 @@ async function data(_izContext, appPath, getObjectTypes) {
         objectType,
         schemaPath
       );
-    // console.log('objectSchemaRecord: ', objectSchemaRecord);
+    // console.log('#### objectSchemaRecord: ', objectSchemaRecord);
 
     let objectSchema = objectSchemaRecord.records[0];
     // console.log(("objectSchema: ", objectSchema)

package/src/generateCode/generateSchema/relationshipPerActionComponent/changeRelationship/complete/sns-out/data.js

@@ -56,7 +56,8 @@ function createParamsForCreateSource(_izContext, srcPath) {
       savePath: path.join(srcPath, SOURCE_PATH.resourceYaml),
       saveFileName: SAVE_FILE_NAME.snsOutYaml,
       fileExtension: '.yml',
-      isAppend: true
+      isAppend: true,
+      fromFile: 'relationShip/changeComplete/sns-out/data.js'
     }
   };
 }

package/src/generateCode/generateSchema/relationshipPerActionComponent/create/action/functionYaml/data.js

@@ -33,6 +33,7 @@ const {
   SHORT_FUNCTION_NAME,
   SOURCE_GENERATE_IAM_ROLE,
   SQS_RESOURCE,
+  DYNAMO_RESOURCE,
   HANDLER
 } = consts;
 

package/src/generateCode/generateSchema/relationshipPerActionComponent/create/complete/sns-out/data.js

@@ -55,7 +55,8 @@ function createParamsForCreateSource(_izContext, srcPath) {
       savePath: path.join(srcPath, SOURCE_PATH.resourceYaml),
       saveFileName: SAVE_FILE_NAME.snsOutYaml,
       fileExtension: '.yml',
-      isAppend: true
+      isAppend: true,
+      fromFile: 'relationShip/createComplete/sns-out/data.js'
     }
   };
 }

package/src/generateCode/generateSchema/relationshipPerActionComponent/delete/action/functionYaml/data.js

@@ -33,6 +33,7 @@ const {
   SHORT_FUNCTION_NAME,
   SOURCE_GENERATE_IAM_ROLE,
   SQS_RESOURCE,
+  DYNAMO_RESOURCE,
   HANDLER
 } = consts;
 

package/src/generateCode/generateSchema/relationshipPerActionComponent/delete/complete/sns-out/data.js

@@ -57,7 +57,8 @@ function createParamsForCreateSource(_izContext, srcPath) {
       savePath: path.join(srcPath, SOURCE_PATH.resourceYaml),
       saveFileName: SAVE_FILE_NAME.snsOutYaml,
       fileExtension: '.yml',
-      isAppend: true
+      isAppend: true,
+      fromFile: 'relationShip/deleteComplete/sns-out/data.js'
     }
   };
 }

package/src/generateCode/generateSchema/relationshipPerActionComponent/get/action/functionYaml/data.js

@@ -33,6 +33,7 @@ const {
   SHORT_FUNCTION_NAME,
   SOURCE_GENERATE_IAM_ROLE,
   SQS_RESOURCE,
+  DYNAMO_RESOURCE,
   HANDLER
 } = consts;
 

package/src/generateCode/generateSchema/relationshipPerActionComponent/get/complete/sns-out/data.js

@@ -58,7 +58,8 @@ function createParamsForCreateSource(_izContext, srcPath) {
       savePath: path.join(srcPath, SOURCE_PATH.resourceYaml),
       saveFileName: SAVE_FILE_NAME.snsOutYaml,
       fileExtension: '.yml',
-      isAppend: true
+      isAppend: true,
+      fromFile: 'relationShip/getComplete/sns-out/data.js'
     }
   };
 }

package/src/generateCode/generateSchema/relationshipPerActionComponent/moveRelationship/complete/sns-out/data.js

@@ -57,7 +57,8 @@ function createParamsForCreateSource(_izContext, srcPath) {
       savePath: path.join(srcPath, SOURCE_PATH.resourceYaml),
       saveFileName: SAVE_FILE_NAME.snsOutYaml,
       fileExtension: '.yml',
-      isAppend: true
+      isAppend: true,
+      fromFile: 'relationShip/moveComplete/sns-out/data.js'
     }
   };
 }

package/src/generateCode/generateSchema/relationshipPerActionComponent/update/action/functionYaml/data.js

@@ -33,6 +33,7 @@ const {
   SHORT_FUNCTION_NAME,
   SOURCE_GENERATE_IAM_ROLE,
   SQS_RESOURCE,
+  DYNAMO_RESOURCE,
   HANDLER
 } = consts;
 

package/src/generateCode/generateSchema/relationshipPerActionComponent/update/action/sns-out/data.js

@@ -60,7 +60,8 @@ function createParamsForCreateSource(_izContext, srcPath) {
       savePath: path.join(srcPath, SOURCE_PATH.resourceYaml),
       saveFileName: SAVE_FILE_NAME.snsOutYaml,
       fileExtension: '.yml',
-      isAppend: true
+      isAppend: true,
+      fromFile: 'relationShip/update/sns-out/data.js'
     }
   };
 }

package/src/generateCode/generateSchema/relationshipPerActionComponent/update/complete/sns-out/data.js

@@ -49,7 +49,8 @@ function createParamsForCreateSource(_izContext, appPath) {
         savePath: path.join(appPath, SOURCE_PATH.resourceYaml),
         saveFileName: SAVE_FILE_NAME.snsOutYaml,
         fileExtension: '.yml',
-        isAppend: true
+        isAppend: true,
+      fromFile: 'relationShip/updateComplete/sns-out/data.js'
       }
     }
   ];

package/src/generateCode/resourceYamlComponent/sns-out/data.js

@@ -69,7 +69,8 @@ function createSourceSnsOut(_izContext, srcPath) {
         savePath: path.join(srcPath, SOURCE_PATH.resourceYaml),
         saveFileName: SAVE_FILE_NAME.snsOutYaml,
         fileExtension: '.yml',
-        isAppend: true
+        isAppend: true,
+        fromFile: 'resourceYaml/sns-out/data.js'
       }
     });
   }

package/src/generateCode/resourceYamlComponent/sns-out/defaultSnsOutForFindDataAndProcessLogical.js

@@ -55,7 +55,8 @@ function createDataForDefaultSnsOut(_izContext, srcPath) {
         savePath: path.join(srcPath, SOURCE_PATH.resourceYaml),
         saveFileName: SAVE_FILE_NAME.snsOutYaml,
         fileExtension: '.yml',
-        isAppend: true
+        isAppend: true,
+        fromFile: 'resourceYaml/sns-out/defaultSnsOut.js'
       }
     });
   }

package/src/generateCode/resourceYamlComponent/sns-out/template.ejs

@@ -1,10 +1,6 @@
 ##--------- [Create Topic Out]
-  Out<%- firstLetterUpperCase(queueName) %>:
+  Out<%- queueName %>:
     Type: AWS::SNS::Topic
     Properties:
       DisplayName: "SNS Message out"
-      TopicName: ${self:custom.iz_serviceTag}_${self:custom.iz_stage}_<%- firstLetterUpperCase(queueName) %>_Out
-
-  <%_ function firstLetterUpperCase(text) {
-    return text.charAt(0).toUpperCase() + text.slice(1)
-  } _%>
+      TopicName: ${self:custom.iz_serviceTag}_${self:custom.iz_stage}_<%- queueName %>_Out

package/src/generateCode.js

@@ -64,6 +64,7 @@ async function generateCodeWithTemplate(
   try {
     const startTime = Date.now();
     const appPath = path.join(rootServicePath, '/app');
+    const schemasPath = path.join(appPath, '/src/schemas');
     console.info(
       `[INFO] [generateCode] STATUS=START     | path=${rootServicePath}`
     );
@@ -73,15 +74,12 @@ async function generateCodeWithTemplate(
     const fetchStartTime = Date.now();
     const [allLocalFlowSchemas, allObjSchemas, allLocalRelationshipSchemas] =
       await Promise.all([
-        getObjectSchema.getAllLocalFlowSchemas(_izContext, rootServicePath),
+        getObjectSchema.getAllLocalFlowSchemas(_izContext, schemasPath),
         getObjectSchema.getAllLocalObjectSchemasWithHierarchy(
           _izContext,
-          rootServicePath
+          schemasPath
         ),
-        getObjectSchema.getAllLocalRelationshipSchema(
-          _izContext,
-          rootServicePath
-        )
+        getObjectSchema.getAllLocalRelationshipSchema(_izContext, schemasPath)
       ]);
 
     const fetchDuration = Date.now() - fetchStartTime;
@@ -145,6 +143,7 @@ async function generateCodeWithTemplate(
       appPath,
       allCreateSource
     );
+
     allCreateSource.push(...createSourceRole);
     const roleStr = `items=${allCreateSource.length} roles=${createSourceRole.length}`;
     console.info(
@@ -156,6 +155,7 @@ async function generateCodeWithTemplate(
     console.info('[INFO] [generateCode] STATUS=VALIDATING| source items...');
     for (const item of allCreateSource) {
       if (!item?.templatePath || !item?.templateData || !item?.setting) {
+        console.debug('###### error item:', item);
         throw new Error(
           `[generateCode] invalid source item: ${JSON.stringify(item)}`
         );
@@ -163,6 +163,8 @@ async function generateCodeWithTemplate(
       const { templatePath, templateData, setting } = item;
       setting.checkCreateSourcePass = true;
 
+      // console.debug('####### item:', item);
+
       const [status, errors] = await createSource(
         readFileSync(templatePath, 'utf8'),
         templateData,
@@ -170,7 +172,7 @@ async function generateCodeWithTemplate(
       );
       if (!status) {
         console.error('[generateCode] validation failed:', errors);
-        _izContext.logger.error('[generateCode] validation failed:', errors);
+        console.debug('###### item:', item);
         throw new Error(errors);
       }
 

package/src/libs/Consts.js

@@ -86,16 +86,12 @@ const SOURCE_PATH = {
     '/src/generatedCode/WebSocket/source/FlowSchemaHook/HookFunctionGeneratedCode/source/',
   resourceLocationGeneratedCodeHookFunction:
     'src/generatedCode/WebSocket/source/FlowSchemaHook/HookFunctionGeneratedCode/source/',
-  generatedAttributeTree: '/src/schemas/generatedCode/attributeTree/',
-  generatedPropertyValue: '/src/schemas/generatedCode/propertyValue/',
-  generatedRefRelationshipAttribute:
-    '/src/schemas/generatedCode/refRelationshipAttribute/',
   endpointPerService: '/src/generatedCode/ActionEndpoint/source/',
   resourceLocationHandlerEndpointPerService:
     'src/generatedCode/ActionEndpoint/source/',
   createRecordComplete: '/src/generatedCode/CreateRecordComplete/',
   resourceLocationCreateRecordComplete:
-    'src/generatedCode/CreateRerordComplete/'
+    'src/generatedCode/CreateRecordComplete/'
 };
 
 const SQS_RESOURCE = {
@@ -141,20 +137,21 @@ const SAVE_FILE_NAME = {
   snsOutYaml: 'generated-sns-out',
   functionRelationshipYaml: 'relationship-per-action',
   functionPerActionYaml: 'per-action-function',
+  processLogicalYaml: 'process-logical',
+  flowSchemaYaml: 'flow-schema',
+  roleNameConfigYaml: 'role-name-config',
+  sharedResourceYaml: 'generate-shared-resource',
+  authorizerYaml: 'authorizer',
+  findData: 'find-data',
+
   externalLambdaRole: 'generatedLambdaRoleServiceConfig',
   snsSubscription: 'generatedSnsServiceConfig',
   translateId: 'TranslateIdsRequest',
-  findData: 'find-data',
-  processLogicalYaml: 'process-logical',
-  flowSchemaYaml: 'flow-schema',
   S3Bucket: 'generated-s3-bucket',
-  sharedResourceYaml: 'generate-shared-resource',
   objectRelationship: 'ObjectRelationships',
   refObjectRelationship: 'RefObjectRelationships',
   objectSchema: 'ObjectFieldSchema',
-  roleNameConfigYaml: 'role-name-config',
-  roleNameConfig: 'RoleNameConfig',
-  authorizerYaml: 'authorizer'
+  roleNameConfig: 'RoleNameConfig'
 };
 
 const FUNCTION_NAME = {

package/src/libs/Utils.js

@@ -18,8 +18,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import yaml from 'yaml';
 import fs from 'fs';
 import path from 'path';
+
 import { objectHash as hash } from '@izara_project/izara-shared-core';
 
+import consts from '#libs/Consts.js';
+const { SOURCE_PATH } = consts;
+
 function firstLetterUpperCase(text) {
   return text.charAt(0).toUpperCase() + text.slice(1);
 }
@@ -128,6 +132,26 @@ function deleteFile(filePath) {
   }
 }
 
+const savePath = {
+  resourceYamlFlowSchemaFlowTag: function (appPath, flowTag) {
+    return path.join(
+      appPath,
+      SOURCE_PATH.flowSchema,
+      firstLetterUpperCase(flowTag),
+      'MainHandler/',
+      'source/'
+    );
+  },
+  flowSchemaFlowTag: function (flowTag) {
+    return path.join(
+      SOURCE_PATH.flowSchema,
+      firstLetterUpperCase(flowTag),
+      'MainHandler/',
+      'source/'
+    );
+  }
+};
+
 export default {
   firstLetterUpperCase,
   firstLetterLowerCase,
@@ -135,5 +159,6 @@ export default {
   getLocalConfig,
   checkValidTableYaml,
   deleteFileInDir,
-  deleteFile
+  deleteFile,
+  savePath
 };

package/src/__TemplateData/flowSchema/event/externalTopic/Process/handler/data.js

@@ -1,64 +0,0 @@
-/*
-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 { SOURCE_PATH, HANDLER } = consts;
-const { firstLetterUpperCase: upperCase } = utils;
-
-const templatePath = path.join(__dirname, 'template.ejs');
-/**
- * receive objectSchema
- * create data for WebScoket handler template
- *
- * @param {Object} objectSchema
- * @return {{templatePath, templateData,setting}}
- */
-
-function createSourceParams(_izContext, flowSchema, srcPath) {
-  let functionName = 'Process' + upperCase(flowSchema.flowTag);
-  let handlerType = upperCase(HANDLER.hdrSqs);
-  let queueName = 'Process' + upperCase(flowSchema.flowTag) + handlerType;
-
-  return {
-    templatePath: templatePath,
-    templateData: {
-      functionName,
-      handlerType,
-      queueName
-    },
-    setting: {
-      savePath: path.join(
-        srcPath,
-        SOURCE_PATH.flowSchema,
-        upperCase(flowSchema.flowTag),
-        'source/'
-      ),
-      saveFileName: `${functionName}_${handlerType}`,
-      fileExtension: '.js',
-      isAppend: false
-    }
-  };
-}
-
-export default createSourceParams;

package/src/__TemplateData/flowSchema/event/externalTopic/sns-out/data.js

@@ -1,75 +0,0 @@
-/*
-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 { SOURCE_PATH, SAVE_FILE_NAME } = consts;
-const { firstLetterUpperCase: upperCase } = utils;
-
-const templatePath = path.join(
-  __dirname,
-  '../../../../resourceYaml/sns-out/template.ejs'
-);
-
-/**
- * create data for dynamoDbYaml tempalte from objectSchema
- * return array of dynamoDb data
- * because one objectSchema can create multiple dynamoDb table
- *
- * @param {Object} _izContext
- * @param {String} saveFilePath
- * @returns {Object[]}              - data of multiple dynamoDb template
- */
-
-function createDataForDefaultSnsInSqs(_izContext, flowSchema, srcPath) {
-  let resultsForCreateDefaultSnsInSqs = [];
-  let flowSteps = Object.keys(flowSchema.flowSteps);
-  const setting = {
-    initialData: 'Resources:\n',
-    savePath: path.join(srcPath, SOURCE_PATH.resourceYaml),
-    saveFileName: SAVE_FILE_NAME.snsOutYaml,
-    fileExtension: '.yml',
-    isAppend: true
-  };
-
-  let topicOut = `${upperCase(flowSchema.flowTag)}`;
-
-  const generatedSnsTopicInForFlowSchema = [];
-  if (flowSteps.includes('Out')) {
-    generatedSnsTopicInForFlowSchema.push({
-      queueName: upperCase(topicOut)
-    });
-  }
-
-  for (let defaultSnsInSqsData of generatedSnsTopicInForFlowSchema) {
-    resultsForCreateDefaultSnsInSqs.push({
-      templatePath: templatePath,
-      templateData: defaultSnsInSqsData,
-      setting: setting
-    });
-  }
-
-  return resultsForCreateDefaultSnsInSqs;
-}
-
-export default createDataForDefaultSnsInSqs;