neo.mjs 4.0.9 → 4.0.12

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "neo.mjs",
-    "version": "4.0.9",
+    "version": "4.0.12",
     "description": "The webworkers driven UI framework",
     "type": "module",
     "repository": {

package/src/data/Store.mjs

@@ -29,6 +29,23 @@ class Store extends Base {
          * @protected
          */
         ntype: 'store',
+        /**
+         * Instead of setting an url, you can define the RPC BE API methods.
+         * In case the 4 methods are using the same service and this service is using the CRUD based fn-names,
+         * you can switch to a string based shortcut.
+         * The following 2 examples are equivalent.
+         * @example
+         * api: {
+         *    create : 'MyApp.backend.UserService.create',
+         *    destroy: 'MyApp.backend.UserService.destroy',
+         *    read   : 'MyApp.backend.UserService.read',
+         *    update : 'MyApp.backend.UserService.update'
+         * }
+         * @example
+         * api: 'MyApp.backend.UserService'
+         * @member {Object|String|null} api_=null
+         */
+        api_: null,
         /**
          * @member {Boolean} autoLoad=false
          */
@@ -143,6 +160,25 @@ class Store extends Base {
         }
     }
 
+    /**
+     * @param {Object|String|null} value
+     * @param {Object|String|null} oldValue
+     * @protected
+     * @returns {Object|null}
+     */
+    beforeSetApi(value, oldValue) {
+        if (Neo.typeOf(value) === 'String') {
+            value = {
+                create : value + '.create',
+                destroy: value + '.destroy',
+                read   : value + '.read',
+                update : value + '.update'
+            };
+        }
+
+        return value;
+    }
+
     /**
      * @param value
      * @param oldValue
@@ -187,8 +223,8 @@ class Store extends Base {
     }
 
     /**
-     * @param {Neo.data.Model} value
-     * @param {Neo.data.Model} oldValue
+     * @param {Neo.data.Model|Object} value
+     * @param {Neo.data.Model|Object} oldValue
      * @protected
      * @returns {Neo.data.Model}
      */
@@ -210,14 +246,31 @@ class Store extends Base {
     load() {
         let me = this;
 
-        Neo.Xhr.promiseJson({
-            url: me.url
-        }).catch(err => {
-            console.log('Error for Neo.Xhr.request', err, me.id);
-        }).then(data => {
-            me.data = Array.isArray(data.json) ? data.json : data.json.data;
-            // we do not need to fire a load event => onCollectionMutate()
-        });
+        if (me.api) {
+            let apiArray = me.api.read.split('.'),
+                fn       = apiArray.pop(),
+                service  = Neo.ns(apiArray.join('.'));
+
+            if (!service) {
+                console.log('Api is not defined', this);
+            } else {
+                // todo: add params
+
+                service[fn]().then(response => {
+                    me.data = response.data;
+                });
+            }
+
+        } else {
+            Neo.Xhr.promiseJson({
+                url: me.url
+            }).catch(err => {
+                console.log('Error for Neo.Xhr.request', err, me.id);
+            }).then(data => {
+                me.data = Array.isArray(data.json) ? data.json : data.json.data;
+                // we do not need to fire a load event => onCollectionMutate()
+            });
+        }
     }
 
     /**

package/src/data/connection/WebSocket.mjs

@@ -237,12 +237,12 @@ class Socket extends Base {
             case WebSocket.CLOSED:
             case WebSocket.CLOSING:
                 me.attemptReconnect(function() {
-                    me.send(d);
+                    me.sendMessage(d);
                 });
                 break;
             case WebSocket.CONNECTING:
                 me.on('open', function() {
-                    me.send(d);
+                    me.sendMessage(d);
                 }, me, {single: true});
                 break;
             case WebSocket.OPEN:

package/src/manager/rpc/Message.mjs

@@ -62,7 +62,7 @@ class Message extends Base {
     onMessage(msg) {
         let api = Neo.manager.rpc.Api.get(`${msg.service}.${msg.method}`);
 
-        return this[`onMessage${Neo.capitalize(method.type)}`](msg, api);
+        return this[`onMessage${Neo.capitalize(api.type)}`](msg, api);
     }
 
     /**
@@ -108,8 +108,6 @@ class Message extends Base {
      * @returns {Promise<any>}
      */
     async onMessageWebsocket(msg, api) {
-        console.log('onMessageWebsocket', msg, api);
-
         let me         = this,
             url        = api.url,
             connection = me.socketConnections[url];
@@ -120,11 +118,7 @@ class Message extends Base {
             me.socketConnections[url] = connection = Neo.create(module.default, {serverAddress: url});
         }
 
-        return await connection.promiseMessage({
-            data   : msg,
-            method : api.method,
-            service: api.service
-        })
+        return await connection.promiseMessage(msg);
     }
 
     /**