@wxn0brp/vql-client 0.1.0 → 0.2.0

package/dist/index.d.ts

@@ -1,10 +1,10 @@
-import { VqlQueryRaw } from "./vql";
+import { VQLUQ } from "./vql";
 export type VQLResult<T = any> = Promise<T>;
-export type VQLTransport = (query: VqlQueryRaw) => VQLResult;
+export type VQLTransport = (query: VQLUQ) => VQLResult;
 export interface VQLHooks {
-    onStart?: (query: VqlQueryRaw, hookContext: any) => void;
-    onEnd?: (query: VqlQueryRaw, durationMs: number, result: any, hookContext: any) => void;
-    onError?: (query: VqlQueryRaw, error: unknown, result?: any, hookContext?: any) => void;
+    onStart?: (query: VQLUQ, hookContext: any) => void;
+    onEnd?: (query: VQLUQ, durationMs: number, result: any, hookContext: any) => void;
+    onError?: (query: VQLUQ, error: unknown, result?: any, hookContext?: any) => void;
 }
 export interface Config {
     transport?: VQLTransport;
@@ -12,5 +12,5 @@ export interface Config {
     url?: string;
 }
 export declare const VConfig: Config;
-export declare function fetchVQL<T = any>(query: VqlQueryRaw<T>, hookContext?: any): Promise<T>;
-export declare function defTransport(query: VqlQueryRaw): Promise<any>;
+export declare function fetchVQL<T = any>(query: VQLUQ<T>, hookContext?: any): Promise<T>;
+export declare function defTransport(query: VQLUQ): Promise<any>;

package/dist/min.js

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

package/dist/vql.d.ts

@@ -137,106 +137,79 @@ declare namespace RelationTypes {
         };
     }
 }
-export interface VQLQuery<T = any> {
-    find: VQLFind<T>;
-    findOne: VQLFindOne<T>;
-    f: VQLFindOne<T>;
-    add: VQLAdd<T>;
-    update: VQLUpdate<T>;
-    updateOne: VQLUpdateOne<T>;
-    remove: VQLRemove<T>;
-    removeOne: VQLRemoveOne<T>;
-    updateOneOrAdd: VQLUpdateOneOrAdd<T>;
-    removeCollection: VQLCollectionOperation;
-    ensureCollection: VQLCollectionOperation;
-    issetCollection: VQLCollectionOperation;
-    getCollections: {};
-}
-export type VQLQueryData<T = any> = {
-    find: VQLFind<T>;
-} | {
-    findOne: VQLFindOne<T>;
-} | {
-    f: VQLFindOne<T>;
-} | {
-    add: VQLAdd<T>;
-} | {
-    update: VQLUpdate<T>;
-} | {
-    updateOne: VQLUpdateOne<T>;
-} | {
-    remove: VQLRemove<T>;
-} | {
-    removeOne: VQLRemoveOne<T>;
-} | {
-    updateOneOrAdd: VQLUpdateOneOrAdd<T>;
-} | {
-    removeCollection: VQLCollectionOperation;
-} | {
-    ensureCollection: VQLCollectionOperation;
-} | {
-    issetCollection: VQLCollectionOperation;
-} | {
-    getCollections: {};
-};
-export interface VQLRequest<T = any> {
-    db: string;
-    d: VQLQueryData<T>;
-}
-export interface VQLFind<T = any> {
+export interface VQL_OP_Find<T = any> {
     collection: string;
     search?: Search<T>;
     limit?: number;
-    fields?: VQLFields;
-    select?: VQLFields;
-    relations?: VQLRelations;
+    fields?: VQL_Fields;
+    select?: VQL_Fields;
     options?: DbFindOpts<T>;
     searchOpts?: FindOpts<T>;
 }
-export interface VQLFindOne<T = any> {
+export interface VQL_OP_FindOne<T = any> {
     collection: string;
     search: Search<T>;
-    fields?: VQLFields;
-    select?: VQLFields;
-    relations?: VQLRelations;
+    fields?: VQL_Fields;
+    select?: VQL_Fields;
     searchOpts?: FindOpts<T>;
 }
-export interface VQLAdd<T = any> {
+export interface VQL_OP_Add<T = any> {
     collection: string;
     data: Arg<T>;
     id_gen?: boolean;
 }
-export interface VQLUpdate<T = any> {
-    collection: string;
-    search: Search<T>;
-    updater: UpdaterArg<T>;
-}
-export interface VQLUpdateOne<T = any> {
+export interface VQL_OP_Update<T = any> {
     collection: string;
     search: Search<T>;
     updater: UpdaterArg<T>;
 }
-export interface VQLRemove<T = any> {
+export interface VQL_OP_Remove<T = any> {
     collection: string;
     search: Search<T>;
 }
-export interface VQLRemoveOne<T = any> {
-    collection: string;
-    search: Search<T>;
-}
-export interface VQLUpdateOneOrAdd<T = any> {
+export interface VQL_OP_UpdateOneOrAdd<T = any> {
     collection: string;
     search: Search<T>;
     updater: UpdaterArg<T>;
     add_arg?: Arg<T>;
     id_gen?: boolean;
 }
-export interface VQLCollectionOperation {
+export interface VQL_OP_CollectionOperation {
     collection: string;
 }
-export type VQLFields = Record<string, boolean | number> | string[];
-export type VQLRelations = Record<string, VQLFind | VQLFindOne>;
-export interface RelationQuery {
+export type VQL_Fields = Record<string, boolean | number> | string[];
+export type VQL_Query_CRUD_Data<T = any> = {
+    find: VQL_OP_Find<T>;
+} | {
+    findOne: VQL_OP_FindOne<T>;
+} | {
+    f: VQL_OP_FindOne<T>;
+} | {
+    add: VQL_OP_Add<T>;
+} | {
+    update: VQL_OP_Update<T>;
+} | {
+    updateOne: VQL_OP_Update<T>;
+} | {
+    remove: VQL_OP_Remove<T>;
+} | {
+    removeOne: VQL_OP_Remove<T>;
+} | {
+    updateOneOrAdd: VQL_OP_UpdateOneOrAdd<T>;
+} | {
+    removeCollection: VQL_OP_CollectionOperation;
+} | {
+    ensureCollection: VQL_OP_CollectionOperation;
+} | {
+    issetCollection: VQL_OP_CollectionOperation;
+} | {
+    getCollections: {};
+};
+export interface VQL_Query_CRUD<T = any> {
+    db: string;
+    d: VQL_Query_CRUD_Data<T>;
+}
+export interface VQL_Query_Relation {
     r: {
         path: RelationTypes.Path;
         search: Search;
@@ -246,25 +219,18 @@ export interface RelationQuery {
         select?: RelationTypes.FieldPath[];
     };
 }
-export interface VQLRef {
-    ref?: string;
+export interface VQL_Var {
     var?: {
         [k: string]: any;
     };
 }
-export type VQLRefRequired = VQLRef & Required<Pick<VQLRef, "ref">>;
-export type DeepPartial<T> = {
-    [P in keyof T]?: T[P] extends object ? DeepPartial<T[P]> : T[P];
-};
-export type VQL<T = any> = (VQLRequest<T> | RelationQuery) & VQLRef;
-export type VQLR<T = any> = VQL<T> | (DeepPartial<VQL<T>> & VQLRefRequired) | VQLRefRequired;
+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 {
     err: true;
     msg: string;
     c: number;
-    why?: string;
 }
-export type VqlQueryRaw<T = any> = VQLR<T> | string | {
-    query: string;
-} & VQLRef;
 export {};

package/package.json

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