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

package/package.json

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

package/src/generateCode/generateFlowSchema/GenerateCodeFlowSchema.js

@@ -85,17 +85,20 @@ async function generateTemplateDataFromFlowSchema(
 
         // ── per-flowSchema resources ─────────────────────────────────────────
         const perFlowParams = [
-          ...createWebSocketGenerateCodeLibs(_izContext, flowSchema, appPath),
-          ...(!flowSchema.event.includes('s3')
-            ? await createFlowSchemaEndpointMainFunction(
-                _izContext,
-                flowSchema,
-                appPath
-              )
-            : []),
+          createWebSocketGenerateCodeLibs(_izContext, flowSchema, appPath),
           ...buildFlowStepResources(_izContext, flowSchema, appPath)
         ];
 
+        if (!flowSchema.event.includes('s3')) {
+          perFlowParams.push(
+            await createFlowSchemaEndpointMainFunction(
+              _izContext,
+              flowSchema,
+              appPath
+            )
+          );
+        }
+
         // ── event handlers ───────────────────────────────────────────────────
         const eventPromises = events
           .filter(event => {

package/src/generateCode/generateFlowSchema/event/eventBridgeComponent/functionYaml/data.js

@@ -45,7 +45,7 @@ const templatePath = path.join(__dirname, 'template.ejs');
  * @param {Object} objectSchema
  * @return {{templatePath, templateData,setting}}
  */
-function createSourceParams(_izContext, flowSchema, srcPath) {
+function createSourceParams(_izContext, flowSchema, appPath) {
   const functionName = upperCase(FUNCTION_NAME.flowSchemaEventBridge);
   // const action = SOURCE_GENERATE_IAM_ROLE.EventBridge;
   const functionNameConfig = upperCase(SOURCE_GENERATE_IAM_ROLE.EventBridge);
@@ -153,7 +153,7 @@ function createSourceParams(_izContext, flowSchema, srcPath) {
       schedules
     },
     setting: {
-      savePath: path.join(srcPath, SOURCE_PATH.appYaml),
+      savePath: path.join(appPath, SOURCE_PATH.appYaml),
       saveFileName: SAVE_FILE_NAME.flowSchemaYaml,
       fileExtension: '.yml',
       isAppend: true

package/src/generateCode/generateFlowSchema/event/eventBridgeComponent/functionYaml/template.ejs

@@ -1,7 +1,6 @@
-<%_ const join = require('path').join; _%>
-<%- firstLetterUpperCase(functionNameConfig) %>:
-  handler: <%- join(resourceLocation, `${functionName}_${firstLetterUpperCase(handlerType)}.main`)%>
-  name: ${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionNameConfig) %>
+<%- functionNameConfig %>:
+  handler: <%- `${resourceLocation}${functionName}_${handlerType}.main` %>
+  name: ${self:custom.iz_resourcePrefix}<%- functionNameConfig %>
   role: <%- roleName %>Role
   #<#<%- functionName %>FunctionSetting#>
   #<#/<%- functionName %>FunctionSetting#>
@@ -13,9 +12,3 @@
         rate: <%- schedule.rate %>
         input: <%- JSON.stringify(schedule.input) %>
     <%_ }) _%>
-<%_ function firstLetterUpperCase(text){
-  return text.charAt(0).toUpperCase() + text.slice(1)
-} _%>
-<%_ function firstLetterLowerCase(str) {
-  return str.charAt(0).toLowerCase() + str.slice(1)
-} _%>

package/src/generateCode/generateFlowSchema/event/eventBridgeComponent/handler/inv/data.js

@@ -33,10 +33,10 @@ const templatePath = path.join(__dirname, 'template.ejs');
  *
  * @param {Object} _izContext
  * @param {Object} flowSchema
- * @param {String} srcPath
+ * @param {String} appPath
  * @return {Object[]}
  */
-function data(_izContext, flowSchema, srcPath) {
+function data(_izContext, flowSchema, appPath) {
   const handler = HANDLER.hdrInv;
   const flowTag = flowSchema.flowTag;
   // const action = SOURCE_GENERATE_IAM_ROLE.EventBridge;
@@ -46,7 +46,8 @@ function data(_izContext, flowSchema, srcPath) {
     templatePath: templatePath,
     templateData: {
       functionName: functionName,
-      flowTag: flowTag,
+      flowTag: upperCase(flowTag),
+      // flowTag: ,
       // action: action,
       handler
       // roleName: SOURCE_GENERATE_IAM_ROLE.EventBridge,
@@ -54,7 +55,7 @@ function data(_izContext, flowSchema, srcPath) {
     },
     setting: {
       savePath: path.join(
-        srcPath,
+        appPath,
         SOURCE_PATH.flowSchemaEventBridge,
         flowSchema.flowTag,
         'source/'

package/src/generateCode/generateFlowSchema/event/eventBridgeComponent/handler/inv/template.ejs

@@ -15,12 +15,10 @@ 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 { middlewareHandleras middlewar } from "@izara_project/izara-middleware";
+import { middlewareHandler as middleware } from "@izara_project/izara-middleware";
 import callingFlowSharedLib from '@izara_project/zara-core-library-calling-flow';
 
-import <%- functionName %>Main from './<%- firstLetterUpperCase(functionName)%>_Main.js'
+import <%- functionName %>Main from './<%- functionName %>_Main.js'
 
 //(<globalVariable>
 //</globalVariable>)
@@ -40,21 +38,14 @@ export const main = middlewareHandler.wrap(async (event, context) => {
     //(</beforeInvoke>)
 
     // invoke LambdaFunction
-    return await <% - functionName %> Main(
+    return await <%- functionName %> Main(
       event._izContext, // correlationId/logger/integrationTestDetail/uniqueRequestId
       event,
       callingFlowSharedLib.addCallingFlowToPassOnProperties(event)
     );
 
   } catch (err) {
-    event._izContext.logger.error('Error, <%- firstLetterUpperCase(flowTag) %>: ', err);
+    event._izContext.logger.error('Error, <%- flowTag %>: ', err);
     throw (err);
   }
-});
-
-<% _ function firstLetterUpperCase(text) {
-  return text.charAt(0).toUpperCase() + text.slice(1)
-} _ %>
-<% _ function firstLetterLowerCase(str) {
-  return str.charAt(0).toLowerCase() + str.slice(1)
-} _ %>
+});

package/src/generateCode/generateFlowSchema/event/eventBridgeComponent/index.js

@@ -2,22 +2,13 @@ import createFlowSchemaEventBridgeFunctionYaml from './functionYaml/data.js';
 import createFlowSchemaEventBridgeHandler from './handler/inv/data.js';
 import createFlowSchemaEventBridgeMainFunction from './mainFunction/data.js';
 
-function createEventBridgeComponent(_izContext, flowSchema, rootServicePath) {
+function createEventBridgeComponent(_izContext, flowSchema, appPath) {
   const component = [
-    createFlowSchemaEventBridgeHandler(_izContext, flowSchema, saveFilePath),
-    createFlowSchemaEventBridgeMainFunction(
-      _izContext,
-      flowSchema,
-      saveFilePath
-    ),
-    createFlowSchemaEventBridgeFunctionYaml(
-      _izContext,
-      flowSchema,
-      saveFilePath
-    )
+    createFlowSchemaEventBridgeHandler(_izContext, flowSchema, appPath),
+    createFlowSchemaEventBridgeMainFunction(_izContext, flowSchema, appPath),
+    createFlowSchemaEventBridgeFunctionYaml(_izContext, flowSchema, appPath)
   ];
 
-  console.info('generateEventBridgeComponent ✅');
   return component;
 }
 

package/src/generateCode/generateFlowSchema/event/eventBridgeComponent/mainFunction/data.js

@@ -35,7 +35,7 @@ const templatePath = path.join(__dirname, 'template.ejs');
  * @param {Object} flowSchema
  * @return {{ templatePath, templateData, setting } }
  */
-function data(_izContext, flowSchema, srcPath) {
+function data(_izContext, flowSchema, appPath) {
   // const handler = HANDLER.hdrInv;
   const flowTag = flowSchema.flowTag;
   // const functionName = "EventBridge" + upperCase(handler);
@@ -52,7 +52,7 @@ function data(_izContext, flowSchema, srcPath) {
     },
     setting: {
       savePath: path.join(
-        srcPath,
+        appPath,
         SOURCE_PATH.flowSchemaEventBridge,
         flowSchema.flowTag,
         'source/'

package/src/generateCode/generateFlowSchema/event/extTopicComponent/index.js

@@ -3,16 +3,12 @@ import createExternalSqsHandler from './process/handler/data.js';
 import createExternalTopicSnsInSqs from './sns-in-sqs/data.js';
 import createExternalTopicSnsOut from './sns-out/data.js';
 
-async function createExternalTopicComponent(
-  _izContext,
-  flowSchema,
-  saveFilePath
-) {
+async function createExternalTopicComponent(_izContext, flowSchema, appPath) {
   const component = [
-    createExternalSqsFunctionYaml(_izContext, flowSchema, saveFilePath),
-    createExternalSqsHandler(_izContext, flowSchema, saveFilePath),
-    ...createExternalTopicSnsInSqs(_izContext, flowSchema, saveFilePath),
-    ...createExternalTopicSnsOut(_izContext, flowSchema, saveFilePath)
+    await createExternalSqsFunctionYaml(_izContext, flowSchema, appPath),
+    createExternalSqsHandler(_izContext, flowSchema, appPath),
+    ...createExternalTopicSnsInSqs(_izContext, flowSchema, appPath),
+    ...createExternalTopicSnsOut(_izContext, flowSchema, appPath)
   ];
 
   return component;

package/src/generateCode/generateFlowSchema/event/extTopicComponent/process/functionYaml/data.js

@@ -38,7 +38,7 @@ const {
   LAMBDA_RESOURCE
 } = consts;
 
-const { firstLetterUpperCase: upperCase } = utils;
+const { firstLetterUpperCase: upperCase, savePath } = utils;
 
 const {
   shortNameHandler,
@@ -53,10 +53,10 @@ const templatePath = path.join(__dirname, 'template.ejs');
  * Creates source parameters for function YAML generation
  * @param {Object} _izContext - The Izara context object
  * @param {Object} flowSchema - The flow schema configuration
- * @param {string} srcPath - The source path for the project
+ * @param {string} appPath - The source path for the project
  * @returns {Promise<Array>} Array containing template configuration object
  */
-async function createSourceParams(_izContext, flowSchema, srcPath) {
+async function createSourceParams(_izContext, flowSchema, appPath) {
   let functionName = 'Process' + upperCase(flowSchema.flowTag);
   let handlerType = upperCase(HANDLER.hdrSqs);
   let additionalResourcePermission = defaultIamRolePerAction();
@@ -92,7 +92,7 @@ async function createSourceParams(_izContext, flowSchema, srcPath) {
       .getLocalObjectSchemas(
         _izContext,
         [flowSchema.objType.objectType],
-        path.join(srcPath, './schemas')
+        path.join(appPath, 'src/schemas')
       )
       .then(res => res.records[0]);
     if (!objectSchema) {
@@ -132,11 +132,7 @@ async function createSourceParams(_izContext, flowSchema, srcPath) {
   return {
     templatePath: templatePath,
     templateData: {
-      resourceLocation: path.join(
-        SOURCE_PATH.resourceLocationFlowSchema,
-        upperCase(flowSchema.flowTag),
-        'source/'
-      ),
+      resourceLocation: savePath.flowSchemaFlowTag(flowSchema.flowTag),
       functionName,
       handlerType,
       additionalResourcePermission,
@@ -147,7 +143,7 @@ async function createSourceParams(_izContext, flowSchema, srcPath) {
       queueName
     },
     setting: {
-      savePath: path.join(srcPath, SOURCE_PATH.appYaml),
+      savePath: path.join(appPath, SOURCE_PATH.appYaml),
       saveFileName: SAVE_FILE_NAME.flowSchemaYaml,
       fileExtension: '.yml',
       isAppend: true

package/src/generateCode/generateFlowSchema/event/extTopicComponent/process/functionYaml/template.ejs

@@ -1,7 +1,6 @@
-<%_ const join = require('path').join; _%>
-<%- firstLetterUpperCase(functionNameConfig) %>:
-  handler: <%- join(resourceLocation, `${firstLetterUpperCase(functionName)}_${firstLetterUpperCase(handlerType)}.main`)%>
-  name: ${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>
+<%- functionNameConfig %>:
+  handler: <%- `${resourceLocation}${functionName}_${handlerType}.main`%>
+  name: ${self:custom.iz_resourcePrefix}<%- functionName %><%- handlerType %>
   role: <%- roleName %>Role
   #<#<%- functionName %><%- handlerType %>FunctionSetting#>
   #<#/<%- functionName %><%- handlerType %>FunctionSetting#>
@@ -11,10 +10,4 @@
         batchSize: 10
         filterPatterns: #**** need to update serverless framework upper v.2.69.1
           - body: {"MessageAttributes":{"callingFlow":{"Value":["${self:custom.iz_resourcePrefix}<%- functionName %>"]}}} # functionName of callingFlow
-          - body: {"MessageAttributes":{"callingFlow":{"Value":[{"exists":false}]}}}
-<%_ function firstLetterUpperCase(text){
-  return text.charAt(0).toUpperCase() + text.slice(1)
-} _%>
-<%_ function firstLetterLowerCase(str) {
-  return str.charAt(0).toLowerCase() + str.slice(1)
-} _%>
+          - body: {"MessageAttributes":{"callingFlow":{"Value":[{"exists":false}]}}}

package/src/generateCode/generateFlowSchema/event/extTopicComponent/process/handler/data.js

@@ -35,7 +35,7 @@ const templatePath = path.join(__dirname, 'template.ejs');
  * @return {{templatePath, templateData,setting}}
  */
 
-function createSourceParams(_izContext, flowSchema, srcPath) {
+function createSourceParams(_izContext, flowSchema, appPath) {
   let functionName = 'Process' + upperCase(flowSchema.flowTag);
   let handlerType = upperCase(HANDLER.hdrSqs);
   let queueName = 'Process' + upperCase(flowSchema.flowTag) + handlerType;
@@ -49,7 +49,7 @@ function createSourceParams(_izContext, flowSchema, srcPath) {
     },
     setting: {
       savePath: path.join(
-        srcPath,
+        appPath,
         SOURCE_PATH.flowSchema,
         upperCase(flowSchema.flowTag),
         'MainHandler/',

package/src/generateCode/generateFlowSchema/event/extTopicComponent/sns-in-sqs/data.js

@@ -37,12 +37,12 @@ const templatePath = path.join(__dirname, 'template.ejs');
  * @returns {Object[]}              - data of multiple dynamoDb template
  */
 
-function createDataForDefaultSnsInSqs(_izContext, flowSchema, srcPath) {
+function createDataForDefaultSnsInSqs(_izContext, flowSchema, appPath) {
   let resultsForCreateDefaultSnsInSqs = [];
   let flowSteps = Object.keys(flowSchema.flowSteps);
   const setting = {
     initialData: 'Resources:\n',
-    savePath: path.join(srcPath, SOURCE_PATH.resourceYaml),
+    savePath: path.join(appPath, SOURCE_PATH.resourceYaml),
     saveFileName: SAVE_FILE_NAME.snsInSqsYaml,
     fileExtension: '.yml',
     isAppend: true

package/src/generateCode/generateFlowSchema/event/extTopicComponent/sns-out/data.js

@@ -41,15 +41,16 @@ const templatePath = path.join(
  * @returns {Object[]}              - data of multiple dynamoDb template
  */
 
-function createDataForDefaultSnsInSqs(_izContext, flowSchema, srcPath) {
+function createDataForDefaultSnsInSqs(_izContext, flowSchema, appPath) {
   let resultsForCreateDefaultSnsInSqs = [];
   let flowSteps = Object.keys(flowSchema.flowSteps);
   const setting = {
     initialData: 'Resources:\n',
-    savePath: path.join(srcPath, SOURCE_PATH.resourceYaml),
+    savePath: path.join(appPath, SOURCE_PATH.resourceYaml),
     saveFileName: SAVE_FILE_NAME.snsOutYaml,
     fileExtension: '.yml',
-    isAppend: true
+    isAppend: true,
+    fromFile: 'external/sns-out/data.js'
   };
 
   let topicOut = `${upperCase(flowSchema.flowTag)}`;

package/src/generateCode/generateFlowSchema/event/lambdaSyncApiComponent/functionYaml/data.js

@@ -41,12 +41,12 @@ const templatePath = path.join(__dirname, 'template.ejs');
  * @param {Object} objectSchema
  * @return {{templatePath, templateData,setting}}
  */
-function createSourceParamsApi(_izContext, flowSchema, srcPath) {
+function createSourceParamsApi(_izContext, flowSchema, appPath) {
   let functionName = 'Process' + upperCase(flowSchema.flowTag);
   let handlerType = upperCase(HANDLER.hdrApi);
   let additionalResourcePermission = defaultIamRolePerAction();
 
-  const configPath = path.join(srcPath, '../../config/serverless.config.yml');
+  const configPath = path.join(appPath, '../config/serverless.config.yml');
   const serverlessConfig = fs.readFileSync(configPath, 'utf8');
   const config = yaml.parse(serverlessConfig);
   const serviceTag = config.main_config.iz_serviceTag;
@@ -54,11 +54,7 @@ function createSourceParamsApi(_izContext, flowSchema, srcPath) {
   return {
     templatePath: templatePath,
     templateData: {
-      resourceLocation: path.join(
-        SOURCE_PATH.resourceLocationFlowSchema,
-        upperCase(flowSchema.flowTag),
-        'source/'
-      ),
+      resourceYamlFlowSchemaFlowTag,
       functionName,
       handlerType,
       additionalResourcePermission,
@@ -69,7 +65,7 @@ function createSourceParamsApi(_izContext, flowSchema, srcPath) {
       serviceTag: serviceTag
     },
     setting: {
-      savePath: path.join(srcPath, SOURCE_PATH.appYaml),
+      savePath: path.join(appPath, SOURCE_PATH.appYaml),
       saveFileName: SAVE_FILE_NAME.flowSchemaYaml,
       fileExtension: '.yml',
       isAppend: true

package/src/generateCode/generateFlowSchema/event/lambdaSyncApiComponent/functionYaml/template.ejs

@@ -1,28 +1,19 @@
-<%_ const join = require('path').join _%>
-<%- firstLetterUpperCase(functionNameConfig) %>:
-  handler: <%- join(resourceLocation, `${firstLetterUpperCase(functionName)}_${firstLetterUpperCase(handlerType)}.main`) %>
-  name: ${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>
-  role: <%- firstLetterUpperCase(roleName) _%>Role
-  #<#<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>FunctionSetting#>
-  #<#/<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>FunctionSetting#>
+<%- functionNameConfig %>:
+  handler: <%- `${resourceLocation}${functionName}_${handlerType}.main` %>
+  name: ${self:custom.iz_resourcePrefix}<%- functionName %><%- handlerType %>
+  role: <%- roleName %>Role
+  #<#<%- functionName %><%- handlerType %>FunctionSetting#>
+  #<#/<%- functionName %><%- handlerType %>FunctionSetting#>
   events:
     - httpApi:
-        path: /<%- serviceTag %>/<%- firstLetterLowerCase(functionName) %>/<%- functionName %>
+        path: /<%- serviceTag %>/<%- functionName %>/<%- functionName %>
         method: <%- event %>
         authorizer: authorizerServiceSchema
-        #<#<%- firstLetterUpperCase(functionName) _%><%- firstLetterUpperCase(handlerType) %>AppLevelAuthorizer#>
-        #<#/<%- firstLetterUpperCase(functionName) _%><%- firstLetterUpperCase(handlerType) %>AppLevelAuthorizer#>
+        #<#<%- functionName %><%- handlerType %>AppLevelAuthorizer#>
+        #<#/<%- functionName %><%- handlerType %>AppLevelAuthorizer#>
     - httpApi:
-        path: /<%- serviceTag %>/<%- firstLetterLowerCase(functionName) %>/<%- functionName %>/{targetUserId}
+        path: /<%- serviceTag %>/<%- functionName %>/<%- functionName %>/{targetUserId}
         method: <%- event %>
         authorizer: authorizerServiceSchema
-        #<#<%- firstLetterUpperCase(functionName) _%><%- firstLetterUpperCase(handlerType) %>UserLevelAuthorizer#>
-        #<#/<%- firstLetterUpperCase(functionName) _%><%- firstLetterUpperCase(handlerType) %>UserLevelAuthorizer#>
-
-
-<%_ function firstLetterUpperCase(text){
-  return text.charAt(0).toUpperCase() + text.slice(1)
-} _%>
-<%_ function firstLetterLowerCase(str) {
-  return str.charAt(0).toLowerCase() + str.slice(1)
-} _%>
+        #<#<%- functionName %><%- handlerType %>UserLevelAuthorizer#>
+        #<#/<%- functionName %><%- handlerType %>UserLevelAuthorizer#>

package/src/generateCode/generateFlowSchema/event/lambdaSyncApiComponent/handler/data.js

@@ -35,7 +35,7 @@ const templatePath = path.join(__dirname, 'template.ejs');
  * @param {Object} objectSchema
  * @return {{templatePath, templateData,setting}}
  */
-function createSourceParamsApi(_izContext, flowSchema, srcPath) {
+function createSourceParamsApi(_izContext, flowSchema, appPath) {
   const functionName = 'Process' + upperCase(flowSchema.flowTag);
   const handlerType = upperCase(HANDLER.hdrApi);
 
@@ -49,7 +49,7 @@ function createSourceParamsApi(_izContext, flowSchema, srcPath) {
     },
     setting: {
       savePath: path.join(
-        srcPath,
+        appPath,
         SOURCE_PATH.flowSchema,
         upperCase(flowSchema.flowTag),
         'MainHandler/',

package/src/generateCode/generateFlowSchema/event/lambdaSyncApiComponent/index.js

@@ -1,14 +1,10 @@
 import createFlowSchemaLambdaSyncFunctionYamlApi from './functionYaml/data.js';
 import createFlowSchemaLambdaSyncHandlerApi from './handler/data.js';
 
-function createLambdaSyncApiComponent(_izContext, flowSchema, saveFilePath) {
+function createLambdaSyncApiComponent(_izContext, flowSchema, appPath) {
   const component = [
-    createFlowSchemaLambdaSyncFunctionYamlApi(
-      _izContext,
-      flowSchema,
-      saveFilePath
-    ),
-    createFlowSchemaLambdaSyncHandlerApi(_izContext, flowSchema, saveFilePath)
+    createFlowSchemaLambdaSyncFunctionYamlApi(_izContext, flowSchema, appPath),
+    createFlowSchemaLambdaSyncHandlerApi(_izContext, flowSchema, appPath)
   ];
 
   return component;

package/src/generateCode/generateFlowSchema/event/lambdaSyncInvComponent/functionYaml/data.js

@@ -28,7 +28,7 @@ const { HANDLER, SOURCE_PATH, SAVE_FILE_NAME } = consts;
 
 const { shortNameHandler, defaultIamRolePerAction } = libs;
 
-const { firstLetterUpperCase: upperCase } = utils;
+const { firstLetterUpperCase: upperCase, savePath } = utils;
 
 const templatePath = path.join(__dirname, 'template.ejs');
 /**
@@ -38,7 +38,7 @@ const templatePath = path.join(__dirname, 'template.ejs');
  * @param {Object} objectSchema
  * @return {{templatePath, templateData,setting}}
  */
-function createSourceParamsInvoke(_izContext, flowSchema, srcPath) {
+function createSourceParamsInvoke(_izContext, flowSchema, appPath) {
   const functionName = 'Process' + upperCase(flowSchema.flowTag);
   const handlerType = upperCase(HANDLER.hdrInv);
   const additionalResourcePermission = defaultIamRolePerAction();
@@ -46,12 +46,14 @@ function createSourceParamsInvoke(_izContext, flowSchema, srcPath) {
   return {
     templatePath: templatePath,
     templateData: {
-      resourceLocation: path.join(
-        SOURCE_PATH.resourceLocationFlowSchema,
-        upperCase(flowSchema.flowTag),
-        'source/'
-      ),
-      functionName,
+      resourceLocation:
+        // path.join(
+        //   SOURCE_PATH.resourceLocationFlowSchema,
+        //   upperCase(flowSchema.flowTag),
+        //   'MainHandler/',
+        //   'source/'
+        // ),
+        savePath.flowSchemaFlowTag(flowSchema.flowTag),
       handlerType,
       additionalResourcePermission,
       functionNameConfig:
@@ -59,7 +61,7 @@ function createSourceParamsInvoke(_izContext, flowSchema, srcPath) {
       roleName: upperCase(flowSchema.flowTag)
     },
     setting: {
-      savePath: path.join(srcPath, SOURCE_PATH.appYaml),
+      savePath: path.join(appPath, SOURCE_PATH.appYaml),
       saveFileName: SAVE_FILE_NAME.flowSchemaYaml,
       fileExtension: '.yml',
       isAppend: true

package/src/generateCode/generateFlowSchema/event/lambdaSyncInvComponent/functionYaml/template.ejs

@@ -1,13 +1,6 @@
-<%_ const join = require('path').join; _%>
-<%- firstLetterUpperCase(functionNameConfig) %>:
-  handler: <%- join(resourceLocation, `${firstLetterUpperCase(functionName)}_${firstLetterUpperCase(handlerType)}.main`)%>
-  name: ${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>
+<%- functionNameConfig %>:
+  handler: <%- `${resourceLocation}${functionName}_${handlerType}.main` %>
+  name: ${self:custom.iz_resourcePrefix}<%- functionName %><%- handlerType %>
   role: <%- roleName %>Role
   #<#<%- functionName %><%- handlerType %>FunctionSetting#>
   #<#/<%- functionName %><%- handlerType %>FunctionSetting#>
-<%_ function firstLetterUpperCase(text){
-  return text.charAt(0).toUpperCase() + text.slice(1)
-} _%>
-<%_ function firstLetterLowerCase(str) {
-  return str.charAt(0).toLowerCase() + str.slice(1)
-} _%>

package/src/generateCode/generateFlowSchema/event/lambdaSyncInvComponent/handler/data.js

@@ -35,7 +35,7 @@ const templatePath = path.join(__dirname, 'template.ejs');
  * @return {{templatePath, templateData,setting}}
  */
 
-function createSourceParamsInvoke(_izContext, flowSchema, srcPath) {
+function createSourceParamsInvoke(_izContext, flowSchema, appPath) {
   const functionName = 'Process' + upperCase(flowSchema.flowTag);
   const handlerType = upperCase(HANDLER.hdrInv);
 
@@ -47,7 +47,7 @@ function createSourceParamsInvoke(_izContext, flowSchema, srcPath) {
     },
     setting: {
       savePath: path.join(
-        srcPath,
+        appPath,
         SOURCE_PATH.flowSchema,
         upperCase(flowSchema.flowTag),
         'MainHandler/',

package/src/generateCode/generateFlowSchema/event/lambdaSyncInvComponent/index.js

@@ -1,14 +1,10 @@
 import createFlowSchemaLambdaSyncFunctionYamlInv from './functionYaml/data.js';
 import createFlowSchemaLambdaSyncHandlerInv from './handler/data.js';
 
-function CreateLambdaSyncInvokeComponent(_izContext, flowSchema, saveFilePath) {
+function CreateLambdaSyncInvokeComponent(_izContext, flowSchema, appPath) {
   const component = [
-    createFlowSchemaLambdaSyncFunctionYamlInv(
-      _izContext,
-      flowSchema,
-      saveFilePath
-    ),
-    createFlowSchemaLambdaSyncHandlerInv(_izContext, flowSchema, saveFilePath)
+    createFlowSchemaLambdaSyncFunctionYamlInv(_izContext, flowSchema, appPath),
+    createFlowSchemaLambdaSyncHandlerInv(_izContext, flowSchema, appPath)
   ];
 
   return component.flat();

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

@@ -55,7 +55,7 @@ const templatePath = path.join(__dirname, 'template.ejs');
  * @return {{templatePath, templateData,setting}}
  */
 
-async function createSourceParams(_izContext, flowSchema, srcPath) {
+async function createSourceParams(_izContext, flowSchema, appPath) {
   let createSources = [];
   let functionName = 'Process' + upperCase(flowSchema.flowTag);
   let handlerType = upperCase(HANDLER.hdrSqs);
@@ -64,7 +64,7 @@ async function createSourceParams(_izContext, flowSchema, srcPath) {
   let objectSchema;
 
   let setting = {
-    savePath: path.join(srcPath, SOURCE_PATH.appYaml),
+    savePath: path.join(appPath, SOURCE_PATH.appYaml),
     saveFileName: SAVE_FILE_NAME.flowSchemaYaml,
     fileExtension: '.yml',
     isAppend: true
@@ -78,6 +78,7 @@ async function createSourceParams(_izContext, flowSchema, srcPath) {
     handlerFilePath: path.join(
       SOURCE_PATH.resourceLocationFlowSchema,
       upperCase(flowSchema.flowTag),
+      'MainHandler/',
       'source/'
     ),
     functionName,
@@ -95,7 +96,7 @@ async function createSourceParams(_izContext, flowSchema, srcPath) {
       .getLocalObjectSchemas(
         _izContext,
         [flowSchema.objType.objectType],
-        path.join(srcPath, './schemas')
+        path.join(appPath, 'src/schemas')
       )
       .then(res => res.records[0]);
     if (!objectSchema) {

package/src/generateCode/generateFlowSchema/event/ownTopicComponent/endpointComponent/handler/data.js

@@ -36,7 +36,7 @@ const dsqTemplatePath = path.join(__dirname, 'DsqHandlerTemplate.ejs');
  * @param {Object} objectSchema
  * @return {{templatePath, templateData,setting}}
  */
-function createParamsForCreateSource(_izContext, flowSchema, srcPath) {
+function createParamsForCreateSource(_izContext, flowSchema, appPath) {
   const createSources = [];
   const functionName = 'Process' + upperCase(flowSchema.flowTag);
   const handlerTypeSqs = upperCase(HANDLER.hdrSqs);
@@ -52,7 +52,7 @@ function createParamsForCreateSource(_izContext, flowSchema, srcPath) {
     },
     setting: {
       savePath: path.join(
-        srcPath,
+        appPath,
         SOURCE_PATH.flowSchema,
         upperCase(flowSchema.flowTag),
         'MainHandler/',
@@ -74,7 +74,7 @@ function createParamsForCreateSource(_izContext, flowSchema, srcPath) {
       },
       setting: {
         savePath: path.join(
-          srcPath,
+          appPath,
           SOURCE_PATH.flowSchema,
           upperCase(flowSchema.flowTag),
           'MainHandler/',