@airoom/nextmin-node 0.1.5 → 0.1.7

package/dist/api/apiRouter.d.ts

@@ -1,7 +1,7 @@
-import express from "express";
-import type { Server as HttpServer } from "http";
-import { DatabaseAdapter } from "../database/DatabaseAdapter";
-import type { FileStorageAdapter } from "../files/FileStorageAdapter";
+import express from 'express';
+import type { Server as HttpServer } from 'http';
+import { DatabaseAdapter } from '../database/DatabaseAdapter';
+import type { FileStorageAdapter } from '../files/FileStorageAdapter';
 export interface APIRouterOptions {
     dbAdapter: DatabaseAdapter;
     server?: HttpServer;
@@ -22,6 +22,7 @@ export declare class APIRouter {
     private liveSchemas;
     private notFoundHandler?;
     private fileStorage?;
+    private fileRoutesMounted;
     constructor(options: APIRouterOptions);
     getRouter(): express.Router;
     private wireSchemaHotReload;
@@ -32,6 +33,7 @@ export declare class APIRouter {
     private mountSchemasEndpointOnce;
     private mountRoutes;
     private mountFindRoutes;
+    private mountFileRoutes;
     private createCtx;
     private getSchema;
     private getModel;

package/dist/api/apiRouter.js

@@ -12,6 +12,7 @@ const SchemaLoader_1 = require("../utils/SchemaLoader");
 const InMemoryAdapter_1 = require("../database/InMemoryAdapter");
 const DefaultDataInitializer_1 = require("../utils/DefaultDataInitializer");
 const SchemaService_1 = require("../services/SchemaService");
+const setupFileRoutes_1 = require("./router/setupFileRoutes");
 const setupAuthRoutes_1 = require("./router/setupAuthRoutes");
 const mountCrudRoutes_1 = require("./router/mountCrudRoutes");
 const mountFindRoutes_1 = require("./router/mountFindRoutes");
@@ -23,12 +24,13 @@ class APIRouter {
         this.schemasRouteRegistered = false;
         this.registeredModels = new Set();
         this.liveSchemas = {};
+        this.fileRoutesMounted = false;
         // ---------- Live lookups ----------
         this.getSchema = (name) => {
             const s = this.liveSchemas[name];
             if (!s) {
                 const err = new Error(`Model '${name}' removed`);
-                err.code = "MODEL_REMOVED";
+                err.code = 'MODEL_REMOVED';
                 throw err;
             }
             return s;
@@ -38,7 +40,7 @@ class APIRouter {
             const m = this.models[name];
             if (!m) {
                 const err = new Error(`Model '${name}' unavailable`);
-                err.code = "MODEL_UNAVAILABLE";
+                err.code = 'MODEL_UNAVAILABLE';
                 throw err;
             }
             return m;
@@ -49,7 +51,7 @@ class APIRouter {
                 const authHeader = req.headers.authorization;
                 if (!authHeader)
                     return next();
-                const token = authHeader.split(" ")[1];
+                const token = authHeader.split(' ')[1];
                 if (!token)
                     return next();
                 try {
@@ -62,7 +64,7 @@ class APIRouter {
             });
         };
         this.normalizeRoleName = async (value) => {
-            const rolesModel = this.getModel("roles");
+            const rolesModel = this.getModel('roles');
             const isHex24 = (s) => /^[0-9a-fA-F]{24}$/.test(s);
             const fromString = async (s) => {
                 if (!s)
@@ -70,17 +72,17 @@ class APIRouter {
                 if (isHex24(s) && rolesModel) {
                     const docs = await rolesModel.read({ id: s }, 1, 0, true);
                     const n = docs?.[0]?.name;
-                    return typeof n === "string" ? n : null;
+                    return typeof n === 'string' ? n : null;
                 }
                 return s;
             };
-            if (typeof value === "string")
+            if (typeof value === 'string')
                 return (await fromString(value))?.toLowerCase() ?? null;
             if (Array.isArray(value)) {
                 for (const v of value) {
-                    const n = typeof v === "string"
+                    const n = typeof v === 'string'
                         ? await fromString(v)
-                        : v && typeof v === "object" && typeof v.name === "string"
+                        : v && typeof v === 'object' && typeof v.name === 'string'
                             ? v.name
                             : null;
                     if (n)
@@ -88,11 +90,11 @@ class APIRouter {
                 }
                 return null;
             }
-            if (value && typeof value === "object") {
+            if (value && typeof value === 'object') {
                 const o = value;
-                if (typeof o.name === "string")
+                if (typeof o.name === 'string')
                     return o.name.toLowerCase();
-                if (typeof o.id === "string") {
+                if (typeof o.id === 'string') {
                     const n = await fromString(o.id);
                     return n ? n.toLowerCase() : null;
                 }
@@ -101,9 +103,9 @@ class APIRouter {
         };
         // ---------- auth middlewares ----------
         this.apiKeyMiddleware = (req, res, next) => {
-            const apiKey = req.headers["x-api-key"];
-            if (typeof apiKey !== "string" || apiKey !== this.trustedApiKey) {
-                return res.status(401).json({ error: "Invalid or missing API key" });
+            const apiKey = req.headers['x-api-key'];
+            if (typeof apiKey !== 'string' || apiKey !== this.trustedApiKey) {
+                return res.status(401).json({ error: 'Invalid or missing API key' });
             }
             next();
         };
@@ -111,10 +113,10 @@ class APIRouter {
             this.apiKeyMiddleware(req, res, () => {
                 const authHeader = req.headers.authorization;
                 if (!authHeader)
-                    return res.status(401).json({ error: "Authorization header missing" });
-                const token = authHeader.split(" ")[1];
+                    return res.status(401).json({ error: 'Authorization header missing' });
+                const token = authHeader.split(' ')[1];
                 if (!token)
-                    return res.status(401).json({ error: "API Token missing." });
+                    return res.status(401).json({ error: 'API Token missing.' });
                 try {
                     const decoded = jsonwebtoken_1.default.verify(token, this.jwtSecret);
                     // @ts-ignore
@@ -122,14 +124,16 @@ class APIRouter {
                     next();
                 }
                 catch {
-                    res.status(401).json({ error: "Invalid or expired token" });
+                    res.status(401).json({ error: 'Invalid or expired token' });
                 }
             });
         };
         // ---------- helpers ----------
-        this.validateRequiredFields = (schema, payload, mode = "create") => {
+        this.validateRequiredFields = (schema, payload, mode = 'create') => {
             const missing = [];
-            const isEmpty = (v) => v === undefined || v === null || (typeof v === "string" && v.trim() === "");
+            const isEmpty = (v) => v === undefined ||
+                v === null ||
+                (typeof v === 'string' && v.trim() === '');
             let baseKeys = null;
             const baseName = schema?.extends;
             if (baseName) {
@@ -147,76 +151,77 @@ class APIRouter {
                     continue;
                 if (attribute?.private)
                     continue;
-                if (baseKeys && key !== "baseId" && baseKeys.has(key))
+                if (baseKeys && key !== 'baseId' && baseKeys.has(key))
                     continue;
                 const reqd = Boolean(attribute?.required);
                 if (!reqd)
                     continue;
-                if (mode === "create") {
+                if (mode === 'create') {
                     if (isEmpty(payload[key]))
                         missing.push(key);
                 }
                 else {
-                    if (Object.prototype.hasOwnProperty.call(payload, key) && isEmpty(payload[key])) {
+                    if (Object.prototype.hasOwnProperty.call(payload, key) &&
+                        isEmpty(payload[key])) {
                         missing.push(key);
                     }
                 }
             }
             return missing;
         };
-        this.isDevelopment = process.env.APP_MODE !== "production";
+        this.isDevelopment = process.env.APP_MODE !== 'production';
         this.router = express_1.default.Router();
         this.fileStorage = options.fileStorageAdapter;
         this.dbAdapter = options.dbAdapter || new InMemoryAdapter_1.InMemoryAdapter();
-        this.jwtSecret = process.env.JWT_SECRET || "default_jwt_secret";
+        this.jwtSecret = process.env.JWT_SECRET || 'default_jwt_secret';
         if (this.isDevelopment && options.server) {
             (0, SchemaService_1.startSchemaService)(options.server, {
                 getApiKey: () => this.trustedApiKey,
             });
-            options.server.on("listening", () => {
+            options.server.on('listening', () => {
                 // @ts-ignore
                 const addr = options.server.address();
-                Logger_1.default.info("SchemaService", `[schema-service] started at /__nextmin__/schema ns /schema on ${typeof addr === "string" ? addr : `${addr?.address}:${addr?.port}`}`);
+                Logger_1.default.info('SchemaService', `[schema-service] started at /__nextmin__/schema ns /schema on ${typeof addr === 'string' ? addr : `${addr?.address}:${addr?.port}`}`);
             });
         }
-        this.schemaLoader = SchemaLoader_1.SchemaLoader.getInstance?.() ?? new SchemaLoader_1.SchemaLoader();
+        this.schemaLoader =
+            SchemaLoader_1.SchemaLoader.getInstance?.() ?? new SchemaLoader_1.SchemaLoader();
         const initialSchemas = this.schemaLoader.getSchemas();
         this.setLiveSchemas(initialSchemas);
         const finishBoot = async () => {
-            if (typeof this.dbAdapter.registerSchemas === "function") {
+            if (typeof this.dbAdapter.registerSchemas === 'function') {
                 await this.dbAdapter.registerSchemas(initialSchemas);
             }
             this.rebuildModels(Object.values(initialSchemas));
             this.mountSchemasEndpointOnce();
             this.mountRoutes(initialSchemas);
             this.mountFindRoutes();
+            this.mountFileRoutes();
             await this.syncAllIndexes(initialSchemas);
             const initializer = new DefaultDataInitializer_1.DefaultDataInitializer(this.dbAdapter, this.models);
             try {
                 await initializer.initialize();
-                this.trustedApiKey = initializer.getApiKey() || "";
-                Logger_1.default.info("APIRouter", `Trusted API key set: ${this.trustedApiKey ? "[hidden]" : "none"}`);
+                this.trustedApiKey = initializer.getApiKey() || '';
+                Logger_1.default.info('APIRouter', `Trusted API key set: ${this.trustedApiKey ? '[hidden]' : 'none'}`);
             }
             catch (err) {
-                Logger_1.default.error("APIRouter", "Failed to initialize default data", err);
+                Logger_1.default.error('APIRouter', 'Failed to initialize default data', err);
             }
             this.setupNotFoundMiddleware();
             this.wireSchemaHotReload();
         };
-        if (typeof this.dbAdapter.registerSchemas === "function") {
+        if (typeof this.dbAdapter.registerSchemas === 'function') {
             const res = this.dbAdapter.registerSchemas(initialSchemas);
             if (res instanceof Promise) {
-                res
-                    .then(finishBoot)
-                    .catch((err) => {
-                    Logger_1.default.error("APIRouter", "registerSchemas failed", err);
+                res.then(finishBoot).catch((err) => {
+                    Logger_1.default.error('APIRouter', 'registerSchemas failed', err);
                     this.setupNotFoundMiddleware();
                 });
                 return;
             }
         }
         finishBoot().catch((err) => {
-            Logger_1.default.error("APIRouter", "finishBoot error", err);
+            Logger_1.default.error('APIRouter', 'finishBoot error', err);
             this.setupNotFoundMiddleware();
         });
     }
@@ -226,15 +231,17 @@ class APIRouter {
     // ---------- Hot reload ----------
     wireSchemaHotReload() {
         const anyLoader = this.schemaLoader;
-        if (typeof anyLoader.on !== "function")
+        if (typeof anyLoader.on !== 'function')
             return;
-        anyLoader.on("schemasChanged", async (newSchemas) => {
+        anyLoader.on('schemasChanged', async (newSchemas) => {
             try {
                 const removed = this.diffRemovedModels(this.liveSchemas, newSchemas);
-                if (removed.length && typeof this.dbAdapter.unregisterSchemas === "function") {
+                if (removed.length &&
+                    typeof this.dbAdapter.unregisterSchemas === 'function') {
                     await this.dbAdapter.unregisterSchemas(removed);
                 }
-                else if (removed.length && typeof this.dbAdapter.dropModel === "function") {
+                else if (removed.length &&
+                    typeof this.dbAdapter.dropModel === 'function') {
                     for (const name of removed) {
                         try {
                             await this.dbAdapter.dropModel(name);
@@ -242,22 +249,22 @@ class APIRouter {
                         catch { }
                     }
                 }
-                if (typeof this.dbAdapter.registerSchemas === "function") {
+                if (typeof this.dbAdapter.registerSchemas === 'function') {
                     await this.dbAdapter.registerSchemas(newSchemas);
                 }
                 this.setLiveSchemas(newSchemas);
                 this.rebuildModels(Object.values(newSchemas));
                 this.mountRoutes(newSchemas);
                 await this.syncAllIndexes(newSchemas);
-                Logger_1.default.info("APIRouter", `Schemas reloaded (added/updated: ${Object.keys(newSchemas).length}, removed: ${removed.join(", ") || "none"})`);
+                Logger_1.default.info('APIRouter', `Schemas reloaded (added/updated: ${Object.keys(newSchemas).length}, removed: ${removed.join(', ') || 'none'})`);
             }
             catch (err) {
-                Logger_1.default.error("APIRouter", "Failed to refresh after schemasChanged", err);
+                Logger_1.default.error('APIRouter', 'Failed to refresh after schemasChanged', err);
             }
         });
     }
     async syncAllIndexes(schemas) {
-        if (typeof this.dbAdapter.syncIndexes !== "function")
+        if (typeof this.dbAdapter.syncIndexes !== 'function')
             return;
         const plan = this.schemaLoader.getIndexPlan();
         for (const s of Object.values(schemas)) {
@@ -268,7 +275,7 @@ class APIRouter {
                     await this.dbAdapter.syncIndexes(modelName, spec);
                 }
                 catch (err) {
-                    Logger_1.default.warn("APIRouter", `Index sync failed for ${modelName}: ${err?.message || err}`);
+                    Logger_1.default.warn('APIRouter', `Index sync failed for ${modelName}: ${err?.message || err}`);
                 }
             }
         }
@@ -280,7 +287,7 @@ class APIRouter {
             if (!next.has(name.toLowerCase()))
                 removed.push(name.toLowerCase());
         }
-        return removed.filter((n) => n !== "users" && n !== "roles");
+        return removed.filter((n) => n !== 'users' && n !== 'roles');
     }
     setLiveSchemas(schemas) {
         const idx = {};
@@ -299,7 +306,7 @@ class APIRouter {
         if (this.schemasRouteRegistered)
             return;
         this.schemasRouteRegistered = true;
-        this.router.get("/_schemas", this.apiKeyMiddleware, (_req, res) => {
+        this.router.get('/_schemas', this.apiKeyMiddleware, (_req, res) => {
             res.json({
                 success: true,
                 data: this.schemaLoader.getPublicSchemaList(),
@@ -307,7 +314,7 @@ class APIRouter {
         });
     }
     mountRoutes(schemas) {
-        if (!this.authRoutesInitialized && this.liveSchemas["users"]) {
+        if (!this.authRoutesInitialized && this.liveSchemas['users']) {
             (0, setupAuthRoutes_1.setupAuthRoutes)(this.createCtx());
             this.authRoutesInitialized = true;
         }
@@ -327,6 +334,15 @@ class APIRouter {
         (0, mountFindRoutes_1.mountFindRoutes)(this.createCtx());
         this.ensureNotFoundLast();
     }
+    mountFileRoutes() {
+        if (this.fileRoutesMounted)
+            return;
+        if (this.fileStorage) {
+            (0, setupFileRoutes_1.setupFileRoutes)(this.createCtx());
+            this.fileRoutesMounted = true;
+            this.ensureNotFoundLast();
+        }
+    }
     // ---------- Context builder for modules ----------
     createCtx() {
         return {
@@ -359,35 +375,45 @@ class APIRouter {
                 return this.optionalAuthMiddleware;
             if (publicRule === false)
                 return this.authenticateMiddleware;
-            return action === "read" ? this.optionalAuthMiddleware : this.authenticateMiddleware;
+            return action === 'read'
+                ? this.optionalAuthMiddleware
+                : this.authenticateMiddleware;
         }
         catch {
-            return action === "read" ? this.optionalAuthMiddleware : this.authenticateMiddleware;
+            return action === 'read'
+                ? this.optionalAuthMiddleware
+                : this.authenticateMiddleware;
         }
     }
     getUserRoleFromReq(req) {
         const r = req.user?.role;
-        return typeof r === "string" ? r : typeof r?.name === "string" ? r.name : null;
+        return typeof r === 'string'
+            ? r
+            : typeof r?.name === 'string'
+                ? r.name
+                : null;
     }
     handleWriteError(error, res) {
-        if (error?.code === "MODEL_REMOVED") {
+        if (error?.code === 'MODEL_REMOVED') {
             res.status(410).json({ error: true, message: error.message });
             return;
         }
         if (error?.code === 11000) {
             const field = Object.keys(error.keyPattern || {})[0];
-            res.status(400).json({ error: true, message: `Duplicate value for field: ${field}` });
+            res
+                .status(400)
+                .json({ error: true, message: `Duplicate value for field: ${field}` });
         }
         else {
-            res.status(400).json({ error: true, message: error?.message || "Error" });
+            res.status(400).json({ error: true, message: error?.message || 'Error' });
         }
     }
     setupNotFoundMiddleware() {
         if (!this.notFoundHandler) {
             this.notFoundHandler = (req, res) => {
-                Logger_1.default.warn("apiRouter", `API route not found: ${req.originalUrl}`);
+                Logger_1.default.warn('apiRouter', `API route not found: ${req.originalUrl}`);
                 res.status(404).json({
-                    error: "API route not found",
+                    error: 'API route not found',
                     path: req.originalUrl,
                     method: req.method,
                 });
@@ -400,7 +426,7 @@ class APIRouter {
             return;
         // @ts-ignore
         this.router.stack = this.router.stack.filter((layer) => layer?.handle !== this.notFoundHandler);
-        this.router.use("*", this.notFoundHandler);
+        this.router.use('*', this.notFoundHandler);
     }
     async checkUniqueFields(schema, data, excludeId) {
         const uniqueFields = Object.entries(schema.attributes)

package/dist/api/router/mountCrudRoutes.js

@@ -134,12 +134,19 @@ function mountCrudRoutes(ctx, modelNameLC) {
                 const childToCreate = { ...childPayload, baseId: baseCreated.id };
                 const childCreated = await model.create(childToCreate);
                 let resultDoc = { ...baseCreated, ...childCreated };
+                resultDoc.exId = String(baseCreated.id);
+                resultDoc.id = String(childCreated.id);
+                resultDoc._id = resultDoc.id;
+                delete resultDoc.baseId;
                 delete resultDoc.baseId;
                 if (cdec.exposePrivate && childCreated?.id) {
                     const [refChild] = await model.read({ id: childCreated.id }, 1, 0, true);
                     const [refBase] = await baseModel.read({ id: baseCreated.id }, 1, 0, true);
                     if (refChild && refBase) {
                         resultDoc = { ...refBase, ...refChild };
+                        resultDoc.exId = String(refBase.id ?? refBase._id);
+                        resultDoc.id = String(refChild.id ?? refChild._id);
+                        resultDoc._id = resultDoc.id;
                         delete resultDoc.baseId;
                     }
                 }
@@ -370,10 +377,9 @@ function mountCrudRoutes(ctx, modelNameLC) {
                     childRows = await model.read(childFilter, 0, 0, needPrivateForHydrate);
                 }
                 else {
-                    childRows = await model.read(childFilter, limit, page * limit, needPrivateForHydrate, {
-                        sort: Object.keys(childSort).length ? childSort : undefined,
-                    });
+                    childRows = await model.read(childFilter, limit, page * limit, needPrivateForHydrate, { sort: Object.keys(childSort).length ? childSort : undefined });
                 }
+                // build base map
                 const baseIds = Array.from(new Set(childRows
                     .map((r) => (0, utils_1.toIdString)(r?.baseId))
                     .filter((s) => !!s)));
@@ -381,13 +387,21 @@ function mountCrudRoutes(ctx, modelNameLC) {
                     ? await baseModel.read({ id: { $in: baseIds } }, baseIds.length, 0, !!rdec.exposePrivate)
                     : [];
                 const baseMap = new Map(baseDocs.map((b) => [String(b.id), b]));
+                // merge, but force merged id to BASE id (single entity identity)
                 let merged = childRows.map((row) => {
                     const bid = (0, utils_1.toIdString)(row?.baseId);
-                    const b = bid ? baseMap.get(bid) : null;
-                    const m = b ? { ...b, ...row } : { ...row };
+                    const base = bid ? baseMap.get(bid) : null;
+                    const m = base ? { ...base, ...row } : { ...row };
+                    // expose base id as exId, keep child's id as id
+                    m.exId = String(base?.id ?? base?._id ?? bid ?? '');
+                    m.id = String(row?.id ?? row?._id);
+                    m._id = m.id;
+                    // optional: keep for trace/debug
+                    m.__childId = m.id;
                     delete m.baseId;
                     return m;
                 });
+                // apply base-level filters/sort, then DEDUPE by canonical id
                 if (Object.keys(extBaseFilter).length) {
                     merged = merged.filter((m) => (0, utils_1.matchDoc)(m, extBaseFilter));
                 }
@@ -395,9 +409,12 @@ function mountCrudRoutes(ctx, modelNameLC) {
                 if (Object.keys(combinedSort).length) {
                     merged = (0, utils_1.sortInMemory)(merged, combinedSort);
                 }
+                // **dedupe**: one row per base entity
+                merged = (0, utils_1.dedupeBy)(merged, (r) => String(r.exId || r.id || r._id || ''));
                 if (currentUserId && isUsersModel) {
                     merged = merged.filter((r) => String(r?.id) !== String(currentUserId));
                 }
+                // pagination + totals
                 let totalRows;
                 let paged;
                 if (requiresBaseProcessing) {
@@ -406,7 +423,9 @@ function mountCrudRoutes(ctx, modelNameLC) {
                     paged = merged.slice(start, start + limit);
                 }
                 else {
-                    totalRows = await model.count(childFilter);
+                    // 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
                     paged = merged.slice(0, limit);
                 }
                 const data = rdec.exposePrivate
@@ -515,6 +534,10 @@ function mountCrudRoutes(ctx, modelNameLC) {
                     const [baseDoc] = await baseModel.read({ id: baseIdStr }, 1, 0, !!dec.exposePrivate);
                     if (baseDoc) {
                         toReturn = { ...baseDoc, ...doc };
+                        toReturn.exId = String(baseDoc.id ?? baseDoc._id ?? baseIdStr);
+                        toReturn.id = String(doc.id ?? doc._id);
+                        toReturn._id = toReturn.id;
+                        delete toReturn.baseId;
                     }
                 }
                 if (toReturn)
@@ -647,8 +670,12 @@ function mountCrudRoutes(ctx, modelNameLC) {
                 const [refChild] = await model.read({ id: String(updatedChild.id) }, 1, 0, true);
                 const [refBase] = await baseModel.read({ id: baseId }, 1, 0, true);
                 let responseDoc = refChild && refBase ? { ...refBase, ...refChild } : updatedChild;
-                if (responseDoc)
+                if (responseDoc) {
+                    responseDoc.exId = String(baseId);
+                    responseDoc.id = String((refChild?.id ?? updatedChild?.id));
+                    responseDoc._id = responseDoc.id;
                     delete responseDoc.baseId;
+                }
                 const masked = udec.exposePrivate
                     ? (0, authorize_1.applyReadMaskOne)(responseDoc, udec.sensitiveMask)
                     : (0, authorize_1.applyReadMaskOne)(responseDoc, udec.readMask);
@@ -719,7 +746,7 @@ function mountCrudRoutes(ctx, modelNameLC) {
                     catch { }
                 }
                 const merged = baseId
-                    ? { ...deletedChild, baseId: undefined }
+                    ? { ...deletedChild, exId: String(baseId), baseId: undefined }
                     : deletedChild;
                 const masked = ddec.exposePrivate
                     ? (0, authorize_1.applyReadMaskOne)(merged, ddec.sensitiveMask)

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

@@ -1,4 +1,4 @@
-import type { Request } from "express";
+import type { Request } from 'express';
 export type AnyRec = Record<string, any>;
 export type SortDir = 1 | -1;
 export type SortSpec = Record<string, SortDir>;
@@ -61,3 +61,4 @@ export declare function refInfoFromAttr(attr: any): {
     ref: string;
     isArray: boolean;
 } | null;
+export declare const dedupeBy: <T, K extends string | number>(rows: T[], key: (r: T) => K) => T[];

package/dist/api/router/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.splitCSV = exports.isPlainObject = void 0;
+exports.dedupeBy = exports.splitCSV = exports.isPlainObject = void 0;
 exports.normalizeAttrType = normalizeAttrType;
 exports.toIdString = toIdString;
 exports.splitFilterForExtended = splitFilterForExtended;
@@ -12,38 +12,41 @@ exports.parseSort = parseSort;
 exports.parseQuery = parseQuery;
 exports.extractIds = extractIds;
 exports.refInfoFromAttr = refInfoFromAttr;
-const isPlainObject = (v) => !!v && typeof v === "object" && !Array.isArray(v);
+const isPlainObject = (v) => !!v && typeof v === 'object' && !Array.isArray(v);
 exports.isPlainObject = isPlainObject;
-const splitCSV = (raw) => raw.split(",").map(s => s.trim()).filter(Boolean);
+const splitCSV = (raw) => raw
+    .split(',')
+    .map((s) => s.trim())
+    .filter(Boolean);
 exports.splitCSV = splitCSV;
 function normalizeAttrType(attr) {
     const a = Array.isArray(attr) ? attr?.[0] : attr;
     let t = a?.type ?? a;
-    if (typeof t === "function" && t.name)
+    if (typeof t === 'function' && t.name)
         t = t.name;
-    if (t && typeof t === "object" && "name" in t)
+    if (t && typeof t === 'object' && 'name' in t)
         t = t.name;
-    if (typeof t === "string")
+    if (typeof t === 'string')
         t = t.toLowerCase();
-    if (t === "bool")
-        t = "boolean";
-    if (t === "objectid" || t === "oid" || t === "ref")
-        t = "objectid";
-    return String(t || "");
+    if (t === 'bool')
+        t = 'boolean';
+    if (t === 'objectid' || t === 'oid' || t === 'ref')
+        t = 'objectid';
+    return String(t || '');
 }
 function toIdString(v) {
     if (!v)
         return null;
-    if (typeof v === "string")
+    if (typeof v === 'string')
         return v;
-    if (typeof v === "number")
+    if (typeof v === 'number')
         return String(v);
-    if (typeof v === "object") {
-        if (typeof v.id === "string")
+    if (typeof v === 'object') {
+        if (typeof v.id === 'string')
             return v.id;
-        if (v._id && typeof v._id.toString === "function")
+        if (v._id && typeof v._id.toString === 'function')
             return v._id.toString();
-        if (typeof v._id === "string")
+        if (typeof v._id === 'string')
             return v._id;
     }
     return null;
@@ -55,7 +58,7 @@ function splitFilterForExtended(filter, baseKeys) {
         const outChild = {};
         const outBase = {};
         for (const [k, v] of Object.entries(node)) {
-            if (k === "$and" || k === "$or" || k === "$nor") {
+            if (k === '$and' || k === '$or' || k === '$nor') {
                 if (!Array.isArray(v))
                     continue;
                 const childArr = [];
@@ -102,8 +105,8 @@ function sortInMemory(rows, sort) {
             const dir = sort[k];
             const av = a?.[k];
             const bv = b?.[k];
-            const ax = av instanceof Date ? +av : (av ?? "");
-            const bx = bv instanceof Date ? +bv : (bv ?? "");
+            const ax = av instanceof Date ? +av : (av ?? '');
+            const bx = bv instanceof Date ? +bv : (bv ?? '');
             if (ax > bx)
                 return dir;
             if (ax < bx)
@@ -115,23 +118,23 @@ function sortInMemory(rows, sort) {
 function matchDoc(doc, filter) {
     const evalNode = (node) => {
         for (const [k, v] of Object.entries(node)) {
-            if (k === "$and" && Array.isArray(v))
+            if (k === '$and' && Array.isArray(v))
                 return v.every((n) => evalNode(n));
-            if (k === "$or" && Array.isArray(v))
+            if (k === '$or' && Array.isArray(v))
                 return v.some((n) => evalNode(n));
-            if (k === "$nor" && Array.isArray(v))
+            if (k === '$nor' && Array.isArray(v))
                 return !v.some((n) => evalNode(n));
             const dv = doc[k];
             if ((0, exports.isPlainObject)(v)) {
-                if ("$in" in v && !v.$in.includes(dv))
+                if ('$in' in v && !v.$in.includes(dv))
                     return false;
-                if ("$gte" in v && !(dv >= v.$gte))
+                if ('$gte' in v && !(dv >= v.$gte))
                     return false;
-                if ("$lte" in v && !(dv <= v.$lte))
+                if ('$lte' in v && !(dv <= v.$lte))
                     return false;
-                if ("$regex" in v) {
-                    const re = new RegExp(v.$regex, v.$options || "");
-                    if (!re.test(String(dv ?? "")))
+                if ('$regex' in v) {
+                    const re = new RegExp(v.$regex, v.$options || '');
+                    if (!re.test(String(dv ?? '')))
                         return false;
                 }
             }
@@ -150,24 +153,42 @@ function buildPredicateForField(field, attr, raw) {
     const attrType = normalizeAttrType(base);
     const tokens = (0, exports.splitCSV)(raw);
     switch (attrType) {
-        case "string":
-            return isArray ? { [field]: { $in: tokens.length ? tokens : [raw] } } : { [field]: { $regex: raw, $options: "i" } };
-        case "number": {
+        case 'string':
+            return isArray
+                ? { [field]: { $in: tokens.length ? tokens : [raw] } }
+                : { [field]: { $regex: raw, $options: 'i' } };
+        case 'number': {
             const nums = tokens.map(Number).filter((n) => !Number.isNaN(n));
-            return isArray ? (nums.length ? { [field]: { $in: nums } } : null) : (nums.length ? { [field]: nums[0] } : null);
+            return isArray
+                ? nums.length
+                    ? { [field]: { $in: nums } }
+                    : null
+                : nums.length
+                    ? { [field]: nums[0] }
+                    : null;
         }
-        case "boolean": {
-            const toBool = (t) => /^(true|1|yes)$/i.test(t) ? true : /^(false|0|no)$/i.test(t) ? false : null;
+        case 'boolean': {
+            const toBool = (t) => /^(true|1|yes)$/i.test(t)
+                ? true
+                : /^(false|0|no)$/i.test(t)
+                    ? false
+                    : null;
             if (isArray) {
-                const bools = tokens.map(toBool).filter((v) => v !== null);
+                const bools = tokens
+                    .map(toBool)
+                    .filter((v) => v !== null);
                 return bools.length ? { [field]: { $in: bools } } : null;
             }
             const b = toBool(raw);
             return b === null ? null : { [field]: b };
         }
-        case "objectid":
-            return isArray || tokens.length > 1 ? { [field]: { $in: tokens } } : (raw ? { [field]: raw } : null);
-        case "date": {
+        case 'objectid':
+            return isArray || tokens.length > 1
+                ? { [field]: { $in: tokens } }
+                : raw
+                    ? { [field]: raw }
+                    : null;
+        case 'date': {
             const toDate = (t) => {
                 const d = new Date(t);
                 return Number.isNaN(+d) ? null : d;
@@ -180,17 +201,22 @@ function buildPredicateForField(field, attr, raw) {
             return d ? { [field]: d } : null;
         }
         default:
-            return isArray ? { [field]: { $in: tokens.length ? tokens : [raw] } } : { [field]: raw };
+            return isArray
+                ? { [field]: { $in: tokens.length ? tokens : [raw] } }
+                : { [field]: raw };
     }
 }
 function parseSort(expr) {
     if (!expr)
         return;
     const out = {};
-    for (const raw of expr.split(",").map((s) => s.trim()).filter(Boolean)) {
-        if (raw.startsWith("-"))
+    for (const raw of expr
+        .split(',')
+        .map((s) => s.trim())
+        .filter(Boolean)) {
+        if (raw.startsWith('-'))
             out[raw.slice(1)] = -1;
-        else if (raw.startsWith("+"))
+        else if (raw.startsWith('+'))
             out[raw.slice(1)] = 1;
         else
             out[raw] = 1;
@@ -198,15 +224,17 @@ function parseSort(expr) {
     return Object.keys(out).length ? out : undefined;
 }
 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);
+    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);
     const skip = (page - 1) * limit;
-    const fields = String(req.query.fields ?? "")
-        .split(",")
+    const fields = String(req.query.fields ?? '')
+        .split(',')
         .map((s) => s.trim())
         .filter(Boolean);
-    const projection = fields.length ? Object.fromEntries(fields.map((f) => [f, 1])) : undefined;
-    const sort = parseSort(String(req.query.sort ?? "-createdAt"));
+    const projection = fields.length
+        ? Object.fromEntries(fields.map((f) => [f, 1]))
+        : undefined;
+    const sort = parseSort(String(req.query.sort ?? '-createdAt'));
     return { limit, page, skip, projection, sort };
 }
 function extractIds(val) {
@@ -216,16 +244,16 @@ function extractIds(val) {
     const toId = (v) => {
         if (!v)
             return null;
-        if (typeof v === "string")
+        if (typeof v === 'string')
             return v;
-        if (typeof v === "number")
+        if (typeof v === 'number')
             return String(v);
-        if (typeof v === "object") {
-            if (typeof v.id === "string")
+        if (typeof v === 'object') {
+            if (typeof v.id === 'string')
                 return v.id;
-            if (v._id && typeof v._id === "string")
+            if (v._id && typeof v._id === 'string')
                 return v._id;
-            if (v._id && typeof v._id.toString === "function")
+            if (v._id && typeof v._id.toString === 'function')
                 return v._id.toString();
         }
         return null;
@@ -239,9 +267,16 @@ function refInfoFromAttr(attr) {
         return { ref: String(attr[0].ref), isArray: true };
     }
     const a = Array.isArray(attr) ? attr?.[0] : attr;
-    const t = (typeof a?.type === "string" ? a.type : String(a?.type || "")).toLowerCase();
-    if (a?.ref && (t === "objectid" || t === "ref")) {
+    const t = (typeof a?.type === 'string' ? a.type : String(a?.type || '')).toLowerCase();
+    if (a?.ref && (t === 'objectid' || t === 'ref')) {
         return { ref: String(a.ref), isArray: false };
     }
     return null;
 }
+const dedupeBy = (rows, key) => {
+    const map = new Map();
+    for (const r of rows)
+        map.set(key(r), r);
+    return Array.from(map.values());
+};
+exports.dedupeBy = dedupeBy;

package/package.json

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