spice-js 2.6.84 → 2.7.0

package/build/models/SpiceModel.js

@@ -168,8 +168,7 @@ class SpiceModel {
         }
 
         return props;
-      } //console.log("Applying Overrides to :", this.collection,'||', args.collection)
-
+      }
 
       args.props = applySchemaOverrides(removeDynamicProps(args.props), args.collection);
       this[_props] = args.props;
@@ -232,7 +231,7 @@ class SpiceModel {
       that = this;
       this.createModifiersFromProps();
     } catch (e) {
-      console.log(e.stack);
+      console.warn(e.stack);
     } // }
 
   }
@@ -682,7 +681,7 @@ class SpiceModel {
 
         return yield doGet();
       } catch (e) {
-        console.log(e.message, e);
+        console.warn(e.message, e);
         throw e;
       }
     })();
@@ -750,7 +749,7 @@ class SpiceModel {
 
         return results;
       } catch (e) {
-        console.log(e.stack);
+        console.warn(e.stack);
         throw e;
       }
     })();
@@ -869,7 +868,7 @@ class SpiceModel {
 
         return yield doUpdate();
       } catch (e) {
-        console.log("Error on update", e, e.stack);
+        console.warn("Error on update", e, e.stack);
         throw e;
       }
     })();
@@ -962,7 +961,7 @@ class SpiceModel {
 
         return yield doCreate();
       } catch (e) {
-        console.log(e.stack);
+        console.warn(e.stack);
         throw e;
       }
     })();
@@ -983,7 +982,7 @@ class SpiceModel {
         touch_response = yield _this10.database.touch(args.id, args._ttl);
         return touch_response;
       } catch (e) {
-        console.log(e.stack);
+        console.warn(e.stack);
         throw e;
       }
     })();
@@ -1063,7 +1062,7 @@ class SpiceModel {
 
         return yield doDelete();
       } catch (e) {
-        console.log(e.stack);
+        console.warn(e.stack);
         throw e;
       }
     })();
@@ -1433,7 +1432,7 @@ class SpiceModel {
 
         return yield doList();
       } catch (e) {
-        console.log(e.stack);
+        console.warn(e.stack);
         throw e;
       }
     })();
@@ -1781,8 +1780,6 @@ class SpiceModel {
 
     var _loop = function _loop(i) {
       if (properties[i].map) {
-        console.log("properties[i].map", properties[i].map);
-
         switch (properties[i].map.type) {
           case _2.MapType.MODEL:
             {
@@ -1918,8 +1915,6 @@ class SpiceModel {
 
 
           if (_this18.type && !_this18[_external_modifier_loaded]) {
-            console.trace("adding external modifiers", _this18.type);
-
             _this18.addExternalModifiers(_this18.type);
 
             _this18[_external_modifier_loaded] = true;
@@ -1935,8 +1930,7 @@ class SpiceModel {
           var genericModifiers = [];
 
           for (var modifier of modifiers) {
-            console.log("modifier", modifier); // Skip field-specific modifiers if columns specified and neither source nor destination field is requested
-
+            // Skip field-specific modifiers if columns specified and neither source nor destination field is 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
@@ -1953,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.84",
+  "version": "2.7.0",
   "description": "spice",
   "main": "build/index.js",
   "repository": {

package/src/models/SpiceModel.js

@@ -157,7 +157,6 @@ export default class SpiceModel {
         }
         return props;
       }
-      //console.log("Applying Overrides to :", this.collection,'||', args.collection)
       args.props = applySchemaOverrides(
         removeDynamicProps(args.props),
         args.collection
@@ -221,7 +220,7 @@ export default class SpiceModel {
       that = this;
       this.createModifiersFromProps();
     } catch (e) {
-      console.log(e.stack);
+      console.warn(e.stack);
     }
     // }
   }
@@ -592,7 +591,7 @@ export default class SpiceModel {
       }
       return await doGet();
     } catch (e) {
-      console.log(e.message, e);
+      console.warn(e.message, e);
       throw e;
     }
   }
@@ -655,7 +654,7 @@ export default class SpiceModel {
 
       return results;
     } catch (e) {
-      console.log(e.stack);
+      console.warn(e.stack);
       throw e;
     }
   }
@@ -763,7 +762,7 @@ export default class SpiceModel {
       }
       return await doUpdate();
     } catch (e) {
-      console.log("Error on update", e, e.stack);
+      console.warn("Error on update", e, e.stack);
       throw e;
     }
   }
@@ -836,7 +835,7 @@ export default class SpiceModel {
       }
       return await doCreate();
     } catch (e) {
-      console.log(e.stack);
+      console.warn(e.stack);
       throw e;
     }
   }
@@ -852,7 +851,7 @@ export default class SpiceModel {
       touch_response = await this.database.touch(args.id, args._ttl);
       return touch_response;
     } catch (e) {
-      console.log(e.stack);
+      console.warn(e.stack);
       throw e;
     }
   }
@@ -902,7 +901,7 @@ export default class SpiceModel {
       }
       return await doDelete();
     } catch (e) {
-      console.log(e.stack);
+      console.warn(e.stack);
       throw e;
     }
   }
@@ -1290,7 +1289,7 @@ export default class SpiceModel {
       }
       return await doList();
     } catch (e) {
-      console.log(e.stack);
+      console.warn(e.stack);
       throw e;
     }
   }
@@ -1616,7 +1615,6 @@ export default class SpiceModel {
   createMofifier(properties) {
     for (let i in properties) {
       if (properties[i].map) {
-        console.log("properties[i].map", properties[i].map);
         switch (properties[i].map.type) {
           case MapType.MODEL: {
             const destinationField = properties[i].map.destination || i;
@@ -1719,7 +1717,6 @@ export default class SpiceModel {
 
       // Add external modifiers only once.
       if (this.type && !this[_external_modifier_loaded]) {
-        console.trace("adding external modifiers", this.type);
         this.addExternalModifiers(this.type);
         this[_external_modifier_loaded] = true;
       }
@@ -1735,7 +1732,6 @@ export default class SpiceModel {
       const genericModifiers = [];
 
       for (const modifier of modifiers) {
-        console.log("modifier", modifier);
         // Skip field-specific modifiers if columns specified and neither source nor destination field is requested
         if (
           requestedColumns &&
@@ -1759,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):",
@@ -1768,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.