@defjs/core 0.3.0 → 0.3.2

package/index.d.ts

@@ -134,10 +134,10 @@ export interface HttpRequest {
 	downloadProgress?: HttpProgressFn;
 	abort?: AbortSignal;
 }
-export type RequestInputValue<T> = T extends Field<infer V> ? V : T extends {
+export type RequestInputValue<T> = T extends {
 	[K in keyof T]: Field<any>;
 } ? {
-	[K in keyof T]: RequestInputValue<T[K]>;
+	[K in keyof T]: T[K] extends Field<infer V> ? V : never;
 } : never;
 export type UseRequestOptions = {
 	abort?: AbortSignal;
@@ -148,21 +148,17 @@ export type UseRequestOptions = {
 export type UseRequestFn<Input, Output> = {
 	doRequest: undefined extends RequestInputValue<Input> ? (input?: RequestInputValue<Input>) => Promise<HttpResponse<Output>> : (input: RequestInputValue<Input>) => Promise<HttpResponse<Output>>;
 	cancel: () => void;
-	getInitValue: () => Input extends Field<infer V> ? V : Input extends {
-		[K in keyof Input]: Field<any>;
-	} ? {
-		[K in keyof Input]: RequestInputValue<Input[K]>;
-	} : undefined;
+	getInitValue: () => RequestInputValue<Input>;
 	setUploadProgress: (fn: HttpProgressFn) => void;
 	setDownloadProgress: (fn: HttpProgressFn) => void;
 };
-export interface DefineRequest<Input extends Field<any> | Record<PropertyKey, Field<any>> | undefined = undefined, Output = unknown> {
+export interface DefineRequest<Input extends Record<PropertyKey, Field<any>> | undefined = undefined, Output = unknown> {
 	(options?: UseRequestOptions): UseRequestFn<Input, Output>;
-	withField<I extends Field<any> | Record<PropertyKey, Field<any>>>(value: I): DefineRequest<I, Output>;
+	withField<I extends Record<PropertyKey, Field<any>>>(value: I): DefineRequest<I, Output>;
 	withInterceptors(value: InterceptorFn[]): DefineRequest<Input, Output>;
 	withContext(value: HttpContext): DefineRequest<Input, Output>;
 	withCredentials(value: boolean): DefineRequest<Input, Output>;
-	withValidators(value: (ValidatorFn<RequestInputValue<Input>> | AsyncValidatorFn<RequestInputValue<Input>>)[]): DefineRequest<Input, Output>;
+	withValidators(...fn: (ValidatorFn<RequestInputValue<Input>> | AsyncValidatorFn<RequestInputValue<Input>>)[]): DefineRequest<Input, Output>;
 	withTransformResponse<O>(fn: TransformResponseFn<O>): DefineRequest<Input, O>;
 	withResponseType(value: "json"): DefineRequest<Input, Output>;
 	withResponseType(value: "text"): DefineRequest<Input, string>;

package/index.js

@@ -1,51 +1,15 @@
-// src/handler/util.ts
-function __getContentLength(headers) {
-  const value = headers.get("Content-Length");
-  if (!value) {
-    return 0;
-  }
-  const num = Number(value);
-  if (isNaN(num)) {
-    return 0;
-  }
-  return num;
-}
-function __getContentType(headers) {
-  return headers.get("Content-Type") || "";
-}
-function __parseBody(params) {
-  const { request, content, contentType } = params;
-  const responseType = request.responseType;
-  switch (responseType) {
-    case "json": {
-      const text = new TextDecoder().decode(content);
-      if (text === "") {
-        return null;
-      }
-      return JSON.parse(text);
-    }
-    case "text":
-      return new TextDecoder().decode(content);
-    case "blob": {
-      return new Blob([content], { type: contentType });
-    }
-    case "arraybuffer":
-      return content.buffer;
-    default:
-      return null;
-  }
-}
-function __concatChunks(chunks, totalLength) {
-  const chunksAll = new Uint8Array(totalLength);
-  let position = 0;
-  for (const chunk of chunks) {
-    chunksAll.set(chunk, position);
-    position += chunk.length;
-  }
-  return chunksAll;
-}
-
 // src/response.ts
+var ERR_ABORTED = new Error("ERR_ABORTED");
+var ERR_TIMEOUT = new Error("ERR_TIMEOUT");
+var ERR_NETWORK = new Error("ERR_NETWORK");
+var ERR_NOT_FOUND_HANDLER = new Error("ERR_NOT_FOUND_HANDLER");
+var ERR_OBSERVE = new Error("ERR_OBSERVE");
+var ERR_NOT_SET_ALIAS = new Error("ERR_NOT_SET_ALIAS");
+var ERR_UNSUPPORTED_FIELD_TYPE = new Error("ERR_UNSUPPORTED_FIELD_TYPE");
+var ERR_INVALID_CLIENT = new Error("ERR_INVALID_CLIENT");
+var ERR_NOT_FOUND_GLOBAL_CLIENT = new Error("ERR_NOT_FOUND_GLOBAL_CLIENT");
+var ERR_INVALID_HTTP_CONTEXT_TOKEN = new Error("ERR_INVALID_HTTP_CONTEXT_TOKEN");
+var ERR_UNKNOWN = new Error("ERR_UNKNOWN");
 function __makeResponse(options) {
   const status = options?.status ?? 0;
   const ok = status >= 200 && status < 300;
@@ -70,19 +34,9 @@ function __makeResponse(options) {
     error
   };
 }
-var ERR_ABORTED = new Error("ERR_ABORTED");
-var ERR_TIMEOUT = new Error("ERR_TIMEOUT");
-var ERR_NETWORK = new Error("ERR_NETWORK");
-var ERR_NOT_FOUND_HANDLER = new Error("ERR_NOT_FOUND_HANDLER");
-var ERR_OBSERVE = new Error("ERR_OBSERVE");
-var ERR_NOT_SET_ALIAS = new Error("ERR_NOT_SET_ALIAS");
-var ERR_UNSUPPORTED_FIELD_TYPE = new Error("ERR_UNSUPPORTED_FIELD_TYPE");
-var ERR_INVALID_CLIENT = new Error("ERR_INVALID_CLIENT");
-var ERR_NOT_FOUND_GLOBAL_CLIENT = new Error("ERR_NOT_FOUND_GLOBAL_CLIENT");
-var ERR_INVALID_HTTP_CONTEXT_TOKEN = new Error("ERR_INVALID_HTTP_CONTEXT_TOKEN");
-var ERR_UNKNOWN = new Error("ERR_UNKNOWN");
 
 // src/context.ts
+var HTTP_CONTEXT_TOKEN = Symbol("HttpContextToken");
 function makeHttpContextToken(defaultValue) {
   Object.defineProperty(defaultValue, HTTP_CONTEXT_TOKEN, { value: defaultValue });
   return defaultValue;
@@ -90,6 +44,7 @@ function makeHttpContextToken(defaultValue) {
 function isHttpContextToken(value) {
   return typeof value === "function" && HTTP_CONTEXT_TOKEN in value;
 }
+var HTTP_CONTEXT = Symbol("HttpContext");
 function isHttpContext(value) {
   return typeof value === "object" && value !== null && HTTP_CONTEXT in value;
 }
@@ -144,10 +99,9 @@ function makeHttpContext(entries) {
     [HTTP_CONTEXT]: ctx
   };
 }
-var HTTP_CONTEXT_TOKEN = Symbol("HttpContextToken");
-var HTTP_CONTEXT = Symbol("HttpContext");
 
 // src/field.ts
+var FIELD = Symbol("field");
 function field(defaultValue) {
   const meta = {
     required: typeof defaultValue !== "undefined",
@@ -209,7 +163,6 @@ function isField(value) {
 function isFieldGroup(value) {
   return !!value && typeof value === "object" && Object.entries(value).every(([, v]) => isField(v));
 }
-var FIELD = Symbol("field");
 
 // src/handler/handler.ts
 var globalHttpHandler = undefined;
@@ -243,15 +196,12 @@ function __serializeBody(body) {
 function __detectContentTypeHeader(body) {
   switch (true) {
     case body instanceof FormData:
-      return "multipart/form-data";
+    case body instanceof URLSearchParams:
+      return null;
     case body instanceof ArrayBuffer:
       return "application/octet-stream";
-    case body instanceof Blob: {
+    case body instanceof Blob:
       return body.type || "application/octet-stream";
-    }
-    case body instanceof URLSearchParams: {
-      return "application/x-www-form-urlencoded;charset=UTF-8";
-    }
     case typeof body === "string":
       return "text/plain";
     case (typeof body === "object" && body !== null):
@@ -263,13 +213,10 @@ function __detectContentTypeHeader(body) {
   }
 }
 function __buildFieldDefaultValue(input) {
-  if (isField(input)) {
-    return input();
-  }
   if (isFieldGroup(input)) {
     const obj = {};
-    for (const [key, field3] of Object.entries(input)) {
-      obj[key] = field3();
+    for (const [key, field2] of Object.entries(input)) {
+      obj[key] = field2();
     }
     return obj;
   }
@@ -279,10 +226,10 @@ function defineRequest(...args) {
   let method;
   let endpoint;
   let requiredInput = false;
-  let field3;
+  let field2;
   let interceptors = [];
   let responseType = "json";
-  let context2;
+  let context;
   let withCredentials = false;
   let validators = [];
   let transformResponse;
@@ -302,10 +249,10 @@ function defineRequest(...args) {
   }
   const fn = (options) => {
     const timeout = options?.timeout || 0;
-    const client2 = options?.client || getGlobalClient();
-    const clientOptions = getClientConfig(client2);
-    const handler2 = options?.handler || clientOptions?.handler || getGlobalHttpHandler();
-    if (!handler2) {
+    const client = options?.client || getGlobalClient();
+    const clientOptions = getClientConfig(client);
+    const handler = options?.handler || clientOptions?.handler || getGlobalHttpHandler();
+    if (!handler) {
       throw ERR_NOT_FOUND_HANDLER;
     }
     let uploadProgress;
@@ -324,7 +271,7 @@ function defineRequest(...args) {
     const cancel = () => {
       abortController?.abort();
     };
-    const getInitValue = () => __buildFieldDefaultValue(field3);
+    const getInitValue = () => __buildFieldDefaultValue(field2);
     const setUploadProgress = (fn2) => {
       uploadProgress = fn2;
     };
@@ -354,17 +301,17 @@ function defineRequest(...args) {
           body: undefined,
           withCredentials,
           responseType,
-          context: context2 || makeHttpContext(),
+          context: context || makeHttpContext(),
           uploadProgress,
           downloadProgress,
           timeout,
           abort: AbortSignal.any(abortSignal)
         };
-        if (requiredInput && field3) {
-          await __fillRequestFromField(req, field3, input);
+        if (requiredInput && field2) {
+          await __fillRequestFromField(req, field2, input);
         }
         const chain = makeInterceptorChain([...clientOptions.interceptors, ...interceptors]);
-        let res = await chain(req, handler2);
+        let res = await chain(req, handler);
         if (typeof transformResponse === "function") {
           res = __makeResponse({
             ...res,
@@ -385,7 +332,7 @@ function defineRequest(...args) {
     };
   };
   fn.withField = (value) => {
-    field3 = value;
+    field2 = value;
     requiredInput = true;
     return fn;
   };
@@ -394,15 +341,15 @@ function defineRequest(...args) {
     return fn;
   };
   fn.withContext = (value) => {
-    context2 = value;
+    context = value;
     return fn;
   };
   fn.withCredentials = (value) => {
     withCredentials = value;
     return fn;
   };
-  fn.withValidators = (value) => {
-    validators = value;
+  fn.withValidators = (...fns) => {
+    validators = fns;
     return fn;
   };
   fn.withTransformResponse = (value) => {
@@ -535,11 +482,11 @@ async function __fillRequestFromField(request, fieldOrFieldGroup, input) {
     const json = {};
     let body = undefined;
     let lastBodyField;
-    for (const [propertyKey, field3] of Object.entries(fieldOrFieldGroup)) {
-      const meta = __getFieldMetadata(field3);
+    for (const [propertyKey, field2] of Object.entries(fieldOrFieldGroup)) {
+      const meta = __getFieldMetadata(field2);
       for (const [type, aliasName] of meta.alias) {
         const valueKey = aliasName || propertyKey;
-        const value = getValidValue(input[propertyKey], field3());
+        const value = getValidValue(input[propertyKey], field2());
         await doValid([...meta.validators, ...meta.asyncValidator], value);
         switch (type) {
           case 0 /* Json */: {
@@ -600,15 +547,62 @@ async function __fillRequestFromField(request, fieldOrFieldGroup, input) {
   throw ERR_UNSUPPORTED_FIELD_TYPE;
 }
 
+// src/handler/util.ts
+function __getContentLength(headers) {
+  const value = headers.get("Content-Length");
+  if (!value) {
+    return 0;
+  }
+  const num = Number(value);
+  if (isNaN(num)) {
+    return 0;
+  }
+  return num;
+}
+function __getContentType(headers) {
+  return headers.get("Content-Type") || "";
+}
+function __parseBody(params) {
+  const { request, content, contentType } = params;
+  const responseType = request.responseType;
+  switch (responseType) {
+    case "json": {
+      const text = new TextDecoder().decode(content);
+      if (text === "") {
+        return null;
+      }
+      return JSON.parse(text);
+    }
+    case "text":
+      return new TextDecoder().decode(content);
+    case "blob": {
+      return new Blob([content], { type: contentType });
+    }
+    case "arraybuffer":
+      return content.buffer;
+    default:
+      return null;
+  }
+}
+function __concatChunks(chunks, totalLength) {
+  const chunksAll = new Uint8Array(totalLength);
+  let position = 0;
+  for (const chunk of chunks) {
+    chunksAll.set(chunk, position);
+    position += chunk.length;
+  }
+  return chunksAll;
+}
+
 // src/handler/fetch/fetch.ts
-function __createRequest(request2) {
-  const url = new URL(request2.endpoint, request2.host);
-  if (request2.queryParams) {
-    url.search = request2.queryParams.toString();
+function __createRequest(request) {
+  const url = new URL(request.endpoint, request.host);
+  if (request.queryParams) {
+    url.search = request.queryParams.toString();
   }
-  const headers = request2.headers ?? new Headers;
+  const headers = request.headers ?? new Headers;
   if (!headers.has("Content-Type")) {
-    const detectedType = __detectContentTypeHeader(request2.body);
+    const detectedType = __detectContentTypeHeader(request.body);
     if (detectedType) {
       headers.set("Content-Type", detectedType);
     }
@@ -616,22 +610,22 @@ function __createRequest(request2) {
   if (!headers.has("Accept")) {
     headers.set("Accept", "application/json, text/plain, */*");
   }
-  const credentials = request2.withCredentials ? "include" : undefined;
+  const credentials = request.withCredentials ? "include" : undefined;
   return new Request(url, {
     headers,
-    method: request2.method,
-    body: __serializeBody(request2.body),
-    signal: request2.abort,
+    method: request.method,
+    body: __serializeBody(request.body),
+    signal: request.abort,
     credentials
   });
 }
 async function fetchHandler(httpRequest) {
   const downloadProgress = httpRequest.downloadProgress;
-  const request2 = __createRequest(httpRequest);
+  const request = __createRequest(httpRequest);
   const abortSignal = httpRequest.abort;
-  let response4;
+  let response;
   try {
-    response4 = await globalThis.fetch(request2);
+    response = await globalThis.fetch(request);
   } catch (error) {
     if (abortSignal?.aborted && abortSignal.reason instanceof Error) {
       switch (true) {
@@ -643,13 +637,13 @@ async function fetchHandler(httpRequest) {
     }
     return __makeResponse({ error });
   }
-  const { headers, status, statusText, url } = response4;
+  const { headers, status, statusText, url } = response;
   const contentLength = __getContentLength(headers);
   const contentType = __getContentType(headers);
   let body = null;
-  if (response4.body) {
+  if (response.body) {
     const chunks = [];
-    const reader = response4.body.getReader();
+    const reader = response.body.getReader();
     let receivedLength = 0;
     while (true) {
       const { done, value } = await reader.read();
@@ -690,14 +684,16 @@ async function fetchHandler(httpRequest) {
   });
 }
 // src/client.ts
+var CLIENT = Symbol("Client");
+var globalClient;
 function isClient(value) {
   return typeof value === "object" && value !== null && CLIENT in value;
 }
-function getClientConfig(client2) {
-  if (!isClient(client2)) {
+function getClientConfig(client) {
+  if (!isClient(client)) {
     throw ERR_INVALID_CLIENT;
   }
-  return client2[CLIENT];
+  return client[CLIENT];
 }
 function createClient(options) {
   const conf = {
@@ -709,8 +705,8 @@ function createClient(options) {
     [CLIENT]: conf
   };
 }
-function cloneClient(client2, options) {
-  const preConf = getClientConfig(client2);
+function cloneClient(client, options) {
+  const preConf = getClientConfig(client);
   const conf = {
     ...preConf,
     ...options
@@ -725,8 +721,8 @@ function getGlobalClient() {
   }
   return globalClient;
 }
-function setGlobalClient(client2) {
-  globalClient = client2;
+function setGlobalClient(client) {
+  globalClient = client;
 }
 function restGlobalClient() {
   globalClient = undefined;
@@ -734,8 +730,6 @@ function restGlobalClient() {
 function createGlobalClient(options) {
   globalClient = createClient(options);
 }
-var CLIENT = Symbol("Client");
-var globalClient;
 // src/interceptor/authorization/basic_auth_interceptor.ts
 function basicAuthInterceptor(fn, options) {
   let encode = options?.encode;

package/index.min.js

@@ -1 +1 @@
-function d(t){const n=t.get("Content-Length");if(!n)return 0;const r=Number(n);if(isNaN(r))return 0;return r}function a(t){return t.get("Content-Type")||""}function q(t){const{request:n,content:r,contentType:o}=t;switch(n.responseType){case"json":{const H=new TextDecoder().decode(r);if(H==="")return null;return JSON.parse(H)}case"text":return new TextDecoder().decode(r);case"blob":return new Blob([r],{type:o});case"arraybuffer":return r.buffer;default:return null}}function l(t,n){const r=new Uint8Array(n);let o=0;for(let T of t)r.set(T,o),o+=T.length;return r}function N(t){const n=t?.status??0,r=n>=200&&n<300,o=t?.statusText??"",T=t?.url??"",H=t?.headers??new Headers,f=t?.body??null;let R=t?.error;if(!R&&!r){let e=`Http failure response for ${T||"(unknown url)"}: ${n}`;if(o)e+=` - ${o}`;R=new Error(e)}return{status:n,statusText:o,url:T,headers:H,body:f,error:R}}var y=new Error("ERR_ABORTED"),K=new Error("ERR_TIMEOUT"),Ht=new Error("ERR_NETWORK"),X=new Error("ERR_NOT_FOUND_HANDLER"),Et=new Error("ERR_OBSERVE"),A=new Error("ERR_NOT_SET_ALIAS"),W=new Error("ERR_UNSUPPORTED_FIELD_TYPE"),J=new Error("ERR_INVALID_CLIENT"),j=new Error("ERR_NOT_FOUND_GLOBAL_CLIENT"),P=new Error("ERR_INVALID_HTTP_CONTEXT_TOKEN"),pt=new Error("ERR_UNKNOWN");function wt(t){return Object.defineProperty(t,v,{value:t}),t}function V(t){return typeof t==="function"&&v in t}function Rt(t){return typeof t==="object"&&t!==null&&Q in t}function Y(t){const n=new Map;switch(!0){case Array.isArray(t):{for(let[r,o]of t)if(V(r))n.set(r,o);break}case Rt(t):{for(let[r,o]of t[Q])n.set(r,o);break}}return{set(r,o){if(!V(r))throw P;return n.set(r,o),this},get(r){if(!V(r))throw P;if(!n.has(r))n.set(r,r());return n.get(r)},del(r){return n.delete(r),this},has(r){return n.has(r)},keys(){return n.keys()},get length(){return Array.from(n.keys()).length},[Q]:n}}var v=Symbol("HttpContextToken"),Q=Symbol("HttpContext");function it(t){const n={required:typeof t!=="undefined",alias:new Map,validators:[],asyncValidator:[]},r=()=>t;return Object.defineProperty(r,Z,{value:n}),r.withJson=(o)=>{return n.alias.set(0,o),r},r.withForm=(o)=>{return n.alias.set(4,o),r},r.withQuery=(o)=>{return n.alias.set(1,o),r},r.withParam=(o)=>{return n.alias.set(2,o),r},r.withHeader=(o)=>{return n.alias.set(3,o),r},r.withUrlForm=(o)=>{return n.alias.set(6,o),r},r.withBody=()=>{return n.alias.set(5,void 0),r},r.withValidators=(...o)=>{return n.validators=o,r},r.withAsyncValidators=(...o)=>{return n.asyncValidator=o,r},r}function G(t){return t[Z]}async function M(t,n){await Promise.all(t.map((r)=>r(n)))}function D(t){return!!t&&typeof t==="function"&&Z in t}function $(t){return!!t&&typeof t==="object"&&Object.entries(t).every(([,n])=>D(n))}var Z=Symbol("field");var ft=void 0;var tt=()=>ft;function nt(t){return t.reduceRight((n,r)=>{return(o,T)=>r(o,(H)=>n(H,T))},(n,r)=>r(n))}function ot(t){switch(!0){case t instanceof FormData:case t instanceof Blob:case t instanceof ArrayBuffer:case t instanceof URLSearchParams:case typeof t==="string":return t;case typeof t==="object":case typeof t==="boolean":case typeof t==="number":case Array.isArray(t):return JSON.stringify(t);default:return null}}function et(t){switch(!0){case t instanceof FormData:return"multipart/form-data";case t instanceof ArrayBuffer:return"application/octet-stream";case t instanceof Blob:return t.type||"application/octet-stream";case t instanceof URLSearchParams:return"application/x-www-form-urlencoded;charset=UTF-8";case typeof t==="string":return"text/plain";case(typeof t==="object"&&t!==null):case typeof t==="number":case typeof t==="boolean":return"application/json";default:return null}}function kt(t){if(D(t))return t();if($(t)){const n={};for(let[r,o]of Object.entries(t))n[r]=o();return n}return}function Ct(...t){let n,r,o=!1,T,H=[],f="json",R,e=!1,p=[],w;switch(t.length){case 1:{n="GET",r=t[0];break}case 2:{n=t[0],r=t[1];break}default:throw new Error("Invalid arguments")}const c=(x)=>{const i=x?.timeout||0,k=x?.client||S(),E=z(k),C=x?.handler||E?.handler||tt();if(!C)throw X;let m,I,B;const _=[];if(x?.abort)_.push(x.abort);else B=new AbortController,_.push(B.signal);if(i>0)_.push(AbortSignal.timeout(i));return{doRequest:async(...F)=>{try{let U;if(o&&F.length===1)U=F[0];if(o&&!U)throw new Error("Because the request has input, the argument must be the input value");if(p.length>0)for(let ct of p)ct(U);const b={host:E?.host,method:n,endpoint:r,queryParams:new URLSearchParams,headers:new Headers,body:void 0,withCredentials:e,responseType:f,context:R||Y(),uploadProgress:m,downloadProgress:I,timeout:i,abort:AbortSignal.any(_)};if(o&&T)await st(b,T,U);let h=await nt([...E.interceptors,...H])(b,C);if(typeof w==="function")h=N({...h,body:w(h)});return h}catch(U){return N({error:U})}},cancel:()=>{B?.abort()},getInitValue:()=>kt(T),setUploadProgress:(F)=>{m=F},setDownloadProgress:(F)=>{I=F}}};return c.withField=(x)=>{return T=x,o=!0,c},c.withInterceptors=(x)=>{return H=x,c},c.withContext=(x)=>{return R=x,c},c.withCredentials=(x)=>{return e=x,c},c.withValidators=(x)=>{return p=x,c},c.withTransformResponse=(x)=>{return w=x,c},c.withResponseType=(x)=>{return f=x,c},c}function rt(t,n){return t.replace(/:([^\/]+)/g,(r,o)=>{return n.get(o)??"undefined"})}async function st(t,n,r){function o(e){return typeof e==="object"&&e!==null}function T(e){switch(!0){case Array.isArray(e):case(typeof e==="object"&&e!==null):return JSON.stringify(e);case(typeof e==="object"&&e===null):case typeof e==="boolean":case typeof e==="number":case typeof e==="string":return String(e);default:throw new Error("Unsupported value type")}}function H(e,p,w){if(Array.isArray(w))for(let c of w)e.append(p,T(c));else e.set(p,T(w));return e}function f(e,p,w){if(Array.isArray(w))for(let c of w)f(e,p,T(c));return e.set(p,T(w)),e}function R(e,p){switch(!0){case typeof e==="undefined":return p;case(typeof e==="object"&&e===null):return e;default:return e}}if(D(n)){let e,p,w,c=void 0;const x=R(r,n()),i=G(n);await M([...i.validators,...i.asyncValidator],x);for(let[k,E]of i.alias)switch(k){case 1:{if(!E)throw A;p=H(new URLSearchParams,E,x);break}case 2:{if(!E)throw A;e=f(new Map,E,x);break}case 3:{if(!E)throw A;w=H(new Headers,E,x);break}case 4:{if(!E)throw A;c=H(new FormData,E,x);break}case 6:{if(!E)throw A;c=H(new URLSearchParams,E,x);break}case 0:case 5:c=x;break}if(e)t.endpoint=rt(t.endpoint,e);t.queryParams=p,t.headers=w,t.body=c;return}if($(n)&&o(r)){let e=new Map,p=new URLSearchParams,w=new Headers,c=new URLSearchParams,x=new FormData;const i={};let k=void 0,E;for(let[C,m]of Object.entries(n)){const I=G(m);for(let[B,_]of I.alias){const O=_||C,s=R(r[C],m());switch(await M([...I.validators,...I.asyncValidator],s),B){case 0:{Object.defineProperty(i,O,{value:s,writable:!0,enumerable:!0}),E=0;break}case 1:p=H(p,O,s);break;case 2:e=f(e,O,s);break;case 3:w=H(w,O,s);break;case 4:{x=H(x,O,s),E=4;break}case 6:{c=H(c,O,s),E=6;break}case 5:{k=s,E=5;break}}}}switch(t.endpoint=rt(t.endpoint,e),t.queryParams=p,t.headers=w,E){case 5:t.body=k;break;case 4:t.body=x;break;case 6:t.body=c;break;case 0:t.body=i;break}return}throw W}function Nt(t){const n=new URL(t.endpoint,t.host);if(t.queryParams)n.search=t.queryParams.toString();const r=t.headers??new Headers;if(!r.has("Content-Type")){const T=et(t.body);if(T)r.set("Content-Type",T)}if(!r.has("Accept"))r.set("Accept","application/json, text/plain, */*");const o=t.withCredentials?"include":void 0;return new Request(n,{headers:r,method:t.method,body:ot(t.body),signal:t.abort,credentials:o})}async function u(t){const n=t.downloadProgress,r=Nt(t),o=t.abort;let T;try{T=await globalThis.fetch(r)}catch(x){if(o?.aborted&&o.reason instanceof Error)switch(!0){case o.reason.name==="AbortError":return N({error:y});case o.reason.name==="TimeoutError":return N({error:K})}return N({error:x})}const{headers:H,status:f,statusText:R,url:e}=T,p=d(H),w=a(H);let c=null;if(T.body){const x=[],i=T.body.getReader();let k=0;while(!0){const{done:C,value:m}=await i.read();if(C)break;x.push(m),k+=m.length,n?.({lengthComputable:p>0,loaded:k,total:p})}const E=l(x,k);try{c=q({request:t,content:E,contentType:w})}catch(C){return N({error:C,status:f,statusText:R,headers:H,url:e})}}return N({status:f,statusText:R,headers:H,url:e,body:c})}function xt(t){return typeof t==="object"&&t!==null&&g in t}function z(t){if(!xt(t))throw J;return t[g]}function Tt(t){const n={host:t.host,interceptors:t.interceptors??[],handler:t.handler||u};return{[g]:n}}function mt(t,n){const o={...z(t),...n};return{[g]:o}}function S(){if(!L)throw j;return L}function Ot(t){L=t}function At(){L=void 0}function It(t){L=Tt(t)}var g=Symbol("Client"),L;function _t(t,n){let r=n?.encode;if(!r){const o=globalThis.btoa;if(typeof o!=="function")throw new Error("BasicAuthInterceptor is not supported in this environment");r=(T)=>o(`${T.username}:${T.password}`)}return(o,T)=>{const H=o.headers||new Headers;return H.set("Authorization",`Basic ${r(t())}`),o.headers=H,T(o)}}var Ft=(t)=>{if(!t)return new Error("required");return null},Ut=(t)=>{if(typeof t!=="boolean"||!t)return new Error("requiredTrue");return null},Bt=(t)=>{return(n)=>{if(typeof n!=="string")return new Error("invalid string");if(n.length<t)return new Error(`minLength ${t}`);return null}},Dt=(t)=>{return(n)=>{if(typeof n!=="string")return new Error("invalid string");if(n.length>t)return new Error(`maxLength ${t}`);return null}},Lt=(t)=>{return(n)=>{if(typeof n!=="number"||isNaN(n))return new Error("invalid number");if(n<t)return new Error(`minLength ${t}`);return null}},ht=(t)=>{return(n)=>{if(typeof n!=="number"||isNaN(n))return new Error("invalid number");if(n>t)return new Error(`maxLength ${t}`);return null}},Pt=(t)=>{return(n)=>{if(typeof n!=="string")return new Error("invalid string");if(!t.test(n))return new Error("pattern");return null}};export{Ot as setGlobalClient,At as restGlobalClient,Ut as requiredTrue,Ft as required,Pt as pattern,Bt as minLength,Lt as min,Dt as maxLength,ht as max,wt as makeHttpContextToken,Y as makeHttpContext,V as isHttpContextToken,$ as isFieldGroup,D as isField,xt as isClient,S as getGlobalClient,it as field,u as fetchHandler,M as doValid,Ct as defineRequest,It as createGlobalClient,Tt as createClient,mt as cloneClient,_t as basicAuthInterceptor,W as ERR_UNSUPPORTED_FIELD_TYPE,pt as ERR_UNKNOWN,K as ERR_TIMEOUT,Et as ERR_OBSERVE,A as ERR_NOT_SET_ALIAS,X as ERR_NOT_FOUND_HANDLER,j as ERR_NOT_FOUND_GLOBAL_CLIENT,Ht as ERR_NETWORK,P as ERR_INVALID_HTTP_CONTEXT_TOKEN,J as ERR_INVALID_CLIENT,y as ERR_ABORTED};
+var K=new Error("ERR_ABORTED"),X=new Error("ERR_TIMEOUT"),Ht=new Error("ERR_NETWORK"),y=new Error("ERR_NOT_FOUND_HANDLER"),Et=new Error("ERR_OBSERVE"),A=new Error("ERR_NOT_SET_ALIAS"),W=new Error("ERR_UNSUPPORTED_FIELD_TYPE"),J=new Error("ERR_INVALID_CLIENT"),j=new Error("ERR_NOT_FOUND_GLOBAL_CLIENT"),L=new Error("ERR_INVALID_HTTP_CONTEXT_TOKEN"),pt=new Error("ERR_UNKNOWN");function N(t){let n=t?.status??0,r=n>=200&&n<300,o=t?.statusText??"",T=t?.url??"",H=t?.headers??new Headers,f=t?.body??null,i=t?.error;if(!i&&!r){let e=`Http failure response for ${T||"(unknown url)"}: ${n}`;if(o)e+=` - ${o}`;i=new Error(e)}return{status:n,statusText:o,url:T,headers:H,body:f,error:i}}var d=Symbol("HttpContextToken");function wt(t){return Object.defineProperty(t,d,{value:t}),t}function P(t){return typeof t==="function"&&d in t}var Q=Symbol("HttpContext");function it(t){return typeof t==="object"&&t!==null&&Q in t}function Y(t){let n=new Map;switch(!0){case Array.isArray(t):{for(let[r,o]of t)if(P(r))n.set(r,o);break}case it(t):{for(let[r,o]of t[Q])n.set(r,o);break}}return{set(r,o){if(!P(r))throw L;return n.set(r,o),this},get(r){if(!P(r))throw L;if(!n.has(r))n.set(r,r());return n.get(r)},del(r){return n.delete(r),this},has(r){return n.has(r)},keys(){return n.keys()},get length(){return Array.from(n.keys()).length},[Q]:n}}var Z=Symbol("field");function Rt(t){let n={required:typeof t!=="undefined",alias:new Map,validators:[],asyncValidator:[]},r=()=>t;return Object.defineProperty(r,Z,{value:n}),r.withJson=(o)=>{return n.alias.set(0,o),r},r.withForm=(o)=>{return n.alias.set(4,o),r},r.withQuery=(o)=>{return n.alias.set(1,o),r},r.withParam=(o)=>{return n.alias.set(2,o),r},r.withHeader=(o)=>{return n.alias.set(3,o),r},r.withUrlForm=(o)=>{return n.alias.set(6,o),r},r.withBody=()=>{return n.alias.set(5,void 0),r},r.withValidators=(...o)=>{return n.validators=o,r},r.withAsyncValidators=(...o)=>{return n.asyncValidator=o,r},r}function G(t){return t[Z]}async function V(t,n){await Promise.all(t.map((r)=>r(n)))}function M(t){return!!t&&typeof t==="function"&&Z in t}function g(t){return!!t&&typeof t==="object"&&Object.entries(t).every(([,n])=>M(n))}var ft=void 0;var a=()=>ft;function q(t){return t.reduceRight((n,r)=>{return(o,T)=>r(o,(H)=>n(H,T))},(n,r)=>r(n))}function v(t){switch(!0){case t instanceof FormData:case t instanceof Blob:case t instanceof ArrayBuffer:case t instanceof URLSearchParams:case typeof t==="string":return t;case typeof t==="object":case typeof t==="boolean":case typeof t==="number":case Array.isArray(t):return JSON.stringify(t);default:return null}}function tt(t){switch(!0){case t instanceof FormData:case t instanceof URLSearchParams:return null;case t instanceof ArrayBuffer:return"application/octet-stream";case t instanceof Blob:return t.type||"application/octet-stream";case typeof t==="string":return"text/plain";case(typeof t==="object"&&t!==null):case typeof t==="number":case typeof t==="boolean":return"application/json";default:return null}}function kt(t){if(g(t)){let n={};for(let[r,o]of Object.entries(t))n[r]=o();return n}return}function st(...t){let n,r,o=!1,T,H=[],f="json",i,e=!1,p=[],w;switch(t.length){case 1:{n="GET",r=t[0];break}case 2:{n=t[0],r=t[1];break}default:throw new Error("Invalid arguments")}let c=(x)=>{let R=x?.timeout||0,k=x?.client||S(),E=z(k),s=x?.handler||E?.handler||a();if(!s)throw y;let m,I,h,_=[];if(x?.abort)_.push(x.abort);else h=new AbortController,_.push(h.signal);if(R>0)_.push(AbortSignal.timeout(R));return{doRequest:async(...F)=>{try{let U;if(o&&F.length===1)U=F[0];if(o&&!U)throw new Error("Because the request has input, the argument must be the input value");if(p.length>0)for(let ct of p)ct(U);let b={host:E?.host,method:n,endpoint:r,queryParams:new URLSearchParams,headers:new Headers,body:void 0,withCredentials:e,responseType:f,context:i||Y(),uploadProgress:m,downloadProgress:I,timeout:R,abort:AbortSignal.any(_)};if(o&&T)await Ct(b,T,U);let D=await q([...E.interceptors,...H])(b,s);if(typeof w==="function")D=N({...D,body:w(D)});return D}catch(U){return N({error:U})}},cancel:()=>{h?.abort()},getInitValue:()=>kt(T),setUploadProgress:(F)=>{m=F},setDownloadProgress:(F)=>{I=F}}};return c.withField=(x)=>{return T=x,o=!0,c},c.withInterceptors=(x)=>{return H=x,c},c.withContext=(x)=>{return i=x,c},c.withCredentials=(x)=>{return e=x,c},c.withValidators=(...x)=>{return p=x,c},c.withTransformResponse=(x)=>{return w=x,c},c.withResponseType=(x)=>{return f=x,c},c}function l(t,n){return t.replace(/:([^\/]+)/g,(r,o)=>{return n.get(o)??"undefined"})}async function Ct(t,n,r){function o(e){return typeof e==="object"&&e!==null}function T(e){switch(!0){case Array.isArray(e):case(typeof e==="object"&&e!==null):return JSON.stringify(e);case(typeof e==="object"&&e===null):case typeof e==="boolean":case typeof e==="number":case typeof e==="string":return String(e);default:throw new Error("Unsupported value type")}}function H(e,p,w){if(Array.isArray(w))for(let c of w)e.append(p,T(c));else e.set(p,T(w));return e}function f(e,p,w){if(Array.isArray(w))for(let c of w)f(e,p,T(c));return e.set(p,T(w)),e}function i(e,p){switch(!0){case typeof e==="undefined":return p;case(typeof e==="object"&&e===null):return e;default:return e}}if(M(n)){let e,p,w,c=void 0,x=i(r,n()),R=G(n);await V([...R.validators,...R.asyncValidator],x);for(let[k,E]of R.alias)switch(k){case 1:{if(!E)throw A;p=H(new URLSearchParams,E,x);break}case 2:{if(!E)throw A;e=f(new Map,E,x);break}case 3:{if(!E)throw A;w=H(new Headers,E,x);break}case 4:{if(!E)throw A;c=H(new FormData,E,x);break}case 6:{if(!E)throw A;c=H(new URLSearchParams,E,x);break}case 0:case 5:c=x;break}if(e)t.endpoint=l(t.endpoint,e);t.queryParams=p,t.headers=w,t.body=c;return}if(g(n)&&o(r)){let e=new Map,p=new URLSearchParams,w=new Headers,c=new URLSearchParams,x=new FormData,R={},k=void 0,E;for(let[s,m]of Object.entries(n)){let I=G(m);for(let[h,_]of I.alias){let O=_||s,C=i(r[s],m());switch(await V([...I.validators,...I.asyncValidator],C),h){case 0:{Object.defineProperty(R,O,{value:C,writable:!0,enumerable:!0}),E=0;break}case 1:p=H(p,O,C);break;case 2:e=f(e,O,C);break;case 3:w=H(w,O,C);break;case 4:{x=H(x,O,C),E=4;break}case 6:{c=H(c,O,C),E=6;break}case 5:{k=C,E=5;break}}}}switch(t.endpoint=l(t.endpoint,e),t.queryParams=p,t.headers=w,E){case 5:t.body=k;break;case 4:t.body=x;break;case 6:t.body=c;break;case 0:t.body=R;break}return}throw W}function nt(t){let n=t.get("Content-Length");if(!n)return 0;let r=Number(n);if(isNaN(r))return 0;return r}function rt(t){return t.get("Content-Type")||""}function ot(t){let{request:n,content:r,contentType:o}=t;switch(n.responseType){case"json":{let H=new TextDecoder().decode(r);if(H==="")return null;return JSON.parse(H)}case"text":return new TextDecoder().decode(r);case"blob":return new Blob([r],{type:o});case"arraybuffer":return r.buffer;default:return null}}function et(t,n){let r=new Uint8Array(n),o=0;for(let T of t)r.set(T,o),o+=T.length;return r}function Nt(t){let n=new URL(t.endpoint,t.host);if(t.queryParams)n.search=t.queryParams.toString();let r=t.headers??new Headers;if(!r.has("Content-Type")){let T=tt(t.body);if(T)r.set("Content-Type",T)}if(!r.has("Accept"))r.set("Accept","application/json, text/plain, */*");let o=t.withCredentials?"include":void 0;return new Request(n,{headers:r,method:t.method,body:v(t.body),signal:t.abort,credentials:o})}async function u(t){let n=t.downloadProgress,r=Nt(t),o=t.abort,T;try{T=await globalThis.fetch(r)}catch(x){if(o?.aborted&&o.reason instanceof Error)switch(!0){case o.reason.name==="AbortError":return N({error:K});case o.reason.name==="TimeoutError":return N({error:X})}return N({error:x})}let{headers:H,status:f,statusText:i,url:e}=T,p=nt(H),w=rt(H),c=null;if(T.body){let x=[],R=T.body.getReader(),k=0;while(!0){let{done:s,value:m}=await R.read();if(s)break;x.push(m),k+=m.length,n?.({lengthComputable:p>0,loaded:k,total:p})}let E=et(x,k);try{c=ot({request:t,content:E,contentType:w})}catch(s){return N({error:s,status:f,statusText:i,headers:H,url:e})}}return N({status:f,statusText:i,headers:H,url:e,body:c})}var $=Symbol("Client"),B;function xt(t){return typeof t==="object"&&t!==null&&$ in t}function z(t){if(!xt(t))throw J;return t[$]}function Tt(t){let n={host:t.host,interceptors:t.interceptors??[],handler:t.handler||u};return{[$]:n}}function mt(t,n){let o={...z(t),...n};return{[$]:o}}function S(){if(!B)throw j;return B}function Ot(t){B=t}function At(){B=void 0}function It(t){B=Tt(t)}function _t(t,n){let r=n?.encode;if(!r){let o=globalThis.btoa;if(typeof o!=="function")throw new Error("BasicAuthInterceptor is not supported in this environment");r=(T)=>o(`${T.username}:${T.password}`)}return(o,T)=>{let H=o.headers||new Headers;return H.set("Authorization",`Basic ${r(t())}`),o.headers=H,T(o)}}var Ft=(t)=>{if(!t)return new Error("required");return null},Ut=(t)=>{if(typeof t!=="boolean"||!t)return new Error("requiredTrue");return null},ht=(t)=>{return(n)=>{if(typeof n!=="string")return new Error("invalid string");if(n.length<t)return new Error(`minLength ${t}`);return null}},Bt=(t)=>{return(n)=>{if(typeof n!=="string")return new Error("invalid string");if(n.length>t)return new Error(`maxLength ${t}`);return null}},Dt=(t)=>{return(n)=>{if(typeof n!=="number"||isNaN(n))return new Error("invalid number");if(n<t)return new Error(`minLength ${t}`);return null}},Lt=(t)=>{return(n)=>{if(typeof n!=="number"||isNaN(n))return new Error("invalid number");if(n>t)return new Error(`maxLength ${t}`);return null}},Pt=(t)=>{return(n)=>{if(typeof n!=="string")return new Error("invalid string");if(!t.test(n))return new Error("pattern");return null}};export{Ot as setGlobalClient,At as restGlobalClient,Ut as requiredTrue,Ft as required,Pt as pattern,ht as minLength,Dt as min,Bt as maxLength,Lt as max,wt as makeHttpContextToken,Y as makeHttpContext,P as isHttpContextToken,g as isFieldGroup,M as isField,xt as isClient,S as getGlobalClient,Rt as field,u as fetchHandler,V as doValid,st as defineRequest,It as createGlobalClient,Tt as createClient,mt as cloneClient,_t as basicAuthInterceptor,W as ERR_UNSUPPORTED_FIELD_TYPE,pt as ERR_UNKNOWN,X as ERR_TIMEOUT,Et as ERR_OBSERVE,A as ERR_NOT_SET_ALIAS,y as ERR_NOT_FOUND_HANDLER,j as ERR_NOT_FOUND_GLOBAL_CLIENT,Ht as ERR_NETWORK,L as ERR_INVALID_HTTP_CONTEXT_TOKEN,J as ERR_INVALID_CLIENT,K as ERR_ABORTED};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defjs/core",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "type": "module",
   "module": "index.js",
   "typings": "index.d.ts",