@wxn0brp/db 0.8.2 → 0.9.1

package/dist/actions/action.js

@@ -1,6 +1,7 @@
 import { existsSync, mkdirSync, promises, statSync } from "fs";
 import dbActionBase from "../base/actions.js";
 import gen from "../helpers/gen.js";
+import { resolve, sep } from "path";
 /**
  * A class representing database actions on files.
  * @class
@@ -37,9 +38,11 @@ class dbActionC extends dbActionBase {
         const collections = allCollections
             .filter(dirent => dirent.isDirectory())
             .map(dirent => {
-            if (dirent.parentPath === this.folder)
+            const parentPath = resolve(dirent.parentPath);
+            const baseFolder = resolve(this.folder);
+            if (parentPath === baseFolder)
                 return dirent.name;
-            return dirent.parentPath.replace(this.folder + "/", "") + "/" + dirent.name;
+            return parentPath.replace(baseFolder + sep, "") + "/" + dirent.name;
         });
         return collections;
     }

package/dist/helpers/relation.js

@@ -19,6 +19,13 @@ function pickByPath(obj, paths) {
     }
     return result;
 }
+function autoSelect(rel, key) {
+    const select = Array.isArray(rel.select) ? [...rel.select] : undefined;
+    const shouldDelete = select && !select.includes(key);
+    if (shouldDelete)
+        select.push(key);
+    return [select, shouldDelete];
+}
 function convertSearchObjToSearchArray(obj, parentKeys = []) {
     return Object.entries(obj).reduce((acc, [key, value]) => {
         const currentPath = [...parentKeys, key];
@@ -47,33 +54,40 @@ async function processRelations(dbs, cfg, data, parentList = null) {
         const db = dbs[dbKey];
         if (type === "1") {
             const keys = [...new Set(targets.map(i => i[pk]))];
-            const results = await db.find(coll, { $in: { [fk]: keys } }, {}, {}, { select });
+            const [selectSafe, deleteSelect] = autoSelect(rel, fk);
+            const results = await db.find(coll, { $in: { [fk]: keys } }, {}, {}, { select: selectSafe });
             const map = new Map(results.map(row => [row[fk], row]));
             for (const item of targets) {
                 const result = map.get(item[pk]) || null;
                 if (result && rel.relations) {
                     await processRelations(dbs, rel.relations, result);
                 }
+                if (deleteSelect && result)
+                    delete result[fk];
                 item[as] = result;
             }
         }
         else if (type === "11") {
             const cache = new Map();
+            const [selectSafe, deleteSelect] = autoSelect(rel, fk);
             for (const item of targets) {
                 const id = item[pk];
                 if (!cache.has(id)) {
-                    cache.set(id, await db.findOne(coll, { [fk]: id }, {}, { select }));
+                    cache.set(id, await db.findOne(coll, { [fk]: id }, {}, { select: selectSafe }));
                 }
                 const result = cache.get(id) || null;
                 if (result && rel.relations) {
                     await processRelations(dbs, rel.relations, result);
                 }
+                if (deleteSelect && result)
+                    delete result[fk];
                 item[as] = result;
             }
         }
         else if (type === "1n") {
             const ids = targets.map(i => i[pk]);
-            const results = await db.find(coll, { $in: { [fk]: ids } }, {}, findOpts || {}, { select });
+            const [selectSafe, deleteSelect] = autoSelect(rel, fk);
+            const results = await db.find(coll, { $in: { [fk]: ids } }, {}, findOpts || {}, { select: selectSafe });
             const grouped = results.reduce((acc, row) => {
                 const id = row[fk];
                 (acc[id] ||= []).push(row);
@@ -85,6 +99,9 @@ async function processRelations(dbs, cfg, data, parentList = null) {
             if (rel.relations) {
                 await Promise.all(results.map(row => processRelations(dbs, rel.relations, row)));
             }
+            if (deleteSelect)
+                for (const r of results)
+                    delete r[fk];
         }
         else if (type === "nm") {
             if (!through || !through.table || !through.pk || !through.fk) {

package/dist/version.js

@@ -1 +1 @@
-export const version = "0.8.2";
+export const version = "0.9.1";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wxn0brp/db",
-  "version": "0.8.2",
+  "version": "0.9.1",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "description": "A simple file-based database management system with support for CRUD operations, custom queries, and graph structures.",