@izara_project/izara-core-library-service-schemas 1.0.101 → 1.0.102

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-core-library-service-schemas",
-  "version": "1.0.101",
+  "version": "1.0.102",
   "description": "Schemas for the service and objects it controls",
   "main": "index.js",
   "scripts": {
@@ -21,10 +21,10 @@
   },
   "type": "module",
   "dependencies": {
-    "@aws-sdk/client-api-gateway": "^3.932.0",
-    "@aws-sdk/client-apigatewayv2": "^3.932.0",
-    "@aws-sdk/client-lambda": "^3.932.0",
-    "@aws-sdk/client-s3": "^3.932.0",
+    "@aws-sdk/client-api-gateway": "^3.933.0",
+    "@aws-sdk/client-apigatewayv2": "^3.933.0",
+    "@aws-sdk/client-lambda": "^3.933.0",
+    "@aws-sdk/client-s3": "^3.933.0",
     "@aws-sdk/crc64-nvme-crt": "^3.932.0",
     "@izara_project/izara-core-library-core": "^1.0.28",
     "@izara_project/izara-core-library-external-request": "^1.0.22",
@@ -32,7 +32,7 @@
     "@izara_project/izara-core-library-logger": "^1.0.8",
     "@izara_project/izara-shared-core": "^1.0.5",
     "@izara_project/izara-shared-service-schemas": "^1.0.33",
-    "glob": "^11.0.3",
+    "glob": "^12.0.0",
     "lodash": "^4.17.21",
     "read-yaml-file": "^2.1.0"
   }

package/src/GetObjectSchema.js

@@ -20,6 +20,7 @@ along with this program.If not, see < http://www.gnu.org/licenses/>.
 
 import { glob } from 'glob';
 import path from 'path';
+import { pathToFileURL } from 'url';
 import lodash from 'lodash';
 import { objectHash as hash } from '@izara_project/izara-shared-core';
 import { getObjectSchema, validateObjType } from "@izara_project/izara-shared-service-schemas";
@@ -45,7 +46,7 @@ import lambdaUtils from './libs/LambdaUtils.js';
  * @param {Boolean} setting.onNotFoundError - optional, default = false -- if true will throw error when not find any file
  * @returns                                 - array of data
  */
-function getDataFromPath(
+async function getDataFromPath(
   _izContext,
   fileName,
   fileStoragePath,
@@ -69,7 +70,7 @@ function getDataFromPath(
   }
 
   // list exists file path from fileStoragePath path
-  const allFilePath = glob.sync(`**/${fileName}`, { cwd: fileStoragePath, dot: true });
+  const allFilePath = await glob(`**/${fileName}`, { cwd: fileStoragePath, dot: true });
 
   // validate fileLimit
   if (fileLimit && allFilePath.length > fileLimit) {
@@ -77,8 +78,13 @@ function getDataFromPath(
   }
 
   if (allFilePath.length > 0) {
-    const allFileData = allFilePath.map(file => require(path.join(fileStoragePath, file)));
-    return allFileData;
+    // const allFileData = allFilePath.map(file => require(path.join(fileStoragePath, file)));
+    const allFileData = await Promise.all(allFilePath.map(async (file) => {
+      let data = await import(pathToFileURL(path.join(fileStoragePath, file)).href);
+      data = data.default;
+      return data;
+    }))
+    return allFileData.flat();
   } else {
 
     if (onNotFoundError === true) {
@@ -89,7 +95,7 @@ function getDataFromPath(
   }
 }
 
-// currenly not use
+// currently not use
 // /**
 //  * get data from file ObjectTypes.js depend on path
 //  *
@@ -168,12 +174,10 @@ async function getLocalObjectSchemas(_izContext, objectTypes, objSchemaPath = co
     // returnValue.fieldLookup[objectType] = null;
   }
 
-  let allObjectSchemas = lodash.cloneDeep(getDataFromPath(_izContext, consts.LOCAL_FILENAME.OBJECT_SCHEMA, objSchemaPath)
-    .flat()
+  let allObjectSchemas = lodash.cloneDeep((await getDataFromPath(_izContext, consts.LOCAL_FILENAME.OBJECT_SCHEMA, objSchemaPath)).flat()
     .filter(schema => filteredObjectTypes.includes(schema.objectType))
   );
 
-
   // add extendObjectType before assign to returnValue object
   if (getExtendObType) {
     await Promise.all(
@@ -250,11 +254,9 @@ async function getAllLocalObjectSchemas(_izContext, objSchemaPath = consts.LOCAL
 
   // const objectTypeList = getObjectTypes(_izContext, objSchemaPath)
 
-  const allObjectSchemas = lodash.cloneDeep(getDataFromPath(_izContext, consts.LOCAL_FILENAME.OBJECT_SCHEMA, objSchemaPath)
-    .flat()
+  const allObjectSchemas = lodash.cloneDeep((await getDataFromPath(_izContext, consts.LOCAL_FILENAME.OBJECT_SCHEMA, objSchemaPath)).flat()
     // .filter(schema => objectTypeList.includes(schema.objectType))
   );
-
   // check objectType that not found in ObjectFieldSchema.js
   // const remainingObjectTypes = objectTypeList.filter(objectType => !allObjectSchemas.some(schema => schema.objectType === objectType));
 
@@ -327,7 +329,7 @@ async function getLambdaFunctionNames(_izContext) {
   try {
     _izContext.logger.debug("-- function getLambdaFunctionNames --");
 
-    const LambdaFunctions = getDataFromPath(_izContext, consts.LOCAL_FILENAME.LAMBDA_FUNCTIONS, consts.LOCAL_OBJECT_SCHEMA_PATH, {
+    const LambdaFunctions = await getDataFromPath(_izContext, consts.LOCAL_FILENAME.LAMBDA_FUNCTIONS, consts.LOCAL_OBJECT_SCHEMA_PATH, {
       fileLimit: 1
     })[0];
     _izContext.logger.debug("LambdaFunctions: ", LambdaFunctions);
@@ -537,7 +539,7 @@ const getObjectSchemaCombineFieldNamesWithCache = inMemoryCacheLib(
  * @param {String} [objSchemaPath]                    - Optional default = './src/schemas', need objSchemaPath if use in local machine
  * @returns {Object}                                  - specific relationship schema
  */
-function getLocalRelationshipSchemas(_izContext, relationshipTags, objSchemaPath = consts.LOCAL_OBJECT_SCHEMA_PATH) {
+async function getLocalRelationshipSchemas(_izContext, relationshipTags, objSchemaPath = consts.LOCAL_OBJECT_SCHEMA_PATH) {
 
   // validate objectTypes
   if (!relationshipTags) {
@@ -553,7 +555,7 @@ function getLocalRelationshipSchemas(_izContext, relationshipTags, objSchemaPath
   }
 
 
-  const objectRelationshipDatas = getDataFromPath(
+  const objectRelationshipDatas = await getDataFromPath(
     _izContext,
     consts.LOCAL_FILENAME.OBJECT_RELATIONSHIPS,
     objSchemaPath,
@@ -932,7 +934,7 @@ async function getAllLocalFlowSchemas(_izContext, flowSchemaPath = consts.LOCAL_
     fieldLookup: {}
   }
 
-  const allFlowSchemas = lodash.cloneDeep(getDataFromPath(_izContext, consts.LOCAL_FILENAME.FLOW_SCHEMA, flowSchemaPath).flat());
+  const allFlowSchemas = lodash.cloneDeep((await getDataFromPath(_izContext, consts.LOCAL_FILENAME.FLOW_SCHEMA, flowSchemaPath)).flat());
   _izContext.logger.debug("allFlowSchemas::", allFlowSchemas)
   for (let [idx, flowSchema] of allFlowSchemas.entries()) {
     if (!returnValue.fieldLookup.hasOwnProperty(flowSchema.flowTag)) {
@@ -973,8 +975,7 @@ async function getLocalFlowSchemas(_izContext, flowTags, flowSchemaPath = consts
     filteredFlowTags.push(flowTag)
   }
 
-  const filterFlowSchemas = lodash.cloneDeep(getDataFromPath(_izContext, consts.LOCAL_FILENAME.FLOW_SCHEMA, flowSchemaPath)
-    .flat()
+  const filterFlowSchemas = lodash.cloneDeep((await getDataFromPath(_izContext, consts.LOCAL_FILENAME.FLOW_SCHEMA, flowSchemaPath)).flat()
     .filter(schema => filteredFlowTags.includes(schema.flowTag))
   );
   _izContext.logger.debug("filterFlowSchemas::", filterFlowSchemas)
@@ -1029,20 +1030,16 @@ const getFlowSchemaS3WithCache = inMemoryCacheLib(
   }
 )
 
-function getAllLocalRelationshipSchema(_izContext, objSchemaPath = consts.LOCAL_OBJECT_SCHEMA_PATH) {
+async function getAllLocalRelationshipSchema(_izContext, objSchemaPath = consts.LOCAL_OBJECT_SCHEMA_PATH) {
 
-  const allObjectSchemas = lodash.cloneDeep(getDataFromPath(_izContext, consts.LOCAL_FILENAME.OBJECT_RELATIONSHIPS, objSchemaPath)
-    .flat()
-  );
+  const allObjectSchemas = lodash.cloneDeep((await getDataFromPath(_izContext, consts.LOCAL_FILENAME.OBJECT_RELATIONSHIPS, objSchemaPath)).flat());
 
   return allObjectSchemas
 }
 
-function getAllLocalRefObjectRelationshipSchema(_izContext, objSchemaPath = consts.LOCAL_OBJECT_SCHEMA_PATH) {
+async function getAllLocalRefObjectRelationshipSchema(_izContext, objSchemaPath = consts.LOCAL_OBJECT_SCHEMA_PATH) {
 
-  const allRefObjectRelationshipSchemas = lodash.cloneDeep(getDataFromPath(_izContext, consts.LOCAL_FILENAME.REFERENCE_OBJECT_RELATIONSHIPS, objSchemaPath)
-    .flat()
-  );
+  const allRefObjectRelationshipSchemas = lodash.cloneDeep((await getDataFromPath(_izContext, consts.LOCAL_FILENAME.REFERENCE_OBJECT_RELATIONSHIPS, objSchemaPath)).flat());
 
   return allRefObjectRelationshipSchemas
 

package/src/Utils.js

@@ -117,7 +117,7 @@ function getUsedFieldNamesOfIdentifiers(_izContext, identifiers, identifierTypes
 
 function validateBasicObjectSchema(_izContext, objectSchema) {
 
-  const validateStatus = validator.validateObject(basicValidatorSchema.basicObjectSchema, objectSchema, null, { strict: false });
+  const validateStatus = validator(basicValidatorSchema.basicObjectSchema, objectSchema, null, { strict: false });
 
   if (validateStatus.pass) {
     let errors = []
@@ -235,7 +235,7 @@ function validateBasicObjectSchema(_izContext, objectSchema) {
 }
 
 function validateExtendObjectSchema(_izContext, extendObjectSchema) {
-  let validateStatus = validator.validateObject(basicValidatorSchema.basicExtendObjectSchema, extendObjectSchema, null, { strict: false });
+  let validateStatus = validator(basicValidatorSchema.basicExtendObjectSchema, extendObjectSchema, null, { strict: false });
 
   if (validateStatus.pass) {
     let errors = []
@@ -364,7 +364,7 @@ function validateObjectSchema(_izContext, objectSchema) {
 
 
 function validateRelationshipSchema(_izContext, relationshipSchema) {
-  let validateStatus = validator.validateObject(basicValidatorSchema.relationshipBasicSchema, relationshipSchema, null, { strict: false });
+  let validateStatus = validator(basicValidatorSchema.relationshipBasicSchema, relationshipSchema, null, { strict: false });
 
   const relationshipTag = Object.keys(relationshipSchema)[0];
   _izContext.logger.debug("relationshipSchema: ", relationshipSchema);
@@ -418,7 +418,7 @@ function validateRelationshipSchema(_izContext, relationshipSchema) {
 }
 
 function validateRefRelationshipSchema(_izContext, refRelationshipSchema, serviceTag) {
-  let validateStatus = validator.validateObject(basicValidatorSchema.refRelationshipBasicSchema, refRelationshipSchema, null, { strict: false });
+  let validateStatus = validator(basicValidatorSchema.refRelationshipBasicSchema, refRelationshipSchema, null, { strict: false });
   if (validateStatus.pass) {
     if (!serviceTag) {
       serviceTag = process.env.iz_serviceTag
@@ -646,7 +646,7 @@ function createLinkTypeId(_izContext, firstObjType, secondObjType, relType, dire
 }
 
 function validateBasicFlowSchema(_izContext, flowSchema) {
-  const validateStatus = validator.validateObject(basicValidatorSchema.basicFlowSchema, flowSchema, null, { strict: false });
+  const validateStatus = validator(basicValidatorSchema.basicFlowSchema, flowSchema, null, { strict: false });
 
   if (validateStatus.pass) {
     let errors = [];

package/src/ValidatorSchema.js

@@ -1023,10 +1023,10 @@ async function validateLocalSchema(_izContext, schemasPath, serviceConfigPath) {
     }
 
     const allObjectSchema = await getObjectSchema.getAllLocalObjectSchemasWithoutHierarchy(_izContext, schemasPath).then(res => res.records);
-    const allObjectRelationships = getObjectSchema.getAllLocalRelationshipSchema(_izContext, schemasPath);
-    const allReferenceObjectRelationships = getObjectSchema.getAllLocalRefObjectRelationshipSchema(_izContext, schemasPath);
+    const allObjectRelationships = await getObjectSchema.getAllLocalRelationshipSchema(_izContext, schemasPath);
+    const allReferenceObjectRelationships = await getObjectSchema.getAllLocalRefObjectRelationshipSchema(_izContext, schemasPath);
     const allFlowSchemas = await getObjectSchema.getAllLocalFlowSchemas(_izContext, schemasPath).then(res => res.records);
-
+    // console.log({ allObjectSchema, allObjectRelationships, allReferenceObjectRelationships, allFlowSchemas })
     // validate all schema
     for (const objSchema of allObjectSchema) {
       const [status, errors] = utils.validateObjectSchema(_izContext, objSchema);