@wxn0brp/db-storage-dir 0.0.1 → 0.1.1

package/dist/action.d.ts

@@ -26,7 +26,7 @@ declare class dbActionC extends dbActionBase {
     /**
      * Check and create the specified collection if it doesn't exist.
      */
-    checkCollection({ collection }: VQuery): Promise<boolean>;
+    ensureCollection({ collection }: VQuery): Promise<boolean>;
     /**
      * Check if a collection exists.
      */
@@ -38,7 +38,7 @@ declare class dbActionC extends dbActionBase {
     /**
      * Find entries in the specified database based on search criteria.
      */
-    find({ collection, search, context, dbFindOpts, findOpts }: VQuery): Promise<Data[]>;
+    find(query: VQuery): Promise<Data[]>;
     /**
      * Find the first matching entry in the specified database based on search criteria.
      */

package/dist/action.js

@@ -1,6 +1,6 @@
 import dbActionBase from "@wxn0brp/db-core/base/actions";
 import gen from "@wxn0brp/db-core/helpers/gen";
-import { compareSafe } from "@wxn0brp/db-core/utils/sort";
+import { findUtil } from "@wxn0brp/db-core/utils/action";
 import { existsSync, mkdirSync, promises, statSync } from "fs";
 import { resolve, sep } from "path";
 /**
@@ -50,7 +50,7 @@ class dbActionC extends dbActionBase {
     /**
      * Check and create the specified collection if it doesn't exist.
      */
-    async checkCollection({ collection }) {
+    async ensureCollection({ collection }) {
         if (await this.issetCollection(collection))
             return;
         const cpath = this._getCollectionPath(collection);
@@ -74,7 +74,7 @@ class dbActionC extends dbActionBase {
      * Add a new entry to the specified database.
      */
     async add({ collection, data, id_gen = true }) {
-        await this.checkCollection(arguments[0]);
+        await this.ensureCollection(arguments[0]);
         const cpath = this._getCollectionPath(collection);
         const file = cpath + await getLastFile(cpath, this.options.maxFileSize);
         if (id_gen)
@@ -85,62 +85,21 @@ class dbActionC extends dbActionBase {
     /**
      * Find entries in the specified database based on search criteria.
      */
-    async find({ collection, search, context = {}, dbFindOpts = {}, findOpts = {} }) {
-        const { reverse = false, max = -1, offset = 0, sortBy, sortAsc = true } = dbFindOpts;
-        await this.checkCollection(arguments[0]);
-        const cpath = this._getCollectionPath(collection);
+    async find(query) {
+        await this.ensureCollection(query);
+        const cpath = this._getCollectionPath(query.collection);
         let files = await getSortedFiles(cpath);
-        if (reverse && !sortBy)
-            files.reverse();
-        let datas = [];
-        let totalEntries = 0;
-        let skippedEntries = 0;
-        for (const f of files) {
-            let entries = await this.fileCpu.find(cpath + f, search, context, findOpts);
-            if (reverse && !sortBy)
-                entries.reverse();
-            if (!sortBy) {
-                if (offset > skippedEntries) {
-                    const remainingSkip = offset - skippedEntries;
-                    if (entries.length <= remainingSkip) {
-                        skippedEntries += entries.length;
-                        continue;
-                    }
-                    entries = entries.slice(remainingSkip);
-                    skippedEntries = offset;
-                }
-                if (max !== -1) {
-                    if (totalEntries + entries.length > max) {
-                        const remaining = max - totalEntries;
-                        entries = entries.slice(0, remaining);
-                        totalEntries = max;
-                    }
-                    else {
-                        totalEntries += entries.length;
-                    }
-                }
-                datas.push(...entries);
-                if (max !== -1 && totalEntries >= max)
-                    break;
-            }
-            else {
-                datas.push(...entries);
-            }
-        }
-        if (sortBy) {
-            const dir = sortAsc ? 1 : -1;
-            datas.sort((a, b) => compareSafe(a[sortBy], b[sortBy]) * dir);
-            const start = offset;
-            const end = max !== -1 ? offset + max : undefined;
-            datas = datas.slice(start, end);
-        }
-        return datas;
+        if (files.length == 0)
+            return [];
+        files = files.map(file => cpath + file);
+        const data = await findUtil(query, this.fileCpu, files);
+        return data || [];
     }
     /**
      * Find the first matching entry in the specified database based on search criteria.
      */
     async findOne({ collection, search, context = {}, findOpts = {} }) {
-        await this.checkCollection(arguments[0]);
+        await this.ensureCollection(arguments[0]);
         const cpath = this._getCollectionPath(collection);
         const files = await getSortedFiles(cpath);
         for (let f of files) {
@@ -154,28 +113,28 @@ class dbActionC extends dbActionBase {
      * Update entries in the specified database based on search criteria and an updater function or object.
      */
     async update({ collection, search, updater, context = {} }) {
-        await this.checkCollection(arguments[0]);
+        await this.ensureCollection(arguments[0]);
         return await operationUpdater(this._getCollectionPath(collection), this.fileCpu.update.bind(this.fileCpu), false, search, updater, context);
     }
     /**
      * Update the first matching entry in the specified database based on search criteria and an updater function or object.
      */
     async updateOne({ collection, search, updater, context = {} }) {
-        await this.checkCollection(arguments[0]);
+        await this.ensureCollection(arguments[0]);
         return await operationUpdater(this._getCollectionPath(collection), this.fileCpu.update.bind(this.fileCpu), true, search, updater, context);
     }
     /**
      * Remove entries from the specified database based on search criteria.
      */
     async remove({ collection, search, context = {} }) {
-        await this.checkCollection(arguments[0]);
+        await this.ensureCollection(arguments[0]);
         return await operationUpdater(this._getCollectionPath(collection), this.fileCpu.remove.bind(this.fileCpu), false, search, context);
     }
     /**
      * Remove the first matching entry from the specified database based on search criteria.
      */
     async removeOne({ collection, search, context = {} }) {
-        await this.checkCollection(arguments[0]);
+        await this.ensureCollection(arguments[0]);
         return await operationUpdater(this._getCollectionPath(collection), this.fileCpu.remove.bind(this.fileCpu), true, search, context);
     }
     /**

package/dist/version.js

@@ -1 +1 @@
-export const version = "0.0.1";
+export const version = "0.1.1";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wxn0brp/db-storage-dir",
-  "version": "0.0.1",
+  "version": "0.1.1",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "author": "wxn0brP",
@@ -13,11 +13,11 @@
   },
   "homepage": "https://github.com/wxn0brP/ValtheraDB",
   "dependencies": {
-    "json5": "^2.2.3",
-    "@wxn0brp/db-core": ">=0.0.1 <0.1.0"
+    "@wxn0brp/db-core": ">=0.2.0",
+    "json5": "^2.2.3"
   },
   "devDependencies": {
-    "@types/node": "^22.12.0",
+    "@types/node": "^24.1.0",
     "tsc-alias": "^1.8.10",
     "typescript": "^5.7.3"
   },