spice-js 2.7.2 → 2.7.4

package/build/models/SpiceModel.js

@@ -54,7 +54,6 @@ if (!Promise.allSettled) {
 }
 
 class SpiceModel {
-  // ⚡ Static caches for performance optimization
   constructor(args) {
     if (args === void 0) {
       args = {};
@@ -704,50 +703,75 @@ class SpiceModel {
     var _this6 = this;
 
     return _asyncToGenerator(function* () {
-      try {
-        if (!args) {
-          args = {};
-        }
+      var _this6$_ctx;
 
-        if (args.skip_hooks != true) {
-          yield _this6.run_hook(_this6, "list", "before");
-        }
+      // ⚡ Profiling: use track() for proper async context forking
+      var p = (_this6$_ctx = _this6[_ctx]) == null ? void 0 : _this6$_ctx.profiler;
+
+      var doGetMulti =
+      /*#__PURE__*/
+      function () {
+        var _ref5 = _asyncToGenerator(function* () {
+          if (!args) {
+            args = {};
+          }
+
+          if (args.skip_hooks != true) {
+            yield _this6.run_hook(_this6, "list", "before");
+          }
 
-        _.remove(args.ids, o => o == undefined);
+          _.remove(args.ids, o => o == undefined);
 
-        var key = "multi-get::" + _this6.type + "::" + _.join(args.ids, "|");
+          var key = "multi-get::" + _this6.type + "::" + _.join(args.ids, "|");
 
-        var results = [];
+          var results = [];
 
-        if (args.ids.length > 0) {
-          if (_this6.shouldUseCache(_this6.type)) {
-            var cached_results = yield _this6.getCacheProviderObject(_this6.type).get(key);
-            results = cached_results == null ? void 0 : cached_results.value;
+          if (args.ids.length > 0) {
+            if (_this6.shouldUseCache(_this6.type)) {
+              var cached_results = yield _this6.getCacheProviderObject(_this6.type).get(key);
+              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);
+              if ((cached_results == null ? void 0 : cached_results.value) === undefined || (yield _this6.shouldForceRefresh(cached_results))) {
+                results = yield _this6.database.multi_get(args.ids, true);
 
-              _this6.getCacheProviderObject(_this6.type).set(key, {
-                value: results,
-                time: new Date().getTime()
-              }, _this6.getCacheConfig(_this6.type));
+                _this6.getCacheProviderObject(_this6.type).set(key, {
+                  value: results,
+                  time: new Date().getTime()
+                }, _this6.getCacheConfig(_this6.type));
+              }
+            } else {
+              results = yield _this6.database.multi_get(args.ids, true);
             }
-          } else {
-            results = yield _this6.database.multi_get(args.ids, true);
           }
-        }
 
-        _.remove(results, o => o.type != _this6.type);
+          _.remove(results, o => o.type != _this6.type);
 
-        if (args.skip_read_serialize != true && args.skip_serialize != true) {
-          results = yield _this6.do_serialize(results, "read", {}, args, (yield _this6.propsToBeRemoved(results)));
-        }
+          if (args.skip_read_serialize != true && args.skip_serialize != true) {
+            results = yield _this6.do_serialize(results, "read", {}, args, (yield _this6.propsToBeRemoved(results)));
+          }
 
-        if (args.skip_hooks != true) {
-          yield _this6.run_hook(results, "list", "after", args.context);
+          if (args.skip_hooks != true) {
+            yield _this6.run_hook(results, "list", "after", args.context);
+          }
+
+          return results;
+        });
+
+        return function doGetMulti() {
+          return _ref5.apply(this, arguments);
+        };
+      }();
+
+      try {
+        if (p) {
+          var _args9, _args9$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
+          });
         }
 
-        return results;
+        return yield doGetMulti();
       } catch (e) {
         console.warn(e.stack);
         throw e;
@@ -796,7 +820,7 @@ class SpiceModel {
       var doUpdate =
       /*#__PURE__*/
       function () {
-        var _ref5 = _asyncToGenerator(function* () {
+        var _ref6 = _asyncToGenerator(function* () {
           _this8.updated_at = new SDate().now();
           var results = yield _this8.database.get(args.id);
           var item_exist = yield _this8.exist(results);
@@ -855,7 +879,7 @@ class SpiceModel {
         });
 
         return function doUpdate() {
-          return _ref5.apply(this, arguments);
+          return _ref6.apply(this, arguments);
         };
       }();
 
@@ -890,7 +914,7 @@ class SpiceModel {
       var doCreate =
       /*#__PURE__*/
       function () {
-        var _ref7 = _asyncToGenerator(function* () {
+        var _ref8 = _asyncToGenerator(function* () {
           var form;
           _this9.created_at = new SDate().now();
           args = _.defaults(args, {
@@ -950,7 +974,7 @@ class SpiceModel {
         });
 
         return function doCreate() {
-          return _ref7.apply(this, arguments);
+          return _ref8.apply(this, arguments);
         };
       }();
 
@@ -1000,7 +1024,7 @@ class SpiceModel {
       var doDelete =
       /*#__PURE__*/
       function () {
-        var _ref9 = _asyncToGenerator(function* () {
+        var _ref10 = _asyncToGenerator(function* () {
           var item_exist = yield _this11.exist(args.id);
 
           if (!item_exist) {
@@ -1018,7 +1042,7 @@ class SpiceModel {
           var dbOperation =
           /*#__PURE__*/
           function () {
-            var _ref10 = _asyncToGenerator(function* () {
+            var _ref11 = _asyncToGenerator(function* () {
               if (args.hard) {
                 delete_response = yield _this11.database.delete(args.id);
 
@@ -1031,7 +1055,7 @@ class SpiceModel {
             });
 
             return function dbOperation() {
-              return _ref10.apply(this, arguments);
+              return _ref11.apply(this, arguments);
             };
           }();
 
@@ -1049,7 +1073,7 @@ class SpiceModel {
         });
 
         return function doDelete() {
-          return _ref9.apply(this, arguments);
+          return _ref10.apply(this, arguments);
         };
       }();
 
@@ -1218,12 +1242,12 @@ class SpiceModel {
 
   createJoinSection(mappedNestings) {
     if (!mappedNestings || mappedNestings.length === 0) return "";
-    return mappedNestings.map((_ref11) => {
+    return mappedNestings.map((_ref12) => {
       var {
         alias,
         reference,
         is_array
-      } = _ref11;
+      } = _ref12;
       var keyspace = (0, _fix.fixCollection)(reference);
 
       if (is_array === true) {
@@ -1319,13 +1343,13 @@ class SpiceModel {
       var doList =
       /*#__PURE__*/
       function () {
-        var _ref12 = _asyncToGenerator(function* () {
-          var _args9, _args10, _args11;
+        var _ref13 = _asyncToGenerator(function* () {
+          var _args10, _args11, _args12;
 
           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(((_args9 = args) == null ? void 0 : _args9.query) || "", _this12.type), ..._this12.extractNestings(((_args10 = args) == null ? void 0 : _args10.columns) || "", _this12.type), ..._this12.extractNestings(((_args11 = args) == null ? void 0 : _args11.sort) || "", _this12.type)]; // Decide which aliases we can join: only when map.type===MODEL AND reference is a STRING keyspace.
+          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];
@@ -1416,17 +1440,17 @@ class SpiceModel {
         });
 
         return function doList() {
-          return _ref12.apply(this, arguments);
+          return _ref13.apply(this, arguments);
         };
       }();
 
       try {
         if (p) {
-          var _args12, _args13;
+          var _args13, _args14;
 
           return yield p.track(_this12.type + ".list", doList, {
-            limit: (_args12 = args) == null ? void 0 : _args12.limit,
-            offset: (_args13 = args) == null ? void 0 : _args13.offset
+            limit: (_args13 = args) == null ? void 0 : _args13.limit,
+            offset: (_args14 = args) == null ? void 0 : _args14.offset
           });
         }
 
@@ -1450,7 +1474,7 @@ class SpiceModel {
       var doFetch =
       /*#__PURE__*/
       function () {
-        var _ref13 = _asyncToGenerator(function* () {
+        var _ref14 = _asyncToGenerator(function* () {
           if (args.is_custom_query === "true" && args.ids.length > 0) {
             return yield _this13.database.query(query);
           } else if (args.is_full_text === "true") {
@@ -1462,7 +1486,7 @@ class SpiceModel {
         });
 
         return function doFetch() {
-          return _ref13.apply(this, arguments);
+          return _ref14.apply(this, arguments);
         };
       }();
 
@@ -1474,12 +1498,12 @@ class SpiceModel {
     })();
   }
 
-  addHook(_ref14) {
+  addHook(_ref15) {
     var {
       operation,
       when,
       execute
-    } = _ref14;
+    } = _ref15;
 
     this[_hooks][operation][when].push(execute);
   }
@@ -1534,54 +1558,6 @@ class SpiceModel {
     }
 
     return true;
-  } // ⚡ OPTIMIZED: Cache defaults metadata per model type
-
-
-  getDefaultsMetadata(type) {
-    var cacheKey = this.type + "::" + type;
-
-    if (!SpiceModel._defaultsCache[cacheKey]) {
-      var staticDefaults = {};
-      var dynamicDefaults = []; // Pre-compute once per model type
-
-      for (var key in this.props) {
-        var _this$props$key, _this$props$key$defau;
-
-        var def = (_this$props$key = this.props[key]) == null ? void 0 : (_this$props$key$defau = _this$props$key.defaults) == null ? void 0 : _this$props$key$defau[type];
-
-        if (def !== undefined) {
-          if (_.isFunction(def)) {
-            dynamicDefaults.push({
-              key,
-              fn: def
-            });
-          } else {
-            staticDefaults[key] = def;
-          }
-        }
-      }
-
-      SpiceModel._defaultsCache[cacheKey] = {
-        staticDefaults,
-        dynamicDefaults,
-        hasDefaults: Object.keys(staticDefaults).length > 0 || dynamicDefaults.length > 0
-      };
-    }
-
-    return SpiceModel._defaultsCache[cacheKey];
-  } // ⚡ OPTIMIZED: Cache hidden props per model type
-
-
-  getHiddenProps() {
-    if (!SpiceModel._hiddenPropsCache[this.type]) {
-      SpiceModel._hiddenPropsCache[this.type] = Object.keys(this.props).filter(key => {
-        var _this$props$key2;
-
-        return (_this$props$key2 = this.props[key]) == null ? void 0 : _this$props$key2.hide;
-      });
-    }
-
-    return SpiceModel._hiddenPropsCache[this.type];
   } // Check if a field is exempt from mapping depth limits
   // Supports deep references like "group.permissions"
 
@@ -1613,6 +1589,11 @@ class SpiceModel {
     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 original_is_array = _.isArray(data);
 
       if (!original_is_array) {
@@ -1633,19 +1614,40 @@ class SpiceModel {
         }); // Build the path for child models
 
 
-        var childPath = _this15[_current_path] ? _this15[_current_path] + "." + source_property : source_property;
-        var returned_all = yield Promise.allSettled(_.map(classes, obj => {
-          return 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],
-            _current_path: childPath
-          })).getMulti({
-            skip_hooks: true,
-            ids: ids
+        var childPath = _this15[_current_path] ? _this15[_current_path] + "." + source_property : source_property; // ⚡ Wrap in profiler track() to ensure proper async context for child operations
+
+        var fetchRelated =
+        /*#__PURE__*/
+        function () {
+          var _ref16 = _asyncToGenerator(function* () {
+            return yield Promise.allSettled(_.map(classes, obj => {
+              return 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],
+                _current_path: childPath
+              })).getMulti({
+                skip_hooks: true,
+                ids: ids
+              });
+            }));
           });
-        }));
+
+          return function fetchRelated() {
+            return _ref16.apply(this, arguments);
+          };
+        }();
+
+        var returned_all;
+
+        if (p && ids.length > 0) {
+          returned_all = yield p.track(_this15.type + ".map." + source_property, fetchRelated, {
+            ids_count: ids.length
+          });
+        } else {
+          returned_all = yield fetchRelated();
+        }
 
         var ug = _.flatten(_.compact(_.map(returned_all, returned_obj => {
           if (returned_obj.status == "fulfilled") return returned_obj.value;
@@ -1668,6 +1670,11 @@ class SpiceModel {
     var _this16 = this;
 
     return _asyncToGenerator(function* () {
+      var _this16$_ctx;
+
+      // ⚡ Get profiler for proper async context forking
+      var p = (_this16$_ctx = _this16[_ctx]) == null ? void 0 : _this16$_ctx.profiler;
+
       var original_is_array = _.isArray(data);
 
       if (!original_is_array) {
@@ -1698,28 +1705,45 @@ class SpiceModel {
 
         var childPath = _this16[_current_path] ? _this16[_current_path] + "." + source_property : source_property;
 
-        var classes = _.compact(_.isArray(Class) ? Class : [Class]);
+        var classes = _.compact(_.isArray(Class) ? Class : [Class]); // ⚡ Wrap in profiler track() to ensure proper async context for child operations
+
+
+        var fetchRelated =
+        /*#__PURE__*/
+        function () {
+          var _ref17 = _asyncToGenerator(function* () {
+            return yield Promise.allSettled(_.map(classes, obj => {
+              return new obj(_extends({}, _this16[_args], {
+                skip_cache: _this16[_skip_cache],
+                _level: _this16[_level] + 1,
+                mapping_dept: _this16[_mapping_dept],
+                mapping_dept_exempt: _this16[_mapping_dept_exempt],
+                _current_path: childPath
+              })).getMulti({
+                skip_hooks: true,
+                ids: ids
+              });
+            }));
+          });
 
-        var returned_all = yield Promise.allSettled(_.map(classes, obj => {
-          return new obj(_extends({}, _this16[_args], {
-            skip_cache: _this16[_skip_cache],
-            _level: _this16[_level] + 1,
-            mapping_dept: _this16[_mapping_dept],
-            mapping_dept_exempt: _this16[_mapping_dept_exempt],
-            _current_path: childPath
-          })).getMulti({
-            skip_hooks: true,
-            ids: ids
+          return function fetchRelated() {
+            return _ref17.apply(this, arguments);
+          };
+        }();
+
+        var returned_all;
+
+        if (p && ids.length > 0) {
+          returned_all = yield p.track(_this16.type + ".mapArray." + source_property, fetchRelated, {
+            ids_count: ids.length
           });
-        }));
+        } else {
+          returned_all = yield fetchRelated();
+        }
 
         var returned_objects = _.flatten(_.compact(_.map(returned_all, returned_obj => {
           if (returned_obj.status == "fulfilled") return returned_obj.value;
         })));
-        /* let returned_objects = await new Class().getMulti({
-        ids: ids,
-        }); */
-
 
         _.each(data, result => {
           if (_.isString(result[store_property])) {
@@ -1740,21 +1764,14 @@ class SpiceModel {
     })();
   }
 
-  addModifier(_ref15) {
+  addModifier(_ref18) {
     var {
       when,
-      execute,
-      field = null,
-      sourceField = null
-    } = _ref15;
+      execute
+    } = _ref18;
 
     if (this[_serializers][when]) {
-      // Store as object with field info for column-based filtering
-      this[_serializers][when]["modifiers"].push({
-        execute,
-        field,
-        sourceField
-      });
+      this[_serializers][when]["modifiers"].push(execute);
     }
   }
 
@@ -1783,21 +1800,15 @@ class SpiceModel {
         switch (properties[i].map.type) {
           case _2.MapType.MODEL:
             {
-              var destinationField = properties[i].map.destination || i;
-
               switch (properties[i].type) {
                 case String:
                 case "string":
                   {
                     _this17.addModifier({
                       when: properties[i].map.when || "read",
-                      field: destinationField,
-                      // ⚡ Track which field this modifier populates
-                      sourceField: i,
-                      // ⚡ Track source property for column filtering
                       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, destinationField, properties[i]);
+                          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]);
                         });
 
                         function execute(_x) {
@@ -1816,13 +1827,9 @@ class SpiceModel {
                   {
                     _this17.addModifier({
                       when: properties[i].map.when || "read",
-                      field: destinationField,
-                      // ⚡ Track which field this modifier populates
-                      sourceField: i,
-                      // ⚡ Track source property for column filtering
                       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, destinationField, properties[i]);
+                          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]);
                         });
 
                         function execute(_x2) {
@@ -1851,42 +1858,6 @@ class SpiceModel {
     for (var i in properties) {
       _loop(i);
     }
-  } // ⚡ Parse columns string into a Set for fast lookup
-
-
-  parseRequestedColumns(columns) {
-    if (!columns || columns === "") return null; // Handle array of columns (convert to string)
-
-    if (Array.isArray(columns)) {
-      columns = columns.join(",");
-    } // Must be a string to parse
-
-
-    if (typeof columns !== "string") return null; // Extract field names from column specifications
-    // Handles: "field", "`field`", "table.field", "`table`.`field`", "expr AS alias"
-
-    var fields = new Set();
-    var columnList = columns.split(",").map(c => c.trim());
-
-    for (var col of columnList) {
-      // Check for AS alias
-      var aliasMatch = col.match(/\s+AS\s+`?([\w]+)`?$/i);
-
-      if (aliasMatch) {
-        fields.add(aliasMatch[1]);
-        continue;
-      } // Get the last part after dots (the field name)
-
-
-      var parts = col.replace(/`/g, "").split(".");
-      var fieldName = parts[parts.length - 1];
-
-      if (fieldName && fieldName !== "*") {
-        fields.add(fieldName);
-      }
-    }
-
-    return fields.size > 0 ? fields : null;
   }
 
   do_serialize(data, type, old_data, args, path_to_be_removed) {
@@ -1905,7 +1876,7 @@ class SpiceModel {
       var doSerialize =
       /*#__PURE__*/
       function () {
-        var _ref16 = _asyncToGenerator(function* () {
+        var _ref19 = _asyncToGenerator(function* () {
           var _this18$_serializers, _this18$_serializers$;
 
           // Early exit if serialization should not run.
@@ -1918,28 +1889,14 @@ class SpiceModel {
             _this18.addExternalModifiers(_this18.type);
 
             _this18[_external_modifier_loaded] = true;
-          } // ⚡ OPTIMIZED: Parse requested columns for selective modifier execution
-
+          } // Cache the modifiers lookup for the specified type.
 
-          var requestedColumns = _this18.parseRequestedColumns(args == null ? void 0 : args.columns); // Cache the modifiers lookup for the specified type.
 
-
-          var modifiers = ((_this18$_serializers = _this18[_serializers]) == null ? void 0 : (_this18$_serializers$ = _this18$_serializers[type]) == null ? void 0 : _this18$_serializers$.modifiers) || []; // Run modifiers serially
+          var modifiers = ((_this18$_serializers = _this18[_serializers]) == null ? void 0 : (_this18$_serializers$ = _this18$_serializers[type]) == null ? void 0 : _this18$_serializers$.modifiers) || [];
 
           for (var modifier of modifiers) {
-            // Skip field-specific modifiers if columns specified and field is not requested
-            if (requestedColumns && modifier.field && !requestedColumns.has(modifier.field) && !(modifier.sourceField && requestedColumns.has(modifier.sourceField))) {
-              continue;
-            }
-
             try {
-              // Handle both function modifiers and object modifiers with .execute
-              var executeFn = typeof modifier === "function" ? modifier : modifier.execute;
-              var result = yield executeFn(data, old_data, _this18[_ctx], _this18.type); // Only assign if modifier returned a value to prevent data corruption
-
-              if (result !== undefined) {
-                data = result;
-              }
+              data = yield modifier(data, old_data, _this18[_ctx], _this18.type);
             } catch (error) {
               console.error("Modifier error in do_serialize:", error.stack);
             }
@@ -1950,42 +1907,33 @@ class SpiceModel {
 
           if (!originalIsArray) {
             data = [data];
-          } // ⚡ OPTIMIZED: Use cached defaults metadata instead of computing every time
-
-
-          var {
-            staticDefaults,
-            dynamicDefaults,
-            hasDefaults
-          } = _this18.getDefaultsMetadata(type);
-
-          if (hasDefaults) {
-            data = data.map(item => {
-              // Apply static defaults first (fast - no function calls)
-              var result = _.defaults({}, item, staticDefaults); // Only compute dynamic defaults if there are any
-
-
-              for (var {
-                key,
-                fn
-              } of dynamicDefaults) {
-                if (result[key] === undefined) {
-                  result[key] = fn({
-                    old_data: data,
-                    new_data: old_data
-                  });
-                }
-              }
+          } // Compute the defaults from properties using reduce.
 
-              return result;
-            });
-          } // If type is "read", clean the data by omitting certain props.
 
+          var defaults = Object.keys(_this18.props).reduce((acc, key) => {
+            var _this18$props$key, _this18$props$key$def;
+
+            var def = (_this18$props$key = _this18.props[key]) == null ? void 0 : (_this18$props$key$def = _this18$props$key.defaults) == null ? void 0 : _this18$props$key$def[type];
+
+            if (def !== undefined) {
+              acc[key] = _.isFunction(def) ? def({
+                old_data: data,
+                new_data: old_data
+              }) : def;
+            }
+
+            return acc;
+          }, {}); // Merge defaults into each object.
+
+          data = data.map(item => _.defaults(item, defaults)); // If type is "read", clean the data by omitting certain props.
 
           if (type === "read") {
-            // ⚡ OPTIMIZED: Use cached hidden props instead of computing every time
-            var hiddenProps = _this18.getHiddenProps(); // Combine default props to remove.
+            // Collect hidden properties from schema.
+            var hiddenProps = Object.keys(_this18.props).filter(key => {
+              var _this18$props$key2;
 
+              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];
             data = data.map(item => _.omit(item, propsToClean));
@@ -1996,7 +1944,7 @@ class SpiceModel {
         });
 
         return function doSerialize() {
-          return _ref16.apply(this, arguments);
+          return _ref19.apply(this, arguments);
         };
       }();
 
@@ -2017,6 +1965,4 @@ class SpiceModel {
 
 }
 
-exports.default = SpiceModel;
-SpiceModel._defaultsCache = {};
-SpiceModel._hiddenPropsCache = {};
+exports.default = SpiceModel;

package/package.json

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

package/src/models/SpiceModel.js

@@ -44,10 +44,6 @@ if (!Promise.allSettled) {
     );
 }
 export default class SpiceModel {
-  // ⚡ Static caches for performance optimization
-  static _defaultsCache = {};
-  static _hiddenPropsCache = {};
-
   constructor(args = {}) {
     try {
       var dbtype =
@@ -606,7 +602,10 @@ export default class SpiceModel {
   }
 
   async getMulti(args) {
-    try {
+    // ⚡ Profiling: use track() for proper async context forking
+    const p = this[_ctx]?.profiler;
+
+    const doGetMulti = async () => {
       if (!args) {
         args = {};
       }
@@ -653,6 +652,15 @@ export default class SpiceModel {
       }
 
       return results;
+    };
+
+    try {
+      if (p) {
+        return await p.track(`${this.type}.getMulti`, doGetMulti, {
+          ids_count: args?.ids?.length || 0,
+        });
+      }
+      return await doGetMulti();
     } catch (e) {
       console.warn(e.stack);
       throw e;
@@ -1379,47 +1387,6 @@ export default class SpiceModel {
     return true;
   }
 
-  // ⚡ OPTIMIZED: Cache defaults metadata per model type
-  getDefaultsMetadata(type) {
-    const cacheKey = `${this.type}::${type}`;
-
-    if (!SpiceModel._defaultsCache[cacheKey]) {
-      const staticDefaults = {};
-      const dynamicDefaults = [];
-
-      // Pre-compute once per model type
-      for (const key in this.props) {
-        const def = this.props[key]?.defaults?.[type];
-        if (def !== undefined) {
-          if (_.isFunction(def)) {
-            dynamicDefaults.push({ key, fn: def });
-          } else {
-            staticDefaults[key] = def;
-          }
-        }
-      }
-
-      SpiceModel._defaultsCache[cacheKey] = {
-        staticDefaults,
-        dynamicDefaults,
-        hasDefaults:
-          Object.keys(staticDefaults).length > 0 || dynamicDefaults.length > 0,
-      };
-    }
-
-    return SpiceModel._defaultsCache[cacheKey];
-  }
-
-  // ⚡ OPTIMIZED: Cache hidden props per model type
-  getHiddenProps() {
-    if (!SpiceModel._hiddenPropsCache[this.type]) {
-      SpiceModel._hiddenPropsCache[this.type] = Object.keys(this.props).filter(
-        (key) => this.props[key]?.hide
-      );
-    }
-    return SpiceModel._hiddenPropsCache[this.type];
-  }
-
   // Check if a field is exempt from mapping depth limits
   // Supports deep references like "group.permissions"
   isFieldExempt(source_property) {
@@ -1445,6 +1412,9 @@ export default class SpiceModel {
   }
 
   async mapToObject(data, Class, source_property, store_property, property) {
+    // ⚡ Get profiler for proper async context forking
+    const p = this[_ctx]?.profiler;
+
     let original_is_array = _.isArray(data);
     if (!original_is_array) {
       data = Array.of(data);
@@ -1469,21 +1439,36 @@ export default class SpiceModel {
           `${this[_current_path]}.${source_property}`
         : source_property;
 
-      var returned_all = await Promise.allSettled(
-        _.map(classes, (obj) => {
-          return 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],
-            _current_path: childPath,
-          }).getMulti({
-            skip_hooks: true,
-            ids: ids,
-          });
-        })
-      );
+      // ⚡ Wrap in profiler track() to ensure proper async context for child operations
+      const fetchRelated = async () => {
+        return await Promise.allSettled(
+          _.map(classes, (obj) => {
+            return 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],
+              _current_path: childPath,
+            }).getMulti({
+              skip_hooks: true,
+              ids: ids,
+            });
+          })
+        );
+      };
+
+      var returned_all;
+      if (p && ids.length > 0) {
+        returned_all = await p.track(
+          `${this.type}.map.${source_property}`,
+          fetchRelated,
+          { ids_count: ids.length }
+        );
+      } else {
+        returned_all = await fetchRelated();
+      }
+
       let ug = _.flatten(
         _.compact(
           _.map(returned_all, (returned_obj) => {
@@ -1511,6 +1496,9 @@ export default class SpiceModel {
     store_property,
     property
   ) {
+    // ⚡ Get profiler for proper async context forking
+    const p = this[_ctx]?.profiler;
+
     let original_is_array = _.isArray(data);
     if (!original_is_array) {
       data = Array.of(data);
@@ -1540,21 +1528,36 @@ export default class SpiceModel {
         : source_property;
 
       let classes = _.compact(_.isArray(Class) ? Class : [Class]);
-      var returned_all = await Promise.allSettled(
-        _.map(classes, (obj) => {
-          return 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],
-            _current_path: childPath,
-          }).getMulti({
-            skip_hooks: true,
-            ids: ids,
-          });
-        })
-      );
+
+      // ⚡ Wrap in profiler track() to ensure proper async context for child operations
+      const fetchRelated = async () => {
+        return await Promise.allSettled(
+          _.map(classes, (obj) => {
+            return 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],
+              _current_path: childPath,
+            }).getMulti({
+              skip_hooks: true,
+              ids: ids,
+            });
+          })
+        );
+      };
+
+      var returned_all;
+      if (p && ids.length > 0) {
+        returned_all = await p.track(
+          `${this.type}.mapArray.${source_property}`,
+          fetchRelated,
+          { ids_count: ids.length }
+        );
+      } else {
+        returned_all = await fetchRelated();
+      }
 
       var returned_objects = _.flatten(
         _.compact(
@@ -1564,9 +1567,6 @@ export default class SpiceModel {
         )
       );
 
-      /* let returned_objects = await new Class().getMulti({
-      ids: ids,
-    }); */
       _.each(data, (result) => {
         if (_.isString(result[store_property])) {
           result[store_property] = [result[store_property]];
@@ -1589,14 +1589,9 @@ export default class SpiceModel {
     return original_is_array ? data : data[0];
   }
 
-  addModifier({ when, execute, field = null, sourceField = null }) {
+  addModifier({ when, execute }) {
     if (this[_serializers][when]) {
-      // Store as object with field info for column-based filtering
-      this[_serializers][when]["modifiers"].push({
-        execute,
-        field,
-        sourceField,
-      });
+      this[_serializers][when]["modifiers"].push(execute);
     }
   }
 
@@ -1617,14 +1612,11 @@ export default class SpiceModel {
       if (properties[i].map) {
         switch (properties[i].map.type) {
           case MapType.MODEL: {
-            const destinationField = properties[i].map.destination || i;
             switch (properties[i].type) {
               case String:
               case "string": {
                 this.addModifier({
                   when: properties[i].map.when || "read",
-                  field: destinationField, // ⚡ Track which field this modifier populates
-                  sourceField: i, // ⚡ Track source property for column filtering
                   execute: async (data) => {
                     return await this.mapToObject(
                       data,
@@ -1632,7 +1624,7 @@ export default class SpiceModel {
                         spice.models[properties[i].map.reference]
                       : properties[i].map.reference,
                       i,
-                      destinationField,
+                      properties[i].map.destination || i,
                       properties[i]
                     );
                   },
@@ -1643,8 +1635,6 @@ export default class SpiceModel {
               case "array": {
                 this.addModifier({
                   when: properties[i].map.when || "read",
-                  field: destinationField, // ⚡ Track which field this modifier populates
-                  sourceField: i, // ⚡ Track source property for column filtering
                   execute: async (data) => {
                     return await this.mapToObjectArray(
                       data,
@@ -1652,7 +1642,7 @@ export default class SpiceModel {
                         spice.models[properties[i].map.reference]
                       : properties[i].map.reference,
                       i,
-                      destinationField,
+                      properties[i].map.destination || i,
                       properties[i]
                     );
                   },
@@ -1670,41 +1660,6 @@ export default class SpiceModel {
     }
   }
 
-  // ⚡ Parse columns string into a Set for fast lookup
-  parseRequestedColumns(columns) {
-    if (!columns || columns === "") return null;
-
-    // Handle array of columns (convert to string)
-    if (Array.isArray(columns)) {
-      columns = columns.join(",");
-    }
-
-    // Must be a string to parse
-    if (typeof columns !== "string") return null;
-    // Extract field names from column specifications
-    // Handles: "field", "`field`", "table.field", "`table`.`field`", "expr AS alias"
-    const fields = new Set();
-    const columnList = columns.split(",").map((c) => c.trim());
-
-    for (const col of columnList) {
-      // Check for AS alias
-      const aliasMatch = col.match(/\s+AS\s+`?([\w]+)`?$/i);
-      if (aliasMatch) {
-        fields.add(aliasMatch[1]);
-        continue;
-      }
-
-      // Get the last part after dots (the field name)
-      const parts = col.replace(/`/g, "").split(".");
-      const fieldName = parts[parts.length - 1];
-      if (fieldName && fieldName !== "*") {
-        fields.add(fieldName);
-      }
-    }
-
-    return fields.size > 0 ? fields : null;
-  }
-
   async do_serialize(data, type, old_data, args, path_to_be_removed = []) {
     // Profiling: use track() for proper async context forking
     const p = this[_ctx]?.profiler;
@@ -1721,33 +1676,11 @@ export default class SpiceModel {
         this[_external_modifier_loaded] = true;
       }
 
-      // ⚡ OPTIMIZED: Parse requested columns for selective modifier execution
-      const requestedColumns = this.parseRequestedColumns(args?.columns);
-
       // Cache the modifiers lookup for the specified type.
       const modifiers = this[_serializers]?.[type]?.modifiers || [];
-
-      // Run modifiers serially
       for (const modifier of modifiers) {
-        // Skip field-specific modifiers if columns specified and field is not requested
-        if (
-          requestedColumns &&
-          modifier.field &&
-          !requestedColumns.has(modifier.field) &&
-          !(modifier.sourceField && requestedColumns.has(modifier.sourceField))
-        ) {
-          continue;
-        }
-
         try {
-          // Handle both function modifiers and object modifiers with .execute
-          const executeFn =
-            typeof modifier === "function" ? modifier : modifier.execute;
-          const result = await executeFn(data, old_data, this[_ctx], this.type);
-          // Only assign if modifier returned a value to prevent data corruption
-          if (result !== undefined) {
-            data = result;
-          }
+          data = await modifier(data, old_data, this[_ctx], this.type);
         } catch (error) {
           console.error("Modifier error in do_serialize:", error.stack);
         }
@@ -1759,30 +1692,27 @@ export default class SpiceModel {
         data = [data];
       }
 
-      // ⚡ OPTIMIZED: Use cached defaults metadata instead of computing every time
-      const { staticDefaults, dynamicDefaults, hasDefaults } =
-        this.getDefaultsMetadata(type);
-
-      if (hasDefaults) {
-        data = data.map((item) => {
-          // Apply static defaults first (fast - no function calls)
-          const result = _.defaults({}, item, staticDefaults);
-
-          // Only compute dynamic defaults if there are any
-          for (const { key, fn } of dynamicDefaults) {
-            if (result[key] === undefined) {
-              result[key] = fn({ old_data: data, new_data: old_data });
-            }
-          }
+      // Compute the defaults from properties using reduce.
+      const defaults = Object.keys(this.props).reduce((acc, key) => {
+        const def = this.props[key]?.defaults?.[type];
+        if (def !== undefined) {
+          acc[key] =
+            _.isFunction(def) ?
+              def({ old_data: data, new_data: old_data })
+            : def;
+        }
+        return acc;
+      }, {});
 
-          return result;
-        });
-      }
+      // Merge defaults into each object.
+      data = data.map((item) => _.defaults(item, defaults));
 
       // If type is "read", clean the data by omitting certain props.
       if (type === "read") {
-        // ⚡ OPTIMIZED: Use cached hidden props instead of computing every time
-        const hiddenProps = this.getHiddenProps();
+        // Collect hidden properties from schema.
+        const hiddenProps = Object.keys(this.props).filter(
+          (key) => this.props[key]?.hide
+        );
         // Combine default props to remove.
         const propsToClean = [
           "deleted",