@arrai-innovations/reactive-helpers 4.1.2 → 4.2.0

package/package.json

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

package/use/listCalculated.js

@@ -103,7 +103,7 @@ export function useListCalculated({
         state.objects = toRef(parentState, "objects");
         state.objectsInOrder = toRef(parentState, "objectsInOrder");
         state[copn] = toRef(state, "calculatedObjectsObjects");
-        for (let key in passThroughPropertyNames) {
+        for (let key of passThroughPropertyNames) {
             state[key] = toRef(parentState, key);
         }
 

package/use/listRelated.js

@@ -110,7 +110,7 @@ export function useListRelated({
         state.objects = toRef(parentState, "objects");
         state.objectsInOrder = toRef(parentState, "objectsInOrder");
         state[ropn] = toRef(state, "relatedObjectsObjects");
-        for (let key in passThroughPropertyNames) {
+        for (let key of passThroughPropertyNames) {
             state[key] = toRef(parentState, key);
         }
 

package/use/listSubscription.js

@@ -155,7 +155,7 @@ export function useListSubscription({
         state.objects = toRef(parentState, "objects");
         state.order = toRef(parentState, "order");
         state.objectsInOrder = toRef(parentState, "objectsInOrder");
-        for (let key in passThroughPropertyNames) {
+        for (let key of passThroughPropertyNames) {
             state[key] = toRef(parentState, key);
         }
 

package/use/objectCalculated.js

@@ -42,7 +42,7 @@ export function useObjectCalculated({
         state.deleted = toRef(parentState, "deleted");
         state.object = toRef(parentState, "object");
         state[copn] = toRef(state, "calculatedObjectObjects");
-        for (let key in passThroughPropertyNames) {
+        for (let key of passThroughPropertyNames) {
             state[key] = toRef(parentState, key);
         }
 

package/use/objectRelated.js

@@ -41,7 +41,7 @@ export function useObjectRelated({
         state.deleted = toRef(parentState, "deleted");
         state.object = toRef(parentState, "object");
         state[ropn] = toRef(state, "relatedObjectObjects");
-        for (let key in passThroughPropertyNames) {
+        for (let key of passThroughPropertyNames) {
             state[key] = toRef(parentState, key);
         }
 

package/utils/assignReactiveObject.js

@@ -116,14 +116,7 @@ export function assignReactiveObject(target, source, exclude = []) {
     addOrUpdateReactiveObject(target, source, exclude, addedKeys, sameKeys);
 }
 
-function assignReactiveObjectRecursive(target, source, exclude = [], path = "") {
-    let addedKeys, sameKeys, removedKeys;
-    try {
-        ({ addedKeys, sameKeys, removedKeys } = keyDiff(Object.keys(source) || [], Object.keys(target) || []));
-    } catch (error) {
-        debugger;
-    }
-    trimReactiveObject(target, removedKeys, exclude);
+function recursiveInner(target, source, exclude, addedKeys, sameKeys, path, fn) {
     addReactiveObject(target, source, exclude, addedKeys);
     const keysForRecurse = [];
     const keysForReplace = [];
@@ -143,10 +136,16 @@ function assignReactiveObjectRecursive(target, source, exclude = [], path = "")
             .filter((excludeKey) => !excludeKey.startsWith(path))
             .map((excludeKey) => excludeKey.replace(path, ""));
         const nextPath = isArray(source[key]) ? `${path}[${key}]` : `${path}.${key}`;
-        assignReactiveObjectRecursive(target[key], source[key], nextLevelExclude, nextPath);
+        fn(target[key], source[key], nextLevelExclude, nextPath);
     }
 }
 
+function assignReactiveObjectRecursive(target, source, exclude = [], path = "") {
+    let { addedKeys, sameKeys, removedKeys } = keyDiff(Object.keys(source) || [], Object.keys(target) || []);
+    trimReactiveObject(target, removedKeys, exclude);
+    recursiveInner(target, source, exclude, addedKeys, sameKeys, path, assignReactiveObjectRecursive);
+}
+
 export function assignReactiveObjectDeep(target, source, exclude = []) {
     // exclude keys will need to be lodash get strings
     if (target === source) {
@@ -155,3 +154,18 @@ export function assignReactiveObjectDeep(target, source, exclude = []) {
     ({ target, source } = validateTargetAndSource(target, source));
     assignReactiveObjectRecursive(target, source, exclude);
 }
+
+function addOrUpdateReactiveObjectRecursive(target, source, exclude = [], path = "") {
+    let addedKeys,
+        sameKeys = keyDiff(Object.keys(source) || [], Object.keys(target) || []);
+    recursiveInner(target, source, exclude, addedKeys, sameKeys, path, addOrUpdateReactiveObjectRecursive);
+}
+
+export function addOrUpdateReactiveObjectDeep(target, source, exclude = []) {
+    // exclude keys will need to be lodash get strings
+    if (target === source) {
+        return;
+    }
+    ({ target, source } = validateTargetAndSource(target, source));
+    addOrUpdateReactiveObjectRecursive(target, source, exclude);
+}