j-templates 7.0.104 → 7.0.105

package/Node/vNode.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.vNode = void 0;
+const array_1 = require("../_not_used/array");
 const Store_1 = require("../Store");
 const observableScope_1 = require("../Store/Tree/observableScope");
 const emitter_1 = require("../Utils/emitter");
@@ -204,32 +205,18 @@ function ToArray(result) {
         return result;
     return [result];
 }
-function IsFragmentOrNull(vnode) {
-    return vnode === null || vnode.type === vNode_types_1.FRAGMENT_NODE;
-}
-function GetNode(vnode) {
-    return vnode.node;
-}
-function FlattenFragmentsRecursive(children, startIndex, result) {
-    for (let x = startIndex; x < children.length; x++) {
-        const vnode = children[x];
-        switch (vnode.type) {
-            case vNode_types_1.FRAGMENT_NODE:
-                FlattenFragmentsRecursive(vnode.children, 0, result);
-            default:
-                if (vnode.node !== null)
-                    result.push(vnode.node);
-        }
+function MapNode(vnode) {
+    switch (vnode.type) {
+        case vNode_types_1.FRAGMENT_NODE:
+            return vnode.children.flatMap(MapNode);
+        default:
+            return vnode.node;
     }
-    return result;
 }
 function CleanupChildrenArray(children) {
-    const index = children.findIndex(IsFragmentOrNull);
-    if (index < 0)
-        return children;
-    const result = children.slice(0, index).map(GetNode);
-    FlattenFragmentsRecursive(children, index, result);
-    return result;
+    const nodes = children.flatMap(MapNode);
+    (0, array_1.RemoveNulls)(nodes);
+    return nodes;
 }
 function UpdateChildren(vnode, init = false, skipInit = false) {
     if (!vnode.children)

package/_not_used/array.js

@@ -33,7 +33,8 @@ function RemoveNulls(array, startIndex = 0) {
         notNullIndex++;
         for (; notNullIndex < array.length && array[notNullIndex] === null; notNullIndex++) { }
     }
-    array.splice(nullIndex);
+    if (nullIndex < array.length)
+        array.splice(nullIndex);
 }
 function ArrayDiff(source, target) {
     if (source === target)

package/package.json

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