@airoom/nextmin-node 0.1.6 → 0.1.8

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.6",
+  "version": "0.1.8",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",