spice-js 2.6.15 → 2.6.16

package/package.json

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

package/src/models/SpiceModel.js

@@ -752,10 +752,12 @@ export default class SpiceModel {
                 if (column == "meta().id") {
                   column = undefined;
                 } else if (!column.startsWith("`") && !column.endsWith("`")) {
+                  `\`${column}\``;
+                }
+                if (column) {
                   if (!column.includes(".") && !column.startsWith(that.type)) {
-                    column = `\`${that.type}\`.\`${column}\``;
+                    column = `\`${that.type}\`.${column}`;
                   }
-                  return column;
                 }
                 return column;
               })
@@ -772,7 +774,10 @@ export default class SpiceModel {
         if (columns && columns != "") {
           columns = columns.replace(/`/g, "");
           columns = columns.replace(/meta\(\)\.id/g, "id");
-          let columnList = columns.split(","); // Convert comma-separated string to array
+          let columnList = columns.split(",").map((column) => {
+            //if colums has a . then remove the first part of the string
+            return column.includes(".") ? _.last(column.split(".")) : column;
+          }); // Convert comma-separated string to array
           columnList.push("_permissions"); // Always include _permissions
           columnList.push("id"); // Always include _permissions
           return _.map(data, (entry) => _.pick(entry, columnList));
@@ -795,7 +800,7 @@ export default class SpiceModel {
         ...extractNestings(args?.sort, this.type),
       ];
       let mappedNestings = _.compact(
-        _.map(nestings, (nesting) => {
+        _.map(_.uniq(nestings), (nesting) => {
           let prop = this.props[nesting];
           if (prop) {
             if (prop.map) {
@@ -853,6 +858,18 @@ export default class SpiceModel {
 
       if (!args.sort) {
         args.sort = `\`${this.type}\`.created_at DESC`;
+      } else {
+        let sort_array = args.sort.split(",");
+        // check the first string in each item in the array to see if it contains a . if not then add the type
+        let new_sort_array = [];
+        for (let i = 0; i < sort_array.length; i++) {
+          if (!sort_array[i].includes(".")) {
+            new_sort_array.push(`\`${this.type}\`.\`${sort_array[i]}\``);
+          } else {
+            new_sort_array.push(sort_array[i]);
+          }
+        }
+        args.sort = _.join(new_sort_array, ",");
       }
       if (args.skip_hooks != true) {
         await this.run_hook(this, "list", "before");
@@ -959,9 +976,6 @@ export default class SpiceModel {
               args.statement_consistent,
               args._join
             );
-            if (this.type == "user") {
-              console.log("results from DB No Chache available", results);
-            }
           }
         }
       }