spice-js 2.6.85 → 2.7.1

package/build/models/SpiceModel.js

@@ -1924,84 +1924,25 @@ 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) || []; // ⚡ OPTIMIZED: Separate field-specific modifiers (can run in parallel) from generic ones (serial)
-
-          var fieldModifiers = [];
-          var genericModifiers = [];
+          var modifiers = ((_this18$_serializers = _this18[_serializers]) == null ? void 0 : (_this18$_serializers$ = _this18$_serializers[type]) == null ? void 0 : _this18$_serializers$.modifiers) || []; // Run modifiers serially
 
           for (var modifier of modifiers) {
-            // Skip field-specific modifiers if columns specified and neither source nor destination field is requested
+            // 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;
-            } // 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)
 
-
-          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 (generic):", error.stack);
-            }
-          } // ⚡ OPTIMIZED: Run field-specific modifiers in PARALLEL - each populates a different field
-
+              // 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 (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];
-                  }
-                }
+              if (result !== undefined) {
+                data = result;
               }
+            } catch (error) {
+              console.error("Modifier error in do_serialize:", error.stack);
             }
-
-            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.85",
+  "version": "2.7.1",
   "description": "spice",
   "main": "build/index.js",
   "repository": {

package/src/models/SpiceModel.js

@@ -1727,12 +1727,9 @@ 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 = [];
-
+      // Run modifiers serially
       for (const modifier of modifiers) {
-        // Skip field-specific modifiers if columns specified and neither source nor destination field is requested
+        // Skip field-specific modifiers if columns specified and field is not requested
         if (
           requestedColumns &&
           modifier.field &&
@@ -1742,75 +1739,18 @@ export default class SpiceModel {
           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)
-      for (const modifier of genericModifiers) {
         try {
+          // Handle both function modifiers and object modifiers with .execute
           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 (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];
-              }
-            }
+          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;
           }
+        } catch (error) {
+          console.error("Modifier error in do_serialize:", error.stack);
         }
-
-        data = originalIsArray ? dataArray : dataArray[0];
       }
 
       // Ensure data is always an array for consistent processing.