spice-js 2.6.6 → 2.6.7

package/build/models/SpiceModel.js

@@ -29,6 +29,7 @@ var SDate = require("sonover-date"),
     _hooks = Symbol(),
     _disable_lifecycle_events = Symbol(),
     _external_modifier_loaded = Symbol(),
+    _skip_cache = Symbol(),
     _serializers = Symbol(); //const _type = Symbol("type");
 
 
@@ -51,7 +52,7 @@ class SpiceModel {
     }
 
     try {
-      var _args$args, _args2, _args2$args;
+      var _args$args, _args2, _args2$args, _args3, _args3$args;
 
       var dbtype = spice.config.database.connections[args.connection].type || "couchbase";
 
@@ -63,6 +64,7 @@ class SpiceModel {
       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[_skip_cache] = ((_args3 = args) == null ? void 0 : (_args3$args = _args3.args) == null ? void 0 : _args3$args.skip_cache) || false;
       this[_hooks] = {
         create: {
           before: [],
@@ -432,10 +434,23 @@ class SpiceModel {
     return return_string;
   }
 
-  shouldCache(resource_type) {
-    var _spice$systemconfig, _spice$systemconfig$c;
+  shouldUseCache(resource_type) {
+    var _spice$config$cache;
 
-    return spice.cache[resource_type] != undefined || ((_spice$systemconfig = spice.systemconfig) == null ? void 0 : (_spice$systemconfig$c = _spice$systemconfig.cache) == null ? void 0 : _spice$systemconfig$c.status) == "disable";
+    // If '_skip_cache' property of this object is true, then we shouldn't cache.
+    if (this[_skip_cache] == true) {
+      return false;
+    } // If the system configuration for spice has a cache status set to "disable",
+    // then we shouldn't cache, so return false.
+
+
+    if (((_spice$config$cache = spice.config.cache) == null ? void 0 : _spice$config$cache.status) == "disabled") {
+      return false;
+    } // If 'spice.cache[resource_type]' is not undefined,
+    // it implies that this resource type is already in the cache or is cacheable.
+
+
+    return spice.cache[resource_type] != undefined;
   }
 
   getCacheConfig(resource_type) {
@@ -501,7 +516,7 @@ class SpiceModel {
           var key = _this4.type + "::" + args.id;
           var results = {};
 
-          if (_this4.shouldCache(_this4.type)) {
+          if (_this4.shouldUseCache(_this4.type)) {
             var cached_results = yield _this4.getCacheProviderObject(_this4.type).get(key);
             results = cached_results == null ? void 0 : cached_results.value;
 
@@ -569,7 +584,7 @@ class SpiceModel {
         var results = [];
 
         if (args.ids.length > 0) {
-          if (_this6.shouldCache(_this6.type)) {
+          if (_this6.shouldUseCache(_this6.type)) {
             var cached_results = yield _this6.getCacheProviderObject(_this6.type).get(key);
             results = cached_results == null ? void 0 : cached_results.value;
 
@@ -830,7 +845,7 @@ class SpiceModel {
 
         if (args.is_custom_query && args.is_custom_query === "true") {
           if (args.ids.length > 0) {
-            if (_this11.shouldCache(_this11.type)) {
+            if (_this11.shouldUseCache(_this11.type)) {
               var cached_results = yield _this11.getCacheProviderObject(_this11.type).get(key);
               results = cached_results == null ? void 0 : cached_results.value;
 
@@ -848,7 +863,7 @@ class SpiceModel {
           }
         } else {
           if (args.is_full_text && args.is_full_text === "true") {
-            if (_this11.shouldCache(_this11.type)) {
+            if (_this11.shouldUseCache(_this11.type)) {
               var _cached_results = yield _this11.getCacheProviderObject(_this11.type).get(key);
 
               results = _cached_results == null ? void 0 : _cached_results.value;
@@ -865,7 +880,7 @@ class SpiceModel {
               results = yield _this11.database.full_text_search(_this11.type, query || "", args.limit, args.offset);
             }
           } else {
-            if (_this11.shouldCache(_this11.type)) {
+            if (_this11.shouldUseCache(_this11.type)) {
               var _cached_results2 = yield _this11.getCacheProviderObject(_this11.type).get(key);
 
               results = _cached_results2 == null ? void 0 : _cached_results2.value;
@@ -997,7 +1012,9 @@ class SpiceModel {
       });
 
       var returned_all = yield Promise.allSettled(_.map(classes, obj => {
-        return new obj(_this13[_args]).getMulti({
+        return new obj(_extends({}, _this13[_args], {
+          skip_cache: _this13[_skip_cache]
+        })).getMulti({
           ids: ids
         });
       }));
@@ -1048,7 +1065,9 @@ class SpiceModel {
 
       var classes = _.isArray(Class) ? Class : [Class];
       var returned_all = yield Promise.allSettled(_.map(classes, obj => {
-        return new obj(_this14[_args]).getMulti({
+        return new obj(_extends({}, _this14[_args], {
+          skip_cache: _this14[_skip_cache]
+        })).getMulti({
           ids: ids
         });
       }));

package/package.json

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

package/src/models/SpiceModel.js

@@ -15,6 +15,7 @@ var SDate = require("sonover-date"),
   _hooks = Symbol(),
   _disable_lifecycle_events = Symbol(),
   _external_modifier_loaded = Symbol(),
+  _skip_cache = Symbol(),
   _serializers = Symbol();
 
 //const _type = Symbol("type");
@@ -48,6 +49,7 @@ export default class SpiceModel {
       this[_disable_lifecycle_events] =
         args.args?.disable_lifecycle_events || false;
       this[_ctx] = args?.args?.ctx;
+      this[_skip_cache] = args?.args?.skip_cache || false;
       this[_hooks] = {
         create: {
           before: [],
@@ -365,11 +367,21 @@ export default class SpiceModel {
     return return_string;
   }
 
-  shouldCache(resource_type) {
-    return (
-      spice.cache[resource_type] != undefined ||
-      spice.systemconfig?.cache?.status == "disable"
-    );
+  shouldUseCache(resource_type) {
+    // If '_skip_cache' property of this object is true, then we shouldn't cache.
+    if (this[_skip_cache] == true) {
+      return false;
+    }
+
+    // If the system configuration for spice has a cache status set to "disable",
+    // then we shouldn't cache, so return false.
+    if (spice.config.cache?.status == "disabled") {
+      return false;
+    }
+
+    // If 'spice.cache[resource_type]' is not undefined,
+    // it implies that this resource type is already in the cache or is cacheable.
+    return spice.cache[resource_type] != undefined;
   }
 
   getCacheConfig(resource_type) {
@@ -418,7 +430,7 @@ export default class SpiceModel {
         await this.run_hook(args, "get", "before");
         let key = `${this.type}::${args.id}`;
         let results = {};
-        if (this.shouldCache(this.type)) {
+        if (this.shouldUseCache(this.type)) {
           let cached_results = await this.getCacheProviderObject(this.type).get(
             key
           );
@@ -487,7 +499,7 @@ export default class SpiceModel {
       let key = `${this.type}::${_.join(args.ids, "|")}`;
       let results = [];
       if (args.ids.length > 0) {
-        if (this.shouldCache(this.type)) {
+        if (this.shouldUseCache(this.type)) {
           let cached_results = await this.getCacheProviderObject(this.type).get(
             key
           );
@@ -742,7 +754,7 @@ export default class SpiceModel {
       let results;
       if (args.is_custom_query && args.is_custom_query === "true") {
         if (args.ids.length > 0) {
-          if (this.shouldCache(this.type)) {
+          if (this.shouldUseCache(this.type)) {
             let cached_results = await this.getCacheProviderObject(
               this.type
             ).get(key);
@@ -764,7 +776,7 @@ export default class SpiceModel {
         }
       } else {
         if (args.is_full_text && args.is_full_text === "true") {
-          if (this.shouldCache(this.type)) {
+          if (this.shouldUseCache(this.type)) {
             let cached_results = await this.getCacheProviderObject(
               this.type
             ).get(key);
@@ -794,7 +806,7 @@ export default class SpiceModel {
             );
           }
         } else {
-          if (this.shouldCache(this.type)) {
+          if (this.shouldUseCache(this.type)) {
             let cached_results = await this.getCacheProviderObject(
               this.type
             ).get(key);
@@ -931,7 +943,10 @@ export default class SpiceModel {
 
     var returned_all = await Promise.allSettled(
       _.map(classes, (obj) => {
-        return new obj(this[_args]).getMulti({
+        return new obj({
+          ...this[_args],
+          skip_cache: this[_skip_cache],
+        }).getMulti({
           ids: ids,
         });
       })
@@ -986,7 +1001,10 @@ export default class SpiceModel {
     let classes = _.isArray(Class) ? Class : [Class];
     var returned_all = await Promise.allSettled(
       _.map(classes, (obj) => {
-        return new obj(this[_args]).getMulti({
+        return new obj({
+          ...this[_args],
+          skip_cache: this[_skip_cache],
+        }).getMulti({
           ids: ids,
         });
       })