j-templates 7.0.33 → 7.0.34

package/Node/vNode.js

@@ -162,7 +162,8 @@ function CreateChildrenScope(vnode, children, data) {
 function WrapStaticChildren(vnode, children) {
     return function () {
         vnode.children && vNode.DestroyAll(vnode.children);
-        return injector_1.Injector.Scope(vnode.injector, children, undefined);
+        const childNodes = injector_1.Injector.Scope(vnode.injector, children, undefined);
+        return CreateNodeArray(childNodes, vnode.children);
     };
 }
 function WrapChildren(injector, children, data, nodeList) {
@@ -191,14 +192,7 @@ function WrapChildren(injector, children, data, nodeList) {
                         nodeListMap.delete(data);
                         const childrenScope = Store_1.ObservableScope.Create(function () {
                             const childNodes = injector_1.Injector.Scope(injector, children, data);
-                            const nodes = typeof childNodes === 'string' ? [vNode.Create({
-                                    type: 'text',
-                                    namespace: null,
-                                    props: {
-                                        nodeValue: childNodes
-                                    }
-                                })] : Array.isArray(childNodes) ? childNodes : [childNodes];
-                            return nodes;
+                            return CreateNodeArray(childNodes);
                         });
                         list_1.List.Add(nextNodeList, {
                             data,
@@ -216,6 +210,18 @@ function WrapChildren(injector, children, data, nodeList) {
         }
     };
 }
+function CreateNodeArray(children, previousChildren) {
+    if (Array.isArray(children))
+        return children;
+    return typeof children === 'string' ? [vNode.Create({
+            type: 'text',
+            namespace: null,
+            node: previousChildren?.[0]?.type === 'text' && previousChildren[0].node || undefined,
+            props: {
+                nodeValue: children
+            }
+        })] : [children];
+}
 function DestroyNodeList(nodeList) {
     for (let node = nodeList.head; node !== null; node = node.next) {
         vNode.DestroyAll(node.data.nodes);
@@ -228,23 +234,7 @@ function GetData(data) {
 }
 function AssignChildren(vnode, childrenScope) {
     const children = Store_1.ObservableScope.Peek(childrenScope);
-    switch (typeof children) {
-        case 'string': {
-            vnode.children = [vNode.Create({
-                    type: 'text',
-                    namespace: null,
-                    node: vnode.children?.[0]?.type === 'text' && vnode.children[0].node || undefined,
-                    props: {
-                        nodeValue: children
-                    }
-                })];
-            break;
-        }
-        default: {
-            vnode.children = Array.isArray(children) ? children : [children];
-            break;
-        }
-    }
+    vnode.children = children;
 }
 function UpdateChildren(vnode, init = false, skipInit = false) {
     if (!vnode.children)

package/package.json

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