native-document 1.0.221 → 1.0.223

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "native-document",
-  "version": "1.0.221",
+  "version": "1.0.223",
   "description": "A reactive JavaScript framework that preserves native DOM simplicity without sacrificing modern features",
   "author": "AfroCodeur <https://github.com/afrocodeur>",
   "license": "MIT",

package/src/core/data/Observable.js

@@ -184,16 +184,16 @@ Observable.computed = function(_callback, _dependencies = []) {
 };
 ObservableItem.computed = Observable.computed;
 
-Observable.auto = (value) => {
+Observable.auto = (value, options = null) => {
     if(value == null) {
-        return new ObservableItem(value);
+        return new ObservableItem(value, options);
     }
     if(Validator.isArray(value)) {
-        return new ObservableArray(value);
+        return new ObservableArray(value, options);
     } else if(typeof value === 'object') {
-        return new ObservableObject(value);
+        return new ObservableObject(value, options);
     }
-    return new ObservableItem(value);
+    return new ObservableItem(value, options);
 };
 ObservableItem.auto = Observable.auto;
 

package/src/core/data/ObservableArray.js

@@ -5,8 +5,8 @@ import PluginsManager from '../utils/plugins-manager.js';
 import NativeDocumentError from '../errors/NativeDocumentError.js';
 import {nextTick} from '../utils/helpers';
 
-const mutationMethods = ['push', 'pop', 'shift', 'unshift', 'reverse', 'sort', 'splice'];
-const noMutationMethods = ['map', 'forEach', 'filter', 'reduce', 'some', 'every', 'find', 'findIndex', 'concat', 'includes', 'indexOf'];
+export const mutationMethods = ['push', 'pop', 'shift', 'unshift', 'reverse', 'sort', 'splice'];
+export const noMutationMethods = ['map', 'forEach', 'filter', 'reduce', 'some', 'every', 'find', 'findIndex', 'concat', 'includes', 'indexOf'];
 
 /**
  * Reactive array container extending ObservableItem.

package/src/core/data/Store.js

@@ -2,7 +2,7 @@ import { Observable } from './Observable';
 import NativeDocumentError from '../errors/NativeDocumentError';
 import DebugManager from '../utils/debug-manager';
 import {$getFromStorage, $saveToStorage, LocalStorage} from '../utils/localstorage';
-import Validator from '../utils/validator';
+import {mutationMethods} from './ObservableArray';
 
 
 const WRITE_METHODS = [
@@ -44,18 +44,44 @@ export const StoreFactory = function() {
         observer.reset  = readOnlyError('reset');
     };
 
-    const $createObservable = (value, options = {}) => {
-        if(Array.isArray(value)) {
-            return Observable.array(value, options);
+    const $synchroProtectedFollower = (from, follower, name, context) => {
+        const originalSet = follower.set.bind(follower);
+        if(!from.__$isObservableArray) {
+            from.subscribe(originalSet);
+            $applyReadOnly(follower, name, 'follow');
+            return originalSet;
         }
-        if(Validator.isJson(value)) {
-            return Observable.object(value, options);
+        const methods = {};
+        const readOnlyError = (method) => {
+            return () => {
+                DebugManager.error('Store', `Store.${context}('${name}') is read-only. '${method}()' is not allowed.`);
+                throw new NativeDocumentError(
+                    `Store.${context}('${name}') is read-only.`,
+                );
+            };
+        };
+
+        for(const method of mutationMethods) {
+            methods[method] = follower[method].bind(follower);
+            follower[method] = readOnlyError(method);
         }
-        return Observable(value, options);
+
+        from.subscribe((data, _, operations) => {
+            const callback = methods[operations.action];
+            if(!callback) {
+                originalSet(data);
+                return;
+            }
+            callback(...(operations.args||[]));
+        });
+    };
+
+    const $createObservable = (value, options = {}) => {
+        return Observable.auto(value, options);
     };
 
     const $api = {
-        /**
+        /**a
          * Create a new state and return the observer.
          * Throws if a store with the same name already exists.
          *
@@ -246,12 +272,7 @@ export const StoreFactory = function() {
             const { observer: originalObserver, subscribers } = $getStoreOrThrow('follow', name);
             const observerFollower = $createObservable(originalObserver.val());
 
-            const originalSet = observerFollower.set.bind(observerFollower);
-            const onStoreChange = value => originalSet(value);
-
-            originalObserver.subscribe(onStoreChange);
-
-            $applyReadOnly(observerFollower, name, 'follow');
+            const onStoreChange = $synchroProtectedFollower(originalObserver, observerFollower,  name,'follow');
 
             observerFollower.destroy = () => {
                 originalObserver.unsubscribe(onStoreChange);

package/src/ui/components/modal/ModalRender.js

@@ -54,8 +54,6 @@ export default function ModalRender($desc, instance) {
             dialog.close();
             return;
         }
-
-        dialog.close();
     });
 
     setupBehaviours(dialog, $desc, instance);