dothtml 6.0.0-beta.44 → 6.0.0-beta.46

package/build_module/vdom-nodes/component-vdom.js

@@ -1,9 +1,31 @@
 import { Vdom } from "./vdom";
 import renderStylesheet from "../helpers/render-stylesheet";
+import { EventManager } from "../events/event-manager";
+import Watcher from "../reactivity/watcher";
+import Binding from "../reactivity/binding";
+import { scheduler } from "../reactivity/scheduler";
+import { Priority } from "../reactivity/priority";
+import { pushComponent, popComponent } from "./component-context";
+import BaseVStyle from "../v-style-nodes/base-v-style";
+import StyleVNode from "../v-meta-nodes/style-v-node";
+import StyleSheetBuilder from "../v-style-nodes/style-sheet-builder";
 let tagId = 0x10000;
 export class ComponentVdom extends Vdom {
     constructor(dot, component) {
         super();
+        this.events = [];
+        this.styleVNodes = [];
+        this.isQueued = false;
+        this.computedWatchers = [];
+        this.disposables = [];
+        this.updateSubscription = {
+            active: true,
+            update: () => {
+                this.isQueued = false;
+                this.rebuild();
+            }
+        };
+        this.dot = dot;
         this.component = component;
         if (component._?._meta) {
             throw new Error("Component has already been added to the VDOM.");
@@ -17,29 +39,186 @@ export class ComponentVdom extends Vdom {
         if (!component._) {
             component._ = {};
         }
+        component._.cvdom = this;
         component._.refs = {};
         component._._meta = component._._meta || {};
         component._._meta.isRendered = false;
         component._._meta.tagName = component.constructor["_dotHtmlComponent"].tagName;
-        this.childShadowVdom = this.component.build(dot);
+        component.emit = (name, detail) => {
+            if (this.shadowEl) {
+                this.shadowEl.dispatchEvent(new CustomEvent(name.toLowerCase(), {
+                    detail,
+                    bubbles: true,
+                    composed: true
+                }));
+            }
+        };
+        if (component._trackedComputeds) {
+            for (const w of component._trackedComputeds) {
+                this.registerComputed(w);
+            }
+            delete component._trackedComputeds;
+        }
+        if (component._trackedDisposables) {
+            for (const d of component._trackedDisposables) {
+                this.registerDisposable(d);
+            }
+            delete component._trackedDisposables;
+        }
+    }
+    registerComputed(watcher) {
+        this.computedWatchers.push(watcher);
+    }
+    registerDisposable(disposable) {
+        this.disposables.push(disposable);
+    }
+    setRef(ref) {
+        this.ref = ref;
+    }
+    init() {
+        this.validateProps();
+        pushComponent(this);
+        try {
+            this.childShadowVdom = this.component.build(this.dot);
+        }
+        finally {
+            popComponent();
+        }
         this.component.built && this.component.built();
+        this.subscribeToProps();
+    }
+    subscribeToProps() {
+        const props = this.component.props;
+        if (!props)
+            return;
+        for (const key in props) {
+            const prop = props[key];
+            if (prop instanceof Watcher || prop instanceof Binding) {
+                prop.subscribe(() => this.requestUpdate());
+            }
+        }
+    }
+    requestUpdate() {
+        if (!this.isQueued) {
+            this.isQueued = true;
+            scheduler.enqueue(this.updateSubscription, Priority.Normal);
+        }
+    }
+    rebuild() {
+        if (!this.shadowEl)
+            return;
+        this.childShadowVdom._unrender();
+        this.validateProps();
+        pushComponent(this);
+        try {
+            this.childShadowVdom = this.component.build(this.dot);
+        }
+        finally {
+            popComponent();
+        }
+        const shadow = this.component._._meta.shadowRoot;
+        this.childShadowVdom._render(shadow);
+        this.component.built && this.component.built();
+    }
+    validateProps() {
+        const schema = this.component.constructor.props;
+        if (!schema)
+            return;
+        const props = this.component.props || {};
+        const componentName = this.component.constructor.name;
+        for (const key in schema) {
+            const rule = schema[key];
+            let value = props[key];
+            if (value === undefined && rule.default !== undefined) {
+                if (typeof rule.default === "function" && (rule.type === Object || rule.type === Array)) {
+                    value = rule.default();
+                }
+                else {
+                    value = rule.default;
+                }
+                props[key] = value;
+            }
+            if (rule.required && value === undefined) {
+                throw new Error(`[${componentName}] Prop "${key}" is required.`);
+            }
+            let valueToValidate = value;
+            if (value instanceof Watcher || value instanceof Binding) {
+                valueToValidate = value.value;
+            }
+            if (valueToValidate !== undefined && valueToValidate !== null && rule.type) {
+                const actualType = typeof valueToValidate;
+                if (rule.type === String && actualType !== "string") {
+                    throw new Error(`[${componentName}] Prop "${key}" expected string, but got ${actualType}.`);
+                }
+                else if (rule.type === Number && actualType !== "number") {
+                    throw new Error(`[${componentName}] Prop "${key}" expected number, but got ${actualType}.`);
+                }
+                else if (rule.type === Boolean && actualType !== "boolean") {
+                    throw new Error(`[${componentName}] Prop "${key}" expected boolean, but got ${actualType}.`);
+                }
+                else if (rule.type === Function && actualType !== "function") {
+                    throw new Error(`[${componentName}] Prop "${key}" expected function, but got ${actualType}.`);
+                }
+                else if (rule.type === Array && !Array.isArray(valueToValidate)) {
+                    throw new Error(`[${componentName}] Prop "${key}" expected array, but got ${actualType}.`);
+                }
+                else if (rule.type === Object && (actualType !== "object" || Array.isArray(valueToValidate))) {
+                    throw new Error(`[${componentName}] Prop "${key}" expected object, but got ${Array.isArray(valueToValidate) ? "array" : actualType}.`);
+                }
+            }
+            if (valueToValidate !== undefined && typeof rule.validator === "function") {
+                if (!rule.validator(valueToValidate)) {
+                    throw new Error(`[${componentName}] Prop "${key}" failed custom validation.`);
+                }
+            }
+        }
+        this.component.props = props;
     }
     setupCustomElement(document) {
         let CustomElementConstructor = document.defaultView.customElements.get(this.component._._meta.tagName);
         if (CustomElementConstructor == undefined) {
-            let styles = this.component.stylize && this.component.stylize() || [];
-            if (typeof styles == "string")
-                styles = [styles];
+            let cachedStyles = this.component.constructor._cachedStyles;
             let sharedStylesheets = [];
             let styleTags = [];
-            if (styles) {
-                for (let i = 0; i < styles.length; i++) {
-                    let styleItem = renderStylesheet(styles[i], document);
+            if (cachedStyles) {
+                sharedStylesheets = cachedStyles.sharedStylesheets;
+                styleTags = cachedStyles.styleTags;
+            }
+            else {
+                const builder = new StyleSheetBuilder();
+                let styles = this.component.stylize && this.component.stylize(builder) || [];
+                if (styles === builder || (!styles && builder.hasRules())) {
+                    styles = builder.toString();
+                }
+                if (typeof styles == "string")
+                    styles = [styles];
+                if (styles) {
+                    for (let i = 0; i < styles.length; i++) {
+                        let styleItem = renderStylesheet(styles[i], document);
+                        if (styleItem instanceof document.defaultView.CSSStyleSheet) {
+                            sharedStylesheets.push(styleItem);
+                        }
+                        else {
+                            styleTags.push(styleItem);
+                        }
+                    }
+                }
+                this.component.constructor._cachedStyles = { sharedStylesheets, styleTags };
+            }
+            let allSharedStylesheets = [...sharedStylesheets];
+            let allStyleTags = [...styleTags];
+            let globalStyles = this.dot.globalStyles || [];
+            for (let gs of globalStyles) {
+                if (gs instanceof document.defaultView.CSSStyleSheet) {
+                    allSharedStylesheets.push(gs);
+                }
+                else if (typeof gs === "string") {
+                    let styleItem = renderStylesheet(gs, document);
                     if (styleItem instanceof document.defaultView.CSSStyleSheet) {
-                        sharedStylesheets.push(styleItem);
+                        allSharedStylesheets.push(styleItem);
                     }
                     else {
-                        styleTags.push(styleItem);
+                        allStyleTags.push(styleItem);
                     }
                 }
             }
@@ -52,9 +231,9 @@ export class ComponentVdom extends Vdom {
                 _renderComponent() {
                     if (this.cvdom instanceof Vdom) {
                         let shadow = this.attachShadow({ mode: 'open' });
-                        shadow.adoptedStyleSheets = sharedStylesheets;
-                        for (let i = 0; i < styleTags.length; i++) {
-                            shadow.appendChild(styleTags[i]);
+                        shadow.adoptedStyleSheets = allSharedStylesheets;
+                        for (let i = 0; i < allStyleTags.length; i++) {
+                            shadow.appendChild(allStyleTags[i].cloneNode(true));
                         }
                         this._component._._meta.shadowRoot = shadow;
                         this.cvdom.childShadowVdom._render(shadow);
@@ -81,17 +260,76 @@ export class ComponentVdom extends Vdom {
         this.shadowEl = document.createElement(this.component._._meta.tagName);
         this.shadowEl["cvdom"] = this;
         this.shadowEl["component"] = this.component;
+        if (this.ref) {
+            if (typeof this.ref === "function") {
+                this.ref(this.component);
+            }
+            else {
+                this.ref.value = this.component;
+            }
+        }
+        if (this.component.hostStyle) {
+            const hostStyleBuilder = new BaseVStyle();
+            this.component.hostStyle(hostStyleBuilder);
+            const hostStyleVNode = new StyleVNode(hostStyleBuilder);
+            hostStyleVNode.render(this.shadowEl, document);
+            this.styleVNodes.push(hostStyleVNode);
+        }
         this.component._.restyle && this.component._.restyle();
         node.appendChild(this.shadowEl);
+        for (let i = 0; i < this.events.length; i++) {
+            let e = this.events[i];
+            this.renderEvent(e.name, e.callback, e.modifiers);
+        }
         this.component.mounted && this.component.mounted();
     }
     _unrender() {
         this.component.unmounting && this.component.unmounting();
         this.childShadowVdom._unrender();
+        const eventManager = EventManager.getForDocument(this.shadowEl.ownerDocument);
+        for (let i = 0; i < this.events.length; i++) {
+            let e = this.events[i];
+            eventManager.removeListener(this.shadowEl, e.name.toLowerCase(), e.callback);
+        }
         this.shadowEl.remove();
         this.shadowEl = null;
+        for (let i = 0; i < this.styleVNodes.length; i++) {
+            this.styleVNodes[i].unrender();
+        }
+        this.styleVNodes = [];
+        for (const watcher of this.computedWatchers) {
+            watcher.dispose();
+        }
+        this.computedWatchers = [];
+        for (const disposable of this.disposables) {
+            disposable();
+        }
+        this.disposables = [];
         this.component._._meta.isRendered = false;
         this.component.unmounted && this.component.unmounted();
+        if (this.ref) {
+            if (typeof this.ref === "function") {
+                this.ref(null);
+            }
+            else {
+                this.ref.value = null;
+            }
+        }
+    }
+    _getNodes() {
+        return this.shadowEl ? [this.shadowEl] : [];
+    }
+    addEventListener(event, callback, modifiers = []) {
+        this.events.push({ name: event, callback: callback, modifiers: modifiers });
+        if (this.shadowEl)
+            this.renderEvent(event, callback, modifiers);
+    }
+    renderEvent(e, callback, modifiers = []) {
+        EventManager.getForDocument(this.shadowEl.ownerDocument).addListener(this.shadowEl, e.toLowerCase(), callback, modifiers);
+    }
+    on(event, callback) {
+        this.addEventListener(event, callback);
+        return this;
     }
     toString() {
         return `<${this.component._._meta.tagName}></${this.component._._meta.tagName}>`;

package/build_module/vdom-nodes/component-vdom.js.map

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

package/build_module/vdom-nodes/conditional-vdom.d.ts

@@ -11,5 +11,6 @@ export declare class ConditionalVdom extends Vdom {
     _render(node: HTMLElement): void;
     removeCNode(C: ConditionalNodeItem): void;
     _unrender(): void;
+    _getNodes(): Node[];
     updateConditions(): void;
 }

package/build_module/vdom-nodes/conditional-vdom.js

@@ -68,6 +68,20 @@ export class ConditionalVdom extends Vdom {
             this.removeCNode(C);
         }
     }
+    _getNodes() {
+        if (!this._isRendered)
+            return [];
+        let nodes = [];
+        for (let i = 0; i < this.conditions.length; i++) {
+            let C = this.conditions[i];
+            nodes.push(C.startAnchor);
+            if (i == this.renderedIndex) {
+                nodes.push(...C.vNode._getNodes());
+            }
+            nodes.push(C.endAnchor);
+        }
+        return nodes;
+    }
     updateConditions() {
         let node = this.conditions[0].startAnchor.parentElement;
         let newIndex = -1;

package/build_module/vdom-nodes/conditional-vdom.js.map

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

package/build_module/vdom-nodes/container-vdom.d.ts

@@ -1,10 +1,11 @@
-import { IDotComponent, IDotCore } from "dothtml-interfaces";
+import { IDotComponent, IDotCore, IDotCss } from "dothtml-interfaces";
 import Watcher from "../reactivity/watcher";
 import { ConditionalVdom } from "./conditional-vdom";
 import ElementVdom from "./element-vdom";
 import { Vdom } from "./vdom";
 import { ObservableCollection } from "./vdom-types";
 import Binding from "../reactivity/binding";
+import BaseVStyle from "../v-style-nodes/base-v-style";
 type ParentVdom = ContainerVdom | ConditionalVdom | ElementVdom;
 export declare class ContainerVdom extends Vdom {
     _children: Array<Vdom>;
@@ -14,14 +15,17 @@ export declare class ContainerVdom extends Vdom {
     _addChild(content: Vdom): this;
     _render(node: HTMLElement): void;
     _unrender(): void;
+    _getNodes(): Node[];
     attr(A: string, c: any): void;
     html(c: string | Watcher | Binding): this;
     text(c: string | Watcher | Binding): this;
     md(c: string | Watcher): this;
-    mount(c: IDotComponent): this;
+    style(c: string | Watcher | Binding | IDotCss | ((s: BaseVStyle) => void)): this;
+    mount(c: IDotComponent, attrs?: Record<string, any>): this;
     when(condition: Watcher | Binding | boolean, then: ContainerVdom | string | boolean | number): this;
     otherwiseWhen(condition: Watcher | Binding | boolean, then: ContainerVdom | string | boolean | number, seal?: boolean): this;
     otherwise(then: ContainerVdom | string | boolean | number): this;
+    on(event: string, callback: (e: any) => void): this;
     each(collection: ObservableCollection, callback: () => Vdom): this;
 }
 export {};

package/build_module/vdom-nodes/container-vdom.js

@@ -6,6 +6,7 @@ import { HtmlVdom } from "./html-vdom";
 import { TextVdom } from "./text-vdom";
 import { Vdom } from "./vdom";
 import { ComponentVdom } from "./component-vdom";
+import BaseVStyle from "../v-style-nodes/base-v-style";
 function reduceReactive(value) {
     if (value instanceof Watcher)
         return value.bind();
@@ -39,6 +40,13 @@ export class ContainerVdom extends Vdom {
             this._children[c]._unrender();
         }
     }
+    _getNodes() {
+        let nodes = [];
+        for (let i = 0; i < this._children.length; i++) {
+            nodes.push(...this._children[i]._getNodes());
+        }
+        return nodes;
+    }
     attr(A, c) {
         let C = this._children[this._children.length - 1];
         if (C && C instanceof ElementVdom) {
@@ -59,8 +67,43 @@ export class ContainerVdom extends Vdom {
     md(c) {
         return this.text(reduceReactive(c));
     }
-    mount(c) {
+    style(c) {
+        if (typeof c === "function") {
+            const builder = new BaseVStyle();
+            c(builder);
+            this.attr("style", builder);
+        }
+        else {
+            this.attr("style", c);
+        }
+        return this;
+    }
+    mount(c, attrs) {
         let cn = new ComponentVdom(this._dot, c);
+        if (attrs) {
+            for (let k in attrs) {
+                let val = attrs[k];
+                if (k === "ref") {
+                    cn.setRef(val);
+                }
+                else if (k.startsWith("on") && typeof val === "function") {
+                    let eventName = k;
+                    let modifiers = [];
+                    if (k.includes(".")) {
+                        const parts = k.split(".");
+                        eventName = parts[0];
+                        modifiers = parts.slice(1);
+                    }
+                    cn.addEventListener(eventName.substring(2).toLowerCase(), val, modifiers);
+                }
+                else {
+                    if (!c["props"])
+                        c.props = {};
+                    c.props[k] = val;
+                }
+            }
+        }
+        cn.init();
         let ret = this._addChild(cn);
         return ret;
     }
@@ -101,6 +144,16 @@ export class ContainerVdom extends Vdom {
         return this;
     }
     otherwise(then) { return this.otherwiseWhen(true, then, true); }
+    on(event, callback) {
+        let C = this._children[this._children.length - 1];
+        if (C && (C instanceof ElementVdom || C instanceof ComponentVdom)) {
+            C.addEventListener(event, callback);
+        }
+        else {
+            throw new Error(`Invalid node to set ${event} listener.`);
+        }
+        return this;
+    }
     each(collection, callback) {
         let collectionVdom = new CollectionVdom(reduceReactive(collection), callback);
         this._addChild(collectionVdom);

package/build_module/vdom-nodes/container-vdom.js.map

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

package/build_module/vdom-nodes/element-vdom.d.ts

@@ -20,9 +20,10 @@ export default class ElementVdom extends Vdom {
     constructor(dot: IDotCore, tag: string);
     _render(node: HTMLElement): void;
     _unrender(): void;
+    _getNodes(): Node[];
     toString(): string;
     setAttr(attr: any, value: any): void;
     private renderAttr;
-    addEventListener(event: string, callback: (e: Event) => void): void;
+    addEventListener(event: string, callback: (e: any) => void, modifiers?: string[]): void;
     private renderEvent;
 }