@izara_project/izara-market-library-service-schemas 1.0.24 → 1.0.26

package/index.js

@@ -21,5 +21,7 @@ module.exports = {
   templateMgr: require('./src/TemplateManager'),
   sourceMgr: require('./src/SourceManager'),
   generateCodeLibs: require('./src/GenerateCodeLibs'),
-  generateCode: require('./src/reStructure/GenerateCode'),
+
+  generateSchemaWithTemplate: require('./src/TemplateManager/src/GenerateSchema').generateSchemaWithTemplate,
+  generateCodeWithTemplate: require('./src/reStructure/GenerateCode').generateCodeWithTemplate
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-market-library-service-schemas",
-  "version": "1.0.24",
+  "version": "1.0.26",
   "description": "Schemas for Izara Market project",
   "main": "index.js",
   "scripts": {

package/src/TemplateManager/src/externalService/FunctionNameConfig/data.js

@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const path = require('path');
 const fs = require('fs');
 
-const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } = require("#mainLibs/Utils");
+const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } = require("../../../../MainLibs/src/Utils");
 const { SOURCE_PATH, SOURCE_GENERATE_IAM_ROLE } = require('../../libs/Consts');
 const templateYamlPath = path.join(__dirname, "./templateYaml.ejs");
 const templatePathIntTestPath = path.join(__dirname, "./templateIntTesting.ejs");

package/src/reStructure/GenerateCode.js

@@ -56,23 +56,14 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
     // collect all result of template data for execute createSource
     let allCreateSource = []
 
-    // Store original console.log function
-    const originalConsoleLog = console.log;
-
     // * iterate templateConfig for generate data
     for (const templateName in templateConfig.TemplateAndData) {
       // Display log indicating which template is being loaded
       console.log('Loading template:', templateName);
 
-      // Temporarily disable console.log before calling generateTemplateData
-      console.log = () => { };
-
       let generateTemplateData = require(join(__dirname, templateConfig.TemplateAndData[templateName]));
       let createSourceResult = await generateTemplateData(_izContext, objSchemaPath);
 
-      // Restore the original console.log function
-      console.log = originalConsoleLog;
-
       // Filter out empty or invalid objects before adding to allCreateSource
       if (Array.isArray(createSourceResult)) {
         const validResults = createSourceResult.filter(item =>
@@ -82,11 +73,11 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
       }
     }
 
-    // Generate function name configuration
+    // ** Generate function name configuration
     const functionNameConfigs = functionNameConfigYamlData(_izContext, allCreateSource, saveFilePath);
     allCreateSource.push(...functionNameConfigs);
 
-    // ? create Generate-Shared-resource
+    // ** create Generate-Shared-resource
     const generateSharedResource = createSharedResource(_izContext, allCreateSource, saveFilePath);
     allCreateSource.push(generateSharedResource);
     // console.log('---> allCreateSource', allCreateSource);
@@ -138,7 +129,7 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
       );
     }
 
-    console.log('Generated all source files');
+    console.log('Generated all source files successfully');
     return 'return values';
   } catch (error) {
     console.error('Error generating code:', error);

package/src/reStructure/TemplateData/externalService/functionNameConfig/data.js

@@ -53,6 +53,7 @@ function data(_izContext, createSourceParams, srcPath) {
   Object.entries(SOURCE_GENERATE_IAM_ROLE)
     .filter(([_, enabled]) => enabled)
     .forEach(([_, value]) => {
+      if (value === SOURCE_GENERATE_IAM_ROLE.NodeCompleteRole) return;
       roleNameConfigs.add(`${upperCase(value)}Role`);
       roleNameConcatConfigs.add(`${upperCase(value)}`);
     });
@@ -69,7 +70,6 @@ function data(_izContext, createSourceParams, srcPath) {
     }
   });
 
-
   // Generate YAML and JS configurations
   const roleConfigYaml = createRoleNameConfigFileYaml(roleNameConfigs, srcPath);
   const roleConfigJs = createRoleNameConfigFileJs(roleNameConcatConfigs, srcPath);

package/src/reStructure/TemplateData/perActionEndpoint/generateTemplateData.js

@@ -63,29 +63,24 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
     for (const objectSchema of allObjSchemas.records) {
       try {
         // Generate handlers
-        const handlerParams = Object.entries(modules.handlers).map(([type, handlerFn]) =>
-          handlerFn(_izContext, objectSchema, saveFilePath)
-        );
+        const handlerParams = Object.entries(modules.handlers)
+          .flatMap(([type, handlerFn]) => handlerFn(_izContext, objectSchema, saveFilePath));
 
         // Generate main functions
-        const functionParams = await Promise.all(
+        const functionParams = (await Promise.all(
           Object.entries(modules.mainFunctions).map(([action, functionFn]) =>
             functionFn(_izContext, objectSchema, saveFilePath)
           )
-        );
+        )).flat();
 
         // Generate function YAML files
-        const yamlParams = Object.entries(modules.yamlGenerators).map(([type, yamlFn]) =>
-          yamlFn(_izContext, objectSchema, saveFilePath)
-        );
+        const yamlParams = Object.entries(modules.yamlGenerators)
+          .flatMap(([type, yamlFn]) => yamlFn(_izContext, objectSchema, saveFilePath));
 
         // Generate code libs
         const libsParam = createGenerateCodeLibs(_izContext, saveFilePath);
 
-        // Only add params if uploadS3 is true
-        if (objectSchema.flowSchema?.uploadS3 === true) {
-          createSourceParams.push(...handlerParams, ...functionParams, ...yamlParams, libsParam);
-        }
+        createSourceParams.push(...handlerParams, ...functionParams, ...yamlParams, libsParam);
       } catch (error) {
         _izContext.logger.error(`Error processing schema ${objectSchema.name || 'unknown'}: ${error}`);
       }

package/src/reStructure/TemplateData/perActionEndpoint/handler/inv/data.js

@@ -23,8 +23,8 @@ const { ACTIONS, HANDLER } = require('@izara_project/izara-core-library-service-
 
 // const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase, checkOverWriteGenerateMainFunction } = require("../#utils");
 // const { DEFAULT_HANDLER_PER_ACTION, SOURCE_PATH, FUNCTION_NAME } = require("../../../#const");
-const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } = require("../../../../../MainLibs/index.js").utils;
-const { DEFAULT_HANDLER_PER_ACTION } = require("../../../../../MainLibs/index.js").consts;
+const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase, checkOverWriteGenerateMainFunction } = require("../../../../../MainLibs/index.js").utils;
+const { DEFAULT_HANDLER_PER_ACTION, SOURCE_PATH, FUNCTION_NAME } = require("../../../../../MainLibs/index.js").consts;
 
 const templatePath = path.join(__dirname, "./template.ejs")
 /**

package/src/reStructure/TemplateData/perActionEndpoint/yaml/dsq/data.js

@@ -33,6 +33,7 @@ const {
   resourceNames,
   RESOURCE_CLASSES,
   DEFAULT_LAMBDA_ROLE_PER_ACTION,
+  SQS_RESOURCE,
   SOURCE_PATH,
   SAVE_FILE_NAME,
   DYNAMO_RESOURCE,

package/src/reStructure/TemplateData/perActionEndpoint/yaml/sqs/data.js

@@ -22,22 +22,23 @@ const path = require('path');
 const { ACTIONS, HANDLER, STORAGE_TYPES } = require('@izara_project/izara-core-library-service-schemas/src/Consts')
 
 // const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } = require("../#utils");
-// const { DEFAULT_HANDLER_PER_ACTION, createIamRole, resourceNames, RESOURCE_CLASSES, DEFAULT_LAMBDA_ROLE_PER_ACTION, SQS_RESOURCE, SOURCE_PATH, SAVE_FILE_NAME, SNS_RESOURCE, FUNCTION_NAME, DYNAMO_RESOURCE, defaultIamRolePerAction, awaitingMultipleStepsRole, shortNameHandler } = require("../#const");
 const {
   firstLetterLowerCase: lowerCase,
   firstLetterUpperCase: upperCase,
 } = require("../../../../../MainLibs/index.js").utils;
+// const { DEFAULT_HANDLER_PER_ACTION, createIamRole, resourceNames, RESOURCE_CLASSES, DEFAULT_LAMBDA_ROLE_PER_ACTION, SQS_RESOURCE, SOURCE_PATH, SAVE_FILE_NAME, SNS_RESOURCE, FUNCTION_NAME, DYNAMO_RESOURCE, defaultIamRolePerAction, awaitingMultipleStepsRole, shortNameHandler } = require("../#const");
 const {
   DEFAULT_HANDLER_PER_ACTION,
   createIamRole,
   resourceNames,
   RESOURCE_CLASSES,
   DEFAULT_LAMBDA_ROLE_PER_ACTION,
+  SQS_RESOURCE,
   SOURCE_PATH,
   SAVE_FILE_NAME,
-  DYNAMO_RESOURCE,
   SNS_RESOURCE,
   FUNCTION_NAME,
+  DYNAMO_RESOURCE,
   defaultIamRolePerAction,
   awaitingMultipleStepsRole,
   shortNameHandler

package/src/reStructure/TemplateData/perActionEndpoint/yaml/wbs/data.js

@@ -20,8 +20,23 @@ const path = require('path');
 
 const { ACTIONS, HANDLER, STORAGE_TYPES } = require('@izara_project/izara-core-library-service-schemas/src/Consts')
 
-const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } = require("../#utils");
-const { DEFAULT_HANDLER_PER_ACTION, createIamRole, resourceNames, RESOURCE_CLASSES, DEFAULT_LAMBDA_ROLE_PER_ACTION, SQS_RESOURCE, SOURCE_PATH, SAVE_FILE_NAME, SNS_RESOURCE, FUNCTION_NAME, DYNAMO_RESOURCE, defaultIamRolePerAction, awaitingMultipleStepsRole, shortNameHandler } = require("../#const");
+const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } = require("../../../../../MainLibs/src/Utils");
+const {
+  DEFAULT_HANDLER_PER_ACTION,
+  createIamRole,
+  resourceNames,
+  RESOURCE_CLASSES,
+  DEFAULT_LAMBDA_ROLE_PER_ACTION,
+  SQS_RESOURCE,
+  SOURCE_PATH,
+  SAVE_FILE_NAME,
+  SNS_RESOURCE,
+  FUNCTION_NAME,
+  DYNAMO_RESOURCE,
+  defaultIamRolePerAction,
+  awaitingMultipleStepsRole,
+  shortNameHandler
+} = require("../../../../../MainLibs/src/Consts");
 
 const templatePath = path.join(__dirname, "./template.ejs")