j-templates 8.0.6 → 8.0.7

package/Store/Store/store.js

@@ -20,7 +20,7 @@ class Store {
         this.keyFunc = keyFunc;
         this.rootMap = new Map();
         const aliasFunc = keyFunc &&
-            ((value) => {
+            ((value, reactive = true) => {
                 const key = keyFunc(value);
                 if (key === undefined)
                     return undefined;
@@ -28,7 +28,7 @@ class Store {
                 if (rootObject === undefined)
                     throw `No root object found for key: ${key}`;
                 const rootValue = observableNode_1.ObservableNode.Unwrap(rootObject); // rootObject[GET_OBSERVABLE_VALUE];
-                observableNode_1.ObservableNode.Touch(rootValue, key);
+                reactive && observableNode_1.ObservableNode.Touch(rootValue, key);
                 const alias = rootValue[key];
                 return alias;
             });

package/Store/Store/storeAsync.d.ts

@@ -84,7 +84,7 @@ export declare class StoreAsync extends Store {
      * @param items Optional elements to insert into the array.
      * @returns The array of deleted elements.
      */
-    Splice(key: string, start: number, deleteCount?: number, ...items: unknown[]): Promise<any[]>;
+    Splice(key: string, start: number, deleteCount?: number, ...items: unknown[]): Promise<any>;
     /**
      * Destroys the StoreAsync instance, stopping the async queue and cleaning up the diff instance.
      * This method should be called when the instance is no longer needed to free up resources.

package/Store/Store/storeAsync.js

@@ -4,7 +4,6 @@ exports.StoreAsync = void 0;
 const asyncQueue_1 = require("../../Utils/asyncQueue");
 const json_1 = require("../../Utils/json");
 const diffAsync_1 = require("../Diff/diffAsync");
-const observableNode_1 = require("../Tree/observableNode");
 const store_1 = require("./store");
 /**
  * StoreAsync class extends the base Store class to provide asynchronous data management operations.
@@ -124,10 +123,9 @@ class StoreAsync extends store_1.Store {
     async Splice(key, start, deleteCount, ...items) {
         return await this.queue.Next(async () => {
             const arr = this.Get(key);
-            const arrValue = observableNode_1.ObservableNode.Unwrap(arr); // (arr as any)[GET_OBSERVABLE_VALUE] as any[];
-            const arrCopy = arrValue.slice();
-            const spliceResult = (0, json_1.JsonDeepClone)(arrCopy.splice(start, deleteCount, ...items));
-            const diffResult = await this.diff.DiffPath(key, arrCopy);
+            const arrValue = arr.toJSON();
+            const spliceResult = arrValue.splice(start, deleteCount, ...items);
+            const diffResult = await this.diff.DiffPath(key, arrValue);
             this.UpdateRootMap(diffResult);
             return spliceResult;
         });

package/Store/Store/storeSync.d.ts

@@ -67,5 +67,5 @@ export declare class StoreSync extends Store {
      * @param items Optional elements to insert into the array.
      * @returns The array of deleted elements.
      */
-    Splice(key: string, start: number, deleteCount?: number, ...items: unknown[]): any[];
+    Splice(key: string, start: number, deleteCount?: number, ...items: unknown[]): any;
 }

package/Store/Store/storeSync.js

@@ -98,10 +98,9 @@ class StoreSync extends store_1.Store {
      */
     Splice(key, start, deleteCount, ...items) {
         const arr = this.Get(key);
-        const arrValue = observableNode_1.ObservableNode.Unwrap(arr); // (arr as any)[GET_OBSERVABLE_VALUE] as any[];
-        const arrCopy = arrValue.slice();
-        const spliceResult = (0, json_1.JsonDeepClone)(arrCopy.splice(start, deleteCount, ...items));
-        const diffResult = this.diff.DiffPath(key, arrCopy);
+        const arrValue = arr.toJSON();
+        const spliceResult = arrValue.splice(start, deleteCount, ...items);
+        const diffResult = this.diff.DiffPath(key, arrValue);
         this.UpdateRootMap(diffResult);
         return spliceResult;
     }

package/Store/Tree/observableNode.d.ts

@@ -82,5 +82,5 @@ export declare namespace ObservableNode {
      * @param alias Optional function to transform values before making them observable.
      * @returns A function that creates observable nodes from plain values.
      */
-    function CreateFactory(alias?: (value: any) => any | undefined): <T>(value: T) => T;
+    function CreateFactory(alias?: (value: any, reactive?: boolean) => any | undefined): <T>(value: T) => T;
 }

package/Store/Tree/observableNode.js

@@ -99,13 +99,13 @@ function CreateProxyFactory(alias) {
         switch (type) {
             case "array": {
                 const typedValue = value;
-                const proxy = CreateProxy(typedValue);
-                return proxy.map(ToJsonCopy);
+                const arrayValue = alias(typedValue, false) ?? typedValue;
+                return arrayValue.map(ToJsonCopy);
             }
             case "object": {
                 const typedValue = alias(value) ?? value;
-                const proxy = CreateProxy(typedValue);
-                const keys = Object.keys(proxy);
+                const objectValue = alias(typedValue, false) ?? typedValue;
+                const keys = Object.keys(objectValue);
                 const copy = {};
                 for (let x = 0; x < keys.length; x++)
                     copy[keys[x]] = ToJsonCopy(typedValue[keys[x]]);
@@ -116,7 +116,7 @@ function CreateProxyFactory(alias) {
         }
     }
     function ToJsonDefault(value) {
-        return value;
+        return (0, json_1.JsonDeepClone)(value);
     }
     const ToJson = alias !== undefined ? ToJsonCopy : ToJsonDefault;
     const readOnly = alias !== undefined;
@@ -465,8 +465,6 @@ var ObservableNode;
                 }
             }
             const assignValue = pathTuples[y][1];
-            // assignValue[path[y]] = JsonDeepClone(value);
-            // ObservableNode.Update(assignValue, path[y]);
             ObservableNode.Assign(assignValue, path[y], (0, json_1.JsonDeepClone)(value));
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "j-templates",
-  "version": "8.0.6",
+  "version": "8.0.7",
   "description": "j-templates",
   "license": "MIT",
   "repository": "https://github.com/TypesInCode/jTemplates",