@wxn0brp/vql-client 0.2.11 → 0.2.13

package/dist/vql.d.ts

@@ -84,13 +84,25 @@ 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 interface UpdateOneOrAdd<T> {
-    add_arg?: Arg<T>;
-    id_gen?: boolean;
-    context?: VContext;
+export type Updater<T = any> = UpdaterArg<T> | UpdaterFunc<T>;
+export interface DbFindOpts<T = any> {
+    reverse?: boolean;
+    limit?: number;
+    offset?: number;
+    sortBy?: KeysMatching<T, any>;
+    sortAsc?: boolean;
+    min?: Record<string, KeysMatching<T, number>>;
+    max?: Record<string, KeysMatching<T, number>>;
+    avg?: Record<string, KeysMatching<T, number>>;
+    groupBy?: KeysMatching<T, any> | KeysMatching<T, any>[];
+    count?: Record<string, string>;
+}
+export interface FindOpts<T = any> {
+    select?: KeysMatching<T, any>[];
+    exclude?: KeysMatching<T, any>[];
+    transform?: Function;
 }
 export interface VQuery_Control {
 }
@@ -124,27 +136,26 @@ export declare namespace VQueryT {
         type: "added" | "removed";
     }
 }
-export type QueryBase<T = Data> = VQueryT.QueryBase<T>;
-export type AddQuery<T = Data> = VQueryT.Add<T>;
-export type FindQuery<T = Data> = VQueryT.Find<T>;
-export type FindOneQuery<T = Data> = VQueryT.FindOne<T>;
-export type UpdateQuery<T = Data> = VQueryT.Update<T>;
-export type RemoveQuery<T = Data> = VQueryT.Remove<T>;
-export type UpdateOneOrAddQuery<T = Data> = VQueryT.UpdateOneOrAdd<T>;
-export type ToggleOneQuery<T = Data> = VQueryT.ToggleOne<T>;
-export type UpdateOneOrAddResult<T> = VQueryT.UpdateOneOrAddResult<T>;
-export type ToggleOneResult<T> = VQueryT.ToggleOneResult<T>;
-export interface DbFindOpts<T = any> {
-    reverse?: boolean;
-    limit?: number;
-    offset?: number;
-    sortBy?: KeysMatching<T, any>;
-    sortAsc?: boolean;
+export interface UpdateOneOrAdd<T> {
+    add_arg?: Arg<T>;
+    id_gen?: boolean;
+    context?: VContext;
 }
-export interface FindOpts<T = any> {
-    select?: KeysMatching<T, any>[];
-    exclude?: KeysMatching<T, any>[];
-    transform?: Function;
+export interface ValtheraCompatible {
+    c<T = Data>(collection: string): Collection<T>;
+    getCollections(): Promise<string[]>;
+    ensureCollection(collection: string): Promise<boolean>;
+    issetCollection(collection: string): Promise<boolean>;
+    add<T = Data>(query: VQueryT.Add<T>): Promise<T>;
+    find<T = Data>(query: VQueryT.Find<T>): Promise<T[]>;
+    findOne<T = Data>(query: VQueryT.FindOne<T>): Promise<T | null>;
+    update<T = Data>(query: VQueryT.Update<T>): Promise<T[]>;
+    updateOne<T = Data>(query: VQueryT.Update<T>): Promise<T | null>;
+    remove<T = Data>(query: VQueryT.Remove<T>): Promise<T[]>;
+    removeOne<T = Data>(query: VQueryT.Remove<T>): Promise<T | null>;
+    removeCollection(collection: string): Promise<boolean>;
+    updateOneOrAdd<T = Data>(query: VQueryT.UpdateOneOrAdd<T>): Promise<VQueryT.UpdateOneOrAddResult<T>>;
+    toggleOne<T = Data>(query: VQueryT.ToggleOne<T>): Promise<VQueryT.ToggleOneResult<T>>;
 }
 declare class Collection<D = Data> {
     db: ValtheraCompatible;
@@ -163,28 +174,6 @@ declare class Collection<D = Data> {
     updateOneOrAdd(search: Search<D>, updater: Updater<D>, { add_arg, context, id_gen }?: UpdateOneOrAdd<D>): Promise<VQueryT.UpdateOneOrAddResult<D>>;
     toggleOne(search: Search<D>, data?: Arg<D>, context?: VContext): Promise<VQueryT.ToggleOneResult<D>>;
 }
-export interface ValtheraCompatible {
-    c<T = Data>(collection: string): Collection<T>;
-    getCollections(): Promise<string[]>;
-    ensureCollection(collection: string): Promise<boolean>;
-    issetCollection(collection: string): Promise<boolean>;
-    add<T = Data>(query: VQueryT.Add<T>): Promise<T>;
-    find<T = Data>(query: VQueryT.Find<T>): Promise<T[]>;
-    findOne<T = Data>(query: VQueryT.FindOne<T>): Promise<T | null>;
-    update<T = Data>(query: VQueryT.Update<T>): Promise<T[]>;
-    updateOne<T = Data>(query: VQueryT.Update<T>): Promise<T | null>;
-    remove<T = Data>(query: VQueryT.Remove<T>): Promise<T[]>;
-    removeOne<T = Data>(query: VQueryT.Remove<T>): Promise<T | null>;
-    removeCollection(collection: string): Promise<boolean>;
-    updateOneOrAdd<T = Data>(query: VQueryT.UpdateOneOrAdd<T>): Promise<VQueryT.UpdateOneOrAddResult<T>>;
-    toggleOne<T = Data>(query: VQueryT.ToggleOne<T>): Promise<VQueryT.ToggleOneResult<T>>;
-}
-export interface VQuery_Control {
-    dir?: {
-        lastFileNum?: number;
-        sortedFiles?: string[];
-    };
-}
 declare namespace RelationTypes {
     type Path = [
         string,
@@ -218,7 +207,6 @@ export interface VQL_OP_Find<T = any> {
     collection: string;
     search?: Search<T>;
     limit?: number;
-    fields?: VQL_Fields;
     select?: VQL_Fields;
     options?: DbFindOpts<T>;
     searchOpts?: FindOpts<T>;
@@ -226,7 +214,6 @@ export interface VQL_OP_Find<T = any> {
 export interface VQL_OP_FindOne<T = any> {
     collection: string;
     search: Search<T>;
-    fields?: VQL_Fields;
     select?: VQL_Fields;
     searchOpts?: FindOpts<T>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wxn0brp/vql-client",
-  "version": "0.2.11",
+  "version": "0.2.13",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "description": "VQL Client",