vsn 0.1.124 → 0.1.126

package/dist/helpers/VisionHelper.js.map

@@ -1 +1 @@
-{"version":3,"file":"VisionHelper.js","sourceRoot":"","sources":["../../src/helpers/VisionHelper.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"VisionHelper.js","sourceRoot":"","sources":["../../src/helpers/VisionHelper.ts"],"names":[],"mappings":"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"}

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "0.1.124";
+export declare const VERSION = "0.1.126";

package/dist/version.js

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VERSION = void 0;
-exports.VERSION = '0.1.124';
+exports.VERSION = '0.1.126';
 //# sourceMappingURL=version.js.map

package/dist/vsn.js

@@ -68,7 +68,6 @@ var Registry_1 = require("./Registry");
 var Configuration_1 = require("./Configuration");
 var VisionHelper_1 = require("./helpers/VisionHelper");
 var AST_1 = require("./AST");
-var Query_1 = require("./Query");
 var EventDispatcher_1 = require("./EventDispatcher");
 var DynamicScopeData_1 = require("./Scope/DynamicScopeData");
 var version_1 = require("./version");
@@ -79,6 +78,7 @@ var Vision = /** @class */ (function (_super) {
         var _this = _super.call(this) || this;
         _this.registry = Registry_1.Registry.instance;
         _this.config = Configuration_1.Configuration.instance;
+        document.ondragover = function (e) { return e.cancelable && e.preventDefault(); }; // Allow dragging over document
         Registry_1.Registry.instance.tags.on('register', _this.defineComponent, _this);
         if (VisionHelper_1.VisionHelper.document) {
             document.addEventListener("DOMContentLoaded", _this.setup.bind(_this));
@@ -90,13 +90,7 @@ var Vision = /** @class */ (function (_super) {
         _this.registry.functions.register('warn', console.warn);
         _this.registry.functions.register('error', console.error);
         _this.registry.functions.register('info', console.info);
-        _this.registry.functions.register('wait', function (seconds) { return __awaiter(_this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                return [2 /*return*/, new Promise(function (resolve) {
-                        setTimeout(resolve, seconds * 1000);
-                    })];
-            });
-        }); });
+        _this.registry.functions.register('wait', VisionHelper_1.VisionHelper.wait);
         _this.registry.models.register('Object', Object);
         _this.registry.controllers.register('WrappedArray', WrappedArray_1.WrappedArray);
         _this.registry.controllers.register('Data', DynamicScopeData_1.DynamicScopeData);
@@ -105,7 +99,7 @@ var Vision = /** @class */ (function (_super) {
             window['Registry'] = Registry_1.Registry;
             window['vision'] = window['vsn'] = _this;
             window['Tree'] = AST_1.Tree;
-            window['$'] = Query_1.Query;
+            window['$'] = _this.exec.bind(_this);
             VisionHelper_1.VisionHelper.window.dispatchEvent(new Event('vsn'));
         }
         return _this;

package/dist/vsn.js.map

@@ -1 +1 @@
-{"version":3,"file":"vsn.js","sourceRoot":"","sources":["../src/vsn.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"vsn.js","sourceRoot":"","sources":["../src/vsn.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAA0B;AAC1B,qDAAkD;AAClD,uCAAoC;AACpC,iDAA8C;AAC9C,uDAAoD;AACpD,6BAA2B;AAC3B,qDAAkD;AAClD,6DAA0D;AAE1D,qCAAkC;AAClC,6BAA2B;AAE3B;IAA4B,0BAAe;IAMvC;QAAA,YACI,iBAAO,SA4BV;QAhCe,cAAQ,GAAG,mBAAQ,CAAC,QAAQ,CAAC;QAC7B,YAAM,GAAkB,6BAAa,CAAC,QAAQ,CAAC;QAI3D,QAAQ,CAAC,UAAU,GAAG,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,cAAc,EAAE,EAAlC,CAAkC,CAAC,CAAE,+BAA+B;QACjG,mBAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,UAAU,EAAE,KAAI,CAAC,eAAe,EAAE,KAAI,CAAC,CAAC;QAClE,IAAI,2BAAY,CAAC,QAAQ,EAAE;YACvB,QAAQ,CAAC,gBAAgB,CACrB,kBAAkB,EAClB,KAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAI,CAAC,CACxB,CAAC;SACL;aAAM;YACH,OAAO,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;SAChD;QACD,KAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;QACrD,KAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QACvD,KAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;QACzD,KAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QACvD,KAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,2BAAY,CAAC,IAAI,CAAC,CAAC;QAC5D,KAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAChD,KAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,cAAc,EAAE,2BAAY,CAAC,CAAC;QACjE,KAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAM,EAAE,mCAAgB,CAAC,CAAC;QAE7D,IAAI,2BAAY,CAAC,MAAM,EAAE;YACrB,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC;YAC1B,MAAM,CAAC,UAAU,CAAC,GAAG,mBAAQ,CAAC;YAC9B,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,KAAI,CAAC;YACxC,MAAM,CAAC,MAAM,CAAC,GAAG,UAAI,CAAC;YACtB,MAAM,CAAC,GAAG,CAAC,GAAG,KAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAI,CAAC,CAAC;YACnC,2BAAY,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;SACvD;;IACL,CAAC;IAES,gCAAe,GAAzB,UAA0B,IAAI,EAAE,GAAG;QAC/B,IAAI,SAAG,CAAC,QAAQ,CAAC,KAAK,EAAE;YACpB,cAAc,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;SACpC;aAAM;YACH,SAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE;gBACvB,cAAc,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;YACrC,CAAC,CAAC,CAAC;SACN;IACL,CAAC;IAED,sBAAW,uBAAG;aAAd;YACI,OAAO,IAAI,CAAC,IAAI,CAAC;QACrB,CAAC;;;OAAA;IAEY,qBAAI,GAAjB,UAAkB,IAAY;;;;4BACnB,qBAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAA;4BAAjC,sBAAO,SAA0B,EAAC;;;;KACrC;IAEY,sBAAK,GAAlB;;;;;;wBACU,IAAI,GAAgB,QAAQ,CAAC,IAAI,CAAC;wBACxC,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;wBAClC,IAAI,CAAC,IAAI,GAAG,SAAG,CAAC,QAAQ,CAAC;wBACnB,SAAS,GAAW,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;wBAC/C,qBAAM,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAA;;wBAAzC,SAAyC,CAAC;wBACpC,GAAG,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC;wBAC7B,SAAS,GAAG,GAAG,GAAG,SAAS,CAAC;wBAClC,OAAO,CAAC,IAAI,CAAC,UAAQ,SAAS,oDAAiD,EAAE,MAAI,iBAAS,CAAC,CAAC;;;;;KACnG;IAED,sBAAkB,kBAAQ;aAA1B;YACI,IAAI,CAAC,MAAM,CAAC,SAAS;gBACjB,MAAM,CAAC,SAAS,GAAG,IAAI,MAAM,EAAE,CAAC;YAEpC,OAAO,MAAM,CAAC,SAAS,CAAC;QAC5B,CAAC;;;OAAA;IACL,aAAC;AAAD,CAAC,AAxED,CAA4B,iCAAe,GAwE1C;AAxEY,wBAAM;AA0EnB,6CAA2B;AAC3B,wDAAsC;AACtC,8DAA4C;AAC5C,8CAA4B;AAC5B,wCAAsB;AACtB,qCAAkC;AAA1B,kGAAA,OAAO,OAAA;AACf,iCAA8B;AAAtB,8FAAA,KAAK,OAAA;AACb,2CAAwC;AAAhC,wGAAA,UAAU,OAAA;AAClB,6BAA0B;AAAlB,0FAAA,GAAG,OAAA;AACX,iCAA8B;AAAtB,8FAAA,KAAK,OAAA;AACb,yDAAsD;AAA9C,gHAAA,cAAc,OAAA;AACtB,qDAAkD;AAA1C,4GAAA,YAAY,OAAA;AACpB,2CAAwC;AAAhC,wGAAA,UAAU,OAAA;AAClB,iCAA8B;AAAtB,8FAAA,KAAK,OAAA;AACb,qCAAkC;AAA1B,kGAAA,OAAO,OAAA;AACf,qDAAkD;AAA1C,kHAAA,eAAe,OAAA;AACvB,6CAA0C;AAAlC,0GAAA,WAAW,OAAA;AACnB,iDAA8C;AAAtC,8GAAA,aAAa,OAAA;AACrB,6BAA0B;AAAlB,0FAAA,GAAG,OAAA;AACE,QAAA,MAAM,GAAW,MAAM,CAAC,QAAQ,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vsn",
-  "version": "0.1.124",
+  "version": "0.1.126",
   "description": "SEO Friendly Javascript/Typescript Framework",
   "keywords": [
     "framework",

package/src/AST/ClassNode.ts

@@ -70,8 +70,7 @@ export class ClassNode extends Node implements TreeNode {
             if (root) {
                 if (dom.built)
                     await this.findClassElements(dom);
-                else
-                    dom.once('builtRoot', () => this.findClassElements(dom));
+                dom.on('built', () => this.findClassElements(dom));
             }
         } else if (meta['PrepForSelector'] === this.fullSelector) { // Only prepare top level class if we're prepping for tag
             await this.block.prepare(tag.scope, dom, tag, meta);
@@ -94,6 +93,11 @@ export class ClassNode extends Node implements TreeNode {
     }
 
     public async constructTag(tag: Tag, dom: DOM, hasConstruct: boolean | null = null) {
+        if (ClassNode.preppedTags[this.fullSelector].indexOf(tag) !== -1) {
+            return;
+        }
+        ClassNode.preppedTags[this.fullSelector].push(tag);
+
         if (hasConstruct === null)
             hasConstruct = this.classScope.has('construct');
 
@@ -107,7 +111,6 @@ export class ClassNode extends Node implements TreeNode {
             await fnc();
         }
         tag.dispatch(`${this.fullSelector}.construct`, tag.element.id);
-        ClassNode.preppedTags[this.fullSelector].push(tag);
         ClassNode.addPreparedClassToElement(tag.element, this.fullSelector);
     }
 

package/src/AST/DispatchEventNode.ts

@@ -5,12 +5,14 @@ import {Token, TokenType, Tree, TreeNode} from "../AST";
 import {Node} from "./Node";
 import {ObjectNode} from "./ObjectNode";
 import {ScopeData} from "../Scope/ScopeData";
+import {ElementQueryNode} from "./ElementQueryNode";
 
 export class DispatchEventNode extends Node implements TreeNode {
     constructor(
         public readonly name: string,
         public readonly data: ObjectNode | null,
-        public readonly bubbles: boolean = false
+        public readonly bubbles: boolean = false,
+        public readonly elementRef: ElementQueryNode | null,
     ) {
         super();
     }
@@ -23,28 +25,34 @@ export class DispatchEventNode extends Node implements TreeNode {
     }
 
     public async evaluate(scope: Scope, dom: DOM, tag: Tag = null) {
-        let detail = this.data ? await this.data.evaluate(scope, dom, tag) : {};
+        let detail = this.data ? (await this.data.evaluate(scope, dom, tag)).objectify : {};
         if (detail instanceof Scope)
             detail = detail.data.getData();
         else if (detail instanceof ScopeData)
             detail = detail.getData();
 
-        detail['source'] = tag.element;
+        let targets: Tag[] = [tag];
+        if (this.elementRef) {
+            targets = await this.elementRef.evaluate(scope, dom, tag, true);
+        }
 
-        tag.element.dispatchEvent(new CustomEvent(this.name, {
-            bubbles: this.bubbles,
-            detail: detail
-        }));
+        for (const target of targets) {
+            detail['source'] = target.element;
+            target.element.dispatchEvent(new CustomEvent(this.name, {
+                bubbles: this.bubbles,
+                detail: detail
+            }));
+        }
     }
 
     public static parse(lastNode, token, tokens: Token[]) {
         const name = tokens.shift();
         let data: ObjectNode = null;
-        if (tokens.length && tokens[0].type === TokenType.L_PAREN) {
-            const containedTokens = Tree.getNextStatementTokens(tokens, true, true, false);
+        if (tokens.length && tokens[0].type === TokenType.L_BRACE) {
+            const containedTokens = Tree.getNextStatementTokens(tokens, false, false, true);
             data = Tree.processTokens(containedTokens).statements[0] as ObjectNode;
         }
-
-        return new DispatchEventNode(name.value, data, name.full.startsWith('!!!'));
+        const elementRef = lastNode instanceof ElementQueryNode ? lastNode : null;
+        return new DispatchEventNode(name.value, data, name.full.startsWith('!!!'), elementRef);
     }
 }

package/src/AST/ElementQueryNode.ts

@@ -1,8 +1,9 @@
 import {Scope} from "../Scope";
-import {DOM, EQuerySelectDirection} from "../DOM";
+import {DOM} from "../DOM";
 import {Tag} from "../Tag";
 import {Token, TreeNode} from "../AST";
 import {Node} from "./Node";
+import {EQuerySelectDirection} from "../DOM/AbstractDOM";
 
 export class ElementQueryNode extends Node implements TreeNode {
     protected requiresPrep: boolean = true;

package/src/AST/FunctionNode.ts

@@ -57,7 +57,7 @@ export class FunctionNode extends Node implements TreeNode {
         }
     }
 
-    public static parse<T = FunctionNode>(lastNode, token, tokens: Token[], cls: any = FunctionNode): FunctionNode {
+    public static parse<T = FunctionNode>(lastNode, token, tokens: Token[], cls: any = FunctionNode): T {
         tokens.shift(); // skip 'func'
         const name = tokens.shift();
         const modifiers = this.moveModifiers(tokens);

package/src/AST/LoopNode.ts

@@ -0,0 +1,35 @@
+import {Token, TreeNode} from "../AST";
+import {FunctionNode} from "./FunctionNode";
+import {Scope} from "../Scope";
+import {DOM} from "../DOM";
+import {Tag} from "../Tag";
+
+export class LoopNode extends FunctionNode implements TreeNode {
+    protected looping?: boolean = true;
+
+    public async prepare(scope: Scope, dom: DOM, tag: Tag = null, meta): Promise<void> {
+        const classPrep = meta?.ClassNodePrepare; // Don't add event handler if we're in class prep
+        if (tag && !classPrep) {
+            const func = await this.getFunction(tag.scope || scope, dom, tag);
+            this.setTimeout(func);
+        }
+        await super.prepare(scope, dom, tag, meta);
+    }
+
+    async loop(func) {
+        if (this.looping) {
+            await func();
+            this.setTimeout(func);
+        }
+    }
+
+    setTimeout(func, time: number = 33) {
+        setTimeout(async () => {
+            await this.loop(func);
+        }, time);
+    }
+
+    public static parse<T = LoopNode>(lastNode, token, tokens: Token[]): T {
+        return super.parse<T>(lastNode, token, tokens, LoopNode);
+    }
+}

package/src/AST/OnNode.ts

@@ -17,7 +17,7 @@ export class OnNode extends FunctionNode implements TreeNode {
         await super.prepare(scope, dom, tag, meta);
     }
 
-    public static parse(lastNode, token, tokens: Token[]): OnNode {
-        return super.parse<OnNode>(lastNode, token, tokens, OnNode);
+    public static parse<T = OnNode>(lastNode, token, tokens: Token[]): T {
+        return super.parse<T>(lastNode, token, tokens, OnNode);
     }
 }

package/src/AST/ScopeMemberNode.ts

@@ -7,6 +7,8 @@ import {TreeNode} from "../AST";
 import {Node} from "./Node";
 import {ElementQueryNode} from "./ElementQueryNode";
 import {ScopeNodeAbstract} from "./ScopeNodeAbstract";
+import {ObjectAccessor} from "../Scope/ObjectAccessor";
+import {ScopeAbstract} from "../Scope/ScopeAbstract";
 
 export class ScopeMemberNode extends ScopeNodeAbstract implements TreeNode {
     constructor(
@@ -45,6 +47,8 @@ export class ScopeMemberNode extends ScopeNodeAbstract implements TreeNode {
         for (let parent of scopes) {
             if (parent instanceof DOMObject)
                 parent = parent.scope;
+            else if (parent && !(parent instanceof ScopeAbstract))
+                parent = new ObjectAccessor(parent);
 
             if (!parent) {
                 throw Error(`Cannot access "${await this.name.evaluate(scope, dom, tag)}" of undefined.`);

package/src/AST.ts

@@ -34,6 +34,7 @@ import {DispatchEventNode} from "./AST/DispatchEventNode";
 import {WithNode} from "./AST/WithNode";
 import {AsNode} from "./AST/AsNode";
 import {NamedStackNode} from "./AST/NamedStackNode";
+import {LoopNode} from "./AST/LoopNode";
 
 function lower(str: string): string {
     return str ? str.toLowerCase() : null;
@@ -65,6 +66,7 @@ export enum TokenType {
     TYPE_UINT,
     TYPE_FLOAT,
     TYPE_STRING,
+    TYPE_BOOL,
     RETURN,
     NOT,
     OF,
@@ -77,6 +79,7 @@ export enum TokenType {
     ELSE_IF,
     ELSE,
     FUNC,
+    LOOP,
     ON,
     CLASS,
     NAME,
@@ -156,24 +159,24 @@ const TOKEN_PATTERNS: TokenPattern[] = [
     },
     {
         type: TokenType.TYPE_INT,
-        pattern: /^int+/
+        pattern: /^int\s/
     },
     {
         type: TokenType.TYPE_UINT,
-        pattern: /^uint+/
+        pattern: /^uint\s/
     },
     {
         type: TokenType.TYPE_FLOAT,
-        pattern: /^float+/
+        pattern: /^float\s/
+    },
+{
+        type: TokenType.TYPE_BOOL,
+        pattern: /^bool\s/
     },
     {
         type: TokenType.UNIT,
         pattern: /^\d+\.?\d?(?:cm|mm|in|px|pt|pc|em|ex|ch|rem|vw|vh|vmin|vmax|%)/
     },
-    {
-        type: TokenType.TYPE_STRING,
-        pattern: /^string+/
-    },
     {
         type: TokenType.BOOLEAN_LITERAL,
         pattern: /^(true|false)/
@@ -230,6 +233,10 @@ const TOKEN_PATTERNS: TokenPattern[] = [
         type: TokenType.FUNC,
         pattern: /^func\s/
     },
+    {
+        type: TokenType.LOOP,
+        pattern: /^loop\s/
+    },
     {
         type: TokenType.ON,
         pattern: /^on\s/
@@ -577,6 +584,11 @@ export class Tree {
                 lastBlock = node;
                 blockNodes.push(node);
                 node = null;
+            } else if (token.type === TokenType.LOOP) {
+                node = LoopNode.parse(node, token, tokens);
+                lastBlock = node;
+                blockNodes.push(node);
+                node = null;
             } else if (token.type === TokenType.ON) {
                 node = OnNode.parse(node, token, tokens);
                 lastBlock = node;

package/src/Component.ts

@@ -1,16 +1,20 @@
 import {Registry} from "./Registry";
-import {DOM} from "./DOM";
 import {SlotTag} from "./Tag/SlotTag";
 import {SlottedTag} from "./Tag/SlottedTag";
+import {ShadowDOM} from "./DOM/ShadowDOM";
+import {DOM} from "./DOM";
 
 export class Component extends HTMLElement {
     protected readonly shadow: ShadowRoot;
+    protected readonly shadowDOM: ShadowDOM;
 
     constructor() {
         super();
         Object.setPrototypeOf(this, Component.prototype);
 
+        this.shadowDOM = new ShadowDOM(DOM.instance, this, false);
         this.shadow = this.attachShadow({mode: 'open'});
+
         const templateId = this.getAttribute('template');
         let template: HTMLTemplateElement;
 
@@ -28,34 +32,32 @@ export class Component extends HTMLElement {
         const slotPromises = [];
         const tagsToSetup = [];
         this.shadow.querySelectorAll('slot').forEach((slot) => {
-            const slotTagPromise = DOM.instance.buildTag(slot,false, SlotTag);
+            const slotTagPromise = this.shadowDOM.buildTag(slot,false, SlotTag);
             const promise = new Promise<SlotTag>((resolve, reject) => {
                 slot.addEventListener('slotchange', (e) => {
                     slotTagPromise.then(async (slotTag) => {
-
                         for (const child of slot.assignedNodes()) {
-                            const t = await DOM.instance.buildTag<SlottedTag>(child as HTMLElement, false, SlottedTag);
+                            const t = await this.shadowDOM.buildTag<SlottedTag>(child as HTMLElement, false, SlottedTag);
                             await t?.slotted(slotTag);
                             tagsToSetup.push(t);
                         }
                         resolve(slotTag);
                     });
                 });
-            })
+            });
             slotPromises.push(promise);
         });
         Promise.all(slotPromises).then(async (slotTags: SlotTag[]) => {
-            await DOM.instance.buildFrom(this, false, true);
-            await DOM.instance.setupTags(slotTags);
-            await DOM.instance.setupTags(tagsToSetup);
+            console.log('Building after slot setup', this);
         });
     }
 
     async connectedCallback() {
-        const tag = await DOM.instance.buildTag(this, true);
-        tag.createScope(true);
-        await DOM.instance.buildFrom(this.shadow);
-        await tag.dom.resetBranch(tag);
-        await tag.dom.setupTags([tag]);
+        //const tag = await this.shadowDOM.buildTag(this, true);
+        //tag.createScope(true);
+        console.log('Building from shadow', this.shadow);
+        await this.shadowDOM.buildFrom(this.shadow, true, true);
+        ///await tag.dom.resetBranch(tag);
+        //await tag.dom.setupTags([tag]);
     }
 }