spice-js 2.6.75 → 2.6.77

package/build/models/SpiceModel.js

@@ -36,7 +36,8 @@ var SDate = require("sonover-date"),
     _skip_cache = Symbol(),
     _serializers = Symbol(),
     _level = Symbol(),
-    _mapping_dept = Symbol(); //const _type = Symbol("type");
+    _mapping_dept = Symbol(),
+    _mapping_dept_exempt = Symbol(); //const _type = Symbol("type");
 
 
 var that;
@@ -59,21 +60,22 @@ class SpiceModel {
     }
 
     try {
-      var _args2, _args2$args, _args$args, _args3, _args3$args, _args4, _args4$args, _args5, _args5$args;
+      var _args2, _args2$args, _args3, _args3$args, _args$args, _args4, _args4$args, _args5, _args5$args, _args6, _args6$args;
 
       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) || 100;
+      this[_mapping_dept] = ((_args2 = args) == null ? void 0 : (_args2$args = _args2.args) == null ? void 0 : _args2$args.mapping_dept) || 2;
+      this[_mapping_dept_exempt] = ((_args3 = args) == null ? void 0 : (_args3$args = _args3.args) == null ? void 0 : _args3$args.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] = (_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[_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[_hooks] = {
         create: {
           before: [],
@@ -576,6 +578,7 @@ class SpiceModel {
       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;
 
           if (!args) {
             args = {};
@@ -668,10 +671,10 @@ class SpiceModel {
 
       try {
         if (p) {
-          var _args6;
+          var _args7;
 
           return yield p.track(_this4.type + ".get", doGet, {
-            id: (_args6 = args) == null ? void 0 : _args6.id
+            id: (_args7 = args) == null ? void 0 : _args7.id
           });
         }
 
@@ -1316,11 +1319,12 @@ class SpiceModel {
       /*#__PURE__*/
       function () {
         var _ref12 = _asyncToGenerator(function* () {
-          var _args7, _args8, _args9;
+          var _args8, _args9, _args10;
 
-          if (args.mapping_dept) _this12[_mapping_dept] = args.mapping_dept; // Find alias tokens from query/columns/sort
+          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(((_args7 = args) == null ? void 0 : _args7.query) || "", _this12.type), ..._this12.extractNestings(((_args8 = args) == null ? void 0 : _args8.columns) || "", _this12.type), ..._this12.extractNestings(((_args9 = args) == null ? void 0 : _args9.sort) || "", _this12.type)]; // Decide which aliases we can join: only when map.type===MODEL AND reference is a STRING keyspace.
+          var nestings = [..._this12.extractNestings(((_args8 = args) == null ? void 0 : _args8.query) || "", _this12.type), ..._this12.extractNestings(((_args9 = args) == null ? void 0 : _args9.columns) || "", _this12.type), ..._this12.extractNestings(((_args10 = args) == null ? void 0 : _args10.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];
@@ -1417,11 +1421,11 @@ class SpiceModel {
 
       try {
         if (p) {
-          var _args10, _args11;
+          var _args11, _args12;
 
           return yield p.track(_this12.type + ".list", doList, {
-            limit: (_args10 = args) == null ? void 0 : _args10.limit,
-            offset: (_args11 = args) == null ? void 0 : _args11.offset
+            limit: (_args11 = args) == null ? void 0 : _args11.limit,
+            offset: (_args12 = args) == null ? void 0 : _args12.offset
           });
         }
 
@@ -1589,9 +1593,9 @@ class SpiceModel {
         data = Array.of(data);
       }
 
-      _this15[_mapping_dept];
+      var isExempt = _this15[_mapping_dept_exempt].includes(source_property);
 
-      if (_this15[_level] + 1 < _this15[_mapping_dept]) {
+      if (isExempt || _this15[_level] + 1 < _this15[_mapping_dept]) {
         var classes = _.compact(_.isArray(Class) ? Class : [Class]);
 
         var ids = [];
@@ -1606,7 +1610,8 @@ class SpiceModel {
           return new obj(_extends({}, _this15[_args], {
             skip_cache: _this15[_skip_cache],
             _level: _this15[_level] + 1,
-            mapping_dept: _this15[_mapping_dept]
+            mapping_dept: _this15[_mapping_dept],
+            mapping_dept_exempt: _this15[_mapping_dept_exempt]
           })).getMulti({
             skip_hooks: true,
             ids: ids
@@ -1640,7 +1645,9 @@ class SpiceModel {
         data = Array.of(data);
       }
 
-      if (_this16[_level] + 1 < _this16[_mapping_dept]) {
+      var isExempt = _this16[_mapping_dept_exempt].includes(source_property);
+
+      if (isExempt || _this16[_level] + 1 < _this16[_mapping_dept]) {
         var ids = [];
 
         _.each(data, result => {
@@ -1665,7 +1672,8 @@ class SpiceModel {
           return new obj(_extends({}, _this16[_args], {
             skip_cache: _this16[_skip_cache],
             _level: _this16[_level] + 1,
-            mapping_dept: _this16[_mapping_dept]
+            mapping_dept: _this16[_mapping_dept],
+            mapping_dept_exempt: _this16[_mapping_dept_exempt]
           })).getMulti({
             skip_hooks: true,
             ids: ids
@@ -1870,21 +1878,84 @@ class SpiceModel {
           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) || [];
+          var modifiers = ((_this18$_serializers = _this18[_serializers]) == null ? void 0 : (_this18$_serializers$ = _this18$_serializers[type]) == null ? void 0 : _this18$_serializers$.modifiers) || []; // ⚡ OPTIMIZED: Separate field-specific modifiers (can run in parallel) from generic ones (serial)
+
+          var fieldModifiers = [];
+          var genericModifiers = [];
 
           for (var modifier of modifiers) {
-            try {
-              // ⚡ OPTIMIZED: Skip field-specific modifiers if columns specified and field not requested
-              if (requestedColumns && modifier.field && !requestedColumns.has(modifier.field)) {
-                continue; // Skip this modifier - field not in requested columns
-              } // Execute modifier (supports both old function format and new object format)
+            // Skip field-specific modifiers if columns specified and field not requested
+            if (requestedColumns && modifier.field && !requestedColumns.has(modifier.field)) {
+              continue;
+            } // Field modifiers have a .field property and .execute function - they can run in parallel
+
+
+            if (modifier.field && typeof modifier.execute === "function") {
+              fieldModifiers.push(modifier);
+            } else {
+              genericModifiers.push(modifier);
+            }
+          } // Run generic modifiers serially first (they may transform the data structure)
 
 
-              var executeFn = typeof modifier === "function" ? modifier : modifier.execute;
+          for (var _modifier of genericModifiers) {
+            try {
+              var executeFn = typeof _modifier === "function" ? _modifier : _modifier.execute;
               data = yield executeFn(data, old_data, _this18[_ctx], _this18.type);
             } catch (error) {
-              console.error("Modifier error in do_serialize:", error.stack);
+              console.error("Modifier error in do_serialize (generic):", error.stack);
             }
+          } // ⚡ OPTIMIZED: Run field-specific modifiers in PARALLEL - each populates a different field
+
+
+          if (fieldModifiers.length > 0) {
+            var _originalIsArray = Array.isArray(data);
+
+            var dataArray = _originalIsArray ? data : [data]; // Run all field modifiers in parallel
+
+            var fieldResults = yield Promise.allSettled(fieldModifiers.map(
+            /*#__PURE__*/
+            function () {
+              var _ref17 = _asyncToGenerator(function* (modifier) {
+                try {
+                  // Each modifier gets a copy of data and returns its field mappings
+                  var result = yield modifier.execute(_originalIsArray ? [...dataArray] : dataArray[0], old_data, _this18[_ctx], _this18.type);
+                  return {
+                    field: modifier.field,
+                    result
+                  };
+                } catch (error) {
+                  console.error("Modifier error for field " + modifier.field + ":", error.stack);
+                  return {
+                    field: modifier.field,
+                    result: null,
+                    error
+                  };
+                }
+              });
+
+              return function (_x3) {
+                return _ref17.apply(this, arguments);
+              };
+            }())); // Merge results - each field modifier added its field to the data items
+
+            for (var outcome of fieldResults) {
+              if (outcome.status === "fulfilled" && outcome.value.result) {
+                var {
+                  field,
+                  result
+                } = outcome.value;
+                var resultArray = Array.isArray(result) ? result : [result]; // Copy the mapped field from each result item to the corresponding data item
+
+                for (var i = 0; i < dataArray.length && i < resultArray.length; i++) {
+                  if (resultArray[i] && resultArray[i][field] !== undefined) {
+                    dataArray[i][field] = resultArray[i][field];
+                  }
+                }
+              }
+            }
+
+            data = _originalIsArray ? dataArray : dataArray[0];
           } // Ensure data is always an array for consistent processing.
 
 

package/package.json

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

package/src/models/SpiceModel.js

@@ -52,7 +52,7 @@ export default class SpiceModel {
       var dbtype =
         spice.config.database.connections[args.connection].type || "couchbase";
       let Database = require(`spice-${dbtype}`);
-      this[_mapping_dept] = args?.args?.mapping_dept || 100;
+      this[_mapping_dept] = args?.args?.mapping_dept || 2;
       this[_mapping_dept_exempt] = args?.args?.mapping_dept_exempt || [];
       this.type = "";
       this.collection = args.connection;
@@ -1673,26 +1673,92 @@ export default class SpiceModel {
 
       // Cache the modifiers lookup for the specified type.
       const modifiers = this[_serializers]?.[type]?.modifiers || [];
+
+      // ⚡ OPTIMIZED: Separate field-specific modifiers (can run in parallel) from generic ones (serial)
+      const fieldModifiers = [];
+      const genericModifiers = [];
+
       for (const modifier of modifiers) {
-        try {
-          // ⚡ OPTIMIZED: Skip field-specific modifiers if columns specified and field not requested
-          if (
-            requestedColumns &&
-            modifier.field &&
-            !requestedColumns.has(modifier.field)
-          ) {
-            continue; // Skip this modifier - field not in requested columns
-          }
+        // Skip field-specific modifiers if columns specified and field not requested
+        if (
+          requestedColumns &&
+          modifier.field &&
+          !requestedColumns.has(modifier.field)
+        ) {
+          continue;
+        }
+
+        // Field modifiers have a .field property and .execute function - they can run in parallel
+        if (modifier.field && typeof modifier.execute === "function") {
+          fieldModifiers.push(modifier);
+        } else {
+          genericModifiers.push(modifier);
+        }
+      }
 
-          // Execute modifier (supports both old function format and new object format)
+      // Run generic modifiers serially first (they may transform the data structure)
+      for (const modifier of genericModifiers) {
+        try {
           const executeFn =
             typeof modifier === "function" ? modifier : modifier.execute;
           data = await executeFn(data, old_data, this[_ctx], this.type);
         } catch (error) {
-          console.error("Modifier error in do_serialize:", error.stack);
+          console.error(
+            "Modifier error in do_serialize (generic):",
+            error.stack
+          );
         }
       }
 
+      // ⚡ OPTIMIZED: Run field-specific modifiers in PARALLEL - each populates a different field
+      if (fieldModifiers.length > 0) {
+        const originalIsArray = Array.isArray(data);
+        const dataArray = originalIsArray ? data : [data];
+
+        // Run all field modifiers in parallel
+        const fieldResults = await Promise.allSettled(
+          fieldModifiers.map(async (modifier) => {
+            try {
+              // Each modifier gets a copy of data and returns its field mappings
+              const result = await modifier.execute(
+                originalIsArray ? [...dataArray] : dataArray[0],
+                old_data,
+                this[_ctx],
+                this.type
+              );
+              return { field: modifier.field, result };
+            } catch (error) {
+              console.error(
+                `Modifier error for field ${modifier.field}:`,
+                error.stack
+              );
+              return { field: modifier.field, result: null, error };
+            }
+          })
+        );
+
+        // Merge results - each field modifier added its field to the data items
+        for (const outcome of fieldResults) {
+          if (outcome.status === "fulfilled" && outcome.value.result) {
+            const { field, result } = outcome.value;
+            const resultArray = Array.isArray(result) ? result : [result];
+
+            // Copy the mapped field from each result item to the corresponding data item
+            for (
+              let i = 0;
+              i < dataArray.length && i < resultArray.length;
+              i++
+            ) {
+              if (resultArray[i] && resultArray[i][field] !== undefined) {
+                dataArray[i][field] = resultArray[i][field];
+              }
+            }
+          }
+        }
+
+        data = originalIsArray ? dataArray : dataArray[0];
+      }
+
       // Ensure data is always an array for consistent processing.
       const originalIsArray = Array.isArray(data);
       if (!originalIsArray) {