j-templates 7.0.44 → 7.0.46

package/Store/Tree/observableNode.d.ts

@@ -3,6 +3,7 @@ export declare const IS_OBSERVABLE_NODE = "____isObservableNode";
 export declare const GET_OBSERVABLE_VALUE = "____getObservableValue";
 export declare const GET_TO_JSON = "toJSON";
 export declare namespace ObservableNode {
+    function BypassProxy(value: boolean): void;
     function Create<T>(value: T): T;
     function Touch(value: unknown, prop?: string | number): void;
     function ApplyDiff(rootNode: any, diffResult: JsonDiffResult): void;

package/Store/Tree/observableNode.js

@@ -4,6 +4,7 @@ exports.ObservableNode = exports.GET_TO_JSON = exports.GET_OBSERVABLE_VALUE = ex
 const json_1 = require("../../Utils/json");
 const jsonType_1 = require("../../Utils/jsonType");
 const observableScope_1 = require("./observableScope");
+let bypassProxy = false;
 exports.IS_OBSERVABLE_NODE = "____isObservableNode";
 exports.GET_OBSERVABLE_VALUE = "____getObservableValue";
 exports.GET_TO_JSON = "toJSON";
@@ -146,6 +147,8 @@ function CreateProxyFactory(alias) {
                 const scope = scopeCache.get(array);
                 array = observableScope_1.ObservableScope.Value(scope);
                 const arrayValue = array[prop];
+                if (bypassProxy)
+                    return arrayValue;
                 if (typeof prop === "symbol")
                     return arrayValue;
                 if (typeof arrayValue === "function")
@@ -221,6 +224,8 @@ function CreateProxyFactory(alias) {
             case exports.GET_OBSERVABLE_VALUE:
                 return object;
             default: {
+                if (bypassProxy)
+                    return object[prop];
                 return GetAccessorValue(object, prop);
             }
         }
@@ -259,6 +264,10 @@ function CreateProxyFactory(alias) {
 const DefaultCreateProxy = CreateProxyFactory();
 var ObservableNode;
 (function (ObservableNode) {
+    function BypassProxy(value) {
+        bypassProxy = value;
+    }
+    ObservableNode.BypassProxy = BypassProxy;
     function Create(value) {
         return DefaultCreateProxy(value);
     }

package/Store/Tree/observableScope.js

@@ -6,6 +6,7 @@ const array_1 = require("../../Utils/array");
 const distinctArray_1 = require("../../Utils/distinctArray");
 const emitter_1 = require("../../Utils/emitter");
 const functions_1 = require("../../Utils/functions");
+const observableNode_1 = require("./observableNode");
 class ObservableScopeValue {
     get Value() {
         return ObservableScope.Value(this.scope);
@@ -65,7 +66,7 @@ function CalcScope(callback) {
     if (watchState !== null)
         watchState[1].push({
             getFunction: callback,
-            value
+            value,
         });
     return value;
 }
@@ -157,11 +158,13 @@ function CalcScope(callback) {
 function DirtyScope(scope) {
     if (scope.dirty || !scope.getFunction)
         return;
+    observableNode_1.ObservableNode.BypassProxy(true);
     let dirty = scope.calcFunctions.length === 0;
     for (let x = 0; !dirty && x < scope.calcFunctions.length; x++) {
         const calc = scope.calcFunctions[x];
         dirty = dirty || calc.value !== calc.getFunction();
     }
+    observableNode_1.ObservableNode.BypassProxy(false);
     scope.dirty = dirty;
     if (!scope.dirty)
         return;
@@ -171,10 +174,10 @@ function DirtyScope(scope) {
     else
         emitter_1.Emitter.Emit(scope.emitter, scope);
 }
-const scopeQueue = new Set();
+const scopeQueue = distinctArray_1.DistinctArray.Create();
 function ProcessScopeQueue() {
-    const scopes = Array.from(scopeQueue);
-    scopeQueue.clear();
+    const scopes = distinctArray_1.DistinctArray.Get(scopeQueue);
+    distinctArray_1.DistinctArray.Clear(scopeQueue);
     for (let x = 0; x < scopes.length; x++)
         DirtyScope(scopes[x]);
 }
@@ -182,9 +185,9 @@ function OnSet(scope) {
     if (scope.destroyed)
         return true;
     if (scope.async || scope.calcFunctions.length > 0) {
-        if (scopeQueue.size === 0)
+        if (distinctArray_1.DistinctArray.Size(scopeQueue) === 0)
             queueMicrotask(ProcessScopeQueue);
-        scopeQueue.add(scope);
+        distinctArray_1.DistinctArray.Push(scopeQueue, scope);
         return;
     }
     DirtyScope(scope);

package/Utils/distinctArray.d.ts

@@ -4,7 +4,9 @@ export type DistinctArray<T> = {
     array: T[];
 };
 export declare namespace DistinctArray {
-    function Create<T>(id: (value: T) => unknown): DistinctArray<T>;
+    function Create<T>(id?: (value: T) => unknown): DistinctArray<T>;
     function Push<T>(distinctArr: DistinctArray<T>, value: T): void;
     function Get<T>({ array }: DistinctArray<T>): T[];
+    function Size<T>(distinct: DistinctArray<T>): number;
+    function Clear<T>(distinct: DistinctArray<T>): void;
 }

package/Utils/distinctArray.js

@@ -3,11 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DistinctArray = void 0;
 var DistinctArray;
 (function (DistinctArray) {
-    function Create(id) {
+    function Create(id = (val) => val) {
         return {
             id,
             distinct: null,
-            array: []
+            array: [],
         };
     }
     DistinctArray.Create = Create;
@@ -18,7 +18,9 @@ var DistinctArray;
                 break;
             case 1: {
                 if (distinctArr.distinct === null) {
-                    distinctArr.distinct = new Set([distinctArr.id(distinctArr.array[0])]);
+                    distinctArr.distinct = new Set([
+                        distinctArr.id(distinctArr.array[0]),
+                    ]);
                 }
             }
             default: {
@@ -35,4 +37,13 @@ var DistinctArray;
         return array;
     }
     DistinctArray.Get = Get;
+    function Size(distinct) {
+        return distinct.distinct.size;
+    }
+    DistinctArray.Size = Size;
+    function Clear(distinct) {
+        distinct.array = [];
+        distinct.distinct?.clear();
+    }
+    DistinctArray.Clear = Clear;
 })(DistinctArray || (exports.DistinctArray = DistinctArray = {}));

package/package.json

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