spice-js 2.6.53 → 2.6.55

package/build/models/SpiceModel.js

@@ -19,8 +19,6 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 
-global.mapping_dept = "*";
-
 var co = require("co");
 
 var regeneratorRuntime = require("regenerator-runtime");
@@ -37,7 +35,8 @@ var SDate = require("sonover-date"),
     _external_modifier_loaded = Symbol(),
     _skip_cache = Symbol(),
     _serializers = Symbol(),
-    _level = Symbol(); //const _type = Symbol("type");
+    _level = Symbol(),
+    _mapping_dept = Symbol(); //const _type = Symbol("type");
 
 
 var that;
@@ -59,20 +58,21 @@ class SpiceModel {
     }
 
     try {
-      var _args$args, _args2, _args2$args, _args3, _args3$args, _args4, _args4$args;
+      var _args2, _args2$args, _args$args, _args3, _args3$args, _args4, _args4$args, _args5, _args5$args;
 
       var dbtype = spice.config.database.connections[args.connection].type || "couchbase";
 
       var Database = require("spice-" + dbtype);
 
+      this[_mapping_dept] = ((_args2 = args) == null ? void 0 : (_args2$args = _args2.args) == null ? void 0 : _args2$args.mapping_dept) || 100;
       this.type = "";
       this.collection = args.connection;
       this[_args] = args.args;
       this[_external_modifier_loaded] = false;
       this[_disable_lifecycle_events] = ((_args$args = args.args) == null ? void 0 : _args$args.disable_lifecycle_events) || false;
-      this[_ctx] = (_args2 = args) == null ? void 0 : (_args2$args = _args2.args) == null ? void 0 : _args2$args.ctx;
-      this[_skip_cache] = ((_args3 = args) == null ? void 0 : (_args3$args = _args3.args) == null ? void 0 : _args3$args.skip_cache) || false;
-      this[_level] = ((_args4 = args) == null ? void 0 : (_args4$args = _args4.args) == null ? void 0 : _args4$args._level) || 0;
+      this[_ctx] = (_args3 = args) == null ? void 0 : (_args3$args = _args3.args) == null ? void 0 : _args3$args.ctx;
+      this[_skip_cache] = ((_args4 = args) == null ? void 0 : (_args4$args = _args4.args) == null ? void 0 : _args4$args.skip_cache) || false;
+      this[_level] = ((_args5 = args) == null ? void 0 : (_args5$args = _args5.args) == null ? void 0 : _args5$args._level) || 0;
       this[_hooks] = {
         create: {
           before: [],
@@ -533,7 +533,7 @@ class SpiceModel {
     var _this3 = this;
 
     return _asyncToGenerator(function* () {
-      var obj = _this3.getCacheProviderObject();
+      var obj = _this3.getCacheProviderObject(_this3.type);
 
       var monitor_record = yield obj.get("monitor::" + _this3.type);
 
@@ -551,7 +551,7 @@ class SpiceModel {
 
   setMonitor() {
     var current_time = new Date().getTime();
-    var obj = this.getCacheProviderObject();
+    var obj = this.getCacheProviderObject(this.type);
     var key = "monitor::" + this.type;
     var value = {
       time: current_time
@@ -566,9 +566,7 @@ class SpiceModel {
 
     return _asyncToGenerator(function* () {
       try {
-        var _args5;
-
-        global.mapping_dept = ((_args5 = args) == null ? void 0 : _args5.mapping_dept) ? Number(args.mapping_dept) : global.mapping_dept;
+        if (args.mapping_dept) _this4[_mapping_dept] = args.mapping_dept;
 
         if (!args) {
           args = {};
@@ -586,7 +584,7 @@ class SpiceModel {
             var cached_results = yield _this4.getCacheProviderObject(_this4.type).get(key);
             results = cached_results == null ? void 0 : cached_results.value;
 
-            if ((cached_results == null ? void 0 : cached_results.value) == undefined || (yield _this4.shouldForceRefresh(cached_results)) || _this4.type == "workflow") {
+            if ((cached_results == null ? void 0 : cached_results.value) === undefined || (yield _this4.shouldForceRefresh(cached_results)) || _this4.type == "workflow") {
               results = yield _this4.database.get(args.id);
               yield _this4.getCacheProviderObject(_this4.type).set(key, {
                 value: results,
@@ -663,7 +661,7 @@ class SpiceModel {
             var cached_results = yield _this6.getCacheProviderObject(_this6.type).get(key);
             results = cached_results == null ? void 0 : cached_results.value;
 
-            if ((cached_results == null ? void 0 : cached_results.value) == undefined || (yield _this6.shouldForceRefresh(cached_results))) {
+            if ((cached_results == null ? void 0 : cached_results.value) === undefined || (yield _this6.shouldForceRefresh(cached_results))) {
               results = yield _this6.database.multi_get(args.ids, true);
 
               _this6.getCacheProviderObject(_this6.type).set(key, {
@@ -916,11 +914,11 @@ class SpiceModel {
         if (column === "meta().id") return undefined;
 
         if (!column.startsWith("`") && !column.endsWith("`")) {
-          column = "`" + column + "`";
+          column = "`" + column.trim() + "`";
         }
 
         if (column && !column.includes(".") && !column.startsWith(this.type)) {
-          column = "`" + this.type + "`." + column;
+          column = "`" + this.type + "`." + column.trim();
         }
 
         return column;
@@ -931,11 +929,33 @@ class SpiceModel {
   }
 
   filterResultsByColumns(data, columns) {
+    if (this.type === "user") {
+      console.log("Filter Columns::", columns);
+    }
+
     if (columns && columns !== "") {
-      columns = columns.replace(/`/g, "").replace(/meta\(\)\.id/g, "id");
-      var columnList = columns.split(",").map(column => column.includes(".") ? _.last(column.split(".")) : column);
-      columnList.push("_permissions", "_permissions_", "id");
-      return data.map(entry => _.pick(entry, columnList));
+      // Remove backticks and replace meta().id with id
+      var cleanedColumns = columns.replace(/`/g, "").replace(/meta\(\)\.id/g, "id"); // Process each column by splitting on comma and trimming
+
+      var columnList = cleanedColumns.split(",").map(col => col.trim()).map(col => {
+        // Check for alias with AS (case-insensitive)
+        var aliasMatch = col.match(/\s+AS\s+([\w]+)/i);
+
+        if (aliasMatch) {
+          return aliasMatch[1].trim();
+        } // Otherwise, if a dot is present, take the part after the last dot
+
+
+        if (col.includes(".")) {
+          return col.split(".").pop().trim();
+        }
+
+        return col;
+      }); // Ensure that essential keys are always picked
+
+      var requiredKeys = ["_permissions", "_permissions_", "id"];
+      var finalKeys = [...new Set([...columnList, ...requiredKeys])];
+      return data.map(entry => _.pick(entry, finalKeys));
     }
 
     return data;
@@ -984,6 +1004,69 @@ class SpiceModel {
     return str.replace(/[^a-zA-Z0-9]/g, "");
   }
 
+  fixColumnName(columns) {
+    // Guard clause: if columns is not provided or not a string, return it as-is.
+    if (!columns || typeof columns !== "string") {
+      return columns;
+    } // Split the columns string on commas and trim each column expression.
+
+
+    var columnList = columns.split(",").map(col => col.trim()); // Object to keep track of alias usage to avoid duplicates.
+
+    var aliasTracker = {};
+    var fixedColumns = columnList.map(col => {
+      // Check if an explicit alias is already provided.
+      var aliasRegex = /\s+AS\s+`?([\w]+)`?$/i;
+      var aliasMatch = col.match(aliasRegex);
+      var explicitAlias = aliasMatch ? aliasMatch[1] : null; // Remove the alias clause for easier processing.
+
+      var colWithoutAlias = explicitAlias ? col.replace(aliasRegex, "").trim() : col; // Use regex to extract the table and column names.
+      // This regex matches optional backticks around each identifier.
+
+      var tableName = this.type;
+      var columnName = "";
+      var columnRegex = /^`?([\w]+)`?\.`?([\w]+)`?$/;
+      var match = colWithoutAlias.match(columnRegex);
+
+      if (match) {
+        tableName = match[1];
+        columnName = match[2];
+      } else {
+        // If no table prefix is found, use the column name only.
+        columnName = colWithoutAlias.replace(/`/g, "");
+      } // Generate the alias.
+      // If the column comes from a table different from this.type, then the alias
+      // becomes tableName_columnName. Otherwise, just use the column name.
+
+
+      var newAlias = columnName;
+
+      if (tableName && tableName !== this.type) {
+        newAlias = tableName + "_" + columnName; // If an explicit alias was provided, favor that.
+
+        if (explicitAlias) {
+          newAlias = explicitAlias;
+        } // Avoid duplicates by appending a count if needed.
+
+
+        if (aliasTracker.hasOwnProperty(newAlias)) {
+          aliasTracker[newAlias]++;
+          newAlias = newAlias + "_" + aliasTracker[newAlias];
+        } else {
+          aliasTracker[newAlias] = 0;
+        } // If there's no explicit alias, add an alias clause.
+
+
+        if (!explicitAlias) {
+          return colWithoutAlias + " AS `" + newAlias + "`";
+        }
+      }
+
+      return col;
+    });
+    return fixedColumns.join(", ");
+  }
+
   list(args) {
     var _this12 = this;
 
@@ -993,10 +1076,12 @@ class SpiceModel {
       }
 
       try {
-        var _args6, _args7, _args8, _args9;
+        var _args6, _args7, _args8;
 
         args.columns = _this12.prepColumns(args.columns);
+        if (args.mapping_dept) _this12[_mapping_dept] = args.mapping_dept;
         var nestings = [..._this12.extractNestings((_args6 = args) == null ? void 0 : _args6.query, _this12.type), ..._this12.extractNestings((_args7 = args) == null ? void 0 : _args7.columns, _this12.type), ..._this12.extractNestings((_args8 = args) == null ? void 0 : _args8.sort, _this12.type)];
+        args.columns = _this12.fixColumnName(args.columns);
 
         var mappedNestings = _.compact(_.uniq(nestings).map(nesting => {
           var _prop$map;
@@ -1028,7 +1113,6 @@ class SpiceModel {
 
         args.limit = Number(args.limit) || undefined;
         args.offset = Number(args.offset) || 0;
-        global.mapping_dept = ((_args9 = args) == null ? void 0 : _args9.mapping_dept) ? Number(args.mapping_dept) : global.mapping_dept;
         args.sort = args.sort ? args.sort.split(",").map(item => item.includes(".") ? item : "`" + _this12.type + "`." + _this12.formatSortComponent(item)).join(",") : "`" + _this12.type + "`.created_at DESC";
 
         if (args.skip_hooks !== true) {
@@ -1042,8 +1126,7 @@ class SpiceModel {
         if (_this12.shouldUseCache(_this12.type)) {
           var cachedResults = yield _this12.getCacheProviderObject(_this12.type).get(cacheKey);
           results = cachedResults == null ? void 0 : cachedResults.value;
-
-          if (!results || (yield _this12.shouldForceRefresh(cachedResults))) {
+          if ((cachedResults == null ? void 0 : cachedResults.value) === undefined) if (!results || (yield _this12.shouldForceRefresh(cachedResults))) {
             results = yield _this12.fetchResults(args, query);
             yield _this12.getCacheProviderObject(_this12.type).set(cacheKey, {
               value: results,
@@ -1058,6 +1141,8 @@ class SpiceModel {
           results.data = yield _this12.do_serialize(results.data, "read", {}, args, (yield _this12.propsToBeRemoved(results.data)));
         }
 
+        if (_this12.type == "user") console.log("results", results.data);
+
         if (args.skip_hooks !== true) {
           yield _this12.run_hook(results.data, "list", "after");
         }
@@ -1158,7 +1243,9 @@ class SpiceModel {
         data = Array.of(data);
       }
 
-      if (_this15[_level] < global.mapping_dept || global.mapping_dept == "*") {
+      _this15[_mapping_dept];
+
+      if (_this15[_level] + 1 < _this15[_mapping_dept]) {
         var classes = _.isArray(Class) ? Class : [Class];
         var ids = [];
 
@@ -1171,7 +1258,8 @@ class SpiceModel {
         var returned_all = yield Promise.allSettled(_.map(classes, obj => {
           return new obj(_extends({}, _this15[_args], {
             skip_cache: _this15[_skip_cache],
-            _level: _this15[_level] + 1
+            _level: _this15[_level] + 1,
+            mapping_dept: _this15[_mapping_dept]
           })).getMulti({
             skip_hooks: true,
             ids: ids
@@ -1205,7 +1293,7 @@ class SpiceModel {
         data = Array.of(data);
       }
 
-      if (_this16[_level] < global.mapping_dept || global.mapping_dept == "*") {
+      if (_this16[_level] + 1 < _this16[_mapping_dept]) {
         var ids = [];
 
         _.each(data, result => {
@@ -1228,7 +1316,8 @@ class SpiceModel {
         var returned_all = yield Promise.allSettled(_.map(classes, obj => {
           return new obj(_extends({}, _this16[_args], {
             skip_cache: _this16[_skip_cache],
-            _level: _this16[_level] + 1
+            _level: _this16[_level] + 1,
+            mapping_dept: _this16[_mapping_dept]
           })).getMulti({
             skip_hooks: true,
             ids: ids
@@ -1362,70 +1451,78 @@ class SpiceModel {
     var _this18 = this;
 
     return _asyncToGenerator(function* () {
-      //console.log("CTX INside Model DO", this[_ctx]);
+      if (path_to_be_removed === void 0) {
+        path_to_be_removed = [];
+      }
+
       try {
-        // run serializers
-        if (!path_to_be_removed) {
-          path_to_be_removed = [];
-        }
+        var _this18$_serializers, _this18$_serializers$;
+
+        // Early exit if serialization should not run.
+        if (!_this18.shouldSerializerRun(args, type)) {
+          return data;
+        } // Add external modifiers only once.
+
+
+        if (_this18.type && !_this18[_external_modifier_loaded]) {
+          _this18.addExternalModifiers(_this18.type);
 
-        if (_this18.shouldSerializerRun(args, type)) {
-          if (_this18.type != "" && _this18.type != undefined && _this18[_external_modifier_loaded] != true) {
-            _this18.addExternalModifiers(_this18.type);
+          _this18[_external_modifier_loaded] = true;
+        } // Cache the modifiers lookup for the specified type.
 
-            _this18[_external_modifier_loaded] = true;
+
+        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);
+          } catch (error) {
+            console.error("Modifier error in do_serialize:", error.stack);
           }
+        } // Ensure data is always an array for consistent processing.
 
-          for (var i of _this18[_serializers][type]["modifiers"]) {
-            try {
-              data = yield i(data, old_data, _this18[_ctx], _this18.type);
-            } catch (e) {
-              console.log(e.stack);
-            }
-          } // make data an array
 
+        var originalIsArray = Array.isArray(data);
 
-          var original_is_array = _.isArray(data);
+        if (!originalIsArray) {
+          data = [data];
+        } // Compute the defaults from properties using reduce.
 
-          if (!original_is_array) {
-            data = Array.of(data);
-          } // get defaults from peroperties
 
+        var defaults = Object.keys(_this18.props).reduce((acc, key) => {
+          var _this18$props$key, _this18$props$key$def;
 
-          var defaults = {};
+          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];
 
-          for (var _i in _this18.props) {
-            if (_this18.props[_i].defaults != undefined && _this18.props[_i].defaults[type] != undefined && _this18.props[_i].defaults[type] != undefined) {
-              defaults[_i] = _.isFunction(_this18.props[_i].defaults[type]) ? _this18.props[_i].defaults[type]({
-                old_data: data,
-                new_data: old_data
-              }) : _this18.props[_i].defaults[type];
-            }
-          } // apply defaults
+          if (def !== undefined) {
+            acc[key] = _.isFunction(def) ? def({
+              old_data: data,
+              new_data: old_data
+            }) : def;
+          }
 
+          return acc;
+        }, {}); // Merge defaults into each object.
 
-          for (var _i2 of data) {
-            _.defaults(_i2, defaults);
-          } // apply cleaners
+        data = data.map(item => _.defaults(item, defaults)); // If type is "read", clean the data by omitting certain props.
 
+        if (type === "read") {
+          // Collect hidden properties from schema.
+          var hiddenProps = Object.keys(_this18.props).filter(key => {
+            var _this18$props$key2;
 
-          if (type == "read") {
-            var props_to_clean = ["deleted", "type", ...path_to_be_removed];
+            return (_this18$props$key2 = _this18.props[key]) == null ? void 0 : _this18$props$key2.hide;
+          }); // Combine default props to remove.
 
-            for (var _i3 in _this18.props) {
-              if (_this18.props[_i3].hide) {
-                props_to_clean.push(_i3);
-              }
-            }
+          var propsToClean = ["deleted", "type", ...path_to_be_removed, ...hiddenProps];
+          data = data.map(item => _.omit(item, propsToClean));
+        } // Return in the original format (array or single object).
 
-            data = _.map(data, obj => _.omit(obj, props_to_clean));
-          }
 
-          return original_is_array ? data : _.first(data);
-        }
-      } catch (e) {
-        console.log(e.stack);
-        throw e;
+        return originalIsArray ? data : data[0];
+      } catch (error) {
+        console.error("Error in do_serialize:", error.stack);
+        throw error;
       }
     })();
   }

package/package.json

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

package/src/models/SpiceModel.js

@@ -165,15 +165,17 @@ export default class SpiceModel {
               }
               case Number:
               case "number": {
-                this[i] = _.isNumber(args.args[i])
-                  ? args.args[i]
+                this[i] =
+                  _.isNumber(args.args[i]) ?
+                    args.args[i]
                   : Number(args.args[i]);
                 break;
               }
               case Boolean:
               case "boolean": {
-                this[i] = _.isBoolean(args.args[i])
-                  ? args.args[i]
+                this[i] =
+                  _.isBoolean(args.args[i]) ?
+                    args.args[i]
                   : args.args[i] == "true" ||
                     args.args[i] == 1 ||
                     args.args[i] == "True";
@@ -186,15 +188,17 @@ export default class SpiceModel {
               }
               case Array:
               case "array": {
-                this[i] = _.isArray(args.args[i])
-                  ? args.args[i]
+                this[i] =
+                  _.isArray(args.args[i]) ?
+                    args.args[i]
                   : JSON.parse(args.args[i]);
                 break;
               }
               case Object:
               case "object": {
-                this[i] = _.isObject(args.args[i])
-                  ? args.args[i]
+                this[i] =
+                  _.isObject(args.args[i]) ?
+                    args.args[i]
                   : JSON.parse(args.args[i]);
                 break;
               }
@@ -458,7 +462,7 @@ export default class SpiceModel {
   }
 
   async shouldForceRefresh(response) {
-    let obj = this.getCacheProviderObject();
+    let obj = this.getCacheProviderObject(this.type);
     let monitor_record = await obj.get(`monitor::${this.type}`);
     if (monitor_record == undefined) {
       return false;
@@ -471,7 +475,7 @@ export default class SpiceModel {
 
   setMonitor() {
     let current_time = new Date().getTime();
-    let obj = this.getCacheProviderObject();
+    let obj = this.getCacheProviderObject(this.type);
     let key = `monitor::${this.type}`;
     let value = { time: current_time };
     obj.set(key, value, { ttl: 0 });
@@ -497,7 +501,7 @@ export default class SpiceModel {
 
           results = cached_results?.value;
           if (
-            cached_results?.value == undefined ||
+            cached_results?.value === undefined ||
             (await this.shouldForceRefresh(cached_results)) ||
             this.type == "workflow"
           ) {
@@ -573,7 +577,7 @@ export default class SpiceModel {
           );
           results = cached_results?.value;
           if (
-            cached_results?.value == undefined ||
+            cached_results?.value === undefined ||
             (await this.shouldForceRefresh(cached_results))
           ) {
             results = await this.database.multi_get(args.ids, true);
@@ -815,14 +819,14 @@ export default class SpiceModel {
           columnList.map((column) => {
             if (column === "meta().id") return undefined;
             if (!column.startsWith("`") && !column.endsWith("`")) {
-              column = `\`${column}\``;
+              column = `\`${column.trim()}\``;
             }
             if (
               column &&
               !column.includes(".") &&
               !column.startsWith(this.type)
             ) {
-              column = `\`${this.type}\`.${column}`;
+              column = `\`${this.type}\`.${column.trim()}`;
             }
             return column;
           })
@@ -834,15 +838,37 @@ export default class SpiceModel {
   }
 
   filterResultsByColumns(data, columns) {
+    if (this.type === "user") {
+      console.log("Filter Columns::", columns);
+    }
     if (columns && columns !== "") {
-      columns = columns.replace(/`/g, "").replace(/meta\(\)\.id/g, "id");
-      let columnList = columns
+      // Remove backticks and replace meta().id with id
+      const cleanedColumns = columns
+        .replace(/`/g, "")
+        .replace(/meta\(\)\.id/g, "id");
+
+      // Process each column by splitting on comma and trimming
+      const columnList = cleanedColumns
         .split(",")
-        .map((column) =>
-          column.includes(".") ? _.last(column.split(".")) : column
-        );
-      columnList.push("_permissions", "_permissions_", "id");
-      return data.map((entry) => _.pick(entry, columnList));
+        .map((col) => col.trim())
+        .map((col) => {
+          // Check for alias with AS (case-insensitive)
+          const aliasMatch = col.match(/\s+AS\s+([\w]+)/i);
+          if (aliasMatch) {
+            return aliasMatch[1].trim();
+          }
+          // Otherwise, if a dot is present, take the part after the last dot
+          if (col.includes(".")) {
+            return col.split(".").pop().trim();
+          }
+          return col;
+        });
+
+      // Ensure that essential keys are always picked
+      const requiredKeys = ["_permissions", "_permissions_", "id"];
+      const finalKeys = [...new Set([...columnList, ...requiredKeys])];
+
+      return data.map((entry) => _.pick(entry, finalKeys));
     }
     return data;
   }
@@ -899,9 +925,76 @@ export default class SpiceModel {
     return str.replace(/[^a-zA-Z0-9]/g, "");
   }
 
+  fixColumnName(columns) {
+    // Guard clause: if columns is not provided or not a string, return it as-is.
+    if (!columns || typeof columns !== "string") {
+      return columns;
+    }
+
+    // Split the columns string on commas and trim each column expression.
+    const columnList = columns.split(",").map((col) => col.trim());
+    // Object to keep track of alias usage to avoid duplicates.
+    const aliasTracker = {};
+
+    const fixedColumns = columnList.map((col) => {
+      // Check if an explicit alias is already provided.
+      const aliasRegex = /\s+AS\s+`?([\w]+)`?$/i;
+      const aliasMatch = col.match(aliasRegex);
+      let explicitAlias = aliasMatch ? aliasMatch[1] : null;
+
+      // Remove the alias clause for easier processing.
+      let colWithoutAlias =
+        explicitAlias ? col.replace(aliasRegex, "").trim() : col;
+
+      // Use regex to extract the table and column names.
+      // This regex matches optional backticks around each identifier.
+      let tableName = this.type;
+      let columnName = "";
+      const columnRegex = /^`?([\w]+)`?\.`?([\w]+)`?$/;
+      const match = colWithoutAlias.match(columnRegex);
+      if (match) {
+        tableName = match[1];
+        columnName = match[2];
+      } else {
+        // If no table prefix is found, use the column name only.
+        columnName = colWithoutAlias.replace(/`/g, "");
+      }
+
+      // Generate the alias.
+      // If the column comes from a table different from this.type, then the alias
+      // becomes tableName_columnName. Otherwise, just use the column name.
+      let newAlias = columnName;
+      if (tableName && tableName !== this.type) {
+        newAlias = `${tableName}_${columnName}`;
+
+        // If an explicit alias was provided, favor that.
+        if (explicitAlias) {
+          newAlias = explicitAlias;
+        }
+
+        // Avoid duplicates by appending a count if needed.
+        if (aliasTracker.hasOwnProperty(newAlias)) {
+          aliasTracker[newAlias]++;
+          newAlias = `${newAlias}_${aliasTracker[newAlias]}`;
+        } else {
+          aliasTracker[newAlias] = 0;
+        }
+
+        // If there's no explicit alias, add an alias clause.
+        if (!explicitAlias) {
+          return `${colWithoutAlias} AS \`${newAlias}\``;
+        }
+      }
+      return col;
+    });
+
+    return fixedColumns.join(", ");
+  }
+
   async list(args = {}) {
     try {
       args.columns = this.prepColumns(args.columns);
+
       if (args.mapping_dept) this[_mapping_dept] = args.mapping_dept;
 
       const nestings = [
@@ -910,6 +1003,8 @@ export default class SpiceModel {
         ...this.extractNestings(args?.sort, this.type),
       ];
 
+      args.columns = this.fixColumnName(args.columns);
+
       const mappedNestings = _.compact(
         _.uniq(nestings).map((nesting) => {
           const prop = this.props[nesting];
@@ -930,11 +1025,11 @@ export default class SpiceModel {
       if (args.is_full_text === "true" || args.is_custom_query === "true") {
         query = args.query;
       } else {
-        query = args.filters
-          ? this.makeQueryFromFilter(args.filters)
-          : args.query
-            ? `${args.query} AND (\`${this.type}\`.deleted = false OR \`${this.type}\`.deleted IS MISSING)`
-            : `(\`${this.type}\`.deleted = false OR \`${this.type}\`.deleted IS MISSING)`;
+        query =
+          args.filters ? this.makeQueryFromFilter(args.filters)
+          : args.query ?
+            `${args.query} AND (\`${this.type}\`.deleted = false OR \`${this.type}\`.deleted IS MISSING)`
+          : `(\`${this.type}\`.deleted = false OR \`${this.type}\`.deleted IS MISSING)`;
       }
 
       if (hasSQLInjection(query)) {
@@ -943,13 +1038,14 @@ export default class SpiceModel {
 
       args.limit = Number(args.limit) || undefined;
       args.offset = Number(args.offset) || 0;
-      args.sort = args.sort
-        ? args.sort
+      args.sort =
+        args.sort ?
+          args.sort
             .split(",")
             .map((item) =>
-              item.includes(".")
-                ? item
-                : `\`${this.type}\`.${this.formatSortComponent(item)}`
+              item.includes(".") ? item : (
+                `\`${this.type}\`.${this.formatSortComponent(item)}`
+              )
             )
             .join(",")
         : `\`${this.type}\`.created_at DESC`;
@@ -969,14 +1065,15 @@ export default class SpiceModel {
         );
         results = cachedResults?.value;
 
-        if (!results || (await this.shouldForceRefresh(cachedResults))) {
-          results = await this.fetchResults(args, query);
-          await this.getCacheProviderObject(this.type).set(
-            cacheKey,
-            { value: results, time: new Date().getTime() },
-            this.getCacheConfig(this.type)
-          );
-        }
+        if (cachedResults?.value === undefined)
+          if (!results || (await this.shouldForceRefresh(cachedResults))) {
+            results = await this.fetchResults(args, query);
+            await this.getCacheProviderObject(this.type).set(
+              cacheKey,
+              { value: results, time: new Date().getTime() },
+              this.getCacheConfig(this.type)
+            );
+          }
       } else {
         results = await this.fetchResults(args, query);
       }
@@ -991,6 +1088,8 @@ export default class SpiceModel {
         );
       }
 
+      if (this.type == "user") console.log("results", results.data);
+
       if (args.skip_hooks !== true) {
         await this.run_hook(results.data, "list", "after");
       }
@@ -1238,9 +1337,9 @@ export default class SpiceModel {
                   execute: async (data) => {
                     return await this.mapToObject(
                       data,
-                      _.isString(properties[i].map.reference)
-                        ? spice.models[properties[i].map.reference]
-                        : properties[i].map.reference,
+                      _.isString(properties[i].map.reference) ?
+                        spice.models[properties[i].map.reference]
+                      : properties[i].map.reference,
                       i,
                       properties[i].map.destination || i,
                       properties[i]
@@ -1256,9 +1355,9 @@ export default class SpiceModel {
                   execute: async (data) => {
                     return await this.mapToObjectArray(
                       data,
-                      _.isString(properties[i].map.reference)
-                        ? spice.models[properties[i].map.reference]
-                        : properties[i].map.reference,
+                      _.isString(properties[i].map.reference) ?
+                        spice.models[properties[i].map.reference]
+                      : properties[i].map.reference,
                       i,
                       properties[i].map.destination || i,
                       properties[i]
@@ -1278,76 +1377,71 @@ export default class SpiceModel {
     }
   }
 
-  async do_serialize(data, type, old_data, args, path_to_be_removed) {
-    //console.log("CTX INside Model DO", this[_ctx]);
+  async do_serialize(data, type, old_data, args, path_to_be_removed = []) {
     try {
-      // run serializers
+      // Early exit if serialization should not run.
+      if (!this.shouldSerializerRun(args, type)) {
+        return data;
+      }
 
-      if (!path_to_be_removed) {
-        path_to_be_removed = [];
+      // Add external modifiers only once.
+      if (this.type && !this[_external_modifier_loaded]) {
+        this.addExternalModifiers(this.type);
+        this[_external_modifier_loaded] = true;
       }
 
-      if (this.shouldSerializerRun(args, type)) {
-        if (
-          this.type != "" &&
-          this.type != undefined &&
-          this[_external_modifier_loaded] != true
-        ) {
-          this.addExternalModifiers(this.type);
-          this[_external_modifier_loaded] = true;
-        }
-        for (let i of this[_serializers][type]["modifiers"]) {
-          try {
-            data = await i(data, old_data, this[_ctx], this.type);
-          } catch (e) {
-            console.log(e.stack);
-          }
+      // 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);
+        } catch (error) {
+          console.error("Modifier error in do_serialize:", error.stack);
         }
+      }
 
-        // make data an array
-        let original_is_array = _.isArray(data);
+      // Ensure data is always an array for consistent processing.
+      const originalIsArray = Array.isArray(data);
+      if (!originalIsArray) {
+        data = [data];
+      }
 
-        if (!original_is_array) {
-          data = Array.of(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;
+      }, {});
 
-        // get defaults from peroperties
-        let defaults = {};
-        for (let i in this.props) {
-          if (
-            this.props[i].defaults != undefined &&
-            this.props[i].defaults[type] != undefined &&
-            this.props[i].defaults[type] != undefined
-          ) {
-            defaults[i] = _.isFunction(this.props[i].defaults[type])
-              ? this.props[i].defaults[type]({
-                  old_data: data,
-                  new_data: old_data,
-                })
-              : this.props[i].defaults[type];
-          }
-        }
-        // apply defaults
-        for (let i of data) {
-          _.defaults(i, defaults);
-        }
-
-        // apply cleaners
-        if (type == "read") {
-          let props_to_clean = ["deleted", "type", ...path_to_be_removed];
-          for (let i in this.props) {
-            if (this.props[i].hide) {
-              props_to_clean.push(i);
-            }
-          }
-          data = _.map(data, (obj) => _.omit(obj, props_to_clean));
-        }
+      // Merge defaults into each object.
+      data = data.map((item) => _.defaults(item, defaults));
 
-        return original_is_array ? data : _.first(data);
+      // If type is "read", clean the data by omitting certain props.
+      if (type === "read") {
+        // 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",
+          "type",
+          ...path_to_be_removed,
+          ...hiddenProps,
+        ];
+        data = data.map((item) => _.omit(item, propsToClean));
       }
-    } catch (e) {
-      console.log(e.stack);
-      throw e;
+
+      // Return in the original format (array or single object).
+      return originalIsArray ? data : data[0];
+    } catch (error) {
+      console.error("Error in do_serialize:", error.stack);
+      throw error;
     }
   }
 }