spice-js 2.7.3 → 2.7.5

package/build/models/SpiceModel.js

@@ -54,7 +54,6 @@ if (!Promise.allSettled) {
 }
 
 class SpiceModel {
-  // ⚡ Static caches for performance optimization
   constructor(args) {
     if (args === void 0) {
       args = {};
@@ -1559,54 +1558,6 @@ class SpiceModel {
     }
 
     return true;
-  } // ⚡ OPTIMIZED: Cache defaults metadata per model type
-
-
-  getDefaultsMetadata(type) {
-    var cacheKey = this.type + "::" + type;
-
-    if (!SpiceModel._defaultsCache[cacheKey]) {
-      var staticDefaults = {};
-      var dynamicDefaults = []; // Pre-compute once per model type
-
-      for (var key in this.props) {
-        var _this$props$key, _this$props$key$defau;
-
-        var def = (_this$props$key = this.props[key]) == null ? void 0 : (_this$props$key$defau = _this$props$key.defaults) == null ? void 0 : _this$props$key$defau[type];
-
-        if (def !== undefined) {
-          if (_.isFunction(def)) {
-            dynamicDefaults.push({
-              key,
-              fn: def
-            });
-          } else {
-            staticDefaults[key] = def;
-          }
-        }
-      }
-
-      SpiceModel._defaultsCache[cacheKey] = {
-        staticDefaults,
-        dynamicDefaults,
-        hasDefaults: Object.keys(staticDefaults).length > 0 || dynamicDefaults.length > 0
-      };
-    }
-
-    return SpiceModel._defaultsCache[cacheKey];
-  } // ⚡ OPTIMIZED: Cache hidden props per model type
-
-
-  getHiddenProps() {
-    if (!SpiceModel._hiddenPropsCache[this.type]) {
-      SpiceModel._hiddenPropsCache[this.type] = Object.keys(this.props).filter(key => {
-        var _this$props$key2;
-
-        return (_this$props$key2 = this.props[key]) == null ? void 0 : _this$props$key2.hide;
-      });
-    }
-
-    return SpiceModel._hiddenPropsCache[this.type];
   } // Check if a field is exempt from mapping depth limits
   // Supports deep references like "group.permissions"
 
@@ -1816,18 +1767,11 @@ class SpiceModel {
   addModifier(_ref18) {
     var {
       when,
-      execute,
-      field = null,
-      sourceField = null
+      execute
     } = _ref18;
 
     if (this[_serializers][when]) {
-      // Store as object with field info for column-based filtering
-      this[_serializers][when]["modifiers"].push({
-        execute,
-        field,
-        sourceField
-      });
+      this[_serializers][when]["modifiers"].push(execute);
     }
   }
 
@@ -1856,21 +1800,15 @@ class SpiceModel {
         switch (properties[i].map.type) {
           case _2.MapType.MODEL:
             {
-              var destinationField = properties[i].map.destination || i;
-
               switch (properties[i].type) {
                 case String:
                 case "string":
                   {
                     _this17.addModifier({
                       when: properties[i].map.when || "read",
-                      field: destinationField,
-                      // ⚡ Track which field this modifier populates
-                      sourceField: i,
-                      // ⚡ Track source property for column filtering
                       execute: function () {
                         var _execute = _asyncToGenerator(function* (data) {
-                          return yield _this17.mapToObject(data, _.isString(properties[i].map.reference) ? spice.models[properties[i].map.reference] : properties[i].map.reference, i, destinationField, properties[i]);
+                          return yield _this17.mapToObject(data, _.isString(properties[i].map.reference) ? spice.models[properties[i].map.reference] : properties[i].map.reference, i, properties[i].map.destination || i, properties[i]);
                         });
 
                         function execute(_x) {
@@ -1889,13 +1827,9 @@ class SpiceModel {
                   {
                     _this17.addModifier({
                       when: properties[i].map.when || "read",
-                      field: destinationField,
-                      // ⚡ Track which field this modifier populates
-                      sourceField: i,
-                      // ⚡ Track source property for column filtering
                       execute: function () {
                         var _execute2 = _asyncToGenerator(function* (data) {
-                          return yield _this17.mapToObjectArray(data, _.isString(properties[i].map.reference) ? spice.models[properties[i].map.reference] : properties[i].map.reference, i, destinationField, properties[i]);
+                          return yield _this17.mapToObjectArray(data, _.isString(properties[i].map.reference) ? spice.models[properties[i].map.reference] : properties[i].map.reference, i, properties[i].map.destination || i, properties[i]);
                         });
 
                         function execute(_x2) {
@@ -1924,42 +1858,6 @@ class SpiceModel {
     for (var i in properties) {
       _loop(i);
     }
-  } // ⚡ Parse columns string into a Set for fast lookup
-
-
-  parseRequestedColumns(columns) {
-    if (!columns || columns === "") return null; // Handle array of columns (convert to string)
-
-    if (Array.isArray(columns)) {
-      columns = columns.join(",");
-    } // Must be a string to parse
-
-
-    if (typeof columns !== "string") return null; // Extract field names from column specifications
-    // Handles: "field", "`field`", "table.field", "`table`.`field`", "expr AS alias"
-
-    var fields = new Set();
-    var columnList = columns.split(",").map(c => c.trim());
-
-    for (var col of columnList) {
-      // Check for AS alias
-      var aliasMatch = col.match(/\s+AS\s+`?([\w]+)`?$/i);
-
-      if (aliasMatch) {
-        fields.add(aliasMatch[1]);
-        continue;
-      } // Get the last part after dots (the field name)
-
-
-      var parts = col.replace(/`/g, "").split(".");
-      var fieldName = parts[parts.length - 1];
-
-      if (fieldName && fieldName !== "*") {
-        fields.add(fieldName);
-      }
-    }
-
-    return fields.size > 0 ? fields : null;
   }
 
   do_serialize(data, type, old_data, args, path_to_be_removed) {
@@ -1991,30 +1889,24 @@ class SpiceModel {
             _this18.addExternalModifiers(_this18.type);
 
             _this18[_external_modifier_loaded] = true;
-          } // ⚡ OPTIMIZED: Parse requested columns for selective modifier execution
+          } // Cache the modifiers lookup for the specified type.
 
 
-          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) || []; // Run modifiers serially
-
-          for (var modifier of modifiers) {
-            // 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;
-            }
+          for (var i = 0; i < modifiers.length; i++) {
+            var modifier = modifiers[i];
 
             try {
-              // 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
+              var result = yield modifier(data, old_data, _this18[_ctx], _this18.type); // Guard against modifiers that return undefined
 
               if (result !== undefined) {
                 data = result;
+              } else {
+                console.warn("Modifier #" + i + " for type=" + _this18.type + " returned undefined, keeping previous data");
               }
             } catch (error) {
-              console.error("Modifier error in do_serialize:", error.stack);
+              console.error("Modifier error in do_serialize (type=" + _this18.type + ", modifier #" + i + "):", error instanceof Error ? error.stack : "Non-Error thrown: " + JSON.stringify(error));
             }
           } // Ensure data is always an array for consistent processing.
 
@@ -2023,42 +1915,33 @@ class SpiceModel {
 
           if (!originalIsArray) {
             data = [data];
-          } // ⚡ OPTIMIZED: Use cached defaults metadata instead of computing every time
-
-
-          var {
-            staticDefaults,
-            dynamicDefaults,
-            hasDefaults
-          } = _this18.getDefaultsMetadata(type);
-
-          if (hasDefaults) {
-            data = data.map(item => {
-              // Apply static defaults first (fast - no function calls)
-              var result = _.defaults({}, item, staticDefaults); // Only compute dynamic defaults if there are any
-
-
-              for (var {
-                key,
-                fn
-              } of dynamicDefaults) {
-                if (result[key] === undefined) {
-                  result[key] = fn({
-                    old_data: data,
-                    new_data: old_data
-                  });
-                }
-              }
+          } // Compute the defaults from properties using reduce.
 
-              return result;
-            });
-          } // If type is "read", clean the data by omitting certain props.
 
+          var defaults = Object.keys(_this18.props).reduce((acc, key) => {
+            var _this18$props$key, _this18$props$key$def;
+
+            var def = (_this18$props$key = _this18.props[key]) == null ? void 0 : (_this18$props$key$def = _this18$props$key.defaults) == null ? void 0 : _this18$props$key$def[type];
+
+            if (def !== undefined) {
+              acc[key] = _.isFunction(def) ? def({
+                old_data: data,
+                new_data: old_data
+              }) : def;
+            }
+
+            return acc;
+          }, {}); // Merge defaults into each object.
+
+          data = data.map(item => _.defaults(item, defaults)); // If type is "read", clean the data by omitting certain props.
 
           if (type === "read") {
-            // ⚡ OPTIMIZED: Use cached hidden props instead of computing every time
-            var hiddenProps = _this18.getHiddenProps(); // Combine default props to remove.
+            // Collect hidden properties from schema.
+            var hiddenProps = Object.keys(_this18.props).filter(key => {
+              var _this18$props$key2;
 
+              return (_this18$props$key2 = _this18.props[key]) == null ? void 0 : _this18$props$key2.hide;
+            }); // Combine default props to remove.
 
             var propsToClean = ["deleted", "type", ...path_to_be_removed, ...hiddenProps];
             data = data.map(item => _.omit(item, propsToClean));
@@ -2082,7 +1965,7 @@ class SpiceModel {
 
         return yield doSerialize();
       } catch (error) {
-        console.error("Error in do_serialize:", error.stack);
+        console.error("Error in do_serialize:", error instanceof Error ? error.stack : "Non-Error thrown: " + JSON.stringify(error));
         throw error;
       }
     })();
@@ -2090,6 +1973,4 @@ class SpiceModel {
 
 }
 
-exports.default = SpiceModel;
-SpiceModel._defaultsCache = {};
-SpiceModel._hiddenPropsCache = {};
+exports.default = SpiceModel;

package/package.json

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

package/src/models/SpiceModel.js

@@ -44,10 +44,6 @@ if (!Promise.allSettled) {
     );
 }
 export default class SpiceModel {
-  // ⚡ Static caches for performance optimization
-  static _defaultsCache = {};
-  static _hiddenPropsCache = {};
-
   constructor(args = {}) {
     try {
       var dbtype =
@@ -1391,47 +1387,6 @@ export default class SpiceModel {
     return true;
   }
 
-  // ⚡ OPTIMIZED: Cache defaults metadata per model type
-  getDefaultsMetadata(type) {
-    const cacheKey = `${this.type}::${type}`;
-
-    if (!SpiceModel._defaultsCache[cacheKey]) {
-      const staticDefaults = {};
-      const dynamicDefaults = [];
-
-      // Pre-compute once per model type
-      for (const key in this.props) {
-        const def = this.props[key]?.defaults?.[type];
-        if (def !== undefined) {
-          if (_.isFunction(def)) {
-            dynamicDefaults.push({ key, fn: def });
-          } else {
-            staticDefaults[key] = def;
-          }
-        }
-      }
-
-      SpiceModel._defaultsCache[cacheKey] = {
-        staticDefaults,
-        dynamicDefaults,
-        hasDefaults:
-          Object.keys(staticDefaults).length > 0 || dynamicDefaults.length > 0,
-      };
-    }
-
-    return SpiceModel._defaultsCache[cacheKey];
-  }
-
-  // ⚡ OPTIMIZED: Cache hidden props per model type
-  getHiddenProps() {
-    if (!SpiceModel._hiddenPropsCache[this.type]) {
-      SpiceModel._hiddenPropsCache[this.type] = Object.keys(this.props).filter(
-        (key) => this.props[key]?.hide
-      );
-    }
-    return SpiceModel._hiddenPropsCache[this.type];
-  }
-
   // Check if a field is exempt from mapping depth limits
   // Supports deep references like "group.permissions"
   isFieldExempt(source_property) {
@@ -1634,14 +1589,9 @@ export default class SpiceModel {
     return original_is_array ? data : data[0];
   }
 
-  addModifier({ when, execute, field = null, sourceField = null }) {
+  addModifier({ when, execute }) {
     if (this[_serializers][when]) {
-      // Store as object with field info for column-based filtering
-      this[_serializers][when]["modifiers"].push({
-        execute,
-        field,
-        sourceField,
-      });
+      this[_serializers][when]["modifiers"].push(execute);
     }
   }
 
@@ -1662,14 +1612,11 @@ export default class SpiceModel {
       if (properties[i].map) {
         switch (properties[i].map.type) {
           case MapType.MODEL: {
-            const destinationField = properties[i].map.destination || i;
             switch (properties[i].type) {
               case String:
               case "string": {
                 this.addModifier({
                   when: properties[i].map.when || "read",
-                  field: destinationField, // ⚡ Track which field this modifier populates
-                  sourceField: i, // ⚡ Track source property for column filtering
                   execute: async (data) => {
                     return await this.mapToObject(
                       data,
@@ -1677,7 +1624,7 @@ export default class SpiceModel {
                         spice.models[properties[i].map.reference]
                       : properties[i].map.reference,
                       i,
-                      destinationField,
+                      properties[i].map.destination || i,
                       properties[i]
                     );
                   },
@@ -1688,8 +1635,6 @@ export default class SpiceModel {
               case "array": {
                 this.addModifier({
                   when: properties[i].map.when || "read",
-                  field: destinationField, // ⚡ Track which field this modifier populates
-                  sourceField: i, // ⚡ Track source property for column filtering
                   execute: async (data) => {
                     return await this.mapToObjectArray(
                       data,
@@ -1697,7 +1642,7 @@ export default class SpiceModel {
                         spice.models[properties[i].map.reference]
                       : properties[i].map.reference,
                       i,
-                      destinationField,
+                      properties[i].map.destination || i,
                       properties[i]
                     );
                   },
@@ -1715,41 +1660,6 @@ export default class SpiceModel {
     }
   }
 
-  // ⚡ Parse columns string into a Set for fast lookup
-  parseRequestedColumns(columns) {
-    if (!columns || columns === "") return null;
-
-    // Handle array of columns (convert to string)
-    if (Array.isArray(columns)) {
-      columns = columns.join(",");
-    }
-
-    // Must be a string to parse
-    if (typeof columns !== "string") return null;
-    // Extract field names from column specifications
-    // Handles: "field", "`field`", "table.field", "`table`.`field`", "expr AS alias"
-    const fields = new Set();
-    const columnList = columns.split(",").map((c) => c.trim());
-
-    for (const col of columnList) {
-      // Check for AS alias
-      const aliasMatch = col.match(/\s+AS\s+`?([\w]+)`?$/i);
-      if (aliasMatch) {
-        fields.add(aliasMatch[1]);
-        continue;
-      }
-
-      // Get the last part after dots (the field name)
-      const parts = col.replace(/`/g, "").split(".");
-      const fieldName = parts[parts.length - 1];
-      if (fieldName && fieldName !== "*") {
-        fields.add(fieldName);
-      }
-    }
-
-    return fields.size > 0 ? fields : null;
-  }
-
   async do_serialize(data, type, old_data, args, path_to_be_removed = []) {
     // Profiling: use track() for proper async context forking
     const p = this[_ctx]?.profiler;
@@ -1766,35 +1676,27 @@ export default class SpiceModel {
         this[_external_modifier_loaded] = true;
       }
 
-      // ⚡ OPTIMIZED: Parse requested columns for selective modifier execution
-      const requestedColumns = this.parseRequestedColumns(args?.columns);
-
       // Cache the modifiers lookup for the specified type.
       const modifiers = this[_serializers]?.[type]?.modifiers || [];
-
-      // Run modifiers serially
-      for (const modifier of modifiers) {
-        // 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;
-        }
-
+      for (let i = 0; i < modifiers.length; i++) {
+        const modifier = modifiers[i];
         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);
-          // Only assign if modifier returned a value to prevent data corruption
+          const result = await modifier(data, old_data, this[_ctx], this.type);
+          // Guard against modifiers that return undefined
           if (result !== undefined) {
             data = result;
+          } else {
+            console.warn(
+              `Modifier #${i} for type=${this.type} returned undefined, keeping previous data`
+            );
           }
         } catch (error) {
-          console.error("Modifier error in do_serialize:", error.stack);
+          console.error(
+            `Modifier error in do_serialize (type=${this.type}, modifier #${i}):`,
+            error instanceof Error ?
+              error.stack
+            : `Non-Error thrown: ${JSON.stringify(error)}`
+          );
         }
       }
 
@@ -1804,30 +1706,27 @@ export default class SpiceModel {
         data = [data];
       }
 
-      // ⚡ OPTIMIZED: Use cached defaults metadata instead of computing every time
-      const { staticDefaults, dynamicDefaults, hasDefaults } =
-        this.getDefaultsMetadata(type);
-
-      if (hasDefaults) {
-        data = data.map((item) => {
-          // Apply static defaults first (fast - no function calls)
-          const result = _.defaults({}, item, staticDefaults);
-
-          // Only compute dynamic defaults if there are any
-          for (const { key, fn } of dynamicDefaults) {
-            if (result[key] === undefined) {
-              result[key] = fn({ old_data: data, new_data: old_data });
-            }
-          }
+      // Compute the defaults from properties using reduce.
+      const defaults = Object.keys(this.props).reduce((acc, key) => {
+        const def = this.props[key]?.defaults?.[type];
+        if (def !== undefined) {
+          acc[key] =
+            _.isFunction(def) ?
+              def({ old_data: data, new_data: old_data })
+            : def;
+        }
+        return acc;
+      }, {});
 
-          return result;
-        });
-      }
+      // Merge defaults into each object.
+      data = data.map((item) => _.defaults(item, defaults));
 
       // If type is "read", clean the data by omitting certain props.
       if (type === "read") {
-        // ⚡ OPTIMIZED: Use cached hidden props instead of computing every time
-        const hiddenProps = this.getHiddenProps();
+        // Collect hidden properties from schema.
+        const hiddenProps = Object.keys(this.props).filter(
+          (key) => this.props[key]?.hide
+        );
         // Combine default props to remove.
         const propsToClean = [
           "deleted",
@@ -1850,7 +1749,12 @@ export default class SpiceModel {
       }
       return await doSerialize();
     } catch (error) {
-      console.error("Error in do_serialize:", error.stack);
+      console.error(
+        "Error in do_serialize:",
+        error instanceof Error ?
+          error.stack
+        : `Non-Error thrown: ${JSON.stringify(error)}`
+      );
       throw error;
     }
   }