spice-js 2.6.20 → 2.6.22

package/build/models/SpiceModel.js

@@ -526,14 +526,14 @@ class SpiceModel {
             yield _this4.run_hook(args, "get", "before");
           }
 
-          var key = _this4.type + "::" + args.id;
+          var key = "get::" + _this4.type + "::" + args.id;
           var results = {};
 
           if (_this4.shouldUseCache(_this4.type)) {
             var cached_results = yield _this4.getCacheProviderObject(_this4.type).get(key);
             results = cached_results == null ? void 0 : cached_results.value;
 
-            if ((cached_results == null ? void 0 : cached_results.value) == undefined || (yield _this4.shouldForceRefresh(cached_results))) {
+            if ((cached_results == null ? void 0 : cached_results.value) == undefined || (yield _this4.shouldForceRefresh(cached_results)) || _this4.type == "workflow") {
               results = yield _this4.database.get(args.id);
               yield _this4.getCacheProviderObject(_this4.type).set(key, {
                 value: results,
@@ -601,7 +601,7 @@ class SpiceModel {
 
         _.remove(args.ids, o => o == undefined);
 
-        var key = _this6.type + "::" + _.join(args.ids, "|");
+        var key = "multi-get::" + _this6.type + "::" + _.join(args.ids, "|");
 
         var results = [];
 
@@ -946,6 +946,15 @@ class SpiceModel {
           }
         }
 
+        function formatSortComponent(sortComponent) {
+          // Split the string by spaces to get individual parts
+          var parts = sortComponent.split(" "); // Assuming the first part is the column name, add backticks around it
+
+          parts[0] = "`" + parts[0] + "`"; // Rejoin the parts back into a string and return
+
+          return parts.join(" ");
+        }
+
         if ((0, _Security.hasSQLInjection)(query)) {
           return [];
         }
@@ -967,7 +976,7 @@ class SpiceModel {
 
           for (var i = 0; i < sort_array.length; i++) {
             if (!sort_array[i].includes(".")) {
-              new_sort_array.push("`" + _this11.type + "`.`" + sort_array[i] + "`");
+              new_sort_array.push("`" + _this11.type + "`." + formatSortComponent(sort_array[i]));
             } else {
               new_sort_array.push(sort_array[i]);
             }
@@ -984,7 +993,7 @@ class SpiceModel {
           return str.replace(/[^a-zA-Z0-9]/g, "");
         }
 
-        var key = removeSpaceAndSpecialCharacters(_this11.type + "::" + args._join + "::" + query + "::" + args.limit + "::" + args.offset + "::" + args.sort + "::" + args.do_count + "::" + args.statement_consistent + "::" + args.columns + "::" + args.is_full_text + "::" + args.is_custom_query);
+        var key = removeSpaceAndSpecialCharacters("list::" + _this11.type + "::" + args._join + "::" + query + "::" + args.limit + "::" + args.offset + "::" + args.sort + "::" + args.do_count + "::" + args.statement_consistent + "::" + args.columns + "::" + args.is_full_text + "::" + args.is_custom_query);
         var results;
 
         if (args.is_custom_query && args.is_custom_query === "true") {
@@ -1049,6 +1058,8 @@ class SpiceModel {
             results.data = yield _this11.do_serialize(results.data, "read", {}, args, (yield _this11.propsToBeRemoved(results.data)));
           }
 
+          if (_this11.type == "resourcedetail") ;
+
           if (args.skip_hooks != true) {
             yield _this11.run_hook(results.data, "list", "after");
           }
@@ -1150,6 +1161,7 @@ class SpiceModel {
         return new obj(_extends({}, _this13[_args], {
           skip_cache: _this13[_skip_cache]
         })).getMulti({
+          skip_hooks: true,
           ids: ids
         });
       }));
@@ -1202,6 +1214,7 @@ class SpiceModel {
         return new obj(_extends({}, _this14[_args], {
           skip_cache: _this14[_skip_cache]
         })).getMulti({
+          skip_hooks: true,
           ids: ids
         });
       }));

package/package.json

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

package/src/models/SpiceModel.js

@@ -436,17 +436,18 @@ export default class SpiceModel {
         if (args.skip_hooks != true) {
           await this.run_hook(args, "get", "before");
         }
-        let key = `${this.type}::${args.id}`;
+        let key = `get::${this.type}::${args.id}`;
         let results = {};
         if (this.shouldUseCache(this.type)) {
           let cached_results = await this.getCacheProviderObject(this.type).get(
             key
           );
-          results = cached_results?.value;
 
+          results = cached_results?.value;
           if (
             cached_results?.value == undefined ||
-            (await this.shouldForceRefresh(cached_results))
+            (await this.shouldForceRefresh(cached_results)) ||
+            this.type == "workflow"
           ) {
             results = await this.database.get(args.id);
             await this.getCacheProviderObject(this.type).set(
@@ -511,7 +512,7 @@ export default class SpiceModel {
         await this.run_hook(this, "list", "before");
       }
       _.remove(args.ids, (o) => o == undefined);
-      let key = `${this.type}::${_.join(args.ids, "|")}`;
+      let key = `multi-get::${this.type}::${_.join(args.ids, "|")}`;
       let results = [];
       if (args.ids.length > 0) {
         if (this.shouldUseCache(this.type)) {
@@ -890,7 +891,7 @@ export default class SpiceModel {
         return str.replace(/[^a-zA-Z0-9]/g, "");
       }
       let key = removeSpaceAndSpecialCharacters(
-        `${this.type}::${args._join}::${query}::${args.limit}::${args.offset}::${args.sort}::${args.do_count}::${args.statement_consistent}::${args.columns}::${args.is_full_text}::${args.is_custom_query}`
+        `list::${this.type}::${args._join}::${query}::${args.limit}::${args.offset}::${args.sort}::${args.do_count}::${args.statement_consistent}::${args.columns}::${args.is_full_text}::${args.is_custom_query}`
       );
 
       let results;