millas 0.2.17 → 0.2.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "millas",
-  "version": "0.2.17",
+  "version": "0.2.19",
   "description": "A modern batteries-included backend framework for Node.js — built on Express, inspired by Laravel, Django, and FastAPI",
   "main": "src/index.js",
   "exports": {

package/src/http/RequestContext.js

@@ -102,8 +102,10 @@ class RequestContext {
     // Uploaded files (populated by multer or similar middleware)
     // req.files → multi-file upload  { avatar: File, resume: File }
     // req.file  → single-file upload (multer .single())
-    this.files = millaReq.raw.files || {};
-    this.file  = millaReq.raw.file  || null;
+    // Prefer UploadedFile-wrapped instances set by UploadMiddleware (_millaFile/_millaFiles).
+    // Fall back to raw multer objects only if UploadMiddleware hasn't run.
+    this.file  = millaReq.raw._millaFile  || millaReq.raw.file  || null;
+    this.files = millaReq.raw._millaFiles || millaReq.raw.files || {};
 
     // ── headers ───────────────────────────────────────────────────────────────
     this.headers = millaReq.raw.headers || {};

package/src/http/middleware/UploadMiddleware.js

@@ -121,7 +121,7 @@ class UploadMiddleware {
    */
   async handle(ctx, next) {
     const expressReq  = ctx.req.raw;
-    const contentType = expressReq.headers?.['content-type'] || '';
+    const contentType = ctx.headers?.['content-type'] || '';
 
     // Skip multer entirely for non-multipart requests.
     // ctx.file / ctx.files stay null/{} — the handler or shape validation

package/src/orm/model/Model.js

@@ -291,6 +291,7 @@ class Model {
     };
 
     payload = await this.beforeCreate(payload) ?? payload;
+    payload = this._serializeForDb(payload);
 
     const q     = trx ? trx(this.table) : this._db();
     const [id]  = await q.insert(payload);
@@ -658,6 +659,7 @@ class Model {
     };
 
     payload = await this.constructor.beforeUpdate(payload) ?? payload;
+    payload = this.constructor._serializeForDb(payload);
 
     const q = trx
       ? trx(this.constructor.table)
@@ -764,11 +766,43 @@ class Model {
     const fields = this.getFields();
     const cast = {};
     for (const [key, val] of Object.entries(row)) {
-      cast[key] = (fields[key]?.type === 'boolean' && val != null) ? Boolean(val) : val;
+      cast[key] = this._castValue(val, fields[key]?.type);
     }
     return new this(cast);
   }
 
+  static _castValue(val, type) {
+    if (val == null) return val;
+    switch (type) {
+      case 'boolean':   return Boolean(val);
+      case 'integer':   return Number.isInteger(val) ? val : parseInt(val, 10);
+      case 'bigInteger':return typeof val === 'bigint' ? val : parseInt(val, 10);
+      case 'float':
+      case 'decimal':   return typeof val === 'number' ? val : parseFloat(val);
+      case 'json':      return typeof val === 'string' ? JSON.parse(val) : val;
+      case 'date':
+      case 'timestamp': return val instanceof Date ? val : new Date(val);
+      default:          return val;
+    }
+  }
+
+  static _serializeValue(val, type) {
+    if (val == null) return val;
+    if (type === 'json') return typeof val === 'string' ? val : JSON.stringify(val);
+    if (type === 'boolean') return val ? 1 : 0;
+    if ((type === 'date' || type === 'timestamp') && val instanceof Date) return val.toISOString();
+    return val;
+  }
+
+  static _serializeForDb(data) {
+    const fieldDefs = this.getFields();
+    const result = {};
+    for (const [key, val] of Object.entries(data)) {
+      result[key] = this._serializeValue(val, fieldDefs[key]?.type);
+    }
+    return result;
+  }
+
   static async _hydrateFromTrx(id, trx) {
     const row = await trx(this.table).where(this.primaryKey, id).first();
     return row ? this._hydrate(row) : null;