@defjs/core 0.1.0 → 0.3.0

package/index.d.ts

@@ -63,6 +63,17 @@ export declare function field<T>(defaultValue: T): Field<T>;
 export declare function doValid<T>(validators: (ValidatorFn<T> | AsyncValidatorFn<T>)[], value: T): Promise<void>;
 export declare function isField(value: unknown): value is Field;
 export declare function isFieldGroup(value: unknown): value is Record<PropertyKey, Field>;
+export declare const ERR_ABORTED: Error;
+export declare const ERR_TIMEOUT: Error;
+export declare const ERR_NETWORK: Error;
+export declare const ERR_NOT_FOUND_HANDLER: Error;
+export declare const ERR_OBSERVE: Error;
+export declare const ERR_NOT_SET_ALIAS: Error;
+export declare const ERR_UNSUPPORTED_FIELD_TYPE: Error;
+export declare const ERR_INVALID_CLIENT: Error;
+export declare const ERR_NOT_FOUND_GLOBAL_CLIENT: Error;
+export declare const ERR_INVALID_HTTP_CONTEXT_TOKEN: Error;
+export declare const ERR_UNKNOWN: Error;
 export type HttpResponseBody = string | ArrayBuffer | Blob | object | null;
 export type HttpResponse<R> = {
 	readonly url: string;
@@ -70,6 +81,7 @@ export type HttpResponse<R> = {
 	readonly statusText: string;
 	readonly headers: Headers;
 	readonly body: R | null;
+	readonly error?: Error | string | unknown;
 };
 export type MakeResponseOptions<R> = {
 	status?: number;
@@ -77,6 +89,7 @@ export type MakeResponseOptions<R> = {
 	url?: string;
 	headers?: Headers;
 	body?: R | null;
+	error?: Error | string | unknown;
 };
 export type InterceptorFn = (req: HttpRequest, next: HttpHandler) => Promise<HttpResponse<unknown>>;
 export type BasicCredential = {
@@ -119,10 +132,6 @@ export interface HttpRequest {
 	/** when use fetch handler, no upload progress */
 	uploadProgress?: HttpProgressFn;
 	downloadProgress?: HttpProgressFn;
-	/**
-	 * default：body
-	 */
-	observe?: "body" | "response";
 	abort?: AbortSignal;
 }
 export type RequestInputValue<T> = T extends Field<infer V> ? V : T extends {
@@ -130,15 +139,15 @@ export type RequestInputValue<T> = T extends Field<infer V> ? V : T extends {
 } ? {
 	[K in keyof T]: RequestInputValue<T[K]>;
 } : never;
-export type DoRequestOptions = {
+export type UseRequestOptions = {
 	abort?: AbortSignal;
 	handler?: HttpHandler;
 	client?: Client;
 	timeout?: number;
 };
-export type ObserveType<Observe, Output> = Observe extends "body" ? Output : Observe extends "response" ? HttpResponse<Output> : never;
-export type UseRequestFn<Input, Output, Observe> = {
-	doRequest: Input extends undefined ? (options?: DoRequestOptions) => Promise<ObserveType<Observe, Output>> : RequestInputValue<Input> extends RequestInputValue<Input> | undefined ? (input?: RequestInputValue<Input>, options?: DoRequestOptions) => Promise<ObserveType<Observe, Output>> : (input: RequestInputValue<Input>, options?: DoRequestOptions) => Promise<ObserveType<Observe, Output>>;
+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>;
 	} ? {
@@ -147,20 +156,18 @@ export type UseRequestFn<Input, Output, Observe> = {
 	setUploadProgress: (fn: HttpProgressFn) => void;
 	setDownloadProgress: (fn: HttpProgressFn) => void;
 };
-export interface DefineRequest<Input extends Field<any> | Record<PropertyKey, Field<any>> | undefined = undefined, Output = unknown, Observe extends "body" | "response" = "body"> {
-	(): UseRequestFn<Input, Output, Observe>;
-	withField<I extends Field<any> | Record<PropertyKey, Field<any>>>(value: I): DefineRequest<I, Output, Observe>;
-	withInterceptors(value: InterceptorFn[]): DefineRequest<Input, Output, Observe>;
-	withContext(value: HttpContext): DefineRequest<Input, Output, Observe>;
-	withCredentials(value: boolean): DefineRequest<Input, Output, Observe>;
-	withValidators(value: (ValidatorFn<RequestInputValue<Input>> | AsyncValidatorFn<RequestInputValue<Input>>)[]): DefineRequest<Input, Output, Observe>;
-	withTransformResponse<O>(fn: TransformResponseFn<O>): DefineRequest<Input, O, Observe>;
-	withObserve(value: "body"): DefineRequest<Input, Output, "body">;
-	withObserve(value: "response"): DefineRequest<Input, Output, "response">;
-	withResponseType(value: "json"): DefineRequest<Input, Output, Observe>;
-	withResponseType(value: "text"): DefineRequest<Input, string, Observe>;
-	withResponseType(value: "blob"): DefineRequest<Input, Blob, Observe>;
-	withResponseType(value: "arraybuffer"): DefineRequest<Input, ArrayBuffer, Observe>;
+export interface DefineRequest<Input extends Field<any> | 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>;
+	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>;
+	withTransformResponse<O>(fn: TransformResponseFn<O>): DefineRequest<Input, O>;
+	withResponseType(value: "json"): DefineRequest<Input, Output>;
+	withResponseType(value: "text"): DefineRequest<Input, string>;
+	withResponseType(value: "blob"): DefineRequest<Input, Blob>;
+	withResponseType(value: "arraybuffer"): DefineRequest<Input, ArrayBuffer>;
 }
 export declare function defineRequest<Output>(endpoint: string): DefineRequest<undefined, Output>;
 export declare function defineRequest<Output>(method: string, endpoint: string): DefineRequest<undefined, Output>;
@@ -168,17 +175,14 @@ export type HttpHandler = (req: HttpRequest) => Promise<HttpResponse<unknown>>;
 export declare function fetchHandler(httpRequest: HttpRequest): Promise<HttpResponse<unknown>>;
 export interface ClientOptions {
 	host: string;
-	/** Default: true  */
-	strict?: boolean;
 	interceptors?: InterceptorFn[];
 	handler?: HttpHandler;
 }
-export interface ClientConfig {
+export type ClientConfig = {
 	host: string;
-	strict: boolean;
 	handler: HttpHandler;
-	interceptors?: InterceptorFn[];
-}
+	interceptors: InterceptorFn[];
+};
 declare const CLIENT: unique symbol;
 export type Client = {
 	readonly [CLIENT]: ClientConfig;
@@ -190,31 +194,5 @@ export declare function getGlobalClient(): Client;
 export declare function setGlobalClient(client: Client): void;
 export declare function restGlobalClient(): void;
 export declare function createGlobalClient(options: ClientOptions): void;
-export declare const ERR_ABORTED: Error;
-export declare const ERR_TIMEOUT: Error;
-export declare const ERR_NETWORK: Error;
-export declare const ERR_NOT_FOUND_HANDLER: Error;
-export declare const ERR_OBSERVE: Error;
-export declare const ERR_NOT_SET_ALIAS: Error;
-export declare const ERR_UNSUPPORTED_FIELD_TYPE: Error;
-export declare const ERR_INVALID_CLIENT: Error;
-export declare const ERR_NOT_FOUND_GLOBAL_CLIENT: Error;
-export declare const ERR_INVALID_HTTP_CONTEXT_TOKEN: Error;
-export declare const ERR_UNKNOWN: Error;
-export declare class HttpErrorResponse extends Error {
-	readonly status: number;
-	readonly statusText: string;
-	readonly url: string;
-	readonly headers: Headers;
-	readonly body: unknown;
-	constructor(init?: {
-		error?: Error | string | unknown;
-		status?: number;
-		statusText?: string;
-		url?: string;
-		headers?: Headers;
-		body?: unknown;
-	});
-}
 
 export {};

package/index.js

@@ -1,48 +1,3 @@
-// src/error.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");
-
-class HttpErrorResponse extends Error {
-  status;
-  statusText;
-  url;
-  headers;
-  body;
-  constructor(init) {
-    const status = init?.status ?? 0;
-    const statusText = init?.statusText ?? "";
-    const ok = status >= 200 && status < 300;
-    const headers = init?.headers ?? new Headers;
-    const url = init?.url ?? "";
-    const body = init?.body ?? null;
-    let message;
-    if (ok) {
-      message = `Http failure during parsing for ${url}`;
-    } else {
-      message = `Http failure response for ${url || "(unknown url)"}: ${status}`;
-      if (statusText) {
-        message += ` - ${statusText}`;
-      }
-    }
-    super(message, { cause: init?.error });
-    super.name = "HttpErrorResponse";
-    this.statusText = statusText;
-    this.url = url;
-    this.headers = headers;
-    this.status = status;
-    this.body = body;
-  }
-}
-
 // src/handler/util.ts
 function __getContentLength(headers) {
   const value = headers.get("Content-Length");
@@ -90,6 +45,43 @@ function __concatChunks(chunks, totalLength) {
   return chunksAll;
 }
 
+// src/response.ts
+function __makeResponse(options) {
+  const status = options?.status ?? 0;
+  const ok = status >= 200 && status < 300;
+  const statusText = options?.statusText ?? "";
+  const url = options?.url ?? "";
+  const headers = options?.headers ?? new Headers;
+  const body = options?.body ?? null;
+  let error = options?.error;
+  if (!error && !ok) {
+    let message = `Http failure response for ${url || "(unknown url)"}: ${status}`;
+    if (statusText) {
+      message += ` - ${statusText}`;
+    }
+    error = new Error(message);
+  }
+  return {
+    status,
+    statusText,
+    url,
+    headers,
+    body,
+    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
 function makeHttpContextToken(defaultValue) {
   Object.defineProperty(defaultValue, HTTP_CONTEXT_TOKEN, { value: defaultValue });
@@ -230,22 +222,6 @@ function makeInterceptorChain(interceptors) {
   }, (req, fn) => fn(req));
 }
 
-// src/response.ts
-function __makeResponse(options) {
-  const status = options?.status ?? 0;
-  const statusText = options?.statusText ?? "";
-  const url = options?.url ?? "";
-  const headers = options?.headers ?? new Headers;
-  const body = options?.body ?? null;
-  return {
-    status,
-    statusText,
-    url,
-    headers,
-    body
-  };
-}
-
 // src/request.ts
 function __serializeBody(body) {
   switch (true) {
@@ -307,7 +283,6 @@ function defineRequest(...args) {
   let interceptors = [];
   let responseType = "json";
   let context2;
-  let observe = "body";
   let withCredentials = false;
   let validators = [];
   let transformResponse;
@@ -325,10 +300,30 @@ function defineRequest(...args) {
     default:
       throw new Error("Invalid arguments");
   }
-  const fn = () => {
+  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) {
+      throw ERR_NOT_FOUND_HANDLER;
+    }
     let uploadProgress;
     let downloadProgress;
-    let abortSignal;
+    let abortController;
+    const abortSignal = [];
+    if (options?.abort) {
+      abortSignal.push(options.abort);
+    } else {
+      abortController = new AbortController;
+      abortSignal.push(abortController.signal);
+    }
+    if (timeout > 0) {
+      abortSignal.push(AbortSignal.timeout(timeout));
+    }
+    const cancel = () => {
+      abortController?.abort();
+    };
     const getInitValue = () => __buildFieldDefaultValue(field3);
     const setUploadProgress = (fn2) => {
       uploadProgress = fn2;
@@ -337,85 +332,53 @@ function defineRequest(...args) {
       downloadProgress = fn2;
     };
     const doRequest = async (...args2) => {
-      let input;
-      let doRequestOptions;
-      switch (args2.length) {
-        case 1: {
-          if (requiredInput) {
-            input = args2[0];
-          } else {
-            doRequestOptions = args2[0];
-          }
-          break;
-        }
-        case 2: {
+      try {
+        let input;
+        if (requiredInput && args2.length === 1) {
           input = args2[0];
-          doRequestOptions = args2[1];
-          break;
         }
-      }
-      if (requiredInput && !input) {
-        throw new Error(`Because the request has input, the first argument must be the input value`);
-      }
-      if (validators.length > 0) {
-        for (const fn2 of validators) {
-          fn2(input);
+        if (requiredInput && !input) {
+          throw new Error(`Because the request has input, the argument must be the input value`);
         }
-      }
-      const timeout = doRequestOptions?.timeout || 0;
-      if (doRequestOptions?.abort) {
-        abortSignal = doRequestOptions.abort;
-      } else if (timeout > 0) {
-        abortSignal = AbortSignal.timeout(timeout);
-      }
-      const client2 = isClient(doRequestOptions?.client) ? doRequestOptions.client : getGlobalClient();
-      const clientOptions = getClientConfig(client2);
-      const req = {
-        host: clientOptions?.host,
-        method,
-        endpoint,
-        queryParams: new URLSearchParams,
-        headers: new Headers,
-        body: undefined,
-        withCredentials,
-        responseType,
-        context: context2 || makeHttpContext(),
-        observe,
-        uploadProgress,
-        downloadProgress,
-        timeout,
-        abort: abortSignal
-      };
-      const handler2 = doRequestOptions?.handler || clientOptions?.handler || getGlobalHttpHandler();
-      if (!handler2) {
-        throw ERR_NOT_FOUND_HANDLER;
-      }
-      if (requiredInput && field3) {
-        await __fillRequestFromField(req, field3, input);
-      }
-      const chain = makeInterceptorChain([...interceptors]);
-      let res = await chain(req, handler2);
-      if (typeof transformResponse === "function") {
-        try {
+        if (validators.length > 0) {
+          for (const fn2 of validators) {
+            fn2(input);
+          }
+        }
+        const req = {
+          host: clientOptions?.host,
+          method,
+          endpoint,
+          queryParams: new URLSearchParams,
+          headers: new Headers,
+          body: undefined,
+          withCredentials,
+          responseType,
+          context: context2 || makeHttpContext(),
+          uploadProgress,
+          downloadProgress,
+          timeout,
+          abort: AbortSignal.any(abortSignal)
+        };
+        if (requiredInput && field3) {
+          await __fillRequestFromField(req, field3, input);
+        }
+        const chain = makeInterceptorChain([...clientOptions.interceptors, ...interceptors]);
+        let res = await chain(req, handler2);
+        if (typeof transformResponse === "function") {
           res = __makeResponse({
             ...res,
             body: transformResponse(res)
           });
-        } catch (error3) {
-          throw new HttpErrorResponse({ error: error3 });
         }
-      }
-      switch (req.observe) {
-        case "body":
-          return res.body;
-        case "response":
-          return res;
-        default:
-          throw ERR_OBSERVE;
+        return res;
+      } catch (error) {
+        return __makeResponse({ error });
       }
     };
     return {
       doRequest,
+      cancel,
       getInitValue,
       setUploadProgress,
       setDownloadProgress
@@ -446,10 +409,6 @@ function defineRequest(...args) {
     transformResponse = value;
     return fn;
   };
-  fn.withObserve = (value) => {
-    observe = value;
-    return fn;
-  };
   fn.withResponseType = (value) => {
     responseType = value;
     return fn;
@@ -670,27 +629,27 @@ async function fetchHandler(httpRequest) {
   const downloadProgress = httpRequest.downloadProgress;
   const request2 = __createRequest(httpRequest);
   const abortSignal = httpRequest.abort;
-  let response3;
+  let response4;
   try {
-    response3 = await globalThis.fetch(request2);
-  } catch (error4) {
+    response4 = await globalThis.fetch(request2);
+  } catch (error) {
     if (abortSignal?.aborted && abortSignal.reason instanceof Error) {
       switch (true) {
         case abortSignal.reason.name === "AbortError":
-          throw new HttpErrorResponse({ error: ERR_ABORTED });
+          return __makeResponse({ error: ERR_ABORTED });
         case abortSignal.reason.name === "TimeoutError":
-          throw new HttpErrorResponse({ error: ERR_TIMEOUT });
+          return __makeResponse({ error: ERR_TIMEOUT });
       }
     }
-    throw new HttpErrorResponse({ error: error4 });
+    return __makeResponse({ error });
   }
-  const { ok, headers, status, statusText, url } = response3;
+  const { headers, status, statusText, url } = response4;
   const contentLength = __getContentLength(headers);
   const contentType = __getContentType(headers);
   let body = null;
-  if (response3.body) {
+  if (response4.body) {
     const chunks = [];
-    const reader = response3.body.getReader();
+    const reader = response4.body.getReader();
     let receivedLength = 0;
     while (true) {
       const { done, value } = await reader.read();
@@ -712,9 +671,9 @@ async function fetchHandler(httpRequest) {
         content: chunksAll,
         contentType
       });
-    } catch (error4) {
-      throw new HttpErrorResponse({
-        error: error4,
+    } catch (error) {
+      return __makeResponse({
+        error,
         status,
         statusText,
         headers,
@@ -722,20 +681,11 @@ async function fetchHandler(httpRequest) {
       });
     }
   }
-  if (!ok) {
-    throw new HttpErrorResponse({
-      status,
-      statusText,
-      headers,
-      url,
-      body
-    });
-  }
   return __makeResponse({
-    url,
     status,
     statusText,
     headers,
+    url,
     body
   });
 }
@@ -752,7 +702,6 @@ function getClientConfig(client2) {
 function createClient(options) {
   const conf = {
     host: options.host,
-    strict: options.strict ?? true,
     interceptors: options.interceptors ?? [],
     handler: options.handler || fetchHandler
   };
@@ -897,7 +846,6 @@ export {
   createClient,
   cloneClient,
   basicAuthInterceptor,
-  HttpErrorResponse,
   ERR_UNSUPPORTED_FIELD_TYPE,
   ERR_UNKNOWN,
   ERR_TIMEOUT,

package/index.min.js

@@ -1 +1 @@
-var X=new Error("ERR_ABORTED"),W=new Error("ERR_TIMEOUT"),wt=new Error("ERR_NETWORK"),J=new Error("ERR_NOT_FOUND_HANDLER"),j=new Error("ERR_OBSERVE"),h=new Error("ERR_NOT_SET_ALIAS"),Q=new Error("ERR_UNSUPPORTED_FIELD_TYPE"),Y=new Error("ERR_INVALID_CLIENT"),Z=new Error("ERR_NOT_FOUND_GLOBAL_CLIENT"),B=new Error("ERR_INVALID_HTTP_CONTEXT_TOKEN"),it=new Error("ERR_UNKNOWN");class m extends Error{status;statusText;url;headers;body;constructor(t){const n=t?.status??0,r=t?.statusText??"",o=n>=200&&n<300,T=t?.headers??new Headers,H=t?.url??"",f=t?.body??null;let R;if(o)R=`Http failure during parsing for ${H}`;else if(R=`Http failure response for ${H||"(unknown url)"}: ${n}`,r)R+=` - ${r}`;super(R,{cause:t?.error});super.name="HttpErrorResponse",this.statusText=r,this.url=H,this.headers=T,this.status=n,this.body=f}}function tt(t){const n=t.get("Content-Length");if(!n)return 0;const r=Number(n);if(isNaN(r))return 0;return r}function nt(t){return t.get("Content-Type")||""}function rt(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 ot(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 ft(t){return Object.defineProperty(t,et,{value:t}),t}function D(t){return typeof t==="function"&&et in t}function Rt(t){return typeof t==="object"&&t!==null&&u in t}function G(t){const n=new Map;switch(!0){case Array.isArray(t):{for(let[r,o]of t)if(D(r))n.set(r,o);break}case Rt(t):{for(let[r,o]of t[u])n.set(r,o);break}}return{set(r,o){if(!D(r))throw B;return n.set(r,o),this},get(r){if(!D(r))throw B;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},[u]:n}}var et=Symbol("HttpContextToken"),u=Symbol("HttpContext");function kt(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 a(t){return t[z]}async function L(t,n){await Promise.all(t.map((r)=>r(n)))}function F(t){return!!t&&typeof t==="function"&&z in t}function P(t){return!!t&&typeof t==="object"&&Object.entries(t).every(([,n])=>F(n))}var z=Symbol("field");var Ct=void 0;var xt=()=>Ct;function Tt(t){return t.reduceRight((n,r)=>{return(o,T)=>r(o,(H)=>n(H,T))},(n,r)=>r(n))}function y(t){const n=t?.status??0,r=t?.statusText??"",o=t?.url??"",T=t?.headers??new Headers,H=t?.body??null;return{status:n,statusText:r,url:o,headers:T,body:H}}function Ht(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 pt(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 mt(t){if(F(t))return t();if(P(t)){const n={};for(let[r,o]of Object.entries(t))n[r]=o();return n}return}function Nt(...t){let n,r,o=!1,T,H=[],f="json",R,e="body",E=!1,s=[],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 x=()=>{let c,N,p;return{doRequest:async(...C)=>{let k,i;switch(C.length){case 1:{if(o)k=C[0];else i=C[0];break}case 2:{k=C[0],i=C[1];break}}if(o&&!k)throw new Error("Because the request has input, the first argument must be the input value");if(s.length>0)for(let K of s)K(k);const $=i?.timeout||0;if(i?.abort)p=i.abort;else if($>0)p=AbortSignal.timeout($);const st=V(i?.client)?i.client:b(),l=S(st),g={host:l?.host,method:n,endpoint:r,queryParams:new URLSearchParams,headers:new Headers,body:void 0,withCredentials:E,responseType:f,context:R||G(),observe:e,uploadProgress:c,downloadProgress:N,timeout:$,abort:p},v=i?.handler||l?.handler||xt();if(!v)throw J;if(o&&T)await _t(g,T,k);let I=await Tt([...H])(g,v);if(typeof w==="function")try{I=y({...I,body:w(I)})}catch(K){throw new m({error:K})}switch(g.observe){case"body":return I.body;case"response":return I;default:throw j}},getInitValue:()=>mt(T),setUploadProgress:(C)=>{c=C},setDownloadProgress:(C)=>{N=C}}};return x.withField=(c)=>{return T=c,o=!0,x},x.withInterceptors=(c)=>{return H=c,x},x.withContext=(c)=>{return R=c,x},x.withCredentials=(c)=>{return E=c,x},x.withValidators=(c)=>{return s=c,x},x.withTransformResponse=(c)=>{return w=c,x},x.withObserve=(c)=>{return e=c,x},x.withResponseType=(c)=>{return f=c,x},x}function ct(t,n){return t.replace(/:([^\/]+)/g,(r,o)=>{return n.get(o)??"undefined"})}async function _t(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,E,s){if(Array.isArray(s))for(let w of s)e.append(E,T(w));else e.set(E,T(s));return e}function f(e,E,s){if(Array.isArray(s))for(let w of s)f(e,E,T(w));return e.set(E,T(s)),e}function R(e,E){switch(!0){case typeof e==="undefined":return E;case(typeof e==="object"&&e===null):return e;default:return e}}if(F(n)){let e,E,s,w=void 0;const x=R(r,n()),c=a(n);await L([...c.validators,...c.asyncValidator],x);for(let[N,p]of c.alias)switch(N){case 1:{if(!p)throw h;E=H(new URLSearchParams,p,x);break}case 2:{if(!p)throw h;e=f(new Map,p,x);break}case 3:{if(!p)throw h;s=H(new Headers,p,x);break}case 4:{if(!p)throw h;w=H(new FormData,p,x);break}case 6:{if(!p)throw h;w=H(new URLSearchParams,p,x);break}case 0:case 5:w=x;break}if(e)t.endpoint=ct(t.endpoint,e);t.queryParams=E,t.headers=s,t.body=w;return}if(P(n)&&o(r)){let e=new Map,E=new URLSearchParams,s=new Headers,w=new URLSearchParams,x=new FormData;const c={};let N=void 0,p;for(let[O,_]of Object.entries(n)){const A=a(_);for(let[q,C]of A.alias){const k=C||O,i=R(r[O],_());switch(await L([...A.validators,...A.asyncValidator],i),q){case 0:{Object.defineProperty(c,k,{value:i,writable:!0,enumerable:!0}),p=0;break}case 1:E=H(E,k,i);break;case 2:e=f(e,k,i);break;case 3:s=H(s,k,i);break;case 4:{x=H(x,k,i),p=4;break}case 6:{w=H(w,k,i),p=6;break}case 5:{N=i,p=5;break}}}}switch(t.endpoint=ct(t.endpoint,e),t.queryParams=E,t.headers=s,p){case 5:t.body=N;break;case 4:t.body=x;break;case 6:t.body=w;break;case 0:t.body=c;break}return}throw Q}function At(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=pt(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:Ht(t.body),signal:t.abort,credentials:o})}async function d(t){const n=t.downloadProgress,r=At(t),o=t.abort;let T;try{T=await globalThis.fetch(r)}catch(c){if(o?.aborted&&o.reason instanceof Error)switch(!0){case o.reason.name==="AbortError":throw new m({error:X});case o.reason.name==="TimeoutError":throw new m({error:W})}throw new m({error:c})}const{ok:H,headers:f,status:R,statusText:e,url:E}=T,s=tt(f),w=nt(f);let x=null;if(T.body){const c=[],N=T.body.getReader();let p=0;while(!0){const{done:_,value:A}=await N.read();if(_)break;c.push(A),p+=A.length,n?.({lengthComputable:s>0,loaded:p,total:s})}const O=ot(c,p);try{x=rt({request:t,content:O,contentType:w})}catch(_){throw new m({error:_,status:R,statusText:e,headers:f,url:E})}}if(!H)throw new m({status:R,statusText:e,headers:f,url:E,body:x});return y({url:E,status:R,statusText:e,headers:f,body:x})}function V(t){return typeof t==="object"&&t!==null&&M in t}function S(t){if(!V(t))throw Y;return t[M]}function Et(t){const n={host:t.host,strict:t.strict??!0,interceptors:t.interceptors??[],handler:t.handler||d};return{[M]:n}}function ht(t,n){const o={...S(t),...n};return{[M]:o}}function b(){if(!U)throw Z;return U}function Ot(t){U=t}function It(){U=void 0}function Ft(t){U=Et(t)}var M=Symbol("Client"),U;function Ut(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 Bt=(t)=>{if(!t)return new Error("required");return null},Dt=(t)=>{if(typeof t!=="boolean"||!t)return new Error("requiredTrue");return null},Lt=(t)=>{return(n)=>{if(typeof n!=="string")return new Error("invalid string");if(n.length<t)return new Error(`minLength ${t}`);return null}},Pt=(t)=>{return(n)=>{if(typeof n!=="string")return new Error("invalid string");if(n.length>t)return new Error(`maxLength ${t}`);return null}},yt=(t)=>{return(n)=>{if(typeof n!=="number"||isNaN(n))return new Error("invalid number");if(n<t)return new Error(`minLength ${t}`);return null}},Vt=(t)=>{return(n)=>{if(typeof n!=="number"||isNaN(n))return new Error("invalid number");if(n>t)return new Error(`maxLength ${t}`);return null}},Mt=(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,It as restGlobalClient,Dt as requiredTrue,Bt as required,Mt as pattern,Lt as minLength,yt as min,Pt as maxLength,Vt as max,ft as makeHttpContextToken,G as makeHttpContext,D as isHttpContextToken,P as isFieldGroup,F as isField,V as isClient,b as getGlobalClient,kt as field,d as fetchHandler,L as doValid,Nt as defineRequest,Ft as createGlobalClient,Et as createClient,ht as cloneClient,Ut as basicAuthInterceptor,m as HttpErrorResponse,Q as ERR_UNSUPPORTED_FIELD_TYPE,it as ERR_UNKNOWN,W as ERR_TIMEOUT,j as ERR_OBSERVE,h as ERR_NOT_SET_ALIAS,J as ERR_NOT_FOUND_HANDLER,Z as ERR_NOT_FOUND_GLOBAL_CLIENT,wt as ERR_NETWORK,B as ERR_INVALID_HTTP_CONTEXT_TOKEN,Y as ERR_INVALID_CLIENT,X as ERR_ABORTED};
+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};

package/package.json

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