@izara_project/izara-market-library-service-schemas 1.0.77 → 1.0.79

package/index.js

@@ -28,6 +28,11 @@ import mainLibUtils from './src/MainLibs/src/Utils.js';
 import sourceManagerUtils from './src/SourceManager/src/Utils.js'
 import createSource from './src/SourceManager/src/CreateSource.js'
 
+import generateCode from './src/reStructure/GenerateCode.js';
+import generateSchema from './src/reStructure/GenerateSchema.js';
+import generateIntTest from './src/reStructure/GenerateTests.js';
+import generateResourceIntTest from './src/reStructure/GenerateResources.js';
+
 export {
   // generatedCode Libs
   constsGenerateCodeLibs, //generateCode Consts
@@ -44,4 +49,9 @@ export {
   // Libs
   checkPermission,
 
+  // main generateCode
+  generateCode,
+  generateSchema,
+  generateIntTest,
+  generateResourceIntTest
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-market-library-service-schemas",
-  "version": "1.0.77",
+  "version": "1.0.79",
   "description": "Schemas for Izara Market project",
   "main": "index.js",
   "scripts": {
@@ -25,15 +25,16 @@
     "@izara_project/izara-core-library-core": "^1.0.28",
     "@izara_project/izara-core-library-dynamodb": "^1.0.12",
     "@izara_project/izara-core-library-external-request": "^1.0.22",
+    "@izara_project/izara-core-library-graph-service": "1.0.16",
     "@izara_project/izara-core-library-lambda": "^1.0.6",
     "@izara_project/izara-core-library-logger": "^1.0.8",
+    "@izara_project/izara-core-library-s3": "^1.0.3",
     "@izara_project/izara-core-library-service-schemas": "^1.0.102",
     "@izara_project/izara-core-library-sns": "^1.0.7",
     "@izara_project/izara-core-library-sqs": "^1.0.5",
     "@izara_project/izara-shared": "^1.0.126",
     "@izara_project/izara-shared-core": "^1.0.6",
     "@izara_project/izara-shared-service-schemas": "^1.0.33",
-    "@izara_project/izara-core-library-graph-service": "1.0.16",
     "ejs": "^3.1.10",
     "js-beautify": "^1.15.4",
     "lodash": "^4.17.21",

package/src/MainLibs/src/Consts.js

@@ -608,6 +608,17 @@ async function getExternalTopicComponentFromAllObjectSchemas(_izContext, allObjS
   return externalTopicComponents
 };
 
+const GENERATE_SEED_DATA_TYPE = {
+  RANDOM_ON_CREATE_IDENTIFIERS: "randomOnCreateIdentifier",
+  NON_RANDOM_ON_CREATE_IDENTIFIERS: "notRandomOnIdentifier",
+  RELATIONSHIPS: "relationships"
+}
+
+const SEED_DATA_TAG = {
+  dynamoDBSeedDataTags: "dynamoDBSeedDataTags",
+  graphSeedDataTags: "graphSeedDataTags"
+}
+
 export default {
   STORAGE_TYPES,
   ACTIONS,
@@ -644,5 +655,7 @@ export default {
   createDynamoDbComponentByLinks,
   getStorageResourceFromObjectSchemas,
   FLOW_SCHEMA_EVENT_TYPE,
-  getExternalTopicComponentFromAllObjectSchemas
+  getExternalTopicComponentFromAllObjectSchemas,
+  GENERATE_SEED_DATA_TYPE,
+  SEED_DATA_TAG
 }

package/src/MainLibs/src/Utils.js

@@ -17,9 +17,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 'use strict';
 
-const yaml = require('yaml')
-const path = require("path");
-const fs = require("fs")
+import yaml from 'yaml';
+import fs from "fs";
+import path from 'path';
 
 function firstLetterUpperCase(text) {
   return text.charAt(0).toUpperCase() + text.slice(1)
@@ -59,6 +59,7 @@ function getLocalConfig(srcPath, params) {
 //   }
 //   return newObjectSchema
 // }
+
 export default {
   firstLetterUpperCase,
   firstLetterLowerCase,

package/src/reStructure/GenerateResources.js

@@ -0,0 +1,127 @@
+/*
+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/>.
+*/
+
+'use strict';
+
+import { join, dirname } from "path";
+import { fileURLToPath, pathToFileURL } from 'url';
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+import { readFileSync } from "fs";
+
+
+// SourceManager
+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, "../../");
+    // console.log({ packagePath });
+    // ---------  Prepare path  -------------
+    // point to app/src
+
+    // point to root folder of service
+
+    //------ Start Create Source ------
+
+    // collect all result of template data for execute createSource
+    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
+      );
+      allCreateSource.push(...validResults);
+    }
+    // console.log({ allCreateSource })
+    // check each allCreateSource valid
+    for (let item of allCreateSource) {
+      // throw Error('Skipping invalid source item:', item);
+      if (!item || !item.templatePath || !item.templateData || !item.setting) {
+        console.log('throw Error Skipping invalid source item:', item);
+        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,
+      );
+
+      if (status === false) {
+        console.log('templatePath in generateCode', templatePath)
+        throw Error(errors)
+      }
+
+      // validatePathWithRootServicePath(localServicePath, setting.savePath)
+      await deleteFileInDir(setting.savePath);
+    }
+
+    // generate all source
+    for (let item of allCreateSource) {
+      // throw error if item is invalid
+      if (!item || !item.templatePath || !item.templateData || !item.setting) {
+        console.log('Throwing invalid source item:', item);
+        throw Error('Throwing invalid source item:', item);
+      }
+
+      const { templatePath, templateData, setting } = item;
+      setting.checkCreateSourcePass = false;
+
+      await createSource.createSource(
+        readFileSync(templatePath, 'utf8'),
+        templateData,
+        setting,
+      );
+    }
+
+    console.log('Generated all source files successfully');
+
+    // exec(`bash ${path.join(packagePath, "./frontEnd/NpmBash.bash")}`, (error, stdout, stderr) => {
+    //   if (error) {
+    //     console.error(`
+    //       ${error.message}`);
+    //     return;
+    //   }
+    //   if (stderr) {
+    //     console.error(`${stderr}`);
+    //     return;
+    //   }
+    //   console.log(`${stdout}`);
+    // });
+    // return 'return values';
+  } catch (error) {
+    console.error('Error generating code:', error);
+    throw error;
+  }
+}
+
+export default generateCodeWithTemplate;

package/src/reStructure/GenerateTests.js

@@ -17,24 +17,28 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 'use strict';
 
-import { readFileSync } from "fs";
-
-
-import { IntTestConfig } from "./IntTestConfig.js";
+import { join, dirname } from "path";
+import { fileURLToPath, pathToFileURL } from 'url';
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
 
+import { readFileSync } from "fs";
 // SourceManager
 import { utils, createSource } from "../SourceManager/index.js";
 const { deleteFileInDir } = utils
-
+import generateTest from './TemplateData/IntTest/generateTests/generateTemplate.js'
+import uploadLib from './TemplateData/IntTest/upload/uploadIntTest.js'
+import lib from '../reStructure/TemplateData/IntTest/libs/libs.js';
+const { getLocalConfig } = lib;
 async function generateCodeWithTemplate(_izContext, savePath, settings) {
   _izContext.logger.debug("START", { savePath, settings })
   try {
 
-    // let packagePath = path.join(__dirname, "../../")
+    let packagePath = path.join(__dirname, "../../")
     // console.log({ packagePath });
     // ---------  Prepare path  -------------
     // point to app/src
-    // let saveFilePath = join(packagePath, `../`);
+    let saveFilePath = join(packagePath, `../`);
 
     // point to root folder of service
     // let localServicePath = join(saveFilePath, "../../");
@@ -45,8 +49,8 @@ async function generateCodeWithTemplate(_izContext, savePath, settings) {
     let allCreateSource = []
 
 
-    let generateTemplateData = (await import(join(__dirname, IntTestConfig.TemplateAndData[templateName]))).default;
-    let createSourceResult = await generateTemplateData(_izContext, savePath, settings);
+    // let generateTemplateData = (await import(join(__dirname, IntTestConfig.TemplateAndData[templateName]))).default;
+    let createSourceResult = await generateTest(_izContext, savePath);
     // console.log({ createSourceResult })
     // Filter out empty or invalid objects before adding to allCreateSource
     if (Array.isArray(createSourceResult)) {
@@ -68,7 +72,7 @@ async function generateCodeWithTemplate(_izContext, savePath, settings) {
       const { templatePath, templateData, setting } = item;
       setting.checkCreateSourcePass = true;
 
-      let [status, errors] = await createSource(
+      let [status, errors] = await createSource.createSource(
         readFileSync(templatePath, 'utf8'),
         templateData,
         setting,
@@ -94,7 +98,7 @@ async function generateCodeWithTemplate(_izContext, savePath, settings) {
       const { templatePath, templateData, setting } = item;
       setting.checkCreateSourcePass = false;
 
-      await createSource(
+      await createSource.createSource(
         readFileSync(templatePath, 'utf8'),
         templateData,
         setting,
@@ -103,7 +107,14 @@ async function generateCodeWithTemplate(_izContext, savePath, settings) {
 
     console.log('Generated all source files successfully');
 
-    // exec(`bash ${path.join(packagePath, "./frontEnd/NpmBash.bash")}`, (error, stdout, stderr) => {
+    console.log("upload file to S3")
+    const intTestPath = join(saveFilePath, `../../src/generateIntegrationTest/${getLocalConfig("iz_serviceTag")}`)
+    console.log({ intTestPath })
+
+    // uploadLib(intTestPath, settings)
+
+
+    // exec(`bash ${ path.join(packagePath, "./frontEnd/NpmBash.bash") } `, (error, stdout, stderr) => {
     //   if (error) {
     //     console.error(`
     //       ${error.message}`);
@@ -123,13 +134,3 @@ async function generateCodeWithTemplate(_izContext, savePath, settings) {
 }
 
 export default generateCodeWithTemplate
-
-/*
-  GenerateCode will iterate through templateConfig and generate each template dependOn each templateAndData\
-
-  GenerateSchema now use for generate attribute tree only
-  generateSchema can be modify use used depend on use case eg: some objectType have attribute tree inside addOn
-    when generateSchema in own service need to generate ref objectRelationship only
-    and attribute tree service can generate schema
-
-*/

package/src/reStructure/TemplateData/EndpointPerService/mainFunction/create/template.ejs

@@ -30,7 +30,8 @@ import asyncFlowSharedLib from '@izara_project/izara-core-library-asynchronous-f
 import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow';
 import lambdaSharedLib from '@izara_project/izara-core-library-lambda';
 import { consts as coreConsts } from '@izara_project/izara-core-library-core';
-import { createRandomIdentifier } from '@izara_project/izara-core-library-identifiers';
+import identifierLib from '@izara_project/izara-core-library-identifiers';
+const { createRandomIdentifier } = identifierLib
 
 // ──────────────────────── Middleware / External ────────────────────────
 import { consts as middlewareConsts } from '@izara_project/izara-middleware';
@@ -52,7 +53,8 @@ const {
   TOPIC_NAME_GRAPH_HANDLER
 } = constsGenerateCodeLibs;
 
-const { dynamoDbIdentifiersByStorageResource } = generateCodeLibs
+const { dynamoDbIdentifiersByStorageResource, createDataDetailsLib } = generateCodeLibs
+
 //(<optionalRequire>)
 //(</optionalRequire>)
 

package/src/reStructure/TemplateData/EndpointPerService/mainFunction/delete/template.ejs

@@ -17,7 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 'use strict';
 // ==================== Shared Core Utilities ====================
-import { consts as coreConsts } from 'izara_project/izara-core-library-core';
+import { consts as coreConsts } from '@izara_project/izara-core-library-core';
 
 // ==================== Core Service Schemas ====================
 import { getObjectSchema, consts, createObjType } from '@izara_project/izara-core-library-service-schemas'

package/src/reStructure/TemplateData/IntTest/generateResources/generateResources.js

@@ -1,56 +1,99 @@
-// /*
-// Copyright (C) 2020 Sven Mason <http://izara.io>
+/*
+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 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.
+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/>.
-// */
+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';
+'use strict';
 
-// // Import required modules
-// // console.log("generate main PropertyValue Schema");
-// const { join } = require('path');
+import path from 'path';
+import { fileURLToPath } from 'url';
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
 
+import { getObjectSchema } from '@izara_project/izara-core-library-service-schemas'
+import intTestLibs from '../libs/libs.js';
+const { getLocalConfig, directoryPath } = intTestLibs;
 
+const templatePath = path.join(__dirname, "./templateResources.ejs")
 
+/**
+ * Generates code with templates for different actions
+ * @param {Object} _izContext - Context object
+ * @param {string} savePath - Path to the schema
+ * @returns {Array} Array of generated code parameters
+ */
+async function generateCodeWithTemplate(_izContext, savePath) {
+  try {
+    let allCreateSource = [];
 
-// // const relationshipPropertyNodeSchema = require('./tests/data')
-// const resource = require('./resources/data')
+    let schemaPath = path.join(savePath, "../ schemas")
+    let slsYmlPath = path.join(savePath, "../../sls_yaml/generatedCode/source/")
+    let serviceTag = getLocalConfig("iz_serviceTag")
+    let functionPath = path.join(savePath, "../../sls_yaml/")
+    // console.log("serviceTag", serviceTag);
 
-// /**
-//  * Generates code with templates for different actions
-//  * @param {Object} _izContext - Context object
-//  * @param {string} savePath - Path to the schema
-//  * @returns {Array} Array of generated code parameters
-//  */
-// async function generateCodeWithTemplate(_izContext, savePath, settings) {
-//   try {
-//     // console.log("settings generateCodeWithTemplate", settings)
-//     let allCreateSource = [];
+    // let allObjectSchema = await getObjectSchemas.getAllLocalObjectSchemasWithHierarchy(_izContext, schemaPath)
+    let allObjectSchema = await getObjectSchema.getAllLocalObjectSchemas(_izContext, schemaPath) // get ObjectSchemas Local
 
-//     const generateResource = await resource(_izContext, savePath, settings)
+    let allObjectSchemas = allObjectSchema.records
 
-//     // console.log("generateResource_Template", generateResource);
+    let tableNames = [];
+    for (let objectSchema of allObjectSchemas) {
+      // console.log("objectSchema", objectSchema)
+      for (let storageResource of Object.values(objectSchema.storageResources)) {
+        // console.log("storageResource_Data", storageResource)
+        if (storageResource.storageType === "dynamoDB") {
+          // console.log("storageResource_Data_Before_Push_Dynamo", storageResource)
+          tableNames.push(storageResource.tableName)
+        }
+      }
+    }
 
+    const generateFunctionComponent = directoryPath(slsYmlPath);
+    const mainFunctionComponent = directoryPath(functionPath);
+    // console.log({ mainFunctionComponent, generateFunctionComponent })
+    let lambdaComponent = { ...generateFunctionComponent, ...mainFunctionComponent }
+    let s3Component = {}
+    for (const lambdaFunctionName in lambdaComponent) {
+      if (lambdaFunctionName.endsWith("S3")) {
+        s3Component[lambdaFunctionName] = lambdaComponent[lambdaFunctionName]
+        delete lambdaComponent[lambdaFunctionName]
+      }
+    }
+    console.log(s3Component)
 
-//     allCreateSource.push(
-//       generateResource,
-//     )
-//     return allCreateSource;
-//   } catch (error) {
-//     _izContext.logger.error('Error generating code with template propertyNode schema:', error);
-//     return [];
-//   }
-// }
 
-// module.exports = generateCodeWithTemplate;
+    allCreateSource.push(
+      {
+        templatePath: templatePath,
+        templateData: { tableNames, functionComponent: lambdaComponent, s3Component },
+        setting: {
+          generateHookFile: false,
+          savePath: path.join(savePath, `${serviceTag}/sharedResources/`),
+          saveFileName: 'resources',
+          fileExtension: ".json",
+          isAppend: false
+        }
+      })
+
+    return allCreateSource;
+
+  } catch (error) {
+    _izContext.logger.error('Error generating code with template propertyNode schema:', error);
+    return [];
+  }
+}
+
+export default generateCodeWithTemplate;

package/src/reStructure/TemplateData/IntTest/generateResources/templateResources.ejs

@@ -0,0 +1,31 @@
+{
+  "Lambda": {
+    <% Object.entries(functionComponent).forEach(([funcName, filePath], index, array) => { -%>
+      "<%= funcName %>": {
+        "localLocation": "/<%= filePath %>.js",
+        "localHandler": "main",
+        "functionName": "<%= funcName %>"
+      }<%= index !== array.length - 1 ? ',' : '' %>
+    <% }); -%>
+  }, <% Object.keys(s3Component).length ? "," : "" %>
+  <% if (Object.keys(s3Component).length) { -%>
+  "S3": {
+    <% Object.entries(s3Component).forEach(([functionName,filePath],index) => { -%>
+      "<%- functionName %>": {
+        "localLocation": "/<%- filePath %>",
+        "localHandler": "main",
+        "functionName": "<%- functionName %>"
+      }<%= index < Object.keys(s3Component).length - 1 ? "," : "" %>
+      <% }); -%>
+  } <% Object.keys(tableNames).length ? "," : "" -%>
+    <% } -%>
+  <% if (Object.keys(tableNames).length) { -%>
+  "Dynamodb": {
+    <% tableNames.forEach(function(tableName, index) { %>
+      "<%= tableName %>": {
+        "tableName": "<%= tableName %>"
+      }<% if (index < tableNames.length - 1) { %>,<% } %>
+    <% }); %>
+  }
+  <% } %>
+}