j-templates 7.0.33 → 7.0.35

package/Node/vNode.js

@@ -2,6 +2,7 @@
 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");
@@ -152,8 +153,10 @@ 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);
     const nodeList = list_1.List.Create();
     const scope = Store_1.ObservableScope.Create(WrapChildren(vnode.injector, children, ToArray(data), nodeList));
+    scope.async = dataIsAsync;
     Store_1.ObservableScope.OnDestroyed(scope, function () {
         DestroyNodeList(nodeList);
     });
@@ -162,7 +165,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 +195,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 +213,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 +237,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/Store/Tree/observableScope.js

@@ -5,6 +5,7 @@ exports.CalcScope = CalcScope;
 const array_1 = require("../../Utils/array");
 const distinctArray_1 = require("../../Utils/distinctArray");
 const emitter_1 = require("../../Utils/emitter");
+const functions_1 = require("../../Utils/functions");
 class ObservableScopeValue {
     get Value() {
         return ObservableScope.Value(this.scope);
@@ -74,7 +75,7 @@ function CalcScope(callback) {
             getFunction: valueFunction,
             value: null,
             promise: null,
-            async: valueFunction[Symbol.toStringTag] === "AsyncFunction",
+            async: (0, functions_1.IsAsync)(valueFunction),
             dirty: true,
             emitter: emitter_1.Emitter.Create(),
             emitters: null,

package/Utils/functions.d.ts

@@ -0,0 +1 @@
+export declare function IsAsync(func: Function): boolean;

package/Utils/functions.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.IsAsync = IsAsync;
+function IsAsync(func) {
+    return func[Symbol.toStringTag] === "AsyncFunction";
+}

package/package.json

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