spice-js 2.6.73 → 2.6.75

package/build/models/SpiceModel.js

@@ -584,9 +584,10 @@ class SpiceModel {
           if (_.isString(args.id)) {
             if (args.skip_hooks !== true) {
               yield _this4.run_hook(args, "get", "before");
-            }
+            } // ⚡ Include columns in cache key if specified
+
 
-            var key = "get::" + _this4.type + "::" + args.id;
+            var key = "get::" + _this4.type + "::" + args.id + (args.columns ? "::" + args.columns : "");
             var results = {};
 
             if (_this4.shouldUseCache(_this4.type)) {
@@ -640,7 +641,13 @@ class SpiceModel {
 
             if (results.deleted === undefined || results.deleted === false) {
               if (args.skip_read_serialize !== true && args.skip_serialize !== true) {
+                // ⚡ Pass columns to do_serialize so it can skip irrelevant modifiers
                 results = yield _this4.do_serialize(results, "read", {}, args, (yield _this4.propsToBeRemoved(results)));
+              } // ⚡ OPTIMIZED: Filter results by columns if specified
+
+
+              if (args.columns) {
+                results = _this4.filterResultsByColumns([results], args.columns)[0];
               }
 
               if (args.skip_hooks !== true) {
@@ -1695,11 +1702,16 @@ class SpiceModel {
   addModifier(_ref15) {
     var {
       when,
-      execute
+      execute,
+      field = null
     } = _ref15;
 
     if (this[_serializers][when]) {
-      this[_serializers][when]["modifiers"].push(execute);
+      // Store as object with field info for column-based filtering
+      this[_serializers][when]["modifiers"].push({
+        execute,
+        field
+      });
     }
   }
 
@@ -1728,15 +1740,19 @@ 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
                       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, properties[i].map.destination || i, properties[i]);
+                          return yield _this17.mapToObject(data, _.isString(properties[i].map.reference) ? spice.models[properties[i].map.reference] : properties[i].map.reference, i, destinationField, properties[i]);
                         });
 
                         function execute(_x) {
@@ -1755,9 +1771,11 @@ class SpiceModel {
                   {
                     _this17.addModifier({
                       when: properties[i].map.when || "read",
+                      field: destinationField,
+                      // ⚡ Track which field this modifier populates
                       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, properties[i].map.destination || i, properties[i]);
+                          return yield _this17.mapToObjectArray(data, _.isString(properties[i].map.reference) ? spice.models[properties[i].map.reference] : properties[i].map.reference, i, destinationField, properties[i]);
                         });
 
                         function execute(_x2) {
@@ -1786,6 +1804,35 @@ 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; // 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) {
@@ -1817,14 +1864,24 @@ class SpiceModel {
             _this18.addExternalModifiers(_this18.type);
 
             _this18[_external_modifier_loaded] = true;
-          } // Cache the modifiers lookup for the specified type.
+          } // ⚡ OPTIMIZED: Parse requested columns for selective modifier execution
+
+
+          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) || [];
 
           for (var modifier of modifiers) {
             try {
-              data = yield modifier(data, old_data, _this18[_ctx], _this18.type);
+              // ⚡ OPTIMIZED: Skip field-specific modifiers if columns specified and field not requested
+              if (requestedColumns && modifier.field && !requestedColumns.has(modifier.field)) {
+                continue; // Skip this modifier - field not in requested columns
+              } // Execute modifier (supports both old function format and new object format)
+
+
+              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:", error.stack);
             }

package/package.json

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

package/src/models/SpiceModel.js

@@ -20,7 +20,8 @@ var SDate = require("sonover-date"),
   _skip_cache = Symbol(),
   _serializers = Symbol(),
   _level = Symbol(),
-  _mapping_dept = Symbol();
+  _mapping_dept = Symbol(),
+  _mapping_dept_exempt = Symbol();
 
 //const _type = Symbol("type");
 
@@ -52,6 +53,7 @@ export default class SpiceModel {
         spice.config.database.connections[args.connection].type || "couchbase";
       let Database = require(`spice-${dbtype}`);
       this[_mapping_dept] = args?.args?.mapping_dept || 100;
+      this[_mapping_dept_exempt] = args?.args?.mapping_dept_exempt || [];
       this.type = "";
       this.collection = args.connection;
       this[_args] = args.args;
@@ -491,6 +493,8 @@ export default class SpiceModel {
 
     const doGet = async () => {
       if (args.mapping_dept) this[_mapping_dept] = args.mapping_dept;
+      if (args.mapping_dept_exempt)
+        this[_mapping_dept_exempt] = args.mapping_dept_exempt;
 
       if (!args) {
         args = {};
@@ -499,7 +503,8 @@ export default class SpiceModel {
         if (args.skip_hooks !== true) {
           await this.run_hook(args, "get", "before");
         }
-        let key = `get::${this.type}::${args.id}`;
+        // ⚡ Include columns in cache key if specified
+        let key = `get::${this.type}::${args.id}${args.columns ? `::${args.columns}` : ""}`;
         let results = {};
 
         if (this.shouldUseCache(this.type)) {
@@ -553,6 +558,7 @@ export default class SpiceModel {
             args.skip_read_serialize !== true &&
             args.skip_serialize !== true
           ) {
+            // ⚡ Pass columns to do_serialize so it can skip irrelevant modifiers
             results = await this.do_serialize(
               results,
               "read",
@@ -561,6 +567,12 @@ export default class SpiceModel {
               await this.propsToBeRemoved(results)
             );
           }
+
+          // ⚡ OPTIMIZED: Filter results by columns if specified
+          if (args.columns) {
+            results = this.filterResultsByColumns([results], args.columns)[0];
+          }
+
           if (args.skip_hooks !== true) {
             await this.run_hook(results, "get", "after");
           }
@@ -1136,6 +1148,8 @@ export default class SpiceModel {
 
     const doList = async () => {
       if (args.mapping_dept) this[_mapping_dept] = args.mapping_dept;
+      if (args.mapping_dept_exempt)
+        this[_mapping_dept_exempt] = args.mapping_dept_exempt;
 
       // Find alias tokens from query/columns/sort
       const nestings = [
@@ -1409,9 +1423,8 @@ export default class SpiceModel {
     if (!original_is_array) {
       data = Array.of(data);
     }
-    this[_mapping_dept];
-
-    if (this[_level] + 1 < this[_mapping_dept]) {
+    const isExempt = this[_mapping_dept_exempt].includes(source_property);
+    if (isExempt || this[_level] + 1 < this[_mapping_dept]) {
       let classes = _.compact(_.isArray(Class) ? Class : [Class]);
 
       let ids = [];
@@ -1431,6 +1444,7 @@ export default class SpiceModel {
             skip_cache: this[_skip_cache],
             _level: this[_level] + 1,
             mapping_dept: this[_mapping_dept],
+            mapping_dept_exempt: this[_mapping_dept_exempt],
           }).getMulti({
             skip_hooks: true,
             ids: ids,
@@ -1468,7 +1482,8 @@ export default class SpiceModel {
     if (!original_is_array) {
       data = Array.of(data);
     }
-    if (this[_level] + 1 < this[_mapping_dept]) {
+    const isExempt = this[_mapping_dept_exempt].includes(source_property);
+    if (isExempt || this[_level] + 1 < this[_mapping_dept]) {
       let ids = [];
       _.each(data, (result) => {
         let value = [];
@@ -1493,6 +1508,7 @@ export default class SpiceModel {
             skip_cache: this[_skip_cache],
             _level: this[_level] + 1,
             mapping_dept: this[_mapping_dept],
+            mapping_dept_exempt: this[_mapping_dept_exempt],
           }).getMulti({
             skip_hooks: true,
             ids: ids,
@@ -1533,9 +1549,10 @@ export default class SpiceModel {
     return original_is_array ? data : data[0];
   }
 
-  addModifier({ when, execute }) {
+  addModifier({ when, execute, field = null }) {
     if (this[_serializers][when]) {
-      this[_serializers][when]["modifiers"].push(execute);
+      // Store as object with field info for column-based filtering
+      this[_serializers][when]["modifiers"].push({ execute, field });
     }
   }
 
@@ -1556,11 +1573,13 @@ 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
                   execute: async (data) => {
                     return await this.mapToObject(
                       data,
@@ -1568,7 +1587,7 @@ export default class SpiceModel {
                         spice.models[properties[i].map.reference]
                       : properties[i].map.reference,
                       i,
-                      properties[i].map.destination || i,
+                      destinationField,
                       properties[i]
                     );
                   },
@@ -1579,6 +1598,7 @@ export default class SpiceModel {
               case "array": {
                 this.addModifier({
                   when: properties[i].map.when || "read",
+                  field: destinationField, // ⚡ Track which field this modifier populates
                   execute: async (data) => {
                     return await this.mapToObjectArray(
                       data,
@@ -1586,7 +1606,7 @@ export default class SpiceModel {
                         spice.models[properties[i].map.reference]
                       : properties[i].map.reference,
                       i,
-                      properties[i].map.destination || i,
+                      destinationField,
                       properties[i]
                     );
                   },
@@ -1604,6 +1624,34 @@ export default class SpiceModel {
     }
   }
 
+  // ⚡ Parse columns string into a Set for fast lookup
+  parseRequestedColumns(columns) {
+    if (!columns || columns === "") 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;
@@ -1620,11 +1668,26 @@ 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 || [];
       for (const modifier of modifiers) {
         try {
-          data = await modifier(data, old_data, this[_ctx], this.type);
+          // ⚡ OPTIMIZED: Skip field-specific modifiers if columns specified and field not requested
+          if (
+            requestedColumns &&
+            modifier.field &&
+            !requestedColumns.has(modifier.field)
+          ) {
+            continue; // Skip this modifier - field not in requested columns
+          }
+
+          // Execute modifier (supports both old function format and new object format)
+          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:", error.stack);
         }