spice-js 2.6.21 → 2.6.23

package/build/bootstrap/schema_extenders.js

@@ -0,0 +1,20 @@
+"use strict";
+
+var _path = _interopRequireDefault(require("path"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+spice.routers = {};
+
+var paths = _path.default.join(spice.root_path, "schema_extenders");
+
+spice.schemaExtenders = {};
+
+require("fs").readdirSync(paths).forEach(function (file) {
+  if (file != "index.js") {
+    var extender = require(_path.default.join(paths, file));
+
+    spice.schemaExtenders[file.split(".")[0]] = extender;
+    spice.schema_extenders = spice.schemaExtenders;
+  }
+});

package/build/loaders/index.js

@@ -15,7 +15,7 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 
-var ordered_modules = ["database", "map", "logger", "error"];
+var ordered_modules = ["schema_extenders", "database", "map", "logger", "error"];
 var last_modules = ["views", "routes"];
 
 function load() {

package/build/models/SpiceModel.js

@@ -117,7 +117,55 @@ class SpiceModel {
         return returnVal;
       }
 
-      args.props = removeDynamicProps(args.props);
+      function applySchemaOverrides(props, resource) {
+        spice.schema_extenders = spice.schema_extenders || [];
+
+        function applyExtenderModifier(prop, resource, extender) {
+          if (extender.modifier) {
+            return extender.modifier(prop, resource);
+          }
+
+          return prop;
+        }
+
+        function hasExtender(resource, prop, extender) {
+          if (extender.selector(prop, resource)) {
+            return true;
+          }
+
+          return false;
+        }
+
+        function resourceHasExtender(resource, extender) {
+          return extender.resource.includes(resource) || extender.resource.includes("*");
+        }
+
+        for (var file_name in spice.schema_extenders) {
+          var extender = spice.schema_extenders[file_name];
+
+          if (resourceHasExtender(resource, extender)) {
+            console.log("Resource:", resource);
+
+            for (var j in props) {
+              if (hasExtender(resource, props[j], extender)) {
+                console.log("Modifying Prop:", props[j]);
+                props[j] = applyExtenderModifier(props[j], resource, extender);
+                console.log("Modified Prop", props[j]);
+              }
+            }
+
+            if (extender == null ? void 0 : extender.creator) {
+              console.log("Applying Creator:", resource);
+              props = _.merge(props, extender.creator(resource));
+            }
+          }
+
+          return props;
+        }
+      } //console.log("Applying Overrides to :", this.collection,'||', args.collection)
+
+
+      args.props = applySchemaOverrides(removeDynamicProps(args.props), args.collection);
       this[_props] = args.props;
 
       for (var i in args.props) {
@@ -526,14 +574,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 +649,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 +994,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 +1024,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 +1041,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 +1106,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 +1209,7 @@ class SpiceModel {
         return new obj(_extends({}, _this13[_args], {
           skip_cache: _this13[_skip_cache]
         })).getMulti({
+          skip_hooks: true,
           ids: ids
         });
       }));
@@ -1202,6 +1262,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.21",
+  "version": "2.6.23",
   "description": "spice",
   "main": "build/index.js",
   "repository": {

package/src/bootstrap/schema_extenders.js

@@ -0,0 +1,15 @@
+import path from "path";
+
+spice.routers = {};
+
+let paths = path.join(spice.root_path, "schema_extenders");
+spice.schemaExtenders = {};
+require("fs")
+  .readdirSync(paths)
+  .forEach(function (file) {
+    if (file != "index.js") {
+      let extender = require(path.join(paths, file));
+      spice.schemaExtenders[file.split(".")[0]] = extender;
+      spice.schema_extenders = spice.schemaExtenders;
+    }
+  });

package/src/loaders/index.js

@@ -2,7 +2,13 @@ import path from "path";
 import fs from "fs";
 import _ from "lodash";
 
-let ordered_modules = ["database", "map", "logger", "error"];
+let ordered_modules = [
+  "schema_extenders",
+  "database",
+  "map",
+  "logger",
+  "error",
+];
 let last_modules = ["views", "routes"];
 export async function load() {
   try {

package/src/models/SpiceModel.js

@@ -102,7 +102,55 @@ export default class SpiceModel {
         }
         return returnVal;
       }
-      args.props = removeDynamicProps(args.props);
+
+      function applySchemaOverrides(props, resource) {
+        spice.schema_extenders = spice.schema_extenders || [];
+
+        function applyExtenderModifier(prop, resource, extender) {
+          if (extender.modifier) {
+            return extender.modifier(prop, resource);
+          }
+          return prop;
+        }
+
+        function hasExtender(resource, prop, extender) {
+          if (extender.selector(prop, resource)) {
+            return true;
+          }
+          return false;
+        }
+
+        function resourceHasExtender(resource, extender) {
+          return (
+            extender.resource.includes(resource) ||
+            extender.resource.includes("*")
+          );
+        }
+
+        for (let file_name in spice.schema_extenders) {
+          let extender = spice.schema_extenders[file_name];
+          if (resourceHasExtender(resource, extender)) {
+            console.log("Resource:", resource);
+            for (let j in props) {
+              if (hasExtender(resource, props[j], extender)) {
+                console.log("Modifying Prop:", props[j]);
+                props[j] = applyExtenderModifier(props[j], resource, extender);
+                console.log("Modified Prop", props[j]);
+              }
+            }
+            if (extender?.creator) {
+              console.log("Applying Creator:", resource);
+              props = _.merge(props, extender.creator(resource));
+            }
+          }
+          return props;
+        }
+      }
+      //console.log("Applying Overrides to :", this.collection,'||', args.collection)
+      args.props = applySchemaOverrides(
+        removeDynamicProps(args.props),
+        args.collection
+      );
       this[_props] = args.props;
       for (let i in args.props) {
         if (args.args != undefined) {