vasille 2.0.3 → 2.2.0

package/cdn/es2015.js

@@ -1,4 +1,24 @@
 (function(){
+// ./lib/v/index.js
+
+const v = Object.assign(Object.assign({ ref(value) {
+        return current.ref(value);
+    }, expr: expr, of: valueOf, sv: setValue, alwaysFalse: new Reference(false), app,
+    component,
+    fragment,
+    extension,
+    text,
+    tag,
+    create }, vx), { merge,
+    destructor() {
+        return current.destroy.bind(current);
+    },
+    runOnDestroy(callback) {
+        current.runOnDestroy(callback);
+    } });
+
+window.v = v;
+
 // ./lib/models/model.js
 
 
@@ -149,13 +169,14 @@ class ObjectModel extends Object {
      */
     constructor(obj = {}) {
         super();
+        this.container = Object.create(null);
         Object.defineProperty(this, 'listener', {
             value: new Listener,
             writable: false,
             configurable: false
         });
         for (const i in obj) {
-            Object.defineProperty(this, i, {
+            Object.defineProperty(this.container, i, {
                 value: obj[i],
                 configurable: true,
                 writable: true,
@@ -170,8 +191,7 @@ class ObjectModel extends Object {
      * @return {*}
      */
     get(key) {
-        const ts = this;
-        return ts[key];
+        return this.container[key];
     }
     /**
      * Sets an object property value
@@ -180,21 +200,19 @@ class ObjectModel extends Object {
      * @return {ObjectModel} a pointer to this
      */
     set(key, v) {
-        const ts = this;
-        // eslint-disable-next-line no-prototype-builtins
-        if (ts.hasOwnProperty(key)) {
-            this.listener.emitRemoved(key, ts[key]);
-            ts[key] = v;
+        if (Reflect.has(this.container, key)) {
+            this.listener.emitRemoved(key, this.container[key]);
+            this.container[key] = v;
         }
         else {
-            Object.defineProperty(ts, key, {
+            Object.defineProperty(this.container, key, {
                 value: v,
                 configurable: true,
                 writable: true,
                 enumerable: true
             });
         }
-        this.listener.emitAdded(key, ts[key]);
+        this.listener.emitAdded(key, this.container[key]);
         return this;
     }
     /**
@@ -202,12 +220,28 @@ class ObjectModel extends Object {
      * @param key {string} property name
      */
     delete(key) {
-        const ts = this;
-        if (ts[key]) {
-            this.listener.emitRemoved(key, ts[key]);
-            delete ts[key];
+        if (this.container[key]) {
+            this.listener.emitRemoved(key, this.container[key]);
+            delete this.container[key];
         }
     }
+    proxy() {
+        // eslint-disable-next-line @typescript-eslint/no-this-alias
+        const ts = this;
+        return new Proxy(this.container, {
+            get(target, p) {
+                return ts.get(p);
+            },
+            set(target, p, value) {
+                ts.set(p, value);
+                return true;
+            },
+            deleteProperty(target, p) {
+                ts.delete(p);
+                return true;
+            }
+        });
+    }
     enableReactivity() {
         this.listener.enableReactivity();
     }
@@ -373,6 +407,15 @@ class ArrayModel extends Array {
             super.push(data[i]);
         }
     }
+    // proxy
+    proxy() {
+        return new Proxy(this, {
+            set(target, p, value) {
+                target.splice(parseInt(p), 1, value);
+                return true;
+            }
+        });
+    }
     /* Array members */
     /**
      * Gets the last item of array
@@ -563,6 +606,266 @@ class ArrayModel extends Array {
 
 window.ArrayModel = ArrayModel;
 
+// ./lib/functional/merge.js
+function merge(main, ...targets) {
+    function refactorClass(obj) {
+        if (Array.isArray(obj.class)) {
+            const out = {
+                $: []
+            };
+            obj.class.forEach(item => {
+                if (item instanceof IValue) {
+                    out.$.push(item);
+                }
+                else if (typeof item === 'string') {
+                    out[item] = true;
+                }
+                else if (typeof item === 'object') {
+                    Object.assign(out, item);
+                }
+            });
+            obj.class = out;
+        }
+    }
+    refactorClass(main);
+    targets.forEach(target => {
+        Reflect.ownKeys(target).forEach((prop) => {
+            if (!Reflect.has(main, prop)) {
+                main[prop] = target[prop];
+            }
+            else if (typeof main[prop] === 'object' && typeof target[prop] === 'object') {
+                if (prop === 'class') {
+                    refactorClass(target);
+                }
+                if (prop === '$' && Array.isArray(main[prop]) && Array.isArray(target[prop])) {
+                    main.$.push(...target.$);
+                }
+                else {
+                    merge(main[prop], target[prop]);
+                }
+            }
+        });
+    });
+}
+
+window.merge = merge;
+
+// ./lib/functional/stack.js
+function app(renderer) {
+    return (node, opts) => {
+        return new App(node, opts).runFunctional(renderer, opts);
+    };
+}
+function component(renderer) {
+    return (opts, callback) => {
+        const component = new Component(opts);
+        if (!(current instanceof Fragment))
+            throw userError('missing parent node', 'out-of-context');
+        let ret;
+        if (callback)
+            opts.slot = callback;
+        current.create(component, node => {
+            ret = node.runFunctional(renderer, opts);
+        });
+        return ret;
+    };
+}
+function fragment(renderer) {
+    return (opts, callback) => {
+        const frag = new Fragment(opts);
+        if (!(current instanceof Fragment))
+            throw userError('missing parent node', 'out-of-context');
+        if (callback)
+            opts.slot = callback;
+        current.create(frag);
+        return frag.runFunctional(renderer, opts);
+    };
+}
+function extension(renderer) {
+    return (opts, callback) => {
+        const ext = new Extension(opts);
+        if (!(current instanceof Fragment))
+            throw userError('missing parent node', 'out-of-context');
+        if (callback)
+            opts.slot = callback;
+        current.create(ext);
+        return ext.runFunctional(renderer, opts);
+    };
+}
+function tag(name, opts, callback) {
+    if (!(current instanceof Fragment))
+        throw userError('missing parent node', 'out-of-context');
+    return {
+        node: current.tag(name, opts, (node) => {
+            callback && node.runFunctional(callback);
+        })
+    };
+}
+function create(node, callback) {
+    if (!(current instanceof Fragment))
+        throw userError('missing current node', 'out-of-context');
+    current.create(node, (node, ...args) => {
+        callback && node.runFunctional(callback, ...args);
+    });
+    return node;
+}
+const vx = {
+    if(condition, callback) {
+        if (current instanceof Fragment) {
+            current.if(condition, node => node.runFunctional(callback));
+        }
+        else {
+            throw userError("wrong use of `v.if` function", "logic-error");
+        }
+    },
+    else(callback) {
+        if (current instanceof Fragment) {
+            current.else(node => node.runFunctional(callback));
+        }
+        else {
+            throw userError("wrong use of `v.else` function", "logic-error");
+        }
+    },
+    elif(condition, callback) {
+        if (current instanceof Fragment) {
+            current.elif(condition, node => node.runFunctional(callback));
+        }
+        else {
+            throw userError("wrong use of `v.elif` function", "logic-error");
+        }
+    },
+    for(model, callback) {
+        if (model instanceof ArrayModel) {
+            // for arrays T & K are the same type
+            create(new ArrayView({ model }), callback);
+        }
+        else if (model instanceof MapModel) {
+            create(new MapView({ model }), callback);
+        }
+        else if (model instanceof SetModel) {
+            // for sets T & K are the same type
+            create(new SetView({ model }), callback);
+        }
+        else if (model instanceof ObjectModel) {
+            // for objects K is always string
+            create(new ObjectView({ model }), callback);
+        }
+        else {
+            throw userError("wrong use of `v.for` function", 'wrong-model');
+        }
+    },
+    watch(model, callback) {
+        const opts = { model };
+        create(new Watch(opts), callback);
+    },
+    nextTick(callback) {
+        const node = current;
+        window.setTimeout(() => {
+            node.runFunctional(callback);
+        }, 0);
+    }
+};
+
+window.app = app;
+window.component = component;
+window.fragment = fragment;
+window.extension = extension;
+window.tag = tag;
+window.create = create;
+window.vx = vx;
+
+// ./lib/functional/models.js
+function arrayModel(arr = []) {
+    if (!current)
+        throw userError('missing parent node', 'out-of-context');
+    return current.register(new ArrayModel(arr)).proxy();
+}
+function mapModel(map = []) {
+    if (!current)
+        throw userError('missing parent node', 'out-of-context');
+    return current.register(new MapModel(map));
+}
+function setModel(arr = []) {
+    if (!current)
+        throw userError('missing parent node', 'out-of-context');
+    return current.register(new SetModel(arr));
+}
+function objectModel(obj = {}) {
+    if (!current)
+        throw userError('missing parent node', 'out-of-context');
+    return current.register(new ObjectModel(obj));
+}
+
+window.arrayModel = arrayModel;
+window.mapModel = mapModel;
+window.setModel = setModel;
+window.objectModel = objectModel;
+
+// ./lib/functional/options.js
+
+
+
+// ./lib/functional/reactivity.js
+function ref(value) {
+    const ref = current.ref(value);
+    return [ref, (value) => ref.$ = value];
+}
+function mirror(value) {
+    return current.mirror(value);
+}
+function forward(value) {
+    return current.forward(value);
+}
+function point(value) {
+    return current.point(value);
+}
+function expr(func, ...values) {
+    return current.expr(func, ...values);
+}
+function watch(func, ...values) {
+    current.watch(func, ...values);
+}
+function valueOf(value) {
+    return value.$;
+}
+function setValue(ref, value) {
+    if (ref instanceof Pointer && value instanceof IValue) {
+        ref.point(value);
+    }
+    else {
+        ref.$ = value instanceof IValue ? value.$ : value;
+    }
+}
+
+window.ref = ref;
+window.mirror = mirror;
+window.forward = forward;
+window.point = point;
+window.expr = expr;
+window.watch = watch;
+window.valueOf = valueOf;
+window.setValue = setValue;
+
+// ./lib/functional/components.js
+function text(text) {
+    if (!(current instanceof Fragment))
+        throw userError('missing parent node', 'out-of-context');
+    ;
+    current.text(text);
+}
+function debug(text) {
+    if (!(current instanceof Fragment))
+        throw userError('missing parent node', 'out-of-context');
+    current.debug(text);
+}
+function predefine(slot, predefined) {
+    return slot || predefined;
+}
+
+window.text = text;
+window.debug = debug;
+window.predefine = predefine;
+
 // ./lib/core/signal.js
 /**
  * Signal is an event generator
@@ -862,7 +1165,7 @@ class Destroyable {
      * Make object fields non configurable
      * @protected
      */
-    $seal() {
+    seal() {
         const $ = this;
         Object.keys($).forEach(i => {
             // eslint-disable-next-line no-prototype-builtins
@@ -894,7 +1197,7 @@ class Destroyable {
     /**
      * Garbage collector method
      */
-    $destroy() {
+    destroy() {
         // nothing here
     }
 }
@@ -902,12 +1205,26 @@ class Destroyable {
 window.Destroyable = Destroyable;
 
 // ./lib/core/ivalue.js
+class Switchable extends Destroyable {
+    /**
+     * Enable update handlers triggering
+     */
+    enable() {
+        throw notOverwritten();
+    }
+    /**
+     * disable update handlers triggering
+     */
+    disable() {
+        throw notOverwritten();
+    }
+}
 /**
  * Interface which describes a value
  * @class IValue
  * @extends Destroyable
  */
-class IValue extends Destroyable {
+class IValue extends Switchable {
     /**
      * @param isEnabled {boolean} initial is enabled state
      */
@@ -943,26 +1260,27 @@ class IValue extends Destroyable {
     off(handler) {
         throw notOverwritten();
     }
-    /**
-     * Enable update handlers triggering
-     */
-    enable() {
-        throw notOverwritten();
-    }
-    /**
-     * disable update handlers triggering
-     */
-    disable() {
-        throw notOverwritten();
-    }
 }
 
+window.Switchable = Switchable;
 window.IValue = IValue;
 
 // ./lib/index.js
 
 
 
+// ./lib/spec/svg.js
+
+
+
+// ./lib/spec/react.js
+
+
+
+// ./lib/spec/html.js
+
+
+
 // ./lib/value/expression.js
 /**
  * Bind some values to one expression
@@ -970,13 +1288,18 @@ window.IValue = IValue;
  * @extends IValue
  */
 class Expression extends IValue {
-    constructor(func, link, v1, v2, v3, v4, v5, v6, v7, v8, v9) {
+    /**
+     * Creates a function bounded to N values
+     * @param func {Function} the function to bound
+     * @param values
+     * @param link {Boolean} links immediately if true
+     */
+    constructor(func, link, ...values) {
         super(false);
         /**
          * Expression will link different handler for each value of list
          */
         this.linkedFunc = [];
-        const values = [v1, v2, v3, v4, v5, v6, v7, v8, v9].filter(v => v instanceof IValue);
         const handler = (i) => {
             if (i != null) {
                 this.valuesCache[i] = this.values[i].$;
@@ -985,14 +1308,12 @@ class Expression extends IValue {
         };
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
-        this.valuesCache = values.map(iValue => iValue.$);
+        this.valuesCache = values.map(item => item.$);
         this.sync = new Reference(func.apply(this, this.valuesCache));
         let i = 0;
         values.forEach(() => {
             this.linkedFunc.push(handler.bind(this, Number(i++)));
         });
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore
         this.values = values;
         this.func = handler;
         if (link) {
@@ -1001,7 +1322,7 @@ class Expression extends IValue {
         else {
             handler();
         }
-        this.$seal();
+        this.seal();
     }
     get $() {
         return this.sync.$;
@@ -1037,12 +1358,12 @@ class Expression extends IValue {
         }
         return this;
     }
-    $destroy() {
+    destroy() {
         this.disable();
         this.values.splice(0);
         this.valuesCache.splice(0);
         this.linkedFunc.splice(0);
-        super.$destroy();
+        super.destroy();
     }
 }
 
@@ -1062,7 +1383,7 @@ class Reference extends IValue {
         super(true);
         this.value = value;
         this.onchange = new Set;
-        this.$seal();
+        this.seal();
     }
     get $() {
         return this.value;
@@ -1084,22 +1405,18 @@ class Reference extends IValue {
             });
             this.isEnabled = true;
         }
-        return this;
     }
     disable() {
         this.isEnabled = false;
-        return this;
     }
     on(handler) {
         this.onchange.add(handler);
-        return this;
     }
     off(handler) {
         this.onchange.delete(handler);
-        return this;
     }
-    $destroy() {
-        super.$destroy();
+    destroy() {
+        super.destroy();
         this.onchange.clear();
     }
 }
@@ -1127,7 +1444,7 @@ class Mirror extends Reference {
         this.pointedValue = value;
         this.forwardOnly = forwardOnly;
         value.on(this.handler);
-        this.$seal();
+        this.seal();
     }
     get $() {
         // this is a ts bug
@@ -1136,13 +1453,13 @@ class Mirror extends Reference {
         return super.$;
     }
     set $(v) {
+        if (!this.forwardOnly) {
+            this.pointedValue.$ = v;
+        }
         // this is a ts bug
         // eslint-disable-next-line
         // @ts-ignore
         super.$ = v;
-        if (!this.forwardOnly) {
-            this.pointedValue.$ = v;
-        }
     }
     enable() {
         if (!this.isEnabled) {
@@ -1150,18 +1467,16 @@ class Mirror extends Reference {
             this.pointedValue.on(this.handler);
             this.$ = this.pointedValue.$;
         }
-        return this;
     }
     disable() {
         if (this.isEnabled) {
             this.pointedValue.off(this.handler);
             this.isEnabled = false;
         }
-        return this;
     }
-    $destroy() {
+    destroy() {
         this.disable();
-        super.$destroy();
+        super.destroy();
     }
 }
 
@@ -1205,39 +1520,39 @@ window.Pointer = Pointer;
 class Binding extends Destroyable {
     /**
      * Constructs a common binding logic
-     * @param node {INode} the vasille node
-     * @param name {String} the name of property/attribute/class
      * @param value {IValue} the value to bind
      */
-    constructor(node, name, value) {
+    constructor(value) {
         super();
-        this.updateFunc = this.bound(name).bind(null, node);
         this.binding = value;
-        this.binding.on(this.updateFunc);
-        this.updateFunc(this.binding.$);
-        this.$seal();
+        this.seal();
     }
-    /**
-     * Is a virtual function to get the specific bind function
-     * @param name {String} the name of attribute/property
-     * @returns {Function} a function to update attribute/property value
-     * @throws Always throws and must be overloaded in child class
-     */
-    bound(name) {
-        throw notOverwritten();
+    init(bounded) {
+        this.func = bounded;
+        this.binding.on(this.func);
+        this.func(this.binding.$);
     }
     /**
      * Just clear bindings
      */
-    $destroy() {
-        this.binding.off(this.updateFunc);
-        super.$destroy();
+    destroy() {
+        this.binding.off(this.func);
+        super.destroy();
     }
 }
 
 window.Binding = Binding;
 
 // ./lib/core/core.js
+
+const currentStack = [];
+function stack(node) {
+    currentStack.push(current);
+    current = node;
+}
+function unstack() {
+    current = currentStack.pop();
+}
 /**
  * Private stuff of a reactive object
  * @class ReactivePrivate
@@ -1270,16 +1585,18 @@ class ReactivePrivate extends Destroyable {
          * @type {boolean}
          */
         this.frozen = false;
-        this.$seal();
+        this.seal();
     }
-    $destroy() {
-        var _a;
-        this.watch.forEach(value => value.$destroy());
+    destroy() {
+        this.watch.forEach(value => value.destroy());
         this.watch.clear();
-        this.bindings.forEach(binding => binding.$destroy());
+        this.bindings.forEach(binding => binding.destroy());
         this.bindings.clear();
-        (_a = this.freezeExpr) === null || _a === void 0 ? void 0 : _a.$destroy();
-        super.$destroy();
+        this.models.forEach(model => model.disableReactivity());
+        this.models.clear();
+        this.freezeExpr && this.freezeExpr.destroy();
+        this.onDestroy && this.onDestroy();
+        super.destroy();
     }
 }
 /**
@@ -1288,15 +1605,23 @@ class ReactivePrivate extends Destroyable {
  * @extends Destroyable
  */
 class Reactive extends Destroyable {
-    constructor($) {
+    constructor(input, $) {
         super();
+        this.input = input;
         this.$ = $ || new ReactivePrivate;
+        this.seal();
+    }
+    /**
+     * Get parent node
+     */
+    get parent() {
+        return this.$.parent;
     }
     /**
      * Create a reference
      * @param value {*} value to reference
      */
-    $ref(value) {
+    ref(value) {
         const $ = this.$;
         const ref = new Reference(value);
         $.watch.add(ref);
@@ -1306,7 +1631,7 @@ class Reactive extends Destroyable {
      * Create a mirror
      * @param value {IValue} value to mirror
      */
-    $mirror(value) {
+    mirror(value) {
         const mirror = new Mirror(value, false);
         this.$.watch.add(mirror);
         return mirror;
@@ -1315,7 +1640,7 @@ class Reactive extends Destroyable {
      * Create a forward-only mirror
      * @param value {IValue} value to mirror
      */
-    $forward(value) {
+    forward(value) {
         const mirror = new Mirror(value, true);
         this.$.watch.add(mirror);
         return mirror;
@@ -1325,14 +1650,9 @@ class Reactive extends Destroyable {
      * @param value {*} default value to point
      * @param forwardOnly {boolean} forward only sync
      */
-    $point(value, forwardOnly = false) {
+    point(value, forwardOnly = false) {
         const $ = this.$;
-        const ref = value instanceof IValue ? value : new Reference(value);
-        const pointer = new Pointer(ref, forwardOnly);
-        // when value is an ivalue will be equal to ref
-        if (value !== ref) {
-            $.watch.add(ref);
-        }
+        const pointer = new Pointer(value, forwardOnly);
         $.watch.add(pointer);
         return pointer;
     }
@@ -1340,16 +1660,27 @@ class Reactive extends Destroyable {
      * Register a model
      * @param model
      */
-    $register(model) {
+    register(model) {
         this.$.models.add(model);
         return model;
     }
-    $watch(func, v1, v2, v3, v4, v5, v6, v7, v8, v9) {
+    /**
+     * Creates a watcher
+     * @param func {function} function to run on any argument change
+     * @param values
+     */
+    watch(func, ...values) {
         const $ = this.$;
-        $.watch.add(new Expression(func, !this.$.frozen, v1, v2, v3, v4, v5, v6, v7, v8, v9));
+        $.watch.add(new Expression(func, !this.$.frozen, ...values));
     }
-    $bind(func, v1, v2, v3, v4, v5, v6, v7, v8, v9) {
-        const res = new Expression(func, !this.$.frozen, v1, v2, v3, v4, v5, v6, v7, v8, v9);
+    /**
+     * Creates a computed value
+     * @param func {function} function to run on any argument change
+     * @param values
+     * @return {IValue} the created ivalue
+     */
+    expr(func, ...values) {
+        const res = new Expression(func, !this.$.frozen, ...values);
         const $ = this.$;
         $.watch.add(res);
         return res;
@@ -1357,7 +1688,7 @@ class Reactive extends Destroyable {
     /**
      * Enable reactivity of fields
      */
-    $enable() {
+    enable() {
         const $ = this.$;
         if (!$.enabled) {
             $.watch.forEach(watcher => {
@@ -1372,7 +1703,7 @@ class Reactive extends Destroyable {
     /**
      * Disable reactivity of fields
      */
-    $disable() {
+    disable() {
         const $ = this.$;
         if ($.enabled) {
             $.watch.forEach(watcher => {
@@ -1390,7 +1721,7 @@ class Reactive extends Destroyable {
      * @param onOff {function} on show feedback
      * @param onOn {function} on hide feedback
      */
-    $bindAlive(cond, onOff, onOn) {
+    bindAlive(cond, onOff, onOn) {
         const $ = this.$;
         if ($.freezeExpr) {
             throw wrongBinding("this component already have a freeze state");
@@ -1402,18 +1733,40 @@ class Reactive extends Destroyable {
             $.frozen = !cond;
             if (cond) {
                 onOn === null || onOn === void 0 ? void 0 : onOn();
-                this.$enable();
+                this.enable();
             }
             else {
                 onOff === null || onOff === void 0 ? void 0 : onOff();
-                this.$disable();
+                this.disable();
             }
         }, true, cond);
         return this;
     }
-    $destroy() {
-        super.$destroy();
-        this.$.$destroy();
+    init() {
+        this.applyOptions(this.input);
+        this.compose(this.input);
+    }
+    applyOptions(input) {
+        // empty
+    }
+    compose(input) {
+        // empty
+    }
+    runFunctional(f, ...args) {
+        stack(this);
+        // yet another ts bug
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore
+        const result = f(...args);
+        unstack();
+        return result;
+    }
+    runOnDestroy(func) {
+        this.$.onDestroy = func;
+    }
+    destroy() {
+        super.destroy();
+        this.$.destroy();
         this.$ = null;
     }
 }
@@ -1430,7 +1783,7 @@ window.Reactive = Reactive;
 class FragmentPrivate extends ReactivePrivate {
     constructor() {
         super();
-        this.$seal();
+        this.seal();
     }
     /**
      * Pre-initializes the base of a fragment
@@ -1444,10 +1797,10 @@ class FragmentPrivate extends ReactivePrivate {
     /**
      * Unlinks all bindings
      */
-    $destroy() {
+    destroy() {
         this.next = null;
         this.prev = null;
-        super.$destroy();
+        super.destroy();
     }
 }
 /**
@@ -1457,16 +1810,17 @@ class FragmentPrivate extends ReactivePrivate {
 class Fragment extends Reactive {
     /**
      * Constructs a Vasille Node
+     * @param input
      * @param $ {FragmentPrivate}
      */
-    constructor($) {
-        super();
+    constructor(input, $) {
+        super(input, $ || new FragmentPrivate);
         /**
          * The children list
          * @type Array
          */
-        this.$children = [];
-        this.$ = $ || new FragmentPrivate;
+        this.children = new Set;
+        this.lastChild = null;
     }
     /**
      * Gets the app of node
@@ -1480,43 +1834,16 @@ class Fragment extends Reactive {
      * @param parent {Fragment} parent of node
      * @param data {*} additional data
      */
-    $preinit(app, parent, data) {
+    preinit(app, parent, data) {
         const $ = this.$;
         $.preinit(app, parent);
     }
-    /**
-     * Initialize node
-     */
-    $init() {
-        this.$createSignals();
-        this.$createWatchers();
-        this.$created();
-        this.$compose();
-        this.$mounted();
-        return this;
-    }
-    /** To be overloaded: created event handler */
-    $created() {
-        // empty
-    }
-    /** To be overloaded: mounted event handler */
-    $mounted() {
-        // empty
+    compose(input) {
+        super.compose(input);
+        input.slot && input.slot(this);
     }
     /** To be overloaded: ready event handler */
-    $ready() {
-        // empty
-    }
-    /** To be overloaded: signals creation milestone */
-    $createSignals() {
-        // empty
-    }
-    /** To be overloaded: watchers creation milestone */
-    $createWatchers() {
-        // empty
-    }
-    /** To be overloaded: DOM creation milestone */
-    $compose() {
+    ready() {
         // empty
     }
     /**
@@ -1524,27 +1851,23 @@ class Fragment extends Reactive {
      * @param node {Fragment} A node to push
      * @protected
      */
-    $$pushNode(node) {
-        let lastChild = null;
-        if (this.$children.length) {
-            lastChild = this.$children[this.$children.length - 1];
-        }
-        if (lastChild) {
-            lastChild.$.next = node;
+    pushNode(node) {
+        if (this.lastChild) {
+            this.lastChild.$.next = node;
         }
-        node.$.prev = lastChild;
-        node.$.parent = this;
-        this.$children.push(node);
+        node.$.prev = this.lastChild;
+        this.lastChild = node;
+        this.children.add(node);
     }
     /**
      * Find first node in element if so exists
      * @return {?Element}
      * @protected
      */
-    $$findFirstChild() {
+    findFirstChild() {
         let first;
-        this.$children.forEach(child => {
-            first = first || child.$$findFirstChild();
+        this.children.forEach(child => {
+            first = first || child.findFirstChild();
         });
         return first;
     }
@@ -1552,30 +1875,30 @@ class Fragment extends Reactive {
      * Append a node to end of element
      * @param node {Node} node to insert
      */
-    $$appendNode(node) {
+    appendNode(node) {
         const $ = this.$;
         if ($.next) {
-            $.next.$$insertAdjacent(node);
+            $.next.insertAdjacent(node);
         }
         else {
-            $.parent.$$appendNode(node);
+            $.parent.appendNode(node);
         }
     }
     /**
      * Insert a node as a sibling of this
      * @param node {Node} node to insert
      */
-    $$insertAdjacent(node) {
-        const child = this.$$findFirstChild();
+    insertAdjacent(node) {
+        const child = this.findFirstChild();
         const $ = this.$;
         if (child) {
-            $.app.$run.insertBefore(child, node);
+            child.parentElement.insertBefore(node, child);
         }
         else if ($.next) {
-            $.next.$$insertAdjacent(node);
+            $.next.insertAdjacent(node);
         }
         else {
-            $.parent.$$appendNode(node);
+            $.parent.appendNode(node);
         }
     }
     /**
@@ -1583,60 +1906,49 @@ class Fragment extends Reactive {
      * @param text {String | IValue} A text fragment string
      * @param cb {function (TextNode)} Callback if previous is slot name
      */
-    $text(text, cb) {
+    text(text, cb) {
         const $ = this.$;
         const node = new TextNode();
-        const textValue = text instanceof IValue ? text : this.$ref(text);
-        node.$preinit($.app, this, textValue);
-        this.$$pushNode(node);
-        if (cb) {
-            $.app.$run.callCallback(() => {
-                cb(node);
-            });
-        }
-        return this;
+        node.preinit($.app, this, text);
+        this.pushNode(node);
+        cb && cb(node);
     }
-    $debug(text) {
-        if (this.$.app.$debugUi) {
+    debug(text) {
+        if (this.$.app.debugUi) {
             const node = new DebugNode();
-            node.$preinit(this.$.app, this, text);
-            this.$$pushNode(node);
+            node.preinit(this.$.app, this, text);
+            this.pushNode(node);
         }
-        return this;
     }
-    $tag(tagName, cb) {
+    /**
+     * Defines a tag element
+     * @param tagName {String} the tag name
+     * @param input
+     * @param cb {function(Tag, *)} callback
+     */
+    tag(tagName, input, cb) {
         const $ = this.$;
-        const node = new Tag();
-        node.$preinit($.app, this, tagName);
-        node.$init();
-        this.$$pushNode(node);
-        $.app.$run.callCallback(() => {
-            if (cb) {
-                cb(node, node.node);
-            }
-            node.$ready();
-        });
-        return this;
+        const node = new Tag(input);
+        input.slot = cb || input.slot;
+        node.preinit($.app, this, tagName);
+        node.init();
+        this.pushNode(node);
+        node.ready();
+        return node.node;
     }
     /**
      * Defines a custom element
      * @param node {Fragment} vasille element to insert
      * @param callback {function($ : *)}
-     * @param callback1 {function($ : *)}
      */
-    $create(node, callback, callback1) {
+    create(node, callback) {
         const $ = this.$;
         node.$.parent = this;
-        node.$preinit($.app, this);
-        if (callback) {
-            callback(node);
-        }
-        if (callback1) {
-            callback1(node);
-        }
-        this.$$pushNode(node);
-        node.$init().$ready();
-        return this;
+        node.preinit($.app, this);
+        node.input.slot = callback || node.input.slot;
+        this.pushNode(node);
+        node.init();
+        node.ready();
     }
     /**
      * Defines an if node
@@ -1644,32 +1956,29 @@ class Fragment extends Reactive {
      * @param cb {function(Fragment)} callback to run on true
      * @return {this}
      */
-    $if(cond, cb) {
-        return this.$switch({ cond, cb });
+    if(cond, cb) {
+        const node = new SwitchedNode();
+        node.preinit(this.$.app, this);
+        node.init();
+        this.pushNode(node);
+        node.addCase(this.case(cond, cb));
+        node.ready();
     }
-    /**
-     * Defines a if-else node
-     * @param ifCond {IValue} `if` condition
-     * @param ifCb {function(Fragment)} Call-back to create `if` child nodes
-     * @param elseCb {function(Fragment)} Call-back to create `else` child nodes
-     */
-    $if_else(ifCond, ifCb, elseCb) {
-        return this.$switch({ cond: ifCond, cb: ifCb }, { cond: trueIValue, cb: elseCb });
+    else(cb) {
+        if (this.lastChild instanceof SwitchedNode) {
+            this.lastChild.addCase(this.default(cb));
+        }
+        else {
+            throw userError('wrong `else` function use', 'logic-error');
+        }
     }
-    /**
-     * Defines a switch nodes: Will break after first true condition
-     * @param cases {...{ cond : IValue, cb : function(Fragment) }} cases
-     * @return {INode}
-     */
-    $switch(...cases) {
-        const $ = this.$;
-        const node = new SwitchedNode();
-        node.$preinit($.app, this);
-        node.$init();
-        this.$$pushNode(node);
-        node.setCases(cases);
-        node.$ready();
-        return this;
+    elif(cond, cb) {
+        if (this.lastChild instanceof SwitchedNode) {
+            this.lastChild.addCase(this.case(cond, cb));
+        }
+        else {
+            throw userError('wrong `elif` function use', 'logic-error');
+        }
     }
     /**
      * Create a case for switch
@@ -1677,22 +1986,48 @@ class Fragment extends Reactive {
      * @param cb {function(Fragment) : void}
      * @return {{cond : IValue, cb : (function(Fragment) : void)}}
      */
-    $case(cond, cb) {
+    case(cond, cb) {
         return { cond, cb };
     }
     /**
      * @param cb {(function(Fragment) : void)}
      * @return {{cond : IValue, cb : (function(Fragment) : void)}}
      */
-    $default(cb) {
+    default(cb) {
         return { cond: trueIValue, cb };
     }
-    $destroy() {
-        for (const child of this.$children) {
-            child.$destroy();
+    insertBefore(node) {
+        const $ = this.$;
+        node.$.prev = $.prev;
+        node.$.next = this;
+        if ($.prev) {
+            $.prev.$.next = node;
+        }
+        $.prev = node;
+    }
+    insertAfter(node) {
+        const $ = this.$;
+        node.$.prev = this;
+        node.$.next = $.next;
+        $.next = node;
+    }
+    remove() {
+        const $ = this.$;
+        if ($.next) {
+            $.next.$.prev = $.prev;
+        }
+        if ($.prev) {
+            $.prev.$.next = $.next;
+        }
+    }
+    destroy() {
+        this.children.forEach(child => child.destroy());
+        this.children.clear();
+        this.lastChild = null;
+        if (this.$.parent.lastChild === this) {
+            this.$.parent.lastChild = this.$.prev;
         }
-        this.$children.splice(0);
-        super.$destroy();
+        super.destroy();
     }
 }
 const trueIValue = new Reference(true);
@@ -1704,26 +2039,28 @@ const trueIValue = new Reference(true);
 class TextNodePrivate extends FragmentPrivate {
     constructor() {
         super();
-        this.$seal();
+        this.seal();
     }
     /**
      * Pre-initializes a text node
      * @param app {AppNode} the app node
+     * @param parent
      * @param text {IValue}
      */
     preinitText(app, parent, text) {
         super.preinit(app, parent);
-        this.node = document.createTextNode(text.$);
-        this.bindings.add(new Expression((v) => {
-            this.node.replaceData(0, -1, v);
-        }, true, text));
-        this.parent.$$appendNode(this.node);
+        this.node = document.createTextNode(text instanceof IValue ? text.$ : text);
+        if (text instanceof IValue) {
+            this.bindings.add(new Expression((v) => {
+                this.node.replaceData(0, -1, v);
+            }, true, text));
+        }
     }
     /**
      * Clear node data
      */
-    $destroy() {
-        super.$destroy();
+    destroy() {
+        super.destroy();
     }
 }
 /**
@@ -1732,25 +2069,25 @@ class TextNodePrivate extends FragmentPrivate {
  * @extends Fragment
  */
 class TextNode extends Fragment {
-    constructor() {
-        super();
-        this.$ = new TextNodePrivate();
-        this.$seal();
+    constructor($ = new TextNodePrivate()) {
+        super({}, $);
+        this.seal();
     }
-    $preinit(app, parent, text) {
+    preinit(app, parent, text) {
         const $ = this.$;
         if (!text) {
             throw internalError('wrong TextNode::$preninit call');
         }
         $.preinitText(app, parent, text);
+        $.parent.appendNode($.node);
     }
-    $$findFirstChild() {
+    findFirstChild() {
         return this.$.node;
     }
-    $destroy() {
+    destroy() {
         this.$.node.remove();
-        this.$.$destroy();
-        super.$destroy();
+        this.$.destroy();
+        super.destroy();
     }
 }
 /**
@@ -1766,10 +2103,10 @@ class INodePrivate extends FragmentPrivate {
          * @type {boolean}
          */
         this.unmounted = false;
-        this.$seal();
+        this.seal();
     }
-    $destroy() {
-        super.$destroy();
+    destroy() {
+        super.destroy();
     }
 }
 /**
@@ -1780,11 +2117,12 @@ class INodePrivate extends FragmentPrivate {
 class INode extends Fragment {
     /**
      * Constructs a base node
+     * @param input
      * @param $ {?INodePrivate}
      */
-    constructor($) {
-        super($ || new INodePrivate);
-        this.$seal();
+    constructor(input, $) {
+        super(input, $ || new INodePrivate);
+        this.seal();
     }
     /**
      * Get the bound node
@@ -1792,78 +2130,55 @@ class INode extends Fragment {
     get node() {
         return this.$.node;
     }
-    /**
-     * Initialize node
-     */
-    $init() {
-        this.$createSignals();
-        this.$createWatchers();
-        this.$createAttrs();
-        this.$createStyle();
-        this.$created();
-        this.$compose();
-        this.$mounted();
-        return this;
-    }
-    /** To be overloaded: attributes creation milestone */
-    $createAttrs() {
-        // empty
-    }
-    /** To be overloaded: $style attributes creation milestone */
-    $createStyle() {
-        // empty
-    }
     /**
      * Bind attribute value
      * @param name {String} name of attribute
      * @param value {IValue} value
      */
-    $attr(name, value) {
+    attr(name, value) {
         const $ = this.$;
         const attr = new AttributeBinding(this, name, value);
         $.bindings.add(attr);
-        return this;
-    }
-    $bindAttr(name, calculator, v1, v2, v3, v4, v5, v6, v7, v8, v9) {
-        const $ = this.$;
-        const expr = this.$bind(calculator, v1, v2, v3, v4, v5, v6, v7, v8, v9);
-        $.bindings.add(new AttributeBinding(this, name, expr));
-        return this;
     }
     /**
      * Set attribute value
      * @param name {string} name of attribute
      * @param value {string} value
      */
-    $setAttr(name, value) {
-        this.$.app.$run.setAttribute(this.$.node, name, value);
+    setAttr(name, value) {
+        if (typeof value === 'boolean') {
+            if (value) {
+                this.$.node.setAttribute(name, "");
+            }
+        }
+        else {
+            this.$.node.setAttribute(name, `${value}`);
+        }
         return this;
     }
     /**
      * Adds a CSS class
      * @param cl {string} Class name
      */
-    $addClass(cl) {
-        this.$.app.$run.addClass(this.$.node, cl);
+    addClass(cl) {
+        this.$.node.classList.add(cl);
         return this;
     }
     /**
      * Adds some CSS classes
      * @param cls {...string} classes names
      */
-    $addClasses(...cls) {
-        cls.forEach(cl => {
-            this.$.app.$run.addClass(this.$.node, cl);
-        });
+    removeClasse(cl) {
+        this.$.node.classList.remove(cl);
         return this;
     }
     /**
      * Bind a CSS class
      * @param className {IValue}
      */
-    $bindClass(className) {
+    bindClass(className) {
         const $ = this.$;
-        $.bindings.add(new ClassBinding(this, "", className));
+        $.bindings.add(new DynamicalClassBinding(this, className));
         return this;
     }
     /**
@@ -1871,8 +2186,8 @@ class INode extends Fragment {
      * @param cond {IValue} condition
      * @param className {string} class name
      */
-    $floatingClass(cond, className) {
-        this.$.bindings.add(new ClassBinding(this, className, cond));
+    floatingClass(cond, className) {
+        this.$.bindings.add(new StaticClassBinding(this, className, cond));
         return this;
     }
     /**
@@ -1880,7 +2195,7 @@ class INode extends Fragment {
      * @param name {String} name of style attribute
      * @param value {IValue} value
      */
-    $style(name, value) {
+    style(name, value) {
         const $ = this.$;
         if ($.node instanceof HTMLElement) {
             $.bindings.add(new StyleBinding(this, name, value));
@@ -1890,28 +2205,17 @@ class INode extends Fragment {
         }
         return this;
     }
-    $bindStyle(name, calculator, v1, v2, v3, v4, v5, v6, v7, v8, v9) {
-        const $ = this.$;
-        const expr = this.$bind(calculator, v1, v2, v3, v4, v5, v6, v7, v8, v9);
-        if ($.node instanceof HTMLElement) {
-            $.bindings.add(new StyleBinding(this, name, expr));
-        }
-        else {
-            throw userError('style can be applied to HTML elements only', 'non-html-element');
-        }
-        return this;
-    }
     /**
      * Sets a style property value
      * @param prop {string} Property name
      * @param value {string} Property value
      */
-    $setStyle(prop, value) {
+    setStyle(prop, value) {
         if (this.$.node instanceof HTMLElement) {
-            this.$.app.$run.setStyle(this.$.node, prop, value);
+            this.$.node.style.setProperty(prop, value);
         }
         else {
-            throw userError("Style can be setted for HTML elements only", "non-html-element");
+            throw userError("Style can be set for HTML elements only", "non-html-element");
         }
         return this;
     }
@@ -1921,403 +2225,24 @@ class INode extends Fragment {
      * @param handler {function (Event)} Event handler
      * @param options {Object | boolean} addEventListener options
      */
-    $listen(name, handler, options) {
+    listen(name, handler, options) {
         this.$.node.addEventListener(name, handler, options);
         return this;
     }
-    /**
-     * @param handler {function (MouseEvent)}
-     * @param options {Object | boolean}
-     */
-    $oncontextmenu(handler, options) {
-        return this.$listen("contextmenu", handler, options);
-    }
-    /**
-     * @param handler {function (MouseEvent)}
-     * @param options {Object | boolean}
-     */
-    $onmousedown(handler, options) {
-        return this.$listen("mousedown", handler, options);
-    }
-    /**
-     * @param handler {function (MouseEvent)}
-     * @param options {Object | boolean}
-     */
-    $onmouseenter(handler, options) {
-        return this.$listen("mouseenter", handler, options);
+    insertAdjacent(node) {
+        this.$.node.parentNode.insertBefore(node, this.$.node);
     }
     /**
-     * @param handler {function (MouseEvent)}
-     * @param options {Object | boolean}
+     * A v-show & ngShow alternative
+     * @param cond {IValue} show condition
      */
-    $onmouseleave(handler, options) {
-        return this.$listen("mouseleave", handler, options);
-    }
-    /**
-     * @param handler {function (MouseEvent)}
-     * @param options {Object | boolean}
-     */
-    $onmousemove(handler, options) {
-        return this.$listen("mousemove", handler, options);
-    }
-    /**
-     * @param handler {function (MouseEvent)}
-     * @param options {Object | boolean}
-     */
-    $onmouseout(handler, options) {
-        return this.$listen("mouseout", handler, options);
-    }
-    /**
-     * @param handler {function (MouseEvent)}
-     * @param options {Object | boolean}
-     */
-    $onmouseover(handler, options) {
-        return this.$listen("mouseover", handler, options);
-    }
-    /**
-     * @param handler {function (MouseEvent)}
-     * @param options {Object | boolean}
-     */
-    $onmouseup(handler, options) {
-        return this.$listen("mouseup", handler, options);
-    }
-    /**
-     * @param handler {function (MouseEvent)}
-     * @param options {Object | boolean}
-     */
-    $onclick(handler, options) {
-        return this.$listen("click", handler, options);
-    }
-    /**
-     * @param handler {function (MouseEvent)}
-     * @param options {Object | boolean}
-     */
-    $ondblclick(handler, options) {
-        return this.$listen("dblclick", handler, options);
-    }
-    /**
-     * @param handler {function (FocusEvent)}
-     * @param options {Object | boolean}
-     */
-    $onblur(handler, options) {
-        return this.$listen("blur", handler, options);
-    }
-    /**
-     * @param handler {function (FocusEvent)}
-     * @param options {Object | boolean}
-     */
-    $onfocus(handler, options) {
-        return this.$listen("focus", handler, options);
-    }
-    /**
-     * @param handler {function (FocusEvent)}
-     * @param options {Object | boolean}
-     */
-    $onfocusin(handler, options) {
-        return this.$listen("focusin", handler, options);
-    }
-    /**
-     * @param handler {function (FocusEvent)}
-     * @param options {Object | boolean}
-     */
-    $onfocusout(handler, options) {
-        return this.$listen("focusout", handler, options);
-    }
-    /**
-     * @param handler {function (KeyboardEvent)}
-     * @param options {Object | boolean}
-     */
-    $onkeydown(handler, options) {
-        return this.$listen("keydown", handler, options);
-    }
-    /**
-     * @param handler {function (KeyboardEvent)}
-     * @param options {Object | boolean}
-     */
-    $onkeyup(handler, options) {
-        return this.$listen("keyup", handler, options);
-    }
-    /**
-     * @param handler {function (KeyboardEvent)}
-     * @param options {Object | boolean}
-     */
-    $onkeypress(handler, options) {
-        return this.$listen("keypress", handler, options);
-    }
-    /**
-     * @param handler {function (TouchEvent)}
-     * @param options {Object | boolean}
-     */
-    $ontouchstart(handler, options) {
-        return this.$listen("touchstart", handler, options);
-    }
-    /**
-     * @param handler {function (TouchEvent)}
-     * @param options {Object | boolean}
-     */
-    $ontouchmove(handler, options) {
-        return this.$listen("touchmove", handler, options);
-    }
-    /**
-     * @param handler {function (TouchEvent)}
-     * @param options {Object | boolean}
-     */
-    $ontouchend(handler, options) {
-        return this.$listen("touchend", handler, options);
-    }
-    /**
-     * @param handler {function (TouchEvent)}
-     * @param options {Object | boolean}
-     */
-    $ontouchcancel(handler, options) {
-        return this.$listen("touchcancel", handler, options);
-    }
-    /**
-     * @param handler {function (WheelEvent)}
-     * @param options {Object | boolean}
-     */
-    $onwheel(handler, options) {
-        return this.$listen("wheel", handler, options);
-    }
-    /**
-     * @param handler {function (ProgressEvent)}
-     * @param options {Object | boolean}
-     */
-    $onabort(handler, options) {
-        return this.$listen("abort", handler, options);
-    }
-    /**
-     * @param handler {function (ProgressEvent)}
-     * @param options {Object | boolean}
-     */
-    $onerror(handler, options) {
-        return this.$listen("error", handler, options);
-    }
-    /**
-     * @param handler {function (ProgressEvent)}
-     * @param options {Object | boolean}
-     */
-    $onload(handler, options) {
-        return this.$listen("load", handler, options);
-    }
-    /**
-     * @param handler {function (ProgressEvent)}
-     * @param options {Object | boolean}
-     */
-    $onloadend(handler, options) {
-        return this.$listen("loadend", handler, options);
-    }
-    /**
-     * @param handler {function (ProgressEvent)}
-     * @param options {Object | boolean}
-     */
-    $onloadstart(handler, options) {
-        return this.$listen("loadstart", handler, options);
-    }
-    /**
-     * @param handler {function (ProgressEvent)}
-     * @param options {Object | boolean}
-     */
-    $onprogress(handler, options) {
-        return this.$listen("progress", handler, options);
-    }
-    /**
-     * @param handler {function (ProgressEvent)}
-     * @param options {Object | boolean}
-     */
-    $ontimeout(handler, options) {
-        return this.$listen("timeout", handler, options);
-    }
-    /**
-     * @param handler {function (DragEvent)}
-     * @param options {Object | boolean}
-     */
-    $ondrag(handler, options) {
-        return this.$listen("drag", handler, options);
-    }
-    /**
-     * @param handler {function (DragEvent)}
-     * @param options {Object | boolean}
-     */
-    $ondragend(handler, options) {
-        return this.$listen("dragend", handler, options);
-    }
-    /**
-     * @param handler {function (DragEvent)}
-     * @param options {Object | boolean}
-     */
-    $ondragenter(handler, options) {
-        return this.$listen("dragenter", handler, options);
-    }
-    /**
-     * @param handler {function (DragEvent)}
-     * @param options {Object | boolean}
-     */
-    $ondragexit(handler, options) {
-        return this.$listen("dragexit", handler, options);
-    }
-    /**
-     * @param handler {function (DragEvent)}
-     * @param options {Object | boolean}
-     */
-    $ondragleave(handler, options) {
-        return this.$listen("dragleave", handler, options);
-    }
-    /**
-     * @param handler {function (DragEvent)}
-     * @param options {Object | boolean}
-     */
-    $ondragover(handler, options) {
-        return this.$listen("dragover", handler, options);
-    }
-    /**
-     * @param handler {function (DragEvent)}
-     * @param options {Object | boolean}
-     */
-    $ondragstart(handler, options) {
-        return this.$listen("dragstart", handler, options);
-    }
-    /**
-     * @param handler {function (DragEvent)}
-     * @param options {Object | boolean}
-     */
-    $ondrop(handler, options) {
-        return this.$listen("drop", handler, options);
-    }
-    /**
-     * @param handler {function (PointerEvent)}
-     * @param options {Object | boolean}
-     */
-    $onpointerover(handler, options) {
-        return this.$listen("pointerover", handler, options);
-    }
-    /**
-     * @param handler {function (PointerEvent)}
-     * @param options {Object | boolean}
-     */
-    $onpointerenter(handler, options) {
-        return this.$listen("pointerenter", handler, options);
-    }
-    /**
-     * @param handler {function (PointerEvent)}
-     * @param options {Object | boolean}
-     */
-    $onpointerdown(handler, options) {
-        return this.$listen("pointerdown", handler, options);
-    }
-    /**
-     * @param handler {function (PointerEvent)}
-     * @param options {Object | boolean}
-     */
-    $onpointermove(handler, options) {
-        return this.$listen("pointermove", handler, options);
-    }
-    /**
-     * @param handler {function (PointerEvent)}
-     * @param options {Object | boolean}
-     */
-    $onpointerup(handler, options) {
-        return this.$listen("pointerup", handler, options);
-    }
-    /**
-     * @param handler {function (PointerEvent)}
-     * @param options {Object | boolean}
-     */
-    $onpointercancel(handler, options) {
-        return this.$listen("pointercancel", handler, options);
-    }
-    /**
-     * @param handler {function (PointerEvent)}
-     * @param options {Object | boolean}
-     */
-    $onpointerout(handler, options) {
-        return this.$listen("pointerout", handler, options);
-    }
-    /**
-     * @param handler {function (PointerEvent)}
-     * @param options {Object | boolean}
-     */
-    $onpointerleave(handler, options) {
-        return this.$listen("pointerleave", handler, options);
-    }
-    /**
-     * @param handler {function (PointerEvent)}
-     * @param options {Object | boolean}
-     */
-    $ongotpointercapture(handler, options) {
-        return this.$listen("gotpointercapture", handler, options);
-    }
-    /**
-     * @param handler {function (PointerEvent)}
-     * @param options {Object | boolean}
-     */
-    $onlostpointercapture(handler, options) {
-        return this.$listen("lostpointercapture", handler, options);
-    }
-    /**
-     * @param handler {function (AnimationEvent)}
-     * @param options {Object | boolean}
-     */
-    $onanimationstart(handler, options) {
-        return this.$listen("animationstart", handler, options);
-    }
-    /**
-     * @param handler {function (AnimationEvent)}
-     * @param options {Object | boolean}
-     */
-    $onanimationend(handler, options) {
-        return this.$listen("animationend", handler, options);
-    }
-    /**
-     * @param handler {function (AnimationEvent)}
-     * @param options {Object | boolean}
-     */
-    $onanimationiteraton(handler, options) {
-        return this.$listen("animationiteration", handler, options);
-    }
-    /**
-     * @param handler {function (ClipboardEvent)}
-     * @param options {Object | boolean}
-     */
-    $onclipboardchange(handler, options) {
-        return this.$listen("clipboardchange", handler, options);
-    }
-    /**
-     * @param handler {function (ClipboardEvent)}
-     * @param options {Object | boolean}
-     */
-    $oncut(handler, options) {
-        return this.$listen("cut", handler, options);
-    }
-    /**
-     * @param handler {function (ClipboardEvent)}
-     * @param options {Object | boolean}
-     */
-    $oncopy(handler, options) {
-        return this.$listen("copy", handler, options);
-    }
-    /**
-     * @param handler {function (ClipboardEvent)}
-     * @param options {Object | boolean}
-     */
-    $onpaste(handler, options) {
-        return this.$listen("paste", handler, options);
-    }
-    $$insertAdjacent(node) {
-        const $ = this.$;
-        $.app.$run.insertBefore($.node, node);
-    }
-    /**
-     * A v-show & ngShow alternative
-     * @param cond {IValue} show condition
-     */
-    $bindShow(cond) {
+    bindShow(cond) {
         const $ = this.$;
         const node = $.node;
         if (node instanceof HTMLElement) {
             let lastDisplay = node.style.display;
             const htmlNode = node;
-            return this.$bindAlive(cond, () => {
+            return this.bindAlive(cond, () => {
                 lastDisplay = htmlNode.style.display;
                 htmlNode.style.display = 'none';
             }, () => {
@@ -2332,19 +2257,105 @@ class INode extends Fragment {
      * bind HTML
      * @param value {IValue}
      */
-    $html(value) {
+    bindDomApi(name, value) {
         const $ = this.$;
         const node = $.node;
         if (node instanceof HTMLElement) {
-            node.innerHTML = value.$;
-            this.$watch((v) => {
-                node.innerHTML = v;
+            node[name] = value.$;
+            this.watch((v) => {
+                node[name] = v;
             }, value);
         }
         else {
             throw userError("HTML can be bound for HTML nodes only", "dom-error");
         }
     }
+    applyOptions(options) {
+        options["v:attr"] && Object.keys(options["v:attr"]).forEach(name => {
+            const value = options["v:attr"][name];
+            if (value instanceof IValue) {
+                this.attr(name, value);
+            }
+            else {
+                this.setAttr(name, value);
+            }
+        });
+        if (options.class) {
+            const handleClass = (name, value) => {
+                if (value instanceof IValue) {
+                    this.floatingClass(value, name);
+                }
+                else if (value && name !== '$') {
+                    this.addClass(name);
+                }
+                else {
+                    this.removeClasse(name);
+                }
+            };
+            if (Array.isArray(options.class)) {
+                options.class.forEach(item => {
+                    if (item instanceof IValue) {
+                        this.bindClass(item);
+                    }
+                    else if (typeof item == "string") {
+                        this.addClass(item);
+                    }
+                    else {
+                        Reflect.ownKeys(item).forEach((name) => {
+                            handleClass(name, item[name]);
+                        });
+                    }
+                });
+            }
+            else {
+                options.class.$.forEach(item => {
+                    this.bindClass(item);
+                });
+                Reflect.ownKeys(options.class).forEach((name) => {
+                    handleClass(name, options.class[name]);
+                });
+            }
+        }
+        options.style && Object.keys(options.style).forEach(name => {
+            const value = options.style[name];
+            if (value instanceof IValue) {
+                this.style(name, value);
+            }
+            else if (typeof value === "string") {
+                this.setStyle(name, value);
+            }
+            else {
+                if (value[0] instanceof IValue) {
+                    this.style(name, this.expr((v) => v + value[1], value[0]));
+                }
+                else {
+                    this.setStyle(name, value[0] + value[1]);
+                }
+            }
+        });
+        options["v:events"] && Object.keys(options["v:events"]).forEach(name => {
+            this.listen(name, options["v:events"][name]);
+        });
+        if (options["v:bind"]) {
+            const inode = this.node;
+            Reflect.ownKeys(options["v:bind"]).forEach((k) => {
+                const value = options["v:bind"][k];
+                if (k === 'value' && (inode instanceof HTMLInputElement || inode instanceof HTMLTextAreaElement)) {
+                    inode.oninput = () => value.$ = inode.value;
+                }
+                else if (k === 'checked' && inode instanceof HTMLInputElement) {
+                    inode.oninput = () => value.$ = inode.checked;
+                }
+                else if (k === 'volume' && inode instanceof HTMLMediaElement) {
+                    inode.onvolumechange = () => value.$ = inode.volume;
+                }
+                this.bindDomApi(k, value);
+            });
+        }
+        options["v:set"] && Object.keys(options["v:set"]).forEach(key => {
+            this.node[key] = options["v:set"][key];
+        });
+    }
 }
 /**
  * Represents an Vasille.js HTML element node
@@ -2352,11 +2363,11 @@ class INode extends Fragment {
  * @extends INode
  */
 class Tag extends INode {
-    constructor() {
-        super();
-        this.$seal();
+    constructor(input) {
+        super(input);
+        this.seal();
     }
-    $preinit(app, parent, tagName) {
+    preinit(app, parent, tagName) {
         if (!tagName || typeof tagName !== "string") {
             throw internalError('wrong Tag::$preinit call');
         }
@@ -2364,55 +2375,52 @@ class Tag extends INode {
         const $ = this.$;
         $.preinit(app, parent);
         $.node = node;
-        $.parent.$$appendNode(node);
+        $.parent.appendNode(node);
+    }
+    compose(input) {
+        input.slot && input.slot(this);
     }
-    $$findFirstChild() {
+    findFirstChild() {
         return this.$.unmounted ? null : this.$.node;
     }
-    $$insertAdjacent(node) {
+    insertAdjacent(node) {
         if (this.$.unmounted) {
             if (this.$.next) {
-                this.$.next.$$insertAdjacent(node);
+                this.$.next.insertAdjacent(node);
             }
             else {
-                this.$.parent.$$appendNode(node);
+                this.$.parent.appendNode(node);
             }
         }
         else {
-            super.$$insertAdjacent(node);
+            super.insertAdjacent(node);
         }
     }
-    $$appendNode(node) {
-        const $ = this.$;
-        $.app.$run.appendChild($.node, node);
+    appendNode(node) {
+        this.$.node.appendChild(node);
     }
     /**
      * Mount/Unmount a node
      * @param cond {IValue} show condition
      */
-    $bindMount(cond) {
+    bindMount(cond) {
         const $ = this.$;
-        return this.$bindAlive(cond, () => {
+        this.bindAlive(cond, () => {
             $.node.remove();
             $.unmounted = true;
         }, () => {
-            if (!$.unmounted)
-                return;
-            if ($.next) {
-                $.next.$$insertAdjacent($.node);
+            if ($.unmounted) {
+                this.insertAdjacent($.node);
+                $.unmounted = false;
             }
-            else {
-                $.parent.$$appendNode($.node);
-            }
-            $.unmounted = false;
         });
     }
     /**
      * Runs GC
      */
-    $destroy() {
+    destroy() {
         this.node.remove();
-        super.$destroy();
+        super.destroy();
     }
 }
 /**
@@ -2421,22 +2429,22 @@ class Tag extends INode {
  * @extends INode
  */
 class Extension extends INode {
-    $preinit(app, parent) {
-        if (parent instanceof INode) {
-            const $ = this.$;
-            $.preinit(app, parent);
-            $.node = parent.node;
+    preinit(app, parent) {
+        const $ = this.$;
+        let it = parent;
+        while (it && !(it instanceof INode)) {
+            it = it.parent;
         }
-        else {
-            throw internalError("A extension node can be encapsulated only in a tag/extension/component");
+        if (it && it instanceof INode) {
+            $.node = it.node;
+        }
+        $.preinit(app, parent);
+        if (!it) {
+            throw userError("A extension node can be encapsulated only in a tag/extension/component", "virtual-dom");
         }
     }
-    constructor($) {
-        super($);
-        this.$seal();
-    }
-    $destroy() {
-        super.$destroy();
+    destroy() {
+        super.destroy();
     }
 }
 /**
@@ -2445,45 +2453,49 @@ class Extension extends INode {
  * @extends Extension
  */
 class Component extends Extension {
-    constructor() {
-        super();
-        this.$seal();
-    }
-    $mounted() {
-        super.$mounted();
-        if (this.$children.length !== 1) {
-            throw userError("UserNode must have a child only", "dom-error");
+    ready() {
+        super.ready();
+        if (this.children.size !== 1) {
+            throw userError("Component must have a child only", "dom-error");
         }
-        const child = this.$children[0];
+        const child = this.lastChild;
         if (child instanceof Tag || child instanceof Component) {
             const $ = this.$;
             $.node = child.node;
         }
         else {
-            throw userError("UserNode child must be Tag or Component", "dom-error");
+            throw userError("Component child must be Tag or Component", "dom-error");
         }
     }
+    preinit(app, parent) {
+        this.$.preinit(app, parent);
+    }
 }
 /**
  * Private part of switch node
  * @class SwitchedNodePrivate
  * @extends INodePrivate
  */
-class SwitchedNodePrivate extends INodePrivate {
+class SwitchedNodePrivate extends FragmentPrivate {
     constructor() {
         super();
-        this.$seal();
+        /**
+         * Array of possible cases
+         * @type {Array<{cond : IValue<boolean>, cb : function(Fragment)}>}
+         */
+        this.cases = [];
+        this.seal();
     }
     /**
      * Runs GC
      */
-    $destroy() {
+    destroy() {
         this.cases.forEach(c => {
             delete c.cond;
             delete c.cb;
         });
         this.cases.splice(0);
-        super.$destroy();
+        super.destroy();
     }
 }
 /**
@@ -2494,7 +2506,7 @@ class SwitchedNode extends Fragment {
      * Constructs a switch node and define a sync function
      */
     constructor() {
-        super(new SwitchedNodePrivate);
+        super({}, new SwitchedNodePrivate);
         this.$.sync = () => {
             const $ = this.$;
             let i = 0;
@@ -2506,10 +2518,10 @@ class SwitchedNode extends Fragment {
             if (i === $.index) {
                 return;
             }
-            if ($.fragment) {
-                $.fragment.$destroy();
-                this.$children.splice(0);
-                $.fragment = null;
+            if (this.lastChild) {
+                this.lastChild.destroy();
+                this.children.clear();
+                this.lastChild = null;
             }
             if (i !== $.cases.length) {
                 $.index = i;
@@ -2519,43 +2531,38 @@ class SwitchedNode extends Fragment {
                 $.index = -1;
             }
         };
-        this.$seal();
+        this.seal();
     }
-    /**
-     * Set up switch cases
-     * @param cases {{ cond : IValue, cb : function(Fragment) }}
-     */
-    setCases(cases) {
-        const $ = this.$;
-        $.cases = [...cases];
+    addCase(case_) {
+        this.$.cases.push(case_);
+        case_.cond.on(this.$.sync);
+        this.$.sync();
     }
     /**
      * Creates a child node
      * @param cb {function(Fragment)} Call-back
      */
     createChild(cb) {
-        const node = new Fragment();
-        node.$preinit(this.$.app, this);
-        node.$init();
-        node.$ready();
-        this.$.fragment = node;
-        this.$children.push(node);
+        const node = new Fragment({});
+        node.preinit(this.$.app, this);
+        node.init();
+        this.lastChild = node;
+        this.children.add(node);
         cb(node);
     }
-    $ready() {
+    ready() {
         const $ = this.$;
-        super.$ready();
         $.cases.forEach(c => {
             c.cond.on($.sync);
         });
         $.sync();
     }
-    $destroy() {
+    destroy() {
         const $ = this.$;
         $.cases.forEach(c => {
             c.cond.off($.sync);
         });
-        super.$destroy();
+        super.destroy();
     }
 }
 /**
@@ -2564,7 +2571,7 @@ class SwitchedNode extends Fragment {
 class DebugPrivate extends FragmentPrivate {
     constructor() {
         super();
-        this.$seal();
+        this.seal();
     }
     /**
      * Pre-initializes a text node
@@ -2578,14 +2585,14 @@ class DebugPrivate extends FragmentPrivate {
         this.bindings.add(new Expression((v) => {
             this.node.replaceData(0, -1, v);
         }, true, text));
-        this.parent.$$appendNode(this.node);
+        this.parent.appendNode(this.node);
     }
     /**
      * Clear node data
      */
-    $destroy() {
+    destroy() {
         this.node.remove();
-        super.$destroy();
+        super.destroy();
     }
 }
 /**
@@ -2595,15 +2602,15 @@ class DebugPrivate extends FragmentPrivate {
  */
 class DebugNode extends Fragment {
     constructor() {
-        super();
+        super({});
         /**
          * private data
          * @type {DebugNode}
          */
         this.$ = new DebugPrivate();
-        this.$seal();
+        this.seal();
     }
-    $preinit(app, parent, text) {
+    preinit(app, parent, text) {
         const $ = this.$;
         if (!text) {
             throw internalError('wrong DebugNode::$preninit call');
@@ -2613,9 +2620,9 @@ class DebugNode extends Fragment {
     /**
      * Runs garbage collector
      */
-    $destroy() {
-        this.$.$destroy();
-        super.$destroy();
+    destroy() {
+        this.$.destroy();
+        super.destroy();
     }
 }
 
@@ -2629,6 +2636,7 @@ window.Tag = Tag;
 window.Extension = Extension;
 window.Component = Component;
 window.SwitchedNodePrivate = SwitchedNodePrivate;
+window.SwitchedNode = SwitchedNode;
 window.DebugPrivate = DebugPrivate;
 window.DebugNode = DebugNode;
 
@@ -2640,12 +2648,12 @@ window.DebugNode = DebugNode;
  */
 class AppNode extends INode {
     /**
-     * @param options {Object} Application options
+     * @param input
      */
-    constructor(options) {
-        super();
-        this.$run = (options === null || options === void 0 ? void 0 : options.executor) || ((options === null || options === void 0 ? void 0 : options.freezeUi) === false ? timeoutExecutor : instantExecutor);
-        this.$debugUi = (options === null || options === void 0 ? void 0 : options.debugUi) || false;
+    constructor(input) {
+        super(input);
+        this.debugUi = input.debugUi || false;
+        this.seal();
     }
 }
 /**
@@ -2657,22 +2665,33 @@ class App extends AppNode {
     /**
      * Constructs an app node
      * @param node {Element} The root of application
-     * @param options {Object} Application options
+     * @param input
      */
-    constructor(node, options) {
-        super(options);
+    constructor(node, input) {
+        super(input);
         this.$.node = node;
-        this.$preinit(this, this);
-        this.$seal();
+        this.preinit(this, this);
+        this.init();
+        this.seal();
     }
-    $$appendNode(node) {
-        const $ = this.$;
-        $.app.$run.appendChild($.node, node);
+    appendNode(node) {
+        this.$.node.appendChild(node);
+    }
+}
+class Portal extends AppNode {
+    constructor(input) {
+        super(input);
+        this.$.node = input.node;
+        this.seal();
+    }
+    appendNode(node) {
+        this.$.node.appendChild(node);
     }
 }
 
 window.AppNode = AppNode;
 window.App = App;
+window.Portal = Portal;
 
 // ./lib/node/interceptor.js
 /**
@@ -2722,8 +2741,8 @@ class Interceptor extends Destroyable {
             signal.unsubscribe(handler);
         });
     }
-    $destroy() {
-        super.$destroy();
+    destroy() {
+        super.destroy();
         this.signals.forEach(signal => {
             this.handlers.forEach(handler => {
                 signal.unsubscribe(handler);
@@ -2750,7 +2769,7 @@ class InterceptorNode extends Fragment {
          */
         this.slot = new Slot;
     }
-    $compose() {
+    compose() {
         this.slot.release(this, this.interceptor);
     }
 }
@@ -2772,22 +2791,21 @@ class AttributeBinding extends Binding {
      * @param value {IValue} value to bind
      */
     constructor(node, name, value) {
-        super(node, name, value);
-    }
-    /**
-     * Generates a function which updates the attribute value
-     * @param name {String} The name of attribute
-     * @returns {Function} a function which will update attribute value
-     */
-    bound(name) {
-        return function (node, value) {
+        super(value);
+        this.init((value) => {
             if (value) {
-                node.app.$run.setAttribute(node.node, name, value);
+                if (typeof value === 'boolean') {
+                    node.node.setAttribute(name, "");
+                }
+                else {
+                    node.node.setAttribute(name, `${value}`);
+                }
             }
             else {
-                node.app.$run.removeAttribute(node.node, name);
+                node.node.removeAttribute(name);
             }
-        };
+        });
+        this.seal();
     }
 }
 
@@ -2807,77 +2825,64 @@ class StyleBinding extends Binding {
      * @param value {IValue} the value to bind
      */
     constructor(node, name, value) {
-        super(node, name, value);
-    }
-    /**
-     * Generates a function to update style property value
-     * @param name {string}
-     * @returns {Function} a function to update style property
-     */
-    bound(name) {
-        return function (node, value) {
+        super(value);
+        this.init((value) => {
             if (node.node instanceof HTMLElement) {
-                node.app.$run.setStyle(node.node, name, value);
+                node.node.style.setProperty(name, value);
             }
-        };
+        });
+        this.seal();
     }
 }
 
 window.StyleBinding = StyleBinding;
 
 // ./lib/binding/class.js
-/**
- * Represents a HTML class binding description
- * @class ClassBinding
- * @extends Binding
- */
-class ClassBinding extends Binding {
-    /**
-     * Constructs an HTML class binding description
-     * @param node {INode} the vasille node
-     * @param name {String} the name of class
-     * @param value {IValue} the value to bind
-     */
+function addClass(node, cl) {
+    node.node.classList.add(cl);
+}
+function removeClass(node, cl) {
+    node.node.classList.remove(cl);
+}
+class StaticClassBinding extends Binding {
     constructor(node, name, value) {
-        super(node, name, value);
-        this.$seal();
-    }
-    /**
-     * Generates a function which updates the html class value
-     * @param name {String} The name of attribute
-     * @returns {Function} a function which will update attribute value
-     */
-    bound(name) {
-        let current = null;
-        function addClass(node, cl) {
-            node.app.$run.addClass(node.node, cl);
-        }
-        function removeClass(node, cl) {
-            node.app.$run.removeClass(node.node, cl);
-        }
-        return (node, value) => {
-            if (value !== current) {
-                if (typeof current === "string" && current !== "") {
-                    removeClass(node, current);
+        super(value);
+        this.current = false;
+        this.init((value) => {
+            if (value !== this.current) {
+                if (value) {
+                    addClass(node, name);
                 }
-                if (typeof value === "boolean") {
-                    if (value) {
-                        addClass(node, name);
-                    }
-                    else {
-                        removeClass(node, name);
-                    }
+                else {
+                    removeClass(node, name);
                 }
-                else if (typeof value === "string" && value !== "") {
+                this.current = value;
+            }
+        });
+        this.seal();
+    }
+}
+class DynamicalClassBinding extends Binding {
+    constructor(node, value) {
+        super(value);
+        this.current = "";
+        this.init((value) => {
+            if (this.current != value) {
+                if (this.current.length) {
+                    removeClass(node, this.current);
+                }
+                if (value.length) {
                     addClass(node, value);
                 }
-                current = value;
+                this.current = value;
             }
-        };
+        });
+        this.seal();
     }
 }
 
-window.ClassBinding = ClassBinding;
+window.StaticClassBinding = StaticClassBinding;
+window.DynamicalClassBinding = DynamicalClassBinding;
 
 // ./lib/views/repeat-node.js
 /**
@@ -2893,11 +2898,11 @@ class RepeatNodePrivate extends INodePrivate {
          * @type {Map}
          */
         this.nodes = new Map();
-        this.$seal();
+        this.seal();
     }
-    $destroy() {
+    destroy() {
         this.nodes.clear();
-        super.$destroy();
+        super.destroy();
     }
 }
 /**
@@ -2906,80 +2911,42 @@ class RepeatNodePrivate extends INodePrivate {
  * @extends Fragment
  */
 class RepeatNode extends Fragment {
-    constructor($) {
-        super($ || new RepeatNodePrivate);
+    constructor(input, $) {
+        super(input, $);
         /**
          * If false will use timeout executor, otherwise the app executor
          */
         this.freezeUi = true;
-        this.slot = new Slot;
     }
-    createChild(id, item, before) {
-        // TODO: Refactor: remove @ts-ignore
-        const node = new Fragment();
-        // eslint-disable-next-line
-        // @ts-ignore
-        const $ = node.$;
+    createChild(opts, id, item, before) {
+        const node = new Fragment({});
         this.destroyChild(id, item);
         if (before) {
-            $.next = before;
-            // eslint-disable-next-line
-            // @ts-ignore
-            $.prev = before.$.prev;
-            // eslint-disable-next-line
-            // @ts-ignore
-            before.$.prev = node;
-            if ($.prev) {
-                // eslint-disable-next-line
-                // @ts-ignore
-                $.prev.$.next = node;
-            }
-            this.$children.splice(this.$children.indexOf(before), 0, node);
+            this.children.add(node);
+            before.insertBefore(node);
         }
         else {
-            const lastChild = this.$children[this.$children.length - 1];
+            const lastChild = this.lastChild;
             if (lastChild) {
-                // eslint-disable-next-line
-                // @ts-ignore
-                lastChild.$.next = node;
+                lastChild.insertAfter(node);
             }
-            $.prev = lastChild;
-            this.$children.push(node);
-        }
-        node.$preinit(this.$.app, this);
-        node.$init();
-        const callback = () => {
-            this.slot.release(node, item, id);
-            node.$ready();
-        };
-        if (this.freezeUi) {
-            this.$.app.$run.callCallback(callback);
-        }
-        else {
-            timeoutExecutor.callCallback(callback);
+            this.children.add(node);
         }
+        this.lastChild = node;
+        node.preinit(this.$.app, this);
+        node.init();
+        opts.slot && opts.slot(node, item, id);
+        node.ready();
         this.$.nodes.set(id, node);
     }
     destroyChild(id, item) {
         const $ = this.$;
         const child = $.nodes.get(id);
         if (child) {
-            // eslint-disable-next-line
-            // @ts-ignore
-            const $ = child.$;
-            if ($.prev) {
-                // eslint-disable-next-line
-                // @ts-ignore
-                $.prev.$.next = $.next;
-            }
-            if ($.next) {
-                // eslint-disable-next-line
-                // @ts-ignore
-                $.next.$.prev = $.prev;
-            }
-            child.$destroy();
+            child.remove();
+            child.destroy();
             this.$.nodes.delete(id);
-            this.$children.splice(this.$children.indexOf(child), 1);
+            this.children.delete(child);
         }
     }
 }
@@ -3000,7 +2967,7 @@ class RepeaterPrivate extends RepeatNodePrivate {
          * Current count of child nodes
          */
         this.currentCount = 0;
-        this.$seal();
+        this.seal();
     }
 }
 /**
@@ -3015,7 +2982,7 @@ class Repeater extends RepeatNode {
          * The count of children
          */
         this.count = new Reference(0);
-        this.$seal();
+        this.seal();
     }
     /**
      * Changes the children count
@@ -3034,18 +3001,18 @@ class Repeater extends RepeatNode {
         }
         $.currentCount = number;
     }
-    $created() {
+    created() {
         const $ = this.$;
-        super.$created();
+        super.created();
         $.updateHandler = this.changeCount.bind(this);
         this.count.on($.updateHandler);
     }
-    $ready() {
+    ready() {
         this.changeCount(this.count.$);
     }
-    $destroy() {
+    destroy() {
         const $ = this.$;
-        super.$destroy();
+        super.destroy();
         this.count.off($.updateHandler);
     }
 }
@@ -3062,7 +3029,7 @@ window.Repeater = Repeater;
 class BaseViewPrivate extends RepeatNodePrivate {
     constructor() {
         super();
-        this.$seal();
+        this.seal();
     }
 }
 /**
@@ -3072,34 +3039,23 @@ class BaseViewPrivate extends RepeatNodePrivate {
  * @implements IModel
  */
 class BaseView extends RepeatNode {
-    constructor($1) {
-        super($1 || new BaseViewPrivate);
+    constructor(input, $) {
+        super(input, $ || new BaseViewPrivate);
+    }
+    compose(input) {
         const $ = this.$;
         $.addHandler = (id, item) => {
-            this.createChild(id, item);
+            this.createChild(input, id, item);
         };
         $.removeHandler = (id, item) => {
             this.destroyChild(id, item);
         };
-        this.$seal();
-    }
-    /**
-     * Handle ready event
-     */
-    $ready() {
-        const $ = this.$;
-        this.model.listener.onAdd($.addHandler);
-        this.model.listener.onRemove($.removeHandler);
-        super.$ready();
-    }
-    /**
-     * Handles destroy event
-     */
-    $destroy() {
-        const $ = this.$;
-        this.model.listener.offAdd($.addHandler);
-        this.model.listener.offRemove($.removeHandler);
-        super.$destroy();
+        input.model.listener.onAdd($.addHandler);
+        input.model.listener.onRemove($.removeHandler);
+        this.runOnDestroy(() => {
+            input.model.listener.offAdd($.addHandler);
+            input.model.listener.offRemove($.removeHandler);
+        });
     }
 }
 
@@ -3113,18 +3069,14 @@ window.BaseView = BaseView;
  * @extends BaseView
  */
 class ArrayView extends BaseView {
-    constructor(model) {
-        super();
-        this.model = model;
-    }
-    createChild(id, item, before) {
-        super.createChild(item, item, before || this.$.nodes.get(id));
+    createChild(input, id, item, before) {
+        super.createChild(input, item, item, before || this.$.nodes.get(id));
     }
-    $ready() {
-        this.model.forEach(item => {
-            this.createChild(item, item);
+    compose(input) {
+        super.compose(input);
+        input.model.forEach(item => {
+            this.createChild(input, item, item);
         });
-        super.$ready();
     }
 }
 
@@ -3137,23 +3089,16 @@ window.ArrayView = ArrayView;
  * @extends Fragment
  */
 class Watch extends Fragment {
-    constructor() {
-        super();
-        this.slot = new Slot;
-        this.model = this.$ref(null);
-        this.$seal();
-    }
-    $createWatchers() {
-        this.$watch((value) => {
-            this.$children.forEach(child => {
-                child.$destroy();
+    compose(input) {
+        this.watch((value) => {
+            this.children.forEach(child => {
+                child.destroy();
             });
-            this.$children.splice(0);
-            this.slot.release(this, value);
-        }, this.model);
-    }
-    $compose() {
-        this.slot.release(this, this.model.$);
+            this.children.clear();
+            this.lastChild = null;
+            input.slot && input.slot(this, value);
+        }, input.model);
+        input.slot(this, input.model.$);
     }
 }
 
@@ -3166,16 +3111,13 @@ window.Watch = Watch;
  * @extends BaseView
  */
 class ObjectView extends BaseView {
-    constructor(model) {
-        super();
-        this.model = model;
-    }
-    $ready() {
-        const obj = this.model;
+    compose(input) {
+        super.compose(input);
+        const obj = input.model.proxy();
         for (const key in obj) {
-            this.createChild(key, obj[key]);
+            this.createChild(input, key, obj[key]);
         }
-        super.$ready();
+        super.ready();
     }
 }
 
@@ -3188,16 +3130,11 @@ window.ObjectView = ObjectView;
  * @extends BaseView
  */
 class MapView extends BaseView {
-    constructor(model) {
-        super();
-        this.model = model;
-    }
-    $ready() {
-        const map = this.model;
-        map.forEach((value, key) => {
-            this.createChild(key, value);
+    compose(input) {
+        super.compose(input);
+        input.model.forEach((value, key) => {
+            this.createChild(input, key, value);
         });
-        super.$ready();
     }
 }
 
@@ -3210,19 +3147,12 @@ window.MapView = MapView;
  * @extends BaseView
  */
 class SetView extends BaseView {
-    constructor(model) {
-        super();
-        this.model = model;
-    }
-    $ready() {
-        const $ = this.$;
-        const set = this.model;
+    compose(input) {
+        super.compose(input);
+        const set = input.model;
         set.forEach(item => {
-            $.app.$run.callCallback(() => {
-                this.createChild(item, item);
-            });
+            this.createChild(input, item, item);
         });
-        super.$ready();
     }
 }