@wxn0brp/db-storage-sqlite 0.101.0 → 0.110.0

package/dist/find.js

@@ -1,7 +1,7 @@
 import { findUtil } from "@wxn0brp/db-core/utils/action";
-import { hasFieldsAdvanced } from "@wxn0brp/db-core/utils/hasFieldsAdvanced";
+import { findObj } from "@wxn0brp/db-core/utils/process";
 export async function find(slv, config) {
-    const { collection, search, context } = config;
+    const { collection, search } = config;
     let sqlResult = [];
     if (typeof search === "function" || Object.keys(search).length === 0) {
         const stmt = await slv._prepare(`SELECT * FROM ${collection}`);
@@ -17,10 +17,6 @@ export async function find(slv, config) {
         const stmt = await slv._prepare(baseSql);
         sqlResult = await Promise.resolve(stmt.all(...baseValues));
     }
-    let result = sqlResult.filter(entry => typeof search === "function" ? search(entry, context) : hasFieldsAdvanced(entry, search));
-    return findUtil(config, {
-        find() {
-            return result;
-        }
-    }, [null]);
+    const result = sqlResult.filter(entry => findObj(entry, search));
+    return findUtil(config, result, []);
 }

package/dist/index.js

@@ -1,5 +1,6 @@
-import { forgeTypedValthera, genId, ValtheraClass } from "@wxn0brp/db-core";
+import { forgeTypedValthera, ValtheraClass } from "@wxn0brp/db-core";
 import { ActionsBase } from "@wxn0brp/db-core/base/actions";
+import { addId } from "@wxn0brp/db-core/helpers/addId";
 import { find } from "./find.js";
 import { remove } from "./remove.js";
 import { update } from "./update.js";
@@ -30,9 +31,8 @@ export class SQLiteValthera extends ActionsBase {
         return tables.map((t) => t.name);
     }
     async add(config) {
-        const { data, id_gen = true, collection } = config;
-        if (id_gen && !data._id)
-            data._id = genId();
+        const { data, collection } = config;
+        await addId(config, this, true);
         const keys = Object.keys(data);
         const placeholders = keys.map(() => "?").join(", ");
         const values = keys.map(k => data[k]);
@@ -94,16 +94,22 @@ export const DYNAMIC = {
             return DYNAMIC.bun(file, keys, opts);
         return DYNAMIC.node(file, keys, opts);
     },
-    async bun(file, keys = {}, opts) {
+    async bun(file, keys = {}, opts = undefined) {
         const { Database } = await import("bun:sqlite");
+        if (typeof opts === "object" && Object.keys(opts).length === 0)
+            opts = undefined;
         return new SQLiteValthera(new Database(file, opts), keys);
     },
     async node(file, keys = {}, opts) {
         const { DatabaseSync } = await import("node:sqlite");
+        if (!opts)
+            opts = {};
         return new SQLiteValthera(new DatabaseSync(file, opts), keys);
     },
     async better(file, keys = {}, opts) {
         const { default: def } = await import("better-sqlite3");
+        if (!opts)
+            opts = {};
         return new SQLiteValthera(new def(file, opts), keys);
     }
 };

package/dist/update.js

@@ -1,7 +1,7 @@
-import { updateObjectAdvanced } from "@wxn0brp/db-core/utils/updateObject";
+import { updateObj } from "@wxn0brp/db-core/utils/process";
 import { find } from "./find.js";
 export async function update(slv, query, one) {
-    const { collection, updater, context } = query;
+    const { collection } = query;
     const matched = await find(slv, {
         ...query,
         dbFindOpts: {
@@ -12,9 +12,7 @@ export async function update(slv, query, one) {
         return [];
     const key = slv.primaryKey[collection] || "_id";
     const updateOne = async (target) => {
-        const newData = typeof updater === "function"
-            ? updater(target, context)
-            : updateObjectAdvanced(target, updater);
+        const newData = updateObj(query, target);
         if (newData[key] !== target[key])
             newData[key] = target[key];
         const keys = Object.keys(newData).filter(k => k !== key);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wxn0brp/db-storage-sqlite",
-  "version": "0.101.0",
+  "version": "0.110.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "description": "A pure SQLite storage adapter for the ValtheraDB database library",
@@ -22,13 +22,13 @@
     "@types/better-sqlite3": "^7.6.13",
     "@types/bun": "*",
     "@types/node": "*",
-    "@wxn0brp/db-core": "^0.10.4",
+    "@wxn0brp/db-core": "^0.11.0-alpha.4",
     "better-sqlite3": "^12.9.0",
     "tsc-alias": "^1",
     "typescript": "^6"
   },
   "peerDependencies": {
-    "@wxn0brp/db-core": "^0.10.4",
+    "@wxn0brp/db-core": "^0.11.0-alpha.4",
     "better-sqlite3": "^12.9.0"
   },
   "peerDependenciesMeta": {