@airoom/nextmin-node 0.1.7 → 0.1.9

package/dist/api/router/mountCrudRoutes.js

@@ -213,21 +213,7 @@ function mountCrudRoutes(ctx, modelNameLC) {
             const sortRaw = String(req.query.sort ?? '').trim();
             const sortTypeRaw = String(req.query.sortType ?? '').trim();
             const filter = {};
-            const buildSortSpec = () => {
-                const keys = (0, utils_1.splitCSV)(sortRaw);
-                const dirs = (0, utils_1.splitCSV)(sortTypeRaw);
-                const s = {};
-                keys.forEach((k, i) => {
-                    if (!schema.attributes?.[k])
-                        return;
-                    const d = dirs[i] ?? dirs[dirs.length - 1] ?? 'desc';
-                    s[k] = /^(desc|-1)$/i.test(d) ? -1 : 1;
-                });
-                if (!Object.keys(s).length)
-                    s.createdAt = -1;
-                return s;
-            };
-            // SEARCH
+            // ---------- SEARCH ----------
             const ors = [];
             const ands = [];
             if (q && searchKey && schema.attributes?.[searchKey]) {
@@ -277,7 +263,7 @@ function mountCrudRoutes(ctx, modelNameLC) {
                         filter[dateKey] = range;
                 }
             }
-            // arbitrary field filters ---- Direct field filters from req.query (e.g., ?isPublic=true&key=doctor) ----
+            // ---------- Direct field filters from req.query ----------
             const RESERVED = new Set([
                 'page',
                 'limit',
@@ -354,21 +340,23 @@ function mountCrudRoutes(ctx, modelNameLC) {
             if (!rdec.allow) {
                 return res.status(403).json({ error: true, message: 'forbidden' });
             }
-            const baseSort = buildSortSpec();
+            // ---------- SORT (updated; type-safe; honors client; allows virtual keys) ----------
+            const baseKeys = new Set(Object.keys(schema.attributes || {}));
+            const baseSort = (0, utils_1.parseSort)(sortRaw, sortTypeRaw, baseKeys);
             const finalFilter = (0, authorize_1.andFilter)(filter, rdec.queryFilter || {});
             const isUsersModel = modelNameLC === 'user' ||
                 modelNameLC === 'users' ||
                 (schema?.modelName ?? '').toLowerCase() === 'users';
             const currentUserId = req?.user?.id;
-            // EXTENDED PATH
+            // ---------- EXTENDED PATH ----------
             if (schema.extends) {
                 const baseName = String(schema.extends);
                 const baseLC = baseName.toLowerCase();
                 const baseSchema = ctx.getSchema(baseLC);
                 const baseModel = ctx.getModel(baseLC);
-                const baseKeys = new Set(Object.keys(baseSchema.attributes || {}));
-                const { child: childFilter, base: extBaseFilter } = (0, utils_1.splitFilterForExtended)(finalFilter, baseKeys);
-                const { child: childSort, base: extBaseSort } = (0, utils_1.splitSortForExtended)(baseSort, baseKeys);
+                const baseAttrKeys = new Set(Object.keys(baseSchema.attributes || {}));
+                const { child: childFilter, base: extBaseFilter } = (0, utils_1.splitFilterForExtended)(finalFilter, baseAttrKeys);
+                const { child: childSort, base: extBaseSort } = (0, utils_1.splitSortForExtended)(baseSort, baseAttrKeys);
                 const needPrivateForHydrate = true;
                 const requiresBaseProcessing = Object.keys(extBaseFilter).length > 0 ||
                     Object.keys(extBaseSort).length > 0;
@@ -407,7 +395,26 @@ function mountCrudRoutes(ctx, modelNameLC) {
                 }
                 const combinedSort = { ...extBaseSort, ...childSort };
                 if (Object.keys(combinedSort).length) {
-                    merged = (0, utils_1.sortInMemory)(merged, combinedSort);
+                    merged = merged.sort((a, b) => {
+                        for (const k of Object.keys(combinedSort)) {
+                            const dir = combinedSort[k];
+                            const av = a?.[k];
+                            const bv = b?.[k];
+                            const ax = av instanceof Date ? +av : av;
+                            const bx = bv instanceof Date ? +bv : bv;
+                            if (ax == null && bx == null)
+                                continue;
+                            if (ax == null)
+                                return 1 * dir;
+                            if (bx == null)
+                                return -1 * dir;
+                            if (ax > bx)
+                                return 1 * dir;
+                            if (ax < bx)
+                                return -1 * dir;
+                        }
+                        return 0;
+                    });
                 }
                 // **dedupe**: one row per base entity
                 merged = (0, utils_1.dedupeBy)(merged, (r) => String(r.exId || r.id || r._id || ''));
@@ -423,9 +430,7 @@ function mountCrudRoutes(ctx, modelNameLC) {
                     paged = merged.slice(start, start + limit);
                 }
                 else {
-                    // If your model supports it, prefer a distinct count on baseId:
-                    // totalRows = await (model as any).countDistinct?.('baseId', childFilter) ?? merged.length;
-                    totalRows = merged.length; // fallback keeps UI consistent with deduped list
+                    totalRows = merged.length;
                     paged = merged.slice(0, limit);
                 }
                 const data = rdec.exposePrivate
@@ -439,7 +444,7 @@ function mountCrudRoutes(ctx, modelNameLC) {
                     sort: combinedSort,
                 });
             }
-            // NON-EXTENDED
+            // ---------- NON-EXTENDED ----------
             const sort = baseSort;
             const totalRows = await model.count(finalFilter);
             let rawRows = [];

package/dist/api/router/setupFileRoutes.d.ts

@@ -1,2 +1,2 @@
-import type { RouterCtx } from "./ctx";
+import type { RouterCtx } from './ctx';
 export declare function setupFileRoutes(ctx: RouterCtx): void;

package/dist/api/router/setupFileRoutes.js

@@ -14,23 +14,26 @@ function setupFileRoutes(ctx) {
         limits: { fileSize: 50 * 1024 * 1024, files: 20 },
     });
     const fileAuthMiddleware = (req, res, next) => ctx.authenticateMiddleware(req, res, next);
-    ctx.router.post("/files", fileAuthMiddleware, upload.any(), async (req, res) => {
+    const fileApiKeyMiddleware = (req, res, next) => ctx.apiKeyMiddleware(req, res, next);
+    ctx.router.post('/file', fileApiKeyMiddleware, upload.any(), async (req, res) => {
         try {
             const files = req.files ?? [];
             if (!files.length) {
-                return res.status(400).json({ error: true, message: "No files uploaded" });
+                return res
+                    .status(400)
+                    .json({ error: true, message: 'No files uploaded' });
             }
             const results = await Promise.all(files.map(async (f) => {
                 const folder = shortFolder();
                 const ext = (f.originalname.match(/\.([A-Za-z0-9]{1,8})$/)?.[1] ??
                     (0, filename_1.extFromMime)(f.mimetype) ??
-                    "bin").toLowerCase();
+                    'bin').toLowerCase();
                 const key = `${folder}/${shortUid()}.${ext}`;
                 const out = await ctx.fileStorage.upload({
                     key,
                     body: f.buffer,
                     contentType: f.mimetype,
-                    metadata: { originalName: f.originalname || "" },
+                    metadata: { originalName: f.originalname || '' },
                 });
                 return {
                     provider: out.provider,
@@ -46,38 +49,88 @@ function setupFileRoutes(ctx) {
             }));
             return res.json({
                 success: true,
-                message: "Files uploaded successfully",
+                message: 'Files uploaded successfully',
                 data: results,
             });
         }
         catch (err) {
-            return res.status(400).json({ error: true, message: err?.message ?? "Upload failed" });
+            return res
+                .status(400)
+                .json({ error: true, message: err?.message ?? 'Upload failed' });
         }
     });
-    ctx.router.delete("/files/:key(*)", fileAuthMiddleware, async (req, res) => {
+    ctx.router.post('/files', fileAuthMiddleware, upload.any(), async (req, res) => {
         try {
-            const key = String(req.params.key || "");
+            const files = req.files ?? [];
+            if (!files.length) {
+                return res
+                    .status(400)
+                    .json({ error: true, message: 'No files uploaded' });
+            }
+            const results = await Promise.all(files.map(async (f) => {
+                const folder = shortFolder();
+                const ext = (f.originalname.match(/\.([A-Za-z0-9]{1,8})$/)?.[1] ??
+                    (0, filename_1.extFromMime)(f.mimetype) ??
+                    'bin').toLowerCase();
+                const key = `${folder}/${shortUid()}.${ext}`;
+                const out = await ctx.fileStorage.upload({
+                    key,
+                    body: f.buffer,
+                    contentType: f.mimetype,
+                    metadata: { originalName: f.originalname || '' },
+                });
+                return {
+                    provider: out.provider,
+                    bucket: out.bucket,
+                    key: out.key,
+                    url: out.url,
+                    etag: out.etag,
+                    contentType: out.contentType,
+                    size: out.size,
+                    metadata: out.metadata,
+                    originalName: f.originalname,
+                };
+            }));
+            return res.json({
+                success: true,
+                message: 'Files uploaded successfully',
+                data: results,
+            });
+        }
+        catch (err) {
+            return res
+                .status(400)
+                .json({ error: true, message: err?.message ?? 'Upload failed' });
+        }
+    });
+    ctx.router.delete('/files/:key(*)', fileAuthMiddleware, async (req, res) => {
+        try {
+            const key = String(req.params.key || '');
             if (!key) {
-                return res.status(400).json({ error: true, message: "Key is required" });
+                return res
+                    .status(400)
+                    .json({ error: true, message: 'Key is required' });
             }
             const { deleted } = await ctx.fileStorage.delete(key);
             return res.json({
                 success: true,
-                message: deleted ? "File deleted" : "Delete attempted",
+                message: deleted ? 'File deleted' : 'Delete attempted',
                 key,
                 deleted,
             });
         }
         catch (err) {
-            return res.status(400).json({ error: true, message: err?.message ?? "Delete failed" });
+            return res
+                .status(400)
+                .json({ error: true, message: err?.message ?? 'Delete failed' });
         }
     });
 }
 function shortFolder() {
     const d = new Date();
     const y = d.getFullYear();
-    const m = String(d.getMonth() + 1).padStart(2, "0");
-    const day = String(d.getDate()).padStart(2, "0");
+    const m = String(d.getMonth() + 1).padStart(2, '0');
+    const day = String(d.getDate()).padStart(2, '0');
     return `uploads/${y}/${m}/${day}`;
 }
 function shortUid() {

package/dist/api/router/utils.d.ts

@@ -2,6 +2,7 @@ import type { Request } from 'express';
 export type AnyRec = Record<string, any>;
 export type SortDir = 1 | -1;
 export type SortSpec = Record<string, SortDir>;
+export declare const ALLOWED_VIRTUAL_ATTRS: Set<string>;
 export declare const isPlainObject: (v: unknown) => v is AnyRec;
 export declare const splitCSV: (raw: string) => string[];
 export declare function normalizeAttrType(attr: any): string;
@@ -46,16 +47,16 @@ export declare function buildPredicateForField(field: string, attr: any, raw: st
 } | {
     [field]: Date;
 } | null;
-export declare function parseSort(expr?: string): Record<string, 1 | -1> | undefined;
-export declare function parseQuery(req: Request): {
+export declare const VIRTUAL_SORT_KEYS: Set<string>;
+export declare function parseSort(sortRaw: unknown, sortTypeRaw: unknown, allowedKeys?: Set<string>): SortSpec;
+export type ParsedQuery = {
     limit: number;
     page: number;
     skip: number;
-    projection: {
-        [k: string]: 1;
-    } | undefined;
-    sort: Record<string, 1 | -1> | undefined;
+    projection?: Record<string, 1>;
+    sort: SortSpec;
 };
+export declare function parseQuery(req: Request, allowedKeys?: Set<string>): ParsedQuery;
 export declare function extractIds(val: unknown): string[];
 export declare function refInfoFromAttr(attr: any): {
     ref: string;

package/dist/api/router/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.dedupeBy = exports.splitCSV = exports.isPlainObject = void 0;
+exports.dedupeBy = exports.VIRTUAL_SORT_KEYS = exports.splitCSV = exports.isPlainObject = exports.ALLOWED_VIRTUAL_ATTRS = void 0;
 exports.normalizeAttrType = normalizeAttrType;
 exports.toIdString = toIdString;
 exports.splitFilterForExtended = splitFilterForExtended;
@@ -12,6 +12,12 @@ exports.parseSort = parseSort;
 exports.parseQuery = parseQuery;
 exports.extractIds = extractIds;
 exports.refInfoFromAttr = refInfoFromAttr;
+exports.ALLOWED_VIRTUAL_ATTRS = new Set([
+    'createdAt',
+    'updatedAt',
+    '_id',
+    'id',
+]);
 const isPlainObject = (v) => !!v && typeof v === 'object' && !Array.isArray(v);
 exports.isPlainObject = isPlainObject;
 const splitCSV = (raw) => raw
@@ -206,35 +212,68 @@ function buildPredicateForField(field, attr, raw) {
                 : { [field]: raw };
     }
 }
-function parseSort(expr) {
-    if (!expr)
-        return;
-    const out = {};
-    for (const raw of expr
+exports.VIRTUAL_SORT_KEYS = new Set([
+    'createdAt',
+    'updatedAt',
+    '_id',
+    'id',
+]);
+function parseSort(sortRaw, sortTypeRaw, allowedKeys) {
+    const keys = String(sortRaw ?? '')
         .split(',')
         .map((s) => s.trim())
-        .filter(Boolean)) {
-        if (raw.startsWith('-'))
-            out[raw.slice(1)] = -1;
-        else if (raw.startsWith('+'))
-            out[raw.slice(1)] = 1;
-        else
-            out[raw] = 1;
+        .filter(Boolean);
+    const dirs = String(sortTypeRaw ?? '')
+        .split(',')
+        .map((s) => s.trim())
+        .filter(Boolean);
+    const hasKey = (k) => (allowedKeys?.has(k) ?? false) || exports.VIRTUAL_SORT_KEYS.has(k);
+    const spec = {};
+    if (keys.length) {
+        keys.forEach((k, i) => {
+            let field = k;
+            let dir = null;
+            // compact + / - prefix
+            if (k.startsWith('-')) {
+                field = k.slice(1);
+                dir = -1;
+            }
+            else if (k.startsWith('+')) {
+                field = k.slice(1);
+                dir = 1;
+            }
+            if (dir === null) {
+                const d = dirs[i] ?? dirs[dirs.length - 1] ?? 'desc';
+                dir = /^(desc|-1)$/i.test(d)
+                    ? -1
+                    : /^(asc|1)$/i.test(d)
+                        ? 1
+                        : -1;
+            }
+            if (field && hasKey(field)) {
+                spec[field] = dir;
+            }
+        });
+        // client sent sort but none validated → honor “no default”
+        return spec;
     }
-    return Object.keys(out).length ? out : undefined;
+    // no sort sent → default
+    return { createdAt: -1 };
 }
-function parseQuery(req) {
-    const limit = Math.min(parseInt(String(req.query.limit ?? '12'), 10) || 12, 100);
-    const page = Math.max(parseInt(String(req.query.page ?? '1'), 10) || 1, 1);
+function parseQuery(req, allowedKeys) {
+    const limit = Math.min(Number.parseInt(String(req.query.limit ?? '12'), 10) || 12, 100);
+    const page = Math.max(Number.parseInt(String(req.query.page ?? '1'), 10) || 1, 1);
     const skip = (page - 1) * limit;
     const fields = String(req.query.fields ?? '')
         .split(',')
         .map((s) => s.trim())
         .filter(Boolean);
-    const projection = fields.length
+    const projection = fields.length > 0
         ? Object.fromEntries(fields.map((f) => [f, 1]))
         : undefined;
-    const sort = parseSort(String(req.query.sort ?? '-createdAt'));
+    // NOTE: do NOT force a fallback like '-createdAt' here;
+    // parseSort will apply { createdAt: -1 } only if no sort is provided.
+    const sort = parseSort(req.query.sort, req.query.sortType, allowedKeys);
     return { limit, page, skip, projection, sort };
 }
 function extractIds(val) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@airoom/nextmin-node",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",