@izara_frontend/service-schemas 1.0.6 → 1.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_frontend/service-schemas",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -20,8 +20,8 @@
   },
   "devDependencies": {},
   "dependencies": {
-    "@izara_project/izara-shared-core": "^1.0.6",
-    "@izara_project/izara-shared-service-schemas": "^1.0.33",
+    "@izara_project/izara-shared-core": "^1.0.9",
+    "@izara_project/izara-shared-service-schemas": "^1.0.40",
     "lodash": "^4.17.21"
   }
 }

package/src/getObjectSchema.js

@@ -1189,9 +1189,9 @@ export function getObjectLinksWithRequestProperties() {
 
 
   // core executor that does the actual work and optionally updates hook state
-  const execute = useCallback(async (objType, { updateState = true } = {}) => {
+  const execute = useCallback(async (objType, { updateState = true, returnPathLinkTypeId = false, returnLinkTypeId = false } = {}) => {
 
-    async function getObjectLinksWithRequestPropertiesMain(objType) {
+    async function getObjectLinksWithRequestPropertiesMain(objType, returnPathLinkTypeId, returnLinkTypeId) {
 
       // validate objType (some validators throw, some return errors)
       try {
@@ -1201,6 +1201,8 @@ export function getObjectLinksWithRequestProperties() {
       }
       let returnLinks = [];
       let mainErrorsFound = [];
+      let objectLinkIndexByLinkTypeId = {};
+      let objectLinkIndexByPathLinkTypeId = {};
 
       const [mainObjTypeConcat] = createObjTypeConcat(objType);
 
@@ -1228,16 +1230,55 @@ export function getObjectLinksWithRequestProperties() {
 
           returnLinks.push(newLink);
         }));
-      }
+
+
+        if (returnLinkTypeId === true || returnPathLinkTypeId === true) {
+          for (let objectLinkIdx = 0; objectLinkIdx < objectLinks.length; objectLinkIdx++) {
+
+            const objectLinkData = objectLinks[objectLinkIdx];
+            // start add index of link by linkTypeId
+            const linkTypeId = sharedSchemaUtils.createLinkTypeId(
+              objectLinkData.base.objType,
+              objectLinkData.other.objType,
+              objectLinkData.relType,
+              objectLinkData.base.direction
+            )
+
+            Object.assign(objectLinkIndexByLinkTypeId, { [linkTypeId.result]: objectLinkIdx });
+            // end add index of link by linkTypeId
+
+
+            // start add index of link by pathLinkTypeId
+            const pathLinkTypeId = sharedSchemaUtils.createPathLinkTypeId(
+              {
+                objType: objectLinkData.other.objType,
+                relType: objectLinkData.relType,
+                relationshipDirection: objectLinkData.base.direction
+              }
+            )
+            Object.assign(objectLinkIndexByPathLinkTypeId, { [pathLinkTypeId.result]: objectLinkIdx });
+            // end add index of link by linkTypeId
+          }
+        }
 
 
 
-      return [{ [mainObjTypeConcat]: returnLinks }, mainErrorsFound];
+      }
+
+      const result = { [mainObjTypeConcat]: returnLinks };
+      if (returnLinkTypeId === true) {
+        Object.assign(result, { [`${mainObjTypeConcat}_linkTypeIdIndex`]: objectLinkIndexByLinkTypeId });
+      }
+      if (returnPathLinkTypeId === true) {
+        Object.assign(result, { [`${mainObjTypeConcat}_pathLinkTypeIdIndex`]: objectLinkIndexByPathLinkTypeId });
+      }
+
+      return [result, mainErrorsFound];
     }
 
     try {
 
-      const [schema, errorsFound] = await getObjectLinksWithRequestPropertiesMain(objType);
+      const [schema, errorsFound] = await getObjectLinksWithRequestPropertiesMain(objType, returnPathLinkTypeId, returnLinkTypeId);
 
       if (updateState) {
         if (errorsFound && errorsFound.length) {
@@ -1264,19 +1305,20 @@ export function getObjectLinksWithRequestProperties() {
   // run can be used two ways:
   // 1) run(objType) -> updates hook state and returns Promise<[collected, errors]>
   // 2) run().initiate(objType) -> does NOT touch hook state, returns Promise<[collected, errors]>
-  const run = useCallback((objType) => {
+  const run = useCallback((objType, settings = { returnPathLinkTypeId: false, returnLinkTypeId: false }) => {
     if (typeof objType === "undefined") {
       return {
-        initiate: (objType) => execute(objType, { updateState: false })
+        initiate: (objType, initiateSettings = {}) => execute(objType, { ...settings, ...initiateSettings, updateState: false }),
       };
     }
     // direct call: update state
-    return execute(objType, { updateState: true });
+    return execute(objType, { ...settings, updateState: true });
   }, [execute]);
 
   return [result, run, { errorsFound }];
 }
 
+
 export function collectObjectLinksWithRequestProperties() {
 
   const [, getObjectLinksWithRequestPropertiesFn] = getObjectLinksWithRequestProperties();
@@ -1291,9 +1333,8 @@ export function collectObjectLinksWithRequestProperties() {
   useEffect(() => { resultRef.current = result; }, [result]);
 
   // core executor that does the actual work and optionally updates hook state
-  const execute = useCallback(async (objType, { updateState = true } = {}) => {
-
-    async function collectObjectLinksWithRequestPropertiesMain(objType) {
+  const execute = useCallback(async (objType, { updateState = true, returnPathLinkTypeId = false, returnLinkTypeId = false } = {}) => {
+    async function collectObjectLinksWithRequestPropertiesMain(objType, returnPathLinkTypeId, returnLinkTypeId) {
 
       // validate objType (some validators throw, some return errors)
       try {
@@ -1315,7 +1356,7 @@ export function collectObjectLinksWithRequestProperties() {
 
 
 
-      const [objectLinks, getSchemaErrors] = await getObjectLinksWithRequestPropertiesFn().initiate(objType);
+      const [objectLinks, getSchemaErrors] = await getObjectLinksWithRequestPropertiesFn().initiate(objType, { returnPathLinkTypeId, returnLinkTypeId });
 
 
       return [objectLinks, getSchemaErrors];
@@ -1324,12 +1365,12 @@ export function collectObjectLinksWithRequestProperties() {
     try {
 
 
-      const [schema, errorsFound] = await collectObjectLinksWithRequestPropertiesMain(objType);
+      const [schema, errorsFound] = await collectObjectLinksWithRequestPropertiesMain(objType, returnPathLinkTypeId, returnLinkTypeId);
 
       if (updateState) {
         if (errorsFound && errorsFound.length) {
           setErrorsFound(errorsFound);
-          setResult(null);
+          // setResult(null);
         } else {
           const [currentObjTypeConcat] = createObjTypeConcat(objType);
 
@@ -1366,15 +1407,15 @@ export function collectObjectLinksWithRequestProperties() {
   // run can be used two ways:
   // 1) run(objType) -> updates hook state and returns Promise<[collected, errors]>
   // 2) run().initiate(objType) -> does NOT touch hook state, returns Promise<[collected, errors]>
-  const run = useCallback((objType) => {
+  const run = useCallback((objType, settings = { returnPathLinkTypeId: false, returnLinkTypeId: false }) => {
     if (typeof objType === "undefined") {
       return {
-        initiate: (objType) => execute(objType, { updateState: false }),
+        initiate: (objType, initiateSettings = {}) => execute(objType, { ...settings, ...initiateSettings, updateState: false }),
         clear: () => { setResult(null); setErrorsFound([]); }
       };
     }
     // direct call: update state
-    return execute(objType, { updateState: true });
+    return execute(objType, { ...settings, updateState: true });
   }, [execute]);
 
   return [result, run, { errorsFound }];
@@ -1382,7 +1423,6 @@ export function collectObjectLinksWithRequestProperties() {
 
 
 
-
 /**
  * TODO: need to use function inside reformatObjectSchema lib instead. create in this cause need to fix bug first
  * create object schema that already combine fieldNames between main objectSchema and addOnDataStructure.type=versionedData