j-templates 7.0.41 → 7.0.43

package/Node/vNode.js

@@ -2,7 +2,6 @@
 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");
@@ -153,18 +152,20 @@ 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);
-    if (dataIsAsync) {
-        const dataScope = Store_1.ObservableScope.Create(data);
-        vnode.scopes.push(dataScope);
-        data = function () {
-            return Store_1.ObservableScope.Value(dataScope);
-        };
-    }
+    const dataScope = Store_1.ObservableScope.Create(data);
+    data = function () {
+        const result = Store_1.ObservableScope.Value(dataScope);
+        if (!result)
+            return [];
+        if (Array.isArray(result))
+            return result;
+        return [result];
+    };
     const nodeList = list_1.List.Create();
-    const scope = Store_1.ObservableScope.Create(WrapChildren(vnode.injector, children, ToArray(data), nodeList));
+    const scope = Store_1.ObservableScope.Create(WrapChildren(vnode.injector, children, data, nodeList));
     Store_1.ObservableScope.OnDestroyed(scope, function () {
         DestroyNodeList(nodeList);
+        Store_1.ObservableScope.Destroy(dataScope);
     });
     return scope;
 }
@@ -196,6 +197,8 @@ function WrapChildren(injector, children, data, nodeList) {
                             vNode.DestroyAll(existingNode.data.nodes);
                             existingNode.data.nodes = Store_1.ObservableScope.Value(existingNode.data.scope);
                         }
+                        else
+                            Store_1.ObservableScope.Touch(existingNode.data.scope);
                     }
                     else {
                         nodeListMap.delete(data);
@@ -275,16 +278,6 @@ function UpdateChildren(vnode, init = false, skipInit = false) {
         });
     });
 }
-function ToArray(callback) {
-    return function (...args) {
-        const result = callback(...args);
-        if (Array.isArray(result))
-            return result;
-        if (!result)
-            return [];
-        return [result];
-    };
-}
 function ScheduledAssignment(assign) {
     let scheduled = false;
     return function (scope) {

package/package.json

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