@wxn0brp/db-storage-dir 0.2.4 → 0.10.0-alpha.0

package/dist/action.d.ts

@@ -1,7 +1,7 @@
 import { ActionsBase } from "@wxn0brp/db-core/base/actions";
 import { Data } from "@wxn0brp/db-core/types/data";
 import { FileCpu } from "@wxn0brp/db-core/types/fileCpu";
-import { VQuery } from "@wxn0brp/db-core/types/query";
+import * as Query from "@wxn0brp/db-core/types/query";
 import { FileActionsUtils } from "./action.utils.js";
 import { DbDirOpts } from "./types.js";
 /**
@@ -32,41 +32,41 @@ export declare class FileActions extends ActionsBase {
     /**
      * Check and create the specified collection if it doesn't exist.
      */
-    ensureCollection({ collection }: VQuery): Promise<boolean>;
+    ensureCollection(collection: string): Promise<boolean>;
     /**
      * Check if a collection exists.
      */
-    issetCollection({ collection }: VQuery): Promise<boolean>;
+    issetCollection(collection: string): Promise<boolean>;
     /**
      * Add a new entry to the specified database.
      */
-    add(query: VQuery): Promise<import("@wxn0brp/db-core/types/arg").Arg<Data>>;
+    add(query: Query.AddQuery): Promise<import("@wxn0brp/db-core/types/arg").Arg<Data>>;
     /**
      * Find entries in the specified database based on search criteria.
      */
-    find(query: VQuery): Promise<Data[]>;
+    find(query: Query.FindQuery): Promise<Data[]>;
     /**
      * Find the first matching entry in the specified database based on search criteria.
      */
-    findOne(query: VQuery): Promise<Data>;
+    findOne(query: Query.FindOneQuery): Promise<Data>;
     /**
      * Update entries in the specified database based on search criteria and an updater function or object.
      */
-    update(query: VQuery): Promise<any[]>;
+    update(query: Query.UpdateQuery): Promise<any[]>;
     /**
      * Update the first matching entry in the specified database based on search criteria and an updater function or object.
      */
-    updateOne(query: VQuery): Promise<any>;
+    updateOne(query: Query.UpdateQuery): Promise<any>;
     /**
      * Remove entries from the specified database based on search criteria.
      */
-    remove(query: VQuery): Promise<any[]>;
+    remove(query: Query.RemoveQuery): Promise<any[]>;
     /**
      * Remove the first matching entry from the specified database based on search criteria.
      */
-    removeOne(query: VQuery): Promise<any>;
+    removeOne(query: Query.RemoveQuery): Promise<any>;
     /**
      * Removes a database collection from the file system.
      */
-    removeCollection({ collection }: VQuery): Promise<boolean>;
+    removeCollection(collection: string): Promise<boolean>;
 }

package/dist/action.js

@@ -4,6 +4,7 @@ import { findUtil } from "@wxn0brp/db-core/utils/action";
 import { promises } from "fs";
 import { resolve, sep } from "path";
 import { FileActionsUtils } from "./action.utils.js";
+import { exists } from "./utils.js";
 /**
  * A class representing database actions on files.
  * @class
@@ -33,7 +34,7 @@ export class FileActions extends ActionsBase {
         };
     }
     async init() {
-        if (!await promises.exists(this.folder))
+        if (!await exists(this.folder))
             await promises.mkdir(this.folder, { recursive: true });
     }
     _getCollectionPath(collection) {
@@ -58,7 +59,7 @@ export class FileActions extends ActionsBase {
     /**
      * Check and create the specified collection if it doesn't exist.
      */
-    async ensureCollection({ collection }) {
+    async ensureCollection(collection) {
         if (await this.issetCollection(collection))
             return;
         const c_path = this._getCollectionPath(collection);
@@ -68,7 +69,7 @@ export class FileActions extends ActionsBase {
     /**
      * Check if a collection exists.
      */
-    async issetCollection({ collection }) {
+    async issetCollection(collection) {
         const path = this._getCollectionPath(collection);
         try {
             await promises.access(path);
@@ -83,18 +84,18 @@ export class FileActions extends ActionsBase {
      */
     async add(query) {
         const { collection, data } = query;
-        await this.ensureCollection(query);
+        await this.ensureCollection(collection);
         const c_path = this._getCollectionPath(collection);
         const file = c_path + await this.utils.getLastFile(c_path, this.options.maxFileSize, query);
         await addId(query, this);
-        await this.fileCpu.add(file, data);
+        await this.fileCpu.add(file, query);
         return data;
     }
     /**
      * Find entries in the specified database based on search criteria.
      */
     async find(query) {
-        await this.ensureCollection(query);
+        await this.ensureCollection(query.collection);
         const c_path = this._getCollectionPath(query.collection);
         let files = await this.utils.getSortedFiles(c_path, query);
         if (files.length == 0)
@@ -107,12 +108,12 @@ export class FileActions extends ActionsBase {
      * Find the first matching entry in the specified database based on search criteria.
      */
     async findOne(query) {
-        const { collection, search, context = {}, findOpts = {} } = query;
-        await this.ensureCollection(query);
+        const { collection } = query;
+        await this.ensureCollection(collection);
         const c_path = this._getCollectionPath(collection);
         const files = await this.utils.getSortedFiles(c_path, query);
         for (let f of files) {
-            let data = await this.fileCpu.findOne(c_path + f, search, context, findOpts);
+            let data = await this.fileCpu.findOne(c_path + f, query);
             if (data)
                 return data;
         }
@@ -122,40 +123,40 @@ export class FileActions extends ActionsBase {
      * Update entries in the specified database based on search criteria and an updater function or object.
      */
     async update(query) {
-        const { collection, search, updater, context = {} } = query;
-        await this.ensureCollection(query);
-        return await this.utils.operationUpdater(this._getCollectionPath(collection), this.fileCpu.update.bind(this.fileCpu), false, query, search, updater, context);
+        const { collection } = query;
+        await this.ensureCollection(collection);
+        return await this.utils.operationUpdater(this._getCollectionPath(collection), this.fileCpu.update.bind(this.fileCpu), false, query);
     }
     /**
      * Update the first matching entry in the specified database based on search criteria and an updater function or object.
      */
     async updateOne(query) {
-        const { collection, search, updater, context = {} } = query;
-        await this.ensureCollection(query);
-        const res = await this.utils.operationUpdater(this._getCollectionPath(collection), this.fileCpu.update.bind(this.fileCpu), true, query, search, updater, context);
+        const { collection } = query;
+        await this.ensureCollection(collection);
+        const res = await this.utils.operationUpdater(this._getCollectionPath(collection), this.fileCpu.update.bind(this.fileCpu), true, query);
         return res[0];
     }
     /**
      * Remove entries from the specified database based on search criteria.
      */
     async remove(query) {
-        const { collection, search, context = {} } = query;
-        await this.ensureCollection(query);
-        return await this.utils.operationUpdater(this._getCollectionPath(collection), this.fileCpu.remove.bind(this.fileCpu), false, query, search, context);
+        const { collection } = query;
+        await this.ensureCollection(query.collection);
+        return await this.utils.operationUpdater(this._getCollectionPath(collection), this.fileCpu.remove.bind(this.fileCpu), false, query);
     }
     /**
      * Remove the first matching entry from the specified database based on search criteria.
      */
     async removeOne(query) {
-        const { collection, search, context = {} } = query;
-        await this.ensureCollection(query);
-        const res = await this.utils.operationUpdater(this._getCollectionPath(collection), this.fileCpu.remove.bind(this.fileCpu), true, query, search, context);
+        const { collection } = query;
+        await this.ensureCollection(query.collection);
+        const res = await this.utils.operationUpdater(this._getCollectionPath(collection), this.fileCpu.remove.bind(this.fileCpu), true, query);
         return res[0];
     }
     /**
      * Removes a database collection from the file system.
      */
-    async removeCollection({ collection }) {
+    async removeCollection(collection) {
         await promises.rm(this.folder + "/" + collection, { recursive: true, force: true });
         return true;
     }

package/dist/action.utils.d.ts

@@ -8,5 +8,5 @@ export declare class FileActionsUtils {
      * Get all files in a directory sorted by name.
      */
     getSortedFiles(folder: string, query: VQuery): Promise<string[]>;
-    operationUpdater(c_path: string, worker: (file: string, one: boolean, ...args: any[]) => Promise<boolean>, one: boolean, query: VQuery, ...args: any[]): Promise<any[]>;
+    operationUpdater(c_path: string, worker: (file: string, config: VQuery, one: boolean) => Promise<boolean>, one: boolean, config: VQuery): Promise<any[]>;
 }

package/dist/action.utils.js

@@ -1,4 +1,5 @@
-import { exists, mkdir, readdir, stat, writeFile } from "fs/promises";
+import { mkdir, readdir, stat, writeFile } from "fs/promises";
+import { exists } from "./utils.js";
 export class FileActionsUtils {
     /**
      * Get the last file in the specified directory.
@@ -41,11 +42,11 @@ export class FileActionsUtils {
         query.control.dir.sortedFiles = sorted;
         return sorted;
     }
-    async operationUpdater(c_path, worker, one, query, ...args) {
-        const files = await this.getSortedFiles(c_path, query);
+    async operationUpdater(c_path, worker, one, config) {
+        const files = await this.getSortedFiles(c_path, config);
         let update = [];
         for (const file of files) {
-            const updated = await worker(c_path + file, one, ...args);
+            const updated = await worker(c_path + file, config, one);
             update.push(updated);
             if (one && updated)
                 break;

package/dist/file/find.d.ts

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

package/dist/file/find.js

@@ -7,9 +7,10 @@ import { createRL } from "./utils.js";
 /**
  * Processes a line of text from a file and checks if it matches the search criteria.
  */
-async function findProcesLine(search, line, context = {}, findOpts = {}) {
+async function findProcesLine(config, line) {
     const ob = parseData(line);
     let res = false;
+    const { search, context, findOpts = {} } = config;
     if (typeof search === "function") {
         if (search(ob, context))
             res = true;
@@ -25,7 +26,7 @@ async function findProcesLine(search, line, context = {}, findOpts = {}) {
 /**
  * Asynchronously finds entries in a file based on search criteria.
  */
-export async function find(file, search, context = {}, findOpts = {}) {
+export async function find(file, config) {
     file = pathRepair(file);
     return await new Promise(async (resolve) => {
         if (!existsSync(file)) {
@@ -41,7 +42,7 @@ export async function find(file, search, context = {}, findOpts = {}) {
             const trimmed = line.trim();
             if (!trimmed)
                 continue;
-            const res = await findProcesLine(search, trimmed, context, findOpts);
+            const res = await findProcesLine(config, trimmed);
             if (res)
                 results.push(res);
         }
@@ -53,7 +54,7 @@ export async function find(file, search, context = {}, findOpts = {}) {
 /**
  * Asynchronously finds one entry in a file based on search criteria.
  */
-export async function findOne(file, search, context = {}, findOpts = {}) {
+export async function findOne(file, config) {
     file = pathRepair(file);
     return await new Promise(async (resolve) => {
         if (!existsSync(file)) {
@@ -68,7 +69,7 @@ export async function findOne(file, search, context = {}, findOpts = {}) {
             const trimmed = line.trim();
             if (!trimmed)
                 continue;
-            const res = await findProcesLine(search, trimmed, context, findOpts);
+            const res = await findProcesLine(config, trimmed);
             if (res) {
                 resolve(res);
                 rl.close();

package/dist/file/index.js

@@ -4,8 +4,8 @@ import { find, findOne } from "./find.js";
 import { remove } from "./remove.js";
 import { update } from "./update.js";
 export const vFileCpu = {
-    add: async (file, data) => {
-        const dataString = stringifyData(data);
+    add: async (file, config) => {
+        const dataString = stringifyData(config.data);
         appendFileSync(file, dataString + "\n");
     },
     find,

package/dist/file/remove.d.ts

@@ -1,6 +1,5 @@
-import { Search } from "@wxn0brp/db-core/types/arg";
-import { VContext } from "@wxn0brp/db-core/types/types";
+import { RemoveQuery } from "@wxn0brp/db-core/types/query";
 /**
  * Removes entries from a file based on search criteria.
  */
-export declare function remove(file: string, one: boolean, search: Search, context?: VContext): Promise<any[]>;
+export declare function remove(file: string, config: RemoveQuery, one: boolean): Promise<any[]>;

package/dist/file/remove.js

@@ -6,7 +6,7 @@ import { createRL } from "./utils.js";
 /**
  * Removes entries from a file based on search criteria.
  */
-export async function remove(file, one, search, context = {}) {
+export async function remove(file, config, one) {
     file = pathRepair(file);
     if (!existsSync(file)) {
         await promises.writeFile(file, "");
@@ -15,6 +15,7 @@ export async function remove(file, one, search, context = {}) {
     await promises.copyFile(file, file + ".tmp");
     await promises.writeFile(file, "");
     const rl = createRL(file + ".tmp");
+    const { search, context } = config;
     let removed = [];
     for await (let line of rl) {
         if (!line)

package/dist/file/update.d.ts

@@ -1,6 +1,5 @@
-import { Search, Updater } from "@wxn0brp/db-core/types/arg";
-import { VContext } from "@wxn0brp/db-core/types/types";
+import { UpdateQuery } from "@wxn0brp/db-core/types/query";
 /**
  * Updates a file based on search criteria and an updater function or object.
  */
-export declare function update(file: string, one: boolean, search: Search, updater: Updater, context?: VContext): Promise<any[]>;
+export declare function update(file: string, config: UpdateQuery, one: boolean): Promise<any[]>;

package/dist/file/update.js

@@ -7,7 +7,7 @@ import { createRL } from "./utils.js";
 /**
  * Updates a file based on search criteria and an updater function or object.
  */
-export async function update(file, one, search, updater, context = {}) {
+export async function update(file, config, one) {
     file = pathRepair(file);
     if (!existsSync(file)) {
         await promises.writeFile(file, "");
@@ -16,6 +16,7 @@ export async function update(file, one, search, updater, context = {}) {
     await promises.copyFile(file, file + ".tmp");
     await promises.writeFile(file, "");
     const rl = createRL(file + ".tmp");
+    const { search, updater, context } = config;
     let updated = [];
     for await (let line of rl) {
         if (!line)

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { FileActions } from "./action.js";
 import { DbDirOpts } from "./types.js";
-export * from "./file/index.js";
 export * from "./action.js";
+export * from "./file/index.js";
 export declare function createFileActions(folder: string, options?: DbDirOpts): FileActions;

package/dist/index.js

@@ -1,7 +1,7 @@
-import { vFileCpu } from "./file/index.js";
 import { FileActions } from "./action.js";
-export * from "./file/index.js";
+import { vFileCpu } from "./file/index.js";
 export * from "./action.js";
+export * from "./file/index.js";
 export function createFileActions(folder, options = {}) {
     return new FileActions(folder, options, vFileCpu);
 }

package/dist/utils.d.ts

@@ -0,0 +1 @@
+export declare function exists(path: string): Promise<boolean>;

package/dist/utils.js

@@ -0,0 +1,10 @@
+import { access } from "node:fs/promises";
+export async function exists(path) {
+    try {
+        await access(path);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wxn0brp/db-storage-dir",
-  "version": "0.2.4",
+  "version": "0.10.0-alpha.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "author": "wxn0brP",
@@ -21,11 +21,11 @@
     "json5": "^2.2.3"
   },
   "peerDependencies": {
-    "@wxn0brp/db-core": "~0.9.0"
+    "@wxn0brp/db-core": "~0.10.0-alpha.1"
   },
   "devDependencies": {
     "@types/bun": "*",
-    "@wxn0brp/db-core": "~0.9.0",
+    "@wxn0brp/db-core": "~0.10.0-alpha.1",
     "tsc-alias": "*",
     "typescript": "*"
   },

package/dist/version.js

@@ -1 +0,0 @@
-export const version = "0.2.4";