@wxn0brp/vql-client 0.2.9 → 0.2.11

package/dist/vql.d.ts

@@ -25,10 +25,10 @@ export type ComparisonOperators<T = any> = {
         number,
         number
     ], number>;
-    $in?: DeepPartial<T> & {
+    $in?: {
         [K in keyof T]?: T[K] extends any[] ? T[K] : T[K][];
     };
-    $nin?: DeepPartial<T> & {
+    $nin?: {
         [K in keyof T]?: T[K] extends any[] ? T[K] : T[K][];
     };
     $idGt?: NestedValue<T, string | number, string | number>;
@@ -41,8 +41,12 @@ export type TypeAndExistenceOperators<T = any> = {
     $type?: NestedValue<T, JSPrimitiveType, any>;
 };
 export type ArrayOperators<T = any> = {
-    $arrinc?: DeepPartial<T>;
-    $arrincall?: DeepPartial<T>;
+    $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> = {
@@ -102,22 +106,34 @@ export interface VQuery<T = Data> {
     updater?: Updater<T>;
     control?: VQuery_Control;
 }
-export type QueryBase<T = Data> = Required<Pick<VQuery<T>, "collection" | "search">> & Pick<VQuery<T>, "control">;
-export type AddQuery<T = Data> = Required<Pick<VQuery<T>, "data" | "collection">> & Pick<VQuery<T>, "id_gen" | "control">;
-export type FindQuery<T = Data> = Omit<QueryBase, "search"> & Pick<VQuery<T>, "search"> & Pick<VQuery<T>, "findOpts" | "dbFindOpts" | "context">;
-export type FindOneQuery<T = Data> = QueryBase & Pick<VQuery<T>, "findOpts" | "context">;
-export type UpdateQuery<T = Data> = QueryBase & Required<Pick<VQuery<T>, "updater">> & Pick<VQuery<T>, "context">;
-export type RemoveQuery<T = Data> = QueryBase & Pick<VQuery<T>, "context">;
-export type UpdateOneOrAddQuery<T = Data> = QueryBase & UpdateQuery & Pick<VQuery<T>, "add_arg" | "id_gen">;
-export type ToggleOneQuery<T = Data> = QueryBase & Pick<VQuery<T>, "data" | "context">;
-export interface UpdateOneOrAddResult<T> {
-    data: T;
-    type: "added" | "updated";
-}
-export interface ToggleOneResult<T> {
-    data: T;
-    type: "added" | "removed";
+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 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;
@@ -144,24 +160,24 @@ declare class Collection<D = Data> {
     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<UpdateOneOrAddResult<D>>;
-    toggleOne(search: Search<D>, data?: Arg<D>, context?: VContext): Promise<ToggleOneResult<D>>;
+    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: AddQuery<T>): Promise<T>;
-    find<T = Data>(query: FindQuery<T>): Promise<T[]>;
-    findOne<T = Data>(query: FindOneQuery<T>): Promise<T | null>;
-    update<T = Data>(query: UpdateQuery<T>): Promise<T[]>;
-    updateOne<T = Data>(query: UpdateQuery<T>): Promise<T | null>;
-    remove<T = Data>(query: RemoveQuery<T>): Promise<T[]>;
-    removeOne<T = Data>(query: RemoveQuery<T>): Promise<T | null>;
+    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: UpdateOneOrAddQuery<T>): Promise<UpdateOneOrAddResult<T>>;
-    toggleOne<T = Data>(query: ToggleOneQuery<T>): Promise<ToggleOneResult<T>>;
+    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?: {

package/package.json

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