j-templates 7.0.78 → 7.0.80

package/Node/vNode.js

@@ -182,22 +182,28 @@ function CreateChildrenScope(vnode, children, data = DefaultData) {
     return Store_1.ObservableScope.Create(WrapChildren(vnode.injector, children, data));
 }
 function WrapChildren(injector, children, data) {
-    let nodeArray = [];
+    let nodeArray;
     return function () {
-        const nextData = ToArray(data());
+        const nextData = data === DefaultData ? data() : ToArray(data());
         switch (nextData.length) {
             case 0: {
-                for (let x = 0; x < nodeArray.length; x++) {
-                    vNode.DestroyAll(nodeArray[x][1]);
-                    Store_1.ObservableScope.Destroy(nodeArray[x][2]);
+                if (nodeArray !== undefined) {
+                    for (let x = 0; x < nodeArray.length; x++) {
+                        vNode.DestroyAll(nodeArray[x][1]);
+                        Store_1.ObservableScope.Destroy(nodeArray[x][2]);
+                    }
+                    nodeArray = [];
                 }
-                nodeArray.splice(0);
+                break;
             }
             default: {
-                if (nodeArray.length < 21)
+                if (nodeArray === undefined)
+                    nodeArray = InitializeNextNodes(injector, children, nextData);
+                else if (nodeArray.length < 11)
                     nodeArray = EvaluateNextNodesSmall(injector, children, nextData, nodeArray);
                 else
                     nodeArray = EvaluateNextNodesLarge(injector, children, nextData, nodeArray);
+                break;
             }
         }
         return nodeArray;
@@ -210,54 +216,61 @@ function ToArray(result) {
         return result;
     return [result];
 }
-function EvaluateNextNodesSmall(injector, getNextChildren, nextData, nodeArray) {
-    if (nextData === DEFAULT_DATA) {
-        const nextChildren = injector_1.Injector.Scope(injector, getNextChildren, nextData[0]);
-        const children = CreateNodeArray(nextChildren);
-        for (let x = 0; x < nodeArray.length; x++) {
-            vNode.DestroyAll(nodeArray[x][1]);
-            Store_1.ObservableScope.Destroy(nodeArray[x][2]);
-        }
-        return [
-            [undefined, children, null],
-        ];
-    }
+function GetNextNodeRow(data, injector, getNextChildren, scope) {
+    scope ??=
+        data === undefined
+            ? null
+            : Store_1.ObservableScope.Create(function () {
+                const children = injector_1.Injector.Scope(injector, getNextChildren, data);
+                return CreateNodeArray(children);
+            });
+    const children = scope === null
+        ? CreateNodeArray(injector_1.Injector.Scope(injector, getNextChildren, undefined))
+        : Store_1.ObservableScope.Value(scope);
+    return [data, children, scope];
+}
+function InitializeNextNodes(injector, getNextChildren, nextData) {
     const nextNodes = new Array(nextData.length);
     for (let x = 0; x < nextData.length; x++) {
         const data = nextData[x];
-        let i = 0;
-        for (; i < nodeArray.length &&
-            (nodeArray[i] === null || nodeArray[i][0] !== data); i++) { }
-        if (i !== nodeArray.length) {
-            if (nodeArray[i][2]) {
-                const scope = nodeArray[i][2];
-                const value = scope.value;
-                const updatedValue = Store_1.ObservableScope.Value(scope);
-                if (value !== updatedValue)
-                    nodeArray[i][1] = CreateNodeArray(updatedValue);
-            }
-            nextNodes[x] = nodeArray[i];
-            nodeArray[i] = null;
-        }
-        else {
-            const scope = Store_1.ObservableScope.Create(function () {
-                return injector_1.Injector.Scope(injector, getNextChildren, data);
-            });
-            nextNodes[x] = [
-                data,
-                CreateNodeArray(Store_1.ObservableScope.Value(scope)),
-                scope,
-            ];
-        }
-    }
-    for (let x = 0; x < nodeArray.length; x++) {
-        if (nodeArray[x] !== null) {
-            vNode.DestroyAll(nodeArray[x][1]);
-            Store_1.ObservableScope.Destroy(nodeArray[x][2]);
-        }
+        nextNodes[x] = GetNextNodeRow(data, injector, getNextChildren);
     }
     return nextNodes;
 }
+function GetNextNodeRowSmall(injector, getNextChildren, nodeArray, data) {
+    let i = 0;
+    for (; i < nodeArray.length && (nodeArray[i] === null || nodeArray[i][0] !== data); i++) { }
+    if (i === nodeArray.length)
+        return GetNextNodeRow(data, injector, getNextChildren);
+    const nextNodeRow = GetNextNodeRow(data, injector, getNextChildren, nodeArray[i][2]);
+    if (nodeArray[i][1] !== nextNodeRow[1])
+        vNode.DestroyAll(nodeArray[i][1]);
+    nodeArray[i] = null;
+    return nextNodeRow;
+}
+function EvaluateNextNodesSmall(injector, getNextChildren, nextData, nodeArray) {
+    const nextNodes = new Array(nextData.length);
+    for (let x = 0; x < nextData.length; x++)
+        nextNodes[x] = GetNextNodeRowSmall(injector, getNextChildren, nodeArray, nextData[x]);
+    return nextNodes;
+}
+function GetNextNodeRowLarge(injector, getNextChildren, nodeRowMap, data) {
+    const currentChildren = nodeRowMap.get(data);
+    let currentChildIndex = currentChildren ? currentChildren.length - 1 : -1;
+    for (; currentChildIndex >= 0 && currentChildren[currentChildIndex] === null; currentChildIndex--) { }
+    if (currentChildIndex >= 0) {
+        const nodeRow = currentChildren[currentChildIndex];
+        if (currentChildIndex === 0)
+            nodeRowMap.delete(data);
+        else
+            currentChildren[currentChildIndex] = null;
+        const nextNodeRow = GetNextNodeRow(data, injector, getNextChildren, nodeRow[2]);
+        if (nodeRow[1] !== nextNodeRow[1])
+            vNode.DestroyAll(nodeRow[1]);
+        return nextNodeRow;
+    }
+    return GetNextNodeRow(data, injector, getNextChildren);
+}
 function EvaluateNextNodesLarge(injector, getNextChildren, nextData, nodeArray) {
     const nextNodes = new Array(nextData.length);
     const dataMap = new Map();
@@ -267,34 +280,7 @@ function EvaluateNextNodesLarge(injector, getNextChildren, nextData, nodeArray)
         dataMap.set(nodeArray[x][0], arr);
     }
     for (let x = 0; x < nextData.length; x++) {
-        const data = nextData[x];
-        const currentChildren = dataMap.get(data);
-        let currentChildIndex = currentChildren ? currentChildren.length - 1 : -1;
-        for (; currentChildIndex >= 0 && currentChildren[currentChildIndex] === null; currentChildIndex--) { }
-        if (currentChildIndex !== -1) {
-            const currentChild = currentChildren[currentChildIndex];
-            currentChildren[currentChildIndex] = null;
-            const scope = currentChild[2];
-            const value = scope.value;
-            const updatedValue = Store_1.ObservableScope.Value(scope);
-            if (value !== updatedValue) {
-                vNode.DestroyAll(currentChild[1]);
-                currentChild[1] = CreateNodeArray(updatedValue);
-            }
-            nextNodes[x] = currentChild;
-            if (currentChildIndex === 0)
-                dataMap.delete(data);
-        }
-        else {
-            const scope = Store_1.ObservableScope.Create(function () {
-                return injector_1.Injector.Scope(injector, getNextChildren, data);
-            });
-            nextNodes[x] = [
-                data,
-                CreateNodeArray(Store_1.ObservableScope.Value(scope)),
-                scope,
-            ];
-        }
+        nextNodes[x] = GetNextNodeRowLarge(injector, getNextChildren, dataMap, nextData[x]);
     }
     for (const value of dataMap.values()) {
         for (let x = 0; x < value.length; x++) {

package/Node/vNode.types.d.ts

@@ -23,7 +23,11 @@ export type vElementNode = {
     definition: vNodeDefinition<any, any, any>;
     injector: Injector;
     node: Node | null;
-    children: [any, vNode[], IObservableScope<string | vNode | vNode[]> | null][] | null;
+    children: (readonly [
+        any,
+        vNode[],
+        IObservableScope<string | vNode | vNode[]> | null
+    ])[] | null;
     destroyed: boolean;
     onDestroyed: Emitter | null;
     scopes: IObservableScope<unknown>[];

package/package.json

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