spice-js 2.6.78 → 2.6.79

package/build/models/SpiceModel.js

@@ -37,7 +37,8 @@ var SDate = require("sonover-date"),
     _serializers = Symbol(),
     _level = Symbol(),
     _mapping_dept = Symbol(),
-    _mapping_dept_exempt = Symbol(); //const _type = Symbol("type");
+    _mapping_dept_exempt = Symbol(),
+    _current_path = Symbol(); //const _type = Symbol("type");
 
 
 var that;
@@ -60,7 +61,7 @@ class SpiceModel {
     }
 
     try {
-      var _args2, _args2$args, _args3, _args3$args, _args$args, _args4, _args4$args, _args5, _args5$args, _args6, _args6$args;
+      var _args2, _args2$args, _args3, _args3$args, _args$args, _args4, _args4$args, _args5, _args5$args, _args6, _args6$args, _args7, _args7$args;
 
       var dbtype = spice.config.database.connections[args.connection].type || "couchbase";
 
@@ -76,6 +77,7 @@ class SpiceModel {
       this[_ctx] = (_args4 = args) == null ? void 0 : (_args4$args = _args4.args) == null ? void 0 : _args4$args.ctx;
       this[_skip_cache] = ((_args5 = args) == null ? void 0 : (_args5$args = _args5.args) == null ? void 0 : _args5$args.skip_cache) || false;
       this[_level] = ((_args6 = args) == null ? void 0 : (_args6$args = _args6.args) == null ? void 0 : _args6$args._level) || 0;
+      this[_current_path] = ((_args7 = args) == null ? void 0 : (_args7$args = _args7.args) == null ? void 0 : _args7$args._current_path) || "";
       this[_hooks] = {
         create: {
           before: [],
@@ -671,10 +673,10 @@ class SpiceModel {
 
       try {
         if (p) {
-          var _args7;
+          var _args8;
 
           return yield p.track(_this4.type + ".get", doGet, {
-            id: (_args7 = args) == null ? void 0 : _args7.id
+            id: (_args8 = args) == null ? void 0 : _args8.id
           });
         }
 
@@ -1319,12 +1321,12 @@ class SpiceModel {
       /*#__PURE__*/
       function () {
         var _ref12 = _asyncToGenerator(function* () {
-          var _args8, _args9, _args10;
+          var _args9, _args10, _args11;
 
           if (args.mapping_dept) _this12[_mapping_dept] = args.mapping_dept;
           if (args.mapping_dept_exempt) _this12[_mapping_dept_exempt] = args.mapping_dept_exempt; // Find alias tokens from query/columns/sort
 
-          var nestings = [..._this12.extractNestings(((_args8 = args) == null ? void 0 : _args8.query) || "", _this12.type), ..._this12.extractNestings(((_args9 = args) == null ? void 0 : _args9.columns) || "", _this12.type), ..._this12.extractNestings(((_args10 = args) == null ? void 0 : _args10.sort) || "", _this12.type)]; // Decide which aliases we can join: only when map.type===MODEL AND reference is a STRING keyspace.
+          var nestings = [..._this12.extractNestings(((_args9 = args) == null ? void 0 : _args9.query) || "", _this12.type), ..._this12.extractNestings(((_args10 = args) == null ? void 0 : _args10.columns) || "", _this12.type), ..._this12.extractNestings(((_args11 = args) == null ? void 0 : _args11.sort) || "", _this12.type)]; // Decide which aliases we can join: only when map.type===MODEL AND reference is a STRING keyspace.
 
           var mappedNestings = _.compact(_.uniq(nestings).map(alias => {
             var prop = _this12.props[alias];
@@ -1421,11 +1423,11 @@ class SpiceModel {
 
       try {
         if (p) {
-          var _args11, _args12;
+          var _args12, _args13;
 
           return yield p.track(_this12.type + ".list", doList, {
-            limit: (_args11 = args) == null ? void 0 : _args11.limit,
-            offset: (_args12 = args) == null ? void 0 : _args12.offset
+            limit: (_args12 = args) == null ? void 0 : _args12.limit,
+            offset: (_args13 = args) == null ? void 0 : _args13.offset
           });
         }
 
@@ -1581,6 +1583,31 @@ class SpiceModel {
     }
 
     return SpiceModel._hiddenPropsCache[this.type];
+  } // Check if a field is exempt from mapping depth limits
+  // Supports deep references like "group.permissions"
+
+
+  isFieldExempt(source_property) {
+    var currentPath = this[_current_path];
+    var fullPath = currentPath ? currentPath + "." + source_property : source_property;
+    return this[_mapping_dept_exempt].some(exemptPattern => {
+      // Exact match: "group" or "group.permissions"
+      if (exemptPattern === source_property || exemptPattern === fullPath) {
+        return true;
+      } // Pattern starts with current full path (e.g., "group.permissions" starts with "group")
+
+
+      if (exemptPattern.startsWith(fullPath + ".")) {
+        return true;
+      } // Full path starts with pattern (e.g., we're at "group.permissions" and "group" is exempt)
+
+
+      if (fullPath.startsWith(exemptPattern + ".")) {
+        return true;
+      }
+
+      return false;
+    });
   }
 
   mapToObject(data, Class, source_property, store_property, property) {
@@ -1593,7 +1620,7 @@ class SpiceModel {
         data = Array.of(data);
       }
 
-      var isExempt = _this15[_mapping_dept_exempt].includes(source_property);
+      var isExempt = _this15.isFieldExempt(source_property);
 
       if (isExempt || _this15[_level] + 1 < _this15[_mapping_dept]) {
         var classes = _.compact(_.isArray(Class) ? Class : [Class]);
@@ -1604,14 +1631,17 @@ class SpiceModel {
           if (_.isString(result[source_property]) && result[source_property] != "") {
             ids = _.union(ids, [result[source_property]]);
           }
-        });
+        }); // Build the path for child models
 
+
+        var childPath = _this15[_current_path] ? _this15[_current_path] + "." + source_property : source_property;
         var returned_all = yield Promise.allSettled(_.map(classes, obj => {
           return new obj(_extends({}, _this15[_args], {
             skip_cache: _this15[_skip_cache],
             _level: _this15[_level] + 1,
             mapping_dept: _this15[_mapping_dept],
-            mapping_dept_exempt: _this15[_mapping_dept_exempt]
+            mapping_dept_exempt: _this15[_mapping_dept_exempt],
+            _current_path: childPath
           })).getMulti({
             skip_hooks: true,
             ids: ids
@@ -1645,7 +1675,7 @@ class SpiceModel {
         data = Array.of(data);
       }
 
-      var isExempt = _this16[_mapping_dept_exempt].includes(source_property);
+      var isExempt = _this16.isFieldExempt(source_property);
 
       if (isExempt || _this16[_level] + 1 < _this16[_mapping_dept]) {
         var ids = [];
@@ -1664,7 +1694,10 @@ class SpiceModel {
           var items = _.filter(value, obj => _.isString(obj) && obj != "");
 
           ids = _.union(ids, items);
-        });
+        }); // Build the path for child models
+
+
+        var childPath = _this16[_current_path] ? _this16[_current_path] + "." + source_property : source_property;
 
         var classes = _.compact(_.isArray(Class) ? Class : [Class]);
 
@@ -1673,7 +1706,8 @@ class SpiceModel {
             skip_cache: _this16[_skip_cache],
             _level: _this16[_level] + 1,
             mapping_dept: _this16[_mapping_dept],
-            mapping_dept_exempt: _this16[_mapping_dept_exempt]
+            mapping_dept_exempt: _this16[_mapping_dept_exempt],
+            _current_path: childPath
           })).getMulti({
             skip_hooks: true,
             ids: ids
@@ -1816,7 +1850,15 @@ class SpiceModel {
 
 
   parseRequestedColumns(columns) {
-    if (!columns || columns === "") return null; // Extract field names from column specifications
+    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;
+    console.log("columns", columns); // Extract field names from column specifications
     // Handles: "field", "`field`", "table.field", "`table`.`field`", "expr AS alias"
 
     var fields = new Set();

package/package.json

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

package/src/models/SpiceModel.js

@@ -21,7 +21,8 @@ var SDate = require("sonover-date"),
   _serializers = Symbol(),
   _level = Symbol(),
   _mapping_dept = Symbol(),
-  _mapping_dept_exempt = Symbol();
+  _mapping_dept_exempt = Symbol(),
+  _current_path = Symbol();
 
 //const _type = Symbol("type");
 
@@ -63,6 +64,7 @@ export default class SpiceModel {
       this[_ctx] = args?.args?.ctx;
       this[_skip_cache] = args?.args?.skip_cache || false;
       this[_level] = args?.args?._level || 0;
+      this[_current_path] = args?.args?._current_path || "";
       this[_hooks] = {
         create: {
           before: [],
@@ -1418,12 +1420,35 @@ export default class SpiceModel {
     return SpiceModel._hiddenPropsCache[this.type];
   }
 
+  // Check if a field is exempt from mapping depth limits
+  // Supports deep references like "group.permissions"
+  isFieldExempt(source_property) {
+    const currentPath = this[_current_path];
+    const fullPath = currentPath ? `${currentPath}.${source_property}` : source_property;
+
+    return this[_mapping_dept_exempt].some((exemptPattern) => {
+      // Exact match: "group" or "group.permissions"
+      if (exemptPattern === source_property || exemptPattern === fullPath) {
+        return true;
+      }
+      // Pattern starts with current full path (e.g., "group.permissions" starts with "group")
+      if (exemptPattern.startsWith(fullPath + ".")) {
+        return true;
+      }
+      // Full path starts with pattern (e.g., we're at "group.permissions" and "group" is exempt)
+      if (fullPath.startsWith(exemptPattern + ".")) {
+        return true;
+      }
+      return false;
+    });
+  }
+
   async mapToObject(data, Class, source_property, store_property, property) {
     let original_is_array = _.isArray(data);
     if (!original_is_array) {
       data = Array.of(data);
     }
-    const isExempt = this[_mapping_dept_exempt].includes(source_property);
+    const isExempt = this.isFieldExempt(source_property);
     if (isExempt || this[_level] + 1 < this[_mapping_dept]) {
       let classes = _.compact(_.isArray(Class) ? Class : [Class]);
 
@@ -1437,6 +1462,11 @@ export default class SpiceModel {
         }
       });
 
+      // Build the path for child models
+      const childPath = this[_current_path]
+        ? `${this[_current_path]}.${source_property}`
+        : source_property;
+
       var returned_all = await Promise.allSettled(
         _.map(classes, (obj) => {
           return new obj({
@@ -1445,6 +1475,7 @@ export default class SpiceModel {
             _level: this[_level] + 1,
             mapping_dept: this[_mapping_dept],
             mapping_dept_exempt: this[_mapping_dept_exempt],
+            _current_path: childPath,
           }).getMulti({
             skip_hooks: true,
             ids: ids,
@@ -1482,7 +1513,7 @@ export default class SpiceModel {
     if (!original_is_array) {
       data = Array.of(data);
     }
-    const isExempt = this[_mapping_dept_exempt].includes(source_property);
+    const isExempt = this.isFieldExempt(source_property);
     if (isExempt || this[_level] + 1 < this[_mapping_dept]) {
       let ids = [];
       _.each(data, (result) => {
@@ -1500,6 +1531,11 @@ export default class SpiceModel {
         ids = _.union(ids, items);
       });
 
+      // Build the path for child models
+      const childPath = this[_current_path]
+        ? `${this[_current_path]}.${source_property}`
+        : source_property;
+
       let classes = _.compact(_.isArray(Class) ? Class : [Class]);
       var returned_all = await Promise.allSettled(
         _.map(classes, (obj) => {
@@ -1509,6 +1545,7 @@ export default class SpiceModel {
             _level: this[_level] + 1,
             mapping_dept: this[_mapping_dept],
             mapping_dept_exempt: this[_mapping_dept_exempt],
+            _current_path: childPath,
           }).getMulti({
             skip_hooks: true,
             ids: ids,
@@ -1635,7 +1672,7 @@ export default class SpiceModel {
 
     // Must be a string to parse
     if (typeof columns !== "string") return null;
-
+    console.log("columns", columns);
     // Extract field names from column specifications
     // Handles: "field", "`field`", "table.field", "`table`.`field`", "expr AS alias"
     const fields = new Set();