millas 0.2.7 → 0.2.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "millas",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "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/admin/resources/AdminResource.js

@@ -165,37 +165,80 @@ class AdminResource {
     const limit  = perPage || this.perPage;
     const offset = (page - 1) * limit;
 
-    let qb = this.model.query().orderBy(sort, order);
+    // _db() is available on all ORM versions — it returns a raw knex table query.
+    // We build everything via knex directly so this works regardless of whether
+    // the ORM changes (changes3) have been applied.
+    let q = this.model._db().orderBy(sort, order);
 
-    // Search
+    // ── Search ───────────────────────────────────────────────────────────────
     if (search && this.searchable.length) {
-      const searchable = this.searchable;
-      qb._query = qb._query.where(function () {
-        for (const col of searchable) {
+      const cols = this.searchable;
+      q = q.where(function () {
+        for (const col of cols) {
           this.orWhere(col, 'like', `%${search}%`);
         }
       });
     }
 
-    // Filters (supports __ lookups)
+    // ── Filters ──────────────────────────────────────────────────────────────
+    // Translate __ lookup syntax into knex calls so filter controls work
+    // even without the ORM changes applied.
     for (const [key, value] of Object.entries(filters)) {
-      if (value !== '' && value !== null && value !== undefined) {
-        qb.where(key, value);
+      if (value === '' || value === null || value === undefined) continue;
+
+      const dunder = key.lastIndexOf('__');
+      if (dunder === -1) {
+        q = q.where(key, value);
+        continue;
+      }
+
+      const col    = key.slice(0, dunder);
+      const lookup = key.slice(dunder + 2);
+
+      switch (lookup) {
+        case 'exact':   q = q.where(col, value);           break;
+        case 'not':     q = q.where(col, '!=', value);     break;
+        case 'gt':      q = q.where(col, '>',  value);     break;
+        case 'gte':     q = q.where(col, '>=', value);     break;
+        case 'lt':      q = q.where(col, '<',  value);     break;
+        case 'lte':     q = q.where(col, '<=', value);     break;
+        case 'isnull':  q = value ? q.whereNull(col) : q.whereNotNull(col); break;
+        case 'in':      q = q.whereIn(col, Array.isArray(value) ? value : [value]); break;
+        case 'notin':   q = q.whereNotIn(col, Array.isArray(value) ? value : [value]); break;
+        case 'between': q = q.whereBetween(col, value);    break;
+        case 'contains':
+        case 'icontains': q = q.where(col, 'like', `%${value}%`); break;
+        case 'startswith':
+        case 'istartswith': q = q.where(col, 'like', `${value}%`); break;
+        case 'endswith':
+        case 'iendswith': q = q.where(col, 'like', `%${value}`); break;
+        default:        q = q.where(key, value);           break;
       }
     }
 
-    // Date hierarchy drill-down
+    // ── Date hierarchy ────────────────────────────────────────────────────────
     if (this.dateHierarchy) {
-      if (year)  qb.where(`${this.dateHierarchy}__year`, Number(year));
-      if (month) qb.where(`${this.dateHierarchy}__month`, Number(month));
+      const col = this.dateHierarchy;
+      if (year) {
+        // SQLite / MySQL / PG compatible
+        q = q.whereRaw(`strftime('%Y', "${col}") = ?`, [String(year)])
+          .catch
+          // If strftime not available (PG), fall through — best effort
+          || q;
+      }
+      if (month) {
+        q = q.whereRaw(`strftime('%m', "${col}") = ?`, [String(month).padStart(2, '0')]);
+      }
     }
 
-    const [rows, total] = await Promise.all([
-      qb._query.clone().limit(limit).offset(offset),
-      qb._query.clone().clearSelect().count('* as count').first()
-        .then(r => Number(r?.count ?? 0)),
+    // ── Execute ───────────────────────────────────────────────────────────────
+    const [rows, countResult] = await Promise.all([
+      q.clone().limit(limit).offset(offset),
+      q.clone().count('* as count').first(),
     ]);
 
+    const total = Number(countResult?.count ?? 0);
+
     return {
       data:     rows.map(r => this.model._hydrate(r)),
       total,
@@ -494,11 +537,11 @@ class AdminInline {
   async fetchRows(parentId) {
     if (!this.model || !this.foreignKey) return [];
     try {
-      const rows = await this.model.query()
+      const rows = await this.model._db()
         .where(this.foreignKey, parentId)
         .limit(this.perPage)
-        .get();
-      return rows.map(r => r.toJSON ? r.toJSON() : r);
+        .orderBy('id', 'desc');
+      return rows.map(r => this.model._hydrate ? this.model._hydrate(r) : r);
     } catch { return []; }
   }