j-templates 7.0.42 → 7.0.44

package/Node/vNode.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.vNode = void 0;
 const Store_1 = require("../Store");
-const functions_1 = require("../Utils/functions");
 const injector_1 = require("../Utils/injector");
 const list_1 = require("../Utils/list");
 const thread_1 = require("../Utils/thread");
@@ -153,18 +152,20 @@ function Children(vnode, children, data) {
 function CreateChildrenScope(vnode, children, data) {
     if (data === undefined)
         return Store_1.ObservableScope.Create(WrapStaticChildren(vnode, children));
-    const dataIsAsync = (0, functions_1.IsAsync)(data);
-    if (dataIsAsync) {
-        const dataScope = Store_1.ObservableScope.Create(data);
-        vnode.scopes.push(dataScope);
-        data = function () {
-            return Store_1.ObservableScope.Value(dataScope);
-        };
-    }
+    const dataScope = Store_1.ObservableScope.Create(data);
+    data = function () {
+        const result = Store_1.ObservableScope.Value(dataScope);
+        if (!result)
+            return [];
+        if (Array.isArray(result))
+            return result;
+        return [result];
+    };
     const nodeList = list_1.List.Create();
-    const scope = Store_1.ObservableScope.Create(WrapChildren(vnode.injector, children, ToArray(data), nodeList));
+    const scope = Store_1.ObservableScope.Create(WrapChildren(vnode.injector, children, data, nodeList));
     Store_1.ObservableScope.OnDestroyed(scope, function () {
         DestroyNodeList(nodeList);
+        Store_1.ObservableScope.Destroy(dataScope);
     });
     return scope;
 }
@@ -277,16 +278,6 @@ function UpdateChildren(vnode, init = false, skipInit = false) {
         });
     });
 }
-function ToArray(callback) {
-    return function (...args) {
-        const result = callback(...args);
-        if (Array.isArray(result))
-            return result;
-        if (!result)
-            return [];
-        return [result];
-    };
-}
 function ScheduledAssignment(assign) {
     let scheduled = false;
     return function (scope) {

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.42",
+  "version": "7.0.44",
   "description": "j-templates",
   "license": "MIT",
   "repository": "https://github.com/TypesInCode/jTemplates",