vsn 0.1.135 → 0.1.136

package/src/AST.ts

@@ -474,19 +474,52 @@ export interface ExecutionContext {
 
 }
 
+export class TreeCache {
+    cache: Map<string, Node> = new Map<string, Node>();
+    lastUsed: Map<string, number> = new Map<string, number>();
+
+    get(code: string) {
+        if (!this.cache.has(code))
+            return null;
+
+        this.lastUsed.set(code, Date.now());
+        return this.cache.get(code);
+    }
+
+    set(code: string, node: Node) {
+        this.cache.set(code, node);
+        this.lastUsed.set(code, Date.now());
+
+        if (this.cache.size > 200) {
+            let toRemove = 20;
+            for (const [key, lastUsed] of Array.from(this.lastUsed.entries()).sort((a, b) => a[1] - b[1])) {
+                this.cache.delete(key);
+                this.lastUsed.delete(key);
+                toRemove--;
+                if (toRemove === 0)
+                    break;
+            }
+        }
+    }
+
+    has(code: string) {
+        return this.cache.has(code);
+    }
+}
+
 export class Tree {
     protected static executing: Set<ExecutionContext> = new Set<ExecutionContext>();
-    protected static cache: { [key: string]: Node } = {};
+    protected static cache: TreeCache = new TreeCache();
     protected _root: Node;
 
     constructor(
         public readonly code: string
     ) {
-        if (Tree.cache[code]) {
-            this._root = Tree.cache[code];
+        if (Tree.cache.has(code)) {
+            this._root = Tree.cache.get(code);
         } else {
             this.parse();
-            Tree.cache[code] = this._root;
+            Tree.cache.set(code, this._root);
         }
     }
 

package/src/DOM/AbstractDOM.ts

@@ -256,7 +256,10 @@ export abstract class AbstractDOM extends EventDispatcher {
     }
 
     async buildTag<T extends Tag>(element: HTMLElement, returnExisting: boolean = false, cls: any = Tag): Promise<T> {
-        if (element[Tag.TaggedVariable]) return returnExisting ? element[Tag.TaggedVariable] : null;
+        if (element[Tag.TaggedVariable]) {
+            this.removedQueued(element);
+            return returnExisting ? element[Tag.TaggedVariable] : null;
+        }
         if (element.tagName.toLowerCase() === 'slot')
             cls = SlotTag;
         else if (element.hasAttribute('slot'))
@@ -293,7 +296,7 @@ export abstract class AbstractDOM extends EventDispatcher {
 
         for (const tag of tags) {
             await tag.finalize();
-            this.queued.splice(this.queued.indexOf(tag.element), 1);
+            this.removedQueued(tag.element)
         }
 
         for (const tag of tags) {
@@ -306,6 +309,12 @@ export abstract class AbstractDOM extends EventDispatcher {
         }
     }
 
+    removedQueued(element: HTMLElement) {
+        const index = this.queued.indexOf(element);
+        if (index > -1)
+            this.queued.splice(index, 1);
+    }
+
     async buildFrom(ele: any, isRoot: boolean = false, forComponent: boolean = false): Promise<Tag[]> {
         if (isRoot) {
             this.rootElement.setAttribute('vsn-root', '');

package/src/Tag.ts

@@ -810,8 +810,10 @@ export class Tag extends DOMObject {
 
     deconstruct() {
         const dom = this.dom || DOM.instance;
-        if (dom)
+        if (dom) {
+            dom.removedQueued(this.element);
             dom.deregisterElementInRoot(this);
+        }
         this.removeAllEventHandlers();
         this.attributes.forEach(attr => attr.deconstruct());
         this.attributes.clear();

package/src/version.ts

@@ -1,2 +1,2 @@
-export const VERSION = '0.1.135';
+export const VERSION = '0.1.136';