vsn 0.1.137 → 0.1.139

package/src/AST/ModifierNode.ts

@@ -18,7 +18,7 @@ export class ModifierNode extends Node implements TreeNode {
         return null;
     }
 
-    public async evaluate(scope: Scope, dom: DOM, tag: Tag = null) {
+    protected async _evaluate(scope: Scope, dom: DOM, tag: Tag = null) {
         return null;
     }
 

package/src/AST/NamedStackNode.ts

@@ -32,7 +32,7 @@ export class NamedStackNode extends Node implements TreeNode {
         ]
     }
 
-    public async evaluate(scope: Scope, dom: DOM, tag: Tag = null) {
+    protected async _evaluate(scope: Scope, dom: DOM, tag: Tag = null) {
         if (scope instanceof FunctionScope) { // NamedStackNode doesn't work with FunctionScope
             scope = scope.parentScope;
         }

package/src/AST/Node.ts

@@ -1,6 +1,6 @@
 import {Scope} from "../Scope";
 import {DOM} from "../DOM";
-import {Tag} from "../Tag";
+import {Tag, TagState} from "../Tag";
 import {Token, TokenType, TreeNode} from "../AST";
 import {Modifiers} from "../Modifiers";
 
@@ -14,7 +14,14 @@ export abstract class Node implements TreeNode {
     protected childNodes: Node[];
     protected nodeCache: {[key: string]: Node[]} = {};
     public readonly modifiers: Modifiers = new Modifiers();
-    abstract evaluate(scope: Scope, dom: DOM, tag?: Tag);
+
+    async evaluate(scope: Scope, dom: DOM, tag?: Tag): Promise<any> {
+        if (scope.isGarbage || (tag && tag.state === TagState.Deconstructed))
+            return;
+        return await this._evaluate(scope, dom, tag);
+    }
+
+    protected async _evaluate(scope: Scope, dom: DOM, tag?: Tag): Promise<any> {}
 
     isPreparationRequired(): boolean {
         if (this.requiresPrep)

package/src/AST/NotNode.ts

@@ -11,7 +11,7 @@ export class NotNode extends Node implements TreeNode {
         super();
     }
 
-    public async evaluate(scope: Scope, dom: DOM, tag: Tag = null) {
+    protected async _evaluate(scope: Scope, dom: DOM, tag: Tag = null) {
         const flipping = await this.toFlip.evaluate(scope, dom, tag);
         return !flipping;
     }

package/src/AST/ObjectNode.ts

@@ -16,7 +16,7 @@ export class ObjectNode extends Node implements TreeNode {
         return new Array(...this.values);
     }
 
-    async evaluate(scope: Scope, dom: DOM, tag: Tag = null) {
+    protected async _evaluate(scope: Scope, dom: DOM, tag: Tag = null) {
         const obj: Scope = new Scope();
         for (let i = 0; i < this.values.length; i++) {
             const key = this.keys[i];

package/src/AST/RootScopeMemberNode.ts

@@ -18,7 +18,7 @@ export class RootScopeMemberNode<T = any> extends ScopeNodeAbstract implements T
         ]
     }
 
-    async evaluate(scope: Scope, dom: DOM, tag: Tag = null) {
+    protected async _evaluate(scope: Scope, dom: DOM, tag: Tag = null) {
         const name = await this.name.evaluate(scope, dom, tag);
         await this.applyModifiers(name, scope, dom, tag);
         const value = scope.get(name);

package/src/AST/ScopeMemberNode.ts

@@ -25,7 +25,7 @@ export class ScopeMemberNode extends ScopeNodeAbstract implements TreeNode {
         ]
     }
 
-    async evaluate(scope: Scope, dom: DOM, tag: Tag = null) {
+    protected async _evaluate(scope: Scope, dom: DOM, tag: Tag = null) {
         let scopes = [];
         const values = [];
         if (this.scope instanceof ElementQueryNode) {

package/src/AST/StringFormatNode.ts

@@ -16,7 +16,7 @@ export class StringFormatNode extends Node implements TreeNode {
         return this.segments && Object.values(this.segments) || [];
     }
 
-    async evaluate(scope: Scope, dom: DOM, tag?: Tag) {
+    protected async _evaluate(scope: Scope, dom: DOM, tag?: Tag) {
         let value = this.value;
         for (const key in this.segments) {
             const segment = this.segments[key];

package/src/AST/WithNode.ts

@@ -23,7 +23,7 @@ export class WithNode extends Node implements TreeNode {
         ]
     }
 
-    public async evaluate(scope: Scope, dom: DOM, tag: Tag = null) {
+    protected async _evaluate(scope: Scope, dom: DOM, tag: Tag = null) {
         const context = await this.context.evaluate(scope, dom, tag);
         let tags = [];
         if (context instanceof TagList) {

package/src/AST/XHRNode.ts

@@ -22,7 +22,7 @@ export class XHRNode extends Node implements TreeNode {
         return nodes;
     }
 
-    async evaluate(scope: Scope, dom: DOM, tag?: Tag) {
+    protected async _evaluate(scope: Scope, dom: DOM, tag?: Tag) {
         let url = await this.url.evaluate(scope, dom, tag);
         let method: string;
         let data = this.left ? await this.left.evaluate(scope, dom, tag) : {};

package/src/DOM/DOMObject.ts

@@ -71,7 +71,6 @@ export abstract class DOMObject extends EventDispatcher {
         if (this.element) {
             this.element[Tag.TaggedVariable] = null;
             this.element[ClassNode.ClassesVariable] = null;
-            (this as any).element = null;
         }
         super.deconstruct();
     }

package/src/EventDispatcher.ts

@@ -51,8 +51,9 @@ export class EventDispatcher  {
     deconstruct() {
         this.dispatch('deconstruct', this);
         const sourceIndex = EventDispatcher.sources.indexOf(this);
-        if (sourceIndex > -1)
+        if (sourceIndex > -1) {
             EventDispatcher.sources.splice(sourceIndex, 1);
+        }
 
         for (const k in this._listeners) {
             for (const cb of this._listeners[k]) {

package/src/Scope/ScopeDataAbstract.ts

@@ -25,7 +25,7 @@ export class ScopeDataAbstract extends EventDispatcher {
     deconstruct() {
         super.deconstruct();
         this._lastData = null;
-        for (const prop of this.__properties__) {
+        for (const prop of Array.from(this.__properties__)) {
             this.removeProperty(prop);
         }
         this.__properties__.length = 0;
@@ -39,6 +39,7 @@ export class ScopeDataAbstract extends EventDispatcher {
         if (this.hasProperty(name)) {
             return this.getProperty(name);
         }
+
         config = config || {};
         const instance = new propertyType(config.default, config);
         const propDesc = Object.getOwnPropertyDescriptor(this, name);

package/src/Scope.ts

@@ -29,12 +29,17 @@ export class Scope extends ScopeAbstract {
     deconstruct() {
         super.deconstruct();
         this.collectGarbage(true);
+
         this.wrapped = null;
         if (this._data)
             this._data.deconstruct();
         this._data = null;
+
+        for (const child of this.children) {
+            child.deconstruct();
+        }
         this.children.length = 0;
-        this._parentScope = null;
+        this.parentScope = null;
     }
 
     public get data(): ScopeData {

package/src/Tag.ts

@@ -19,6 +19,7 @@ export enum TagState {
     AttributesExtracted,
     AttributesConnected,
     Built,
+    Deconstructed,
 }
 
 export class Tag extends DOMObject {
@@ -412,6 +413,7 @@ export class Tag extends DOMObject {
     }
 
     public setElementAttribute(key: string, value: any) {
+        if (!this.element) return null;
         if (this.isMagicAttribute(key)) {
             if (key === '@text')
                 this.element.innerText = value;
@@ -441,6 +443,7 @@ export class Tag extends DOMObject {
     }
 
     public getElementAttribute(key: string): any {
+        if (!this.element) return null;
         if (this.isMagicAttribute(key)) {
             if (key === '@text')
                 return this.element.innerText;
@@ -620,6 +623,9 @@ export class Tag extends DOMObject {
     }
 
     protected handleEvent(eventType: string, e) {
+        if (this.state === TagState.Deconstructed)
+            return
+
         if (e)
             e.stopPropagation();
 
@@ -809,6 +815,7 @@ export class Tag extends DOMObject {
     }
 
     deconstruct() {
+        this._state = TagState.Deconstructed
         const dom = this.dom || DOM.instance;
         if (dom) {
             dom.removedQueued(this.element);

package/src/version.ts

@@ -1,2 +1,2 @@
-export const VERSION = '0.1.137';
+export const VERSION = '0.1.139';