@wxn0brp/db-core 0.7.0 → 0.8.1

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2025 wxn0brP
+Copyright (c) 2026 wxn0brP
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/dist/base/actions.d.ts

@@ -1,6 +1,6 @@
 import { ActionsBaseInterface } from "../types/action.js";
 import { DataInternal } from "../types/data.js";
-import { VQuery } from "../types/query.js";
+import { ToggleOneResult, UpdateOneOrAddResult, VQuery } from "../types/query.js";
 export declare abstract class ActionsBase implements ActionsBaseInterface {
     _inited: boolean;
     numberId: boolean;
@@ -16,6 +16,6 @@ export declare abstract class ActionsBase implements ActionsBaseInterface {
     abstract remove(config: VQuery): Promise<DataInternal[] | null>;
     abstract removeOne(config: VQuery): Promise<DataInternal | null>;
     abstract removeCollection(config: VQuery): Promise<boolean>;
-    updateOneOrAdd(config: VQuery): Promise<DataInternal>;
-    toggleOne(config: VQuery): Promise<boolean>;
+    updateOneOrAdd(config: VQuery): Promise<UpdateOneOrAddResult<DataInternal>>;
+    toggleOne(config: VQuery): Promise<ToggleOneResult<DataInternal>>;
 }

package/dist/base/actions.js

@@ -5,24 +5,28 @@ export class ActionsBase {
     async init(...args) { }
     async updateOneOrAdd(config) {
         const res = await this.updateOne(config);
-        const controlData = { updated: true };
-        config.control ||= {};
-        config.control.updateOneOrAdd = controlData;
         if (res)
-            return res;
+            return {
+                data: res,
+                type: "updated"
+            };
         setDataForUpdateOneOrAdd(config);
-        config.control.updateOneOrAdd.updated = false;
-        return await this.add(config);
+        return {
+            data: await this.add(config),
+            type: "added"
+        };
     }
     async toggleOne(config) {
         const res = await this.removeOne(config);
-        const controlData = { data: res };
-        config.control ||= {};
-        config.control.toggleOne = controlData;
         if (res)
-            return false;
+            return {
+                data: res,
+                type: "removed"
+            };
         setDataForToggleOne(config);
-        config.control.toggleOne.data = await this.add(config);
-        return true;
+        return {
+            data: await this.add(config),
+            type: "added"
+        };
     }
 }

package/dist/db/valthera.d.ts

@@ -4,8 +4,8 @@ import { Collection } from "../helpers/collection.js";
 import { Executor } from "../helpers/executor.js";
 import { Data } from "../types/data.js";
 import { DbOpts } from "../types/options.js";
-import { VQuery } from "../types/query.js";
-import { AddQuery, FindOneQuery, FindQuery, RemoveQuery, ToggleOneQuery, UpdateOneOrAddQuery, UpdateQuery, ValtheraCompatible } from "../types/valthera.js";
+import { AddQuery, FindOneQuery, FindQuery, RemoveQuery, ToggleOneQuery, UpdateOneOrAddQuery, UpdateQuery, VQuery } from "../types/query.js";
+import { ValtheraCompatible } from "../types/valthera.js";
 /**
  * Represents a database management class for performing CRUD operations.
  * @class

package/dist/db/valthera.js

@@ -63,6 +63,7 @@ export class ValtheraClass {
      */
     add(query) {
         query.control ||= {};
+        query.id_gen ??= true;
         return this.execute("add", query);
     }
     /**
@@ -124,7 +125,7 @@ export class ValtheraClass {
         query.context ||= {};
         query.add_arg ||= {};
         query.control ||= {};
-        query.id_gen ||= true;
+        query.id_gen ??= true;
         return this.execute("updateOneOrAdd", query);
     }
     /**

package/dist/helpers/collection.d.ts

@@ -1,8 +1,10 @@
 import { Arg, Search, Updater } from "../types/arg.js";
+import { UpdateOneOrAdd } from "../types/collection.js";
 import { Data } from "../types/data.js";
 import { DbFindOpts, FindOpts } from "../types/options.js";
+import { ToggleOneResult, UpdateOneOrAddResult } from "../types/query.js";
 import { VContext } from "../types/types.js";
-import { UpdateOneOrAdd, ValtheraCompatible } from "../types/valthera.js";
+import { ValtheraCompatible } from "../types/valthera.js";
 export declare class Collection<D = Data> {
     db: ValtheraCompatible;
     collection: string;
@@ -41,12 +43,12 @@ export declare class Collection<D = Data> {
     /**
      * Asynchronously updates one entry in a database or adds a new one if it doesn't exist.
      */
-    updateOneOrAdd(search: Search<D>, updater: Updater<D>, { add_arg, context, id_gen }?: UpdateOneOrAdd<D>): Promise<D>;
+    updateOneOrAdd(search: Search<D>, updater: Updater<D>, { add_arg, context, id_gen }?: UpdateOneOrAdd<D>): Promise<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<boolean>;
+    toggleOne(search: Search<D>, data?: Arg<D>, context?: VContext): Promise<ToggleOneResult<D>>;
 }

package/dist/types/action.d.ts

@@ -1,5 +1,5 @@
 import { DataInternal } from "./data.js";
-import { VQuery } from "./query.js";
+import { ToggleOneResult, UpdateOneOrAddResult, VQuery } from "./query.js";
 export interface ActionsBaseInterface {
     _inited: boolean;
     numberId: boolean;
@@ -15,6 +15,6 @@ export interface ActionsBaseInterface {
     remove(config: VQuery): Promise<DataInternal[] | null>;
     removeOne(config: VQuery): Promise<DataInternal | null>;
     removeCollection(config: VQuery): Promise<boolean>;
-    updateOneOrAdd(config: VQuery): Promise<DataInternal>;
-    toggleOne(config: VQuery): Promise<boolean>;
+    updateOneOrAdd(config: VQuery): Promise<UpdateOneOrAddResult<DataInternal>>;
+    toggleOne(config: VQuery): Promise<ToggleOneResult<DataInternal>>;
 }

package/dist/types/collection.d.ts

@@ -0,0 +1,7 @@
+import { Arg } from "./arg.js";
+import { VContext } from "./types.js";
+export interface UpdateOneOrAdd<T> {
+    add_arg?: Arg<T>;
+    id_gen?: boolean;
+    context?: VContext;
+}

package/dist/types/collection.js

@@ -0,0 +1 @@
+export {};

package/dist/types/query.d.ts

@@ -1,5 +1,4 @@
 import { Arg, Search, Updater } from "./arg.js";
-import { Data } from "./data.js";
 import { DbFindOpts, FindOpts } from "./options.js";
 import { VContext } from "./types.js";
 /**
@@ -12,12 +11,6 @@ import { VContext } from "./types.js";
  * }
  */
 export interface VQuery_Control {
-    updateOneOrAdd?: {
-        updated?: boolean;
-    };
-    toggleOne?: {
-        data?: Data;
-    };
 }
 export interface VQuery {
     collection?: string;
@@ -31,3 +24,19 @@ export interface VQuery {
     updater?: Updater;
     control?: VQuery_Control;
 }
+export type QueryBase = Required<Pick<VQuery, "collection" | "search">> & Pick<VQuery, "control">;
+export type AddQuery = Required<Pick<VQuery, "data" | "collection">> & Pick<VQuery, "id_gen" | "control">;
+export type FindQuery = Omit<QueryBase, "search"> & Pick<VQuery, "search"> & Pick<VQuery, "findOpts" | "dbFindOpts" | "context">;
+export type FindOneQuery = QueryBase & Pick<VQuery, "findOpts" | "context">;
+export type UpdateQuery = QueryBase & Required<Pick<VQuery, "updater">> & Pick<VQuery, "context">;
+export type RemoveQuery = QueryBase & Pick<VQuery, "context">;
+export type UpdateOneOrAddQuery = QueryBase & UpdateQuery & Pick<VQuery, "add_arg" | "id_gen">;
+export type ToggleOneQuery = QueryBase & Pick<VQuery, "data" | "context">;
+export interface UpdateOneOrAddResult<T> {
+    data: T;
+    type: "added" | "updated";
+}
+export interface ToggleOneResult<T> {
+    data: T;
+    type: "added" | "removed";
+}

package/dist/types/query.js

@@ -1 +1,3 @@
+;
+;
 export {};

package/dist/types/valthera.d.ts

@@ -1,16 +1,6 @@
 import { Collection } from "../helpers/collection.js";
-import { Arg } from "./arg.js";
 import { Data } from "./data.js";
-import { VQuery } from "./query.js";
-import { VContext } from "./types.js";
-export type QueryBase = Required<Pick<VQuery, "collection" | "search">> & Pick<VQuery, "control">;
-export type AddQuery = Required<Pick<VQuery, "data" | "collection">> & Pick<VQuery, "id_gen" | "control">;
-export type FindQuery = Omit<QueryBase, "search"> & Pick<VQuery, "search"> & Pick<VQuery, "findOpts" | "dbFindOpts" | "context">;
-export type FindOneQuery = QueryBase & Pick<VQuery, "findOpts" | "context">;
-export type UpdateQuery = QueryBase & Required<Pick<VQuery, "updater">> & Pick<VQuery, "context">;
-export type RemoveQuery = QueryBase & Pick<VQuery, "context">;
-export type UpdateOneOrAddQuery = QueryBase & UpdateQuery & Pick<VQuery, "add_arg" | "id_gen">;
-export type ToggleOneQuery = QueryBase & Pick<VQuery, "data" | "context">;
+import { AddQuery, FindOneQuery, FindQuery, RemoveQuery, ToggleOneQuery, ToggleOneResult, UpdateOneOrAddQuery, UpdateOneOrAddResult, UpdateQuery } from "./query.js";
 export interface ValtheraCompatible {
     c(collection: string): Collection;
     getCollections(): Promise<string[]>;
@@ -24,11 +14,6 @@ export interface ValtheraCompatible {
     remove<T = Data>(query: RemoveQuery): Promise<T[] | null>;
     removeOne<T = Data>(query: RemoveQuery): Promise<T | null>;
     removeCollection(collection: string): Promise<boolean>;
-    updateOneOrAdd<T = Data>(query: UpdateOneOrAddQuery): Promise<T>;
-    toggleOne(query: ToggleOneQuery): Promise<boolean>;
-}
-export interface UpdateOneOrAdd<T> {
-    add_arg?: Arg<T>;
-    id_gen?: boolean;
-    context?: VContext;
+    updateOneOrAdd<T = Data>(query: UpdateOneOrAddQuery): Promise<UpdateOneOrAddResult<T>>;
+    toggleOne<T = Data>(query: ToggleOneQuery): Promise<ToggleOneResult<T>>;
 }

package/dist/version.js

@@ -1 +1 @@
-export const version = "0.7.0";
+export const version = "0.8.1";

package/package.json

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