@izara_project/izara-market-library-service-schemas 1.0.82 → 1.0.84

package/src/reStructure/GenerateResources.js

@@ -15,24 +15,20 @@ 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/>.
 */
 
-'use strict';
-
-import { join, dirname } from "path";
+import { join, dirname } from 'path';
 import { fileURLToPath, pathToFileURL } from 'url';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
-import { readFileSync } from "fs";
-
+import { readFileSync } from 'fs';
 
 // SourceManager
-const { deleteFileInDir } = utils
-import { utils, createSource } from "../SourceManager/index.js";
+const { deleteFileInDir } = utils;
+import { utils, createSource } from '../SourceManager/index.js';
 
 import generateResource from './TemplateData/IntTest/generateResources/generateResources.js';
 
 async function generateCodeWithTemplate(_izContext, savePath, settings) {
   try {
-
     // let packagePath = path.join(__dirname, "../../")
     // let saveFilePath = join(packagePath, `../`);
     // let localServicePath = join(saveFilePath, "../../");
@@ -45,15 +41,14 @@ async function generateCodeWithTemplate(_izContext, savePath, settings) {
     //------ Start Create Source ------
 
     // collect all result of template data for execute createSource
-    let allCreateSource = []
-
+    let allCreateSource = [];
 
     let createSourceResult = await generateResource(_izContext, savePath);
     // console.log({ createSourceResult })
     // Filter out empty or invalid objects before adding to allCreateSource
     if (Array.isArray(createSourceResult)) {
-      const validResults = createSourceResult.filter(item =>
-        item && item.templatePath && item.templateData && item.setting
+      const validResults = createSourceResult.filter(
+        item => item && item.templatePath && item.templateData && item.setting
       );
       allCreateSource.push(...validResults);
     }
@@ -66,19 +61,18 @@ async function generateCodeWithTemplate(_izContext, savePath, settings) {
         throw Error('Skipping invalid source item:', item);
       }
 
-
       const { templatePath, templateData, setting } = item;
       setting.checkCreateSourcePass = true;
 
       let [status, errors] = await createSource.createSource(
         readFileSync(templatePath, 'utf8'),
         templateData,
-        setting,
+        setting
       );
 
       if (status === false) {
-        console.log('templatePath in generateCode', templatePath)
-        throw Error(errors)
+        console.log('templatePath in generateCode', templatePath);
+        throw Error(errors);
       }
 
       // validatePathWithRootServicePath(localServicePath, setting.savePath)
@@ -99,7 +93,7 @@ async function generateCodeWithTemplate(_izContext, savePath, settings) {
       await createSource.createSource(
         readFileSync(templatePath, 'utf8'),
         templateData,
-        setting,
+        setting
       );
     }
 

package/src/reStructure/GenerateSchema.js

@@ -15,22 +15,22 @@ 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/>.
 */
 
-'use strict';
+import { join } from 'path';
+import { readFileSync } from 'fs';
 
-import { join } from "path";
-import { readFileSync } from "fs";
+import { validatePathWithRootServicePath } from './libs/GenerateCodeLibs.js';
 
-import { validatePathWithRootServicePath } from "./libs/GenerateCodeLibs.js";
-
-import { schemaConfig } from "./SchemaConfig.js";
+import { schemaConfig } from './SchemaConfig.js';
 
 // SourceManager
-import { utils, createSource } from "../SourceManager/index.js";
-const { deleteFileInDir } = utils
-
-
-
-async function generateSchema(_izContext, objSchemaPath, generateSchemaSettings) {
+import { utils, createSource } from '../SourceManager/index.js';
+const { deleteFileInDir } = utils;
+
+async function generateSchema(
+  _izContext,
+  objSchemaPath,
+  generateSchemaSettings
+) {
   try {
     // console.log('generateSchema', { objSchemaPath, generateSchemaSettings });
     // ---------  Prepare path  -------------
@@ -39,10 +39,9 @@ async function generateSchema(_izContext, objSchemaPath, generateSchemaSettings)
     // console.log("saveFilePath: ", saveFilePath);
 
     // point to root folder of service
-    let localServicePath = join(saveFilePath, "../../");
+    let localServicePath = join(saveFilePath, '../../');
     // console.log("localServicePath: ", localServicePath);
 
-
     //------ Start Create Source ------
 
     // collect all result of template data for execute createSource
@@ -50,20 +49,21 @@ async function generateSchema(_izContext, objSchemaPath, generateSchemaSettings)
     // collect all path that need to empty before createSource
     let allEmptyPath = new Set();
 
-
     // Validate that all generateNames in generateSettings are present in the schemaConfig
     const generateNameSet = new Set(Object.keys(schemaConfig.TemplateAndData));
 
     // Find any missing generateNames that are not in the schemaConfig
-    let missingGenerateName = generateSchemaSettings.
-      filter(({ generateName }) => !generateNameSet.has(generateName));
+    let missingGenerateName = generateSchemaSettings.filter(
+      ({ generateName }) => !generateNameSet.has(generateName)
+    );
 
     // If there are missing generateNames, throw an error with the list of missing names
     if (missingGenerateName.length) {
-      throw Error(`Invalid generateName:[ ${missingGenerateName.map(({ generateName }) => generateName).join(", ")} ]`);
+      throw Error(
+        `Invalid generateName:[ ${missingGenerateName.map(({ generateName }) => generateName).join(', ')} ]`
+      );
     }
 
-
     // start create generateSchema depend on
     for (const generateSetting of generateSchemaSettings) {
       console.log('Loading template:', generateSetting.generateName);
@@ -72,20 +72,30 @@ async function generateSchema(_izContext, objSchemaPath, generateSchemaSettings)
       // console.log('schemaPath:', join(__dirname, schemaConfig.TemplateAndData[generateSetting.generateName]));
 
       // get generateSchema template depend on generateName
-      let generateSchemaData = (await import(join(__dirname, schemaConfig.TemplateAndData[generateSetting.generateName]))).default;
+      let generateSchemaData = (
+        await import(
+          join(
+            __dirname,
+            schemaConfig.TemplateAndData[generateSetting.generateName]
+          )
+        )
+      ).default;
       // sources[eventSourceTag] = await import(`../MiddlewareCore/EventSources/${eventSourceTag}.js`);
-      let createSourceResult = await generateSchemaData(_izContext, objSchemaPath, generateSchemaSettings);
+      let createSourceResult = await generateSchemaData(
+        _izContext,
+        objSchemaPath,
+        generateSchemaSettings
+      );
 
       // Filter out empty or invalid objects before adding to allCreateSource
       if (Array.isArray(createSourceResult)) {
-        const validResults = createSourceResult.filter(item =>
-          item && item.templatePath && item.templateData && item.setting
+        const validResults = createSourceResult.filter(
+          item => item && item.templatePath && item.templateData && item.setting
         );
         allCreateSource.push(...validResults);
       }
     }
 
-
     // check each allCreateSource valid
     for (let item of allCreateSource) {
       // throw Error('Skipping invalid source item:', item);
@@ -94,13 +104,18 @@ async function generateSchema(_izContext, objSchemaPath, generateSchemaSettings)
         throw Error('Skipping invalid source item:', item);
       }
 
-      const { templatePath, templateData, setting, emptyPath: returnEmptyPath } = item;
+      const {
+        templatePath,
+        templateData,
+        setting,
+        emptyPath: returnEmptyPath
+      } = item;
       setting.checkCreateSourcePass = true;
 
       let [status, errors] = await createSource.createSource(
         readFileSync(templatePath, 'utf8'),
         templateData,
-        setting,
+        setting
       );
 
       if (status === false) {
@@ -113,14 +128,13 @@ async function generateSchema(_izContext, objSchemaPath, generateSchemaSettings)
     // validate path before empty folder
     for (let emptyPath of allEmptyPath) {
       // console.log("emptyPath: ", emptyPath);
-      validatePathWithRootServicePath(localServicePath, emptyPath)
+      validatePathWithRootServicePath(localServicePath, emptyPath);
     }
 
     for (let emptyPath of allEmptyPath) {
       await deleteFileInDir(emptyPath);
     }
 
-
     // generate all source
     for (let item of allCreateSource) {
       // throw error if item is invalid
@@ -135,7 +149,7 @@ async function generateSchema(_izContext, objSchemaPath, generateSchemaSettings)
       await createSource(
         readFileSync(templatePath, 'utf8'),
         templateData,
-        setting,
+        setting
       );
     }
 
@@ -147,4 +161,4 @@ async function generateSchema(_izContext, objSchemaPath, generateSchemaSettings)
   }
 }
 
-export default generateSchema
+export default generateSchema;

package/src/reStructure/GenerateTests.js

@@ -15,27 +15,25 @@ 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/>.
 */
 
-'use strict';
-
-import { join, dirname } from "path";
+import { join, dirname } from 'path';
 import { fileURLToPath, pathToFileURL } from 'url';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 
-import { readFileSync } from "fs";
+import { readFileSync } from 'fs';
 // SourceManager
-import { utils, createSource } from "../SourceManager/index.js";
-const { deleteFileInDir } = utils
-import generateTest from './TemplateData/IntTest/generateTests/generateTemplate.js'
+import { utils, createSource } from '../SourceManager/index.js';
+const { deleteFileInDir } = utils;
+import generateTest from './TemplateData/IntTest/generateTests/generateTemplate.js';
 
 import lib from '../reStructure/TemplateData/IntTest/libs/libs.js';
 const { getLocalConfig } = lib;
-import uploadLib from '../reStructure/TemplateData/IntTest/upload/uploadIntTest.js'
+import uploadLib from '../reStructure/TemplateData/IntTest/upload/uploadIntTest.js';
 async function generateCodeWithTemplate(_izContext, savePath, settings) {
-  _izContext.logger.debug("START", { savePath, settings })
+  _izContext.logger.debug('START', { savePath, settings });
   try {
-    const serviceTag = getLocalConfig("iz_serviceTag")
-    let packagePath = path.join(__dirname, "../../")
+    const serviceTag = getLocalConfig('iz_serviceTag');
+    let packagePath = path.join(__dirname, '../../');
     // console.log({ packagePath });
     // ---------  Prepare path  -------------
     // point to app/src
@@ -47,16 +45,19 @@ async function generateCodeWithTemplate(_izContext, savePath, settings) {
     //------ Start Create Source ------
 
     // collect all result of template data for execute createSource
-    let allCreateSource = []
-
+    let allCreateSource = [];
 
+    // console.log({ intTestPath })
     // let generateTemplateData = (await import(join(__dirname, IntTestConfig.TemplateAndData[templateName]))).default;
-    let createSourceResult = await generateTest(_izContext, savePath);
+    let createSourceResult = await generateTest(_izContext, savePath, {
+      serviceTag,
+      s3Prefix: settings
+    });
     // console.log({ createSourceResult })
     // Filter out empty or invalid objects before adding to allCreateSource
     if (Array.isArray(createSourceResult)) {
-      const validResults = createSourceResult.filter(item =>
-        item && item.templatePath && item.templateData && item.setting
+      const validResults = createSourceResult.filter(
+        item => item && item.templatePath && item.templateData && item.setting
       );
       allCreateSource.push(...validResults);
     }
@@ -76,16 +77,16 @@ async function generateCodeWithTemplate(_izContext, savePath, settings) {
       let [status, errors] = await createSource.createSource(
         readFileSync(templatePath, 'utf8'),
         templateData,
-        setting,
+        setting
       );
 
       if (status === false) {
-        console.log('templatePath in generateCode', templatePath)
-        throw Error(errors)
+        console.log('templatePath in generateCode', templatePath);
+        throw Error(errors);
       }
 
       // validatePathWithRootServicePath(localServicePath, setting.savePath)
-      await deleteFileInDir(setting.savePath);
+      // await deleteFileInDir(setting.savePath);
     }
 
     // generate all source
@@ -102,18 +103,18 @@ async function generateCodeWithTemplate(_izContext, savePath, settings) {
       await createSource.createSource(
         readFileSync(templatePath, 'utf8'),
         templateData,
-        setting,
+        setting
       );
     }
 
     console.log('Generated all source files successfully');
 
-    console.log("upload file to S3")
-    const intTestPath = join(saveFilePath, `../../src/generateIntegrationTest/${serviceTag}`)
-    console.log({ intTestPath })
-
-    await uploadLib(intTestPath, { s3Prefix: settings, serviceTag: serviceTag })
+    console.log('upload file to S3');
 
+    await uploadLib.uploadTos3(
+      join(saveFilePath, `../../src/generateIntegrationTest/${serviceTag}`), //intTest path
+      { s3Prefix: settings, serviceTag: serviceTag } // settings
+    );
 
     // exec(`bash ${ path.join(packagePath, "./frontEnd/NpmBash.bash") } `, (error, stdout, stderr) => {
     //   if (error) {
@@ -134,4 +135,4 @@ async function generateCodeWithTemplate(_izContext, savePath, settings) {
   }
 }
 
-export default generateCodeWithTemplate
+export default generateCodeWithTemplate;

package/src/reStructure/IntTestConfig.js

@@ -15,13 +15,9 @@ 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/>.
 */
 
-'use strict';
-
 export const IntTestConfig = {
   TemplateAndData: {
-    IntTest: './TemplateData/IntTest/generateTemplateData.js',
+    IntTest: './TemplateData/IntTest/generateTemplateData.js'
   },
-  Plugin: {
-
-  }
-}
+  Plugin: {}
+};

package/src/reStructure/SchemaConfig.js

@@ -15,13 +15,9 @@ 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/>.
 */
 
-'use strict';
-
 export const schemaConfig = {
   TemplateAndData: {
-    propertyValue: './TemplateData/propertyValueSchema/generateTemplateData.js',
+    propertyValue: './TemplateData/propertyValueSchema/generateTemplateData.js'
   },
-  Plugin: {
-
-  }
-}
+  Plugin: {}
+};

package/src/reStructure/TemplateConfig.js

@@ -15,16 +15,14 @@ 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/>.
 */
 
-'use strict';
-
-
 export const templateConfig = {
   TemplateAndData: {
     // ** PerActionEndpoint **
     // perActionEndpoint: './TemplateData/perActionEndpoint/generateTemplateData.js',
 
     // ** perActionComplete **
-    perActionComplete: './TemplateData/perActionComplete/generateTemplateData.js',
+    perActionComplete:
+      './TemplateData/perActionComplete/generateTemplateData.js',
 
     // ** Resource YAML **
     resourceYaml: './TemplateData/resourceYaml/generateTemplateData.js',
@@ -33,7 +31,8 @@ export const templateConfig = {
     externalService: './TemplateData/externalService/generateTemplateData.js',
 
     // ** Relationship Per Action **
-    relationshipPerAction: './TemplateData/relationshipPerAction/generateTemplateData.js',
+    relationshipPerAction:
+      './TemplateData/relationshipPerAction/generateTemplateData.js',
 
     // ** Find Data **
     findData: './TemplateData/findData/generateTemplateData.js',
@@ -42,18 +41,18 @@ export const templateConfig = {
     processLogical: './TemplateData/processLogical/generateTemplateData.js',
 
     // ** Process Logical Paginate **
-    processLogicalPaginate: './TemplateData/processLogicalPagination/generateTemplateData.js',
+    processLogicalPaginate:
+      './TemplateData/processLogicalPagination/generateTemplateData.js',
 
     // ** flowSchema **
     flowSchema: './TemplateData/flowSchema/generateTemplateData.js',
 
     // ** endpoint per service **
-    endpointPerServiceConfig: './TemplateData/EndpointPerService/generateTemplateData.js',
+    endpointPerServiceConfig:
+      './TemplateData/EndpointPerService/generateTemplateData.js',
 
     // ** Auth **
-    auth: "./TemplateData/Auth/generateTemplateData.js"
+    auth: './TemplateData/Auth/generateTemplateData.js'
   },
-  Plugin: {
-
-  }
-}
+  Plugin: {}
+};

package/src/reStructure/TemplateData/Auth/generateAuthYml/data.js

@@ -15,8 +15,6 @@ 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/>.
 */
 
-'use strict';
-
 import path from 'path';
 import { fileURLToPath } from 'url';
 const __filename = fileURLToPath(import.meta.url);
@@ -24,7 +22,7 @@ const __dirname = path.dirname(__filename);
 
 import { consts } from '../../../../MainLibs/index.js';
 const { SOURCE_PATH } = consts;
-const templatePath = path.join(__dirname, 'template.ejs')
+const templatePath = path.join(__dirname, 'template.ejs');
 
 /**
  * receive objectSchema
@@ -39,15 +37,11 @@ function data(_izContext, srcPath) {
     templateData: {},
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.appYaml),
-      saveFileName: "Authorizer",
+      saveFileName: 'Authorizer',
       fileExtension: '.yml',
       isAppend: true
     }
-  }
-
+  };
 }
 
-
-
-
-export default data;
+export default data;

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

@@ -15,11 +15,9 @@ 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/>.
 */
 
-'use strict';
-
 import { join } from 'path';
 // Import handlers and generators
-import generateAuth from './generateAuthYml/data.js'
+import generateAuth from './generateAuthYml/data.js';
 
 // Import code libs generator
 // const createGenerateCodeLibs = require('./libs/data');
@@ -33,13 +31,16 @@ import generateAuth from './generateAuthYml/data.js'
 async function generateCodeWithTemplate(_izContext, objSchemaPath) {
   try {
     const saveFilePath = join(objSchemaPath, `../`);
-    let authYamlFile = generateAuth(_izContext, saveFilePath)
+    let authYamlFile = generateAuth(_izContext, saveFilePath);
 
     const createSourceParams = [authYamlFile];
 
     return createSourceParams;
   } catch (error) {
-    _izContext.logger.error('Error generating code with template endpointPerService:', error);
+    _izContext.logger.error(
+      'Error generating code with template endpointPerService:',
+      error
+    );
     return [];
   }
 }

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

@@ -15,22 +15,20 @@ 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/>.
 */
 
-'use strict';
-
 import { join } from 'path';
-import { NoRetryError } from '@izara_project/izara-core-library-core'
+import { NoRetryError } from '@izara_project/izara-core-library-core';
 import { getObjectSchema } from '@izara_project/izara-core-library-service-schemas';
 // Import handlers and generators
 
-import invHandler from "./handler/inv/data.js";
-import apiHandler from "./handler/api/data.js";
-import sqsHandler from "./handler/sqs/data.js";
-import dsqHandler from "./handler/dsq/data.js";
-import createMain from "./mainFunction/create/data.js";
-import updateMain from "./mainFunction/update/data.js";
-import getMain from "./mainFunction/get/data.js";
-import deleteMain from "./mainFunction/delete/data.js";
-import yamlGenerator from "./yaml/data.js";
+import invHandler from './handler/inv/data.js';
+import apiHandler from './handler/api/data.js';
+import sqsHandler from './handler/sqs/data.js';
+import dsqHandler from './handler/dsq/data.js';
+import createMain from './mainFunction/create/data.js';
+import updateMain from './mainFunction/update/data.js';
+import getMain from './mainFunction/get/data.js';
+import deleteMain from './mainFunction/delete/data.js';
+import yamlGenerator from './yaml/data.js';
 
 const modules = {
   handlers: {
@@ -68,48 +66,60 @@ const modules = {
 async function generateCodeWithTemplate(_izContext, objSchemaPath) {
   try {
     const saveFilePath = join(objSchemaPath, `../`);
-    const allObjSchemas = await getObjectSchema.getAllLocalObjectSchemasWithHierarchy(_izContext, objSchemaPath);
-    console.log("allObjSchemas: ", allObjSchemas.records)
+    const allObjSchemas =
+      await getObjectSchema.getAllLocalObjectSchemasWithHierarchy(
+        _izContext,
+        objSchemaPath
+      );
+    console.log('allObjSchemas: ', allObjSchemas.records);
     const createSourceParams = [];
 
     for (const objectSchema of allObjSchemas.records) {
       try {
         // Generate handlers
-        const handlerParams = Object.entries(modules.handlers)
-          .flatMap(([type, handlerFn]) => handlerFn(_izContext, saveFilePath));
+        const handlerParams = Object.entries(modules.handlers).flatMap(
+          ([type, handlerFn]) => handlerFn(_izContext, saveFilePath)
+        );
 
         // Generate main functions
-        const functionParams = (await Promise.all(
-          Object.entries(modules.mainFunctions).map(([action, functionFn]) =>
-            functionFn(_izContext, saveFilePath)
+        const functionParams = (
+          await Promise.all(
+            Object.entries(modules.mainFunctions).map(([action, functionFn]) =>
+              functionFn(_izContext, saveFilePath)
+            )
           )
-        )).flat();
-
-
+        ).flat();
 
         // Generate code libs
         // const libsParam = createGenerateCodeLibs(_izContext, saveFilePath);
 
         createSourceParams.push(...handlerParams, ...functionParams);
       } catch (error) {
-        _izContext.logger.error(`Error processing schema ${objectSchema.name || 'unknown'}: ${error}`);
-        throw new NoRetryError(error)
+        _izContext.logger.error(
+          `Error processing schema ${objectSchema.name || 'unknown'}: ${error}`
+        );
+        throw new NoRetryError(error);
       }
     }
     try {
       // Generate function YAML files
-      const yamlParams = (await Promise.all(
-        Object.entries(modules.yamlGenerators)
-          .map(([type, yamlFn]) => yamlFn(_izContext, allObjSchemas, saveFilePath))
-      )).flat();
+      const yamlParams = (
+        await Promise.all(
+          Object.entries(modules.yamlGenerators).map(([type, yamlFn]) =>
+            yamlFn(_izContext, allObjSchemas, saveFilePath)
+          )
+        )
+      ).flat();
       createSourceParams.push(...yamlParams);
-
     } catch (error) {
       _izContext.logger.error(`Error processing schema yaml ${error}`);
     }
     return createSourceParams;
   } catch (error) {
-    _izContext.logger.error('Error generating code with template endpointPerService:', error);
+    _izContext.logger.error(
+      'Error generating code with template endpointPerService:',
+      error
+    );
     return [];
   }
 }