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

package/src/libs/CreateNodeLib.js

@@ -16,16 +16,15 @@ along with this program.If not, see < http://www.gnu.org/licenses/>.
 */
 
 'use strict';
-const { createRelTypeConcat, createLinkTypeId } = require('../Utils');
-const getObjectSchema = require('../GetObjectSchema');
-const serviceConfig = require('../ServiceConfig');
-const { STORAGE_TYPES, OBJECT_SCHEMA_BUCKET_NAME } = require('../Consts')
-const { getObjTypeHierarchy } = require('../GetObjectSchema')
+import utils from '../Utils.js';
+import getObjectSchema from '../GetObjectSchema.js';
+import serviceConfig from '../ServiceConfig.js';
+import consts from '../Consts.js';
 
 async function validateRequiredOnCreateLinks(_izContext, objType, relationships = [], settings = {}) {
   _izContext.logger.debug("validateRequiredOnCreateLinks:::", { objType, relationships, settings })
 
-  let objectHie = await getObjTypeHierarchy(_izContext, objType).then(objSchema => {
+  let objectHie = await getObjectSchema.getObjTypeHierarchy(_izContext, objType).then(objSchema => {
     if (objSchema.errorsFound.length > 0) {
       throw new NoRetryError(objSchema.errorsFound.join(","))
     } else {
@@ -35,7 +34,7 @@ async function validateRequiredOnCreateLinks(_izContext, objType, relationships
   _izContext.logger.debug("objectHierarchy::", objectHie)
 
   if (relationships.length) {
-    let targetHierarchy = await getObjTypeHierarchy(_izContext, relationships[0].targetObjType).then(objSchema => {
+    let targetHierarchy = await getObjectSchema.getObjTypeHierarchy(_izContext, relationships[0].targetObjType).then(objSchema => {
       if (objSchema.errorsFound.length > 0) {
         throw new NoRetryError(objSchema.errorsFound.join(","))
       } else {
@@ -62,7 +61,7 @@ async function validateRequiredOnCreateLinks(_izContext, objType, relationships
       const serviceTags = await Promise.all(
         requiredOnCreateLink.storageResourceTags.map(async (storageTag) => {
           let storageResource = requiredOnCreateLink.storageResources[storageTag];
-          if (storageResource.storageType === STORAGE_TYPES.graph) {
+          if (storageResource.storageType === consts.STORAGE_TYPES.graph) {
             return await serviceConfig.getGraphServiceTagWithCache(_izContext, storageResource.graphServerTag)
           }
         })
@@ -84,7 +83,7 @@ async function validateRequiredOnCreateLinks(_izContext, objType, relationships
   _izContext.logger.debug("start validate relationship from requestParams")
   for (const relationship of relationships) {
     // validate all relationship in requestParams
-    let relTypeConcat = createRelTypeConcat(_izContext, relationship.relType)
+    let relTypeConcat = utils.createRelTypeConcat(_izContext, relationship.relType)
 
     if (!requiredOnCreateLinkGroups[relTypeConcat]) {
       errorsFound.push(`cannot create relationship ${relTypeConcat}`)
@@ -101,7 +100,7 @@ async function validateRequiredOnCreateLinks(_izContext, objType, relationships
 
     for (let link of usedLinkGroup) {
       // check other with targetObjType, check linkType of other should be 'one',
-      let targetObjTypeHierarchy = await getObjTypeHierarchy(_izContext, relationship.targetObjType).then(objSchema => {
+      let targetObjTypeHierarchy = await getObjectSchema.getObjTypeHierarchy(_izContext, relationship.targetObjType).then(objSchema => {
         if (objSchema.errorsFound.length > 0) {
           throw new NoRetryError(objSchema.errorsFound.join(","))
         } else {
@@ -144,7 +143,7 @@ async function validateRequiredOnCreateLinks(_izContext, objType, relationships
 function groupRequiredOnCreateLink(_izContext, relationshipSchemas) {
   let groupLink = {};
   for (let relationshipSchema of relationshipSchemas) {
-    let relTypeConcat = createRelTypeConcat(_izContext, relationshipSchema.relType);
+    let relTypeConcat = utils.createRelTypeConcat(_izContext, relationshipSchema.relType);
     if (!groupLink.hasOwnProperty(relTypeConcat)) {
       Object.assign(groupLink, {
         [relTypeConcat]: {
@@ -184,10 +183,9 @@ function createLinkTypeIdFromLinkGroup(_izContext, linkGroup) {
   let linkTypeIds = new Set();
   for (const objectRelationshipGroup of Object.values(linkGroup)) {
     for (const direction of Object.keys(objectRelationshipGroup)) {
-      let objectRelationshipByDirection = objectRelationshipGroup[direction]
       if (objectRelationshipGroup[direction].length) {
         for (const objectRelLink of objectRelationshipGroup[direction]) {
-          linkTypeIds.add(createLinkTypeId(
+          linkTypeIds.add(utils.createLinkTypeId(
             _izContext,
             objectRelLink?.base?.objType,
             objectRelLink?.other?.objType,
@@ -210,7 +208,7 @@ function switchDirection(direction) {
   }
 }
 
-module.exports = {
+export default {
   validateRequiredOnCreateLinks,
   groupRequiredOnCreateLink,
   createLinkTypeIdFromLinkGroup,

package/src/libs/DeliminatorTree.js

@@ -17,10 +17,10 @@ along with this program.If not, see < http://www.gnu.org/licenses/>.
 
 'use strict';
 
-const { NoRetryError } = require('@izara_project/izara-core-library-core');
+import { NoRetryError } from '@izara_project/izara-core-library-core';
 
-const { getObjSchemaS3WithHierarchy } = require("../GetObjectSchema");
-const { DEFAULT_IDENTIFIER_DELIMINATOR } = require("../Consts");
+import getObjectSchema from "../GetObjectSchema.js";
+import consts from "../Consts.js";
 
 
 /**
@@ -51,7 +51,7 @@ async function generateDeliminatorTreePerFieldName(_izContext, fieldName, fieldN
 
   if (fieldNameSetting.fromObjType) {
 
-    let childObjectSchema = await getObjSchemaS3WithHierarchy(
+    let childObjectSchema = await getObjectSchema.getObjSchemaS3WithHierarchy(
       _izContext,
       // {
       //   objectType: fieldNameSetting.fromObjectType,
@@ -120,7 +120,7 @@ async function generateDeliminatorTreePerFieldName(_izContext, fieldName, fieldN
 
     // add deliminator and deliminatorList to deliminatorTree
     if (isConcatCompositeKey) {
-      deliminatorTree[fieldName].deliminator = usedIdentifier.deliminator || DEFAULT_IDENTIFIER_DELIMINATOR;
+      deliminatorTree[fieldName].deliminator = usedIdentifier.deliminator || consts.DEFAULT_IDENTIFIER_DELIMINATOR;
     }
 
     if (childDeliminatorList.hasOwnProperty(deliminatorTree[fieldName].deliminator)) {
@@ -304,7 +304,7 @@ async function generateDeliminatorCompositeIdentifier(_izContext, objSchema) {
   }
 }
 
-module.exports = {
+export default {
   generateDeliminatorTreePerFieldName,
   generateDeliminatorTreeAllFieldNames,
   generateDeliminatorTreeIdentifier,

package/src/libs/ExplodedReqParams.js

@@ -17,9 +17,9 @@ along with this program.If not, see < http://www.gnu.org/licenses/>.
 
 'use strict';
 
-const { NoRetryError } = require('@izara_project/izara-core-library-core');
+import { NoRetryError } from '@izara_project/izara-core-library-core';
 
-const deliminatorTree = require("./DeliminatorTree");
+import deliminatorTree from "./DeliminatorTree.js";
 
 
 /**
@@ -474,7 +474,7 @@ async function explodedDataForUpdate(_izContext, requestParams, objectSchema, se
   return explodedReqParams
 }
 
-module.exports = {
+export default {
   explodeDataField,
   explodedDataForCreate,
   explodedDataForIdentifiers,

package/src/libs/LambdaUtils.js

@@ -17,7 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 'use strict';
 
-const { LambdaClient, ListFunctionsCommand } = require('@aws-sdk/client-lambda');
+import { LambdaClient, ListFunctionsCommand } from '@aws-sdk/client-lambda';
 
 /**
  * List all lambda functions
@@ -38,6 +38,4 @@ async function listLambdaFunctions(_izContext, param) {
   }
 }
 
-module.exports = {
-  listLambdaFunctions,
-};
+export default listLambdaFunctions;

package/src/libs/RelSchemaLib.js

@@ -17,13 +17,12 @@ along with this program.If not, see < http://www.gnu.org/licenses/>.
 
 'use strict';
 
-const lodash = require("lodash");
+import lodash from "lodash";
+import { NoRetryError } from '@izara_project/izara-core-library-core';
+import { objectHash as hash } from '@izara_project/izara-shared-core';
+import getObjectSchema from "../GetObjectSchema.js";
+import { validateObjType } from "@izara_project/izara-shared-service-schemas";
 
-const hash = require('@izara_project/izara-shared-core').objectHash;
-const { NoRetryError } = require('@izara_project/izara-core-library-core');
-const getObjectSchema = require("../GetObjectSchema");
-const { validateObjType: { validateObjType } } = require("@izara_project/izara-shared-service-schemas");
-const { getObjTypeHierarchy } = require('../GetObjectSchema');
 /**
  * helper function for find link of 2 objects in links and refactor each link
  *
@@ -42,7 +41,7 @@ async function findLinksByObjTypes(_izContext, objTypes, relationshipLinks) {
   }
 
   for (const objType of objTypes) {
-    const validateObjTypeResult = validateObjType(objType);
+    const validateObjTypeResult = validateObjType.validateObjType(objType);
     if (validateObjTypeResult.errorsFound.length > 0) {
       throw NoRetryError(`function checkLinkValid: invalid objType ${objType.name} - ${validateObjTypeResult.errorsFound.join(", ")}`);
     }
@@ -52,14 +51,14 @@ async function findLinksByObjTypes(_izContext, objTypes, relationshipLinks) {
   const secondObjType = objTypes[1];
 
   // first create hierarchy of each objType
-  const firstObjTypeTree = await getObjTypeHierarchy(_izContext, objTypes[0], process.env.iz_serviceSchemaBucketName).then(objSchema => {
+  const firstObjTypeTree = await getObjectSchema.getObjTypeHierarchy(_izContext, objTypes[0], process.env.iz_serviceSchemaBucketName).then(objSchema => {
     if (objSchema.errorsFound.length > 0) {
       throw new NoRetryError(objSchema.errorsFound.join(","))
     } else {
       return objSchema.result
     }
   });
-  const secondObjTypeTree = await getObjTypeHierarchy(_izContext, objTypes[1], process.env.iz_serviceSchemaBucketName).then(objSchema => {
+  const secondObjTypeTree = await getObjectSchema.getObjTypeHierarchy(_izContext, objTypes[1], process.env.iz_serviceSchemaBucketName).then(objSchema => {
     if (objSchema.errorsFound.length > 0) {
       throw new NoRetryError(objSchema.errorsFound.join(","))
     } else {
@@ -113,6 +112,4 @@ async function findLinksByObjTypes(_izContext, objTypes, relationshipLinks) {
   return foundLinks;
 }
 
-module.exports = {
-  findLinksByObjTypes
-}
+export default { findLinksByObjTypes }

package/src/libs/SharedUtilsLibs.js

@@ -211,7 +211,7 @@ function getStorageResources(relationshipSchema, storageResourceTags) {
   return result;
 }
 
-module.exports = {
+export default {
   validateObjectLinksInput,
   validateGraphServerTags,
   mergeStorageResources,

package/src/libs/UploadUseCase.js

@@ -17,26 +17,11 @@ along with this program.If not, see < http://www.gnu.org/licenses/>.
 
 'use strict';
 
-const { NoRetryError } = require('@izara_project/izara-core-library-core');
-const {
-  generateObjectSchemaForCreate: generateObjectSchemaForCreateShared,
-  generateObjectSchemaForUpdate: generateObjectSchemaForUpdateShared,
-  generateObjectSchemaForCombineFieldNames: generateObjectSchemaForCombineFieldNamesShared
-} = require('@izara_project/izara-shared-service-schemas').reformatObjectSchema
-const {
-  getUsedFieldNamesOfIdentifiers,
-  findLinkByObjType,
-  findLinkByObjTypeV2,
-  createLinkTypeId
-} = require('../Utils');
-const {
-  OBJECT_SCHEMA_BUCKET_NAME,
-  UPLOAD_PATH_S3,
-  LOCAL_OBJECT_SCHEMA_PATH,
-  LOCAL_FILENAME
-} = require("../Consts");
-
-const { headObjectS3, getObjectS3 } = require('./s3Utils')
+import { reformatObjectSchema } from '@izara_project/izara-shared-service-schemas'
+
+import utils from '../Utils.js';
+
+
 
 const DEFAULT_REL_ID_SETTING = {
   relId: {
@@ -66,7 +51,7 @@ const DEFAULT_REL_ID_SETTING = {
  */
 function generateObjectSchemaForCreate(_izContext, objSchema) {
 
-  return generateObjectSchemaForCreateShared(objSchema)
+  return reformatObjectSchema.generateObjectSchemaForCreate(objSchema)
   // // generate data for case create
   // let initReturnObj = {
   //   objectType: objSchema.objectType,
@@ -127,7 +112,7 @@ function generateObjectSchemaForCreate(_izContext, objSchema) {
  */
 function generateObjectSchemaForUpdate(_izContext, objSchema) {
 
-  return generateObjectSchemaForUpdateShared(objSchema)
+  return reformatObjectSchema.generateObjectSchemaForUpdate(objSchema)
   // // generate data for case update
   // let initReturnObj = {
   //   objectType: objSchema.objectType,
@@ -201,7 +186,7 @@ function generateObjectSchemaForUpdate(_izContext, objSchema) {
  */
 function generateObjectSchemaForCombineFieldNames(_izContext, objSchema) {
 
-  return generateObjectSchemaForCombineFieldNamesShared(objSchema)
+  return reformatObjectSchema.generateObjectSchemaForCombineFieldNames(objSchema)
   // generate data for case update
   // let initReturnObj = {
   //   objectType: objSchema.objectType,
@@ -272,7 +257,7 @@ function groupRelationshipsPerObjectType(_izContext, allObjectRelationships, obj
 
     for (let objectType of objectTypes) {
 
-      const linkResult = findLinkByObjType(
+      const linkResult = utils.findLinkByObjType(
         _izContext,
         {
           objectType,
@@ -322,7 +307,7 @@ function groupLinksPerObjectType(_izContext, allObjectRelationships, objectTypes
 
     for (let objectType of objectTypes) {
 
-      const linkRecords = findLinkByObjTypeV2(
+      const linkRecords = utils.findLinkByObjType(
         _izContext,
         { // objType
           objectType,
@@ -355,7 +340,7 @@ function generateLinksDataPerLinkTypeId(_izContext, relationshipTag, relationshi
   let linksData = {};
   const storageResources = relationshipData.storageResources
   for (const link of relationshipData.links) {
-    const linkTypeId = createLinkTypeId(
+    const linkTypeId = utils.createLinkTypeId(
       _izContext,
       link.from.objType,
       link.to.objType,
@@ -479,7 +464,7 @@ async function refRelationshipPerObjectSchema(_izContext, objSchema) {
 }
 
 
-module.exports = {
+export default {
   generateObjectSchemaForCreate,
   generateObjectSchemaForUpdate,
   generateObjectSchemaForCombineFieldNames,

package/src/libs/s3Utils.js

@@ -17,8 +17,8 @@ along with this program.If not, see < http://www.gnu.org/licenses/>.
 
 'use strict';
 
-require("@aws-sdk/crc64-nvme-crt");
-const {
+import("@aws-sdk/crc64-nvme-crt");
+import {
   S3Client,
   GetObjectCommand,
   HeadObjectCommand,
@@ -26,13 +26,13 @@ const {
   DeleteObjectCommand,
   DeleteObjectsCommand,
   PutObjectCommand,
-} = require("@aws-sdk/client-s3");
+} from "@aws-sdk/client-s3";
 
-const hash = require('@izara_project/izara-shared-core').objectHash;
+import { objectHash as hash } from '@izara_project/izara-shared-core';
 
-const { NoRetryError, inMemoryCacheLib } = require('@izara_project/izara-core-library-core');
-const { SCHEMA_NAME_PER_S3_PATH } = require('@izara_project/izara-shared-service-schemas').consts;
-const { OBJECT_SCHEMA_BUCKET_NAME } = require('../Consts');
+import { NoRetryError, inMemoryCacheLib } from '@izara_project/izara-core-library-core';
+import { consts } from '@izara_project/izara-shared-service-schemas';
+import coreConsts from '../Consts.js';
 
 const s3Client = new S3Client();
 
@@ -67,14 +67,14 @@ async function getSchemaByName(params, bucketName) {
     throw new NoRetryError(`getSchemaByName invalid parameters`);
   }
 
-  if (!SCHEMA_NAME_PER_S3_PATH.hasOwnProperty(params.schemaName)) {
+  if (!consts.SCHEMA_NAME_PER_S3_PATH.hasOwnProperty(params.schemaName)) {
     throw new NoRetryError(`schemaName:${params.schemaName} not exist`);
   }
 
   // build params for getObjectS3
   let getDataParam = {
-    Bucket: bucketName || process.env.iz_serviceSchemaBucketName || OBJECT_SCHEMA_BUCKET_NAME,
-    Key: SCHEMA_NAME_PER_S3_PATH[params.schemaName](params.getParams)
+    Bucket: bucketName || process.env.iz_serviceSchemaBucketName || coreConsts.OBJECT_SCHEMA_BUCKET_NAME,
+    Key: consts.SCHEMA_NAME_PER_S3_PATH[params.schemaName](params.getParams)
   };
 
   let [objectSchema] = await getObjectS3Shared({
@@ -145,7 +145,7 @@ async function putObjectS3(_izContext, param) {
   return putResult;
 }
 
-module.exports = {
+export default {
   getObjectS3,
   headObjectS3,
   listObjectsV2,