spice-js 2.7.13 → 2.7.14

package/build/models/SpiceModel.js

@@ -791,7 +791,7 @@ class SpiceModel {
               if ((cached_results == null ? void 0 : cached_results.value) === undefined || (yield _this6.shouldForceRefresh(cached_results))) {
                 results = yield _this6.database.multi_get(args.ids, {
                   keep_type: true,
-                  columns: args.columns && args.columns.length > 0 && args.columns != "" ? [...args.columns, 'type'] : []
+                  columns: args.columns && args.columns.length > 0 && args.columns != "" ? [..._this6.extractBaseColumns(args.columns), 'type'] : []
                 });
 
                 _this6.getCacheProviderObject(_this6.type).set(key, {
@@ -802,7 +802,7 @@ class SpiceModel {
             } else {
               results = yield _this6.database.multi_get(args.ids, {
                 keep_type: true,
-                columns: args.columns && args.columns.length > 0 && args.columns != "" ? [...args.columns, 'type'] : []
+                columns: args.columns && args.columns.length > 0 && args.columns != "" ? [..._this6.extractBaseColumns(args.columns), 'type'] : []
               });
             }
           }
@@ -1989,6 +1989,21 @@ class SpiceModel {
       that.addModifier(modifier);
     });
   }
+  /**
+   * Extracts the first segment of each column path for database queries.
+   * e.g., ["name", "permissions.permission"] → ["name", "permissions"]
+   * @param {string[]} columns - Array of column paths
+   * @returns {string[]} - Array of base column names (deduplicated)
+   */
+
+
+  extractBaseColumns(columns) {
+    if (!columns || !Array.isArray(columns)) return columns;
+    return [...new Set(columns.map(col => {
+      var firstDot = col.indexOf('.');
+      return firstDot > -1 ? col.substring(0, firstDot) : col;
+    }))];
+  }
   /**
    * Checks if a field is present in the columns string.
    * Used to skip modifier execution when the field isn't requested.

package/package.json

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

package/src/models/SpiceModel.js

@@ -684,7 +684,7 @@ export default class SpiceModel {
             cached_results?.value === undefined ||
             (await this.shouldForceRefresh(cached_results))
           ) {
-            results = await this.database.multi_get(args.ids, {keep_type:true, columns:args.columns && args.columns.length > 0 && args.columns != ""?[...args.columns, 'type']:[]});
+            results = await this.database.multi_get(args.ids, {keep_type:true, columns:args.columns && args.columns.length > 0 && args.columns != ""?[...this.extractBaseColumns(args.columns), 'type']:[]});
             this.getCacheProviderObject(this.type).set(
               key,
               { value: results, time: new Date().getTime() },
@@ -692,7 +692,7 @@ export default class SpiceModel {
             );
           }
         } else {
-          results = await this.database.multi_get(args.ids, {keep_type:true, columns:args.columns && args.columns.length > 0 && args.columns != ""?[...args.columns, 'type']:[]});
+          results = await this.database.multi_get(args.ids, {keep_type:true, columns:args.columns && args.columns.length > 0 && args.columns != ""?[...this.extractBaseColumns(args.columns), 'type']:[]});
         }
       }
       _.remove(results, (o) => o.type != this.type);
@@ -1813,6 +1813,20 @@ export default class SpiceModel {
     });
   }
 
+  /**
+   * Extracts the first segment of each column path for database queries.
+   * e.g., ["name", "permissions.permission"] → ["name", "permissions"]
+   * @param {string[]} columns - Array of column paths
+   * @returns {string[]} - Array of base column names (deduplicated)
+   */
+  extractBaseColumns(columns) {
+    if (!columns || !Array.isArray(columns)) return columns;
+    return [...new Set(columns.map(col => {
+      const firstDot = col.indexOf('.');
+      return firstDot > -1 ? col.substring(0, firstDot) : col;
+    }))];
+  }
+
   /**
    * Checks if a field is present in the columns string.
    * Used to skip modifier execution when the field isn't requested.