@wxn0brp/db-storage-sqlite 0.90.0 → 0.100.0

package/dist/find.d.ts

@@ -1,4 +1,4 @@
 import { Data } from "@wxn0brp/db-core/types/data";
-import { VQuery } from "@wxn0brp/db-core/types/query";
+import { FindQuery } from "@wxn0brp/db-core/types/query";
 import { SQLiteValthera } from "./index.js";
-export declare function find(slv: SQLiteValthera, config: VQuery): Promise<Data[]>;
+export declare function find(slv: SQLiteValthera, config: FindQuery): Promise<Data[]>;

package/dist/find.js

@@ -1,8 +1,7 @@
-import { compareSafe } from "@wxn0brp/db-core/utils/compare";
+import { findUtil } from "@wxn0brp/db-core/utils/action";
 import { hasFieldsAdvanced } from "@wxn0brp/db-core/utils/hasFieldsAdvanced";
-import { updateFindObject } from "@wxn0brp/db-core/utils/updateFindObject";
 export async function find(slv, config) {
-    const { collection, search, findOpts, dbFindOpts, context } = config;
+    const { collection, search, context } = config;
     let sqlResult = [];
     if (typeof search === "function" || Object.keys(search).length === 0) {
         const stmt = await slv._prepare(`SELECT * FROM ${collection}`);
@@ -19,21 +18,9 @@ export async function find(slv, config) {
         sqlResult = await Promise.resolve(stmt.all(...baseValues));
     }
     let result = sqlResult.filter(entry => typeof search === "function" ? search(entry, context) : hasFieldsAdvanced(entry, search));
-    const { reverse = false, limit = -1, offset = 0, sortBy, sortAsc = true } = dbFindOpts;
-    if (reverse)
-        result.reverse();
-    if (sortBy) {
-        const dir = sortAsc ? 1 : -1;
-        result.sort((a, b) => compareSafe(a[sortBy], b[sortBy]) * dir);
-        const start = offset;
-        const end = limit !== -1 ? offset + limit : undefined;
-        result = result.slice(start, end);
-    }
-    else {
-        if (offset > 0)
-            result.splice(0, offset);
-        if (limit > 0)
-            result.splice(limit);
-    }
-    return result.length ? result.map(res => updateFindObject(res, findOpts)) : [];
+    return findUtil(config, {
+        find() {
+            return result;
+        }
+    }, [null]);
 }

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import { ValtheraClass } from "@wxn0brp/db-core";
 import { ActionsBase } from "@wxn0brp/db-core/base/actions";
 import { Data } from "@wxn0brp/db-core/types/data";
-import { VQuery } from "@wxn0brp/db-core/types/query";
+import * as Query from "@wxn0brp/db-core/types/query";
 import { SupportedDB, VStatement } from "./types.js";
 export declare class SQLiteValthera extends ActionsBase {
     db: SupportedDB;
@@ -9,15 +9,15 @@ export declare class SQLiteValthera extends ActionsBase {
     constructor(db: SupportedDB);
     _prepare(sql: string): Promise<VStatement>;
     getCollections(): Promise<string[]>;
-    add(config: VQuery): Promise<Data>;
-    find(config: VQuery): Promise<Data[]>;
-    findOne(config: VQuery): Promise<Data | null>;
-    update(config: VQuery): Promise<any[]>;
-    updateOne(config: VQuery): Promise<any>;
-    remove(config: VQuery): Promise<Data[]>;
-    removeOne(config: VQuery): Promise<Data>;
-    removeCollection(config: VQuery): Promise<boolean>;
-    issetCollection(config: VQuery): Promise<boolean>;
-    ensureCollection(config: VQuery): Promise<boolean>;
+    add(config: Query.AddQuery): Promise<Data>;
+    find(config: Query.FindQuery): Promise<Data[]>;
+    findOne(config: Query.FindQuery): Promise<Data | null>;
+    update(config: Query.UpdateQuery): Promise<import("@wxn0brp/db-core/types/data").DataInternal[]>;
+    updateOne(config: Query.UpdateQuery): Promise<import("@wxn0brp/db-core/types/data").DataInternal>;
+    remove(config: Query.RemoveQuery): Promise<import("@wxn0brp/db-core/types/data").DataInternal[]>;
+    removeOne(config: Query.RemoveQuery): Promise<import("@wxn0brp/db-core/types/data").DataInternal>;
+    removeCollection(collection: string): Promise<boolean>;
+    issetCollection(collection: string): Promise<boolean>;
+    ensureCollection(collection: string): Promise<boolean>;
 }
 export declare function createSQLiteValthera(sqlDB: SupportedDB): ValtheraClass;

package/dist/index.js

@@ -48,36 +48,33 @@ export class SQLiteValthera extends ActionsBase {
         return result.length ? result[0] : null;
     }
     update(config) {
-        return update(this, config.collection, false, config.search, config.updater, config.context);
+        return update(this, config, false);
     }
     async updateOne(config) {
-        const res = await update(this, config.collection, true, config.search, config.updater, config.context);
+        const res = await update(this, config, true);
         return res[0] || null;
     }
     remove(config) {
-        return remove(this, config.collection, false, config.search, config.context);
+        return remove(this, config, false);
     }
     async removeOne(config) {
-        const res = await remove(this, config.collection, true, config.search, config.context);
+        const res = await remove(this, config, true);
         return res[0] || null;
     }
-    async removeCollection(config) {
-        const { collection } = config;
+    async removeCollection(collection) {
         const sql = `DROP TABLE IF EXISTS ${collection}`;
         const stmt = await this._prepare(sql);
         await Promise.resolve(stmt.run());
         return true;
     }
-    async issetCollection(config) {
-        const { collection } = config;
+    async issetCollection(collection) {
         const sql = `SELECT name FROM sqlite_master WHERE type='table' AND name=?`;
         const stmt = await this._prepare(sql);
         const result = await Promise.resolve(stmt.all(collection));
         return result.length > 0;
     }
-    async ensureCollection(config) {
-        const { collection } = config;
-        const issetCollection = await this.issetCollection(config);
+    async ensureCollection(collection) {
+        const issetCollection = await this.issetCollection(collection);
         if (!issetCollection) {
             throw new Error(`Collection "${collection}" not found. Please create it first.`);
         }

package/dist/remove.d.ts

@@ -1,5 +1,4 @@
-import { Search } from "@wxn0brp/db-core/types/arg";
-import { Data } from "@wxn0brp/db-core/types/data";
-import { VContext } from "@wxn0brp/db-core/types/types";
+import { DataInternal } from "@wxn0brp/db-core/types/data";
+import { RemoveQuery } from "@wxn0brp/db-core/types/query";
 import { SQLiteValthera } from "./index.js";
-export declare function remove(slv: SQLiteValthera, collection: string, one: boolean, search: Search, context?: VContext): Promise<Data[]>;
+export declare function remove(slv: SQLiteValthera, query: RemoveQuery, one: boolean): Promise<DataInternal[]>;

package/dist/remove.js

@@ -1,5 +1,6 @@
 import { hasFieldsAdvanced } from "@wxn0brp/db-core/utils/hasFieldsAdvanced";
-export async function remove(slv, collection, one, search, context = {}) {
+export async function remove(slv, query, one) {
+    const { collection, search, context } = query;
     let stmt = await slv._prepare(`SELECT * FROM "${collection}"`);
     const allEntries = await Promise.resolve(stmt.all());
     const toDelete = [];

package/dist/update.d.ts

@@ -1,4 +1,4 @@
-import { Search, Updater } from "@wxn0brp/db-core/types/arg";
-import { VContext } from "@wxn0brp/db-core/types/types";
+import { DataInternal } from "@wxn0brp/db-core/types/data";
+import { UpdateQuery } from "@wxn0brp/db-core/types/query";
 import { SQLiteValthera } from "./index.js";
-export declare function update(slv: SQLiteValthera, collection: string, one: boolean, search: Search, updater: Updater, context?: VContext): Promise<any[]>;
+export declare function update(slv: SQLiteValthera, query: UpdateQuery, one: boolean): Promise<DataInternal[]>;

package/dist/update.js

@@ -1,5 +1,6 @@
 import { hasFieldsAdvanced } from "@wxn0brp/db-core/utils/hasFieldsAdvanced";
-export async function update(slv, collection, one, search, updater, context = {}) {
+export async function update(slv, query, one) {
+    const { collection, search, updater, context } = query;
     const stmt = await slv._prepare(`SELECT * FROM "${collection}"`);
     const allEntries = await Promise.resolve(stmt.all());
     const matched = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wxn0brp/db-storage-sqlite",
-  "version": "0.90.0",
+  "version": "0.100.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "description": "A pure SQLite storage adapter for the ValtheraDB database library",
@@ -22,14 +22,14 @@
     "@types/better-sqlite3": "^7.6.13",
     "@types/bun": "*",
     "@types/node": "*",
-    "@wxn0brp/db-core": "~0.9.0",
-    "better-sqlite3": "^12.6.2",
+    "@wxn0brp/db-core": "~0.10.0",
+    "better-sqlite3": "^12.8.0",
     "tsc-alias": "*",
     "typescript": "*"
   },
   "peerDependencies": {
-    "@wxn0brp/db-core": "~0.9.0",
-    "better-sqlite3": "^12.6.2"
+    "@wxn0brp/db-core": "~0.10.0",
+    "better-sqlite3": "^12.8.0"
   },
   "peerDependenciesMeta": {
     "@wxn0brp/db-core": {