native-document 1.0.91 → 1.0.92

package/dist/native-document.components.min.js

@@ -472,7 +472,6 @@ var NativeComponents = (function (exports) {
 
         this.$previousValue = null;
         this.$currentValue = value;
-        this.$isCleanedUp = false;
 
         this.$firstListener = null;
         this.$listeners = null;
@@ -499,16 +498,16 @@ var NativeComponents = (function (exports) {
     });
 
     ObservableItem.prototype.__$isObservable = true;
-    const DEFAULT_OPERATIONS = {};
     const noneTrigger = function() {};
 
     ObservableItem.prototype.intercept = function(callback) {
         this.$interceptor = callback;
+        this.set = this.$setWithInterceptor;
         return this;
     };
 
     ObservableItem.prototype.triggerFirstListener = function(operations) {
-        this.$firstListener(this.$currentValue, this.$previousValue, operations || {});
+        this.$firstListener(this.$currentValue, this.$previousValue, operations);
     };
 
     ObservableItem.prototype.triggerListeners = function(operations) {
@@ -516,33 +515,12 @@ var NativeComponents = (function (exports) {
         const $previousValue = this.$previousValue;
         const $currentValue = this.$currentValue;
 
-        operations = operations || DEFAULT_OPERATIONS;
         for(let i = 0, length = $listeners.length; i < length; i++) {
             $listeners[i]($currentValue, $previousValue, operations);
         }
     };
 
-    const handleWatcherCallback = function(callbacks, value) {
-        if(typeof callbacks === "function") {
-            callbacks(value);
-            return;
-        }
-        if (callbacks.set) {
-            callbacks.set(value);
-            return;
-        }
-        for(let i = 0, length = callbacks.length; i < length; i++) {
-            const callback = callbacks[i];
-            callback.set ? callback.set(value) : callback(value);
-
-        }
-    };
-
-    ObservableItem.prototype.triggerWatchers = function() {
-        if(!this.$watchers) {
-            return;
-        }
-
+    ObservableItem.prototype.triggerWatchers = function(operations) {
         const $watchers = this.$watchers;
         const $previousValue = this.$previousValue;
         const $currentValue = this.$currentValue;
@@ -550,20 +528,20 @@ var NativeComponents = (function (exports) {
         const $currentValueCallbacks = $watchers.get($currentValue);
         const $previousValueCallbacks = $watchers.get($previousValue);
         if($currentValueCallbacks) {
-            handleWatcherCallback($currentValueCallbacks, true);
+            $currentValueCallbacks(true, $previousValue, operations);
         }
         if($previousValueCallbacks) {
-            handleWatcherCallback($previousValueCallbacks, false);
+            $previousValueCallbacks(false, $currentValue, operations);
         }
     };
 
     ObservableItem.prototype.triggerAll = function(operations) {
-        this.triggerWatchers();
+        this.triggerWatchers(operations);
         this.triggerListeners(operations);
     };
 
     ObservableItem.prototype.triggerWatchersAndFirstListener = function(operations) {
-        this.triggerWatchers();
+        this.triggerWatchers(operations);
         this.triggerFirstListener(operations);
     };
 
@@ -591,21 +569,8 @@ var NativeComponents = (function (exports) {
     };
     ObservableItem.prototype.trigger = noneTrigger;
 
-    /**
-     * @param {*} data
-     */
-    ObservableItem.prototype.set = function(data) {
-        let newValue = (typeof data === 'function') ? data(this.$currentValue) : data;
-        newValue = Validator.isObservable(newValue) ? newValue.val() : newValue;
-
-        if (this.$interceptor) {
-            const result = this.$interceptor(newValue, this.$currentValue);
-
-            if (result !== undefined) {
-                newValue = result;
-            }
-        }
-
+    ObservableItem.prototype.$updateWithNewValue = function(newValue) {
+        newValue = newValue?.__$isObservable ? newValue.val() : newValue;
         if(this.$currentValue === newValue) {
             return;
         }
@@ -615,6 +580,30 @@ var NativeComponents = (function (exports) {
         this.$previousValue = null;
     };
 
+    /**
+     * @param {*} data
+     */
+    ObservableItem.prototype.$setWithInterceptor = function(data) {
+        let newValue = (typeof data === 'function') ? data(this.$currentValue) : data;
+        const result = this.$interceptor(newValue, this.$currentValue);
+
+        if (result !== undefined) {
+            newValue = result;
+        }
+
+        this.$updateWithNewValue(newValue);
+    };
+
+    /**
+     * @param {*} data
+     */
+    ObservableItem.prototype.$basicSet = function(data) {
+        let newValue = (typeof data === 'function') ? data(this.$currentValue) : data;
+        this.$updateWithNewValue(newValue);
+    };
+
+    ObservableItem.prototype.set = ObservableItem.prototype.$basicSet;
+
     ObservableItem.prototype.val = function() {
         return this.$currentValue;
     };
@@ -650,32 +639,19 @@ var NativeComponents = (function (exports) {
         }
         MemoryManager.unregister(this.$memoryId);
         this.disconnectAll();
-        this.$isCleanedUp = true;
         delete this.$value;
     };
 
     /**
      *
      * @param {Function} callback
-     * @param {any} target
      * @returns {(function(): void)}
      */
-    ObservableItem.prototype.subscribe = function(callback, target = null) {
+    ObservableItem.prototype.subscribe = function(callback) {
         this.$listeners = this.$listeners ?? [];
-        if (this.$isCleanedUp) {
-            DebugManager.warn('Observable subscription', '⚠️ Attempted to subscribe to a cleaned up observable.');
-            return () => {};
-        }
-        if (typeof callback !== 'function') {
-            throw new NativeDocumentError('Callback must be a function');
-        }
 
         this.$listeners.push(callback);
         this.assocTrigger();
-        return () => {
-            this.unsubscribe(callback);
-            this.assocTrigger();
-        };
     };
 
     ObservableItem.prototype.on = function(value, callback) {
@@ -683,40 +659,66 @@ var NativeComponents = (function (exports) {
 
         let watchValueList = this.$watchers.get(value);
 
+        if(callback.__$isObservable) {
+            callback = callback.set.bind(callback);
+        }
+
         if(!watchValueList) {
+            watchValueList = callback;
             this.$watchers.set(value, callback);
-        } else if(!Validator.isArray(watchValueList)) {
+        } else if(!Validator.isArray(watchValueList.list)) {
             watchValueList = [watchValueList, callback];
-            this.$watchers.set(value, watchValueList);
+            callback = (value) => {
+                for(let i = 0, length = watchValueList.length; i < length; i++) {
+                    watchValueList[i](value);
+                }
+            };
+            callback.list = watchValueList;
+            this.$watchers.set(value, callback);
         } else {
-            watchValueList.push(callback);
+            watchValueList.list.push(callback);
         }
 
         this.assocTrigger();
-        return () => {
-            const index = watchValueList.indexOf(callback);
-            watchValueList?.splice(index, 1);
-            if(watchValueList.size === 1) {
-                this.$watchers.set(value, watchValueList[0]);
-            }
-            else if(watchValueList.size === 0) {
-                this.$watchers?.delete(value);
-                watchValueList = null;
-            }
+    };
+
+    /**
+     * @param {*} value
+     * @param {Function} callback - if omitted, removes all watchers for this value
+     */
+    ObservableItem.prototype.off = function(value, callback) {
+        if(!this.$watchers) return;
+
+        const watchValueList = this.$watchers.get(value);
+        if(!watchValueList) return;
+
+        if(!callback || !Array.isArray(watchValueList.list)) {
+            this.$watchers?.delete(value);
             this.assocTrigger();
-        };
+            return;
+        }
+        const index = watchValueList.indexOf(callback);
+        watchValueList?.splice(index, 1);
+        if(watchValueList.length === 1) {
+            this.$watchers.set(value, watchValueList[0]);
+        }
+        else if(watchValueList.length === 0) {
+            this.$watchers?.delete(value);
+            watchValueList = null;
+        }
+        this.assocTrigger();
     };
 
     ObservableItem.prototype.once = function(predicate, callback) {
         const fn = typeof predicate === 'function' ? predicate : (v) => v === predicate;
 
-        const unsub = this.subscribe((val) => {
+        const handler = (val) => {
             if (fn(val)) {
-                unsub();
+                this.unsubscribe(handler);
                 callback(val);
             }
-        });
-        return unsub;
+        };
+        this.subscribe(handler);
     };
 
     /**
@@ -724,6 +726,7 @@ var NativeComponents = (function (exports) {
      * @param {Function} callback
      */
     ObservableItem.prototype.unsubscribe = function(callback) {
+        if(!this.$listeners) return;
         const index = this.$listeners.indexOf(callback);
         if (index > -1) {
             this.$listeners.splice(index, 1);
@@ -781,6 +784,10 @@ var NativeComponents = (function (exports) {
         return String(this.$currentValue);
     };
 
+    ObservableItem.prototype.valueOf = function() {
+        return this.$currentValue;
+    };
+
     const DocumentObserver = {
         mounted: new WeakMap(),
         mountedSupposedSize: 0,

package/dist/native-document.dev.js

@@ -326,7 +326,9 @@ var NativeDocument = (function (exports) {
 
         this.$previousValue = null;
         this.$currentValue = value;
-        this.$isCleanedUp = false;
+        {
+            this.$isCleanedUp = false;
+        }
 
         this.$firstListener = null;
         this.$listeners = null;
@@ -356,16 +358,16 @@ var NativeDocument = (function (exports) {
     });
 
     ObservableItem.prototype.__$isObservable = true;
-    const DEFAULT_OPERATIONS = {};
     const noneTrigger = function() {};
 
     ObservableItem.prototype.intercept = function(callback) {
         this.$interceptor = callback;
+        this.set = this.$setWithInterceptor;
         return this;
     };
 
     ObservableItem.prototype.triggerFirstListener = function(operations) {
-        this.$firstListener(this.$currentValue, this.$previousValue, operations || {});
+        this.$firstListener(this.$currentValue, this.$previousValue, operations);
     };
 
     ObservableItem.prototype.triggerListeners = function(operations) {
@@ -373,33 +375,12 @@ var NativeDocument = (function (exports) {
         const $previousValue = this.$previousValue;
         const $currentValue = this.$currentValue;
 
-        operations = operations || DEFAULT_OPERATIONS;
         for(let i = 0, length = $listeners.length; i < length; i++) {
             $listeners[i]($currentValue, $previousValue, operations);
         }
     };
 
-    const handleWatcherCallback = function(callbacks, value) {
-        if(typeof callbacks === "function") {
-            callbacks(value);
-            return;
-        }
-        if (callbacks.set) {
-            callbacks.set(value);
-            return;
-        }
-        for(let i = 0, length = callbacks.length; i < length; i++) {
-            const callback = callbacks[i];
-            callback.set ? callback.set(value) : callback(value);
-
-        }
-    };
-
-    ObservableItem.prototype.triggerWatchers = function() {
-        if(!this.$watchers) {
-            return;
-        }
-
+    ObservableItem.prototype.triggerWatchers = function(operations) {
         const $watchers = this.$watchers;
         const $previousValue = this.$previousValue;
         const $currentValue = this.$currentValue;
@@ -407,20 +388,20 @@ var NativeDocument = (function (exports) {
         const $currentValueCallbacks = $watchers.get($currentValue);
         const $previousValueCallbacks = $watchers.get($previousValue);
         if($currentValueCallbacks) {
-            handleWatcherCallback($currentValueCallbacks, true);
+            $currentValueCallbacks(true, $previousValue, operations);
         }
         if($previousValueCallbacks) {
-            handleWatcherCallback($previousValueCallbacks, false);
+            $previousValueCallbacks(false, $currentValue, operations);
         }
     };
 
     ObservableItem.prototype.triggerAll = function(operations) {
-        this.triggerWatchers();
+        this.triggerWatchers(operations);
         this.triggerListeners(operations);
     };
 
     ObservableItem.prototype.triggerWatchersAndFirstListener = function(operations) {
-        this.triggerWatchers();
+        this.triggerWatchers(operations);
         this.triggerFirstListener(operations);
     };
 
@@ -448,21 +429,8 @@ var NativeDocument = (function (exports) {
     };
     ObservableItem.prototype.trigger = noneTrigger;
 
-    /**
-     * @param {*} data
-     */
-    ObservableItem.prototype.set = function(data) {
-        let newValue = (typeof data === 'function') ? data(this.$currentValue) : data;
-        newValue = Validator.isObservable(newValue) ? newValue.val() : newValue;
-
-        if (this.$interceptor) {
-            const result = this.$interceptor(newValue, this.$currentValue);
-
-            if (result !== undefined) {
-                newValue = result;
-            }
-        }
-
+    ObservableItem.prototype.$updateWithNewValue = function(newValue) {
+        newValue = newValue?.__$isObservable ? newValue.val() : newValue;
         if(this.$currentValue === newValue) {
             return;
         }
@@ -478,6 +446,30 @@ var NativeDocument = (function (exports) {
         }
     };
 
+    /**
+     * @param {*} data
+     */
+    ObservableItem.prototype.$setWithInterceptor = function(data) {
+        let newValue = (typeof data === 'function') ? data(this.$currentValue) : data;
+        const result = this.$interceptor(newValue, this.$currentValue);
+
+        if (result !== undefined) {
+            newValue = result;
+        }
+
+        this.$updateWithNewValue(newValue);
+    };
+
+    /**
+     * @param {*} data
+     */
+    ObservableItem.prototype.$basicSet = function(data) {
+        let newValue = (typeof data === 'function') ? data(this.$currentValue) : data;
+        this.$updateWithNewValue(newValue);
+    };
+
+    ObservableItem.prototype.set = ObservableItem.prototype.$basicSet;
+
     ObservableItem.prototype.val = function() {
         return this.$currentValue;
     };
@@ -513,38 +505,34 @@ var NativeDocument = (function (exports) {
         }
         MemoryManager.unregister(this.$memoryId);
         this.disconnectAll();
-        this.$isCleanedUp = true;
+        {
+            this.$isCleanedUp = true;
+        }
         delete this.$value;
     };
 
     /**
      *
      * @param {Function} callback
-     * @param {any} target
      * @returns {(function(): void)}
      */
-    ObservableItem.prototype.subscribe = function(callback, target = null) {
-        this.$listeners = this.$listeners ?? [];
-        if (this.$isCleanedUp) {
-            DebugManager.warn('Observable subscription', '⚠️ Attempted to subscribe to a cleaned up observable.');
-            return () => {};
-        }
-        if (typeof callback !== 'function') {
-            throw new NativeDocumentError('Callback must be a function');
+    ObservableItem.prototype.subscribe = function(callback) {
+        {
+            if (this.$isCleanedUp) {
+                DebugManager.warn('Observable subscription', '⚠️ Attempted to subscribe to a cleaned up observable.');
+                return;
+            }
+            if (typeof callback !== 'function') {
+                throw new NativeDocumentError('Callback must be a function');
+            }
         }
+        this.$listeners = this.$listeners ?? [];
 
         this.$listeners.push(callback);
         this.assocTrigger();
         {
-            PluginsManager.emit('ObservableSubscribe', this, target);
+            PluginsManager.emit('ObservableSubscribe', this);
         }
-        return () => {
-            this.unsubscribe(callback);
-            this.assocTrigger();
-            {
-                PluginsManager.emit('ObservableUnsubscribe', this);
-            }
-        };
     };
 
     ObservableItem.prototype.on = function(value, callback) {
@@ -552,40 +540,66 @@ var NativeDocument = (function (exports) {
 
         let watchValueList = this.$watchers.get(value);
 
+        if(callback.__$isObservable) {
+            callback = callback.set.bind(callback);
+        }
+
         if(!watchValueList) {
+            watchValueList = callback;
             this.$watchers.set(value, callback);
-        } else if(!Validator.isArray(watchValueList)) {
+        } else if(!Validator.isArray(watchValueList.list)) {
             watchValueList = [watchValueList, callback];
-            this.$watchers.set(value, watchValueList);
+            callback = (value) => {
+                for(let i = 0, length = watchValueList.length; i < length; i++) {
+                    watchValueList[i](value);
+                }
+            };
+            callback.list = watchValueList;
+            this.$watchers.set(value, callback);
         } else {
-            watchValueList.push(callback);
+            watchValueList.list.push(callback);
         }
 
         this.assocTrigger();
-        return () => {
-            const index = watchValueList.indexOf(callback);
-            watchValueList?.splice(index, 1);
-            if(watchValueList.size === 1) {
-                this.$watchers.set(value, watchValueList[0]);
-            }
-            else if(watchValueList.size === 0) {
-                this.$watchers?.delete(value);
-                watchValueList = null;
-            }
+    };
+
+    /**
+     * @param {*} value
+     * @param {Function} callback - if omitted, removes all watchers for this value
+     */
+    ObservableItem.prototype.off = function(value, callback) {
+        if(!this.$watchers) return;
+
+        const watchValueList = this.$watchers.get(value);
+        if(!watchValueList) return;
+
+        if(!callback || !Array.isArray(watchValueList.list)) {
+            this.$watchers?.delete(value);
             this.assocTrigger();
-        };
+            return;
+        }
+        const index = watchValueList.indexOf(callback);
+        watchValueList?.splice(index, 1);
+        if(watchValueList.length === 1) {
+            this.$watchers.set(value, watchValueList[0]);
+        }
+        else if(watchValueList.length === 0) {
+            this.$watchers?.delete(value);
+            watchValueList = null;
+        }
+        this.assocTrigger();
     };
 
     ObservableItem.prototype.once = function(predicate, callback) {
         const fn = typeof predicate === 'function' ? predicate : (v) => v === predicate;
 
-        const unsub = this.subscribe((val) => {
+        const handler = (val) => {
             if (fn(val)) {
-                unsub();
+                this.unsubscribe(handler);
                 callback(val);
             }
-        });
-        return unsub;
+        };
+        this.subscribe(handler);
     };
 
     /**
@@ -593,11 +607,15 @@ var NativeDocument = (function (exports) {
      * @param {Function} callback
      */
     ObservableItem.prototype.unsubscribe = function(callback) {
+        if(!this.$listeners) return;
         const index = this.$listeners.indexOf(callback);
         if (index > -1) {
             this.$listeners.splice(index, 1);
         }
         this.assocTrigger();
+        {
+            PluginsManager.emit('ObservableUnsubscribe', this);
+        }
     };
 
     /**
@@ -650,6 +668,10 @@ var NativeDocument = (function (exports) {
         return String(this.$currentValue);
     };
 
+    ObservableItem.prototype.valueOf = function() {
+        return this.$currentValue;
+    };
+
     const DocumentObserver = {
         mounted: new WeakMap(),
         mountedSupposedSize: 0,
@@ -3723,7 +3745,7 @@ var NativeDocument = (function (exports) {
         };
 
         const buildContent = (items, _, operations) => {
-            if(operations.action === 'clear' || !items.length) {
+            if(operations?.action === 'clear' || !items.length) {
                 if(lastNumberOfItems === 0) {
                     return;
                 }