vasille 2.3.8 → 3.0.0

package/lib/models/array-model.js

@@ -8,25 +8,17 @@ export class ArrayModel extends Array {
     /**
      * @param data {Array} input data
      */
-    constructor(data = []) {
+    constructor(data) {
         super();
-        Object.defineProperty(this, 'listener', {
-            value: new Listener,
-            writable: false,
-            configurable: false
-        });
-        for (let i = 0; i < data.length; i++) {
-            super.push(data[i]);
+        this.passive = false;
+        this.listener = new Listener();
+        if (data instanceof Array) {
+            for (let i = 0; i < data.length; i++) {
+                super.push(data[i]);
+            }
         }
     }
     /* Array members */
-    /**
-     * Gets the last item of array
-     * @return {*} the last item of array
-     */
-    get last() {
-        return this.length ? this[this.length - 1] : null;
-    }
     /**
      * Calls Array.fill and notify about changes
      * @param value {*} value to fill with
@@ -34,6 +26,7 @@ export class ArrayModel extends Array {
      * @param end {?number} end index
      */
     fill(value, start, end) {
+        this.passive = true;
         if (!start) {
             start = 0;
         }
@@ -45,6 +38,7 @@ export class ArrayModel extends Array {
             this[i] = value;
             this.listener.emitAdded(value, value);
         }
+        this.passive = false;
         return this;
     }
     /**
@@ -52,10 +46,12 @@ export class ArrayModel extends Array {
      * @return {*} removed value
      */
     pop() {
+        this.passive = true;
         const v = super.pop();
         if (v !== undefined) {
             this.listener.emitRemoved(v, v);
         }
+        this.passive = false;
         return v;
     }
     /**
@@ -64,10 +60,12 @@ export class ArrayModel extends Array {
      * @return {number} new length of array
      */
     push(...items) {
+        this.passive = true;
         items.forEach(item => {
             this.listener.emitAdded(item, item);
             super.push(item);
         });
+        this.passive = false;
         return this.length;
     }
     /**
@@ -75,10 +73,12 @@ export class ArrayModel extends Array {
      * @return {*} the shifted value
      */
     shift() {
+        this.passive = true;
         const v = super.shift();
         if (v !== undefined) {
             this.listener.emitRemoved(v, v);
         }
+        this.passive = false;
         return v;
     }
     /**
@@ -89,8 +89,9 @@ export class ArrayModel extends Array {
      * @return {ArrayModel} a pointer to this
      */
     splice(start, deleteCount, ...items) {
+        this.passive = true;
         start = Math.min(start, this.length);
-        deleteCount = deleteCount || this.length - start;
+        deleteCount = typeof deleteCount === "number" ? deleteCount : this.length - start;
         const before = this[start + deleteCount];
         for (let i = 0; i < deleteCount; i++) {
             const index = start + deleteCount - i - 1;
@@ -101,6 +102,7 @@ export class ArrayModel extends Array {
         for (let i = 0; i < items.length; i++) {
             this.listener.emitAdded(before, items[i]);
         }
+        this.passive = false;
         return new ArrayModel(super.splice(start, deleteCount, ...items));
     }
     /**
@@ -109,106 +111,37 @@ export class ArrayModel extends Array {
      * @return {number} the length after prepend
      */
     unshift(...items) {
+        this.passive = true;
         for (let i = 0; i < items.length; i++) {
             this.listener.emitAdded(this[i], items[i]);
         }
-        return super.unshift(...items);
-    }
-    /**
-     * Inserts a value to the end of array
-     * @param v {*} value to insert
-     */
-    append(v) {
-        this.listener.emitAdded(null, v);
-        super.push(v);
-        return this;
-    }
-    /**
-     * Clears array
-     * @return {this} a pointer to this
-     */
-    clear() {
-        this.forEach(v => {
-            this.listener.emitRemoved(v, v);
-        });
-        super.splice(0);
-        return this;
-    }
-    /**
-     * Inserts a value to position `index`
-     * @param index {number} index to insert value
-     * @param v {*} value to insert
-     * @return {this} a pointer to this
-     */
-    insert(index, v) {
-        this.listener.emitAdded(this[index], v);
-        super.splice(index, 0, v);
-        return this;
-    }
-    /**
-     * Inserts a value to the beginning of array
-     * @param v {*} value to insert
-     * @return {this} a pointer to this
-     */
-    prepend(v) {
-        this.listener.emitAdded(this[0], v);
-        super.unshift(v);
-        return this;
-    }
-    /**
-     * Removes a value from an index
-     * @param index {number} index of value to remove
-     * @return {this} a pointer to this
-     */
-    removeAt(index) {
-        if (index > 0 && index < this.length) {
-            this.listener.emitRemoved(this[index], this[index]);
-            super.splice(index, 1);
-        }
-        return this;
-    }
-    /**
-     * Removes the first value of array
-     * @return {this} a pointer to this
-     */
-    removeFirst() {
-        if (this.length) {
-            this.listener.emitRemoved(this[0], this[0]);
-            super.shift();
-        }
-        return this;
-    }
-    /**
-     * Removes the ast value of array
-     * @return {this} a pointer to this
-     */
-    removeLast() {
-        const last = this.last;
-        if (last != null) {
-            this.listener.emitRemoved(this[this.length - 1], last);
-            super.pop();
-        }
-        return this;
-    }
-    /**
-     * Remove the first occurrence of value
-     * @param v {*} value to remove
-     * @return {this}
-     */
-    removeOne(v) {
-        this.removeAt(this.indexOf(v));
-        return this;
+        const r = super.unshift(...items);
+        this.passive = false;
+        return r;
     }
     replace(at, with_) {
+        this.passive = true;
         this.listener.emitAdded(this[at], with_);
         this.listener.emitRemoved(this[at], this[at]);
         this[at] = with_;
+        this.passive = false;
         return this;
     }
-    enableReactivity() {
-        this.listener.enableReactivity();
-    }
-    disableReactivity() {
-        this.listener.disableReactivity();
+    destroy() {
+        this.splice(0);
     }
 }
+export function proxyArrayModel(arr) {
+    return new Proxy(arr, {
+        set(target, p, newValue, receiver) {
+            if (!arr.passive && typeof p === "string") {
+                const index = parseInt(p);
+                if (Number.isFinite(index)) {
+                    arr.replace(index, newValue);
+                    return true;
+                }
+            }
+            return Reflect.set(target, p, newValue, receiver);
+        },
+    });
+}

package/lib/models/listener.js

@@ -4,41 +4,16 @@
  */
 export class Listener {
     constructor() {
-        Object.defineProperties(this, {
-            onAdded: {
-                value: new Set,
-                writable: false,
-                configurable: false
-            },
-            onRemoved: {
-                value: new Set,
-                writable: false,
-                configurable: false
-            },
-            frozen: {
-                value: false,
-                writable: true,
-                configurable: false
-            },
-            queue: {
-                value: [],
-                writable: false,
-                configurable: false
-            }
-        });
-    }
-    /**
-     * Exclude the repeated operation in queue
-     * @private
-     */
-    excludeRepeat(index) {
-        this.queue.forEach((item, i) => {
-            if (item.index === index) {
-                this.queue.splice(i, 1);
-                return true;
-            }
-        });
-        return false;
+        /**
+         * Functions to run on adding new items
+         * @type Set
+         */
+        this.onAdded = new Set();
+        /**
+         * Functions to run on item removing
+         * @type Set
+         */
+        this.onRemoved = new Set();
     }
     /**
      * Emits added event to listeners
@@ -46,16 +21,9 @@ export class Listener {
      * @param value {*} value of added item
      */
     emitAdded(index, value) {
-        if (this.frozen) {
-            if (!this.excludeRepeat(index)) {
-                this.queue.push({ sign: true, index, value });
-            }
-        }
-        else {
-            this.onAdded.forEach(handler => {
-                handler(index, value);
-            });
-        }
+        this.onAdded.forEach(handler => {
+            handler(index, value);
+        });
     }
     /**
      * Emits removed event to listeners
@@ -63,16 +31,9 @@ export class Listener {
      * @param value {*} value of removed item
      */
     emitRemoved(index, value) {
-        if (this.frozen) {
-            if (!this.excludeRepeat(index)) {
-                this.queue.push({ sign: false, index, value });
-            }
-        }
-        else {
-            this.onRemoved.forEach(handler => {
-                handler(index, value);
-            });
-        }
+        this.onRemoved.forEach(handler => {
+            handler(index, value);
+        });
     }
     /**
      * Adds a handler to added event
@@ -102,29 +63,4 @@ export class Listener {
     offRemove(handler) {
         this.onRemoved.delete(handler);
     }
-    /**
-     * Run all queued operation and enable reactivity
-     */
-    enableReactivity() {
-        this.queue.forEach(item => {
-            if (item.sign) {
-                this.onAdded.forEach(handler => {
-                    handler(item.index, item.value);
-                });
-            }
-            else {
-                this.onRemoved.forEach(handler => {
-                    handler(item.index, item.value);
-                });
-            }
-        });
-        this.queue.splice(0);
-        this.frozen = false;
-    }
-    /**
-     * Disable the reactivity and enable the queue
-     */
-    disableReactivity() {
-        this.frozen = true;
-    }
 }

package/lib/models/map-model.js

@@ -10,19 +10,15 @@ export class MapModel extends Map {
      * Constructs a map model
      * @param map {[*, *][]} input data
      */
-    constructor(map = []) {
+    constructor(map) {
         super();
-        Object.defineProperty(this, 'listener', {
-            value: new Listener,
-            writable: false,
-            configurable: false
-        });
-        map.forEach(([key, value]) => {
+        this.listener = new Listener();
+        map === null || map === void 0 ? void 0 : map.forEach(([key, value]) => {
             super.set(key, value);
         });
     }
     /**
-     * Calls Map.clear and notify abut changes
+     * Calls Map.clear and notify about changes
      */
     clear() {
         this.forEach((value, key) => {
@@ -57,10 +53,7 @@ export class MapModel extends Map {
         this.listener.emitAdded(key, value);
         return this;
     }
-    enableReactivity() {
-        this.listener.enableReactivity();
-    }
-    disableReactivity() {
-        this.listener.disableReactivity();
+    destroy() {
+        this.clear();
     }
 }

package/lib/models/object-model.js

@@ -11,17 +11,17 @@ export class ObjectModel extends Object {
     constructor(obj = {}) {
         super();
         this.container = Object.create(null);
-        Object.defineProperty(this, 'listener', {
-            value: new Listener,
+        Object.defineProperty(this, "listener", {
+            value: new Listener(),
             writable: false,
-            configurable: false
+            configurable: false,
         });
         for (const i in obj) {
             Object.defineProperty(this.container, i, {
                 value: obj[i],
                 configurable: true,
                 writable: true,
-                enumerable: true
+                enumerable: true,
             });
             this.listener.emitAdded(i, obj[i]);
         }
@@ -41,7 +41,7 @@ export class ObjectModel extends Object {
      * @return {ObjectModel} a pointer to this
      */
     set(key, v) {
-        if (Reflect.has(this.container, key)) {
+        if (key in this.container) {
             this.listener.emitRemoved(key, this.container[key]);
             this.container[key] = v;
         }
@@ -50,7 +50,7 @@ export class ObjectModel extends Object {
                 value: v,
                 configurable: true,
                 writable: true,
-                enumerable: true
+                enumerable: true,
             });
         }
         this.listener.emitAdded(key, this.container[key]);

package/lib/models/set-model.js

@@ -10,14 +10,10 @@ export class SetModel extends Set {
      * Constructs a set model based on a set
      * @param set {Set} input data
      */
-    constructor(set = []) {
+    constructor(set) {
         super();
-        Object.defineProperty(this, 'listener', {
-            value: new Listener,
-            writable: false,
-            configurable: false
-        });
-        set.forEach(item => {
+        this.listener = new Listener();
+        set === null || set === void 0 ? void 0 : set.forEach(item => {
             super.add(item);
         });
     }
@@ -53,10 +49,7 @@ export class SetModel extends Set {
         }
         return super.delete(value);
     }
-    enableReactivity() {
-        this.listener.enableReactivity();
-    }
-    disableReactivity() {
-        this.listener.disableReactivity();
+    destroy() {
+        this.clear();
     }
 }

package/lib/node/app.js

@@ -1,25 +1,10 @@
-import { INode } from "./node";
-/**
- * Application Node
- * @class AppNode
- * @extends INode
- */
-export class AppNode extends INode {
-    /**
-     * @param input
-     */
-    constructor(input) {
-        super(input);
-        this.debugUi = input.debugUi || false;
-        this.$seal();
-    }
-}
+import { Fragment, Root } from "./node";
 /**
  * Represents a Vasille.js application
  * @class App
  * @extends AppNode
  */
-export class App extends AppNode {
+export class App extends Root {
     /**
      * Constructs an app node
      * @param node {Element} The root of application
@@ -27,22 +12,18 @@ export class App extends AppNode {
      */
     constructor(node, input) {
         super(input);
-        this.$.node = node;
-        this.preinit(this, this);
-        this.init();
-        this.$seal();
+        this.node = node;
     }
     appendNode(node) {
-        this.$.node.appendChild(node);
+        this.node.appendChild(node);
     }
 }
-export class Portal extends AppNode {
+export class Portal extends Fragment {
     constructor(input) {
-        super(input);
-        this.$.node = input.node;
-        this.$seal();
+        super(input, ":portal");
+        this.node = input.node;
     }
     appendNode(node) {
-        this.$.node.appendChild(node);
+        this.node.appendChild(node);
     }
 }