@wxn0brp/db-core 0.11.6 → 0.12.0-alpha.1

package/dist/db/memory.js

@@ -1,6 +1,6 @@
 import { CustomActionsBase } from "../base/custom.js";
 import { CustomFileCpu } from "../customFileCpu.js";
-import { forgeValthera } from "../helpers/forge.js";
+import { forgeTypedValthera } from "../helpers/forge.js";
 import { ValtheraClass } from "./valthera.js";
 export class MemoryAction extends CustomActionsBase {
     memory;
@@ -13,10 +13,10 @@ export class MemoryAction extends CustomActionsBase {
     _readMemory(key) {
         if (!this.memory.has(key))
             return [];
-        return this.memory.get(key);
+        return structuredClone(this.memory.get(key));
     }
     _writeMemory(key, data) {
-        this.memory.set(key, data);
+        this.memory.set(key, structuredClone(data));
     }
     async getCollections() {
         const collections = Array.from(this.memory.keys());
@@ -48,9 +48,9 @@ export class ValtheraMemory extends ValtheraClass {
 export function createMemoryValthera(data) {
     const db = new ValtheraMemory();
     if (!data)
-        return forgeValthera(db);
+        return forgeTypedValthera(db);
     for (const collection of Object.keys(data)) {
         db.adapter.memory.set(collection, data[collection]);
     }
-    return forgeValthera(db);
+    return forgeTypedValthera(db);
 }

package/dist/db/valthera.d.ts

@@ -20,32 +20,10 @@ export declare class ValtheraClass implements ValtheraCompatible {
     } & {
         "*": (name: keyof ValtheraCompatible, query: VQuery, result: any) => void;
     }>;
-    /** @deprecated typo */
-    emiter: VEE<{
-        c: (query: VQuery, result: Collection<unknown>) => void;
-        getCollections: (query: VQuery, result: string[]) => void;
-        ensureCollection: (query: VQuery, result: boolean) => void;
-        issetCollection: (query: VQuery, result: boolean) => void;
-        add: (query: VQuery, result: unknown) => void;
-        find: (query: VQuery, result: unknown[]) => void;
-        findOne: (query: VQuery, result: unknown) => void;
-        update: (query: VQuery, result: unknown[]) => void;
-        updateOne: (query: VQuery, result: unknown) => void;
-        remove: (query: VQuery, result: unknown[]) => void;
-        removeOne: (query: VQuery, result: unknown) => void;
-        removeCollection: (query: VQuery, result: boolean) => void;
-        updateOneOrAdd: (query: VQuery, result: VQueryT.UpdateOneOrAddResult<unknown>) => void;
-        toggleOne: (query: VQuery, result: VQueryT.ToggleOneResult<unknown>) => void;
-    } & {
-        "*": (name: keyof ValtheraCompatible, query: VQuery, result: any) => void;
-    }>;
     version: string;
     _plugins: ValtheraPlugin[];
+    _collections: Map<string, Collection<any>>;
     plugin(p: ValtheraPlugin): () => void;
-    /** @deprecated use `adapter` */
-    get dbAction(): ActionsBase;
-    /** @deprecated use `adapter` */
-    set dbAction(action: ActionsBase);
     constructor(options: DbOpts);
     init(...args: any[]): Promise<any>;
     close(...args: any[]): Promise<any>;
@@ -100,9 +78,6 @@ export declare class ValtheraClass implements ValtheraCompatible {
     updateOneOrAdd<T = Data>(query: VQueryT.UpdateOneOrAdd<T>): Promise<VQueryT.UpdateOneOrAddResult<T>>;
     /**
      * Asynchronously removes one entry in a database or adds a new one if it doesn't exist. Usage e.g. for toggling a flag.
-     * Returns a promise resolving to `false` if the entry was found and removed,
-     * or `true` if the entry was added. The returned value reflects the state of the database
-     * after the operation.
      */
     toggleOne<T = Data>(query: VQueryT.ToggleOne<T>): Promise<VQueryT.ToggleOneResult<T>>;
     /**

package/dist/db/valthera.js

@@ -11,10 +11,9 @@ export class ValtheraClass {
     adapter;
     executor;
     emitter = new VEE();
-    /** @deprecated typo */
-    emiter = this.emitter;
     version = version;
     _plugins = [];
+    _collections = new Map();
     plugin(p) {
         p.init?.(this);
         this._plugins.push(p);
@@ -24,25 +23,9 @@ export class ValtheraClass {
                 this._plugins.splice(i, 1);
         };
     }
-    /** @deprecated use `adapter` */
-    get dbAction() {
-        return this.adapter;
-    }
-    /** @deprecated use `adapter` */
-    set dbAction(action) {
-        this.adapter = action;
-    }
     constructor(options) {
         this.options = options;
         this.executor = options.executor || new SmartExecutor(undefined, false);
-        options.adapter ??= options.dbAction;
-        options.dbAction ??= options.adapter;
-        options.adapterOpts ??= {};
-        if (options.numberId !== undefined &&
-            options.adapterOpts.numberId === undefined)
-            options.adapterOpts.numberId = options.numberId;
-        if (options.idKey !== undefined && options.adapterOpts.idKey === undefined)
-            options.adapterOpts.idKey = options.idKey;
         if (typeof options.adapter === "function")
             return;
         else {
@@ -109,7 +92,11 @@ export class ValtheraClass {
      * Create a new instance of a Collection class.
      */
     c(collection) {
-        return new Collection(this, collection);
+        if (this._collections.has(collection))
+            return this._collections.get(collection);
+        const col = new Collection(this, collection);
+        this._collections.set(collection, col);
+        return col;
     }
     /**
      * Get the names of all available databases.
@@ -201,9 +188,6 @@ export class ValtheraClass {
     }
     /**
      * Asynchronously removes one entry in a database or adds a new one if it doesn't exist. Usage e.g. for toggling a flag.
-     * Returns a promise resolving to `false` if the entry was found and removed,
-     * or `true` if the entry was added. The returned value reflects the state of the database
-     * after the operation.
      */
     toggleOne(query) {
         query.data ||= {};

package/dist/helpers/collection.d.ts

@@ -46,9 +46,6 @@ export declare class Collection<D = Data> {
     updateOneOrAdd(search: Search<D>, updater: Updater<D>, { add_arg, context, id_gen }?: UpdateOneOrAdd<D>): Promise<VQueryT.UpdateOneOrAddResult<D>>;
     /**
      * Asynchronously removes one entry in a database or adds a new one if it doesn't exist. Usage e.g. for toggling a flag.
-     * Returns a promise resolving to `false` if the entry was found and removed,
-     * or `true` if the entry was added. The returned value reflects the state of the database
-     * after the operation.
      */
     toggleOne(search: Search<D>, data?: Arg<D>, context?: VContext): Promise<VQueryT.ToggleOneResult<D>>;
 }

package/dist/helpers/collection.js

@@ -92,9 +92,6 @@ export class Collection {
     }
     /**
      * Asynchronously removes one entry in a database or adds a new one if it doesn't exist. Usage e.g. for toggling a flag.
-     * Returns a promise resolving to `false` if the entry was found and removed,
-     * or `true` if the entry was added. The returned value reflects the state of the database
-     * after the operation.
      */
     toggleOne(search, data = {}, context = {}) {
         return this.db.toggleOne({

package/dist/helpers/forge.d.ts

@@ -2,12 +2,6 @@ import { Collection } from "./collection.js";
 import { Data } from "../types/data.js";
 import { ValtheraCompatible } from "../types/valthera.js";
 import { ValtheraClass } from "../db/valthera.js";
-export declare function forgeValthera<T extends string>(target: ValtheraClass): ValtheraClass & {
-    [K in T]: Collection;
-};
-export declare function forgeValthera<T extends string>(target: ValtheraCompatible): ValtheraCompatible & {
-    [K in T]: Collection;
-};
 export declare function forgeTypedValthera<T extends Record<string, Data>>(target: ValtheraClass): ValtheraClass & {
     [K in keyof T]: Collection<T[K]>;
 };

package/dist/helpers/forge.js

@@ -1,7 +1,4 @@
 import { Collection } from "./collection.js";
-export function forgeValthera(target) {
-    return forgeTypedValthera(target);
-}
 export function forgeTypedValthera(target) {
     return new Proxy(target, {
         get(target, prop, receiver) {

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 export { CustomFileCpu } from "./customFileCpu.js";
 export { createMemoryValthera, ValtheraMemory } from "./db/memory.js";
 export { ValtheraClass } from "./db/valthera.js";
-export { forgeTypedValthera, forgeValthera } from "./helpers/forge.js";
+export { forgeTypedValthera } from "./helpers/forge.js";
 export { genId } from "./helpers/gen.js";
 export { Relation } from "./helpers/relation.js";
 export { convertIdToUnix, sortByIds } from "./utils/id.js";

package/dist/index.js

@@ -1,7 +1,7 @@
 export { CustomFileCpu } from "./customFileCpu.js";
 export { createMemoryValthera, ValtheraMemory } from "./db/memory.js";
 export { ValtheraClass } from "./db/valthera.js";
-export { forgeTypedValthera, forgeValthera } from "./helpers/forge.js";
+export { forgeTypedValthera } from "./helpers/forge.js";
 export { genId } from "./helpers/gen.js";
 export { Relation } from "./helpers/relation.js";
 export { convertIdToUnix, sortByIds } from "./utils/id.js";

package/dist/types/action.d.ts

@@ -4,10 +4,6 @@ import { VQueryT } from "./query.js";
 export interface ActionsBaseInterface {
     _inited: boolean;
     adapterOpts: AdapterOpts;
-    /** @deprecated use `adapterOpts.numberId` */
-    numberId: boolean;
-    /** @deprecated use `adapterOpts.idKey` */
-    idKey: string;
     smartExecutor: boolean;
     init(...args: any[]): Promise<void>;
     close(...args: any[]): Promise<void>;

package/dist/types/options.d.ts

@@ -2,23 +2,11 @@ import { ActionsBase } from "../base/actions.js";
 import { Executor } from "../helpers/executor.js";
 import { KeysMatching } from "./utils.js";
 export type AdapterValue = ActionsBase | (() => Promise<ActionsBase>);
-type AdapterOption = {
+export interface DbOpts {
     adapter: AdapterValue;
-    /** @deprecated use `adapter` */
-    dbAction?: AdapterValue;
-} | {
-    adapter?: AdapterValue;
-    /** @deprecated use `adapter` */
-    dbAction: AdapterValue;
-};
-export type DbOpts = AdapterOption & {
     executor?: Executor;
     adapterOpts?: AdapterOpts;
-    /** @deprecated use `adapterOpts.numberId` */
-    numberId?: boolean;
-    /** @deprecated use `adapterOpts.idKey` */
-    idKey?: string;
-};
+}
 export interface AdapterOpts {
     numberId?: boolean;
     idKey?: string;
@@ -46,4 +34,3 @@ export interface FindOpts<T = any> {
     exclude?: FieldPath<T>[];
     transform?: Function;
 }
-export {};

package/dist/types/searchOpts.d.ts

@@ -65,22 +65,10 @@ export type ArrayOperators<T = any> = {
     $arrInc?: {
         [K in keyof T]?: T[K] extends any[] ? T[K][number][] : T[K][];
     };
-    /**
-     * @deprecated Use $arrInc instead.
-     */
-    $arrinc?: {
-        [K in keyof T]?: T[K] extends any[] ? T[K][number][] : T[K][];
-    };
     /** [1, 2, 3] array includes all elements e.g. [1, 2] */
     $arrIncAll?: {
         [K in keyof T]?: T[K] extends any[] ? T[K][number][] : T[K][];
     };
-    /**
-     * @deprecated Use $arrIncAll instead.
-     */
-    $arrincall?: {
-        [K in keyof T]?: T[K] extends any[] ? T[K][number][] : T[K][];
-    };
     /** [1, 2, 3] has size 3 */
     $size?: NestedValue<T, number>;
 };

package/dist/types/updater.d.ts

@@ -5,24 +5,12 @@ export type ArrayUpdater<T = any> = {
     $push?: NestedValue<T, any>;
     /** [1,2] -> $pushSet 2,3 -> [1,2,3] */
     $pushSet?: NestedValue<T, any>;
-    /**
-     * @deprecated Use $pushSet instead.
-     */
-    $pushset?: NestedValue<T, any>;
     /** [1,2,3] -> $pushAll [2,3] -> [1,2,3] */
     $pushAll?: NestedValue<T, any>;
-    /**
-     * @deprecated Use $pushAll instead.
-     */
-    $pushall?: NestedValue<T, any>;
     /** [1,2,3] -> $pull 2 -> [1,3] */
     $pull?: NestedValue<T, any>;
     /** [1,2,2,3] -> $pullAll [2] -> [1,3] */
     $pullAll?: NestedValue<T, any>;
-    /**
-     * @deprecated Use $pullAll instead.
-     */
-    $pullall?: NestedValue<T, any>;
 };
 /** Objects */
 export type ObjectUpdater<T = any> = {

package/dist/utils/action.js

@@ -1,7 +1,10 @@
 import { compareSafe } from "./compare.js";
 export async function findUtil(query, fileCpuOrData, files, fileCpuOpts) {
     const { dbFindOpts = {} } = query;
-    const { reverse = false, offset = 0, limit = -1, sortBy, sortAsc = true, min, max, avg, sum, distinct, groupBy, count, } = dbFindOpts;
+    const { reverse = false, offset = 0, sortBy, sortAsc = true, min, max, avg, sum, distinct, groupBy, count, } = dbFindOpts;
+    let limit = dbFindOpts.limit ?? -1;
+    if (limit === Infinity)
+        limit = -1;
     const needsAllData = min || max || avg || sum || distinct || groupBy || count || sortBy;
     let datas = [];
     let skippedEntries = 0;
@@ -54,6 +57,8 @@ export async function findUtil(query, fileCpuOrData, files, fileCpuOpts) {
     }
     if (!needsAllData)
         return datas;
+    if (datas.length === 0)
+        return [];
     const hasAggregations = min || max || avg || sum || groupBy || count;
     if (hasAggregations) {
         const groups = new Map();
@@ -94,28 +99,28 @@ export async function findUtil(query, fileCpuOrData, files, fileCpuOpts) {
             }
             for (const [outKey, srcField] of Object.entries(min ?? {})) {
                 const nums = groupItems
-                    .map(d => Number(d[srcField]))
-                    .filter(n => !Number.isNaN(n));
+                    .map(d => d[srcField])
+                    .filter((v) => typeof v === "number");
                 result[outKey] = nums.length ? Math.min(...nums) : null;
             }
             for (const [outKey, srcField] of Object.entries(max ?? {})) {
                 const nums = groupItems
-                    .map(d => Number(d[srcField]))
-                    .filter(n => !Number.isNaN(n));
+                    .map(d => d[srcField])
+                    .filter((v) => typeof v === "number");
                 result[outKey] = nums.length ? Math.max(...nums) : null;
             }
             for (const [outKey, srcField] of Object.entries(avg ?? {})) {
                 const nums = groupItems
-                    .map(d => Number(d[srcField]))
-                    .filter(n => !Number.isNaN(n));
+                    .map(d => d[srcField])
+                    .filter((v) => typeof v === "number");
                 result[outKey] = nums.length
                     ? nums.reduce((a, b) => a + b, 0) / nums.length
                     : null;
             }
             for (const [outKey, srcField] of Object.entries(sum ?? {})) {
                 const nums = groupItems
-                    .map(d => Number(d[srcField]))
-                    .filter(n => !Number.isNaN(n));
+                    .map(d => d[srcField])
+                    .filter((v) => typeof v === "number");
                 result[outKey] = nums.length ? nums.reduce((a, b) => a + b, 0) : null;
             }
             aggregated.push(result);

package/dist/utils/hasFieldsAdvanced.js

@@ -42,10 +42,10 @@ export function hasFieldsAdvanced(obj, fields) {
 function mainCheck(obj, fields) {
     return _for(fields, obj, {
         ne: (data, value) => data !== value,
-        gt: (data, value) => data > value,
-        lt: (data, value) => data < value,
-        gte: (data, value) => data >= value,
-        lte: (data, value) => data <= value,
+        gt: (data, value) => typeof data === typeof value && data > value,
+        lt: (data, value) => typeof data === typeof value && data < value,
+        gte: (data, value) => typeof data === typeof value && data >= value,
+        lte: (data, value) => typeof data === typeof value && data <= value,
         in: (data, value) => value.includes(data),
         nin: (data, value) => !value.includes(data),
         type: (data, value) => typeof data === value,

package/dist/utils/process.d.ts

@@ -2,4 +2,7 @@ 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;
+/**
+ * @returns reference to object or new object
+ */
 export declare function updateObj(config: VQueryT.Update, obj: Data): DataInternal;

package/dist/utils/process.js

@@ -18,10 +18,15 @@ export function matchObj(config, obj) {
         return true;
     return false;
 }
+/**
+ * @returns reference to object or new object
+ */
 export function updateObj(config, obj) {
     const { updater, context } = config;
-    if (typeof updater === "object" && !Array.isArray(updater))
-        return updateObjectAdvanced(obj, updater);
+    if (typeof updater === "object" && !Array.isArray(updater)) {
+        updateObjectAdvanced(obj, updater);
+        return obj;
+    }
     if (typeof updater === "function") {
         const updateObjValue = updater(obj, context);
         if (updateObjValue)

package/dist/utils/updateObject.d.ts

@@ -4,4 +4,4 @@ import { UpdaterArg } from "../types/updater.js";
  * @param obj - The object to update.
  * @param field - An object containing new values to update in the target object.
  */
-export declare function updateObjectAdvanced(obj: Record<string, any>, field: UpdaterArg): Record<string, any>;
+export declare function updateObjectAdvanced(obj: Record<string, any>, field: UpdaterArg): void;

package/dist/utils/updateObject.js

@@ -8,8 +8,7 @@ export function updateObjectAdvanced(obj, field) {
     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);
+        return;
     const $fields = {};
     const subsetFields = {};
     Object.keys(field).forEach(key => {
@@ -18,10 +17,9 @@ export function updateObjectAdvanced(obj, field) {
         else
             subsetFields[key] = field[key];
     });
-    mainUpdate(newObj, $fields);
-    const mergedObj = deepMerge(newObj, $fields);
+    mainUpdate(obj, $fields);
+    const mergedObj = deepMerge(obj, $fields);
     updateObject(mergedObj, subsetFields);
-    return mergedObj;
 }
 function deepMerge(obj, fields) {
     if (!("$deepmerge" in fields))

package/dist/version.js

@@ -1 +1 @@
-export const version = "0.11.6";
+export const version = "0.12.0-alpha.1";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wxn0brp/db-core",
-  "version": "0.11.6",
+  "version": "0.12.0-alpha.1",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "author": "wxn0brP",
@@ -13,7 +13,7 @@
   },
   "homepage": "https://github.com/wxn0brP/ValtheraDB",
   "dependencies": {
-    "@wxn0brp/event-emitter": "0.0.5"
+    "@wxn0brp/event-emitter": "0.0.6"
   },
   "devDependencies": {
     "@types/bun": "*",