@arrai-innovations/reactive-helpers 9.0.0 → 9.0.2

package/package.json

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

package/use/cancellableIntent.js

@@ -84,22 +84,41 @@ export function useCancellableIntent({
     };
 
     let delayedWatch = null;
+    let runningIntentWatch = null;
 
     const intentWatch = async () => {
-        let newWatchValues = deepUnref(Object.values(watchArguments));
-        const guardValues = deepUnref(Object.values(guardArguments));
-        if (isEqual(newWatchValues, previousWatchValues)) {
+        if (runningIntentWatch) {
             return;
         }
-        previousWatchValues = newWatchValues;
-        await cancel();
-        if (Object.values(previousWatchValues).every(identity)) {
-            // if any guards are true, delay the watch.
-            if (guardValues && !isEmpty(guardValues) && guardValues.some(identity)) {
-                delayedWatch = doIntentWatch;
+        runningIntentWatch = true;
+        // this locked section is to deal with multiple intentWatches running while waiting for cancel to resolve
+        try {
+            let newWatchValues = deepUnref(Object.values(watchArguments));
+            if (isEqual(newWatchValues, previousWatchValues)) {
                 return;
             }
-            doIntentWatch();
+            await cancel(); // this can take time so guards and watches can change!
+            newWatchValues = deepUnref(Object.values(watchArguments));
+            if (isEqual(newWatchValues, previousWatchValues)) {
+                return;
+            }
+            previousWatchValues = newWatchValues;
+            const guardValues = deepUnref(Object.values(guardArguments));
+            if (Object.values(newWatchValues).every(identity)) {
+                // if any guards are true, delay the watch.
+                if (guardValues && !isEmpty(guardValues) && guardValues.some(identity)) {
+                    delayedWatch = doIntentWatch;
+                    return;
+                }
+                doIntentWatch();
+            } else {
+                // if there already is a delayed watch, but the values have gone false, cancel it
+                if (delayedWatch) {
+                    delayedWatch = null;
+                }
+            }
+        } finally {
+            runningIntentWatch = false;
         }
     };
 

package/use/listInstance.js

@@ -128,13 +128,21 @@ export function useListInstance({ props, functions = {}, keepOldPages = false })
         });
     };
 
+    const promises = {
+        list: null,
+    };
+
     function list() {
         // this function cannot be async, or the resulting promise will lose its .cancel() method
+        if (promises.list) {
+            // if a retrieve is already in progress, return the existing promise
+            return promises.list;
+        }
         if (state.loading) {
             return Promise.reject(new ListError("already loading."));
         }
         let returnPromiseResolve;
-        const returnPromise = new Promise((resolve) => (returnPromiseResolve = resolve));
+        promises.list = new Promise((resolve) => (returnPromiseResolve = resolve));
         state.loading = true;
         state.errored = false;
         state.error = null;
@@ -146,7 +154,7 @@ export function useListInstance({ props, functions = {}, keepOldPages = false })
         });
         let resolveState = false;
         if (listPromise.cancel) {
-            returnPromise.cancel = async () => {
+            promises.list.cancel = async () => {
                 let promise = listPromise.cancel();
                 if (promise) {
                     await promise;
@@ -166,7 +174,7 @@ export function useListInstance({ props, functions = {}, keepOldPages = false })
                 state.loading = false;
                 returnPromiseResolve(resolveState);
             });
-        return returnPromise;
+        return promises.list;
     }
 
     function addListObject(object) {