@wxn0brp/db-core 0.12.2 → 0.12.3

package/dist/helpers/relation.js

@@ -67,6 +67,8 @@ export async function processRelations(dbs, cfg, data, parentList = null) {
         : [
             data,
         ];
+    if (targets.length === 0)
+        return;
     for (const key in cfg) {
         if (!Object.hasOwn(cfg, key))
             continue;
@@ -158,29 +160,83 @@ export async function processRelations(dbs, cfg, data, parentList = null) {
         else if (type === "nm") {
             if (!through || !through.table || !through.pk || !through.fk)
                 throw new Error(`Relation type "nm" requires a defined "through" in "${key}"`);
-            for (const item of targets) {
-                const pivotDb = dbs[through.db || dbKey];
-                const pivots = await pivotDb.find({
-                    collection: through.table,
-                    search: {
-                        [through.pk]: item[pk],
+            const allSourceIds = targets.map(i => i[pk]);
+            const pivotDb = dbs[through.db || dbKey];
+            const allPivots = await pivotDb.find({
+                collection: through.table,
+                search: {
+                    $in: {
+                        [through.pk]: allSourceIds,
                     },
-                });
-                const ids = pivots.map(p => p[through.fk]);
-                const related = await db.find({
+                },
+            });
+            const pivotMap = new Map();
+            for (const p of allPivots) {
+                const srcId = p[through.pk];
+                const arr = pivotMap.get(srcId) || [];
+                arr.push(p[through.fk]);
+                pivotMap.set(srcId, arr);
+            }
+            const allTargetIds = [
+                ...new Set(allPivots.map(p => p[through.fk])),
+            ];
+            const allRelated = await db.find({
+                collection,
+                search: {
+                    $in: {
+                        [fk]: allTargetIds,
+                    },
+                },
+                findOpts: {
+                    select,
+                },
+            });
+            const targetMap = new Map(allRelated.map(r => [
+                r[fk],
+                r,
+            ]));
+            for (const item of targets) {
+                const targetIds = pivotMap.get(item[pk]) || [];
+                const related = targetIds.map(id => targetMap.get(id)).filter(Boolean);
+                item[as] = related;
+                if (rel.relations && related.length > 0) {
+                    await Promise.all(related.map(row => processRelations(dbs, rel.relations, row)));
+                }
+            }
+        }
+        else if (type === "n1") {
+            const allFkIds = [
+                ...new Set(targets.flatMap(i => i[pk] || [])),
+            ];
+            if (allFkIds.length === 0) {
+                for (const item of targets)
+                    item[as] = null;
+            }
+            else {
+                const [selectSafe, deleteSelect] = autoSelect(rel, fk);
+                const results = await db.find({
                     collection,
                     search: {
                         $in: {
-                            [fk]: ids,
+                            [fk]: allFkIds,
                         },
                     },
                     findOpts: {
-                        select,
+                        select: selectSafe,
                     },
                 });
-                item[as] = related;
-                if (rel.relations) {
-                    await Promise.all(related.map(row => processRelations(dbs, rel.relations, row)));
+                const map = new Map(results.map(row => [
+                    row[fk],
+                    row,
+                ]));
+                for (const item of targets) {
+                    const fks = item[pk] || [];
+                    const result = map.get(fks[0]) || null;
+                    if (result && rel.relations)
+                        await processRelations(dbs, rel.relations, result);
+                    if (deleteSelect && result)
+                        delete result[fk];
+                    item[as] = result;
                 }
             }
         }

package/dist/types/relation.d.ts

@@ -19,7 +19,7 @@ export declare namespace RelationTypes {
         as?: string;
         select?: string[];
         dbFindOpts?: DbFindOpts;
-        type?: "1" | "11" | "1n" | "nm";
+        type?: "1" | "11" | "1n" | "nm" | "n1";
         relations?: Relation;
         through?: {
             table: string;

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const version = "0.12.2";
+export declare const version = "0.12.3";

package/dist/version.js

@@ -1 +1 @@
-export const version = "0.12.2";
+export const version = "0.12.3";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wxn0brp/db-core",
-  "version": "0.12.2",
+  "version": "0.12.3",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "author": "wxn0brP",
@@ -17,7 +17,6 @@
   },
   "devDependencies": {
     "@types/bun": "*",
-    "@types/node": "*",
     "fast-check": "^4",
     "tsc-alias": "^1",
     "typescript": "^7"