spice-js 2.5.25 → 2.5.28

package/build/models/SpiceModel.js

@@ -23,6 +23,7 @@ var SDate = require("sonover-date"),
     UUID = require("uuid"),
     _ = require("lodash"),
     _database = Symbol(),
+    _ctx = Symbol(),
     _props = Symbol(),
     _args = Symbol(),
     _hooks = Symbol(),
@@ -48,7 +49,7 @@ class SpiceModel {
     }
 
     try {
-      var _args$args;
+      var _args$args, _args2, _args2$args;
 
       var dbtype = spice.config.database.connections[args.connection].type || "couchbase";
 
@@ -57,6 +58,7 @@ class SpiceModel {
       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: [],
@@ -90,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,
@@ -445,12 +448,12 @@ class SpiceModel {
     })();
   }
 
-  query(query) {
+  query(query, scope) {
     var _this2 = this;
 
     return _asyncToGenerator(function* () {
       try {
-        var results = yield _this2.database.query(query);
+        var results = yield _this2.database.query(query, scope);
         return results;
       } catch (error) {
         throw error;
@@ -732,7 +735,8 @@ class SpiceModel {
               operation: op,
               when,
               old_data,
-              resource: _this9.type
+              resource: _this9.type,
+              ctx: _this9[_ctx]
             }
           });
           resourceLifecycleTriggered.dispatch();

package/package.json

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

package/src/models/SpiceModel.js

@@ -9,6 +9,7 @@ var SDate = require("sonover-date"),
   UUID = require("uuid"),
   _ = require("lodash"),
   _database = Symbol(),
+  _ctx = Symbol(),
   _props = Symbol(),
   _args = Symbol(),
   _hooks = Symbol(),
@@ -41,6 +42,7 @@ export default class SpiceModel {
       this[_args] = args.args;
       this[_disable_lifecycle_events] =
         args.args?.disable_lifecycle_events || false;
+      this[_ctx] = args?.args?.ctx;
       this[_hooks] = {
         create: {
           before: [],
@@ -75,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,
@@ -371,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;
@@ -617,7 +621,14 @@ export default class SpiceModel {
     try {
       if (this[_disable_lifecycle_events] == false) {
         let resourceLifecycleTriggered = new ResourceLifecycleTriggered({
-          data: { data, operation: op, when, old_data, resource: this.type },
+          data: {
+            data,
+            operation: op,
+            when,
+            old_data,
+            resource: this.type,
+            ctx: this[_ctx],
+          },
         });
         resourceLifecycleTriggered.dispatch();
       }