spice-js 2.7.0 → 2.7.1

package/build/models/SpiceModel.js

@@ -1924,52 +1924,24 @@ 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;
+              // 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;
               }
             } catch (error) {
-              console.error("Modifier error in do_serialize (generic):", error.stack);
-            }
-          } // Run field-specific modifiers SERIALLY to allow proper deduplication
-          // of nested relation lookups (parallel execution causes duplicate fetches
-          // when related entities have circular references like user fields)
-
-
-          for (var _modifier2 of fieldModifiers) {
-            try {
-              var _result = yield _modifier2.execute(data, old_data, _this18[_ctx], _this18.type); // Only assign if modifier returned a value to prevent data corruption
-
-
-              if (_result !== undefined) {
-                data = _result;
-              }
-            } catch (error) {
-              console.error("Modifier error for field " + _modifier2.field + ":", error.stack);
+              console.error("Modifier error in do_serialize:", error.stack);
             }
           } // Ensure data is always an array for consistent processing.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spice-js",
-  "version": "2.7.0",
+  "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,17 +1739,8 @@ 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;
           const result = await executeFn(data, old_data, this[_ctx], this.type);
@@ -1761,33 +1749,7 @@ export default class SpiceModel {
             data = result;
           }
         } catch (error) {
-          console.error(
-            "Modifier error in do_serialize (generic):",
-            error.stack
-          );
-        }
-      }
-
-      // Run field-specific modifiers SERIALLY to allow proper deduplication
-      // of nested relation lookups (parallel execution causes duplicate fetches
-      // when related entities have circular references like user fields)
-      for (const modifier of fieldModifiers) {
-        try {
-          const result = await modifier.execute(
-            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 for field ${modifier.field}:`,
-            error.stack
-          );
+          console.error("Modifier error in do_serialize:", error.stack);
         }
       }