@wxn0brp/vql-client 0.0.6 → 0.0.8

package/dist/index.d.ts

@@ -1,19 +1,16 @@
-import { VQLR, VQLRef } from "./vql.js";
-export type VQLQuery = VQLR | string | {
-    query: string;
-} & VQLRef;
+import { VqlQueryRaw } from "./vql.js";
 export type VQLResult<T = any> = Promise<T>;
-export type VQLTransport = (query: VQLQuery) => VQLResult;
+export type VQLTransport = (query: VqlQueryRaw) => VQLResult;
 export type VQLHooks = {
-    onStart?: (query: VQLQuery) => void;
-    onEnd?: (query: VQLQuery, durationMs: number, result: any) => void;
-    onError?: (query: VQLQuery, error: unknown) => void;
+    onStart?: (query: VqlQueryRaw) => void;
+    onEnd?: (query: VqlQueryRaw, durationMs: number, result: any) => void;
+    onError?: (query: VqlQueryRaw, error: unknown) => void;
 };
 export declare function initVQLClient(config: {
     transport?: VQLTransport;
     hooks?: VQLHooks;
     defaultFetchUrl?: string;
 }): void;
-export declare function fetchVQL<T = any>(query: VQLQuery): Promise<T>;
+export declare function fetchVQL<T = any>(query: VqlQueryRaw): Promise<T>;
 export declare function resetVQLClient(): void;
-export declare function defaultFetchTransport(query: VQLQuery): Promise<any>;
+export declare function defaultFetchTransport(query: VqlQueryRaw): Promise<any>;

package/dist/index.js

@@ -21,7 +21,9 @@ export async function fetchVQL(query) {
             hooks.onError?.(query, error);
             throw error;
         }
-        return res?.result ?? res;
+        if (res.result !== undefined)
+            return res.result;
+        return res;
     }
     catch (e) {
         hooks.onError?.(query, e);

package/dist/vql-client.cjs

@@ -34,7 +34,7 @@ function initVQLClient(config) {
   if (config.defaultFetchUrl) defaultFetchUrl = config.defaultFetchUrl;
 }
 async function fetchVQL(query) {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c, _d;
   const start = Date.now();
   try {
     (_a = hooks.onStart) == null ? void 0 : _a.call(hooks, query);
@@ -46,9 +46,10 @@ async function fetchVQL(query) {
       (_c = hooks.onError) == null ? void 0 : _c.call(hooks, query, error);
       throw error;
     }
-    return (_d = res == null ? void 0 : res.result) != null ? _d : res;
+    if (res.result !== void 0) return res.result;
+    return res;
   } catch (e) {
-    (_e = hooks.onError) == null ? void 0 : _e.call(hooks, query, e);
+    (_d = hooks.onError) == null ? void 0 : _d.call(hooks, query, e);
     throw e;
   }
 }

package/dist/vql-client.min.js

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

package/dist/vql.d.ts

@@ -272,4 +272,7 @@ export interface VQLError {
     c: number;
     why?: string;
 }
+export type VqlQueryRaw = VQLR | string | {
+    query: string;
+} & VQLRef;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wxn0brp/vql-client",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "author": "wxn0brP",