@wxn0brp/db-core 0.11.0-alpha.1 → 0.11.0-alpha.3

package/dist/base/custom.d.ts

@@ -20,17 +20,17 @@ export declare abstract class CustomActionsBase extends ActionsBase {
     /**
      * Update entries in the specified database based on search criteria and an updater function or object.
      */
-    update(query: VQueryT.Update): Promise<Data[]>;
+    update(query: VQueryT.Update): Promise<import("../types/data.js").DataInternal[]>;
     /**
      * Update the first matching entry in the specified database based on search criteria and an updater function or object.
      */
-    updateOne(query: VQueryT.Update): Promise<Data>;
+    updateOne(query: VQueryT.Update): Promise<import("../types/data.js").DataInternal>;
     /**
      * Remove entries from the specified database based on search criteria.
      */
-    remove(query: VQueryT.Remove): Promise<Data[]>;
+    remove(query: VQueryT.Remove): Promise<import("../types/data.js").DataInternal[]>;
     /**
      * Remove the first matching entry from the specified database based on search criteria.
      */
-    removeOne(query: VQueryT.Remove): Promise<Data>;
+    removeOne(query: VQueryT.Remove): Promise<import("../types/data.js").DataInternal>;
 }

package/dist/customFileCpu.d.ts

@@ -1,4 +1,4 @@
-import { Data } from "./types/data.js";
+import { Data, DataInternal } from "./types/data.js";
 import { FileCpu } from "./types/fileCpu.js";
 import { VQueryT } from "./types/query.js";
 export type WriteFile = (file: string, data: any[]) => Promise<void>;
@@ -10,7 +10,7 @@ export declare class CustomFileCpu implements FileCpu {
     constructor(readFile: ReadFile, writeFile: WriteFile);
     add(file: string, config: VQueryT.Add): Promise<void>;
     find(file: string, config: VQueryT.Find): Promise<Data[]>;
-    findOne(file: string, config: VQueryT.FindOne): Promise<Data | false>;
-    remove(file: string, config: VQueryT.Remove, one: boolean): Promise<Data[]>;
-    update(file: string, config: VQueryT.Update, one: boolean): Promise<Data[]>;
+    findOne(file: string, config: VQueryT.FindOne): Promise<DataInternal | false>;
+    remove(file: string, config: VQueryT.Remove, one: boolean): Promise<DataInternal[]>;
+    update(file: string, config: VQueryT.Update, one: boolean): Promise<DataInternal[]>;
 }

package/dist/customFileCpu.js

@@ -1,6 +1,4 @@
-import { hasFieldsAdvanced } from "./utils/hasFieldsAdvanced.js";
-import { updateFindObject } from "./utils/updateFindObject.js";
-import { updateObjectAdvanced } from "./utils/updateObject.js";
+import { matchObj, findObj, updateObj } from "./utils/process.js";
 export function pathRepair(path) {
     return path.replaceAll("//", "/");
 }
@@ -20,31 +18,28 @@ export class CustomFileCpu {
     async find(file, config) {
         file = pathRepair(file);
         const entries = await this._readFile(file);
-        const { search, context = {}, findOpts = {} } = config;
-        const results = entries.filter(entry => typeof search === "function" ? search(entry, context) : hasFieldsAdvanced(entry, search));
-        return results.length ?
-            results.map(res => updateFindObject(res, findOpts)) :
-            [];
+        return entries
+            .map((entry) => findObj(config, entry))
+            .filter(Boolean);
     }
     async findOne(file, config) {
         file = pathRepair(file);
         const entries = await this._readFile(file);
-        const { search, context = {}, findOpts = {} } = config;
-        const result = entries.find(entry => typeof search === "function" ? search(entry, context) : hasFieldsAdvanced(entry, search));
-        return result ?
-            updateFindObject(result, findOpts) :
-            false;
+        for (const entry of entries) {
+            const result = findObj(config, entry);
+            if (result)
+                return result;
+        }
+        return false;
     }
     async remove(file, config, one) {
         file = pathRepair(file);
         let entries = await this._readFile(file);
         const removed = [];
-        const { search, context = {} } = config;
-        entries = entries.filter(entry => {
+        entries = entries.filter((entry) => {
             if (removed.length && one)
                 return true;
-            let match = typeof search === "function" ? search(entry, context) : hasFieldsAdvanced(entry, search);
-            if (match) {
+            if (matchObj(config, entry)) {
                 removed.push(entry);
                 return false;
             }
@@ -58,13 +53,11 @@ export class CustomFileCpu {
         file = pathRepair(file);
         let entries = await this._readFile(file);
         const updated = [];
-        const { search, updater, context = {} } = config;
-        entries = entries.map(entry => {
+        entries = entries.map((entry) => {
             if (updated.length && one)
                 return entry;
-            let match = typeof search === "function" ? search(entry, context) : hasFieldsAdvanced(entry, search);
-            if (match) {
-                const updatedEntry = typeof updater === "function" ? updater(entry, context) : updateObjectAdvanced(entry, updater);
+            if (matchObj(config, entry)) {
+                const updatedEntry = updateObj(config, entry);
                 updated.push(updatedEntry);
                 return updatedEntry;
             }

package/dist/types/arg.d.ts

@@ -1,3 +1,4 @@
+import { Data } from "./data.js";
 import { SearchOptions } from "./searchOpts.js";
 import { VContext } from "./types.js";
 import { UpdaterArg } from "./updater.js";
@@ -5,6 +6,6 @@ export type Arg<T = any> = {
     [K in keyof T]?: any;
 } & Record<string, any>;
 export type SearchFunc<T = any> = (data: T, context: VContext) => boolean;
-export type UpdaterFunc<T = any> = (data: T, context: VContext) => boolean;
+export type UpdaterFunc<T = any> = (data: T, context: VContext) => Data | void;
 export type Search<T = any> = SearchOptions<T> | SearchFunc<T>;
-export type Updater<T = any> = UpdaterArg<T> | UpdaterArg<T>[] | UpdaterFunc<T>;
+export type Updater<T = any> = UpdaterArg<T> | UpdaterFunc<T>;

package/dist/utils/process.d.ts

@@ -0,0 +1,5 @@
+import { Data, DataInternal } from "../types/data.js";
+import { VQuery, VQueryT } from "../types/query.js";
+export declare function findObj(config: VQueryT.Find | VQueryT.FindOne, obj: Data): DataInternal | null;
+export declare function matchObj(config: VQuery, obj: Data): boolean;
+export declare function updateObj(config: VQueryT.Update, obj: Data): DataInternal;

package/dist/utils/process.js

@@ -0,0 +1,30 @@
+import { hasFieldsAdvanced } from "./hasFieldsAdvanced.js";
+import { updateFindObject } from "./updateFindObject.js";
+import { updateObjectAdvanced } from "./updateObject.js";
+export function findObj(config, obj) {
+    if (matchObj(config, obj))
+        return updateFindObject(obj, config.findOpts || {});
+    return null;
+}
+export function matchObj(config, obj) {
+    const { search, context } = config;
+    if (search === undefined || search === null)
+        return true;
+    if (typeof search === "function" && search(obj, context))
+        return true;
+    if (typeof search === "object" && !Array.isArray(search) && hasFieldsAdvanced(obj, search))
+        return true;
+    return false;
+}
+export function updateObj(config, obj) {
+    const { updater, context } = config;
+    if (typeof updater === "object" && !Array.isArray(updater))
+        return updateObjectAdvanced(obj, updater);
+    if (typeof updater === "function") {
+        const updateObjValue = updater(obj, context);
+        if (updateObjValue)
+            return updateObjValue;
+        return obj;
+    }
+    return obj;
+}

package/dist/utils/updateObject.js

@@ -5,12 +5,10 @@ import { _deepMerge } from "./merge.js";
  * @param field - An object containing new values to update in the target object.
  */
 export function updateObjectAdvanced(obj, field) {
-    if (typeof field !== "object" || field === null) {
-        throw new Error("Fields must be an object or object array");
-    }
-    if (Object.keys(field).length === 0) {
+    if (typeof field !== "object" || Array.isArray(field) || field === null)
+        throw new Error("Fields must be an object");
+    if (Object.keys(field).length === 0)
         return obj;
-    }
     const newObj = structuredClone(obj);
     const $fields = {};
     const subsetFields = {};
@@ -106,11 +104,9 @@ function mainUpdate(obj, fields) {
  * @param newVal - An object containing new values to update in the target object.
  */
 function updateObject(obj, newVal) {
-    for (let key in newVal) {
-        if (newVal.hasOwnProperty(key)) {
+    for (let key in newVal)
+        if (newVal.hasOwnProperty(key))
             obj[key] = newVal[key];
-        }
-    }
     return obj;
 }
 function _for(fields, obj, opts) {

package/dist/version.js

@@ -1 +1 @@
-export const version = "0.11.0-alpha.1";
+export const version = "0.11.0-alpha.3";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wxn0brp/db-core",
-  "version": "0.11.0-alpha.1",
+  "version": "0.11.0-alpha.3",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "author": "wxn0brP",