spice-js 2.6.13 → 2.6.15

package/build/models/SpiceModel.js

@@ -832,47 +832,98 @@ class SpiceModel {
     var _this11 = this;
 
     return _asyncToGenerator(function* () {
-      function filterResultsByColumns(data, columns) {
-        if (columns && columns != "") {
-          columns = columns.replace(/`/g, "");
-          columns = columns.replace(/meta\(\)\.id/g, "id");
-          var columnList = columns.split(","); // Convert comma-separated string to array
+      try {
+        var _args4, _args5, _args6;
+
+        if (!args) {
+          args = {};
+        }
 
-          columnList.push("_permissions"); // Always include _permissions
+        function prepColumns(columns) {
+          if (columns && columns != "") {
+            var columnList = columns.split(","); // Convert comma-separated string to array
 
-          columnList.push("id"); // Always include _permissions
+            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 _.map(data, entry => _.pick(entry, columnList));
+          return columns;
         }
 
-        return data;
-      }
+        var query = "";
+        args.columns = prepColumns(args.columns);
 
-      function prepColumns(columns) {
-        if (columns && columns != "") {
-          var columnList = columns.split(","); // Convert comma-separated string to array
+        function filterResultsByColumns(data, columns) {
+          if (columns && columns != "") {
+            columns = columns.replace(/`/g, "");
+            columns = columns.replace(/meta\(\)\.id/g, "id");
+            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 + "`";
-            }
+            columnList.push("_permissions"); // Always include _permissions
 
-            return column;
-          })), ",");
+            columnList.push("id"); // Always include _permissions
+
+            return _.map(data, entry => _.pick(entry, columnList));
+          }
+
+          return data;
         }
 
-        return columns;
-      }
+        function extractNestings(string, localType) {
+          var returnVal = [];
+          var regex = /(\w+)\./g;
+          var match;
 
-      try {
-        if (!args) {
-          args = {};
+          while (match = regex.exec(string)) {
+            if (match[1] != localType) returnVal.push(match[1]);
+          }
+
+          return returnVal;
         }
 
-        var query = "";
-        args.columns = prepColumns(args.columns);
+        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];
+
+          if (prop) {
+            if (prop.map) {
+              if (prop.map.type == _2.MapType.MODEL) {
+                return {
+                  alias: nesting,
+                  reference: prop.map.reference.toLowerCase(),
+                  value_field: prop.map.value_field
+                };
+              }
+            }
+          }
+        }));
+
+        function createJoinSection(nestings) {
+          //create join section with nestings
+          var joinSection = "";
+
+          _.each(nestings, nesting => {
+            joinSection += "LEFT JOIN `" + nesting.reference + "` AS `" + nesting.alias + "` ON KEYS `" + that.type + "`.`" + nesting.alias + "` ";
+          });
+
+          return joinSection;
+        }
+
+        var _join = createJoinSection(mappedNestings);
+
+        args._join = _join;
 
         if (args.is_full_text && args.is_full_text === "true" || args.is_custom_query && args.is_custom_query === "true") {
           query = args.query;
@@ -881,9 +932,9 @@ class SpiceModel {
             query = _this11.makeQueryFromFilter(args.filters);
           } else {
             if (args.query) {
-              query = args.query + " AND (deleted = false OR deleted IS MISSING) ";
+              query = args.query + (" AND (`" + _this11.type + "`.deleted = false OR `" + _this11.type + "`.deleted IS MISSING) ");
             } else {
-              query = "(deleted = false OR deleted IS MISSING) ";
+              query = "(`" + _this11.type + "`.deleted = false OR `" + _this11.type + "`.deleted IS MISSING) ";
             }
           }
         }
@@ -901,7 +952,7 @@ class SpiceModel {
         }
 
         if (!args.sort) {
-          args.sort = "created_at DESC";
+          args.sort = "`" + _this11.type + "`.created_at DESC";
         }
 
         if (args.skip_hooks != true) {
@@ -912,7 +963,7 @@ class SpiceModel {
           return str.replace(/[^a-zA-Z0-9]/g, "");
         }
 
-        var key = removeSpaceAndSpecialCharacters(_this11.type + "::" + 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(_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") {
@@ -941,7 +992,7 @@ class SpiceModel {
               results = _cached_results == null ? void 0 : _cached_results.value;
 
               if ((_cached_results == null ? void 0 : _cached_results.value) == undefined || (yield _this11.shouldForceRefresh(_cached_results))) {
-                results = yield _this11.database.full_text_search(_this11.type, query || "", args.limit, args.offset);
+                results = yield _this11.database.full_text_search(_this11.type, query || "", args.limit, args.offset, args._join);
 
                 _this11.getCacheProviderObject(_this11.type).set(key, {
                   value: results,
@@ -949,7 +1000,7 @@ class SpiceModel {
                 }, _this11.getCacheConfig(_this11.type));
               }
             } else {
-              results = yield _this11.database.full_text_search(_this11.type, query || "", args.limit, args.offset);
+              results = yield _this11.database.full_text_search(_this11.type, query || "", args.limit, args.offset, args._join);
             }
           } else {
             if (_this11.shouldUseCache(_this11.type)) {
@@ -959,7 +1010,7 @@ class SpiceModel {
               var shouleForceRefresh = yield _this11.shouldForceRefresh(_cached_results2);
 
               if ((_cached_results2 == null ? void 0 : _cached_results2.value) == undefined || shouleForceRefresh) {
-                results = yield _this11.database.search(_this11.type, args.columns || "", query || "", args.limit, args.offset, args.sort, args.do_count, args.statement_consistent);
+                results = yield _this11.database.search(_this11.type, args.columns || "", query || "", args.limit, args.offset, args.sort, args.do_count, args.statement_consistent, args._join);
 
                 _this11.getCacheProviderObject(_this11.type).set(key, {
                   value: results,
@@ -967,7 +1018,7 @@ class SpiceModel {
                 }, _this11.getCacheConfig(_this11.type));
               }
             } else {
-              results = yield _this11.database.search(_this11.type, args.columns || "", query || "", args.limit, args.offset, args.sort, args.do_count, args.statement_consistent);
+              results = yield _this11.database.search(_this11.type, args.columns || "", query || "", args.limit, args.offset, args.sort, args.do_count, args.statement_consistent, args._join);
 
               if (_this11.type == "user") {
                 console.log("results from DB No Chache available", results);

package/package.json

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

package/src/models/SpiceModel.js

@@ -738,44 +738,90 @@ export default class SpiceModel {
   }
 
   async list(args) {
-    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
-        columnList.push("_permissions"); // Always include _permissions
-        columnList.push("id"); // Always include _permissions
-        return _.map(data, (entry) => _.pick(entry, columnList));
-      }
-      return data;
-    }
-
-    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;
-    }
     try {
       if (!args) {
         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("`")) {
+                  if (!column.includes(".") && !column.startsWith(that.type)) {
+                    column = `\`${that.type}\`.\`${column}\``;
+                  }
+                  return 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
+          columnList.push("_permissions"); // Always include _permissions
+          columnList.push("id"); // Always include _permissions
+          return _.map(data, (entry) => _.pick(entry, columnList));
+        }
+        return data;
+      }
+      function extractNestings(string, localType) {
+        let returnVal = [];
+        let regex = /(\w+)\./g;
+        let match;
+        while ((match = regex.exec(string))) {
+          if (match[1] != localType) returnVal.push(match[1]);
+        }
+        return returnVal;
+      }
+
+      let nestings = [
+        ...extractNestings(args?.query, this.type),
+        ...extractNestings(args?.columns, this.type),
+        ...extractNestings(args?.sort, this.type),
+      ];
+      let mappedNestings = _.compact(
+        _.map(nestings, (nesting) => {
+          let prop = this.props[nesting];
+          if (prop) {
+            if (prop.map) {
+              if (prop.map.type == MapType.MODEL) {
+                return {
+                  alias: nesting,
+                  reference: prop.map.reference.toLowerCase(),
+                  value_field: prop.map.value_field,
+                };
+              }
+            }
+          }
+        })
+      );
+
+      function createJoinSection(nestings) {
+        //create join section with nestings
+        let joinSection = "";
+        _.each(nestings, (nesting) => {
+          joinSection += `LEFT JOIN \`${nesting.reference}\` AS \`${nesting.alias}\` ON KEYS \`${that.type}\`.\`${nesting.alias}\` `;
+        });
+        return joinSection;
+      }
+      let _join = createJoinSection(mappedNestings);
+      args._join = _join;
+
       if (
         (args.is_full_text && args.is_full_text === "true") ||
         (args.is_custom_query && args.is_custom_query === "true")
@@ -787,9 +833,10 @@ export default class SpiceModel {
         } else {
           if (args.query) {
             query =
-              args.query + " AND (deleted = false OR deleted IS MISSING) ";
+              args.query +
+              ` AND (\`${this.type}\`.deleted = false OR \`${this.type}\`.deleted IS MISSING) `;
           } else {
-            query = "(deleted = false OR deleted IS MISSING) ";
+            query = `(\`${this.type}\`.deleted = false OR \`${this.type}\`.deleted IS MISSING) `;
           }
         }
       }
@@ -805,7 +852,7 @@ export default class SpiceModel {
       }
 
       if (!args.sort) {
-        args.sort = "created_at DESC";
+        args.sort = `\`${this.type}\`.created_at DESC`;
       }
       if (args.skip_hooks != true) {
         await this.run_hook(this, "list", "before");
@@ -814,7 +861,7 @@ export default class SpiceModel {
         return str.replace(/[^a-zA-Z0-9]/g, "");
       }
       let key = removeSpaceAndSpecialCharacters(
-        `${this.type}::${query}::${args.limit}::${args.offset}::${args.sort}::${args.do_count}::${args.statement_consistent}::${args.columns}::${args.is_full_text}::${args.is_custom_query}`
+        `${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;
@@ -855,7 +902,8 @@ export default class SpiceModel {
                 this.type,
                 query || "",
                 args.limit,
-                args.offset
+                args.offset,
+                args._join
               );
               this.getCacheProviderObject(this.type).set(
                 key,
@@ -868,7 +916,8 @@ export default class SpiceModel {
               this.type,
               query || "",
               args.limit,
-              args.offset
+              args.offset,
+              args._join
             );
           }
         } else {
@@ -889,7 +938,8 @@ export default class SpiceModel {
                 args.offset,
                 args.sort,
                 args.do_count,
-                args.statement_consistent
+                args.statement_consistent,
+                args._join
               );
               this.getCacheProviderObject(this.type).set(
                 key,
@@ -906,7 +956,8 @@ export default class SpiceModel {
               args.offset,
               args.sort,
               args.do_count,
-              args.statement_consistent
+              args.statement_consistent,
+              args._join
             );
             if (this.type == "user") {
               console.log("results from DB No Chache available", results);