@arrai-innovations/reactive-helpers 11.4.0 → 11.4.2

package/.circleci/config.yml

@@ -7,28 +7,28 @@ orbs:
 workflows:
     test:
         jobs:
-            #            - npm/coverage:
-            #                  name: tests
-            #                  context: arrai-global
-            #                  filters:
-            #                      branches:
-            #                          only:
-            #                              - main
-            #            - npm/coverage:
-            #                  name: tests-no-badge
-            #                  context: arrai-global
-            #                  create_badges: false
-            #                  filters:
-            #                      tags:
-            #                          only: /.*/
-            #                      branches:
-            #                          ignore:
-            #                              - main
+            - npm/coverage:
+                  name: tests
+                  context: arrai-global
+                  filters:
+                      branches:
+                          only:
+                              - main
+            - npm/coverage:
+                  name: tests-no-badge
+                  context: arrai-global
+                  create_badges: false
+                  filters:
+                      tags:
+                          only: /.*/
+                      branches:
+                          ignore:
+                              - main
             - npm/publish:
                   name: publish
                   context: arrai-private-package-publishing
-                  #                  requires:
-                  #                      - tests-no-badge
+                  requires:
+                      - tests-no-badge
                   filters:
                       tags:
                           only: /.*/
@@ -37,8 +37,8 @@ workflows:
             - github/create_release:
                   name: release_on_github
                   context: arrai-global
-                  #                  requires:
-                  #                      - tests-no-badge
+                  requires:
+                      - tests-no-badge
                   filters:
                       tags:
                           only: /.*/

package/package.json

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

package/tests/unit/use/listInstance.spec.js

@@ -593,12 +593,14 @@ describe("use/listInstance.spec.js", function () {
             expect(isReadonly(passedIsCancelled)).toBe(true);
             expect(passedIsCancelled.value).toBe(false);
             expect(cancelablePromise.cancel).toBeTruthy();
+            expect(listInstance.state.loading).toBe(true);
 
             const cancelPromise = cancelablePromise.cancel();
             myListFnCancelResolve();
             await cancelPromise;
 
             expect(passedIsCancelled.value).toBe(true);
+            expect(listInstance.state.loading).toBe(false);
         });
     });
 });

package/use/listCalculated.js

@@ -67,10 +67,6 @@ export function useListCalculated({ parentState, calculatedObjectsRules }) {
     function calculatedObjectsWatch() {
         const calculatedObjectsRulesIsEmpty = !state.calculatedObjectsRules || isEmpty(state.calculatedObjectsRules);
         for (const objectKey of Object.keys(state.calculatedObjects)) {
-            const originalObject = toRef(parentState.objects, objectKey);
-            const relatedObject = parentState.relatedObjects
-                ? toRef(parentState.relatedObjects, objectKey)
-                : ref(undefined);
             if (!state.calculatedObjects[objectKey]) {
                 state.calculatedObjects[objectKey] = {};
             }
@@ -96,12 +92,16 @@ export function useListCalculated({ parentState, calculatedObjectsRules }) {
             if (!calculatedObjectsEffectScopes[objectKey]) {
                 calculatedObjectsEffectScopes[objectKey] = effectScope();
             }
+            const originalObjectRef = toRef(parentState.objects, objectKey);
+            const relatedObjectRef = parentState.relatedObjects
+                ? toRef(parentState.relatedObjects, objectKey)
+                : ref(undefined);
             calculatedObjectsEffectScopes[objectKey].run(() => {
                 for (const addedRuleKey of addedRuleKeys) {
                     calculatedObjectsObject[addedRuleKey] = computed(() =>
                         state.calculatedObjectsRules?.[addedRuleKey]?.(
-                            unref(originalObject),
-                            unref(relatedObject),
+                            unref(originalObjectRef),
+                            unref(relatedObjectRef),
                             calculatedObjectsObject
                         )
                     );

package/use/listInstance.js

@@ -198,6 +198,7 @@ export function useListInstance({ props, functions = {}, keepOldPages = false })
                 if (promise) {
                     await promise;
                 }
+                state.loading = false;
             };
         }
         // the indirection of promises here is to allow us to do additional work on listPromise's cancel

package/use/listRelated.js

@@ -92,8 +92,6 @@ export function useListRelated({ parentState, relatedObjectsRules }) {
     function relatedObjectsWatch() {
         const relatedObjectsRulesIsEmpty = !state.relatedObjectsRules || isEmpty(state.relatedObjectsRules);
         for (const objectKey of Object.keys(state.relatedObjects)) {
-            const originalObjectRef = toRef(parentState.objects, objectKey);
-            const relatedObjectRef = toRef(state.relatedObjects, objectKey);
             let removedRuleKeys, addedRuleKeys;
             if (!relatedObjectsRulesIsEmpty) {
                 ({ removedKeys: removedRuleKeys, addedKeys: addedRuleKeys } = keyDiff(
@@ -119,6 +117,8 @@ export function useListRelated({ parentState, relatedObjectsRules }) {
                 if (!relatedObjectsEffectScopes[objectKey]) {
                     relatedObjectsEffectScopes[objectKey] = effectScope();
                 }
+                const originalObjectRef = toRef(parentState.objects, objectKey);
+                const relatedObjectRef = toRef(state.relatedObjects, objectKey);
                 relatedObjectsEffectScopes[objectKey].run(() => {
                     for (const addedRuleKey of addedRuleKeys) {
                         const rules = toRef(state.relatedObjectsRules, addedRuleKey);

package/use/objectRelated.js

@@ -79,7 +79,6 @@ export function useObjectRelated({ parentState, relatedObjectRules }) {
                         // deal with computed objects being passed.
                         const ruleObjects = unref(state.relatedObjectRules?.[addedRuleKey]?.objects);
                         const rulePkKey = state.relatedObjectRules?.[addedRuleKey]?.pkKey || addedRuleKey;
-                        const ruleOrder = unref(state.relatedObjectRules?.[addedRuleKey]?.order);
                         if (!ruleObjects || !rulePkKey) {
                             state.relatedObject[addedRuleKey] = undefined;
                             return;
@@ -90,6 +89,7 @@ export function useObjectRelated({ parentState, relatedObjectRules }) {
                             return;
                         }
                         if (isArray(value)) {
+                            const ruleOrder = unref(state.relatedObjectRules?.[addedRuleKey]?.order);
                             // the related list could be sorted differently than the original list.
                             if (ruleOrder?.length) {
                                 value = value.filter(identity);

package/utils/debugMessage.js

@@ -1,6 +1,6 @@
 import { isSuperset } from "./set.js";
 import { transformWalk } from "./transformWalk.js";
-import debounce from "lodash-es/debounce";
+import debounce from "lodash-es/debounce.js";
 import isSet from "lodash-es/isSet.js";
 import partial from "lodash-es/partial.js";
 import union from "lodash-es/union.js";