spice-js 2.7.23 → 2.7.24

package/build/models/SpiceModel.js

@@ -1036,65 +1036,33 @@ class SpiceModel {
   }
   filterResultsByColumns(data, columns) {
     if (columns && columns !== "") {
+      // Remove backticks and replace meta().id with id
       var cleanedColumns = columns.replace(/`/g, "").replace(/meta\(\)\.id/g, "id");
-      var columnPaths = cleanedColumns.split(",").map(col => col.trim()).map(col => {
+
+      // Process each column by splitting on comma and trimming
+      var columnList = cleanedColumns.split(",").map(col => col.trim()).map(col => {
+        // Check for alias with AS (case-insensitive)
         var aliasMatch = col.match(/\s+AS\s+([\w]+)/i);
         if (aliasMatch) {
-          return {
-            original: col,
-            path: col.replace(/\s+AS\s+[\w]+/i, "").trim(),
-            alias: aliasMatch[1].trim()
-          };
+          return aliasMatch[1].trim();
         }
-        return {
-          original: col,
-          path: col,
-          alias: null
-        };
+        // Otherwise, for dot-notation, keep the first segment after removing
+        // the base model prefix (e.g. user.group.name -> group).
+        if (col.includes(".")) {
+          var pathParts = col.split(".").map(part => part.trim()).filter(part => part !== "");
+          if (pathParts[0] === this.type && pathParts.length > 1) {
+            pathParts = pathParts.slice(1);
+          }
+          return pathParts[0];
+        }
+        return col;
       });
-      var requiredKeys = ["_permissions", "_permissions_", "id"];
-      return data.map(entry => {
-        var result = {};
-
-        // Add required keys
-        requiredKeys.forEach(key => {
-          if (entry.hasOwnProperty(key)) {
-            result[key] = entry[key];
-          }
-        });
 
-        // Process each column path
-        columnPaths.forEach(_ref10 => {
-          var {
-            path,
-            alias
-          } = _ref10;
-          var actualPath = path;
-
-          // Remove table prefix if it matches this.type
-          if (path.includes(".")) {
-            var parts = path.split(".");
-            if (parts[0] === this.type) {
-              actualPath = parts.slice(1).join(".");
-            }
-          }
-          var value = _.get(entry, actualPath);
-          if (value !== undefined) {
-            if (alias) {
-              result[alias] = value;
-            } else if (actualPath.includes(".")) {
-              // For nested paths, use the last part as the key
-              var key = actualPath.split(".").pop();
-              result[key] = value;
-            } else {
-              result[actualPath] = value;
-            }
-          }
-        });
-        return result;
-      });
+      // Ensure that essential keys are always picked
+      var requiredKeys = ["_permissions", "_permissions_", "id"];
+      var finalKeys = [...new Set([...columnList, ...requiredKeys])];
+      return data.map(entry => _.pick(entry, finalKeys));
     }
-    console.log("filterResultsByColumns", data);
     return data;
   }
   extractNestings(string, localType) {
@@ -1135,12 +1103,12 @@ class SpiceModel {
   }
   createJoinSection(mappedNestings) {
     if (!mappedNestings || mappedNestings.length === 0) return "";
-    return mappedNestings.map(_ref11 => {
+    return mappedNestings.map(_ref10 => {
       var {
         alias,
         reference,
         is_array
-      } = _ref11;
+      } = _ref10;
       var keyspace = (0, _fix.fixCollection)(reference);
       if (is_array === true) {
         return "LEFT NEST `" + keyspace + "` AS `" + alias + "` ON KEYS `" + this.type + "`.`" + alias + "`";
@@ -1285,8 +1253,8 @@ class SpiceModel {
       // Profiling: use track() for proper async context forking
       var p = (_this10$_ctx = _this10[_ctx]) == null ? void 0 : _this10$_ctx.profiler;
       var doList = /*#__PURE__*/function () {
-        var _ref12 = _asyncToGenerator(function* () {
-          var _args10, _args11, _args12;
+        var _ref11 = _asyncToGenerator(function* () {
+          var _args10, _args11;
           if (args.mapping_dept) _this10[_mapping_dept] = args.mapping_dept;
           if (args.mapping_dept_exempt) _this10[_mapping_dept_exempt] = args.mapping_dept_exempt;
 
@@ -1302,12 +1270,15 @@ class SpiceModel {
           var originalColumns = args.columns;
 
           // Find alias tokens from query/columns/sort
-          var nestings = [..._this10.extractNestings(((_args10 = args) == null ? void 0 : _args10.query) || "", _this10.type), ..._this10.extractNestings(((_args11 = args) == null ? void 0 : _args11.columns) || "", _this10.type), ..._this10.extractNestings(((_args12 = args) == null ? void 0 : _args12.sort) || "", _this10.type)];
+          var nestings = [..._this10.extractNestings(((_args10 = args) == null ? void 0 : _args10.query) || "", _this10.type),
+          //...this.extractNestings(args?.columns || "", this.type),
+          ..._this10.extractNestings(((_args11 = args) == null ? void 0 : _args11.sort) || "", _this10.type)];
 
           // Build join metadata and prepare columns
           var {
             mappedNestings
           } = _this10.buildJoinMetadata(nestings, args);
+
           // Build JOIN/NEST from the mapped keyspaces
           args._join = _this10.createJoinSection(mappedNestings);
 
@@ -1357,20 +1328,20 @@ class SpiceModel {
           if (args.skip_hooks !== true) {
             yield _this10.run_hook(results.data, "list", "after");
           }
-          results.data = _this10.filterResultsByColumns(results.data, originalColumns);
+          results.data = _this10.filterResultsByColumns(results.data, args.columns);
           //console.log("results.data", results.data);
           return results;
         });
         return function doList() {
-          return _ref12.apply(this, arguments);
+          return _ref11.apply(this, arguments);
         };
       }();
       try {
         if (p) {
-          var _args13, _args14;
+          var _args12, _args13;
           return yield p.track(_this10.type + ".list", doList, {
-            limit: (_args13 = args) == null ? void 0 : _args13.limit,
-            offset: (_args14 = args) == null ? void 0 : _args14.offset
+            limit: (_args12 = args) == null ? void 0 : _args12.limit,
+            offset: (_args13 = args) == null ? void 0 : _args13.offset
           });
         }
         return yield doList();
@@ -1416,7 +1387,7 @@ class SpiceModel {
       // Profiling: use track() for proper async context forking
       var p = (_this11$_ctx = _this11[_ctx]) == null ? void 0 : _this11$_ctx.profiler;
       var doFetch = /*#__PURE__*/function () {
-        var _ref13 = _asyncToGenerator(function* () {
+        var _ref12 = _asyncToGenerator(function* () {
           if (args.is_custom_query === "true" && args.ids.length > 0) {
             return yield _this11.database.query(query);
           } else if (args.is_full_text === "true") {
@@ -1428,7 +1399,7 @@ class SpiceModel {
           }
         });
         return function doFetch() {
-          return _ref13.apply(this, arguments);
+          return _ref12.apply(this, arguments);
         };
       }();
       if (p) {
@@ -1437,12 +1408,12 @@ class SpiceModel {
       return yield doFetch();
     })();
   }
-  addHook(_ref14) {
+  addHook(_ref13) {
     var {
       operation,
       when,
       execute
-    } = _ref14;
+    } = _ref13;
     this[_hooks][operation][when].push(execute);
   }
   run_hook(data, op, when, old_data) {
@@ -1564,7 +1535,7 @@ class SpiceModel {
 
         // ⚡ Wrap in profiler track() to ensure proper async context for child operations
         var fetchRelated = /*#__PURE__*/function () {
-          var _ref15 = _asyncToGenerator(function* () {
+          var _ref14 = _asyncToGenerator(function* () {
             return yield Promise.allSettled(_.map(classes, obj => {
               var objInstance = new obj(_extends({}, _this13[_args], {
                 skip_cache: _this13[_skip_cache],
@@ -1582,7 +1553,7 @@ class SpiceModel {
             }));
           });
           return function fetchRelated() {
-            return _ref15.apply(this, arguments);
+            return _ref14.apply(this, arguments);
           };
         }();
         var returned_all;
@@ -1682,7 +1653,7 @@ class SpiceModel {
 
         // ⚡ Wrap in profiler track() to ensure proper async context for child operations
         var fetchRelated = /*#__PURE__*/function () {
-          var _ref16 = _asyncToGenerator(function* () {
+          var _ref15 = _asyncToGenerator(function* () {
             return yield Promise.allSettled(_.map(classes, obj => {
               return new obj(_extends({}, _this14[_args], {
                 skip_cache: _this14[_skip_cache],
@@ -1699,7 +1670,7 @@ class SpiceModel {
             }));
           });
           return function fetchRelated() {
-            return _ref16.apply(this, arguments);
+            return _ref15.apply(this, arguments);
           };
         }();
         var returned_all;
@@ -1747,11 +1718,11 @@ class SpiceModel {
       return original_is_array ? data : data[0];
     })();
   }
-  addModifier(_ref17) {
+  addModifier(_ref16) {
     var {
       when,
       execute
-    } = _ref17;
+    } = _ref16;
     if (this[_serializers][when]) {
       this[_serializers][when]["modifiers"].push(execute);
     }
@@ -1881,7 +1852,7 @@ class SpiceModel {
       // Profiling: use track() for proper async context forking
       var p = (_this16$_ctx = _this16[_ctx]) == null ? void 0 : _this16$_ctx.profiler;
       var doSerialize = /*#__PURE__*/function () {
-        var _ref18 = _asyncToGenerator(function* () {
+        var _ref17 = _asyncToGenerator(function* () {
           var _this16$_serializers, _this16$_serializers$;
           // Early exit if serialization should not run.
           if (!_this16.shouldSerializerRun(args, type)) {
@@ -1949,7 +1920,7 @@ class SpiceModel {
           return originalIsArray ? data : data[0];
         });
         return function doSerialize() {
-          return _ref18.apply(this, arguments);
+          return _ref17.apply(this, arguments);
         };
       }();
       try {

package/package.json

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