native-document 1.0.45 → 1.0.46

package/dist/native-document.dev.js

@@ -438,7 +438,11 @@ var NativeDocument = (function (exports) {
     ObservableItem.prototype.check = function(callback) {
         return new ObservableChecker(this, callback)
     };
-    ObservableItem.prototype.get = ObservableItem.prototype.check;
+
+    ObservableItem.prototype.get = function(key) {
+        const item = this.$currentValue[key];
+        return Validator.isObservable(item) ? item.val() : item;
+    };
 
     ObservableItem.prototype.when = function(value) {
         return {$target: value, $observer: this};
@@ -990,11 +994,6 @@ var NativeDocument = (function (exports) {
         };
     }
 
-    var validator = /*#__PURE__*/Object.freeze({
-        __proto__: null,
-        default: Validator
-    });
-
     function Anchor(name, isUniqueChild = false) {
         const element = document.createDocumentFragment();
         element.__Anchor__ = true;
@@ -1273,7 +1272,7 @@ var NativeDocument = (function (exports) {
         }
         if(Validator.isObservable(value)) {
             if(['checked'].includes(attributeName)) {
-                element.addEventListener('input', updateObserverFromInput.bind(null, element, attributeName, defaultValue));
+                element.addEventListener('input', updateObserverFromInput.bind(null, element, attributeName, defaultValue, value));
             }
             value.subscribe(updateInputFromObserver.bind(null, element, attributeName));
         }
@@ -1464,6 +1463,9 @@ var NativeDocument = (function (exports) {
             if(Validator.isNDElement(child)) {
                 return child.$element ?? child.$build?.() ?? null;
             }
+            if(Validator.$element) {
+                return Validator.$element;
+            }
             if(Validator.isArray(child)) {
                 const fragment = document.createDocumentFragment();
                 for(let i = 0, length = child.length; i < length; i++) {
@@ -2037,7 +2039,7 @@ var NativeDocument = (function (exports) {
      * @param {Array} target
      * @returns {ObservableItem}
      */
-    Observable.array = function(target) {
+    Observable.array = function(target, { propagation = false, deep = false } = {}) {
         if(!Array.isArray(target)) {
             throw new NativeDocumentError('Observable.array : target must be an array');
         }
@@ -2154,43 +2156,86 @@ var NativeDocument = (function (exports) {
         return batch;
     };
 
+    const ObservableObjectValue = function(data) {
+        const result = {};
+        for(const key in data) {
+            const dataItem = data[key];
+            if(Validator.isObservable(dataItem)) {
+                let value = dataItem.val();
+                if(Array.isArray(value)) {
+                    value = value.map(item => {
+                        if(Validator.isObservable(item)) {
+                            return item.val();
+                        }
+                        if(Validator.isProxy(item)) {
+                            return item.$value;
+                        }
+                        return item;
+                    });
+                }
+                result[key] = value;
+            } else if(Validator.isProxy(dataItem)) {
+                result[key] = dataItem.$value;
+            } else {
+                result[key] = dataItem;
+            }
+        }
+        return result;
+    };
+
+    const ObservableGet = function(target, property) {
+        const item = target[property];
+        if(Validator.isObservable(item)) {
+            return item.val();
+        }
+        if(Validator.isProxy(item)) {
+            return item.$value;
+        }
+        return item;
+    };
+
     /**
      *
      * @param {Object} initialValue
      * @returns {Proxy}
      */
-    Observable.init = function(initialValue) {
+    Observable.init = function(initialValue, { propagation= false, deep = true } = {}) {
         const data = {};
         for(const key in initialValue) {
             const itemValue = initialValue[key];
             if(Array.isArray(itemValue)) {
-                data[key] = Observable.array(itemValue);
+                if(deep) {
+                    data[key] = itemValue.map(item => {
+                        if(Validator.isJson(item)) {
+                            return Observable.json(item, { propagation, deep });
+                        }
+                        if(Validator.isArray(item)) {
+                            return Observable.array(item, { propagation, deep });
+                        }
+                        return Observable(item);
+                    });
+                    continue;
+                }
+                data[key] = Observable.array(itemValue, { propagation });
+                continue;
+            }
+            if(Validator.isObservable(itemValue) || Validator.isProxy(itemValue)) {
+                data[key] = itemValue;
                 continue;
             }
             data[key] = Observable(itemValue);
         }
 
-        const $val = function() {
-            const result = {};
-            for(const key in data) {
-                const dataItem = data[key];
-                if(Validator.isObservable(dataItem)) {
-                    result[key] = dataItem.val();
-                } else if(Validator.isProxy(dataItem)) {
-                    result[key] = dataItem.$value;
-                } else {
-                    result[key] = dataItem;
-                }
-            }
-            return result;
-        };
-        const $clone = function() {
-            return Observable.init($val());
-        };
-        const $updateWith = function(values) {
+        const $val = () => ObservableObjectValue(data);
+
+        const $clone = () => Observable.init($val(), { propagation, deep });
+
+        const $updateWith = (values) => {
             Observable.update(proxy, values);
         };
 
+        const $get = (key) => ObservableGet(data, key);
+
         const proxy = new Proxy(data, {
             get(target, property) {
                 if(property === '__isProxy__') {
@@ -2202,12 +2247,18 @@ var NativeDocument = (function (exports) {
                 if(property === '$clone') {
                     return $clone;
                 }
+                if(property === '$keys') {
+                    return Object.keys(initialValue);
+                }
                 if(property === '$observables') {
                     return Object.values(target);
                 }
-                if(property === '$updateWith') {
+                if(property === '$updateWith' || property === '$set') {
                     return $updateWith;
                 }
+                if(property === '$get') {
+                    return $get;
+                }
                 if(target[property] !== undefined) {
                     return target[property];
                 }
@@ -2260,16 +2311,26 @@ var NativeDocument = (function (exports) {
     };
 
 
-    Observable.update = function($target, data) {
-        if(Validator.isProxy(data)) {
-            data = data.$value;
-        }
+    Observable.update = function($target, newData) {
+        const data = Validator.isProxy(newData) ? newData.$value : newData;
+
         for(const key in data) {
             const targetItem = $target[key];
+            const newValueOrigin = newData[key];
             const newValue = data[key];
 
             if(Validator.isObservable(targetItem)) {
                 if(Validator.isArray(newValue)) {
+                    if(Validator.isObservable(newValueOrigin[0]) || Validator.isProxy(newValueOrigin[0])) {
+                        const newValues = newValue.map(item => {
+                            if(Validator.isObservable(newValueOrigin[0])) {
+                                return Observable(item);
+                            }
+                            return Observable.init(newValueOrigin[0]);
+                        });
+                        targetItem.set(newValues);
+                        continue;
+                    }
                     targetItem.set([...newValue]);
                     continue;
                 }
@@ -4017,7 +4078,7 @@ var NativeDocument = (function (exports) {
     exports.SingletonView = SingletonView;
     exports.Store = Store;
     exports.TemplateCloner = TemplateCloner;
-    exports.Validator = validator;
+    exports.Validator = Validator;
     exports.classPropertyAccumulator = classPropertyAccumulator;
     exports.createTextNode = createTextNode;
     exports.cssPropertyAccumulator = cssPropertyAccumulator;