spice-js 2.7.17 → 2.7.19

package/build/models/SpiceModel.js

@@ -502,27 +502,29 @@ class SpiceModel {
             var key = "get::" + _this4.type + "::" + args.id + (args.columns ? "::" + args.columns : "");
             var results = {};
 
+            // Filter out id, meta().id, and any column ending with .id (e.g., dependents.id)
+            if (args.columns) {
+              args.columns = args.columns.split(",").map(col => col.trim()).filter(col => col !== "").filter(col => {
+                var cleaned = col.replace(/`/g, "").toLowerCase();
+                return cleaned !== "id" && cleaned !== "meta().id" && !cleaned.endsWith(".id");
+              }).join(",");
+            }
+
+            // Save filtered columns before buildJoinMetadata modifies them
+            var originalColumns = args.columns;
+
             // Extract nestings from columns if specified
             var nestings = _this4.extractNestings(((_args9 = args) == null ? void 0 : _args9.columns) || "", _this4.type);
 
             // Build join metadata and prepare columns
             _this4.buildJoinMetadata(nestings, args);
-            var columns = args.columns;
+
+            // Use original (filtered) columns for extracting base column names
+            var columns = originalColumns;
             var columnArray = [];
             if (columns) {
-              columns.split(',').forEach(col => {
-                var parts = col.trim().split("."); // remove the first segment
-                // Also match if parts[0] is source_property or '`' + source_property + '`'
-                var firstPart = parts[0];
-                // Remove backticks if present
-                var cleanFirstPart = firstPart && firstPart.startsWith('`') && firstPart.endsWith('`') ? firstPart.slice(1, -1) : firstPart;
-
-                //if (parts.length > 0 && (firstPart === source_property || cleanFirstPart === source_property)) {
-                // Use cleanFirstPart for the map key to handle both cases consistently
-                // Remove backticks from each column segment, if present, before joining
-                columnArray.push(parts.slice(1).map(segment => segment && segment.startsWith('`') && segment.endsWith('`') ? segment.slice(1, -1) : segment).join("."));
-                // }
-              });
+              var rawColumns = columns.split(",").map(col => col.trim()).filter(col => col !== "").map(col => col.replace(/`/g, ""));
+              columnArray = [...new Set(_this4.extractBaseColumns(rawColumns).filter(col => col && col !== ""))];
             }
             if (_this4.shouldUseCache(_this4.type)) {
               // Retrieve the cached results
@@ -644,7 +646,7 @@ class SpiceModel {
               if ((cached_results == null ? void 0 : cached_results.value) === undefined || (yield _this6.shouldForceRefresh(cached_results))) {
                 results = yield _this6.database.multi_get(args.ids, {
                   keep_type: true,
-                  columns: args.columns && args.columns.length > 0 && args.columns != "" ? [..._this6.extractBaseColumns(args.columns), 'type'] : []
+                  columns: args.columns && args.columns.length > 0 && args.columns != "" ? [..._this6.extractBaseColumns(args.columns), "type"] : []
                 });
                 _this6.getCacheProviderObject(_this6.type).set(key, {
                   value: results,
@@ -654,7 +656,7 @@ class SpiceModel {
             } else {
               results = yield _this6.database.multi_get(args.ids, {
                 keep_type: true,
-                columns: args.columns && args.columns.length > 0 && args.columns != "" ? [..._this6.extractBaseColumns(args.columns), 'type'] : []
+                columns: args.columns && args.columns.length > 0 && args.columns != "" ? [..._this6.extractBaseColumns(args.columns), "type"] : []
               });
             }
           }
@@ -955,36 +957,47 @@ class SpiceModel {
       var col = (raw || "").trim();
       if (col === "" || col === "meta().id") return undefined;
       if (/^\s*ARRAY\s+/i.test(col) || /\w+\s*\(/.test(col)) return col;
+
+      // If the first segment is a mapped model property, always project the
+      // root mapped field (supports deep paths like dependents.passports.holder).
+      var deepMappedPathMatch = col.match(/^\s*`?(\w+)`?(?:\.`?\w+`?)+(?:\s+AS\s+`?([\w]+)`?)?\s*$/i);
+      if (deepMappedPathMatch) {
+        var _this$props$alias;
+        var alias = deepMappedPathMatch[1];
+        if (alias !== this.type && ((_this$props$alias = this.props[alias]) == null ? void 0 : _this$props$alias.map)) {
+          return q(this.type) + "." + q(alias);
+        }
+      }
       var m = col.match(/^\s*`?(\w+)`?\.`?(\w+)`?(?:\s+AS\s+`?([\w]+)`?)?\s*$/i);
       if (m) {
-        var alias = m[1];
+        var _alias = m[1];
         var field = m[2];
         var explicitAs = m[3];
 
         // If alias matches this.type, don't prepend again
-        if (alias === this.type) {
-          var _qualified = q(alias) + "." + q(field);
+        if (_alias === this.type) {
+          var _qualified = q(_alias) + "." + q(field);
           return explicitAs ? _qualified + " AS " + q(explicitAs) : _qualified;
         }
 
         // Check if alias has a map - if so, simplify to root column only (raw ID)
-        var prop = this.props[alias];
+        var prop = this.props[_alias];
         if (prop == null ? void 0 : prop.map) {
           // Return base table qualified root column, ignoring the .field part
-          return q(this.type) + "." + q(alias);
+          return q(this.type) + "." + q(_alias);
         }
-        if (arraySet.has(alias)) {
-          var proj = this.buildArrayProjection(alias, field);
-          if (explicitAs && explicitAs !== alias + "_" + field) {
+        if (arraySet.has(_alias)) {
+          var proj = this.buildArrayProjection(_alias, field);
+          if (explicitAs && explicitAs !== _alias + "_" + field) {
             proj = proj.replace(/AS\s+`[^`]+`$/i, "AS " + q(explicitAs));
           }
           return proj;
         }
-        if (protectedSet.has(alias)) {
-          var aliased = q(alias) + "." + (field.startsWith("`") ? field : q(field));
+        if (protectedSet.has(_alias)) {
+          var aliased = q(_alias) + "." + (field.startsWith("`") ? field : q(field));
           return explicitAs ? aliased + " AS " + q(explicitAs) : aliased;
         }
-        var qualified = q(this.type) + "." + q(alias) + "." + q(field);
+        var qualified = q(this.type) + "." + q(_alias) + "." + q(field);
         return explicitAs ? qualified + " AS " + q(explicitAs) : qualified;
       }
       var looksProtected = [...protectedSet].some(a => col === a || col === q(a) || col.startsWith(a + ".") || col.startsWith(q(a) + "."));
@@ -1030,9 +1043,14 @@ class SpiceModel {
         if (aliasMatch) {
           return aliasMatch[1].trim();
         }
-        // Otherwise, if a dot is present, take the part after the last dot
+        // Otherwise, for dot-notation, keep the first segment after removing
+        // the base model prefix (e.g. user.group.name -> group).
         if (col.includes(".")) {
-          return col.split(".").pop().trim();
+          var pathParts = col.split(".").map(part => part.trim()).filter(part => part !== "");
+          if (pathParts[0] === this.type && pathParts.length > 1) {
+            pathParts = pathParts.slice(1);
+          }
+          return pathParts[0];
         }
         return col;
       });
@@ -1142,7 +1160,7 @@ class SpiceModel {
     // then normalize names and add default aliases
     //console.log("Columns in BuildJoinMetadata", args.columns);
 
-    this[_columns] = (_args$columns = args.columns) != null ? _args$columns : '';
+    this[_columns] = (_args$columns = args.columns) != null ? _args$columns : "";
     args.columns = this.prepColumns(args.columns, protectedAliases, arrayAliases);
     args.columns = this.fixColumnName(args.columns, protectedAliases);
     //console.log("Columns in BuildJoinMetadata after fixColumnName", args.columns);
@@ -1237,6 +1255,17 @@ class SpiceModel {
           if (args.mapping_dept) _this10[_mapping_dept] = args.mapping_dept;
           if (args.mapping_dept_exempt) _this10[_mapping_dept_exempt] = args.mapping_dept_exempt;
 
+          // Filter out id, meta().id, and any column ending with .id (e.g., dependents.id)
+          if (args.columns) {
+            args.columns = args.columns.split(",").map(col => col.trim()).filter(col => col !== "").filter(col => {
+              var cleaned = col.replace(/`/g, "").toLowerCase();
+              return cleaned !== "id" && cleaned !== "meta().id" && !cleaned.endsWith(".id");
+            }).join(",");
+          }
+
+          // Save filtered columns before buildJoinMetadata modifies them
+          var originalColumns = args.columns;
+
           // Find alias tokens from query/columns/sort
           var nestings = [..._this10.extractNestings(((_args10 = args) == null ? void 0 : _args10.query) || "", _this10.type),
           //...this.extractNestings(args?.columns || "", this.type),
@@ -1279,14 +1308,14 @@ class SpiceModel {
             var isEmpty = (cached == null ? void 0 : cached.value) === undefined;
             var refresh = yield _this10.shouldForceRefresh(cached);
             if (isEmpty || refresh) {
-              results = yield _this10.fetchResults(args, query);
+              results = yield _this10.fetchResults(args, query, mappedNestings);
               _this10.getCacheProviderObject(_this10.type).set(cacheKey, {
                 value: results,
                 time: new Date().getTime()
               }, _this10.getCacheConfig(_this10.type));
             }
           } else {
-            results = yield _this10.fetchResults(args, query);
+            results = yield _this10.fetchResults(args, query, mappedNestings);
           }
 
           // Serializer still handles class-based refs and value_field
@@ -1319,7 +1348,36 @@ class SpiceModel {
       }
     })();
   }
-  fetchResults(args, query) {
+  correctColumns(columns, mappedNestings) {
+    // Preserve normal columns and only rewrite mapped alias dot-paths
+    // to the root mapped field on the base resource.
+    if (!columns || typeof columns !== "string") return columns;
+    var mappedAliasSet = new Set((mappedNestings || []).map(m => m.alias));
+    var isMappedAlias = alias => {
+      var _this$props, _this$props$alias2;
+      return !!((_this$props = this.props) == null ? void 0 : (_this$props$alias2 = _this$props[alias]) == null ? void 0 : _this$props$alias2.map);
+    };
+    var normalized = columns.split(",").map(col => col.trim()).filter(col => col !== "").map(col => {
+      var cleanCol = col.replace(/`/g, "").trim();
+      var parts = cleanCol.split(".");
+      var firstSegment = parts[0];
+      var secondSegment = parts[1];
+      var mappedAlias = null;
+      if (isMappedAlias(firstSegment)) {
+        mappedAlias = firstSegment;
+      } else if (firstSegment === this.type && secondSegment && isMappedAlias(secondSegment)) {
+        mappedAlias = secondSegment;
+      } else if (mappedAliasSet.has(firstSegment)) {
+        mappedAlias = firstSegment;
+      }
+      if (mappedAlias) {
+        return "`" + this.type + "`.`" + mappedAlias + "`";
+      }
+      return col;
+    });
+    return _.join(_.uniq(_.compact(normalized)), ",");
+  }
+  fetchResults(args, query, mappedNestings) {
     var _this11 = this;
     return _asyncToGenerator(function* () {
       var _this11$_ctx;
@@ -1332,7 +1390,8 @@ class SpiceModel {
           } else if (args.is_full_text === "true") {
             return yield _this11.database.full_text_search(_this11.type, query || "", args.limit, args.offset, args._join);
           } else {
-            var result = yield _this11.database.search(_this11.type, args.columns || "", query || "", args.limit, args.offset, args.sort, args.do_count, args.statement_consistent, args._join);
+            var correctedColumns = _this11.correctColumns(args.columns, mappedNestings);
+            var result = yield _this11.database.search(_this11.type, correctedColumns || args.columns || "", query || "", args.limit, args.offset, args.sort, args.do_count, args.statement_consistent, args._join);
             return result;
           }
         });
@@ -1431,16 +1490,16 @@ class SpiceModel {
       // Create a set of columns where the first segment matches source_property
       var columnArray = [];
       if (columns) {
-        columns.split(',').forEach(col => {
+        columns.split(",").forEach(col => {
           var parts = col.trim().split("."); // remove the first segment
           // Also match if parts[0] is source_property or '`' + source_property + '`'
           var firstPart = parts[0];
           // Remove backticks if present
-          var cleanFirstPart = firstPart && firstPart.startsWith('`') && firstPart.endsWith('`') ? firstPart.slice(1, -1) : firstPart;
+          var cleanFirstPart = firstPart && firstPart.startsWith("`") && firstPart.endsWith("`") ? firstPart.slice(1, -1) : firstPart;
           if (parts.length > 0 && (firstPart === source_property || cleanFirstPart === source_property)) {
             // Use cleanFirstPart for the map key to handle both cases consistently
             // Remove backticks from each column segment, if present, before joining
-            columnArray.push(parts.slice(1).map(segment => segment && segment.startsWith('`') && segment.endsWith('`') ? segment.slice(1, -1) : segment).join("."));
+            columnArray.push(parts.slice(1).map(segment => segment && segment.startsWith("`") && segment.endsWith("`") ? segment.slice(1, -1) : segment).join("."));
           }
         });
       }
@@ -1456,8 +1515,8 @@ class SpiceModel {
           var value = result[source_property];
 
           // Check if value is in the empty string key (column aliasing issue)
-          if ((value === undefined || _.isObject(value) && _.isEmpty(value)) && result[''] && result[''][source_property]) {
-            value = result[''][source_property];
+          if ((value === undefined || _.isObject(value) && _.isEmpty(value)) && result[""] && result[""][source_property]) {
+            value = result[""][source_property];
           }
           if (_.isString(value) && value != "") {
             // Value is a raw ID string
@@ -1480,7 +1539,7 @@ class SpiceModel {
                 _level: _this13[_level] + 1,
                 mapping_dept: _this13[_mapping_dept],
                 mapping_dept_exempt: _this13[_mapping_dept_exempt],
-                _columns: columnArray.join(','),
+                _columns: columnArray.join(","),
                 _current_path: childPath
               }));
               return objInstance.getMulti({
@@ -1516,8 +1575,8 @@ class SpiceModel {
           var sourceValue = result[source_property];
 
           // Check if value is in the empty string key (column aliasing issue)
-          if ((sourceValue === undefined || _.isObject(sourceValue) && _.isEmpty(sourceValue)) && result[''] && result[''][source_property]) {
-            sourceValue = result[''][source_property];
+          if ((sourceValue === undefined || _.isObject(sourceValue) && _.isEmpty(sourceValue)) && result[""] && result[""][source_property]) {
+            sourceValue = result[""][source_property];
           }
 
           // Get the ID to match against - either a string ID or the id property of an object
@@ -1540,16 +1599,16 @@ class SpiceModel {
       var p = (_this14$_ctx = _this14[_ctx]) == null ? void 0 : _this14$_ctx.profiler;
       var columnArray = [];
       if (columns) {
-        columns.split(',').forEach(col => {
+        columns.split(",").forEach(col => {
           var parts = col.trim().split("."); // remove the first segment
           // Also match if parts[0] is source_property or '`' + source_property + '`'
           var firstPart = parts[0];
           // Remove backticks if present
-          var cleanFirstPart = firstPart && firstPart.startsWith('`') && firstPart.endsWith('`') ? firstPart.slice(1, -1) : firstPart;
+          var cleanFirstPart = firstPart && firstPart.startsWith("`") && firstPart.endsWith("`") ? firstPart.slice(1, -1) : firstPart;
           if (parts.length > 0 && (firstPart === source_property || cleanFirstPart === source_property)) {
             // Use cleanFirstPart for the map key to handle both cases consistently
             // Remove backticks from each column segment, if present, before joining
-            columnArray.push(parts.slice(1).map(segment => segment && segment.startsWith('`') && segment.endsWith('`') ? segment.slice(1, -1) : segment).join("."));
+            columnArray.push(parts.slice(1).map(segment => segment && segment.startsWith("`") && segment.endsWith("`") ? segment.slice(1, -1) : segment).join("."));
           }
         });
       }
@@ -1561,12 +1620,16 @@ class SpiceModel {
       if (isExempt || _this14[_level] + 1 < _this14[_mapping_dept]) {
         var ids = [];
         _.each(data, result => {
-          var value = [];
-          if (_.isArray(result[source_property])) {
-            value = result[source_property];
+          var value = result[source_property];
+
+          // Some list/select projections place fields under an empty-string key.
+          if ((value === undefined || _.isObject(value) && _.isEmpty(value)) && result[""] && result[""][source_property] !== undefined) {
+            value = result[""][source_property];
           }
-          if (_.isString(result[source_property])) {
-            value = [result[source_property]];
+          if (_.isString(value)) {
+            value = [value];
+          } else if (!_.isArray(value)) {
+            value = [];
           }
 
           // Extract IDs - handle both string IDs and objects with id property
@@ -1594,7 +1657,7 @@ class SpiceModel {
                 _level: _this14[_level] + 1,
                 mapping_dept: _this14[_mapping_dept],
                 mapping_dept_exempt: _this14[_mapping_dept_exempt],
-                _columns: columnArray.join(','),
+                _columns: columnArray.join(","),
                 _current_path: childPath
               })).getMulti({
                 skip_hooks: true,
@@ -1619,14 +1682,29 @@ class SpiceModel {
           if (returned_obj.status == "fulfilled") return returned_obj.value;
         })));
         _.each(data, result => {
+          var sourceValue = result[source_property];
+          var hasFallbackSource = result[""] && result[""][source_property] !== undefined;
           if (_.isString(result[store_property])) {
             result[store_property] = [result[store_property]];
           }
-          if (!_.has(result, source_property)) {
+          if (!_.has(result, source_property) && !hasFallbackSource) {
+            if (!_.isArray(result[store_property])) {
+              result[store_property] = [];
+            }
             result[source_property] = [];
             return;
           }
-          result[store_property] = _.map(result[source_property], item => {
+
+          // Match mapToObject behavior for projected rows that use result[""].
+          if ((sourceValue === undefined || _.isObject(sourceValue) && _.isEmpty(sourceValue)) && hasFallbackSource) {
+            sourceValue = result[""][source_property];
+          }
+          if (_.isString(sourceValue)) {
+            sourceValue = [sourceValue];
+          } else if (!_.isArray(sourceValue)) {
+            sourceValue = [];
+          }
+          result[store_property] = _.map(sourceValue, item => {
             // Get the ID to match - either a string ID or the id property of an object
             var itemId = _.isString(item) ? item : _.isObject(item) ? item.id : null;
             return _.find(returned_objects, p => p.id === itemId);
@@ -1669,7 +1747,7 @@ class SpiceModel {
   extractBaseColumns(columns) {
     if (!columns || !Array.isArray(columns)) return columns;
     return [...new Set(columns.map(col => {
-      var firstDot = col.indexOf('.');
+      var firstDot = col.indexOf(".");
       return firstDot > -1 ? col.substring(0, firstDot) : col;
     }))];
   }
@@ -1683,14 +1761,14 @@ class SpiceModel {
    */
   isFieldInColumns(fieldName, columns) {
     // No columns filter = include all
-    if (!columns || columns === '') return true;
-    var tokens = columns.split(',');
+    if (!columns || columns === "") return true;
+    var tokens = columns.split(",");
     for (var col of tokens) {
       var trimmed = col.trim();
       // Check if this column starts with the field name (exact match or nested like "fieldName.subfield")
-      var firstPart = trimmed.split('.')[0];
+      var firstPart = trimmed.split(".")[0];
       // Handle backtick-wrapped column names
-      var cleanFirstPart = firstPart.startsWith('`') && firstPart.endsWith('`') ? firstPart.slice(1, -1) : firstPart;
+      var cleanFirstPart = firstPart.startsWith("`") && firstPart.endsWith("`") ? firstPart.slice(1, -1) : firstPart;
       if (cleanFirstPart === fieldName) {
         return true;
       }

package/package.json

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