j-templates 7.0.32 → 7.0.34

package/DOM/createPropertyAssignment.d.ts

@@ -1,5 +1,7 @@
 export declare function CreateNodeValueAssignment(target: HTMLElement): (value: string) => void;
-export declare function CreatePropertyAssignment(target: any): (next: {
+export declare function CreatePropertyAssignment(target: any): ((next: {
+    nodeValue: string;
+}) => void) | ((next: {
     [prop: string]: any;
-}) => void;
+}) => void);
 export declare function AssignProperties(target: any, next: any): void;

package/DOM/createPropertyAssignment.js

@@ -52,6 +52,11 @@ function GetAssignmentFunction(path) {
     }
 }
 function CreatePropertyAssignment(target) {
+    if (target.nodeType === Node.TEXT_NODE) {
+        return function (next) {
+            AssignNodeValue(target, next.nodeValue);
+        };
+    }
     const last = [
         ["", null, null],
     ];

package/Node/vNode.js

@@ -6,10 +6,6 @@ const injector_1 = require("../Utils/injector");
 const list_1 = require("../Utils/list");
 const thread_1 = require("../Utils/thread");
 const nodeConfig_1 = require("./nodeConfig");
-const DEFAULT_VNODE_ARRAY = [undefined];
-function DEFAULT_VNODE_DATA() {
-    return DEFAULT_VNODE_ARRAY;
-}
 var vNode;
 (function (vNode) {
     function Create(definition) {
@@ -17,7 +13,7 @@ var vNode;
             definition,
             type: definition.type,
             injector: injector_1.Injector.Current() ?? new injector_1.Injector(),
-            node: null,
+            node: definition.node ?? null,
             children: null,
             destroyed: false,
             component: null,
@@ -74,7 +70,7 @@ var vNode;
 })(vNode || (exports.vNode = vNode = {}));
 function InitNode(vnode) {
     const { type, namespace, props, attrs, on, data, componentConstructor, children, childrenArray, } = vnode.definition;
-    const node = (vnode.node = nodeConfig_1.NodeConfig.createNode(type, namespace));
+    const node = (vnode.node = vnode.definition.node ?? nodeConfig_1.NodeConfig.createNode(type, namespace));
     vnode.definition = null;
     if (props) {
         const assignProperties = nodeConfig_1.NodeConfig.createPropertyAssignment(node);
@@ -138,16 +134,12 @@ function InitNode(vnode) {
         vNode.InitAll(vnode.children);
     }
     else if (children) {
-        Children(vnode, children, data ? ToArray(data) : DEFAULT_VNODE_DATA);
+        Children(vnode, children, data);
     }
     UpdateChildren(vnode, true, !!childrenArray);
 }
 function Children(vnode, children, data) {
-    const nodeList = list_1.List.Create();
-    const childrenScope = Store_1.ObservableScope.Create(WrapChildren(vnode.injector, children, data, nodeList));
-    Store_1.ObservableScope.OnDestroyed(childrenScope, function () {
-        DestroyNodeList(nodeList);
-    });
+    const childrenScope = CreateChildrenScope(vnode, children, data);
     vnode.scopes.push(childrenScope);
     Store_1.ObservableScope.Watch(childrenScope, CreateScheduledCallback(function (scope) {
         if (vnode.destroyed)
@@ -157,28 +149,22 @@ function Children(vnode, children, data) {
     }));
     AssignChildren(vnode, childrenScope);
 }
-function AssignChildren(vnode, childrenScope) {
-    const children = Store_1.ObservableScope.Value(childrenScope);
-    switch (typeof children) {
-        case 'string': {
-            if (vnode.children?.[0]?.type !== 'text') {
-                vnode.children && vNode.DestroyAll(vnode.children);
-                const node = injector_1.Injector.Scope(vnode.injector, vNode.Create, {
-                    type: "text",
-                    namespace: null,
-                    props() {
-                        return { nodeValue: Store_1.ObservableScope.Value(childrenScope) };
-                    },
-                });
-                vnode.children = [node];
-            }
-            break;
-        }
-        default: {
-            vnode.children = Array.isArray(children) ? children : [children];
-            break;
-        }
-    }
+function CreateChildrenScope(vnode, children, data) {
+    if (data === undefined)
+        return Store_1.ObservableScope.Create(WrapStaticChildren(vnode, children));
+    const nodeList = list_1.List.Create();
+    const scope = Store_1.ObservableScope.Create(WrapChildren(vnode.injector, children, ToArray(data), nodeList));
+    Store_1.ObservableScope.OnDestroyed(scope, function () {
+        DestroyNodeList(nodeList);
+    });
+    return scope;
+}
+function WrapStaticChildren(vnode, children) {
+    return function () {
+        vnode.children && vNode.DestroyAll(vnode.children);
+        const childNodes = injector_1.Injector.Scope(vnode.injector, children, undefined);
+        return CreateNodeArray(childNodes, vnode.children);
+    };
 }
 function WrapChildren(injector, children, data, nodeList) {
     return function () {
@@ -187,9 +173,6 @@ function WrapChildren(injector, children, data, nodeList) {
             case 0:
                 DestroyNodeList(nodeList);
                 return [];
-            case 1:
-                DestroyNodeList(nodeList);
-                return injector_1.Injector.Scope(injector, children, nextData[0]);
             default: {
                 const nodeListMap = list_1.List.ToListMap(nodeList, GetData);
                 const nextNodeList = list_1.List.Create();
@@ -209,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,
@@ -234,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);
@@ -244,6 +232,10 @@ function DestroyNodeList(nodeList) {
 function GetData(data) {
     return data.data;
 }
+function AssignChildren(vnode, childrenScope) {
+    const children = Store_1.ObservableScope.Peek(childrenScope);
+    vnode.children = children;
+}
 function UpdateChildren(vnode, init = false, skipInit = false) {
     if (!vnode.children)
         return;
@@ -252,7 +244,7 @@ function UpdateChildren(vnode, init = false, skipInit = false) {
         if (vnode.destroyed || children !== vnode.children)
             return;
         for (let x = 0; !skipInit && x < children.length; x++)
-            if (children[x].node === null) {
+            if (children[x].definition) {
                 const childNode = children[x];
                 (0, thread_1.Schedule)(function () {
                     if (vnode.destroyed || children !== vnode.children)

package/Node/vNode.types.d.ts

@@ -25,6 +25,7 @@ export type vNode = {
 };
 export type vNodeDefinition<P = HTMLElement, E = HTMLElementEventMap, T = never> = {
     type: string;
+    node?: Node;
     namespace: string | null;
     props?: FunctionOr<RecursivePartial<P>>;
     attrs?: FunctionOr<{

package/package.json

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