j-templates 7.0.43 → 7.0.45

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;

package/Utils/distinctArray.d.ts

@@ -1,10 +1,10 @@
 export type DistinctArray<T> = {
-    id: (value: T) => number;
-    distinct: Array<true | undefined> | null;
+    id: (value: T) => unknown;
+    distinct: Set<unknown> | null;
     array: T[];
 };
 export declare namespace DistinctArray {
-    function Create<T>(id: (value: T) => number): 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[];
 }

package/Utils/distinctArray.js

@@ -12,22 +12,20 @@ var DistinctArray;
     }
     DistinctArray.Create = Create;
     function Push(distinctArr, value) {
-        const { id, array } = distinctArr;
-        switch (array.length) {
+        switch (distinctArr.array.length) {
             case 0:
-                array.push(value);
+                distinctArr.array.push(value);
                 break;
             case 1: {
                 if (distinctArr.distinct === null) {
-                    distinctArr.distinct = [];
-                    distinctArr.distinct[id(array[0])] = true;
+                    distinctArr.distinct = new Set([distinctArr.id(distinctArr.array[0])]);
                 }
             }
             default: {
-                const vId = id(value);
-                if (distinctArr.distinct[vId] === undefined) {
-                    distinctArr.distinct[vId] = true;
-                    array.push(value);
+                const vId = distinctArr.id(value);
+                if (!distinctArr.distinct.has(vId)) {
+                    distinctArr.distinct.add(vId);
+                    distinctArr.array.push(value);
                 }
             }
         }

package/Utils/thread.js

@@ -19,7 +19,7 @@ function timeRemaining() {
 function createDeadline() {
     return {
         end: Date.now() + workTimeMs,
-        timeRemaining
+        timeRemaining,
     };
 }
 function ProcessQueue(deadline = createDeadline()) {
@@ -49,7 +49,9 @@ function DoWork(ctx, deadline = createDeadline()) {
     threadContext = ctx;
     const async = ctx.async;
     let callback;
-    while (async === ctx.async && deadline.timeRemaining() > 0 && (callback = list_1.List.Pop(ctx.workList)))
+    while (async === ctx.async &&
+        deadline.timeRemaining() > 0 &&
+        (callback = list_1.List.Pop(ctx.workList)))
         Invoke(ctx, callback);
     if (ctx.workList.size > 0)
         ScheduleWork(ctx);
@@ -59,7 +61,7 @@ function CreateContext() {
     return {
         async: false,
         workEndNode: null,
-        workList: list_1.List.Create()
+        workList: list_1.List.Create(),
     };
 }
 function ScheduleCallback(callback, before, async) {
@@ -89,7 +91,9 @@ function After(callback) {
 }
 function Callback(callback) {
     return function (a, b, c, d) {
-        Schedule(function () { callback(a, b, c, d); });
+        Schedule(function () {
+            callback(a, b, c, d);
+        });
     };
 }
 var inSynchCallback = false;
@@ -109,7 +113,7 @@ function Thread(callback) {
         Synch(callback);
 }
 function ThreadAsync(callback) {
-    return new Promise(resolve => Thread(function (async) {
+    return new Promise((resolve) => Thread(function (async) {
         callback(async);
         Thread(resolve);
     }));

package/package.json

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