spice-js 2.7.9 → 2.7.11

package/build/models/SpiceModel.js

@@ -1353,7 +1353,14 @@ class SpiceModel {
 
 
   buildJoinMetadata(nestings, args) {
-    // Decide which aliases we can join: only when map.type===MODEL AND reference is a STRING keyspace.
+    var _args$columns;
+
+    // Normalize any double backticks to single backticks early (handles URL encoding issues)
+    if (args.columns && typeof args.columns === "string") {
+      args.columns = args.columns.replace(/``/g, "`");
+    } // Decide which aliases we can join: only when map.type===MODEL AND reference is a STRING keyspace.
+
+
     var mappedNestings = _.compact(_.uniq(nestings).map(alias => {
       var prop = this.props[alias];
       if (!(prop == null ? void 0 : prop.map) || prop.map.type !== _2.MapType.MODEL) return null;
@@ -1381,7 +1388,7 @@ class SpiceModel {
     // then normalize names and add default aliases
     //console.log("Columns in BuildJoinMetadata", args.columns);
 
-    this[_columns] = "" + args.columns;
+    this[_columns] = (_args$columns = args.columns) != null ? _args$columns : '';
     args.columns = this.prepColumns(args.columns, protectedAliases, arrayAliases);
     args.columns = this.fixColumnName(args.columns, protectedAliases); //console.log("Columns in BuildJoinMetadata after fixColumnName", args.columns);
 
@@ -1545,7 +1552,8 @@ class SpiceModel {
             yield _this12.run_hook(results.data, "list", "after");
           }
 
-          results.data = _this12.filterResultsByColumns(results.data, args.columns);
+          results.data = _this12.filterResultsByColumns(results.data, args.columns); //console.log("results.data", results.data);
+
           return results;
         });
 
@@ -1981,6 +1989,34 @@ class SpiceModel {
       that.addModifier(modifier);
     });
   }
+  /**
+   * Checks if a field is present in the columns string.
+   * Used to skip modifier execution when the field isn't requested.
+   * @param {string} fieldName - The field name to check for
+   * @param {string} columns - Comma-separated column string
+   * @returns {boolean} - True if field is in columns or columns is empty (fetch all)
+   */
+
+
+  isFieldInColumns(fieldName, columns) {
+    // No columns filter = include all
+    if (!columns || columns === '') return true;
+    var tokens = columns.split(',');
+
+    for (var col of tokens) {
+      var trimmed = col.trim(); // Check if this column starts with the field name (exact match or nested like "fieldName.subfield")
+
+      var firstPart = trimmed.split('.')[0]; // Handle backtick-wrapped column names
+
+      var cleanFirstPart = firstPart.startsWith('`') && firstPart.endsWith('`') ? firstPart.slice(1, -1) : firstPart;
+
+      if (cleanFirstPart === fieldName) {
+        return true;
+      }
+    }
+
+    return false;
+  }
 
   createMofifier(properties) {
     var _this17 = this;
@@ -1998,6 +2034,11 @@ class SpiceModel {
                       when: properties[i].map.when || "read",
                       execute: function () {
                         var _execute = _asyncToGenerator(function* (data, old_data, ctx, type, args, mapping_dept, level, columns) {
+                          // Skip if columns are specified but this field isn't included
+                          if (!_this17.isFieldInColumns(i, columns)) {
+                            return data;
+                          }
+
                           return yield _this17.mapToObject(data, _.isString(properties[i].map.reference) ? spice.models[properties[i].map.reference] : properties[i].map.reference, i, properties[i].map.destination || i, properties[i], args, type, mapping_dept, level, columns);
                         });
 
@@ -2019,6 +2060,11 @@ class SpiceModel {
                       when: properties[i].map.when || "read",
                       execute: function () {
                         var _execute2 = _asyncToGenerator(function* (data, old_data, ctx, type, args, mapping_dept, level, columns) {
+                          // Skip if columns are specified but this field isn't included
+                          if (!_this17.isFieldInColumns(i, columns)) {
+                            return data;
+                          }
+
                           return yield _this17.mapToObjectArray(data, _.isString(properties[i].map.reference) ? spice.models[properties[i].map.reference] : properties[i].map.reference, i, properties[i].map.destination || i, properties[i], args, type, mapping_dept, level, columns);
                         });
 

package/package.json

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

package/src/models/SpiceModel.js

@@ -1168,6 +1168,11 @@ export default class SpiceModel {
    * @returns {Object} - { mappedNestings, protectedAliases, arrayAliases }
    */
   buildJoinMetadata(nestings, args) {
+    // Normalize any double backticks to single backticks early (handles URL encoding issues)
+    if (args.columns && typeof args.columns === "string") {
+      args.columns = args.columns.replace(/``/g, "`");
+    }
+    
     // Decide which aliases we can join: only when map.type===MODEL AND reference is a STRING keyspace.
     const mappedNestings = _.compact(
       _.uniq(nestings).map((alias) => {
@@ -1204,7 +1209,10 @@ export default class SpiceModel {
     // Columns: first prepare (prefix base table, rewrite array alias.field → ARRAY proj),
     // then normalize names and add default aliases
     //console.log("Columns in BuildJoinMetadata", args.columns);
-    this[_columns] = `${args.columns}`;
+    
+    this[_columns] = args.columns ?? '';
+
+   
     args.columns = this.prepColumns(
       args.columns,
       protectedAliases,
@@ -1384,6 +1392,7 @@ export default class SpiceModel {
       }
 
       results.data = this.filterResultsByColumns(results.data, args.columns);
+      //console.log("results.data", results.data);
       return results;
     };
 
@@ -1573,8 +1582,8 @@ export default class SpiceModel {
       const childPath =
         this[_current_path] ?
           `${this[_current_path]}.${source_property}`
-        : source_property;
-
+          : source_property;
+      
       // ⚡ Wrap in profiler track() to ensure proper async context for child operations
       const fetchRelated = async () => {
         return await Promise.allSettled(
@@ -1804,6 +1813,34 @@ export default class SpiceModel {
     });
   }
 
+  /**
+   * Checks if a field is present in the columns string.
+   * Used to skip modifier execution when the field isn't requested.
+   * @param {string} fieldName - The field name to check for
+   * @param {string} columns - Comma-separated column string
+   * @returns {boolean} - True if field is in columns or columns is empty (fetch all)
+   */
+  isFieldInColumns(fieldName, columns) {
+    // No columns filter = include all
+    if (!columns || columns === '') return true;
+    
+    const tokens = columns.split(',');
+    for (const col of tokens) {
+      const trimmed = col.trim();
+      // Check if this column starts with the field name (exact match or nested like "fieldName.subfield")
+      const firstPart = trimmed.split('.')[0];
+      // Handle backtick-wrapped column names
+      const cleanFirstPart = firstPart.startsWith('`') && firstPart.endsWith('`')
+        ? firstPart.slice(1, -1)
+        : firstPart;
+      
+      if (cleanFirstPart === fieldName) {
+        return true;
+      }
+    }
+    return false;
+  }
+
   createMofifier(properties) {
     for (let i in properties) {
       if (properties[i].map) {
@@ -1815,6 +1852,10 @@ export default class SpiceModel {
                 this.addModifier({
                   when: properties[i].map.when || "read",
                   execute: async (data, old_data, ctx, type, args, mapping_dept, level, columns) => {
+                    // Skip if columns are specified but this field isn't included
+                    if (!this.isFieldInColumns(i, columns)) {
+                      return data;
+                    }
                     return await this.mapToObject(
                       data,
                       _.isString(properties[i].map.reference) ?
@@ -1838,6 +1879,10 @@ export default class SpiceModel {
                 this.addModifier({
                   when: properties[i].map.when || "read",
                   execute: async (data, old_data, ctx, type, args, mapping_dept, level, columns) => {
+                    // Skip if columns are specified but this field isn't included
+                    if (!this.isFieldInColumns(i, columns)) {
+                      return data;
+                    }
                     return await this.mapToObjectArray(
                       data,
                       _.isString(properties[i].map.reference) ?