spice-js 2.5.34 → 2.5.36

package/build/index.js

@@ -136,12 +136,22 @@ class Spice {
           multipart: true,
           formidable: {
             uploadDir: "./storage/uploads",
-            maxFileSize: 1024 * 1024 * 1024
+            maxFileSize: 1024 * 1024 * 1024 // 1GB
+
           }
         }));
         app.use(convert(Validate()));
         spice.app = app;
-        spice.config = yield require("./loaders/config")(); //io.attach(app);
+        spice.mofifiers = {};
+        spice.config = yield require("./loaders/config")();
+
+        spice.addModifier = function (resource, modifier) {
+          spice.mofifiers[resource.toLowerCase()] = spice.mofifiers[resource] == undefined ? [modifier] : [...spice.mofifiers[resource], modifier];
+        };
+
+        spice.getModifiers = function (resource) {
+          return spice.mofifiers[resource.toLowerCase()] || [];
+        }; //io.attach(app);
         //spice.io = io; */
 
         /* io.on("message", (ctx, data) => {
@@ -152,6 +162,7 @@ class Spice {
           console.log("Connection Up", sock);
         }); */
 
+
         app.use((0, _koa2SwaggerUi.koaSwagger)({
           hideTopbar: true,
           title: "Spice JS",

package/build/models/SpiceModel.js

@@ -28,7 +28,9 @@ var SDate = require("sonover-date"),
     _args = Symbol(),
     _hooks = Symbol(),
     _disable_lifecycle_events = Symbol(),
-    _serializers = Symbol();
+    _external_modifier_loaded = Symbol(),
+    _serializers = Symbol(); //const _type = Symbol("type");
+
 
 var that;
 
@@ -56,7 +58,10 @@ class SpiceModel {
       var Database = require("spice-" + dbtype);
 
       this.type = "";
+      this.collection = args.connection; //console.log("Args --  Type::", args.type);
+
       this[_args] = args.args;
+      this[_external_modifier_loaded] = false;
       this[_disable_lifecycle_events] = ((_args$args = args.args) == null ? void 0 : _args$args.disable_lifecycle_events) || false;
       this[_ctx] = (_args2 = args) == null ? void 0 : (_args2$args = _args2.args) == null ? void 0 : _args2$args.ctx;
       this[_hooks] = {
@@ -174,6 +179,19 @@ class SpiceModel {
     } // }
 
   }
+  /* get type() {
+    return this._type;
+  }
+   // Setter for 'type'
+  set type(value) {
+    if (typeof value !== "string") {
+      // example validation
+      throw new Error("Type must be a string.");
+    }
+    this._type = value;
+    //console.log("Type Setted::", value);
+  } */
+
 
   get database() {
     return this[_database];
@@ -441,8 +459,12 @@ class SpiceModel {
           yield _this2.run_hook(args, "get", "before");
           var results = yield _this2.database.get(args.id);
 
-          if (results.type != _this2.type) {
-            throw new Error(_this2.type + " does not exist");
+          if (results.type != undefined) {
+            if (results.type != _this2.type) throw new Error(_this2.type + " does not exist type");
+          }
+
+          if (results._type != undefined) {
+            if (results._type != _this2.type) throw new Error(_this2.type + " does not exist _type");
           }
 
           if (results.deleted == undefined || results.deleted == false) {
@@ -510,12 +532,17 @@ class SpiceModel {
       try {
         if (_.isString(data)) {
           var result = yield _this5.database.get(data);
-
-          if (result.type != _this5.type) {
+          if (result.type) if (result.type != _this5.type) {
+            return false;
+          }
+          if (result._type) if (result._type != _this5.type) {
             return false;
           }
         } else {
-          if (data.type != _this5.type) {
+          if (data.type) if (data.type != _this5.type) {
+            return false;
+          }
+          if (data._type) if (data._type != _this5.type) {
             return false;
           }
         }
@@ -534,10 +561,12 @@ class SpiceModel {
       try {
         _this6.updated_at = new SDate().now();
         var results = yield _this6.database.get(args.id);
+        console.log("Results", results);
         var item_exist = yield _this6.exist(results);
+        console.log("Item Exist", item_exist);
 
         if (!item_exist) {
-          throw new Error(_this6.type + " does not exist.");
+          throw new Error(_this6.type + " does not exist. in update");
         }
 
         delete results["id"];
@@ -551,7 +580,7 @@ class SpiceModel {
         };
 
         if (args.skip_hooks != true) {
-          yield _this6.run_hook(cover_obj, "update", "before");
+          yield _this6.run_hook(cover_obj, "update", "before", results);
         }
 
         var form;
@@ -560,12 +589,17 @@ class SpiceModel {
           form = yield _this6.do_serialize(_this6, "write", cover_obj.new, args);
         }
 
-        yield _this6.database.update(args.id, form || _this6);
+        var db_data = form || _this6; //console.log("New Data Inside Update::::", db_data);
+
+        _this6.implementTypeFix(db_data); // console.log("After ITF::::", db_data);
+
+
+        yield _this6.database.update(args.id, db_data); //console.log("Old Data Inside Update::::", results);
 
         if (args.skip_hooks != true) {
           yield _this6.run_hook(_extends({}, _this6, {
             id: args.id
-          }), "update", "after");
+          }), "update", "after", results);
         }
 
         if (args.skip_read_serialize != true && args.skip_serialize != true) {
@@ -583,6 +617,18 @@ class SpiceModel {
     })();
   }
 
+  implementTypeFix(item) {
+    /* console.log("Type Before Fix", item.type, item._type);
+    let _new_type = item.type || item._type;
+    //item.type = type;
+    console.log("New type", _new_type);
+     item = { ...item, type: _new_type };
+    delete item._type; */
+    //console.log("Type After Fix", item.type, item._type);
+    //if (item._type) delete item["_type"];
+    //console.log("Type After Fix", item.type);
+  }
+
   create(args) {
     var _this7 = this;
 
@@ -607,7 +653,7 @@ class SpiceModel {
         }
 
         yield _this7.run_hook(workingForm, "create", "before");
-        workingForm = yield _this7.do_serialize(workingForm, "write", {}, args);
+        workingForm = _this7.implementTypeFix((yield _this7.do_serialize(workingForm, "write", {}, args)));
         var results = yield _this7.database.insert(id, workingForm, args.expiry);
         yield _this7.run_hook(_extends({}, results, {
           id
@@ -633,6 +679,8 @@ class SpiceModel {
         throw new Error(_this8.type + " does not exist.");
       }
 
+      var results = yield _this8.database.get(args.id);
+
       try {
         yield _this8.run_hook(args, "delete", "before");
         var delete_response = {};
@@ -640,13 +688,12 @@ class SpiceModel {
         if (args.hard) {
           delete_response = yield _this8.database.delete(args.id);
         } else {
-          var results = yield _this8.database.get(args.id);
           delete results["id"];
           results.deleted = true;
           delete_response = yield _this8.database.update(args.id, "");
         }
 
-        yield _this8.run_hook(args, "delete", "after");
+        yield _this8.run_hook(results, "delete", "after", results);
         return {};
       } catch (e) {
         console.log(e.stack);
@@ -911,6 +958,19 @@ class SpiceModel {
 
   createModifiersFromProps() {
     this.createMofifier(this.props);
+    this.addExternalModifiers();
+  }
+
+  addExternalModifiers(scope) {
+    if (scope === void 0) {
+      scope = "*";
+    }
+
+    var that = this;
+
+    _.each([...spice.getModifiers(scope)], function (modifier) {
+      that.addModifier(modifier);
+    });
   }
 
   createMofifier(properties) {
@@ -985,6 +1045,7 @@ class SpiceModel {
     var _this14 = this;
 
     return _asyncToGenerator(function* () {
+      //console.log("CTX INside Model DO", this[_ctx]);
       try {
         // run serializers
         if (!path_to_be_removed) {
@@ -992,9 +1053,15 @@ class SpiceModel {
         }
 
         if (_this14.shouldSerializerRun(args, type)) {
+          if (_this14.type != "" && _this14.type != undefined && _this14[_external_modifier_loaded] != true) {
+            _this14.addExternalModifiers(_this14.type);
+
+            _this14[_external_modifier_loaded] = true;
+          }
+
           for (var i of _this14[_serializers][type]["modifiers"]) {
             try {
-              data = yield i(data, old_data);
+              data = yield i(data, old_data, _this14[_ctx]);
             } catch (e) {
               console.log(e.stack);
             }

package/package.json

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

package/src/index.js

@@ -71,8 +71,19 @@ export default class Spice {
       );
       app.use(convert(Validate()));
       spice.app = app;
+      spice.mofifiers = {};
       spice.config = await require("./loaders/config")();
 
+      spice.addModifier = function (resource, modifier) {
+        spice.mofifiers[resource.toLowerCase()] =
+          spice.mofifiers[resource] == undefined
+            ? [modifier]
+            : [...spice.mofifiers[resource], modifier];
+      };
+
+      spice.getModifiers = function (resource) {
+        return spice.mofifiers[resource.toLowerCase()] || [];
+      };
       //io.attach(app);
       //spice.io = io; */
       /* io.on("message", (ctx, data) => {

package/src/models/SpiceModel.js

@@ -14,7 +14,10 @@ var SDate = require("sonover-date"),
   _args = Symbol(),
   _hooks = Symbol(),
   _disable_lifecycle_events = Symbol(),
+  _external_modifier_loaded = Symbol(),
   _serializers = Symbol();
+
+//const _type = Symbol("type");
 let that;
 if (!Promise.allSettled) {
   Promise.allSettled = (promises) =>
@@ -39,7 +42,10 @@ export default class SpiceModel {
         spice.config.database.connections[args.connection].type || "couchbase";
       let Database = require(`spice-${dbtype}`);
       this.type = "";
+      this.collection = args.connection;
+      //console.log("Args --  Type::", args.type);
       this[_args] = args.args;
+      this[_external_modifier_loaded] = false;
       this[_disable_lifecycle_events] =
         args.args?.disable_lifecycle_events || false;
       this[_ctx] = args?.args?.ctx;
@@ -154,6 +160,19 @@ export default class SpiceModel {
     }
     // }
   }
+  /* get type() {
+    return this._type;
+  }
+
+  // Setter for 'type'
+  set type(value) {
+    if (typeof value !== "string") {
+      // example validation
+      throw new Error("Type must be a string.");
+    }
+    this._type = value;
+    //console.log("Type Setted::", value);
+  } */
 
   get database() {
     return this[_database];
@@ -369,9 +388,16 @@ export default class SpiceModel {
         await this.run_hook(args, "get", "before");
         let results = await this.database.get(args.id);
 
-        if (results.type != this.type) {
-          throw new Error(`${this.type} does not exist`);
+        if (results.type != undefined) {
+          if (results.type != this.type)
+            throw new Error(`${this.type} does not exist type`);
+        }
+
+        if (results._type != undefined) {
+          if (results._type != this.type)
+            throw new Error(`${this.type} does not exist _type`);
         }
+
         if (results.deleted == undefined || results.deleted == false) {
           await this.run_hook(results, "get", "after");
           results = await this.do_serialize(
@@ -434,13 +460,24 @@ export default class SpiceModel {
     try {
       if (_.isString(data)) {
         let result = await this.database.get(data);
-        if (result.type != this.type) {
-          return false;
-        }
+        if (result.type)
+          if (result.type != this.type) {
+            return false;
+          }
+        if (result._type)
+          if (result._type != this.type) {
+            return false;
+          }
       } else {
-        if (data.type != this.type) {
-          return false;
-        }
+        if (data.type)
+          if (data.type != this.type) {
+            return false;
+          }
+
+        if (data._type)
+          if (data._type != this.type) {
+            return false;
+          }
       }
       return true;
     } catch (e) {
@@ -452,9 +489,11 @@ export default class SpiceModel {
     try {
       this.updated_at = new SDate().now();
       let results = await this.database.get(args.id);
+      console.log("Results", results);
       let item_exist = await this.exist(results);
+      console.log("Item Exist", item_exist);
       if (!item_exist) {
-        throw new Error(`${this.type} does not exist.`);
+        throw new Error(`${this.type} does not exist. in update`);
       }
       delete results["id"];
       _.defaults(this, results);
@@ -471,8 +510,14 @@ export default class SpiceModel {
       if (args.skip_write_serialize != true && args.skip_serialize != true) {
         form = await this.do_serialize(this, "write", cover_obj.new, args);
       }
-      await this.database.update(args.id, form || this);
-      console.log("Old Data Inside Update::::", results);
+      let db_data = form || this;
+      //console.log("New Data Inside Update::::", db_data);
+
+      this.implementTypeFix(db_data);
+      // console.log("After ITF::::", db_data);
+
+      await this.database.update(args.id, db_data);
+      //console.log("Old Data Inside Update::::", results);
       if (args.skip_hooks != true) {
         await this.run_hook(
           {
@@ -501,6 +546,19 @@ export default class SpiceModel {
     }
   }
 
+  implementTypeFix(item) {
+    /* console.log("Type Before Fix", item.type, item._type);
+    let _new_type = item.type || item._type;
+    //item.type = type;
+    console.log("New type", _new_type);
+
+    item = { ...item, type: _new_type };
+    delete item._type; */
+    //console.log("Type After Fix", item.type, item._type);
+    //if (item._type) delete item["_type"];
+    //console.log("Type After Fix", item.type);
+  }
+
   async create(args) {
     try {
       let form;
@@ -519,7 +577,9 @@ export default class SpiceModel {
         id = args.id;
       }
       await this.run_hook(workingForm, "create", "before");
-      workingForm = await this.do_serialize(workingForm, "write", {}, args);
+      workingForm = this.implementTypeFix(
+        await this.do_serialize(workingForm, "write", {}, args)
+      );
 
       let results = await this.database.insert(id, workingForm, args.expiry);
       await this.run_hook(
@@ -830,6 +890,14 @@ export default class SpiceModel {
 
   createModifiersFromProps() {
     this.createMofifier(this.props);
+    this.addExternalModifiers();
+  }
+
+  addExternalModifiers(scope = "*") {
+    let that = this;
+    _.each([...spice.getModifiers(scope)], function (modifier) {
+      that.addModifier(modifier);
+    });
   }
 
   createMofifier(properties) {
@@ -886,6 +954,7 @@ export default class SpiceModel {
   }
 
   async do_serialize(data, type, old_data, args, path_to_be_removed) {
+    //console.log("CTX INside Model DO", this[_ctx]);
     try {
       // run serializers
 
@@ -894,9 +963,17 @@ export default class SpiceModel {
       }
 
       if (this.shouldSerializerRun(args, type)) {
+        if (
+          this.type != "" &&
+          this.type != undefined &&
+          this[_external_modifier_loaded] != true
+        ) {
+          this.addExternalModifiers(this.type);
+          this[_external_modifier_loaded] = true;
+        }
         for (let i of this[_serializers][type]["modifiers"]) {
           try {
-            data = await i(data, old_data);
+            data = await i(data, old_data, this[_ctx]);
           } catch (e) {
             console.log(e.stack);
           }