spice-js 2.5.26 → 2.5.29

package/build/models/SpiceModel.js

@@ -201,6 +201,25 @@ class SpiceModel {
     return item.length > 27 && item.indexOf("|") > -1;
   }
 
+  propsToBeRemoved(data) {
+    var _this = this;
+
+    return _asyncToGenerator(function* () {
+      if (!_.isArray(data)) {
+        data = Array.of(data);
+      }
+
+      console.log("DAta", data);
+
+      if (_this[_ctx]) {
+        var returned = yield new _this[_ctx].state.process_fields().process(_this[_ctx], data, _this.type);
+        return returned;
+      }
+
+      return [];
+    })();
+  }
+
   createValidationString(_ref) {
     var {
       property_name,
@@ -418,7 +437,7 @@ class SpiceModel {
   }
 
   get(args) {
-    var _this = this;
+    var _this2 = this;
 
     return _asyncToGenerator(function* () {
       try {
@@ -427,19 +446,19 @@ class SpiceModel {
         }
 
         if (_.isString(args.id)) {
-          yield _this.run_hook(args, "get", "before");
-          var results = yield _this.database.get(args.id);
+          yield _this2.run_hook(args, "get", "before");
+          var results = yield _this2.database.get(args.id);
 
-          if (results.type != _this.type) {
-            throw new Error(_this.type + " does not exist");
+          if (results.type != _this2.type) {
+            throw new Error(_this2.type + " does not exist");
           }
 
           if (results.deleted == undefined || results.deleted == false) {
-            yield _this.run_hook(results, "get", "after");
-            results = yield _this.do_serialize(results, "read", {}, args);
+            yield _this2.run_hook(results, "get", "after");
+            results = yield _this2.do_serialize(results, "read", {}, args, (yield _this2.propsToBeRemoved(results)));
             return results;
           } else {
-            throw new Error(_this.type + " does not exist");
+            throw new Error(_this2.type + " does not exist");
           }
         }
       } catch (e) {
@@ -448,12 +467,12 @@ class SpiceModel {
     })();
   }
 
-  query(query) {
-    var _this2 = this;
+  query(query, scope) {
+    var _this3 = this;
 
     return _asyncToGenerator(function* () {
       try {
-        var results = yield _this2.database.query(query);
+        var results = yield _this3.database.query(query, scope);
         return results;
       } catch (error) {
         throw error;
@@ -462,7 +481,7 @@ class SpiceModel {
   }
 
   getMulti(args) {
-    var _this3 = this;
+    var _this4 = this;
 
     return _asyncToGenerator(function* () {
       try {
@@ -470,20 +489,20 @@ class SpiceModel {
           args = {};
         }
 
-        yield _this3.run_hook(_this3, "list", "before");
+        yield _this4.run_hook(_this4, "list", "before");
 
         _.remove(args.ids, o => o == undefined);
 
         var results = [];
 
         if (args.ids.length > 0) {
-          results = yield _this3.database.multi_get(args.ids, true);
+          results = yield _this4.database.multi_get(args.ids, true);
         }
 
-        _.remove(results, o => o.type != _this3.type);
+        _.remove(results, o => o.type != _this4.type);
 
-        yield _this3.run_hook(results, "list", "after", args.context);
-        results = yield _this3.do_serialize(results, "read", {}, args);
+        yield _this4.run_hook(results, "list", "after", args.context);
+        results = yield _this4.do_serialize(results, "read", {}, args, (yield _this4.propsToBeRemoved(results)));
         return results;
       } catch (e) {
         console.log(e.stack);
@@ -493,18 +512,18 @@ class SpiceModel {
   }
 
   exist(data) {
-    var _this4 = this;
+    var _this5 = this;
 
     return _asyncToGenerator(function* () {
       try {
         if (_.isString(data)) {
-          var result = yield _this4.database.get(data);
+          var result = yield _this5.database.get(data);
 
-          if (result.type != _this4.type) {
+          if (result.type != _this5.type) {
             return false;
           }
         } else {
-          if (data.type != _this4.type) {
+          if (data.type != _this5.type) {
             return false;
           }
         }
@@ -517,51 +536,51 @@ class SpiceModel {
   }
 
   update(args) {
-    var _this5 = this;
+    var _this6 = this;
 
     return _asyncToGenerator(function* () {
       try {
-        _this5.updated_at = new SDate().now();
-        var results = yield _this5.database.get(args.id);
-        var item_exist = yield _this5.exist(results);
+        _this6.updated_at = new SDate().now();
+        var results = yield _this6.database.get(args.id);
+        var item_exist = yield _this6.exist(results);
 
         if (!item_exist) {
-          throw new Error(_this5.type + " does not exist.");
+          throw new Error(_this6.type + " does not exist.");
         }
 
         delete results["id"];
 
-        _.defaults(_this5, results);
+        _.defaults(_this6, results);
 
         var cover_obj = {
           old: results,
-          new: _this5,
+          new: _this6,
           id: args.id
         };
 
         if (args.skip_hooks != true) {
-          yield _this5.run_hook(cover_obj, "update", "before");
+          yield _this6.run_hook(cover_obj, "update", "before");
         }
 
         var form;
 
         if (args.skip_write_serialize != true && args.skip_serialize != true) {
-          form = yield _this5.do_serialize(_this5, "write", cover_obj.new, args);
+          form = yield _this6.do_serialize(_this6, "write", cover_obj.new, args);
         }
 
-        yield _this5.database.update(args.id, form || _this5);
+        yield _this6.database.update(args.id, form || _this6);
 
         if (args.skip_hooks != true) {
-          yield _this5.run_hook(_extends({}, _this5, {
+          yield _this6.run_hook(_extends({}, _this6, {
             id: args.id
           }), "update", "after");
         }
 
         if (args.skip_read_serialize != true && args.skip_serialize != true) {
-          form = yield _this5.do_serialize(form, "read", {}, args);
+          form = yield _this6.do_serialize(form, "read", {}, args, (yield _this6.propsToBeRemoved(form)));
         }
 
-        _this5.id = args.id;
+        _this6.id = args.id;
         return _extends({}, form, {
           id: args.id
         });
@@ -573,35 +592,35 @@ class SpiceModel {
   }
 
   create(args) {
-    var _this6 = this;
+    var _this7 = this;
 
     return _asyncToGenerator(function* () {
       try {
         var form;
-        _this6.created_at = new SDate().now();
+        _this7.created_at = new SDate().now();
 
         if (args.body) {
           form = _.defaults({}, args.body);
-          form.created_at = _this6.created_at;
-          form.updated_at = _this6.created_at;
+          form.created_at = _this7.created_at;
+          form.updated_at = _this7.created_at;
           delete form["bucket"];
         }
 
-        var workingForm = form || _this6;
-        _this6.updated_at = new SDate().now();
+        var workingForm = form || _this7;
+        _this7.updated_at = new SDate().now();
         var id = args.id_prefix + "-" + UUID.v4();
 
         if (args && args.id) {
           id = args.id;
         }
 
-        yield _this6.run_hook(workingForm, "create", "before");
-        workingForm = yield _this6.do_serialize(workingForm, "write", {}, args);
-        var results = yield _this6.database.insert(id, workingForm, args.expiry);
-        yield _this6.run_hook(_extends({}, results, {
+        yield _this7.run_hook(workingForm, "create", "before");
+        workingForm = yield _this7.do_serialize(workingForm, "write", {}, args);
+        var results = yield _this7.database.insert(id, workingForm, args.expiry);
+        yield _this7.run_hook(_extends({}, results, {
           id
         }), "create", "after");
-        results = yield _this6.do_serialize(results, "read", {}, args);
+        results = yield _this7.do_serialize(results, "read", {}, args, (yield _this7.propsToBeRemoved(results)));
         return _extends({}, results, {
           id
         });
@@ -613,29 +632,29 @@ class SpiceModel {
   }
 
   delete(args) {
-    var _this7 = this;
+    var _this8 = this;
 
     return _asyncToGenerator(function* () {
-      var item_exist = yield _this7.exist(args.id);
+      var item_exist = yield _this8.exist(args.id);
 
       if (!item_exist) {
-        throw new Error(_this7.type + " does not exist.");
+        throw new Error(_this8.type + " does not exist.");
       }
 
       try {
-        yield _this7.run_hook(args, "delete", "before");
+        yield _this8.run_hook(args, "delete", "before");
         var delete_response = {};
 
         if (args.hard) {
-          delete_response = yield _this7.database.delete(args.id);
+          delete_response = yield _this8.database.delete(args.id);
         } else {
-          var results = yield _this7.database.get(args.id);
+          var results = yield _this8.database.get(args.id);
           delete results["id"];
           results.deleted = true;
-          delete_response = yield _this7.database.update(args.id, "");
+          delete_response = yield _this8.database.update(args.id, "");
         }
 
-        yield _this7.run_hook(args, "delete", "after");
+        yield _this8.run_hook(args, "delete", "after");
         return {};
       } catch (e) {
         console.log(e.stack);
@@ -649,7 +668,7 @@ class SpiceModel {
   }
 
   list(args) {
-    var _this8 = this;
+    var _this9 = this;
 
     return _asyncToGenerator(function* () {
       try {
@@ -663,7 +682,7 @@ class SpiceModel {
           query = args.query;
         } else {
           if (args.filters) {
-            query = yield _this8.makeQueryFromFilter(args.filters);
+            query = yield _this9.makeQueryFromFilter(args.filters);
           } else {
             if (args.query) {
               query = args.query + " AND (deleted = false OR deleted IS MISSING) ";
@@ -685,22 +704,22 @@ class SpiceModel {
           args.sort = "created_at DESC";
         }
 
-        yield _this8.run_hook(_this8, "list", "before");
+        yield _this9.run_hook(_this9, "list", "before");
         var results;
 
         if (args.is_custom_query && args.is_custom_query === "true") {
-          results = yield _this8.database.query(query);
+          results = yield _this9.database.query(query);
         } else {
           if (args.is_full_text && args.is_full_text === "true") {
-            results = yield _this8.database.full_text_search(_this8.type, query || "", args.limit, args.offset);
+            results = yield _this9.database.full_text_search(_this9.type, query || "", args.limit, args.offset);
           } else {
-            results = yield _this8.database.search(_this8.type, args.columns || "", query || "", args.limit, args.offset, args.sort, args.do_count, args.statement_consistent);
+            results = yield _this9.database.search(_this9.type, args.columns || "", query || "", args.limit, args.offset, args.sort, args.do_count, args.statement_consistent);
           }
         }
 
         try {
-          yield _this8.run_hook(results.data, "list", "after");
-          results.data = yield _this8.do_serialize(results.data, "read", {}, args);
+          yield _this9.run_hook(results.data, "list", "after");
+          results.data = yield _this9.do_serialize(results.data, "read", {}, args, (yield _this9.propsToBeRemoved(results.data)));
         } catch (e) {
           console.log(e);
         }
@@ -724,26 +743,26 @@ class SpiceModel {
   }
 
   run_hook(data, op, when, old_data) {
-    var _this9 = this;
+    var _this10 = this;
 
     return _asyncToGenerator(function* () {
       try {
-        if (_this9[_disable_lifecycle_events] == false) {
+        if (_this10[_disable_lifecycle_events] == false) {
           var resourceLifecycleTriggered = new _ResourceLifecycleTriggered.default({
             data: {
               data,
               operation: op,
               when,
               old_data,
-              resource: _this9.type,
-              ctx: _this9[_ctx]
+              resource: _this10.type,
+              ctx: _this10[_ctx]
             }
           });
           resourceLifecycleTriggered.dispatch();
         }
 
-        if (_this9[_hooks] && _this9[_hooks][op] && _this9[_hooks][op][when]) {
-          for (var i of _this9[_hooks][op][when]) {
+        if (_this10[_hooks] && _this10[_hooks][op] && _this10[_hooks][op][when]) {
+          for (var i of _this10[_hooks][op][when]) {
             data = yield i(data, old_data);
           }
         }
@@ -776,7 +795,7 @@ class SpiceModel {
   }
 
   mapToObject(data, Class, source_property, store_property, property) {
-    var _this10 = this;
+    var _this11 = this;
 
     return _asyncToGenerator(function* () {
       var original_is_array = _.isArray(data);
@@ -795,7 +814,7 @@ class SpiceModel {
       });
 
       var returned_all = yield Promise.allSettled(_.map(classes, obj => {
-        return new obj(_this10[_args]).getMulti({
+        return new obj(_this11[_args]).getMulti({
           ids: ids
         });
       }));
@@ -813,7 +832,7 @@ class SpiceModel {
   }
 
   mapToObjectArray(data, Class, source_property, store_property, property) {
-    var _this11 = this;
+    var _this12 = this;
 
     return _asyncToGenerator(function* () {
       var original_is_array = _.isArray(data);
@@ -842,7 +861,7 @@ class SpiceModel {
 
       var classes = _.isArray(Class) ? Class : [Class];
       var returned_all = yield Promise.allSettled(_.map(classes, obj => {
-        return new obj(_this11[_args]).getMulti({
+        return new obj(_this12[_args]).getMulti({
           ids: ids
         });
       }));
@@ -889,7 +908,7 @@ class SpiceModel {
   }
 
   createMofifier(properties) {
-    var _this12 = this;
+    var _this13 = this;
 
     var _loop = function _loop(i) {
       if (properties[i].map) {
@@ -900,11 +919,11 @@ class SpiceModel {
                 case String:
                 case "string":
                   {
-                    _this12.addModifier({
+                    _this13.addModifier({
                       when: properties[i].map.when || "read",
                       execute: function () {
                         var _execute = _asyncToGenerator(function* (data) {
-                          return yield _this12.mapToObject(data, _.isString(properties[i].map.reference) ? spice.models[properties[i].map.reference] : properties[i].map.reference, i, properties[i].map.destination || i, properties[i]);
+                          return yield _this13.mapToObject(data, _.isString(properties[i].map.reference) ? spice.models[properties[i].map.reference] : properties[i].map.reference, i, properties[i].map.destination || i, properties[i]);
                         });
 
                         function execute(_x) {
@@ -921,11 +940,11 @@ class SpiceModel {
                 case Array:
                 case "array":
                   {
-                    _this12.addModifier({
+                    _this13.addModifier({
                       when: properties[i].map.when || "read",
                       execute: function () {
                         var _execute2 = _asyncToGenerator(function* (data) {
-                          return yield _this12.mapToObjectArray(data, _.isString(properties[i].map.reference) ? spice.models[properties[i].map.reference] : properties[i].map.reference, i, properties[i].map.destination || i, properties[i]);
+                          return yield _this13.mapToObjectArray(data, _.isString(properties[i].map.reference) ? spice.models[properties[i].map.reference] : properties[i].map.reference, i, properties[i].map.destination || i, properties[i]);
                         });
 
                         function execute(_x2) {
@@ -956,14 +975,14 @@ class SpiceModel {
     }
   }
 
-  do_serialize(data, type, old_data, args) {
-    var _this13 = this;
+  do_serialize(data, type, old_data, args, path_to_be_removed) {
+    var _this14 = this;
 
     return _asyncToGenerator(function* () {
       try {
         // run serializers
-        if (_this13.shouldSerializerRun(args, type)) {
-          for (var i of _this13[_serializers][type]["modifiers"]) {
+        if (_this14.shouldSerializerRun(args, type)) {
+          for (var i of _this14[_serializers][type]["modifiers"]) {
             try {
               data = yield i(data, old_data);
             } catch (e) {
@@ -981,12 +1000,12 @@ class SpiceModel {
 
           var defaults = {};
 
-          for (var _i in _this13.props) {
-            if (_this13.props[_i].defaults != undefined && _this13.props[_i].defaults[type] != undefined && _this13.props[_i].defaults[type] != undefined) {
-              defaults[_i] = _.isFunction(_this13.props[_i].defaults[type]) ? _this13.props[_i].defaults[type]({
+          for (var _i in _this14.props) {
+            if (_this14.props[_i].defaults != undefined && _this14.props[_i].defaults[type] != undefined && _this14.props[_i].defaults[type] != undefined) {
+              defaults[_i] = _.isFunction(_this14.props[_i].defaults[type]) ? _this14.props[_i].defaults[type]({
                 old_data: data,
                 new_data: old_data
-              }) : _this13.props[_i].defaults[type];
+              }) : _this14.props[_i].defaults[type];
             }
           } // apply defaults
 
@@ -997,10 +1016,10 @@ class SpiceModel {
 
 
           if (type == "read") {
-            var props_to_clean = ["deleted", "type"];
+            var props_to_clean = ["deleted", "type", ...path_to_be_removed];
 
-            for (var _i3 in _this13.props) {
-              if (_this13.props[_i3].hide) {
+            for (var _i3 in _this14.props) {
+              if (_this14.props[_i3].hide) {
                 props_to_clean.push(_i3);
               }
             }
@@ -1008,7 +1027,7 @@ class SpiceModel {
             data = _.map(data, obj => _.omit(obj, props_to_clean));
           }
 
-          return original_is_array ? data : data[0];
+          return original_is_array ? data : _.first(data);
         }
       } catch (e) {
         console.log(e.stack);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spice-js",
-  "version": "2.5.26",
+  "version": "2.5.29",
   "description": "spice",
   "main": "build/index.js",
   "repository": {

package/src/models/SpiceModel.js

@@ -123,8 +123,8 @@ export default class SpiceModel {
                 this[i] = _.isBoolean(args.args[i])
                   ? args.args[i]
                   : args.args[i] == "true" ||
-                    args.args[i] == 1 ||
-                    args.args[i] == "True";
+                  args.args[i] == 1 ||
+                  args.args[i] == "True";
                 break;
               }
               case Date:
@@ -180,6 +180,21 @@ export default class SpiceModel {
     return item.length > 27 && item.indexOf("|") > -1;
   }
 
+  async propsToBeRemoved(data) {
+
+    if (!_.isArray(data)) {
+      data = Array.of(data)
+    }
+
+    console.log("DAta", data)
+    if (this[_ctx]) {
+      let returned = await new this[_ctx].state.process_fields().process(this[_ctx], data, this.type);
+      return returned;
+
+    }
+    return []
+  }
+
   createValidationString({ property_name, props, operation, complete }) {
     let operationExempt = {
       PUT: ["required", "unique"],
@@ -364,7 +379,13 @@ export default class SpiceModel {
         }
         if (results.deleted == undefined || results.deleted == false) {
           await this.run_hook(results, "get", "after");
-          results = await this.do_serialize(results, "read", {}, args);
+          results = await this.do_serialize(
+            results,
+            "read",
+            {},
+            args,
+            await this.propsToBeRemoved(results)
+          );
           return results;
         } else {
           throw new Error(`${this.type} does not exist`);
@@ -375,9 +396,9 @@ export default class SpiceModel {
     }
   }
 
-  async query(query) {
+  async query(query, scope) {
     try {
-      let results = await this.database.query(query);
+      let results = await this.database.query(query, scope);
       return results;
     } catch (error) {
       throw error;
@@ -399,7 +420,13 @@ export default class SpiceModel {
       _.remove(results, (o) => o.type != this.type);
 
       await this.run_hook(results, "list", "after", args.context);
-      results = await this.do_serialize(results, "read", {}, args);
+      results = await this.do_serialize(
+        results,
+        "read",
+        {},
+        args,
+        await this.propsToBeRemoved(results)
+      );
 
       return results;
     } catch (e) {
@@ -461,7 +488,13 @@ export default class SpiceModel {
         );
       }
       if (args.skip_read_serialize != true && args.skip_serialize != true) {
-        form = await this.do_serialize(form, "read", {}, args);
+        form = await this.do_serialize(
+          form,
+          "read",
+          {},
+          args,
+          await this.propsToBeRemoved(form)
+        );
       }
       this.id = args.id;
       return { ...form, id: args.id };
@@ -500,7 +533,13 @@ export default class SpiceModel {
         "create",
         "after"
       );
-      results = await this.do_serialize(results, "read", {}, args);
+      results = await this.do_serialize(
+        results,
+        "read",
+        {},
+        args,
+        await this.propsToBeRemoved(results)
+      );
       return { ...results, id };
     } catch (e) {
       console.log(e.stack);
@@ -601,7 +640,13 @@ export default class SpiceModel {
       }
       try {
         await this.run_hook(results.data, "list", "after");
-        results.data = await this.do_serialize(results.data, "read", {}, args);
+        results.data = await this.do_serialize(
+          results.data,
+          "read",
+          {},
+          args,
+          await this.propsToBeRemoved(results.data)
+        );
       } catch (e) {
         console.log(e);
       }
@@ -830,7 +875,7 @@ export default class SpiceModel {
     }
   }
 
-  async do_serialize(data, type, old_data, args) {
+  async do_serialize(data, type, old_data, args, path_to_be_removed) {
     try {
       // run serializers
 
@@ -860,9 +905,9 @@ export default class SpiceModel {
           ) {
             defaults[i] = _.isFunction(this.props[i].defaults[type])
               ? this.props[i].defaults[type]({
-                  old_data: data,
-                  new_data: old_data,
-                })
+                old_data: data,
+                new_data: old_data,
+              })
               : this.props[i].defaults[type];
           }
         }
@@ -873,7 +918,7 @@ export default class SpiceModel {
 
         // apply cleaners
         if (type == "read") {
-          let props_to_clean = ["deleted", "type"];
+          let props_to_clean = ["deleted", "type", ...path_to_be_removed];
           for (let i in this.props) {
             if (this.props[i].hide) {
               props_to_clean.push(i);
@@ -882,7 +927,7 @@ export default class SpiceModel {
           data = _.map(data, (obj) => _.omit(obj, props_to_clean));
         }
 
-        return original_is_array ? data : data[0];
+        return original_is_array ? data : _.first(data);
       }
     } catch (e) {
       console.log(e.stack);