fib-app - npm Package Compare versions

Comparing version 1.7.5 to 1.7.6

lib/classes/base.js

@@ -25,3 +25,4 @@ const err_info = require('../utils/err_info');
         var _opt;
-        var rdata;
+        var rdata = [];
+        var obj;
 
@@ -31,63 +32,42 @@ if (_createBy !== undefined)
 
-        if (Array.isArray(data)) {
-            data = data.map(d => filter(d, acl));
 
-            rdata = [];
-            data.forEach(d => {
-                var rd = {};
-                rdata.push(rd);
+        function _create(d) {
+            d = filter(d, acl);
 
-                for (var k in cls.extends) {
-                    var r = d[k];
-
-                    if (r !== undefined) {
-                        rd[k] = r;
-                        delete d[k];
-                    }
-                }
-            });
-        } else {
-            data = filter(data, acl);
-
-            rdata = {};
+            var rd = {};
             for (var k in cls.extends) {
-                var r = data[k];
+                var r = d[k];
 
                 if (r !== undefined) {
-                    rdata[k] = r;
-                    delete data[k];
+                    rd[k] = r;
+                    delete d[k];
                 }
             }
-        }
 
-        var obj = cls.createSync(data);
+            rdata.push(rd);
 
-        if (me !== undefined) {
-            if (Array.isArray(obj)) {
-                _opt = obj[0].__opts.one_associations.find(a => a.name === 'createdBy').setAccessor;
-                obj.forEach(o => o[_opt + 'Sync'].call(o, me));
-            } else {
-                _opt = obj.__opts.one_associations.find(a => a.name === 'createdBy').setAccessor;
-                obj[_opt + 'Sync'].call(obj, me);
+            var o = new cls(d);
+            if (me !== undefined) {
+                _opt = o.__opts.one_associations.find(a => a.name === 'createdBy').setAccessor;
+                o[_opt + 'Sync'].call(o, me);
             }
+            o.saveSync();
+
+            return o;
         }
 
-        if (Array.isArray(rdata)) {
-            for (var i = 0; i < rdata.length; i++) {
-                var rd = rdata[i];
-                for (var k in rd) {
-                    var res = api.epost(req, db, cls, obj[i], k, rd[k]);
-                    if (res.error)
-                        return res;
-                }
-            }
-        } else {
-            for (var k in rdata) {
-                var res = api.epost(req, db, cls, obj, k, rdata[k]);
+        if (Array.isArray(data))
+            obj = data.map(d => _create(d));
+        else
+            obj = [_create(data)];
+
+        rdata.forEach((rd, i) => {
+            for (var k in rd) {
+                var res = api.epost(req, db, cls, obj[i], k, rd[k]);
                 if (res.error)
                     return res;
             }
-        }
+        });
 
-        if (Array.isArray(obj))
+        if (Array.isArray(data))
             return {
@@ -106,4 +86,4 @@ status: 201,
                 success: {
-                    id: obj.id,
-                    createdAt: obj.createdAt
+                    id: obj[0].id,
+                    createdAt: obj[0].createdAt
                 }
@@ -110,0 +90,0 @@ };

lib/classes/extend.js

@@ -130,70 +130,46 @@ const util = require('util');
         var robj;
-        var rdata;
+        var rdata = [];
 
-        if (Array.isArray(data)) {
-            data = data.map(d => filter(d, acl));
+        function _create(d) {
+            d = filter(d, acl);
 
-            rdata = [];
-            data.forEach(d => {
-                var rd = {};
-                rdata.push(rd);
-
-                for (var k in cls.extends) {
-                    var r = d[k];
-
-                    if (r !== undefined) {
-                        rd[k] = r;
-                        delete d[k];
-                    }
-                }
-            });
-        } else {
-            data = filter(data, acl);
-
-            rdata = {};
+            var rd = {};
             for (var k in cls.extends) {
-                var r = data[k];
+                var r = d[k];
 
                 if (r !== undefined) {
-                    rdata[k] = r;
-                    delete data[k];
+                    rd[k] = r;
+                    delete d[k];
                 }
             }
-        }
+            rdata.push(rd);
 
-        if (rel_model.reversed) {
-            obj.data[extend] = data;
-            obj.data.saveSync();
-            robj = obj.data[extend];
-            if (!Array.isArray(data))
-                robj = robj[0];
-        } else
-            robj = rel_model.model.createSync(data);
+            var ro = new rel_model.model(d);
 
-        if (me !== undefined) {
-            if (Array.isArray(robj)) {
-                _opt = robj[0].__opts.one_associations.find(a => a.name === 'createdBy').setAccessor;
-                robj.forEach(o => o[_opt + 'Sync'].call(o, me));
-            } else {
-                _opt = robj.__opts.one_associations.find(a => a.name === 'createdBy').setAccessor;
-                robj[_opt + 'Sync'].call(robj, me);
+            if (me !== undefined) {
+                _opt = ro.__opts.one_associations.find(a => a.name === 'createdBy').setAccessor;
+                ro[_opt + 'Sync'].call(ro, me);
             }
+
+            if (rel_model.reversed) {
+                obj.data[extend] = ro;
+                obj.data.saveSync();
+            } else
+                ro.saveSync();
+
+            return ro;
         }
 
-        if (Array.isArray(rdata)) {
-            for (var i = 0; i < rdata.length; i++) {
-                var rd = rdata[i];
-                for (var k in rd) {
-                    var res = api.epost(req, db, cls, robj[i], k, rd[k]);
-                    if (res.error)
-                        return res;
-                }
-            }
-        } else {
-            for (var k in rdata) {
-                var res = api.epost(req, db, cls, robj, k, rdata[k]);
+        if (Array.isArray(data))
+            robj = data.map(d => _create(d));
+        else
+            robj = [_create(data)];
+
+        rdata.forEach((rd, i) => {
+            for (var k in rd) {
+                var res = api.epost(req, db, cls, robj[i], k, rd[k]);
                 if (res.error)
                     return res;
             }
-        }
+        });
 
@@ -207,6 +183,6 @@ if (!rel_model.reversed) {
 
-            obj.data[_opt + 'Sync'].call(obj.data, robj);
+            robj.forEach(ro => obj.data[_opt + 'Sync'].call(obj.data, ro));
         }
 
-        if (Array.isArray(robj)) {
+        if (Array.isArray(data)) {
             return {
@@ -225,4 +201,4 @@ status: 201,
                 success: {
-                    id: robj.id,
-                    createdAt: robj.createdAt
+                    id: robj[0].id,
+                    createdAt: robj[0].createdAt
                 }
@@ -229,0 +205,0 @@ };

package.json

 {
   "name": "fib-app",
-  "version": "1.7.5",
+  "version": "1.7.6",
   "description": "",
@@ -21,2 +21,2 @@ "main": "lib/app",
   }
-}
+}

No alert changes

Worsened metrics

Total package byte prevSize

61245

decreased by-2.64%

Lines of code

1350

decreased by-3.16%

No dependency changes