spice-js 2.7.8 → 2.7.10

package/build/models/SpiceModel.js

@@ -31,6 +31,7 @@ var SDate = require("sonover-date"),
     _props = Symbol(),
     _args = Symbol(),
     _hooks = Symbol(),
+    _columns = Symbol(),
     _disable_lifecycle_events = Symbol(),
     _external_modifier_loaded = Symbol(),
     _skip_cache = Symbol(),
@@ -60,7 +61,7 @@ class SpiceModel {
     }
 
     try {
-      var _args2, _args2$args, _args3, _args3$args, _args$args, _args4, _args4$args, _args5, _args5$args, _args6, _args6$args, _args7, _args7$args;
+      var _args2, _args2$args, _args3, _args3$args, _args$args, _args4, _args4$args, _args5, _args5$args, _args6, _args6$args, _args7, _args7$args, _args8, _args8$args;
 
       var dbtype = spice.config.database.connections[args.connection].type || "couchbase";
 
@@ -77,6 +78,7 @@ class SpiceModel {
       this[_skip_cache] = ((_args5 = args) == null ? void 0 : (_args5$args = _args5.args) == null ? void 0 : _args5$args.skip_cache) || false;
       this[_level] = ((_args6 = args) == null ? void 0 : (_args6$args = _args6.args) == null ? void 0 : _args6$args._level) || 0;
       this[_current_path] = ((_args7 = args) == null ? void 0 : (_args7$args = _args7.args) == null ? void 0 : _args7$args._current_path) || "";
+      this[_columns] = ((_args8 = args) == null ? void 0 : (_args8$args = _args8.args) == null ? void 0 : _args8$args._columns) || "";
       this[_hooks] = {
         create: {
           before: [],
@@ -608,13 +610,38 @@ class SpiceModel {
           }
 
           if (_.isString(args.id)) {
+            var _args9;
+
             if (args.skip_hooks !== true) {
               yield _this4.run_hook(args, "get", "before");
             } // ⚡ Include columns in cache key if specified
 
 
             var key = "get::" + _this4.type + "::" + args.id + (args.columns ? "::" + args.columns : "");
-            var results = {};
+            var results = {}; // Extract nestings from columns if specified
+
+            var nestings = _this4.extractNestings(((_args9 = args) == null ? void 0 : _args9.columns) || "", _this4.type); // Build join metadata and prepare columns
+
+
+            _this4.buildJoinMetadata(nestings, args);
+
+            var columns = args.columns;
+            var columnArray = [];
+
+            if (columns) {
+              columns.split(',').forEach(col => {
+                var parts = col.trim().split("."); // remove the first segment
+                // Also match if parts[0] is source_property or '`' + source_property + '`'
+
+                var firstPart = parts[0]; // Remove backticks if present
+
+                var cleanFirstPart = firstPart && firstPart.startsWith('`') && firstPart.endsWith('`') ? firstPart.slice(1, -1) : firstPart; //if (parts.length > 0 && (firstPart === source_property || cleanFirstPart === source_property)) {
+                // Use cleanFirstPart for the map key to handle both cases consistently
+                // Remove backticks from each column segment, if present, before joining
+
+                columnArray.push(parts.slice(1).map(segment => segment && segment.startsWith('`') && segment.endsWith('`') ? segment.slice(1, -1) : segment).join(".")); // }
+              });
+            }
 
             if (_this4.shouldUseCache(_this4.type)) {
               // Retrieve the cached results
@@ -622,7 +649,7 @@ class SpiceModel {
 
               var isCacheEmpty = (cached_results == null ? void 0 : cached_results.value) === undefined; // Check if the cached result should be refreshed
 
-              var shouldRefresh = yield _this4.shouldForceRefresh(cached_results); // Force a refresh for "workflow" type if needed
+              var shouldRefresh = yield _this4.shouldForceRefresh(cached_results);
 
               if (isCacheEmpty || shouldRefresh) {
                 // Retrieve from the database and update cache
@@ -630,10 +657,14 @@ class SpiceModel {
                   results = yield p.track(_this4.type + ".get.database",
                   /*#__PURE__*/
                   _asyncToGenerator(function* () {
-                    return yield _this4.database.get(args.id);
+                    return yield _this4.database.get(args.id, {
+                      columns: columnArray
+                    });
                   }));
                 } else {
-                  results = yield _this4.database.get(args.id);
+                  results = yield _this4.database.get(args.id, {
+                    columns: columnArray
+                  });
                 }
 
                 yield _this4.getCacheProviderObject(_this4.type).set(key, {
@@ -650,10 +681,14 @@ class SpiceModel {
                 results = yield p.track(_this4.type + ".get.database",
                 /*#__PURE__*/
                 _asyncToGenerator(function* () {
-                  return yield _this4.database.get(args.id);
+                  return yield _this4.database.get(args.id, {
+                    columns: columnArray
+                  });
                 }));
               } else {
-                results = yield _this4.database.get(args.id);
+                results = yield _this4.database.get(args.id, {
+                  columns: columnArray
+                });
               }
             }
 
@@ -694,10 +729,10 @@ class SpiceModel {
 
       try {
         if (p) {
-          var _args8;
+          var _args10;
 
           return yield p.track(_this4.type + ".get", doGet, {
-            id: (_args8 = args) == null ? void 0 : _args8.id
+            id: (_args10 = args) == null ? void 0 : _args10.id
           });
         }
 
@@ -745,8 +780,7 @@ class SpiceModel {
 
           _.remove(args.ids, o => o == undefined);
 
-          var key = "multi-get::" + _this6.type + "::" + _.join(args.ids, "|");
-
+          var key = "multi-get::" + _this6.type + "::" + _.join(args.ids, "|") + ":" + args.columns;
           var results = [];
 
           if (args.ids.length > 0) {
@@ -755,7 +789,10 @@ class SpiceModel {
               results = cached_results == null ? void 0 : cached_results.value;
 
               if ((cached_results == null ? void 0 : cached_results.value) === undefined || (yield _this6.shouldForceRefresh(cached_results))) {
-                results = yield _this6.database.multi_get(args.ids, true);
+                results = yield _this6.database.multi_get(args.ids, {
+                  keep_type: true,
+                  columns: args.columns.length > 0 && args.columns != "" ? [...args.columns, 'type'] : []
+                });
 
                 _this6.getCacheProviderObject(_this6.type).set(key, {
                   value: results,
@@ -763,7 +800,10 @@ class SpiceModel {
                 }, _this6.getCacheConfig(_this6.type));
               }
             } else {
-              results = yield _this6.database.multi_get(args.ids, true);
+              results = yield _this6.database.multi_get(args.ids, {
+                keep_type: true,
+                columns: args.columns.length > 0 && args.columns != "" ? [...args.columns, 'type'] : []
+              });
             }
           }
 
@@ -787,10 +827,10 @@ class SpiceModel {
 
       try {
         if (p) {
-          var _args9, _args9$ids;
+          var _args11, _args11$ids;
 
           return yield p.track(_this6.type + ".getMulti", doGetMulti, {
-            ids_count: ((_args9 = args) == null ? void 0 : (_args9$ids = _args9.ids) == null ? void 0 : _args9$ids.length) || 0
+            ids_count: ((_args11 = args) == null ? void 0 : (_args11$ids = _args11.ids) == null ? void 0 : _args11$ids.length) || 0
           });
         }
 
@@ -1164,6 +1204,14 @@ class SpiceModel {
           var _qualified = q(alias) + "." + q(field);
 
           return explicitAs ? _qualified + " AS " + q(explicitAs) : _qualified;
+        } // Check if alias has a map - if so, simplify to root column only (raw ID)
+
+
+        var prop = this.props[alias];
+
+        if (prop == null ? void 0 : prop.map) {
+          // Return base table qualified root column, ignoring the .field part
+          return q(this.type) + "." + q(alias);
         }
 
         if (arraySet.has(alias)) {
@@ -1207,8 +1255,9 @@ class SpiceModel {
       }
 
       return col;
-    });
-    return _.join(_.compact(out), ",");
+    }); // Deduplicate columns (e.g., when multiple mapped dot-notations share the same root)
+
+    return _.join(_.uniq(_.compact(out)), ",");
   }
 
   filterResultsByColumns(data, columns) {
@@ -1241,24 +1290,33 @@ class SpiceModel {
   }
 
   extractNestings(string, localType) {
-    var returnVal = [];
+    var returnVal = []; // First, extract loop variables and embedded arrays from ANY/EVERY expressions
+    // These should be EXCLUDED from join candidates
+
+    var anyEveryRegex = /(ANY|EVERY)\s+(\w+)\s+IN\s+`?(\w+)`?/gi;
+    var anyEveryMatch;
+    var loopVariables = new Set();
+    var embeddedArrayFields = new Set();
+
+    while ((anyEveryMatch = anyEveryRegex.exec(string)) !== null) {
+      loopVariables.add(anyEveryMatch[2]); // e.g., "p"
+
+      embeddedArrayFields.add(anyEveryMatch[3]); // e.g., "permissions"
+    } // Now extract dot notation patterns, but skip loop variables and embedded arrays
+
+
     var regex = /(`?\w+`?)\.(`?\w+`?)/g;
     var match;
 
     while ((match = regex.exec(string)) !== null) {
-      var first = match[1].replace(/`/g, "");
+      var first = match[1].replace(/`/g, ""); // Skip if it's the local type, a loop variable from ANY/EVERY, or an embedded array field
 
-      if (first !== localType) {
+      if (first !== localType && !loopVariables.has(first) && !embeddedArrayFields.has(first)) {
         returnVal.push(first);
       }
-    }
+    } // DO NOT add embedded array fields from ANY/EVERY expressions
+    // They iterate over document's embedded array, not join to another collection
 
-    var queryRegex = /(ANY|EVERY)\s+\w+\s+IN\s+`?(\w+)`?/g;
-    var queryMatch;
-
-    while ((queryMatch = queryRegex.exec(string)) !== null) {
-      returnVal.push(queryMatch[2]);
-    }
 
     return [...new Set(returnVal)];
   }
@@ -1286,6 +1344,55 @@ class SpiceModel {
     parts[0] = "`" + parts[0] + "`";
     return parts.join(" ");
   }
+  /**
+   * Builds join metadata from nestings for SQL joins and prepares columns.
+   * @param {string[]} nestings - Array of alias names extracted from query/columns/sort
+   * @param {Object} args - Arguments object containing columns (will be mutated with prepared columns)
+   * @returns {Object} - { mappedNestings, protectedAliases, arrayAliases }
+   */
+
+
+  buildJoinMetadata(nestings, args) {
+    var _args$columns;
+
+    // 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;
+      var ref = prop.map.reference;
+
+      if (typeof ref !== "string") {
+        // reference is a class/function/array-of-classes → no SQL join; serializer will handle it
+        return null;
+      }
+
+      var is_array = prop.type === "array" || prop.type === Array || prop.type === _2.DataType.ARRAY;
+      return {
+        alias,
+        reference: ref.toLowerCase(),
+        // keyspace to join
+        is_array,
+        type: prop.type,
+        value_field: prop.map.value_field,
+        destination: prop.map.destination || alias
+      };
+    }));
+
+    var protectedAliases = mappedNestings.map(m => m.alias);
+    var arrayAliases = mappedNestings.filter(m => m.is_array).map(m => m.alias); // 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 = 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);
+
+    return {
+      mappedNestings,
+      protectedAliases,
+      arrayAliases
+    };
+  }
   /* removeSpaceAndSpecialCharacters(str) {
     return str.replace(/[^a-zA-Z0-9]/g, "");
   } */
@@ -1331,21 +1438,26 @@ class SpiceModel {
 
 
       if (tableName && tableName !== this.type) {
-        var newAlias = explicitAlias || tableName + "_" + columnName;
+        var newAlias = explicitAlias || "" + tableName;
 
         if (!explicitAlias) {
           if (aliasTracker.hasOwnProperty(newAlias)) {
             aliasTracker[newAlias]++;
-            newAlias = newAlias + "_" + aliasTracker[newAlias];
+            newAlias = "" + newAlias;
           } else {
             aliasTracker[newAlias] = 0;
           }
 
           return colWithoutAlias + " AS `" + newAlias + "`";
         }
+      } // If column is already qualified with base table (e.g., `user`.`field`), return as-is
+
+
+      if (tableName === this.type && match) {
+        return col;
       }
 
-      return col;
+      return "`" + col + "`";
     });
     return _.join(_.compact(out), ", ");
   }
@@ -1367,41 +1479,18 @@ class SpiceModel {
       /*#__PURE__*/
       function () {
         var _ref13 = _asyncToGenerator(function* () {
-          var _args10, _args11, _args12;
+          var _args12, _args13;
 
           if (args.mapping_dept) _this12[_mapping_dept] = args.mapping_dept;
           if (args.mapping_dept_exempt) _this12[_mapping_dept_exempt] = args.mapping_dept_exempt; // Find alias tokens from query/columns/sort
 
-          var nestings = [..._this12.extractNestings(((_args10 = args) == null ? void 0 : _args10.query) || "", _this12.type), ..._this12.extractNestings(((_args11 = args) == null ? void 0 : _args11.columns) || "", _this12.type), ..._this12.extractNestings(((_args12 = args) == null ? void 0 : _args12.sort) || "", _this12.type)]; // 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 = _this12.props[alias];
-            if (!(prop == null ? void 0 : prop.map) || prop.map.type !== _2.MapType.MODEL) return null;
-            var ref = prop.map.reference;
-
-            if (typeof ref !== "string") {
-              // reference is a class/function/array-of-classes → no SQL join; serializer will handle it
-              return null;
-            }
-
-            var is_array = prop.type === "array" || prop.type === Array || prop.type === _2.DataType.ARRAY;
-            return {
-              alias,
-              reference: ref.toLowerCase(),
-              // keyspace to join
-              is_array,
-              type: prop.type,
-              value_field: prop.map.value_field,
-              destination: prop.map.destination || alias
-            };
-          }));
+          var nestings = [..._this12.extractNestings(((_args12 = args) == null ? void 0 : _args12.query) || "", _this12.type), //...this.extractNestings(args?.columns || "", this.type),
+          ..._this12.extractNestings(((_args13 = args) == null ? void 0 : _args13.sort) || "", _this12.type)]; // Build join metadata and prepare columns
 
-          var protectedAliases = mappedNestings.map(m => m.alias);
-          var arrayAliases = mappedNestings.filter(m => m.is_array).map(m => m.alias); // Columns: first prepare (prefix base table, rewrite array alias.field → ARRAY proj),
-          // then normalize names and add default aliases
+          var {
+            mappedNestings
+          } = _this12.buildJoinMetadata(nestings, args); // Build JOIN/NEST from the mapped keyspaces
 
-          args.columns = _this12.prepColumns(args.columns, protectedAliases, arrayAliases);
-          args.columns = _this12.fixColumnName(args.columns, protectedAliases); // Build JOIN/NEST from the mapped keyspaces
 
           args._join = _this12.createJoinSection(mappedNestings); // WHERE
 
@@ -1469,11 +1558,11 @@ class SpiceModel {
 
       try {
         if (p) {
-          var _args13, _args14;
+          var _args14, _args15;
 
           return yield p.track(_this12.type + ".list", doList, {
-            limit: (_args13 = args) == null ? void 0 : _args13.limit,
-            offset: (_args14 = args) == null ? void 0 : _args14.offset
+            limit: (_args14 = args) == null ? void 0 : _args14.limit,
+            offset: (_args15 = args) == null ? void 0 : _args15.offset
           });
         }
 
@@ -1608,14 +1697,34 @@ class SpiceModel {
     });
   }
 
-  mapToObject(data, Class, source_property, store_property, property) {
+  mapToObject(data, Class, source_property, store_property, property, args, type, mapping_dept, level, columns) {
     var _this15 = this;
 
     return _asyncToGenerator(function* () {
       var _this15$_ctx;
 
       // ⚡ Get profiler for proper async context forking
-      var p = (_this15$_ctx = _this15[_ctx]) == null ? void 0 : _this15$_ctx.profiler;
+      var p = (_this15$_ctx = _this15[_ctx]) == null ? void 0 : _this15$_ctx.profiler; // create a array of all columns in args.columns skipping the first_segment of the Column string and pull out all the columns of where the new first segment matches source_property
+      // Create a set of columns where the first segment matches source_property
+
+      var columnArray = [];
+
+      if (columns) {
+        columns.split(',').forEach(col => {
+          var parts = col.trim().split("."); // remove the first segment
+          // Also match if parts[0] is source_property or '`' + source_property + '`'
+
+          var firstPart = parts[0]; // Remove backticks if present
+
+          var cleanFirstPart = firstPart && firstPart.startsWith('`') && firstPart.endsWith('`') ? firstPart.slice(1, -1) : firstPart;
+
+          if (parts.length > 0 && (firstPart === source_property || cleanFirstPart === source_property)) {
+            // Use cleanFirstPart for the map key to handle both cases consistently
+            // Remove backticks from each column segment, if present, before joining
+            columnArray.push(parts.slice(1).map(segment => segment && segment.startsWith('`') && segment.endsWith('`') ? segment.slice(1, -1) : segment).join("."));
+          }
+        });
+      }
 
       var original_is_array = _.isArray(data);
 
@@ -1631,8 +1740,18 @@ class SpiceModel {
         var ids = [];
 
         _.each(data, result => {
-          if (_.isString(result[source_property]) && result[source_property] != "") {
-            ids = _.union(ids, [result[source_property]]);
+          var value = result[source_property]; // Check if value is in the empty string key (column aliasing issue)
+
+          if ((value === undefined || _.isObject(value) && _.isEmpty(value)) && result[''] && result[''][source_property]) {
+            value = result[''][source_property];
+          }
+
+          if (_.isString(value) && value != "") {
+            // Value is a raw ID string
+            ids = _.union(ids, [value]);
+          } else if (_.isObject(value) && _.isString(value.id) && value.id != "") {
+            // Value is already a joined object with an id field
+            ids = _.union(ids, [value.id]);
           }
         }); // Build the path for child models
 
@@ -1644,15 +1763,18 @@ class SpiceModel {
         function () {
           var _ref16 = _asyncToGenerator(function* () {
             return yield Promise.allSettled(_.map(classes, obj => {
-              return new obj(_extends({}, _this15[_args], {
+              var objInstance = new obj(_extends({}, _this15[_args], {
                 skip_cache: _this15[_skip_cache],
                 _level: _this15[_level] + 1,
                 mapping_dept: _this15[_mapping_dept],
                 mapping_dept_exempt: _this15[_mapping_dept_exempt],
+                _columns: columnArray.join(','),
                 _current_path: childPath
-              })).getMulti({
+              }));
+              return objInstance.getMulti({
                 skip_hooks: true,
-                ids: ids
+                ids: ids,
+                columns: columnArray
               });
             }));
           });
@@ -1673,12 +1795,26 @@ class SpiceModel {
         }
 
         var ug = _.flatten(_.compact(_.map(returned_all, returned_obj => {
-          if (returned_obj.status == "fulfilled") return returned_obj.value;
+          if (returned_obj.status == "fulfilled") {
+            return returned_obj.value;
+          }
         })));
+        /* if(source_property == "group") {
+          console.log("Returned All", source_property, store_property, ug);
+        } */
+
 
         data = _.map(data, result => {
+          var sourceValue = result[source_property]; // Check if value is in the empty string key (column aliasing issue)
+
+          if ((sourceValue === undefined || _.isObject(sourceValue) && _.isEmpty(sourceValue)) && result[''] && result[''][source_property]) {
+            sourceValue = result[''][source_property];
+          } // Get the ID to match against - either a string ID or the id property of an object
+
+
+          var sourceId = _.isString(sourceValue) ? sourceValue : _.isObject(sourceValue) ? sourceValue.id : null;
           var result_found = _.find(ug, g => {
-            return g.id == result[source_property];
+            return g.id == sourceId;
           }) || {};
           result[store_property] = result_found;
           return result;
@@ -1689,7 +1825,7 @@ class SpiceModel {
     })();
   }
 
-  mapToObjectArray(data, Class, source_property, store_property, property) {
+  mapToObjectArray(data, Class, source_property, store_property, property, args, type, mapping_dept, level, columns) {
     var _this16 = this;
 
     return _asyncToGenerator(function* () {
@@ -1697,6 +1833,24 @@ class SpiceModel {
 
       // ⚡ Get profiler for proper async context forking
       var p = (_this16$_ctx = _this16[_ctx]) == null ? void 0 : _this16$_ctx.profiler;
+      var columnArray = [];
+
+      if (columns) {
+        columns.split(',').forEach(col => {
+          var parts = col.trim().split("."); // remove the first segment
+          // Also match if parts[0] is source_property or '`' + source_property + '`'
+
+          var firstPart = parts[0]; // Remove backticks if present
+
+          var cleanFirstPart = firstPart && firstPart.startsWith('`') && firstPart.endsWith('`') ? firstPart.slice(1, -1) : firstPart;
+
+          if (parts.length > 0 && (firstPart === source_property || cleanFirstPart === source_property)) {
+            // Use cleanFirstPart for the map key to handle both cases consistently
+            // Remove backticks from each column segment, if present, before joining
+            columnArray.push(parts.slice(1).map(segment => segment && segment.startsWith('`') && segment.endsWith('`') ? segment.slice(1, -1) : segment).join("."));
+          }
+        });
+      }
 
       var original_is_array = _.isArray(data);
 
@@ -1718,9 +1872,18 @@ class SpiceModel {
 
           if (_.isString(result[source_property])) {
             value = [result[source_property]];
-          }
+          } // Extract IDs - handle both string IDs and objects with id property
+
 
-          var items = _.filter(value, obj => _.isString(obj) && obj != "");
+          var items = _.compact(_.map(value, obj => {
+            if (_.isString(obj) && obj != "") {
+              return obj;
+            } else if (_.isObject(obj) && _.isString(obj.id) && obj.id != "") {
+              return obj.id;
+            }
+
+            return null;
+          }));
 
           ids = _.union(ids, items);
         }); // Build the path for child models
@@ -1741,10 +1904,12 @@ class SpiceModel {
                 _level: _this16[_level] + 1,
                 mapping_dept: _this16[_mapping_dept],
                 mapping_dept_exempt: _this16[_mapping_dept_exempt],
+                _columns: columnArray.join(','),
                 _current_path: childPath
               })).getMulti({
                 skip_hooks: true,
-                ids: ids
+                ids: ids,
+                columns: columnArray
               });
             }));
           });
@@ -1778,7 +1943,11 @@ class SpiceModel {
             return;
           }
 
-          result[store_property] = _.map(result[source_property], pid => _.find(returned_objects, p => p.id === pid));
+          result[store_property] = _.map(result[source_property], item => {
+            // Get the ID to match - either a string ID or the id property of an object
+            var itemId = _.isString(item) ? item : _.isObject(item) ? item.id : null;
+            return _.find(returned_objects, p => p.id === itemId);
+          });
           result[store_property] = _.reject(result[store_property], obj => obj === null || obj === undefined);
         });
       }
@@ -1814,6 +1983,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;
@@ -1830,11 +2027,16 @@ class SpiceModel {
                     _this17.addModifier({
                       when: properties[i].map.when || "read",
                       execute: function () {
-                        var _execute = _asyncToGenerator(function* (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]);
+                        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);
                         });
 
-                        function execute(_x) {
+                        function execute(_x, _x2, _x3, _x4, _x5, _x6, _x7, _x8) {
                           return _execute.apply(this, arguments);
                         }
 
@@ -1851,11 +2053,16 @@ class SpiceModel {
                     _this17.addModifier({
                       when: properties[i].map.when || "read",
                       execute: function () {
-                        var _execute2 = _asyncToGenerator(function* (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]);
+                        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);
                         });
 
-                        function execute(_x2) {
+                        function execute(_x9, _x10, _x11, _x12, _x13, _x14, _x15, _x16) {
                           return _execute2.apply(this, arguments);
                         }
 
@@ -1921,7 +2128,7 @@ class SpiceModel {
             var modifier = modifiers[i];
 
             try {
-              var result = yield modifier(data, old_data, _this18[_ctx], _this18.type); // Guard against modifiers that return undefined
+              var result = yield modifier(data, old_data, _this18[_ctx], _this18.type, args, _this18[_mapping_dept], _this18[_level], _this18[_columns]); // Guard against modifiers that return undefined
 
               if (result !== undefined) {
                 data = result;
@@ -1966,7 +2173,7 @@ class SpiceModel {
               return (_this18$props$key2 = _this18.props[key]) == null ? void 0 : _this18$props$key2.hide;
             }); // Combine default props to remove.
 
-            var propsToClean = ["deleted", "type", ...path_to_be_removed, ...hiddenProps];
+            var propsToClean = ["deleted", "type", "collection", ...path_to_be_removed, ...hiddenProps];
             data = data.map(item => _.omit(item, propsToClean));
           } // Return in the original format (array or single object).
 

package/package.json

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

package/src/models/SpiceModel.js

@@ -15,6 +15,7 @@ var SDate = require("sonover-date"),
   _props = Symbol(),
   _args = Symbol(),
   _hooks = Symbol(),
+  _columns = Symbol(),
   _disable_lifecycle_events = Symbol(),
   _external_modifier_loaded = Symbol(),
   _skip_cache = Symbol(),
@@ -62,6 +63,7 @@ export default class SpiceModel {
       this[_skip_cache] = args?.args?.skip_cache || false;
       this[_level] = args?.args?._level || 0;
       this[_current_path] = args?.args?._current_path || "";
+      this[_columns] = args?.args?._columns || "";
       this[_hooks] = {
         create: {
           before: [],
@@ -528,6 +530,41 @@ export default class SpiceModel {
         let key = `get::${this.type}::${args.id}${args.columns ? `::${args.columns}` : ""}`;
         let results = {};
 
+        // Extract nestings from columns if specified
+        const nestings = this.extractNestings(args?.columns || "", this.type);
+        
+        // Build join metadata and prepare columns
+        this.buildJoinMetadata(nestings, args);
+        let columns = args.columns;
+        let columnArray = [];
+        if (columns) {
+          columns.split(',').forEach(col => {
+
+            const parts = col.trim().split(".")// remove the first segment
+            // Also match if parts[0] is source_property or '`' + source_property + '`'
+            const firstPart = parts[0];
+            // Remove backticks if present
+            const cleanFirstPart = firstPart && firstPart.startsWith('`') && firstPart.endsWith('`')
+              ? firstPart.slice(1, -1)
+              : firstPart;
+
+          //if (parts.length > 0 && (firstPart === source_property || cleanFirstPart === source_property)) {
+              // Use cleanFirstPart for the map key to handle both cases consistently
+              // Remove backticks from each column segment, if present, before joining
+              columnArray.push(
+                parts
+                  .slice(1)
+                  .map(segment =>
+                    segment && segment.startsWith('`') && segment.endsWith('`')
+                      ? segment.slice(1, -1)
+                      : segment
+                  )
+                  .join(".")
+              );
+          // }
+          });
+        }
+
         if (this.shouldUseCache(this.type)) {
           // Retrieve the cached results
           const cached_results = await this.getCacheProviderObject(
@@ -537,16 +574,15 @@ export default class SpiceModel {
           const isCacheEmpty = cached_results?.value === undefined;
           // Check if the cached result should be refreshed
           const shouldRefresh = await this.shouldForceRefresh(cached_results);
-          // Force a refresh for "workflow" type if needed
 
           if (isCacheEmpty || shouldRefresh) {
             // Retrieve from the database and update cache
             if (p) {
               results = await p.track(`${this.type}.get.database`, async () => {
-                return await this.database.get(args.id);
+                return await this.database.get(args.id, { columns: columnArray });
               });
             } else {
-              results = await this.database.get(args.id);
+              results = await this.database.get(args.id, { columns: columnArray });
             }
             await this.getCacheProviderObject(this.type).set(
               key,
@@ -561,10 +597,10 @@ export default class SpiceModel {
           // Directly fetch from the database if caching is disabled
           if (p) {
             results = await p.track(`${this.type}.get.database`, async () => {
-              return await this.database.get(args.id);
+              return await this.database.get(args.id, { columns: columnArray });
             });
           } else {
-            results = await this.database.get(args.id);
+            results = await this.database.get(args.id, { columns: columnArray });
           }
         }
 
@@ -636,7 +672,7 @@ export default class SpiceModel {
         await this.run_hook(this, "list", "before");
       }
       _.remove(args.ids, (o) => o == undefined);
-      let key = `multi-get::${this.type}::${_.join(args.ids, "|")}`;
+      let key = `multi-get::${this.type}::${_.join(args.ids, "|")}:${args.columns}`;
       let results = [];
       if (args.ids.length > 0) {
         if (this.shouldUseCache(this.type)) {
@@ -648,7 +684,7 @@ export default class SpiceModel {
             cached_results?.value === undefined ||
             (await this.shouldForceRefresh(cached_results))
           ) {
-            results = await this.database.multi_get(args.ids, true);
+            results = await this.database.multi_get(args.ids, {keep_type:true, columns:args.columns.length > 0 && args.columns != ""?[...args.columns, 'type']:[]});
             this.getCacheProviderObject(this.type).set(
               key,
               { value: results, time: new Date().getTime() },
@@ -656,7 +692,7 @@ export default class SpiceModel {
             );
           }
         } else {
-          results = await this.database.multi_get(args.ids, true);
+          results = await this.database.multi_get(args.ids, {keep_type:true, columns:args.columns.length> 0 && args.columns != ""?[...args.columns, 'type']:[]});
         }
       }
       _.remove(results, (o) => o.type != this.type);
@@ -668,11 +704,11 @@ export default class SpiceModel {
           args,
           await this.propsToBeRemoved(results)
         );
-      }
+      } 
 
       if (args.skip_hooks != true) {
         await this.run_hook(results, "list", "after", args.context);
-      }
+      } 
 
       return results;
     };
@@ -981,6 +1017,13 @@ export default class SpiceModel {
           return explicitAs ? `${qualified} AS ${q(explicitAs)}` : qualified;
         }
 
+        // Check if alias has a map - if so, simplify to root column only (raw ID)
+        const prop = this.props[alias];
+        if (prop?.map) {
+          // Return base table qualified root column, ignoring the .field part
+          return `${q(this.type)}.${q(alias)}`;
+        }
+
         if (arraySet.has(alias)) {
           let proj = this.buildArrayProjection(alias, field);
           if (explicitAs && explicitAs !== `${alias}_${field}`) {
@@ -1027,7 +1070,8 @@ export default class SpiceModel {
       return col;
     });
 
-    return _.join(_.compact(out), ",");
+    // Deduplicate columns (e.g., when multiple mapped dot-notations share the same root)
+    return _.join(_.uniq(_.compact(out)), ",");
   }
 
   filterResultsByColumns(data, columns) {
@@ -1065,22 +1109,33 @@ export default class SpiceModel {
 
   extractNestings(string, localType) {
     let returnVal = [];
+
+    // First, extract loop variables and embedded arrays from ANY/EVERY expressions
+    // These should be EXCLUDED from join candidates
+    let anyEveryRegex = /(ANY|EVERY)\s+(\w+)\s+IN\s+`?(\w+)`?/gi;
+    let anyEveryMatch;
+    const loopVariables = new Set();
+    const embeddedArrayFields = new Set();
+
+    while ((anyEveryMatch = anyEveryRegex.exec(string)) !== null) {
+      loopVariables.add(anyEveryMatch[2]); // e.g., "p"
+      embeddedArrayFields.add(anyEveryMatch[3]); // e.g., "permissions"
+    }
+
+    // Now extract dot notation patterns, but skip loop variables and embedded arrays
     let regex = /(`?\w+`?)\.(`?\w+`?)/g;
     let match;
 
     while ((match = regex.exec(string)) !== null) {
       let first = match[1].replace(/`/g, "");
-      if (first !== localType) {
+      // Skip if it's the local type, a loop variable from ANY/EVERY, or an embedded array field
+      if (first !== localType && !loopVariables.has(first) && !embeddedArrayFields.has(first)) {
         returnVal.push(first);
       }
     }
 
-    let queryRegex = /(ANY|EVERY)\s+\w+\s+IN\s+`?(\w+)`?/g;
-    let queryMatch;
-
-    while ((queryMatch = queryRegex.exec(string)) !== null) {
-      returnVal.push(queryMatch[2]);
-    }
+    // DO NOT add embedded array fields from ANY/EVERY expressions
+    // They iterate over document's embedded array, not join to another collection
 
     return [...new Set(returnVal)];
   }
@@ -1106,6 +1161,61 @@ export default class SpiceModel {
     return parts.join(" ");
   }
 
+  /**
+   * Builds join metadata from nestings for SQL joins and prepares columns.
+   * @param {string[]} nestings - Array of alias names extracted from query/columns/sort
+   * @param {Object} args - Arguments object containing columns (will be mutated with prepared columns)
+   * @returns {Object} - { mappedNestings, protectedAliases, arrayAliases }
+   */
+  buildJoinMetadata(nestings, args) {
+    // Decide which aliases we can join: only when map.type===MODEL AND reference is a STRING keyspace.
+    const mappedNestings = _.compact(
+      _.uniq(nestings).map((alias) => {
+        const prop = this.props[alias];
+        if (!prop?.map || prop.map.type !== MapType.MODEL) return null;
+
+        const ref = prop.map.reference;
+        if (typeof ref !== "string") {
+          // reference is a class/function/array-of-classes → no SQL join; serializer will handle it
+          return null;
+        }
+
+        const is_array =
+          prop.type === "array" ||
+          prop.type === Array ||
+          prop.type === DataType.ARRAY;
+
+        return {
+          alias,
+          reference: ref.toLowerCase(), // keyspace to join
+          is_array,
+          type: prop.type,
+          value_field: prop.map.value_field,
+          destination: prop.map.destination || alias,
+        };
+      })
+    );
+
+    const protectedAliases = mappedNestings.map((m) => m.alias);
+    const arrayAliases = mappedNestings
+      .filter((m) => m.is_array)
+      .map((m) => m.alias);
+
+    // 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 ?? '';
+    args.columns = this.prepColumns(
+      args.columns,
+      protectedAliases,
+      arrayAliases
+    );
+
+    args.columns = this.fixColumnName(args.columns, protectedAliases);
+    //console.log("Columns in BuildJoinMetadata after fixColumnName", args.columns);
+    return { mappedNestings, protectedAliases, arrayAliases };
+  }
+
   /* removeSpaceAndSpecialCharacters(str) {
     return str.replace(/[^a-zA-Z0-9]/g, "");
   } */
@@ -1157,11 +1267,11 @@ export default class SpiceModel {
 
       // For joined table columns, add default alias <table_col> if none
       if (tableName && tableName !== this.type) {
-        let newAlias = explicitAlias || `${tableName}_${columnName}`;
+        let newAlias = explicitAlias || `${tableName}`;
         if (!explicitAlias) {
           if (aliasTracker.hasOwnProperty(newAlias)) {
             aliasTracker[newAlias]++;
-            newAlias = `${newAlias}_${aliasTracker[newAlias]}`;
+            newAlias = `${newAlias}`;
           } else {
             aliasTracker[newAlias] = 0;
           }
@@ -1169,7 +1279,12 @@ export default class SpiceModel {
         }
       }
 
-      return col;
+      // If column is already qualified with base table (e.g., `user`.`field`), return as-is
+      if (tableName === this.type && match) {
+        return col;
+      }
+
+      return `\`${col}\``;
     });
 
     return _.join(_.compact(out), ", ");
@@ -1187,52 +1302,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),
       ];
 
-      // Decide which aliases we can join: only when map.type===MODEL AND reference is a STRING keyspace.
-      const mappedNestings = _.compact(
-        _.uniq(nestings).map((alias) => {
-          const prop = this.props[alias];
-          if (!prop?.map || prop.map.type !== MapType.MODEL) return null;
-
-          const ref = prop.map.reference;
-          if (typeof ref !== "string") {
-            // reference is a class/function/array-of-classes → no SQL join; serializer will handle it
-            return null;
-          }
-
-          const is_array =
-            prop.type === "array" ||
-            prop.type === Array ||
-            prop.type === DataType.ARRAY;
-
-          return {
-            alias,
-            reference: ref.toLowerCase(), // keyspace to join
-            is_array,
-            type: prop.type,
-            value_field: prop.map.value_field,
-            destination: prop.map.destination || alias,
-          };
-        })
-      );
-
-      const protectedAliases = mappedNestings.map((m) => m.alias);
-      const arrayAliases = mappedNestings
-        .filter((m) => m.is_array)
-        .map((m) => m.alias);
-
-      // Columns: first prepare (prefix base table, rewrite array alias.field → ARRAY proj),
-      // then normalize names and add default aliases
-      args.columns = this.prepColumns(
-        args.columns,
-        protectedAliases,
-        arrayAliases
-      );
-      args.columns = this.fixColumnName(args.columns, protectedAliases);
-
+      // Build join metadata and prepare columns
+      const { mappedNestings } = this.buildJoinMetadata(nestings, args);
+      
       // Build JOIN/NEST from the mapped keyspaces
       args._join = this.createJoinSection(mappedNestings);
 
@@ -1299,7 +1375,7 @@ export default class SpiceModel {
           "read",
           {},
           args,
-          await this.propsToBeRemoved(results.data)
+          await this.propsToBeRemoved(results.data),
         );
       }
 
@@ -1434,10 +1510,39 @@ export default class SpiceModel {
     });
   }
 
-  async mapToObject(data, Class, source_property, store_property, property) {
+  async mapToObject(data, Class, source_property, store_property, property, args, type, mapping_dept, level, columns) {
     // ⚡ Get profiler for proper async context forking
     const p = this[_ctx]?.profiler;
-
+    // create a array of all columns in args.columns skipping the first_segment of the Column string and pull out all the columns of where the new first segment matches source_property
+    // Create a set of columns where the first segment matches source_property
+    let columnArray = [];
+    if (columns) {
+      columns.split(',').forEach(col => {
+
+        const parts = col.trim().split(".")// remove the first segment
+        // Also match if parts[0] is source_property or '`' + source_property + '`'
+        const firstPart = parts[0];
+        // Remove backticks if present
+        const cleanFirstPart = firstPart && firstPart.startsWith('`') && firstPart.endsWith('`')
+          ? firstPart.slice(1, -1)
+          : firstPart;
+
+        if (parts.length > 0 && (firstPart === source_property || cleanFirstPart === source_property)) {
+          // Use cleanFirstPart for the map key to handle both cases consistently
+          // Remove backticks from each column segment, if present, before joining
+          columnArray.push(
+            parts
+              .slice(1)
+              .map(segment =>
+                segment && segment.startsWith('`') && segment.endsWith('`')
+                  ? segment.slice(1, -1)
+                  : segment
+              )
+              .join(".")
+          );
+        }
+      });
+    }
     let original_is_array = _.isArray(data);
     if (!original_is_array) {
       data = Array.of(data);
@@ -1448,11 +1553,19 @@ export default class SpiceModel {
 
       let ids = [];
       _.each(data, (result) => {
-        if (
-          _.isString(result[source_property]) &&
-          result[source_property] != ""
-        ) {
-          ids = _.union(ids, [result[source_property]]);
+        let value = result[source_property];
+        
+        // Check if value is in the empty string key (column aliasing issue)
+        if ((value === undefined || (_.isObject(value) && _.isEmpty(value))) && result[''] && result[''][source_property]) {
+          value = result[''][source_property];
+        }
+        
+        if (_.isString(value) && value != "") {
+          // Value is a raw ID string
+          ids = _.union(ids, [value]);
+        } else if (_.isObject(value) && _.isString(value.id) && value.id != "") {
+          // Value is already a joined object with an id field
+          ids = _.union(ids, [value.id]);
         }
       });
 
@@ -1466,16 +1579,20 @@ export default class SpiceModel {
       const fetchRelated = async () => {
         return await Promise.allSettled(
           _.map(classes, (obj) => {
-            return new obj({
+            let objInstance = new obj({
               ...this[_args],
               skip_cache: this[_skip_cache],
               _level: this[_level] + 1,
               mapping_dept: this[_mapping_dept],
               mapping_dept_exempt: this[_mapping_dept_exempt],
+              _columns: columnArray.join(','),
               _current_path: childPath,
-            }).getMulti({
+            })
+            
+             return objInstance.getMulti({
               skip_hooks: true,
               ids: ids,
+              columns:columnArray,
             });
           })
         );
@@ -1495,15 +1612,30 @@ export default class SpiceModel {
       let ug = _.flatten(
         _.compact(
           _.map(returned_all, (returned_obj) => {
-            if (returned_obj.status == "fulfilled") return returned_obj.value;
+            if (returned_obj.status == "fulfilled") {
+              return returned_obj.value;
+            }
           })
         )
       );
 
+      /* if(source_property == "group") {
+        console.log("Returned All", source_property, store_property, ug);
+      } */
+
       data = _.map(data, (result) => {
+        let sourceValue = result[source_property];
+        
+        // Check if value is in the empty string key (column aliasing issue)
+        if ((sourceValue === undefined || (_.isObject(sourceValue) && _.isEmpty(sourceValue))) && result[''] && result[''][source_property]) {
+          sourceValue = result[''][source_property];
+        }
+        
+        // Get the ID to match against - either a string ID or the id property of an object
+        const sourceId = _.isString(sourceValue) ? sourceValue : (_.isObject(sourceValue) ? sourceValue.id : null);
         let result_found =
           _.find(ug, (g) => {
-            return g.id == result[source_property];
+            return g.id == sourceId;
           }) || {};
         result[store_property] = result_found;
         return result;
@@ -1517,11 +1649,41 @@ export default class SpiceModel {
     Class,
     source_property,
     store_property,
-    property
+    property,
+    args, type, mapping_dept, level, columns
   ) {
     // ⚡ Get profiler for proper async context forking
     const p = this[_ctx]?.profiler;
 
+    let columnArray = [];
+    if (columns) {
+      columns.split(',').forEach(col => {
+
+        const parts = col.trim().split(".")// remove the first segment
+        // Also match if parts[0] is source_property or '`' + source_property + '`'
+        const firstPart = parts[0];
+        // Remove backticks if present
+        const cleanFirstPart = firstPart && firstPart.startsWith('`') && firstPart.endsWith('`')
+          ? firstPart.slice(1, -1)
+          : firstPart;
+
+        if (parts.length > 0 && (firstPart === source_property || cleanFirstPart === source_property)) {
+          // Use cleanFirstPart for the map key to handle both cases consistently
+          // Remove backticks from each column segment, if present, before joining
+          columnArray.push(
+            parts
+              .slice(1)
+              .map(segment =>
+                segment && segment.startsWith('`') && segment.endsWith('`')
+                  ? segment.slice(1, -1)
+                  : segment
+              )
+              .join(".")
+          );
+        }
+      });
+    }
+
     let original_is_array = _.isArray(data);
     if (!original_is_array) {
       data = Array.of(data);
@@ -1540,7 +1702,15 @@ export default class SpiceModel {
           value = [result[source_property]];
         }
 
-        let items = _.filter(value, (obj) => _.isString(obj) && obj != "");
+        // Extract IDs - handle both string IDs and objects with id property
+        let items = _.compact(_.map(value, (obj) => {
+          if (_.isString(obj) && obj != "") {
+            return obj;
+          } else if (_.isObject(obj) && _.isString(obj.id) && obj.id != "") {
+            return obj.id;
+          }
+          return null;
+        }));
         ids = _.union(ids, items);
       });
 
@@ -1562,10 +1732,12 @@ export default class SpiceModel {
               _level: this[_level] + 1,
               mapping_dept: this[_mapping_dept],
               mapping_dept_exempt: this[_mapping_dept_exempt],
+              _columns: columnArray.join(','),
               _current_path: childPath,
             }).getMulti({
               skip_hooks: true,
               ids: ids,
+              columns:columnArray,
             });
           })
         );
@@ -1600,9 +1772,11 @@ export default class SpiceModel {
           return;
         }
 
-        result[store_property] = _.map(result[source_property], (pid) =>
-          _.find(returned_objects, (p) => p.id === pid)
-        );
+        result[store_property] = _.map(result[source_property], (item) => {
+          // Get the ID to match - either a string ID or the id property of an object
+          const itemId = _.isString(item) ? item : (_.isObject(item) ? item.id : null);
+          return _.find(returned_objects, (p) => p.id === itemId);
+        });
         result[store_property] = _.reject(
           result[store_property],
           (obj) => obj === null || obj === undefined
@@ -1630,6 +1804,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) {
@@ -1640,7 +1842,11 @@ export default class SpiceModel {
               case "string": {
                 this.addModifier({
                   when: properties[i].map.when || "read",
-                  execute: async (data) => {
+                  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) ?
@@ -1648,7 +1854,12 @@ export default class SpiceModel {
                       : properties[i].map.reference,
                       i,
                       properties[i].map.destination || i,
-                      properties[i]
+                      properties[i],
+                      args,
+                      type,
+                      mapping_dept,
+                      level,
+                      columns
                     );
                   },
                 });
@@ -1658,7 +1869,11 @@ export default class SpiceModel {
               case "array": {
                 this.addModifier({
                   when: properties[i].map.when || "read",
-                  execute: async (data) => {
+                  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) ?
@@ -1666,7 +1881,12 @@ export default class SpiceModel {
                       : properties[i].map.reference,
                       i,
                       properties[i].map.destination || i,
-                      properties[i]
+                      properties[i],
+                      args,
+                      type,
+                      mapping_dept,
+                      level,
+                      columns
                     );
                   },
                 });
@@ -1676,7 +1896,7 @@ export default class SpiceModel {
             break;
           }
           case MapType.LOOKUP: {
-            break;
+            break;  
           }
         }
       }
@@ -1704,7 +1924,7 @@ export default class SpiceModel {
       for (let i = 0; i < modifiers.length; i++) {
         const modifier = modifiers[i];
         try {
-          const result = await modifier(data, old_data, this[_ctx], this.type);
+          const result = await modifier(data, old_data, this[_ctx], this.type, args, this[_mapping_dept], this[_level], this[_columns]);
           // Guard against modifiers that return undefined
           if (result !== undefined) {
             data = result;
@@ -1754,6 +1974,7 @@ export default class SpiceModel {
         const propsToClean = [
           "deleted",
           "type",
+          "collection",
           ...path_to_be_removed,
           ...hiddenProps,
         ];