@wxn0brp/vql-client 0.2.3 → 0.2.5

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { VQLUQ } from "./vql";
 export type VQLResult<T = any> = Promise<T>;
-export type VQLTransport = (query: VQLUQ) => VQLResult;
+export type VQLTransport = (query: VQLUQ, fetchOptions?: FetchOptions) => VQLResult;
 export interface VQLHooks {
     onStart?: (query: VQLUQ, hookContext: any) => void;
     onEnd?: (query: VQLUQ, durationMs: number, result: any, hookContext: any) => void;
@@ -8,10 +8,18 @@ export interface VQLHooks {
 }
 export interface Config {
     transport?: VQLTransport;
+    fetchImplementation: typeof fetch;
     hooks?: VQLHooks;
     url?: string;
     body?: Record<string, any>;
+    headers?: Record<string, any>;
+    hookContext?: any;
+}
+export interface FetchOptions {
+    signal?: AbortSignal;
+    headers?: Record<string, any>;
+    body?: Record<string, any>;
 }
 export declare const VConfig: Config;
-export declare function fetchVQL<T = any>(query: VQLUQ<T>, vars?: any, hookContext?: any): Promise<T>;
-export declare function defTransport(query: VQLUQ): Promise<any>;
+export declare function fetchVQL<T = any>(query: VQLUQ<T>, vars?: any, hookContext?: any, fetchOptions?: FetchOptions): Promise<T>;
+export declare function defTransport(query: VQLUQ, fetchOptions?: FetchOptions): Promise<any>;

package/dist/index.js

@@ -1,14 +1,15 @@
 ;
 export const VConfig = {
     transport: defTransport,
+    fetchImplementation: fetch,
     hooks: {},
     url: "/VQL"
 };
-export async function fetchVQL(query, vars = {}, hookContext = {}) {
+export async function fetchVQL(query, vars = {}, hookContext = {}, fetchOptions = {}) {
     const { transport, hooks } = VConfig;
     const start = Date.now();
     try {
-        hookContext = Object.assign({}, vars, hookContext);
+        hookContext = Object.assign({}, VConfig.hookContext, vars, hookContext);
         hooks.onStart?.(query, hookContext);
         if (typeof query === "string" && Object.keys(vars).length) {
             query = {
@@ -16,7 +17,7 @@ export async function fetchVQL(query, vars = {}, hookContext = {}) {
                 var: vars
             };
         }
-        const res = await transport(query);
+        const res = await transport(query, fetchOptions);
         const duration = Date.now() - start;
         hooks.onEnd?.(query, duration, res, hookContext);
         if (res?.err) {
@@ -33,14 +34,21 @@ export async function fetchVQL(query, vars = {}, hookContext = {}) {
         throw e;
     }
 }
-export async function defTransport(query) {
-    const res = await fetch(VConfig.url, {
-        method: "POST",
-        headers: {
-            "Content-Type": "application/json"
-        },
-        body: JSON.stringify({ query, ...(VConfig.body || {}) })
+export async function defTransport(query, fetchOptions) {
+    const headers = Object.assign({
+        "Content-Type": "application/json"
+    }, VConfig.headers, fetchOptions.headers);
+    const body = Object.assign({}, VConfig.body, fetchOptions.body, {
+        query
     });
+    const queryConfig = {
+        method: "POST",
+        headers,
+        body: JSON.stringify(body)
+    };
+    if (fetchOptions.signal)
+        queryConfig.signal = fetchOptions.signal;
+    const res = await VConfig.fetchImplementation(VConfig.url, queryConfig);
     if (!res.ok)
         throw new Error(`VQL request failed: ${res.status}`);
     return await res.json();

package/dist/min.js

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

package/dist/vql.d.ts

@@ -25,6 +25,10 @@ export type ComparisonOperators<T = any> = {
     ], number>;
     $in?: Partial<Record<keyof T, T[keyof T][]>>;
     $nin?: Partial<Record<keyof T, T[keyof T][]>>;
+    $idGt?: PartialOfType<T, string | number>;
+    $idLt?: PartialOfType<T, string | number>;
+    $idGte?: PartialOfType<T, string | number>;
+    $idLte?: PartialOfType<T, string | number>;
 };
 export type TypeAndExistenceOperators<T = any> = {
     $exists?: PartialOfType<T, boolean, any>;
@@ -52,13 +56,15 @@ export type ArrayUpdater<T = any> = {
     $pullall?: PartialOfType<T, any>;
 };
 export type ObjectUpdater<T = any> = {
-    $merge?: PartialOfType<T, any[]>;
+    $merge?: PartialOfType<T, any>;
+    $deepMerge?: PartialOfType<T, any>;
 };
 export type ValueUpdater<T = any> = {
     $inc?: PartialOfType<T, number>;
     $dec?: PartialOfType<T, number>;
     $unset?: PartialOfType<T, any>;
     $rename?: PartialOfType<T, any>;
+    $set?: PartialOfType<T, any>;
 };
 export type UpdaterArg<T = any> = ArrayUpdater<T> & ObjectUpdater<T> & ValueUpdater<T> & Arg<T>;
 export type Arg<T = any> = {
@@ -92,6 +98,7 @@ declare class CollectionManager<D = Data> {
     remove<T = Data>(search: Search<T & Data>, context?: VContext): Promise<boolean>;
     removeOne<T = Data>(search: Search<T & Data>, context?: VContext): Promise<boolean>;
     updateOneOrAdd<T = Data>(search: Search<T & Data>, updater: Updater<T & Data>, { add_arg, context, id_gen }: UpdateOneOrAdd<T & Data>): Promise<boolean>;
+    toggleOne<T = Data>(search: Search<T & Data>, data?: Arg<T & Data>, context?: VContext): Promise<boolean>;
 }
 export interface ValtheraCompatible {
     c(collection: string): CollectionManager;
@@ -107,6 +114,7 @@ export interface ValtheraCompatible {
     removeOne<T = Data>(collection: string, search: Search<T>, context?: VContext): Promise<boolean>;
     removeCollection(collection: string): Promise<boolean>;
     updateOneOrAdd<T = Data>(collection: string, search: Search<T>, updater: Updater<T>, opts?: UpdateOneOrAdd<T>): Promise<boolean>;
+    toggleOne<T = Data>(collection: string, search: Search<T>, data?: Arg<T>, context?: VContext): Promise<boolean>;
 }
 export interface UpdateOneOrAdd<T> {
     add_arg?: Arg<T>;
@@ -179,6 +187,11 @@ export interface VQL_OP_UpdateOneOrAdd<T = any> {
     add_arg?: Arg<T>;
     id_gen?: boolean;
 }
+export interface VQL_OP_ToggleOne<T = any> {
+    collection: string;
+    search: Search<T>;
+    data?: Arg<T>;
+}
 export interface VQL_OP_CollectionOperation {
     collection: string;
 }
@@ -201,6 +214,8 @@ export type VQL_Query_CRUD_Data<T = any> = {
     removeOne: VQL_OP_Remove<T>;
 } | {
     updateOneOrAdd: VQL_OP_UpdateOneOrAdd<T>;
+} | {
+    toggleOne: VQL_OP_ToggleOne<T>;
 } | {
     removeCollection: VQL_OP_CollectionOperation;
 } | {
@@ -210,6 +225,7 @@ 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>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wxn0brp/vql-client",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "description": "VQL Client",
@@ -9,6 +9,19 @@
     "type": "git",
     "url": "https://github.com/wxn0brP/VQL-client.git"
   },
+  "keywords": [
+    "vql",
+    "valthera",
+    "database",
+    "orm",
+    "api",
+    "crud",
+    "nosql",
+    "query",
+    "db",
+    "query-language",
+    "client"
+  ],
   "author": "wxn0brP",
   "license": "MIT",
   "type": "module",