spice-js 2.5.24 → 2.5.27

package/build/models/SpiceModel.js

@@ -23,8 +23,11 @@ var SDate = require("sonover-date"),
     UUID = require("uuid"),
     _ = require("lodash"),
     _database = Symbol(),
+    _ctx = Symbol(),
     _props = Symbol(),
+    _args = Symbol(),
     _hooks = Symbol(),
+    _disable_lifecycle_events = Symbol(),
     _serializers = Symbol();
 
 var that;
@@ -46,11 +49,16 @@ class SpiceModel {
     }
 
     try {
+      var _args$args, _args2, _args2$args;
+
       var dbtype = spice.config.database.connections[args.connection].type || "couchbase";
 
       var Database = require("spice-" + dbtype);
 
       this.type = "";
+      this[_args] = args.args;
+      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] = {
         create: {
           before: [],
@@ -84,10 +92,11 @@ class SpiceModel {
         }
       };
       this.deleted = false;
-
+      /*
       if (args.args) {
         delete args.args["ctx"];
       }
+      */
 
       this[_database] = new Database(args.connection || "default", {
         collection: args.collection,
@@ -719,16 +728,19 @@ class SpiceModel {
 
     return _asyncToGenerator(function* () {
       try {
-        var resourceLifecycleTriggered = new _ResourceLifecycleTriggered.default({
-          data: {
-            data,
-            operation: op,
-            when,
-            old_data,
-            resource: _this9.type
-          }
-        });
-        resourceLifecycleTriggered.dispatch();
+        if (_this9[_disable_lifecycle_events] == false) {
+          var resourceLifecycleTriggered = new _ResourceLifecycleTriggered.default({
+            data: {
+              data,
+              operation: op,
+              when,
+              old_data,
+              resource: _this9.type,
+              ctx: _this9[_ctx]
+            }
+          });
+          resourceLifecycleTriggered.dispatch();
+        }
 
         if (_this9[_hooks] && _this9[_hooks][op] && _this9[_hooks][op][when]) {
           for (var i of _this9[_hooks][op][when]) {
@@ -764,6 +776,8 @@ class SpiceModel {
   }
 
   mapToObject(data, Class, source_property, store_property, property) {
+    var _this10 = this;
+
     return _asyncToGenerator(function* () {
       var original_is_array = _.isArray(data);
 
@@ -781,7 +795,7 @@ class SpiceModel {
       });
 
       var returned_all = yield Promise.allSettled(_.map(classes, obj => {
-        return new obj().getMulti({
+        return new obj(_this10[_args]).getMulti({
           ids: ids
         });
       }));
@@ -799,6 +813,8 @@ class SpiceModel {
   }
 
   mapToObjectArray(data, Class, source_property, store_property, property) {
+    var _this11 = this;
+
     return _asyncToGenerator(function* () {
       var original_is_array = _.isArray(data);
 
@@ -826,7 +842,7 @@ class SpiceModel {
 
       var classes = _.isArray(Class) ? Class : [Class];
       var returned_all = yield Promise.allSettled(_.map(classes, obj => {
-        return new obj().getMulti({
+        return new obj(_this11[_args]).getMulti({
           ids: ids
         });
       }));
@@ -873,7 +889,7 @@ class SpiceModel {
   }
 
   createMofifier(properties) {
-    var _this10 = this;
+    var _this12 = this;
 
     var _loop = function _loop(i) {
       if (properties[i].map) {
@@ -884,11 +900,11 @@ class SpiceModel {
                 case String:
                 case "string":
                   {
-                    _this10.addModifier({
+                    _this12.addModifier({
                       when: properties[i].map.when || "read",
                       execute: function () {
                         var _execute = _asyncToGenerator(function* (data) {
-                          return yield _this10.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 _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]);
                         });
 
                         function execute(_x) {
@@ -905,11 +921,11 @@ class SpiceModel {
                 case Array:
                 case "array":
                   {
-                    _this10.addModifier({
+                    _this12.addModifier({
                       when: properties[i].map.when || "read",
                       execute: function () {
                         var _execute2 = _asyncToGenerator(function* (data) {
-                          return yield _this10.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 _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]);
                         });
 
                         function execute(_x2) {
@@ -941,13 +957,13 @@ class SpiceModel {
   }
 
   do_serialize(data, type, old_data, args) {
-    var _this11 = this;
+    var _this13 = this;
 
     return _asyncToGenerator(function* () {
       try {
         // run serializers
-        if (_this11.shouldSerializerRun(args, type)) {
-          for (var i of _this11[_serializers][type]["modifiers"]) {
+        if (_this13.shouldSerializerRun(args, type)) {
+          for (var i of _this13[_serializers][type]["modifiers"]) {
             try {
               data = yield i(data, old_data);
             } catch (e) {
@@ -965,12 +981,12 @@ class SpiceModel {
 
           var defaults = {};
 
-          for (var _i in _this11.props) {
-            if (_this11.props[_i].defaults != undefined && _this11.props[_i].defaults[type] != undefined && _this11.props[_i].defaults[type] != undefined) {
-              defaults[_i] = _.isFunction(_this11.props[_i].defaults[type]) ? _this11.props[_i].defaults[type]({
+          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]({
                 old_data: data,
                 new_data: old_data
-              }) : _this11.props[_i].defaults[type];
+              }) : _this13.props[_i].defaults[type];
             }
           } // apply defaults
 
@@ -983,8 +999,8 @@ class SpiceModel {
           if (type == "read") {
             var props_to_clean = ["deleted", "type"];
 
-            for (var _i3 in _this11.props) {
-              if (_this11.props[_i3].hide) {
+            for (var _i3 in _this13.props) {
+              if (_this13.props[_i3].hide) {
                 props_to_clean.push(_i3);
               }
             }

package/package.json

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

package/src/models/SpiceModel.js

@@ -9,8 +9,11 @@ var SDate = require("sonover-date"),
   UUID = require("uuid"),
   _ = require("lodash"),
   _database = Symbol(),
+  _ctx = Symbol(),
   _props = Symbol(),
+  _args = Symbol(),
   _hooks = Symbol(),
+  _disable_lifecycle_events = Symbol(),
   _serializers = Symbol();
 let that;
 if (!Promise.allSettled) {
@@ -36,7 +39,10 @@ export default class SpiceModel {
         spice.config.database.connections[args.connection].type || "couchbase";
       let Database = require(`spice-${dbtype}`);
       this.type = "";
-
+      this[_args] = args.args;
+      this[_disable_lifecycle_events] =
+        args.args?.disable_lifecycle_events || false;
+      this[_ctx] = args?.args?.ctx;
       this[_hooks] = {
         create: {
           before: [],
@@ -71,10 +77,12 @@ export default class SpiceModel {
       };
 
       this.deleted = false;
+
+      /*
       if (args.args) {
         delete args.args["ctx"];
       }
-
+    */
       this[_database] = new Database(args.connection || "default", {
         collection: args.collection,
         scope: args.scope,
@@ -367,9 +375,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;
@@ -611,10 +619,19 @@ export default class SpiceModel {
 
   async run_hook(data, op, when, old_data) {
     try {
-      let resourceLifecycleTriggered = new ResourceLifecycleTriggered({
-        data: { data, operation: op, when, old_data, resource: this.type },
-      });
-      resourceLifecycleTriggered.dispatch();
+      if (this[_disable_lifecycle_events] == false) {
+        let resourceLifecycleTriggered = new ResourceLifecycleTriggered({
+          data: {
+            data,
+            operation: op,
+            when,
+            old_data,
+            resource: this.type,
+            ctx: this[_ctx],
+          },
+        });
+        resourceLifecycleTriggered.dispatch();
+      }
       if (this[_hooks] && this[_hooks][op] && this[_hooks][op][when]) {
         for (let i of this[_hooks][op][when]) {
           data = await i(data, old_data);
@@ -661,7 +678,7 @@ export default class SpiceModel {
 
     var returned_all = await Promise.allSettled(
       _.map(classes, (obj) => {
-        return new obj().getMulti({
+        return new obj(this[_args]).getMulti({
           ids: ids,
         });
       })
@@ -712,7 +729,7 @@ export default class SpiceModel {
     let classes = _.isArray(Class) ? Class : [Class];
     var returned_all = await Promise.allSettled(
       _.map(classes, (obj) => {
-        return new obj().getMulti({
+        return new obj(this[_args]).getMulti({
           ids: ids,
         });
       })