spice-js 2.6.74 → 2.6.75

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spice-js",
-  "version": "2.6.74",
+  "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 = {};
@@ -563,12 +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");
           }
@@ -1144,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 = [
@@ -1417,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 = [];
@@ -1439,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,
@@ -1476,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 = [];
@@ -1501,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,
@@ -1619,12 +1627,12 @@ 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);
@@ -1632,7 +1640,7 @@ export default class SpiceModel {
         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];
@@ -1640,7 +1648,7 @@ export default class SpiceModel {
         fields.add(fieldName);
       }
     }
-    
+
     return fields.size > 0 ? fields : null;
   }
 
@@ -1668,12 +1676,17 @@ export default class SpiceModel {
       for (const modifier of modifiers) {
         try {
           // ⚡ OPTIMIZED: Skip field-specific modifiers if columns specified and field not requested
-          if (requestedColumns && modifier.field && !requestedColumns.has(modifier.field)) {
+          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;
+          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);