spice-js 2.6.85 → 2.7.0

package/build/models/SpiceModel.js

@@ -1947,61 +1947,30 @@ class SpiceModel {
           for (var _modifier of genericModifiers) {
             try {
               var executeFn = typeof _modifier === "function" ? _modifier : _modifier.execute;
-              data = yield executeFn(data, old_data, _this18[_ctx], _this18.type);
+              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);
             }
-          } // ⚡ OPTIMIZED: Run field-specific modifiers in PARALLEL - each populates a different field
+          } // 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)
 
 
-          if (fieldModifiers.length > 0) {
-            var _originalIsArray = Array.isArray(data);
+          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
 
-            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 for field " + _modifier2.field + ":", 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.0",
   "description": "spice",
   "main": "build/index.js",
   "repository": {

package/src/models/SpiceModel.js

@@ -1755,7 +1755,11 @@ export default class SpiceModel {
         try {
           const executeFn =
             typeof modifier === "function" ? modifier : modifier.execute;
-          data = await executeFn(data, old_data, this[_ctx], this.type);
+          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 (generic):",
@@ -1764,53 +1768,27 @@ export default class SpiceModel {
         }
       }
 
-      // ⚡ 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];
-              }
-            }
+      // 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
+          );
         }
-
-        data = originalIsArray ? dataArray : dataArray[0];
       }
 
       // Ensure data is always an array for consistent processing.