@wxn0brp/vql-client 0.2.13 → 0.2.15

package/dist/index.d.ts

@@ -6,9 +6,10 @@ export interface VQLHooks {
     onEnd?: (query: VQLUQ, durationMs: number, result: any, hookContext: any) => void;
     onError?: (query: VQLUQ, error: unknown, result?: any, hookContext?: any) => void;
 }
+export type FetchImplementation = (input: RequestInfo | URL, init?: RequestInit) => Promise<Response>;
 export interface Config {
     transport?: VQLTransport;
-    fetchImplementation: typeof fetch;
+    fetchImplementation: FetchImplementation;
     hooks?: VQLHooks;
     url?: string;
     body?: Record<string, any>;

package/dist/index.js

@@ -1,9 +1,8 @@
-;
 export const VConfig = {
     transport: defTransport,
     fetchImplementation: (input, init) => fetch(input, init),
     hooks: {},
-    url: "/VQL"
+    url: "/VQL",
 };
 export async function fetchVQL(query, vars = {}, hookContext = {}, fetchOptions = {}) {
     const { transport, hooks } = VConfig;
@@ -14,7 +13,7 @@ export async function fetchVQL(query, vars = {}, hookContext = {}, fetchOptions
         if (typeof query === "string" && Object.keys(vars).length) {
             query = {
                 query: query,
-                var: vars
+                var: vars,
             };
         }
         const res = await transport(query, fetchOptions);
@@ -36,15 +35,15 @@ export async function fetchVQL(query, vars = {}, hookContext = {}, fetchOptions
 }
 export async function defTransport(query, fetchOptions) {
     const headers = Object.assign({
-        "Content-Type": "application/json"
+        "Content-Type": "application/json",
     }, VConfig.headers, fetchOptions.headers);
     const body = Object.assign({}, VConfig.body, fetchOptions.body, {
-        query
+        query,
     });
     const queryConfig = {
         method: "POST",
         headers,
-        body: JSON.stringify(body)
+        body: JSON.stringify(body),
     };
     if (fetchOptions.signal)
         queryConfig.signal = fetchOptions.signal;
@@ -64,6 +63,6 @@ if (typeof window !== "undefined") {
         fetchVQL,
         defTransport,
         VQL: V,
-        cfg: VConfig
+        cfg: VConfig,
     };
 }

package/dist/min.js

@@ -1 +1 @@
-var VQLClient=(()=>{var c=Object.defineProperty;var m=Object.getOwnPropertyDescriptor;var w=Object.getOwnPropertyNames;var h=Object.prototype.hasOwnProperty;var T=(t,n)=>{for(var e in n)c(t,e,{get:n[e],enumerable:!0})},b=(t,n,e,i)=>{if(n&&typeof n=="object"||typeof n=="function")for(let o of w(n))!h.call(t,o)&&o!==e&&c(t,o,{get:()=>n[o],enumerable:!(i=m(n,o))||i.enumerable});return t};var x=t=>b(c({},"__esModule",{value:!0}),t);var O={};T(O,{V:()=>g,VConfig:()=>s,defTransport:()=>d,fetchVQL:()=>y});var s={transport:d,fetchImplementation:(t,n)=>fetch(t,n),hooks:{},url:"/VQL"};async function y(t,n={},e={},i={}){var p,f,u,Q;let{transport:o,hooks:r}=s,V=Date.now();try{e=Object.assign({},s.hookContext,n,e),(p=r.onStart)==null||p.call(r,t,e),typeof t=="string"&&Object.keys(n).length&&(t={query:t,var:n});let a=await o(t,i),L=Date.now()-V;if((f=r.onEnd)==null||f.call(r,t,L,a,e),a!=null&&a.err){let l=new Error(a.err);throw(u=r.onError)==null||u.call(r,t,l,a,e),l}return a.result!==void 0?a.result:a}catch(a){throw(Q=r.onError)==null||Q.call(r,t,a,null,e),a}}async function d(t,n){let e=Object.assign({"Content-Type":"application/json"},s.headers,n.headers),i=Object.assign({},s.body,n.body,{query:t}),o={method:"POST",headers:e,body:JSON.stringify(i)};n.signal&&(o.signal=n.signal);let r=await s.fetchImplementation(s.url,o);if(!r.ok)throw new Error(`VQL request failed: ${r.status}`);return await r.json()}var g=async(t,...n)=>{let e=t.map((i,o)=>i.trim()+(n[o]!==void 0?n[o]:"")).join(" ");return y(e)};typeof window!="undefined"&&(window.VQLClient={fetchVQL:y,defTransport:d,VQL:g,cfg:s});return x(O);})();
+var VQLClient=(()=>{var c=Object.defineProperty;var L=Object.getOwnPropertyDescriptor;var h=Object.getOwnPropertyNames;var w=Object.prototype.hasOwnProperty;var T=(t,n)=>{for(var r in n)c(t,r,{get:n[r],enumerable:!0})},b=(t,n,r,i)=>{if(n&&typeof n=="object"||typeof n=="function")for(let o of h(n))!w.call(t,o)&&o!==r&&c(t,o,{get:()=>n[o],enumerable:!(i=L(n,o))||i.enumerable});return t};var R=t=>b(c({},"__esModule",{value:!0}),t);var x={};T(x,{V:()=>g,VConfig:()=>s,defTransport:()=>p,fetchVQL:()=>y});var s={transport:p,fetchImplementation:(t,n)=>fetch(t,n),hooks:{},url:"/VQL"};async function y(t,n={},r={},i={}){var d,f,u,l;let{transport:o,hooks:e}=s,m=Date.now();try{r=Object.assign({},s.hookContext,n,r),(d=e.onStart)==null||d.call(e,t,r),typeof t=="string"&&Object.keys(n).length&&(t={query:t,var:n});let a=await o(t,i),V=Date.now()-m;if((f=e.onEnd)==null||f.call(e,t,V,a,r),a!=null&&a.err){let Q=new Error(a.err);throw(u=e.onError)==null||u.call(e,t,Q,a,r),Q}return a.result!==void 0?a.result:a}catch(a){throw(l=e.onError)==null||l.call(e,t,a,null,r),a}}async function p(t,n){let r=Object.assign({"Content-Type":"application/json"},s.headers,n.headers),i=Object.assign({},s.body,n.body,{query:t}),o={method:"POST",headers:r,body:JSON.stringify(i)};n.signal&&(o.signal=n.signal);let e=await s.fetchImplementation(s.url,o);if(!e.ok)throw new Error(`VQL request failed: ${e.status}`);return await e.json()}var g=async(t,...n)=>{let r=t.map((i,o)=>i.trim()+(n[o]!==void 0?n[o]:"")).join(" ");return y(r)};typeof window!="undefined"&&(window.VQLClient={fetchVQL:y,defTransport:p,VQL:g,cfg:s});return R(x);})();

package/dist/vql.d.ts

@@ -1,22 +1,48 @@
-export interface Data {
-    [key: string]: any;
-}
-export type KeysMatching<T, V, C = V> = {
-    [K in keyof T]-?: T[K] extends C ? K : never;
-}[keyof T];
-export type NestedValue<T, V, C = V> = {
-    [K in keyof T as T[K] extends C ? K : T[K] extends object ? K : never]?: T[K] extends C ? V : T[K] extends object ? NestedValue<T[K], V, C> : never;
-};
-export type DeepPartial<T> = {
-    [K in keyof T]?: T[K] extends object ? DeepPartial<T[K]> : T[K];
+export declare type Arg<T = any> = {
+    [K in keyof T]?: any;
+} & Record<string, any>;
+export declare type ArrayOperators<T = any> = {
+    $arrInc?: {
+        [K in keyof T]?: T[K] extends any[] ? T[K][number][] : T[K][];
+    };
+    $arrIncAll?: {
+        [K in keyof T]?: T[K] extends any[] ? T[K][number][] : T[K][];
+    };
+    $size?: NestedValue<T, number>;
 };
-export type JSPrimitiveType = "string" | "number" | "boolean" | "bigint" | "symbol" | "undefined" | "function" | "object";
-export type LogicalOperators<T = any> = {
-    $and?: Array<SearchOptions<T>>;
-    $or?: Array<SearchOptions<T>>;
-    $not?: SearchOptions<T>;
+export declare type ArrayUpdater<T = any> = {
+    $push?: NestedValue<T, any>;
+    $pushSet?: NestedValue<T, any>;
+    $pushAll?: NestedValue<T, any>;
+    $pull?: NestedValue<T, any>;
+    $pullAll?: NestedValue<T, any>;
 };
-export type ComparisonOperators<T = any> = {
+export declare class Collection<D = Data> {
+    db: ValtheraCompatible;
+    collection: string;
+    constructor(db: ValtheraCompatible, collection: string);
+    add(data: Arg<D>, id_gen: false): Promise<D>;
+    add(data: Arg<D>, id_gen?: true): Promise<D & {
+        _id: string;
+    }>;
+    bulkAdd(data: Arg<D>[], id_gen: false): Promise<D[]>;
+    bulkAdd(data: Arg<D>[], id_gen?: true): Promise<(D & {
+        _id: string;
+    })[]>;
+    find(search?: Search<D>, options?: DbFindOpts<D>, findOpts?: FindOpts<D>, context?: VContext): Promise<D[]>;
+    findOne(search?: Search<D>, findOpts?: FindOpts<D>, context?: VContext): Promise<D | null>;
+    count(search?: Search<D, false>): Promise<number>;
+    update(search: Search<D>, updater: Updater<D>, context?: VContext): Promise<D[]>;
+    updateOne(search: Search<D>, updater: Updater<D>, context?: VContext): Promise<D | null>;
+    remove(search: Search<D>, context?: VContext): Promise<D[]>;
+    removeOne(search: Search<D>, context?: VContext): Promise<D | null>;
+    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>>;
+    createIndex(fields: string[], opts?: IndexOpts): Promise<void>;
+    removeIndex(fields: string[]): Promise<void>;
+}
+export declare type ComparisonOperators<T = any> = {
+    $ne?: NestedValue<T, any>;
     $gt?: NestedValue<T, number, number>;
     $lt?: NestedValue<T, number, number>;
     $gte?: NestedValue<T, number, number>;
@@ -36,145 +62,65 @@ export type ComparisonOperators<T = any> = {
     $idGte?: NestedValue<T, string | number, string | number>;
     $idLte?: NestedValue<T, string | number, string | number>;
 };
-export type TypeAndExistenceOperators<T = any> = {
-    $exists?: NestedValue<T, boolean, any>;
-    $type?: NestedValue<T, JSPrimitiveType, any>;
-};
-export type ArrayOperators<T = any> = {
-    $arrinc?: {
-        [K in keyof T]?: T[K] extends any[] ? T[K][number][] : T[K][];
-    };
-    $arrincall?: {
-        [K in keyof T]?: T[K] extends any[] ? T[K][number][] : T[K][];
-    };
-    $size?: NestedValue<T, number>;
-};
-export type StringOperators<T = any> = {
-    $regex?: NestedValue<T, RegExp | string, string>;
-    $startsWith?: NestedValue<T, string, string>;
-    $endsWith?: NestedValue<T, string, string>;
-};
-export type OtherOperators<T = any> = {
-    $subset?: DeepPartial<T>;
-};
-export type PredefinedSearchOperators<T = any> = LogicalOperators<T> & ComparisonOperators<T> & TypeAndExistenceOperators<T> & ArrayOperators<T> & StringOperators<T> & OtherOperators<T>;
-export type SearchOptions<T = any> = PredefinedSearchOperators<T> & DeepPartial<T> & Record<string, any>;
-export interface VContext {
+export declare interface Data {
     [key: string]: any;
 }
-export type ArrayUpdater<T = any> = {
-    $push?: NestedValue<T, any>;
-    $pushset?: NestedValue<T, any>;
-    $pull?: NestedValue<T, any>;
-    $pullall?: NestedValue<T, any>;
-};
-export type ObjectUpdater<T = any> = {
-    $merge?: NestedValue<T, any>;
-    $deepMerge?: NestedValue<T, any>;
-};
-export type ValueUpdater<T = any> = {
-    $inc?: NestedValue<T, number>;
-    $dec?: NestedValue<T, number>;
-    $unset?: NestedValue<T, any>;
-    $rename?: NestedValue<T, any>;
-    $set?: NestedValue<T, any>;
-};
-export type UpdaterArg<T = any> = ArrayUpdater<T> & ObjectUpdater<T> & ValueUpdater<T> & DeepPartial<T> & Record<string, any>;
-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) => Data | void;
-export type Search<T = any> = SearchOptions<T> | SearchFunc<T>;
-export type Updater<T = any> = UpdaterArg<T> | UpdaterFunc<T>;
-export interface DbFindOpts<T = any> {
+export declare interface DbFindOpts<T = any> {
     reverse?: boolean;
     limit?: number;
     offset?: number;
-    sortBy?: KeysMatching<T, any>;
+    sortBy?: KeysMatching<T, any> | {
+        field: KeysMatching<T, any>;
+        asc?: boolean;
+    }[];
     sortAsc?: boolean;
     min?: Record<string, KeysMatching<T, number>>;
     max?: Record<string, KeysMatching<T, number>>;
     avg?: Record<string, KeysMatching<T, number>>;
+    sum?: Record<string, KeysMatching<T, number>>;
+    distinct?: KeysMatching<T, any>;
     groupBy?: KeysMatching<T, any> | KeysMatching<T, any>[];
     count?: Record<string, string>;
 }
-export interface FindOpts<T = any> {
-    select?: KeysMatching<T, any>[];
-    exclude?: KeysMatching<T, any>[];
+export declare type DeepPartial<T> = {
+    [K in keyof T]?: T[K] extends object ? DeepPartial<T[K]> : T[K];
+};
+export declare type FieldPath<T = any> = KeysMatching<T, any> | (string & {}) | string[];
+export declare interface FindOpts<T = any> {
+    select?: FieldPath<T>[];
+    exclude?: FieldPath<T>[];
     transform?: Function;
 }
-export interface VQuery_Control {
-}
-export interface VQuery<T = Data> {
-    collection?: string;
-    search?: Search<T>;
-    context?: VContext;
-    dbFindOpts?: DbFindOpts<T>;
-    findOpts?: FindOpts<T>;
-    data?: Arg<T>;
-    id_gen?: boolean;
-    add_arg?: Arg<T>;
-    updater?: Updater<T>;
-    control?: VQuery_Control;
-}
-export declare namespace VQueryT {
-    type QueryBase<T = Data> = Required<Pick<VQuery<T>, "collection" | "search">> & Pick<VQuery<T>, "control">;
-    type Add<T = Data> = Required<Pick<VQuery<T>, "data" | "collection">> & Pick<VQuery<T>, "id_gen" | "control">;
-    type Find<T = Data> = Omit<QueryBase, "search"> & Pick<VQuery<T>, "search"> & Pick<VQuery<T>, "findOpts" | "dbFindOpts" | "context">;
-    type FindOne<T = Data> = QueryBase & Pick<VQuery<T>, "findOpts" | "context">;
-    type Update<T = Data> = QueryBase & Required<Pick<VQuery<T>, "updater">> & Pick<VQuery<T>, "context">;
-    type Remove<T = Data> = QueryBase & Pick<VQuery<T>, "context">;
-    type UpdateOneOrAdd<T = Data> = QueryBase & Update & Pick<VQuery<T>, "add_arg" | "id_gen">;
-    type ToggleOne<T = Data> = QueryBase & Pick<VQuery<T>, "data" | "context">;
-    interface UpdateOneOrAddResult<T> {
-        data: T;
-        type: "added" | "updated";
-    }
-    interface ToggleOneResult<T> {
-        data: T;
-        type: "added" | "removed";
-    }
-}
-export interface UpdateOneOrAdd<T> {
-    add_arg?: Arg<T>;
-    id_gen?: boolean;
-    context?: VContext;
-}
-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;
+export declare interface IndexDefinition {
     collection: string;
-    constructor(db: ValtheraCompatible, collection: string);
-    add(data: Arg<D>, id_gen: false): Promise<D>;
-    add(data: Arg<D>, id_gen?: true): Promise<D & {
-        _id: string;
-    }>;
-    find(search?: Search<D>, options?: DbFindOpts<D>, findOpts?: FindOpts<D>, context?: VContext): Promise<D[]>;
-    findOne(search?: Search<D>, findOpts?: FindOpts<D>, context?: VContext): Promise<D>;
-    update(search: Search<D>, updater: Updater<D>, context?: VContext): Promise<D[]>;
-    updateOne(search: Search<D>, updater: Updater<D>, context?: VContext): Promise<D | null>;
-    remove(search: Search<D>, context?: VContext): Promise<D[]>;
-    removeOne(search: Search<D>, context?: VContext): Promise<D | null>;
-    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>>;
+    fields: string[];
+    opts?: IndexOpts;
+}
+export declare interface IndexOpts {
+    unique?: boolean;
+    name?: string;
 }
-declare namespace RelationTypes {
+export declare type JSPrimitiveType = "string" | "number" | "boolean" | "bigint" | "symbol" | "undefined" | "function" | "object";
+export declare type KeysMatching<T, V, C = V> = {
+    [K in keyof T]-?: T[K] extends C ? K : never;
+}[keyof T];
+export declare type LogicalOperators<T = any> = {
+    $and?: Array<SearchOptions<T>>;
+    $or?: Array<SearchOptions<T>>;
+    $not?: SearchOptions<T>;
+};
+export declare type NestedValue<T, V, C = V> = {
+    [K in keyof T as T[K] extends C ? K : T[K] extends object ? K : never]?: T[K] extends C ? V : T[K] extends object ? NestedValue<T[K], V, C> : never;
+};
+export declare type ObjectUpdater<T = any> = {
+    $merge?: NestedValue<T, any>;
+    $deepMerge?: NestedValue<T, any>;
+};
+export declare type OtherOperators<T = any> = {
+    $subset?: DeepPartial<T>;
+};
+export declare type PredefinedSearchOperators<T = any> = LogicalOperators<T> & ComparisonOperators<T> & TypeAndExistenceOperators<T> & ArrayOperators<T> & StringOperators<T> & OtherOperators<T>;
+export declare namespace RelationTypes {
     type Path = [
         string,
         string
@@ -193,7 +139,7 @@ declare namespace RelationTypes {
         as?: string;
         select?: string[];
         dbFindOpts?: DbFindOpts;
-        type?: "1" | "11" | "1n" | "nm";
+        type?: "1" | "11" | "1n" | "nm" | "n1";
         relations?: Relation;
         through?: {
             table: string;
@@ -203,7 +149,72 @@ declare namespace RelationTypes {
         };
     }
 }
-export interface VQL_OP_Find<T = any> {
+export declare type Search<T = any, AllowFn extends boolean = true> = AllowFn extends true ? SearchOptions<T> | SearchFunc<T> : SearchOptions<T>;
+export declare type SearchFunc<T = any> = (data: T, context: VContext) => boolean;
+export declare type SearchOptions<T = any> = PredefinedSearchOperators<T> & DeepPartial<T> & Record<string, any>;
+export declare type StringOperators<T = any> = {
+    $regex?: NestedValue<T, RegExp | string, string>;
+    $startsWith?: NestedValue<T, string, string>;
+    $endsWith?: NestedValue<T, string, string>;
+    $iStartsWith?: NestedValue<T, string, string>;
+    $iEndsWith?: NestedValue<T, string, string>;
+};
+export declare interface TransactionHandle {
+    id: string;
+    _adapterData?: unknown;
+}
+export declare type TypeAndExistenceOperators<T = any> = {
+    $exists?: NestedValue<T, boolean, any>;
+    $type?: NestedValue<T, JSPrimitiveType, any>;
+};
+export declare interface UpdateOneOrAdd<T> {
+    add_arg?: Arg<T>;
+    id_gen?: boolean;
+    context?: VContext;
+}
+export declare type Updater<T = any, AllowFn extends boolean = true> = AllowFn extends true ? UpdaterArg<T> | UpdaterFunc<T> : UpdaterArg<T>;
+export declare type UpdaterArg<T = any> = ArrayUpdater<T> & ObjectUpdater<T> & ValueUpdater<T> & DeepPartial<T> & Record<string, any>;
+export declare type UpdaterFunc<T = any> = (data: T, context: VContext) => Data | void;
+export declare 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>>;
+    createIndex(collection: string, fields: string[], opts?: IndexOpts): Promise<void>;
+    removeIndex(collection: string, fields: string[]): Promise<void>;
+    count(query: VQueryT.Count): Promise<number>;
+    bulkAdd<T = Data>(query: VQueryT.BulkAdd<T>): Promise<T[]>;
+}
+export declare type ValueUpdater<T = any> = {
+    $inc?: NestedValue<T, number>;
+    $dec?: NestedValue<T, number>;
+    $unset?: NestedValue<T, any>;
+    $rename?: NestedValue<T, any>;
+    $set?: NestedValue<T, any>;
+};
+export declare interface VContext {
+    [key: string]: any;
+}
+export declare type VQL_Fields = Record<string, boolean | number> | string[];
+export declare interface VQL_OP_Add<T = any> {
+    collection: string;
+    data?: Arg<T>;
+    id_gen?: boolean;
+}
+export declare interface VQL_OP_CollectionOperation {
+    collection: string;
+}
+export declare interface VQL_OP_Find<T = any> {
     collection: string;
     search?: Search<T>;
     limit?: number;
@@ -211,43 +222,43 @@ export interface VQL_OP_Find<T = any> {
     options?: DbFindOpts<T>;
     searchOpts?: FindOpts<T>;
 }
-export interface VQL_OP_FindOne<T = any> {
+export declare interface VQL_OP_FindOne<T = any> {
     collection: string;
     search: Search<T>;
     select?: VQL_Fields;
     searchOpts?: FindOpts<T>;
 }
-export interface VQL_OP_Add<T = any> {
+export declare interface VQL_OP_Remove<T = any> {
     collection: string;
-    data: Arg<T>;
-    id_gen?: boolean;
+    search: Search<T>;
+    select?: VQL_Fields;
 }
-export interface VQL_OP_Update<T = any> {
+export declare interface VQL_OP_ToggleOne<T = any> {
     collection: string;
     search: Search<T>;
-    updater: UpdaterArg<T>;
+    data?: Arg<T>;
+    select?: VQL_Fields;
 }
-export interface VQL_OP_Remove<T = any> {
+export declare interface VQL_OP_Update<T = any> {
     collection: string;
     search: Search<T>;
+    updater: UpdaterArg<T>;
+    select?: VQL_Fields;
 }
-export interface VQL_OP_UpdateOneOrAdd<T = any> {
+export declare interface VQL_OP_UpdateOneOrAdd<T = any> {
     collection: string;
     search: Search<T>;
     updater: UpdaterArg<T>;
     add_arg?: Arg<T>;
     id_gen?: boolean;
+    select?: VQL_Fields;
 }
-export interface VQL_OP_ToggleOne<T = any> {
-    collection: string;
-    search: Search<T>;
-    data?: Arg<T>;
-}
-export interface VQL_OP_CollectionOperation {
-    collection: string;
+export declare type VQL_Query<T = any> = (VQL_Query_CRUD<T> | VQL_Query_Relation) & VQL_Var;
+export declare interface VQL_Query_CRUD<T = any> {
+    db: string;
+    d: VQL_Query_CRUD_Data<T>;
 }
-export type VQL_Fields = Record<string, boolean | number> | string[];
-export type VQL_Query_CRUD_Data<T = any> = {
+export declare type VQL_Query_CRUD_Data<T = any> = {
     find: VQL_OP_Find<T>;
 } | {
     findOne: VQL_OP_FindOne<T>;
@@ -276,12 +287,8 @@ export type VQL_Query_CRUD_Data<T = any> = {
 } | {
     getCollections: {};
 };
-export type VQL_Query_CRUD_Keys = VQL_Query_CRUD_Data extends infer U ? U extends Record<string, unknown> ? keyof U : never : never;
-export interface VQL_Query_CRUD<T = any> {
-    db: string;
-    d: VQL_Query_CRUD_Data<T>;
-}
-export interface VQL_Query_Relation {
+export declare type VQL_Query_CRUD_Keys = VQL_Query_CRUD_Data extends infer U ? U extends Record<string, unknown> ? keyof U : never : never;
+export declare interface VQL_Query_Relation {
     r: {
         path: RelationTypes.Path;
         search: Search;
@@ -291,18 +298,98 @@ export interface VQL_Query_Relation {
         select?: RelationTypes.FieldPath[] | Record<string, any>;
     };
 }
-export interface VQL_Var {
+export declare interface VQL_Var {
     var?: {
         [k: string]: any;
     };
 }
-export type VQL_Query<T = any> = (VQL_Query_CRUD<T> | VQL_Query_Relation) & VQL_Var;
-export type VQLUQ<T = any> = VQL_Query<T> | string | {
-    query: string;
-} & VQL_Var;
-export interface VQLError {
+export declare interface VQLError {
     err: true;
     msg: string;
     c: number;
 }
+export declare type VQLUQ<T = any> = VQL_Query<T> | string | ({
+    query: string;
+} & VQL_Var);
+export declare interface VQuery<T = Data, AllowFn extends boolean = true> {
+    collection?: string;
+    search?: Search<T, AllowFn>;
+    context?: VContext;
+    dbFindOpts?: DbFindOpts<T>;
+    findOpts?: FindOpts<T>;
+    data?: Arg<T>;
+    datas?: Arg<T>[];
+    id_gen?: boolean;
+    add_arg?: Arg<T>;
+    updater?: Updater<T, AllowFn>;
+    control?: VQuery_Control;
+    transaction?: TransactionHandle;
+    index?: IndexDefinition;
+}
+export declare interface VQuery_Control {
+}
+export declare namespace VQueryT {
+    type QueryBase<T = Data> = {
+        collection: string;
+        control?: VQuery_Control;
+        transaction?: TransactionHandle;
+    };
+    type Add<T = Data> = QueryBase<T> & {
+        data: Arg<T>;
+        id_gen?: boolean;
+    };
+    type BulkAdd<T = Data> = QueryBase<T> & {
+        datas: Arg<T>[];
+        id_gen?: boolean;
+    };
+    type Find<T = Data, AllowFn extends boolean = true> = QueryBase<T> & {
+        search?: Search<T, AllowFn>;
+        findOpts?: FindOpts<T>;
+        dbFindOpts?: DbFindOpts<T>;
+        context?: VContext;
+    };
+    type FindOne<T = Data, AllowFn extends boolean = true> = QueryBase<T> & {
+        search: Search<T, AllowFn>;
+        findOpts?: FindOpts<T>;
+        context?: VContext;
+    };
+    type Update<T = Data, AllowFn extends boolean = true> = QueryBase<T> & {
+        search: Search<T, AllowFn>;
+        updater: Updater<T, AllowFn>;
+        context?: VContext;
+    };
+    type Remove<T = Data, AllowFn extends boolean = true> = QueryBase<T> & {
+        search: Search<T, AllowFn>;
+        context?: VContext;
+    };
+    type UpdateOneOrAdd<T = Data, AllowFn extends boolean = true> = QueryBase<T> & {
+        search: Search<T, AllowFn>;
+        updater: Updater<T, AllowFn>;
+        add_arg?: Arg<T>;
+        id_gen?: boolean;
+        context?: VContext;
+    };
+    type ToggleOne<T = Data, AllowFn extends boolean = true> = QueryBase<T> & {
+        search: Search<T, AllowFn>;
+        data: Arg<T>;
+        context?: VContext;
+    };
+    interface UpdateOneOrAddResult<T> {
+        data: T;
+        type: "added" | "updated";
+    }
+    interface ToggleOneResult<T> {
+        data: T;
+        type: "added" | "removed";
+    }
+    type CreateIndex<T = Data> = QueryBase<T> & {
+        index: IndexDefinition;
+    };
+    type RemoveIndex<T = Data> = QueryBase<T> & {
+        index: IndexDefinition;
+    };
+    type Count<T = Data> = QueryBase<T> & {
+        search: Search<T, false>;
+    };
+}
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wxn0brp/vql-client",
-  "version": "0.2.13",
+  "version": "0.2.15",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "description": "VQL Client",
@@ -26,8 +26,9 @@
   "license": "MIT",
   "type": "module",
   "devDependencies": {
+    "@wxn0brp/biome": "*",
     "esbuild": "^0.28",
-    "typescript": "^6"
+    "typescript": "^7"
   },
   "files": [
     "dist"