vsn 0.1.122 → 0.1.123

package/src/AST.ts

@@ -415,7 +415,16 @@ export const AttributableNodes = [
     ElementAttributeNode
 ];
 
+export interface ExecutionContext {
+    scope: Scope;
+    dom: DOM;
+    tag: Tag;
+    tree: Tree;
+
+}
+
 export class Tree {
+    protected static executing: Set<ExecutionContext> = new Set<ExecutionContext>();
     protected static cache: { [key: string]: Node } = {};
     protected _root: Node;
 
@@ -438,7 +447,16 @@ export class Tree {
     }
 
     async evaluate(scope: Scope, dom: DOM, tag: Tag = null) {
-        return await this._root.evaluate(scope, dom, tag);
+        const context = {
+            scope: scope,
+            dom: dom,
+            tag: tag,
+            tree: this
+        };
+        Tree.executing.add(context);
+        const r = await this._root.evaluate(scope, dom, tag);
+        Tree.executing.delete(context);
+        return r;
     }
 
     async prepare(scope: Scope, dom: DOM, tag: Tag = null) {
@@ -463,6 +481,12 @@ export class Tree {
         }
     }
 
+    public static reprepareExecutingTrees() {
+        Tree.executing.forEach(async context => {
+            await context.tree.prepare(context.scope, context.dom, context.tag);
+        });
+    }
+
     public static tokenize(code: string): Token[] {
         const tokens: Token[] = [];
         if (!code || code.length === 0)

package/src/DOM.ts

@@ -313,7 +313,7 @@ export class DOM extends EventDispatcher {
         const found: Element[] = [];
 
         for (const element of elements) {
-            if (element[Tag.TaggedVariable]) {
+            if (element && element[Tag.TaggedVariable]) {
                 tags.push(element[Tag.TaggedVariable]);
                 found.push(element);
             }
@@ -337,7 +337,7 @@ export class DOM extends EventDispatcher {
     }
 
     async getTagForElement(element: Element, create: boolean = false, forComponent: boolean = false) {
-        if (element[Tag.TaggedVariable])
+        if (element && element[Tag.TaggedVariable])
             return element[Tag.TaggedVariable];
 
         if (element && create) {

package/src/Tag.ts

@@ -405,7 +405,9 @@ export class Tag extends DOMObject {
                 this.element.innerText = value;
             else if (key === '@html') {
                 this.element.innerHTML = value;
-                DOM.instance.buildFrom(this.element);
+                DOM.instance.buildFrom(this.element).then((tag) => {
+                    Tree.reprepareExecutingTrees();
+                });
             } else if (key === '@value')
                 this.value = value;
             else if (key === '@class' && value) {

package/src/version.ts

@@ -1,2 +1,2 @@
-export const VERSION = '0.1.122';
+export const VERSION = '0.1.123';