spice-js 2.6.14 → 2.6.16

package/build/models/SpiceModel.js

@@ -833,12 +833,37 @@ class SpiceModel {
 
     return _asyncToGenerator(function* () {
       try {
-        var _args4;
+        var _args4, _args5, _args6;
 
         if (!args) {
           args = {};
         }
 
+        function prepColumns(columns) {
+          if (columns && columns != "") {
+            var columnList = columns.split(","); // Convert comma-separated string to array
+
+            return _.join(_.compact(_.map(columnList, column => {
+              if (column == "meta().id") {
+                column = undefined;
+              } else if (!column.startsWith("`") && !column.endsWith("`")) {
+                if (!column.includes(".") && !column.startsWith(that.type)) {
+                  column = "`" + that.type + "`.`" + column + "`";
+                }
+
+                return column;
+              }
+
+              return column;
+            })), ",");
+          }
+
+          return columns;
+        }
+
+        var query = "";
+        args.columns = prepColumns(args.columns);
+
         function filterResultsByColumns(data, columns) {
           if (columns && columns != "") {
             columns = columns.replace(/`/g, "");
@@ -867,7 +892,7 @@ class SpiceModel {
           return returnVal;
         }
 
-        var nestings = extractNestings((_args4 = args) == null ? void 0 : _args4.query, _this11.type);
+        var nestings = [...extractNestings((_args4 = args) == null ? void 0 : _args4.query, _this11.type), ...extractNestings((_args5 = args) == null ? void 0 : _args5.columns, _this11.type), ...extractNestings((_args6 = args) == null ? void 0 : _args6.sort, _this11.type)];
 
         var mappedNestings = _.compact(_.map(nestings, nesting => {
           var prop = _this11.props[nesting];
@@ -900,27 +925,6 @@ class SpiceModel {
 
         args._join = _join;
 
-        function prepColumns(columns) {
-          if (columns && columns != "") {
-            var columnList = columns.split(","); // Convert comma-separated string to array
-
-            return _.join(_.compact(_.map(columnList, column => {
-              if (column == "meta().id") {
-                column = undefined;
-              } else if (!column.startsWith("`") && !column.endsWith("`")) {
-                return "`" + column + "`";
-              }
-
-              return column;
-            })), ",");
-          }
-
-          return columns;
-        }
-
-        var query = "";
-        args.columns = prepColumns(args.columns);
-
         if (args.is_full_text && args.is_full_text === "true" || args.is_custom_query && args.is_custom_query === "true") {
           query = args.query;
         } else {

package/package.json

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

package/src/models/SpiceModel.js

@@ -743,11 +743,41 @@ export default class SpiceModel {
         args = {};
       }
 
+      function prepColumns(columns) {
+        if (columns && columns != "") {
+          let columnList = columns.split(","); // Convert comma-separated string to array
+          return _.join(
+            _.compact(
+              _.map(columnList, (column) => {
+                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}`;
+                  }
+                }
+                return column;
+              })
+            ),
+            ","
+          );
+        }
+        return columns;
+      }
+
+      let query = "";
+      args.columns = prepColumns(args.columns);
       function filterResultsByColumns(data, columns) {
         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));
@@ -764,9 +794,13 @@ export default class SpiceModel {
         return returnVal;
       }
 
-      let nestings = extractNestings(args?.query, this.type);
+      let nestings = [
+        ...extractNestings(args?.query, this.type),
+        ...extractNestings(args?.columns, this.type),
+        ...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) {
@@ -793,28 +827,6 @@ export default class SpiceModel {
       let _join = createJoinSection(mappedNestings);
       args._join = _join;
 
-      function prepColumns(columns) {
-        if (columns && columns != "") {
-          let columnList = columns.split(","); // Convert comma-separated string to array
-          return _.join(
-            _.compact(
-              _.map(columnList, (column) => {
-                if (column == "meta().id") {
-                  column = undefined;
-                } else if (!column.startsWith("`") && !column.endsWith("`")) {
-                  return `\`${column}\``;
-                }
-                return column;
-              })
-            ),
-            ","
-          );
-        }
-        return columns;
-      }
-
-      let query = "";
-      args.columns = prepColumns(args.columns);
       if (
         (args.is_full_text && args.is_full_text === "true") ||
         (args.is_custom_query && args.is_custom_query === "true")
@@ -846,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");
@@ -952,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);
-            }
           }
         }
       }