@arrai-innovations/reactive-helpers 1.1.1 → 1.2.0

package/package.json

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

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

@@ -296,7 +296,7 @@ describe("use/listFilter", () => {
                     name: "four",
                 },
             });
-            const args = {
+            const listFilterArgs = {
                 A: {
                     excludedValues: {
                         id: 1,
@@ -310,21 +310,16 @@ describe("use/listFilter", () => {
                     },
                 },
             };
-            const listInstanceModule = await import("../../../use/listInstance");
-            const listInstances = listInstanceModule.useListInstances({
-                A: {
-                    listInstanceA,
-                },
-                B: {
-                    listInstanceB,
-                },
-            });
-            const listFilters = useListFilters(args, listInstances);
+            const listInstances = {
+                A: listInstanceA,
+                B: listInstanceB,
+            };
+            const listFilters = useListFilters(listFilterArgs, listInstances);
 
             expect(listFilters.A.state.excludedValues).toEqual({ id: 1, name: "three" });
             expect(listFilters.B.state.allowedValues).toEqual({ id: 2, name: "four" });
-            expect(unrefAndToRawDeep(listFilters.A.parentState)).toEqual(unrefAndToRawDeep(listInstanceA.state));
-            expect(unrefAndToRawDeep(listFilters.B.parentState)).toEqual(unrefAndToRawDeep(listInstanceB.state));
+            expect(unrefAndToRawDeep(listFilters.A.parentState)).toEqual(unrefAndToRawDeep(listFilterA.parentState));
+            expect(unrefAndToRawDeep(listFilters.B.parentState)).toEqual(unrefAndToRawDeep(listFilterB.parentState));
             expect(unrefAndToRawDeep(listFilters.A.state)).toEqual(unrefAndToRawDeep(listFilterA.state));
             expect(unrefAndToRawDeep(listFilters.B.state)).toEqual(unrefAndToRawDeep(listFilterB.state));
         });

package/use/listInstance.js

@@ -1,6 +1,7 @@
-import { isEmpty } from "lodash";
+import { cloneDeep, isEmpty } from "lodash";
 import { computed, effectScope, reactive, unref } from "vue";
 import { assignReactiveObject } from "../utils/assignReactiveObject";
+import { getFakeId } from "../utils/getFakeId";
 import inspect from "browser-util-inspect";
 
 export class ListError extends Error {
@@ -11,14 +12,14 @@ export class ListError extends Error {
     }
 }
 
-const defaultCrud = reactive({
+const defaultCrud = {
     args: {},
     list: undefined,
-});
+};
 
 export function setListInstanceCrud({ list, args = {} } = {}) {
     defaultCrud.list = list;
-    assignReactiveObject(defaultCrud.args, args);
+    Object.assign(defaultCrud.args, args);
 }
 
 export function useListInstances(listInstanceArgs) {
@@ -43,7 +44,7 @@ export function useListInstance({ crudArgs, defaultListArgs = {}, defaultRetriev
         error: null,
         order: [],
     });
-    assignReactiveObject(state.listInstanceCrud, defaultCrud);
+    Object.assign(state.listInstanceCrud, cloneDeep(defaultCrud));
     if (crudArgs) {
         assignReactiveObject(state.listInstanceCrud.args, crudArgs);
     }
@@ -136,12 +137,8 @@ export function useListInstance({ crudArgs, defaultListArgs = {}, defaultRetriev
         }
     }
 
-    function getFakeId() {
-        let fakeId;
-        do {
-            fakeId = Math.floor(Math.random() * Number.MIN_SAFE_INTEGER);
-        } while (fakeId in state.objects);
-        return fakeId;
+    function ourGetFakeId() {
+        return getFakeId(state.objects);
     }
 
     const es = effectScope();
@@ -158,7 +155,7 @@ export function useListInstance({ crudArgs, defaultListArgs = {}, defaultRetriev
         deleteListObject,
         clearList,
         effectScope: es,
-        getFakeId,
+        getFakeId: ourGetFakeId,
         defaultPageCallback,
         pageCallback: defaultPageCallback,
     };

package/use/listSubscription.js

@@ -11,9 +11,9 @@ export class ListSubscriptionError extends Error {
     }
 }
 
-const defaultCrud = reactive({
+const defaultCrud = {
     subscribe: undefined,
-});
+};
 
 export function setListSubscriptionCrud({ subscribe }) {
     defaultCrud.subscribe = subscribe;
@@ -36,7 +36,7 @@ export function useListSubscription({ listInstance, crudArgs, defaultListArgs, d
         listSubscriptionCrud: {},
         intendToSubscribe: false,
     });
-    assignReactiveObject(state.listSubscriptionCrud, defaultCrud);
+    assignReactiveObject(state.listSubscriptionCrud, cloneDeep(defaultCrud));
 
     async function subscribe({ listArgs, retrieveArgs } = {}) {
         if (!listArgs) {

package/utils/getFakeId.js

@@ -0,0 +1,15 @@
+import { isArray } from "lodash";
+
+export function getFakeId(arrayOrObject) {
+    let fakeId;
+    let test;
+    if (isArray(arrayOrObject)) {
+        test = () => arrayOrObject.any((item) => item.id === fakeId);
+    } else {
+        test = () => fakeId in arrayOrObject;
+    }
+    do {
+        fakeId = Math.floor(Math.random() * Number.MIN_SAFE_INTEGER);
+    } while (test());
+    return fakeId;
+}

package/utils/index.js

@@ -1,4 +1,5 @@
 export * from "./assignReactiveObject";
+export * from "./getFakeId";
 export * from "./keyDiff";
 export * from "./set";
 export * from "./unrefAndToRawDeep";