@wxn0brp/db-storage-dir 0.1.2 → 0.1.4

package/dist/action.d.ts

@@ -34,7 +34,7 @@ export declare class FileActions extends dbActionBase {
     /**
      * Add a new entry to the specified database.
      */
-    add({ collection, data, id_gen }: VQuery): Promise<import("@wxn0brp/db-core/types/arg").Arg>;
+    add({ collection, data }: VQuery): Promise<import("@wxn0brp/db-core/types/arg").Arg>;
     /**
      * Find entries in the specified database based on search criteria.
      */

package/dist/action.js

@@ -1,5 +1,5 @@
 import dbActionBase from "@wxn0brp/db-core/base/actions";
-import gen from "@wxn0brp/db-core/helpers/gen";
+import { addId } from "@wxn0brp/db-core/helpers/addId";
 import { findUtil } from "@wxn0brp/db-core/utils/action";
 import { existsSync, mkdirSync, promises, statSync } from "fs";
 import { resolve, sep } from "path";
@@ -73,12 +73,11 @@ export class FileActions extends dbActionBase {
     /**
      * Add a new entry to the specified database.
      */
-    async add({ collection, data, id_gen = true }) {
+    async add({ collection, data }) {
         await this.ensureCollection(arguments[0]);
         const c_path = this._getCollectionPath(collection);
         const file = c_path + await getLastFile(c_path, this.options.maxFileSize);
-        if (id_gen)
-            data._id = data._id || gen();
+        await addId(arguments[0], this);
         await this.fileCpu.add(file, data);
         return data;
     }

package/dist/file/find.d.ts

@@ -4,8 +4,8 @@ import { VContext } from "@wxn0brp/db-core/types/types";
 /**
  * Asynchronously finds entries in a file based on search criteria.
  */
-export declare function find(file: string, arg: Search, context?: VContext, findOpts?: FindOpts): Promise<any[] | false>;
+export declare function find(file: string, search: Search, context?: VContext, findOpts?: FindOpts): Promise<any[] | false>;
 /**
  * Asynchronously finds one entry in a file based on search criteria.
  */
-export declare function findOne(file: string, arg: Search, context?: VContext, findOpts?: FindOpts): Promise<any | false>;
+export declare function findOne(file: string, search: Search, context?: VContext, findOpts?: FindOpts): Promise<any | false>;

package/dist/file/find.js

@@ -7,15 +7,15 @@ import { pathRepair } from "@wxn0brp/db-core/customFileCpu";
 /**
  * Processes a line of text from a file and checks if it matches the search criteria.
  */
-async function findProcesLine(arg, line, context = {}, findOpts = {}) {
+async function findProcesLine(search, line, context = {}, findOpts = {}) {
     const ob = parseData(line);
     let res = false;
-    if (typeof arg === "function") {
-        if (arg(ob, context))
+    if (typeof search === "function") {
+        if (search(ob, context))
             res = true;
     }
-    else if (typeof arg === "object" && !Array.isArray(arg)) {
-        if (hasFieldsAdvanced(ob, arg))
+    else if (typeof search === "object" && !Array.isArray(search)) {
+        if (hasFieldsAdvanced(ob, search))
             res = true;
     }
     if (res)
@@ -25,7 +25,7 @@ async function findProcesLine(arg, line, context = {}, findOpts = {}) {
 /**
  * Asynchronously finds entries in a file based on search criteria.
  */
-export async function find(file, arg, context = {}, findOpts = {}) {
+export async function find(file, search, context = {}, findOpts = {}) {
     file = pathRepair(file);
     return await new Promise(async (resolve) => {
         if (!existsSync(file)) {
@@ -36,9 +36,12 @@ export async function find(file, arg, context = {}, findOpts = {}) {
         const rl = createRL(file);
         const resF = [];
         for await (const line of rl) {
-            if (line == "" || !line)
+            if (!line)
                 continue;
-            const res = await findProcesLine(arg, line, context, findOpts);
+            const trimmed = line.trim();
+            if (!trimmed)
+                continue;
+            const res = await findProcesLine(search, trimmed, context, findOpts);
             if (res)
                 resF.push(res);
         }
@@ -50,7 +53,7 @@ export async function find(file, arg, context = {}, findOpts = {}) {
 /**
  * Asynchronously finds one entry in a file based on search criteria.
  */
-export async function findOne(file, arg, context = {}, findOpts = {}) {
+export async function findOne(file, search, context = {}, findOpts = {}) {
     file = pathRepair(file);
     return await new Promise(async (resolve) => {
         if (!existsSync(file)) {
@@ -60,9 +63,12 @@ export async function findOne(file, arg, context = {}, findOpts = {}) {
         }
         const rl = createRL(file);
         for await (const line of rl) {
-            if (line == "" || !line)
+            if (!line)
+                continue;
+            const trimmed = line.trim();
+            if (!trimmed)
                 continue;
-            const res = await findProcesLine(arg, line, context, findOpts);
+            const res = await findProcesLine(search, trimmed, context, findOpts);
             if (res) {
                 resolve(res);
                 rl.close();

package/dist/file/remove.js

@@ -17,11 +17,16 @@ async function removeWorker(file, one, search, context = {}) {
     const rl = createRL(file + ".tmp");
     let removed = false;
     for await (let line of rl) {
+        if (!line)
+            continue;
+        const trimmed = line.trim();
         if (one && removed) {
-            appendFileSync(file, line + "\n");
+            appendFileSync(file, trimmed + "\n");
             continue;
         }
-        const data = parseData(line);
+        if (!trimmed)
+            continue;
+        const data = parseData(trimmed);
         if (typeof search === "function") {
             if (search(data, context)) {
                 removed = true;

package/dist/file/update.js

@@ -18,11 +18,16 @@ async function updateWorker(file, one, search, updater, context = {}) {
     const rl = createRL(file + ".tmp");
     let updated = false;
     for await (let line of rl) {
+        if (!line)
+            continue;
+        const trimmed = line.trim();
         if (one && updated) {
-            await promises.appendFile(file, line + "\n");
+            await promises.appendFile(file, trimmed + "\n");
             continue;
         }
-        const data = parseData(line);
+        if (!trimmed)
+            continue;
+        const data = parseData(trimmed);
         let ob = false;
         if (typeof search === "function") {
             ob = search(data, context) || false;

package/dist/version.js

@@ -1 +1 @@
-export const version = "0.1.2";
+export const version = "0.1.4";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wxn0brp/db-storage-dir",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "author": "wxn0brP",
@@ -16,11 +16,11 @@
     "json5": "^2.2.3"
   },
   "peerDependencies": {
-    "@wxn0brp/db-core": ">=0.2.3"
+    "@wxn0brp/db-core": ">=0.2.4"
   },
   "devDependencies": {
     "@types/bun": "*",
-    "@wxn0brp/db-core": "^0.2.3",
+    "@wxn0brp/db-core": "^0.2.4",
     "tsc-alias": "*",
     "typescript": "*"
   },
@@ -39,4 +39,4 @@
       "default": "./dist/*.js"
     }
   }
-}
+}