spice-js 2.7.22 → 2.7.23

package/package.json

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

package/src/models/SpiceModel.js

@@ -1128,68 +1128,42 @@ export default class SpiceModel {
 
   filterResultsByColumns(data, columns) {
     if (columns && columns !== "") {
+      // Remove backticks and replace meta().id with id
       const cleanedColumns = columns
         .replace(/`/g, "")
         .replace(/meta\(\)\.id/g, "id");
 
-      const columnPaths = cleanedColumns
+      // Process each column by splitting on comma and trimming
+      const columnList = cleanedColumns
         .split(",")
         .map((col) => col.trim())
         .map((col) => {
+          // Check for alias with AS (case-insensitive)
           const 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 };
-        });
-
-      const requiredKeys = ["_permissions", "_permissions_", "id"];
-
-      return data.map((entry) => {
-        const result = {};
-
-        // Add required keys
-        requiredKeys.forEach((key) => {
-          if (entry.hasOwnProperty(key)) {
-            result[key] = entry[key];
-          }
-        });
-
-        // Process each column path
-        columnPaths.forEach(({ path, alias }) => {
-          let actualPath = path;
-
-          // Remove table prefix if it matches this.type
-          if (path.includes(".")) {
-            const parts = path.split(".");
-            if (parts[0] === this.type) {
-              actualPath = parts.slice(1).join(".");
-            }
-          }
-
-          const 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
-              const key = actualPath.split(".").pop();
-              result[key] = value;
-            } else {
-              result[actualPath] = value;
+          // Otherwise, for dot-notation, keep the first segment after removing
+          // the base model prefix (e.g. user.group.name -> group).
+          if (col.includes(".")) {
+            let 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;
         });
 
-        return result;
-      });
+      // Ensure that essential keys are always picked
+      const requiredKeys = ["_permissions", "_permissions_", "id"];
+      const finalKeys = [...new Set([...columnList, ...requiredKeys])];
+
+      return data.map((entry) => _.pick(entry, finalKeys));
     }
-    console.log("filterResultsByColumns", data);
     return data;
   }
 
@@ -1426,12 +1400,13 @@ export default class SpiceModel {
       // Find alias tokens from query/columns/sort
       const nestings = [
         ...this.extractNestings(args?.query || "", this.type),
-        ...this.extractNestings(args?.columns || "", this.type),
+        //...this.extractNestings(args?.columns || "", this.type),
         ...this.extractNestings(args?.sort || "", this.type),
       ];
 
       // Build join metadata and prepare columns
       const { mappedNestings } = this.buildJoinMetadata(nestings, args);
+
       // Build JOIN/NEST from the mapped keyspaces
       args._join = this.createJoinSection(mappedNestings);
 
@@ -1506,7 +1481,7 @@ export default class SpiceModel {
         await this.run_hook(results.data, "list", "after");
       }
 
-      results.data = this.filterResultsByColumns(results.data, originalColumns);
+      results.data = this.filterResultsByColumns(results.data, args.columns);
       //console.log("results.data", results.data);
       return results;
     };