j-templates 7.0.57 → 7.0.59

package/Node/vNode.js

@@ -2,7 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.vNode = void 0;
 const Store_1 = require("../Store");
+const observableScope_1 = require("../Store/Tree/observableScope");
 const emitter_1 = require("../Utils/emitter");
+const functions_1 = require("../Utils/functions");
 const injector_1 = require("../Utils/injector");
 const thread_1 = require("../Utils/thread");
 const nodeConfig_1 = require("./nodeConfig");
@@ -153,48 +155,45 @@ function InitNode(vnode) {
     UpdateChildren(vnode, true, !!childrenArray);
 }
 function Children(vnode, children, data) {
-    const childrenScope = CreateChildrenScope(vnode, children, data);
-    vnode.scopes.push(childrenScope);
-    Store_1.ObservableScope.Watch(childrenScope, CreateScheduledCallback(function (scope) {
-        if (vnode.destroyed)
-            return;
-        const startChildren = vnode.children;
-        AssignChildren(vnode, scope);
-        startChildren !== vnode.children && UpdateChildren(vnode);
-    }));
-    AssignChildren(vnode, childrenScope);
+    const [childNodes, childrenScope] = CreateChildrenScope(vnode, children, data);
+    if (childrenScope) {
+        vnode.scopes.push(childrenScope);
+        Store_1.ObservableScope.Watch(childrenScope, CreateScheduledCallback(function (scope) {
+            if (vnode.destroyed)
+                return;
+            const startChildren = vnode.children;
+            const newChildren = Store_1.ObservableScope.Value(scope);
+            if (startChildren !== newChildren) {
+                vnode.children = newChildren;
+                UpdateChildren(vnode);
+            }
+        }));
+    }
+    vnode.children = childNodes;
+}
+function AssignChildren(vnode, childrenScope) {
+    const children = Store_1.ObservableScope.Peek(childrenScope);
+    vnode.children = children;
 }
 const DEFAULT_DATA = [undefined];
 function DefaultData() {
     return DEFAULT_DATA;
 }
-function CreateChildrenScope(vnode, children, data) {
-    let dataScope;
-    if (data !== undefined) {
-        dataScope = Store_1.ObservableScope.Create(data);
+function CreateChildrenScope(vnode, children, data = DefaultData) {
+    if ((0, functions_1.IsAsync)(data)) {
+        const asyncData = data;
         data = function () {
-            const result = Store_1.ObservableScope.Value(dataScope);
-            if (!result)
-                return [];
-            if (Array.isArray(result))
-                return result;
-            return [result];
+            return (0, observableScope_1.CalcScope)(async function () {
+                return asyncData();
+            });
         };
     }
-    else
-        data = DefaultData;
-    const scope = Store_1.ObservableScope.Create(WrapChildren(vnode.injector, children, data));
-    dataScope &&
-        Store_1.ObservableScope.OnDestroyed(scope, function () {
-            Store_1.ObservableScope.Destroy(dataScope);
-            return true;
-        });
-    return scope;
+    return Store_1.ObservableScope.CreateIf(WrapChildren(vnode.injector, children, data));
 }
 function WrapChildren(injector, children, data) {
     let nodeArray = [];
     return function () {
-        const nextData = data();
+        const nextData = ToArray(data());
         switch (nextData.length) {
             case 0: {
                 for (let x = 0; x < nodeArray.length; x++) {
@@ -213,6 +212,13 @@ function WrapChildren(injector, children, data) {
         return nodeArray;
     };
 }
+function ToArray(result) {
+    if (!result)
+        return [];
+    if (Array.isArray(result))
+        return result;
+    return [result];
+}
 function EvaluateNextNodesSmall(injector, getNextChildren, nextData, nodeArray) {
     if (nextData === DEFAULT_DATA) {
         const nextChildren = injector_1.Injector.Scope(injector, getNextChildren, nextData[0]);
@@ -321,10 +327,6 @@ function CreateNodeArray(children, previousChildren) {
     }
     return [children];
 }
-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;

package/Store/Store/store.d.ts

@@ -4,7 +4,8 @@ export declare class Store {
     private rootMap;
     private createNode;
     constructor(keyFunc?: (value: any) => string | undefined);
-    Get<O>(id: string, defaultValue?: O): O | undefined;
+    Get<O>(id: string): O | undefined;
+    Get<O>(id: string, defaultValue: O): O;
     protected UpdateRootMap(results: JsonDiffResult): void;
     private UpdateRootObject;
 }

package/package.json

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