spice-js 2.7.29 → 2.7.31

package/build/models/SpiceModel.js

@@ -7,9 +7,9 @@ var _ResourceLifecycleTriggered = _interopRequireDefault(require("../events/even
 var _Security = require("../utility/Security");
 var _fix = require("../utility/fix");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) { ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } } return n; }, _extends.apply(null, arguments); }
 function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
 function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
-function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) { ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } } return n; }, _extends.apply(null, arguments); }
 var co = require("co");
 var regeneratorRuntime = require("regenerator-runtime");
 var SDate = require("sonover-date"),
@@ -27,11 +27,76 @@ var SDate = require("sonover-date"),
   _serializers = Symbol(),
   _level = Symbol(),
   _mapping_dept = Symbol(),
+  _mapping_dept_scalar = Symbol(),
+  _mapping_dept_array = Symbol(),
+  _mapping_concurrency = Symbol(),
+  _skip_mapped_serialization = Symbol(),
   _mapping_dept_exempt = Symbol(),
   _current_path = Symbol();
-
-//const _type = Symbol("type");
-
+var GLOBAL_MAPPING_CONCURRENCY = Math.max(1, Number(process.env.SPICE_MAPPING_GLOBAL_CONCURRENCY) || 32);
+var activeGlobalMappings = 0;
+var globalMappingWaiters = [];
+function normalizeConcurrency(value, fallback) {
+  if (fallback === void 0) {
+    fallback = 1;
+  }
+  var parsed = Number(value);
+  return Number.isFinite(parsed) && parsed > 0 ? Math.floor(parsed) : fallback;
+}
+function acquireGlobalMappingSlot() {
+  return _acquireGlobalMappingSlot.apply(this, arguments);
+}
+function _acquireGlobalMappingSlot() {
+  _acquireGlobalMappingSlot = _asyncToGenerator(function* () {
+    var queuedAt = process.hrtime.bigint();
+    if (activeGlobalMappings < GLOBAL_MAPPING_CONCURRENCY) {
+      activeGlobalMappings += 1;
+    } else {
+      yield new Promise(resolve => globalMappingWaiters.push(resolve));
+    }
+    return {
+      active: activeGlobalMappings,
+      waitMs: Number(process.hrtime.bigint() - queuedAt) / 1e6,
+      release() {
+        var next = globalMappingWaiters.shift();
+        if (next) {
+          next();
+        } else {
+          activeGlobalMappings -= 1;
+        }
+      }
+    };
+  });
+  return _acquireGlobalMappingSlot.apply(this, arguments);
+}
+function runWithConcurrency(_x, _x2, _x3) {
+  return _runWithConcurrency.apply(this, arguments);
+} //const _type = Symbol("type");
+function _runWithConcurrency() {
+  _runWithConcurrency = _asyncToGenerator(function* (items, concurrency, worker) {
+    var results = new Array(items.length);
+    var nextIndex = 0;
+    function runWorker() {
+      return _runWorker.apply(this, arguments);
+    }
+    function _runWorker() {
+      _runWorker = _asyncToGenerator(function* () {
+        while (nextIndex < items.length) {
+          var index = nextIndex;
+          nextIndex += 1;
+          results[index] = yield worker(items[index], index);
+        }
+      });
+      return _runWorker.apply(this, arguments);
+    }
+    var workerCount = Math.min(concurrency, items.length);
+    yield Promise.all(Array.from({
+      length: workerCount
+    }, () => runWorker()));
+    return results;
+  });
+  return _runWithConcurrency.apply(this, arguments);
+}
 var that;
 if (!Promise.allSettled) {
   Promise.allSettled = promises => Promise.all(promises.map((promise, i) => promise.then(value => ({
@@ -48,21 +113,29 @@ class SpiceModel {
       args = {};
     }
     try {
-      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 _args2, _modelArgs$ctx, _modelArgs$ctx$state, _ref, _ref2, _modelArgs$mapping_de, _ref3, _ref4, _modelArgs$mapping_de2, _modelArgs$mapping_co, _ref5, _modelArgs$skip_mappe, _args$args, _args3, _args3$args, _args4, _args4$args, _args5, _args5$args, _args6, _args6$args, _args7, _args7$args;
+      var modelArgs = ((_args2 = args) == null ? void 0 : _args2.args) || {};
+      var requestProfile = (modelArgs == null ? void 0 : (_modelArgs$ctx = modelArgs.ctx) == null ? void 0 : (_modelArgs$ctx$state = _modelArgs$ctx.state) == null ? void 0 : _modelArgs$ctx$state.read_profile) || {};
+      var defaultMappingDept = process.env.MAPPING_DEPT || 3;
+      var legacyMappingDept = modelArgs.mapping_dept !== undefined && modelArgs.mapping_dept !== null ? modelArgs.mapping_dept : undefined;
       var dbtype = spice.config.database.connections[args.connection].type || "couchbase";
       var Database = require("spice-" + dbtype);
-      this[_mapping_dept] = ((_args2 = args) == null ? void 0 : (_args2$args = _args2.args) == null ? void 0 : _args2$args.mapping_dept) || process.env.MAPPING_DEPT || 3;
-      this[_mapping_dept_exempt] = ((_args3 = args) == null ? void 0 : (_args3$args = _args3.args) == null ? void 0 : _args3$args.mapping_dept_exempt) || [];
+      this[_mapping_dept] = legacyMappingDept != null ? legacyMappingDept : defaultMappingDept;
+      this[_mapping_dept_scalar] = (_ref = (_ref2 = (_modelArgs$mapping_de = modelArgs.mapping_dept_scalar) != null ? _modelArgs$mapping_de : legacyMappingDept) != null ? _ref2 : requestProfile.mapping_dept_scalar) != null ? _ref : defaultMappingDept;
+      this[_mapping_dept_array] = (_ref3 = (_ref4 = (_modelArgs$mapping_de2 = modelArgs.mapping_dept_array) != null ? _modelArgs$mapping_de2 : legacyMappingDept) != null ? _ref4 : requestProfile.mapping_dept_array) != null ? _ref3 : defaultMappingDept;
+      this[_mapping_concurrency] = normalizeConcurrency((_modelArgs$mapping_co = modelArgs.mapping_concurrency) != null ? _modelArgs$mapping_co : requestProfile.mapping_concurrency);
+      this[_skip_mapped_serialization] = (_ref5 = (_modelArgs$skip_mappe = modelArgs.skip_mapped_serialization) != null ? _modelArgs$skip_mappe : requestProfile.skip_mapped_serialization) != null ? _ref5 : false;
+      this[_mapping_dept_exempt] = modelArgs.mapping_dept_exempt || [];
       this.type = "";
       this.collection = args.connection;
       this[_args] = args.args;
       this[_external_modifier_loaded] = false;
       this[_disable_lifecycle_events] = ((_args$args = args.args) == null ? void 0 : _args$args.disable_lifecycle_events) || false;
-      this[_ctx] = (_args4 = args) == null ? void 0 : (_args4$args = _args4.args) == null ? void 0 : _args4$args.ctx;
-      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[_ctx] = (_args3 = args) == null ? void 0 : (_args3$args = _args3.args) == null ? void 0 : _args3$args.ctx;
+      this[_skip_cache] = ((_args4 = args) == null ? void 0 : (_args4$args = _args4.args) == null ? void 0 : _args4$args.skip_cache) || false;
+      this[_level] = ((_args5 = args) == null ? void 0 : (_args5$args = _args5.args) == null ? void 0 : _args5$args._level) || 0;
+      this[_current_path] = ((_args6 = args) == null ? void 0 : (_args6$args = _args6.args) == null ? void 0 : _args6$args._current_path) || "";
+      this[_columns] = ((_args7 = args) == null ? void 0 : (_args7$args = _args7.args) == null ? void 0 : _args7$args._columns) || "";
       this[_hooks] = {
         create: {
           before: [],
@@ -209,6 +282,32 @@ class SpiceModel {
     }
     // }
   }
+  applyMappingDepthArgs(args) {
+    if (args === void 0) {
+      args = {};
+    }
+    var hasLegacyDepth = args.mapping_dept !== undefined && args.mapping_dept !== null;
+    if (hasLegacyDepth) {
+      this[_mapping_dept] = args.mapping_dept;
+      this[_mapping_dept_scalar] = args.mapping_dept;
+      this[_mapping_dept_array] = args.mapping_dept;
+    }
+    if (args.mapping_dept_scalar !== undefined && args.mapping_dept_scalar !== null) {
+      this[_mapping_dept_scalar] = args.mapping_dept_scalar;
+    }
+    if (args.mapping_dept_array !== undefined && args.mapping_dept_array !== null) {
+      this[_mapping_dept_array] = args.mapping_dept_array;
+    }
+    if (args.skip_mapped_serialization !== undefined) {
+      this[_skip_mapped_serialization] = args.skip_mapped_serialization;
+    }
+    if (args.mapping_concurrency !== undefined) {
+      this[_mapping_concurrency] = normalizeConcurrency(args.mapping_concurrency, this[_mapping_concurrency]);
+    }
+    if (args.mapping_dept_exempt) {
+      this[_mapping_dept_exempt] = args.mapping_dept_exempt;
+    }
+  }
   get database() {
     return this[_database];
   }
@@ -250,13 +349,13 @@ class SpiceModel {
       return [];
     })();
   }
-  createValidationString(_ref) {
+  createValidationString(_ref6) {
     var {
       property_name,
       props,
       operation,
       complete
-    } = _ref;
+    } = _ref6;
     var operationExempt = {
       PUT: ["required", "unique"]
     };
@@ -487,14 +586,13 @@ class SpiceModel {
       // Profiling: use track() for proper async context forking
       var p = (_this4$_ctx = _this4[_ctx]) == null ? void 0 : _this4$_ctx.profiler;
       var doGet = /*#__PURE__*/function () {
-        var _ref2 = _asyncToGenerator(function* () {
-          if (args.mapping_dept) _this4[_mapping_dept] = args.mapping_dept;
-          if (args.mapping_dept_exempt) _this4[_mapping_dept_exempt] = args.mapping_dept_exempt;
+        var _ref7 = _asyncToGenerator(function* () {
           if (!args) {
             args = {};
           }
+          _this4.applyMappingDepthArgs(args);
           if (_.isString(args.id)) {
-            var _args9, _results, _results2, _results3, _results4, _results5, _results6;
+            var _args8, _results, _results2, _results3, _results4, _results5, _results6;
             if (args.skip_hooks !== true) {
               yield _this4.run_hook(args, "get", "before");
             }
@@ -514,7 +612,7 @@ class SpiceModel {
             var originalColumns = args.columns;
 
             // Extract nestings from columns if specified
-            var nestings = _this4.extractNestings(((_args9 = args) == null ? void 0 : _args9.columns) || "", _this4.type);
+            var nestings = _this4.extractNestings(((_args8 = args) == null ? void 0 : _args8.columns) || "", _this4.type);
 
             // Build join metadata and prepare columns
             _this4.buildJoinMetadata(nestings, args);
@@ -597,14 +695,14 @@ class SpiceModel {
           }
         });
         return function doGet() {
-          return _ref2.apply(this, arguments);
+          return _ref7.apply(this, arguments);
         };
       }();
       try {
         if (p) {
-          var _args0;
+          var _args9;
           return yield p.track(_this4.type + ".get", doGet, {
-            id: (_args0 = args) == null ? void 0 : _args0.id
+            id: (_args9 = args) == null ? void 0 : _args9.id
           });
         }
         return yield doGet();
@@ -632,14 +730,15 @@ class SpiceModel {
       // ⚡ 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* () {
+        var _ref0 = _asyncToGenerator(function* () {
           if (!args) {
             args = {};
           }
+          _this6.applyMappingDepthArgs(args);
           if (args.skip_hooks != true) {
             yield _this6.run_hook(_this6, "list", "before");
           }
-          _.remove(args.ids, o => o == undefined);
+          args.ids = _.uniq(_.filter(args.ids || [], id => _.isString(id) && id.length > 0));
           var key = "multi-get::" + _this6.type + "::" + _.join(args.ids, "|") + ":" + args.columns;
           var results = [];
           if (args.ids.length > 0) {
@@ -673,14 +772,14 @@ class SpiceModel {
           return results;
         });
         return function doGetMulti() {
-          return _ref5.apply(this, arguments);
+          return _ref0.apply(this, arguments);
         };
       }();
       try {
         if (p) {
-          var _args1, _args1$ids;
+          var _args0, _args0$ids;
           return yield p.track(_this6.type + ".getMulti", doGetMulti, {
-            ids_count: ((_args1 = args) == null ? void 0 : (_args1$ids = _args1.ids) == null ? void 0 : _args1$ids.length) || 0
+            ids_count: ((_args0 = args) == null ? void 0 : (_args0$ids = _args0.ids) == null ? void 0 : _args0$ids.length) || 0
           });
         }
         return yield doGetMulti();
@@ -729,7 +828,7 @@ class SpiceModel {
       // Profiling: use track() for proper async context forking
       var p = (_this8$_ctx = _this8[_ctx]) == null ? void 0 : _this8$_ctx.profiler;
       var doUpdate = /*#__PURE__*/function () {
-        var _ref6 = _asyncToGenerator(function* () {
+        var _ref1 = _asyncToGenerator(function* () {
           _this8.updated_at = new SDate().now();
           var results = yield _this8.database.get(args.id);
           var item_exist = yield _this8.exist(results);
@@ -773,7 +872,7 @@ class SpiceModel {
           });
         });
         return function doUpdate() {
-          return _ref6.apply(this, arguments);
+          return _ref1.apply(this, arguments);
         };
       }();
       try {
@@ -799,7 +898,7 @@ class SpiceModel {
       // Profiling: use track() for proper async context forking
       var p = (_this9$_ctx = _this9[_ctx]) == null ? void 0 : _this9$_ctx.profiler;
       var doCreate = /*#__PURE__*/function () {
-        var _ref8 = _asyncToGenerator(function* () {
+        var _ref11 = _asyncToGenerator(function* () {
           var form;
           _this9.created_at = new SDate().now();
           args = _.defaults(args, {
@@ -845,7 +944,7 @@ class SpiceModel {
           });
         });
         return function doCreate() {
-          return _ref8.apply(this, arguments);
+          return _ref11.apply(this, arguments);
         };
       }();
       try {
@@ -883,7 +982,7 @@ class SpiceModel {
       // Profiling: use track() for proper async context forking
       var p = (_this1$_ctx = _this1[_ctx]) == null ? void 0 : _this1$_ctx.profiler;
       var doDelete = /*#__PURE__*/function () {
-        var _ref0 = _asyncToGenerator(function* () {
+        var _ref13 = _asyncToGenerator(function* () {
           var item_exist = yield _this1.exist(args.id);
           if (!item_exist) {
             throw new Error(_this1.type + " does not exist.");
@@ -894,7 +993,7 @@ class SpiceModel {
           }
           var delete_response = {};
           var dbOperation = /*#__PURE__*/function () {
-            var _ref1 = _asyncToGenerator(function* () {
+            var _ref14 = _asyncToGenerator(function* () {
               if (args.hard) {
                 delete_response = yield _this1.database.delete(args.id);
                 _this1.setMonitor();
@@ -905,7 +1004,7 @@ class SpiceModel {
               }
             });
             return function dbOperation() {
-              return _ref1.apply(this, arguments);
+              return _ref14.apply(this, arguments);
             };
           }();
           if (p) {
@@ -921,7 +1020,7 @@ class SpiceModel {
           return {};
         });
         return function doDelete() {
-          return _ref0.apply(this, arguments);
+          return _ref13.apply(this, arguments);
         };
       }();
       try {
@@ -1111,12 +1210,12 @@ class SpiceModel {
   }
   createJoinSection(mappedNestings) {
     if (!mappedNestings || mappedNestings.length === 0) return "";
-    return mappedNestings.map(_ref10 => {
+    return mappedNestings.map(_ref15 => {
       var {
         alias,
         reference,
         is_array
-      } = _ref10;
+      } = _ref15;
       var keyspace = (0, _fix.fixCollection)(reference);
       if (is_array === true) {
         return "LEFT NEST `" + keyspace + "` AS `" + alias + "` ON KEYS `" + this.type + "`.`" + alias + "`";
@@ -1261,10 +1360,9 @@ class SpiceModel {
       // Profiling: use track() for proper async context forking
       var p = (_this10$_ctx = _this10[_ctx]) == null ? void 0 : _this10$_ctx.profiler;
       var doList = /*#__PURE__*/function () {
-        var _ref11 = _asyncToGenerator(function* () {
-          var _args10, _args11;
-          if (args.mapping_dept) _this10[_mapping_dept] = args.mapping_dept;
-          if (args.mapping_dept_exempt) _this10[_mapping_dept_exempt] = args.mapping_dept_exempt;
+        var _ref16 = _asyncToGenerator(function* () {
+          var _args1, _args10;
+          _this10.applyMappingDepthArgs(args);
 
           // Filter out id, meta().id, and any column ending with .id (e.g., dependents.id)
           if (args.columns) {
@@ -1278,9 +1376,9 @@ class SpiceModel {
           var originalColumns = args.columns;
 
           // Find alias tokens from query/columns/sort
-          var nestings = [..._this10.extractNestings(((_args10 = args) == null ? void 0 : _args10.query) || "", _this10.type),
+          var nestings = [..._this10.extractNestings(((_args1 = args) == null ? void 0 : _args1.query) || "", _this10.type),
           //...this.extractNestings(args?.columns || "", this.type),
-          ..._this10.extractNestings(((_args11 = args) == null ? void 0 : _args11.sort) || "", _this10.type)];
+          ..._this10.extractNestings(((_args10 = args) == null ? void 0 : _args10.sort) || "", _this10.type)];
 
           // Build join metadata and prepare columns
           var {
@@ -1341,15 +1439,15 @@ class SpiceModel {
           return results;
         });
         return function doList() {
-          return _ref11.apply(this, arguments);
+          return _ref16.apply(this, arguments);
         };
       }();
       try {
         if (p) {
-          var _args12, _args13;
+          var _args11, _args12;
           return yield p.track(_this10.type + ".list", doList, {
-            limit: (_args12 = args) == null ? void 0 : _args12.limit,
-            offset: (_args13 = args) == null ? void 0 : _args13.offset
+            limit: (_args11 = args) == null ? void 0 : _args11.limit,
+            offset: (_args12 = args) == null ? void 0 : _args12.offset
           });
         }
         return yield doList();
@@ -1395,8 +1493,9 @@ class SpiceModel {
       // Profiling: use track() for proper async context forking
       var p = (_this11$_ctx = _this11[_ctx]) == null ? void 0 : _this11$_ctx.profiler;
       var doFetch = /*#__PURE__*/function () {
-        var _ref12 = _asyncToGenerator(function* () {
+        var _ref17 = _asyncToGenerator(function* () {
           if (args.is_custom_query === "true" && args.ids.length > 0) {
+            console.log("Fetching results from database", _this11.type, args, query, mappedNestings);
             return yield _this11.database.query(query);
           } else if (args.is_full_text === "true") {
             return yield _this11.database.full_text_search(_this11.type, query || "", args.limit, args.offset, args._join);
@@ -1407,7 +1506,7 @@ class SpiceModel {
           }
         });
         return function doFetch() {
-          return _ref12.apply(this, arguments);
+          return _ref17.apply(this, arguments);
         };
       }();
       if (p) {
@@ -1416,12 +1515,12 @@ class SpiceModel {
       return yield doFetch();
     })();
   }
-  addHook(_ref13) {
+  addHook(_ref18) {
     var {
       operation,
       when,
       execute
-    } = _ref13;
+    } = _ref18;
     this[_hooks][operation][when].push(execute);
   }
   run_hook(data, op, when, old_data) {
@@ -1519,7 +1618,8 @@ class SpiceModel {
         data = Array.of(data);
       }
       var isExempt = _this13.isFieldExempt(source_property);
-      if (isExempt || _this13[_level] + 1 < _this13[_mapping_dept]) {
+      var activeMappingDept = type === "read" ? _this13[_mapping_dept_scalar] : _this13[_mapping_dept];
+      if (isExempt || _this13[_level] + 1 < activeMappingDept) {
         var classes = _.compact(_.isArray(Class) ? Class : [Class]);
         var ids = [];
         _.each(data, result => {
@@ -1543,12 +1643,16 @@ class SpiceModel {
 
         // ⚡ Wrap in profiler track() to ensure proper async context for child operations
         var fetchRelated = /*#__PURE__*/function () {
-          var _ref14 = _asyncToGenerator(function* () {
+          var _ref19 = _asyncToGenerator(function* () {
             return yield Promise.allSettled(_.map(classes, obj => {
               var objInstance = new obj(_extends({}, _this13[_args], {
                 skip_cache: _this13[_skip_cache],
                 _level: _this13[_level] + 1,
                 mapping_dept: _this13[_mapping_dept],
+                mapping_dept_scalar: _this13[_mapping_dept_scalar],
+                mapping_dept_array: _this13[_mapping_dept_array],
+                mapping_concurrency: _this13[_mapping_concurrency],
+                skip_mapped_serialization: _this13[_skip_mapped_serialization],
                 mapping_dept_exempt: _this13[_mapping_dept_exempt],
                 _columns: columnArray.join(","),
                 _current_path: childPath
@@ -1556,12 +1660,13 @@ class SpiceModel {
               return objInstance.getMulti({
                 skip_hooks: true,
                 ids: ids,
-                columns: columnArray
+                columns: columnArray,
+                skip_read_serialize: _this13[_skip_mapped_serialization]
               });
             }));
           });
           return function fetchRelated() {
-            return _ref14.apply(this, arguments);
+            return _ref19.apply(this, arguments);
           };
         }();
         var returned_all;
@@ -1628,7 +1733,8 @@ class SpiceModel {
         data = Array.of(data);
       }
       var isExempt = _this14.isFieldExempt(source_property);
-      if (isExempt || _this14[_level] + 1 < _this14[_mapping_dept]) {
+      var activeMappingDept = type === "read" ? _this14[_mapping_dept_array] : _this14[_mapping_dept];
+      if (isExempt || _this14[_level] + 1 < activeMappingDept) {
         var ids = [];
         _.each(data, result => {
           var value = result[source_property];
@@ -1661,24 +1767,29 @@ class SpiceModel {
 
         // ⚡ Wrap in profiler track() to ensure proper async context for child operations
         var fetchRelated = /*#__PURE__*/function () {
-          var _ref15 = _asyncToGenerator(function* () {
+          var _ref20 = _asyncToGenerator(function* () {
             return yield Promise.allSettled(_.map(classes, obj => {
               return new obj(_extends({}, _this14[_args], {
                 skip_cache: _this14[_skip_cache],
                 _level: _this14[_level] + 1,
                 mapping_dept: _this14[_mapping_dept],
+                mapping_dept_scalar: _this14[_mapping_dept_scalar],
+                mapping_dept_array: _this14[_mapping_dept_array],
+                mapping_concurrency: _this14[_mapping_concurrency],
+                skip_mapped_serialization: _this14[_skip_mapped_serialization],
                 mapping_dept_exempt: _this14[_mapping_dept_exempt],
                 _columns: columnArray.join(","),
                 _current_path: childPath
               })).getMulti({
                 skip_hooks: true,
                 ids: ids,
-                columns: columnArray
+                columns: columnArray,
+                skip_read_serialize: _this14[_skip_mapped_serialization]
               });
             }));
           });
           return function fetchRelated() {
-            return _ref15.apply(this, arguments);
+            return _ref20.apply(this, arguments);
           };
         }();
         var returned_all;
@@ -1726,12 +1837,22 @@ class SpiceModel {
       return original_is_array ? data : data[0];
     })();
   }
-  addModifier(_ref16) {
+  addModifier(_ref21) {
     var {
       when,
-      execute
-    } = _ref16;
+      execute,
+      kind,
+      source_property,
+      store_property
+    } = _ref21;
     if (this[_serializers][when]) {
+      if (kind) {
+        execute.spiceModifier = {
+          kind,
+          source_property,
+          store_property
+        };
+      }
       this[_serializers][when]["modifiers"].push(execute);
     }
   }
@@ -1799,15 +1920,18 @@ class SpiceModel {
                   {
                     _this15.addModifier({
                       when: properties[i].map.when || "read",
+                      kind: "relationship_map",
+                      source_property: i,
+                      store_property: properties[i].map.destination || i,
                       execute: function () {
-                        var _execute = _asyncToGenerator(function* (data, old_data, ctx, type, args, mapping_dept, level, columns) {
+                        var _execute = _asyncToGenerator(function* (data, old_data, ctx, type, args, mapping_dept, level, columns, serializationType) {
                           // Skip if columns are specified but this field isn't included
                           if (!_this15.isFieldInColumns(i, columns)) {
                             return data;
                           }
-                          return yield _this15.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);
+                          return yield _this15.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, serializationType, mapping_dept, level, columns);
                         });
-                        function execute(_x, _x2, _x3, _x4, _x5, _x6, _x7, _x8) {
+                        function execute(_x4, _x5, _x6, _x7, _x8, _x9, _x0, _x1, _x10) {
                           return _execute.apply(this, arguments);
                         }
                         return execute;
@@ -1820,15 +1944,18 @@ class SpiceModel {
                   {
                     _this15.addModifier({
                       when: properties[i].map.when || "read",
+                      kind: "relationship_map",
+                      source_property: i,
+                      store_property: properties[i].map.destination || i,
                       execute: function () {
-                        var _execute2 = _asyncToGenerator(function* (data, old_data, ctx, type, args, mapping_dept, level, columns) {
+                        var _execute2 = _asyncToGenerator(function* (data, old_data, ctx, type, args, mapping_dept, level, columns, serializationType) {
                           // Skip if columns are specified but this field isn't included
                           if (!_this15.isFieldInColumns(i, columns)) {
                             return data;
                           }
-                          return yield _this15.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);
+                          return yield _this15.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, serializationType, mapping_dept, level, columns);
                         });
-                        function execute(_x9, _x0, _x1, _x10, _x11, _x12, _x13, _x14) {
+                        function execute(_x11, _x12, _x13, _x14, _x15, _x16, _x17, _x18, _x19) {
                           return _execute2.apply(this, arguments);
                         }
                         return execute;
@@ -1860,7 +1987,7 @@ class SpiceModel {
       // Profiling: use track() for proper async context forking
       var p = (_this16$_ctx = _this16[_ctx]) == null ? void 0 : _this16$_ctx.profiler;
       var doSerialize = /*#__PURE__*/function () {
-        var _ref17 = _asyncToGenerator(function* () {
+        var _ref22 = _asyncToGenerator(function* () {
           var _this16$_serializers, _this16$_serializers$;
           // Early exit if serialization should not run.
           if (!_this16.shouldSerializerRun(args, type)) {
@@ -1875,19 +2002,117 @@ class SpiceModel {
 
           // Cache the modifiers lookup for the specified type.
           var modifiers = ((_this16$_serializers = _this16[_serializers]) == null ? void 0 : (_this16$_serializers$ = _this16$_serializers[type]) == null ? void 0 : _this16$_serializers$.modifiers) || [];
-          for (var i = 0; i < modifiers.length; i++) {
-            var modifier = modifiers[i];
-            try {
-              var result = yield modifier(data, old_data, _this16[_ctx], _this16.type, args, _this16[_mapping_dept], _this16[_level], _this16[_columns]);
-              // Guard against modifiers that return undefined
-              if (result !== undefined) {
-                data = result;
-              } else {
-                console.warn("Modifier #" + i + " for type=" + _this16.type + " returned undefined, keeping previous data");
+          var invokeModifier = /*#__PURE__*/function () {
+            var _ref23 = _asyncToGenerator(function* (modifier, index, inputData) {
+              try {
+                var result = yield modifier(inputData, old_data, _this16[_ctx], _this16.type, args, _this16[_mapping_dept], _this16[_level], _this16[_columns], type);
+                if (result !== undefined) {
+                  return {
+                    hasValue: true,
+                    value: result
+                  };
+                }
+                console.warn("Modifier #" + index + " for type=" + _this16.type + " returned undefined, keeping previous data");
+              } catch (error) {
+                console.error("Modifier error in do_serialize (type=" + _this16.type + ", modifier #" + index + "):", error instanceof Error ? error.stack : "Non-Error thrown: " + JSON.stringify(error));
               }
-            } catch (error) {
-              console.error("Modifier error in do_serialize (type=" + _this16.type + ", modifier #" + i + "):", error instanceof Error ? error.stack : "Non-Error thrown: " + JSON.stringify(error));
+              return {
+                hasValue: false
+              };
+            });
+            return function invokeModifier(_x20, _x21, _x22) {
+              return _ref23.apply(this, arguments);
+            };
+          }();
+          var modifierIndex = 0;
+          var _loop2 = function* _loop2() {
+            var _modifier$spiceModifi;
+            var modifier = modifiers[modifierIndex];
+            var canRunRelationshipMapsConcurrently = type === "read" && _this16[_level] === 0 && _this16[_mapping_concurrency] > 1 && (modifier == null ? void 0 : (_modifier$spiceModifi = modifier.spiceModifier) == null ? void 0 : _modifier$spiceModifi.kind) === "relationship_map";
+            if (!canRunRelationshipMapsConcurrently) {
+              var result = yield invokeModifier(modifier, modifierIndex, data);
+              if (result.hasValue) data = result.value;
+              modifierIndex += 1;
+              return "continue";
+            }
+            var group = [];
+            var destinations = new Set();
+            while (modifierIndex < modifiers.length) {
+              var candidate = modifiers[modifierIndex];
+              var metadata = candidate == null ? void 0 : candidate.spiceModifier;
+              if ((metadata == null ? void 0 : metadata.kind) !== "relationship_map") break;
+              if (metadata.store_property && destinations.has(metadata.store_property)) {
+                break;
+              }
+              if (metadata.store_property) {
+                destinations.add(metadata.store_property);
+              }
+              group.push({
+                modifier: candidate,
+                index: modifierIndex,
+                metadata
+              });
+              modifierIndex += 1;
             }
+            var groupQueuedAt = process.hrtime.bigint();
+            var activeRequestMappings = 0;
+            var executeGroup = /*#__PURE__*/function () {
+              var _ref24 = _asyncToGenerator(function* () {
+                return yield runWithConcurrency(group, _this16[_mapping_concurrency], /*#__PURE__*/function () {
+                  var _ref25 = _asyncToGenerator(function* (entry) {
+                    var requestQueueWaitMs = Number(process.hrtime.bigint() - groupQueuedAt) / 1e6;
+                    var globalSlot = yield acquireGlobalMappingSlot();
+                    activeRequestMappings += 1;
+                    var profileMetadata = {
+                      source_property: entry.metadata.source_property,
+                      store_property: entry.metadata.store_property,
+                      request_queue_wait_ms: Math.round(requestQueueWaitMs * 100) / 100,
+                      global_queue_wait_ms: Math.round(globalSlot.waitMs * 100) / 100,
+                      active_request_mappings: activeRequestMappings,
+                      request_limit: _this16[_mapping_concurrency],
+                      active_global_mappings: globalSlot.active,
+                      global_limit: GLOBAL_MAPPING_CONCURRENCY
+                    };
+                    try {
+                      var execute = /*#__PURE__*/function () {
+                        var _ref26 = _asyncToGenerator(function* () {
+                          return yield invokeModifier(entry.modifier, entry.index, data);
+                        });
+                        return function execute() {
+                          return _ref26.apply(this, arguments);
+                        };
+                      }();
+                      if (p) {
+                        return yield p.track(_this16.type + ".map.concurrent." + entry.metadata.source_property, execute, profileMetadata);
+                      }
+                      return yield execute();
+                    } finally {
+                      activeRequestMappings -= 1;
+                      globalSlot.release();
+                    }
+                  });
+                  return function (_x23) {
+                    return _ref25.apply(this, arguments);
+                  };
+                }());
+              });
+              return function executeGroup() {
+                return _ref24.apply(this, arguments);
+              };
+            }();
+            var groupMetadata = {
+              map_count: group.length,
+              request_limit: _this16[_mapping_concurrency],
+              global_limit: GLOBAL_MAPPING_CONCURRENCY
+            };
+            var groupResults = p ? yield p.track(_this16.type + ".map.concurrent", executeGroup, groupMetadata) : yield executeGroup();
+            for (var _result of groupResults) {
+              if (_result == null ? void 0 : _result.hasValue) data = _result.value;
+            }
+          };
+          while (modifierIndex < modifiers.length) {
+            var _ret = yield* _loop2();
+            if (_ret === "continue") continue;
           }
 
           // Ensure data is always an array for consistent processing.
@@ -1928,7 +2153,7 @@ class SpiceModel {
           return originalIsArray ? data : data[0];
         });
         return function doSerialize() {
-          return _ref17.apply(this, arguments);
+          return _ref22.apply(this, arguments);
         };
       }();
       try {