@arrai-innovations/reactive-helpers 8.3.1 → 8.3.3

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@arrai-innovations/reactive-helpers",
-    "version": "8.3.1",
+    "version": "8.3.3",
     "description": "VueJS 3 utility composition functions to help manipulate objects and lists.",
     "main": "index.js",
     "type": "module",

package/use/objectSubscription.js

@@ -175,7 +175,7 @@ export function useObjectSubscription({
             awaitableWithCancel: subscribe,
             watchArguments: reactive({
                 intendToSubscribe: toRef(state, "intendToSubscribe"),
-                listArgs: toRef(parentState, "id"),
+                id: toRef(parentState, "id"),
                 retrieveArgs: toRef(parentState, "retrieveArgs"),
             }),
             clearActiveOnResolved: false,
@@ -184,10 +184,15 @@ export function useObjectSubscription({
         retrieveIntent = useCancellableIntent({
             awaitableWithCancel: objectInstance.retrieve,
             watchArguments: reactive({
-                intendToSubscribe: toRef(state, "intendToRetrieve"),
-                listArgs: toRef(parentState, "id"),
+                intendToRetrieve: toRef(state, "intendToRetrieve"),
+                id: toRef(parentState, "id"),
                 retrieveArgs: toRef(parentState, "retrieveArgs"),
             }),
+            // delay triggering a retrieve until the last retrieve has finished/cancelled
+            // cancel can still be triggered
+            guardArguments: reactive({
+                loading: toRef(state, "loading"),
+            }),
         });
     });
 

package/utils/compact.js

@@ -4,12 +4,7 @@ const removeEmptyObjectsRecursive = (obj) => {
     if (typeof obj !== "object" || obj === null) {
         return;
     }
-    if (Array.isArray(obj)) {
-        for (const item of obj) {
-            removeEmptyObjectsRecursive(item);
-        }
-        return;
-    }
+    // we need to go deep first, so we so empty nested objects are removed before we check if the object is empty
     for (const [key, value] of Object.entries(obj)) {
         if (typeof value === "object" && value !== null) {
             if (Object.keys(value).length === 0) {
@@ -19,6 +14,12 @@ const removeEmptyObjectsRecursive = (obj) => {
             removeEmptyObjectsRecursive(value);
         }
     }
+    if (Array.isArray(obj)) {
+        for (const item of obj) {
+            removeEmptyObjectsRecursive(item);
+        }
+        return;
+    }
 };
 
 /**
@@ -33,6 +34,12 @@ const compactSparseArraysRecursive = (obj) => {
     if (typeof obj !== "object" || obj === null) {
         return;
     }
+    // we need to go deep first, so we so empty nested arrays are removed before we check if the array is empty
+    for (const value of Object.values(obj)) {
+        if (typeof value === "object" && value !== null) {
+            compactSparseArraysRecursive(value);
+        }
+    }
     if (Array.isArray(obj)) {
         for (let i = 0; i < obj.length; i++) {
             if (obj[i] === undefined) {
@@ -41,11 +48,6 @@ const compactSparseArraysRecursive = (obj) => {
             }
         }
     }
-    for (const value of Object.values(obj)) {
-        if (typeof value === "object" && value !== null) {
-            compactSparseArraysRecursive(value);
-        }
-    }
 };
 
 /**
@@ -60,14 +62,8 @@ const removeEmptyObjectsAndCompactSparseArraysRecursive = (obj) => {
     if (typeof obj !== "object" || obj === null) {
         return;
     }
-    if (Array.isArray(obj)) {
-        for (let i = 0; i < obj.length; i++) {
-            if (obj[i] === undefined || isEmpty(obj[i])) {
-                obj.splice(i, 1);
-                i--;
-            }
-        }
-    }
+    // we need to go deep first, so we so empty properties of objects or items in arrays are removed
+    //  before we check if the object or array is empty
     for (const [key, value] of Object.entries(obj)) {
         if (typeof value === "object" && value !== null) {
             if (Object.keys(value).length === 0) {
@@ -77,6 +73,14 @@ const removeEmptyObjectsAndCompactSparseArraysRecursive = (obj) => {
             removeEmptyObjectsAndCompactSparseArraysRecursive(value);
         }
     }
+    if (Array.isArray(obj)) {
+        for (let i = 0; i < obj.length; i++) {
+            if (obj[i] === undefined || isEmpty(obj[i])) {
+                obj.splice(i, 1);
+                i--;
+            }
+        }
+    }
 };
 
 /**