@defjs/core 0.0.0-test-000 → 0.0.0-test-002

package/index.d.ts

@@ -20,7 +20,7 @@ export declare const minLength: (min: number) => ValidatorFn;
 export declare const maxLength: (max: number) => ValidatorFn;
 export declare const min: (min: number) => ValidatorFn;
 export declare const max: (max: number) => ValidatorFn;
-export declare const pattern: (pattern: string | RegExp) => ValidatorFn;
+export declare const pattern: (pattern: RegExp) => ValidatorFn;
 declare const FIELD: unique symbol;
 declare enum FieldType {
 	Json = 1,
@@ -28,7 +28,8 @@ declare enum FieldType {
 	Param = 3,
 	Header = 4,
 	Form = 5,
-	Body = 6
+	Body = 6,
+	UrlForm = 7
 }
 export interface FieldMetadata<T = undefined> {
 	alias: Map<FieldType, string | undefined>;
@@ -41,6 +42,7 @@ export type Field<T = undefined> = (() => T) & {
 	withQuery(alias?: string): Field<T>;
 	withParam(alias?: string): Field<T>;
 	withHeader(alias?: string): Field<T>;
+	withUrlForm(alias?: string): Field<T>;
 	withBody(): Field<T>;
 	withValidators(...fn: ValidatorFn<T>[]): Field<T>;
 	withAsyncValidators(...fn: AsyncValidatorFn<T>[]): Field<T>;
@@ -53,36 +55,21 @@ export declare function validatorField(validators: ValidatorFn<any>[], value: un
 export declare function asyncValidatorField(asyncValidator: AsyncValidatorFn<any>[], value: unknown): Promise<void>;
 export declare function isField(value: unknown): value is Field;
 export declare function isFieldGroup(value: unknown): value is Record<PropertyKey, Field>;
-declare const HTTP_RESPONSE: unique symbol;
 export type HttpResponseBody = string | ArrayBuffer | Blob | object | null;
-export type HttpResponse<R> = ({
-	readonly ok: true;
-	readonly status: number;
-	readonly statusText: string;
+export type HttpResponse<R> = {
 	readonly url: string;
-	readonly headers: Headers;
-	readonly body: R | null;
-} | {
-	readonly ok: false;
-	readonly error: Error;
 	readonly status: number;
 	readonly statusText: string;
-	readonly url: string;
 	readonly headers: Headers;
-	readonly body: null;
-}) & {
-	readonly [HTTP_RESPONSE]: unknown;
+	readonly body: R | null;
 };
-export declare function isHttpResponse<R>(value: unknown): value is HttpResponse<R>;
 export type MakeResponseOptions<R> = {
 	status?: number;
 	statusText?: string;
 	url?: string;
 	headers?: Headers;
 	body?: R | null;
-	error?: Error;
 };
-export declare function makeResponse<R>(options: MakeResponseOptions<R>): HttpResponse<R>;
 export type InterceptorFn = (req: HttpRequest, next: HttpHandler) => Promise<HttpResponse<unknown>>;
 export type BasicCredential = {
 	username: string;
@@ -108,13 +95,12 @@ export interface HttpProgressEvent {
 	readonly total: number;
 }
 export type HttpProgressFn = (event: HttpProgressEvent) => void;
-export type TransformRequestFn<Input = unknown> = (input: Input, request: HttpRequest) => HttpRequest["body"];
 export type TransformResponseFn<Output = unknown> = (response: HttpResponse<unknown>) => Output;
 export interface HttpRequest {
 	host?: string;
 	method: string;
 	endpoint: string;
-	body?: Blob | ArrayBuffer | FormData | object | string | number | boolean | null;
+	body?: Blob | ArrayBuffer | FormData | URLSearchParams | object | string | number | boolean | null;
 	headers?: Headers;
 	queryParams?: URLSearchParams;
 	/** default：json */
@@ -127,10 +113,8 @@ export interface HttpRequest {
 	downloadProgress?: HttpProgressFn;
 	/**
 	 * default：body
-	 *
-	 * @todo Implement streaming response
 	 */
-	observe?: "body" | "stream" | "response";
+	observe?: "body" | "response";
 	abort?: AbortSignal;
 }
 export type RequestInputValue<T> = T extends Field<infer V> ? V : T extends {
@@ -138,29 +122,16 @@ export type RequestInputValue<T> = T extends Field<infer V> ? V : T extends {
 } ? {
 	[K in keyof T]: RequestInputValue<T[K]>;
 } : never;
-export type RequestOptions<Output = unknown, Input extends Field<any> | Record<PropertyKey, Field<any>> | undefined = undefined> = {
-	method: string;
-	endpoint: string;
-	input?: Input;
-	interceptors?: InterceptorFn[];
-	responseType?: HttpResponseType;
-	context?: HttpContext;
-	observe?: "body" | "response";
-	withCredentials?: boolean;
-	validators?: (ValidatorFn<RequestInputValue<Input>> | AsyncValidatorFn<RequestInputValue<Input>>)[];
-	transformRequest?: TransformRequestFn;
-	transformResponse?: TransformResponseFn<Output>;
-};
 export type DoRequestOptions = {
 	abort?: AbortSignal;
 	handler?: HttpHandler;
 	client?: Client;
 	timeout?: number;
 };
-export type DoRequestFn<Input = unknown, Output = unknown> = Input extends undefined ? (options?: DoRequestOptions) => Promise<Output> : (input: RequestInputValue<Input>, options?: DoRequestOptions) => Promise<Output>;
-export type UseRequestFn<Output = unknown, Input = unknown> = () => {
-	doRequest: DoRequestFn<Input, Output>;
-	inputValue: Input extends Field<infer V> ? V : Input extends {
+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>> : (input: RequestInputValue<Input>, options?: DoRequestOptions) => Promise<ObserveType<Observe, Output>>;
+	getInitValue: () => Input extends Field<infer V> ? V : Input extends {
 		[K in keyof Input]: Field<any>;
 	} ? {
 		[K in keyof Input]: RequestInputValue<Input[K]>;
@@ -168,112 +139,22 @@ export type UseRequestFn<Output = unknown, Input = unknown> = () => {
 	setUploadProgress: (fn: HttpProgressFn) => void;
 	setDownloadProgress: (fn: HttpProgressFn) => void;
 };
-/** Observe: Body */
-export declare function defineRequest<Output = unknown, Input extends Field<any> | Record<PropertyKey, Field<any>> | undefined = undefined>(options: {
-	method: string;
-	endpoint: string;
-	input?: Input;
-	interceptors?: InterceptorFn[];
-	responseType?: "json";
-	observe?: "body";
-	context?: HttpContext;
-	withCredentials?: boolean;
-	validators?: (ValidatorFn<RequestInputValue<Input>> | AsyncValidatorFn<RequestInputValue<Input>>)[];
-	transformRequest?: TransformRequestFn<RequestInputValue<Input>>;
-	transformResponse?: TransformResponseFn<Output>;
-}): UseRequestFn<Output, Input>;
-export declare function defineRequest<Input extends Field<any> | Record<PropertyKey, Field<any>> | undefined = undefined>(options: {
-	method: string;
-	endpoint: string;
-	input?: Input;
-	interceptors?: InterceptorFn[];
-	responseType: "text";
-	observe?: "body";
-	context?: HttpContext;
-	withCredentials?: boolean;
-	validators?: (ValidatorFn<RequestInputValue<Input>> | AsyncValidatorFn<RequestInputValue<Input>>)[];
-	transformRequest?: TransformRequestFn<RequestInputValue<Input>>;
-	transformResponse?: TransformResponseFn;
-}): UseRequestFn<string, Input>;
-export declare function defineRequest<Input extends Field<any> | Record<PropertyKey, Field<any>> | undefined = undefined>(options: {
-	method: string;
-	endpoint: string;
-	input?: Input;
-	interceptors?: InterceptorFn[];
-	responseType: "blob";
-	observe?: "body";
-	context?: HttpContext;
-	withCredentials?: boolean;
-	validators?: (ValidatorFn<RequestInputValue<Input>> | AsyncValidatorFn<RequestInputValue<Input>>)[];
-	transformRequest?: TransformRequestFn<RequestInputValue<Input>>;
-	transformResponse?: TransformResponseFn;
-}): UseRequestFn<Blob, Input>;
-export declare function defineRequest<Input extends Field<any> | Record<PropertyKey, Field<any>> | undefined = undefined>(options: {
-	method: string;
-	endpoint: string;
-	input?: Input;
-	interceptors?: InterceptorFn[];
-	responseType: "arraybuffer";
-	observe?: "body";
-	context?: HttpContext;
-	withCredentials?: boolean;
-	validators?: (ValidatorFn<RequestInputValue<Input>> | AsyncValidatorFn<RequestInputValue<Input>>)[];
-	transformRequest?: TransformRequestFn<RequestInputValue<Input>>;
-	transformResponse?: TransformResponseFn;
-}): UseRequestFn<ArrayBuffer, Input>;
-/** Observe: Response */
-export declare function defineRequest<Output = unknown, Input extends Field<any> | Record<PropertyKey, Field<any>> | undefined = undefined>(options: {
-	method: string;
-	endpoint: string;
-	input?: Input;
-	interceptors?: InterceptorFn[];
-	responseType?: "json";
-	observe: "response";
-	context?: HttpContext;
-	withCredentials?: boolean;
-	validators?: (ValidatorFn<RequestInputValue<Input>> | AsyncValidatorFn<RequestInputValue<Input>>)[];
-	transformRequest?: TransformRequestFn<RequestInputValue<Input>>;
-	transformResponse?: TransformResponseFn<Output>;
-}): UseRequestFn<HttpResponse<Output>, Input>;
-export declare function defineRequest<Input extends Field<any> | Record<PropertyKey, Field<any>> | undefined = undefined>(options: {
-	method: string;
-	endpoint: string;
-	input?: Input;
-	interceptors?: InterceptorFn[];
-	responseType?: "text";
-	observe: "response";
-	context?: HttpContext;
-	withCredentials?: boolean;
-	validators?: (ValidatorFn<RequestInputValue<Input>> | AsyncValidatorFn<RequestInputValue<Input>>)[];
-	transformRequest?: TransformRequestFn<RequestInputValue<Input>>;
-	transformResponse?: TransformResponseFn;
-}): UseRequestFn<HttpResponse<string>, Input>;
-export declare function defineRequest<Input extends Field<any> | Record<PropertyKey, Field<any>> | undefined = undefined>(options: {
-	method: string;
-	endpoint: string;
-	input?: Input;
-	interceptors?: InterceptorFn[];
-	responseType: "blob";
-	observe: "response";
-	context?: HttpContext;
-	withCredentials?: boolean;
-	validators?: (ValidatorFn<RequestInputValue<Input>> | AsyncValidatorFn<RequestInputValue<Input>>)[];
-	transformRequest?: TransformRequestFn<RequestInputValue<Input>>;
-	transformResponse?: TransformResponseFn;
-}): UseRequestFn<HttpResponse<Blob>, Input>;
-export declare function defineRequest<Input extends Field<any> | Record<PropertyKey, Field<any>> | undefined = undefined>(options: {
-	method: string;
-	endpoint: string;
-	input?: Input;
-	interceptors?: InterceptorFn[];
-	responseType?: "arraybuffer";
-	observe: "response";
-	context?: HttpContext;
-	withCredentials?: boolean;
-	validators?: (ValidatorFn<RequestInputValue<Input>> | AsyncValidatorFn<RequestInputValue<Input>>)[];
-	transformRequest?: TransformRequestFn<RequestInputValue<Input>>;
-	transformResponse?: TransformResponseFn;
-}): UseRequestFn<HttpResponse<ArrayBuffer>, Input>;
+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 declare function defineRequest<Output>(method: string, endpoint: string): DefineRequest<undefined, Output>;
 export type HttpHandler = (req: HttpRequest) => Promise<HttpResponse<unknown>>;
 export interface FetchConfig {
 	/** A string indicating how the request will interact with the browser's cache to set request's cache. */
@@ -310,10 +191,37 @@ export type Client = {} & {
 };
 export declare function isClient(value: unknown): value is Client;
 export declare function createClient(options: ClientOptions): Client;
-export declare function cloneClient(client: Client, options: ClientOptions): Client;
+export declare function cloneClient(client: Client, options: Partial<ClientOptions>): Client;
 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 | null;
+	readonly headers: Headers;
+	readonly ok: boolean;
+	readonly body: unknown;
+	constructor(init: {
+		error?: Error | string | unknown;
+		status?: number;
+		statusText?: string;
+		url?: string;
+		headers?: Headers;
+		body?: unknown;
+	});
+}
 
 export {};

package/index.es.min.js

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

package/index.js

@@ -1,3 +1,47 @@
+// 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;
+  ok;
+  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 ?? null;
+    const body = init.body ?? null;
+    let message;
+    if (ok) {
+      message = `Http failure during parsing for ${init.url || "(unknown url)"}`;
+    } else {
+      message = `Http failure response for ${init.url || "(unknown url)"}: ${init.status} ${init.statusText}`;
+    }
+    super(message, { cause: init.error });
+    super.name = "HttpErrorResponse";
+    this.statusText = statusText;
+    this.url = url;
+    this.headers = headers;
+    this.status = status;
+    this.ok = ok;
+    this.body = body;
+  }
+}
+
 // src/context.ts
 function makeHttpContextToken(defaultValue) {
   Object.defineProperty(defaultValue, HTTP_CONTEXT_TOKEN, { value: defaultValue });
@@ -11,14 +55,14 @@ function makeHttpContext() {
   return {
     set(token, value) {
       if (!isHttpContextToken(token)) {
-        throw new Error("Invalid HttpContextToken");
+        throw ERR_INVALID_HTTP_CONTEXT_TOKEN;
       }
       ctx.set(token, value);
       return this;
     },
     get(token) {
       if (!isHttpContextToken(token)) {
-        throw new Error("Invalid HttpContextToken");
+        throw ERR_INVALID_HTTP_CONTEXT_TOKEN;
       }
       if (!ctx.has(token)) {
         ctx.set(token, token());
@@ -70,6 +114,10 @@ function field(defaultValue) {
     meta.alias.set(4 /* Header */, alias);
     return getter;
   };
+  getter.withUrlForm = (alias) => {
+    meta.alias.set(7 /* UrlForm */, alias);
+    return getter;
+  };
   getter.withBody = () => {
     meta.alias.set(6 /* Body */, undefined);
     return getter;
@@ -84,7 +132,7 @@ function field(defaultValue) {
   };
   return getter;
 }
-function getFieldMetadata(field2) {
+function __getFieldMetadata(field2) {
   return field2[FIELD];
 }
 function validatorField(validators, value) {
@@ -123,47 +171,28 @@ function makeInterceptorChain(interceptors) {
 }
 
 // src/response.ts
-function isHttpResponse(value) {
-  return typeof value === "object" && value !== null && HTTP_RESPONSE in value;
-}
-function makeResponse(options) {
+function __makeResponse(options) {
   const status = options.status ?? 0;
   const statusText = options.statusText ?? "";
-  const ok = status >= 200 && status < 300;
   const url = options.url ?? "";
   const headers = options.headers ?? new Headers;
   const body = options.body ?? null;
-  if (!ok || options.error) {
-    const error = options.error || new Error(`Http failure response for ${options.url}: ${status} ${statusText}`);
-    return {
-      ok: false,
-      error,
-      status,
-      statusText,
-      url,
-      headers,
-      body: null,
-      [HTTP_RESPONSE]: null
-    };
-  }
   return {
-    ok: true,
     status,
     statusText,
     url,
     headers,
-    body,
-    [HTTP_RESPONSE]: null
+    body
   };
 }
-var HTTP_RESPONSE = Symbol("HTTP_RESPONSE");
 
 // src/request.ts
-function serializeBody(body) {
+function __serializeBody(body) {
   switch (true) {
     case body instanceof FormData:
     case body instanceof Blob:
     case body instanceof ArrayBuffer:
+    case body instanceof URLSearchParams:
     case typeof body === "string":
       return body;
     case typeof body === "object":
@@ -175,7 +204,7 @@ function serializeBody(body) {
       return null;
   }
 }
-function detectContentTypeHeader(body) {
+function __detectContentTypeHeader(body) {
   switch (true) {
     case body instanceof FormData:
       return "multipart/form-data";
@@ -197,7 +226,7 @@ function detectContentTypeHeader(body) {
       return null;
   }
 }
-function buildFieldValue(input) {
+function __buildFieldDefaultValue(input) {
   if (isField(input)) {
     return input();
   }
@@ -210,21 +239,26 @@ function buildFieldValue(input) {
   }
   return;
 }
-function defineRequest(options) {
-  const requestOptions = {
-    ...options
-  };
-  const requiredInput = !!requestOptions.input;
-  return () => {
+function defineRequest(method, endpoint) {
+  let requiredInput = false;
+  let field3;
+  let interceptors = [];
+  let responseType = "json";
+  let context2;
+  let observe = "body";
+  let withCredentials = false;
+  let validators = [];
+  let transformResponse;
+  const fn = () => {
     let uploadProgress;
     let downloadProgress;
-    let abortController;
     let abortSignal;
-    const setUploadProgress = (fn) => {
-      uploadProgress = fn;
+    const getInitValue = () => __buildFieldDefaultValue(field3);
+    const setUploadProgress = (fn2) => {
+      uploadProgress = fn2;
     };
-    const setDownloadProgress = (fn) => {
-      downloadProgress = fn;
+    const setDownloadProgress = (fn2) => {
+      downloadProgress = fn2;
     };
     const doRequest = async (...args) => {
       let input;
@@ -241,99 +275,114 @@ function defineRequest(options) {
         }
       }
       if (requiredInput && !input) {
-        throw new Error("input is required");
+        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);
+        }
       }
+      const timeout = doRequestOptions?.timeout || 0;
       if (doRequestOptions?.abort) {
         abortSignal = doRequestOptions.abort;
-      } else {
-        abortController = new AbortController;
-        abortSignal = abortController.signal;
+      } 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: requestOptions.method,
-        endpoint: requestOptions.endpoint,
+        method,
+        endpoint,
         queryParams: new URLSearchParams,
         headers: new Headers,
         body: undefined,
-        withCredentials: requestOptions.withCredentials,
-        responseType: requestOptions.responseType ?? "json",
-        context: requestOptions.context || makeHttpContext(),
-        observe: requestOptions.observe ?? "body",
+        withCredentials,
+        responseType,
+        context: context2 || makeHttpContext(),
+        observe,
         uploadProgress,
         downloadProgress,
-        timeout: doRequestOptions?.timeout || 0,
+        timeout,
         abort: abortSignal
       };
       const handler2 = doRequestOptions?.handler || clientOptions?.handler || getGlobalHttpHandler();
       if (!handler2) {
-        throw new Error("no handler");
+        throw ERR_NOT_FOUND_HANDLER;
       }
       if (requiredInput) {
-        await fillRequestFromField(req, requestOptions.input, input);
-      }
-      if (typeof requestOptions.transformRequest === "function") {
-        req.body = requestOptions.transformRequest(input, req);
-      }
-      const chain = makeInterceptorChain([...clientOptions?.interceptors || [], ...requestOptions?.interceptors || []]);
-      if (typeof req.timeout === "number" && req.timeout > 0 && abortController) {
-        setTimeout(() => {
-          if (!req.abort?.aborted) {
-            abortController?.abort("timeout");
-          }
-        }, req.timeout);
+        await __fillRequestFromField(req, field3, input);
       }
-      let res;
-      try {
-        res = await chain(req, handler2);
-      } catch (error) {
-        throw makeResponse({
-          error: error instanceof Error ? error : new Error("Transform response error", { cause: error })
-        });
-      }
-      if (typeof requestOptions.transformResponse === "function") {
+      const chain = makeInterceptorChain([...interceptors]);
+      let res = await chain(req, handler2);
+      if (typeof transformResponse === "function") {
         try {
-          res = makeResponse({
-            ...res,
-            body: requestOptions.transformResponse(res)
-          });
-        } catch (error) {
-          throw makeResponse({
+          res = __makeResponse({
             ...res,
-            error: error instanceof Error ? error : new Error("Transform response error", { cause: error })
+            body: transformResponse(res)
           });
+        } catch (error3) {
+          throw new HttpErrorResponse({ error: error3 });
         }
       }
       switch (req.observe) {
         case "body":
           return res.body;
-        case "stream":
-          throw new Error("streaming not implemented");
         case "response":
           return res;
         default:
-          throw new Error("invalid observe");
+          throw ERR_OBSERVE;
       }
     };
     return {
       doRequest,
-      inputValue: buildFieldValue(requestOptions.input),
+      getInitValue,
       setUploadProgress,
       setDownloadProgress
     };
   };
+  fn.withField = (value) => {
+    field3 = value;
+    requiredInput = true;
+    return fn;
+  };
+  fn.withInterceptors = (value) => {
+    interceptors = value;
+    return fn;
+  };
+  fn.withContext = (value) => {
+    context2 = value;
+    return fn;
+  };
+  fn.withCredentials = (value) => {
+    withCredentials = value;
+    return fn;
+  };
+  fn.withValidators = (value) => {
+    validators = value;
+    console.log(validators);
+    return fn;
+  };
+  fn.withTransformResponse = (value) => {
+    transformResponse = value;
+    return fn;
+  };
+  fn.withObserve = (value) => {
+    observe = value;
+    return fn;
+  };
+  fn.withResponseType = (value) => {
+    responseType = value;
+    return fn;
+  };
+  return fn;
 }
-function throwAliaNotSet() {
-  throw new Error("alias not set");
-}
-function fillUrl(endpoint, params) {
+function __fillUrl(endpoint, params) {
   return endpoint.replace(/:([^\/]+)/g, (_, p1) => {
     return params.get(p1) ?? "undefined";
   });
 }
-async function fillRequestFromField(request, fieldOrFieldGroup, input) {
+async function __fillRequestFromField(request, fieldOrFieldGroup, input) {
   async function doValid(validators, value) {
     for (const validator of validators) {
       const err = await validator(value);
@@ -346,24 +395,37 @@ async function fillRequestFromField(request, fieldOrFieldGroup, input) {
   function inputIsObject(input2) {
     return typeof input2 === "object" && input2 !== null;
   }
+  function serializeToString(value) {
+    switch (true) {
+      case Array.isArray(value):
+      case (typeof value === "object" && value !== null):
+        return JSON.stringify(value);
+      case (typeof value === "object" && value === null):
+      case typeof value === "boolean":
+      case typeof value === "number":
+      case typeof value === "string":
+        return String(value);
+      default:
+        throw new Error("Unsupported value type");
+    }
+  }
   function appendValue(sp, key, value) {
     if (Array.isArray(value)) {
       for (const v of value) {
-        sp.append(key, String(v));
+        sp.append(key, serializeToString(v));
       }
     } else {
-      sp.set(key, String(value));
+      sp.set(key, serializeToString(value));
     }
     return sp;
   }
   function setValue(sp, key, value) {
     if (Array.isArray(value)) {
       for (const v of value) {
-        sp.set(key, String(v));
+        setValue(sp, key, serializeToString(v));
       }
-    } else {
-      sp.set(key, String(value));
     }
+    sp.set(key, serializeToString(value));
     return sp;
   }
   if (isField(fieldOrFieldGroup)) {
@@ -372,7 +434,7 @@ async function fillRequestFromField(request, fieldOrFieldGroup, input) {
     let headers;
     let body = undefined;
     const fieldValue = input ?? fieldOrFieldGroup();
-    const meta = getFieldMetadata(fieldOrFieldGroup);
+    const meta = __getFieldMetadata(fieldOrFieldGroup);
     const err = await doValid([...meta.validators, ...meta.asyncValidator], fieldValue);
     if (err) {
       throw err;
@@ -381,32 +443,39 @@ async function fillRequestFromField(request, fieldOrFieldGroup, input) {
       switch (type) {
         case 2 /* Query */: {
           if (!aliasName) {
-            throwAliaNotSet();
+            throw ERR_NOT_SET_ALIAS;
           }
           queryParams = appendValue(new URLSearchParams, aliasName, fieldValue);
           break;
         }
         case 3 /* Param */: {
           if (!aliasName) {
-            throwAliaNotSet();
+            throw ERR_NOT_SET_ALIAS;
           }
           params = setValue(new Map, aliasName, fieldValue);
           break;
         }
         case 4 /* Header */: {
           if (!aliasName) {
-            throwAliaNotSet();
+            throw ERR_NOT_SET_ALIAS;
           }
           headers = appendValue(new Headers, aliasName, fieldValue);
           break;
         }
         case 5 /* Form */: {
           if (!aliasName) {
-            throwAliaNotSet();
+            throw ERR_NOT_SET_ALIAS;
           }
           body = appendValue(new FormData, aliasName, fieldValue);
           break;
         }
+        case 7 /* UrlForm */: {
+          if (!aliasName) {
+            throw ERR_NOT_SET_ALIAS;
+          }
+          body = appendValue(new URLSearchParams, aliasName, fieldValue);
+          break;
+        }
         case 1 /* Json */:
         case 6 /* Body */:
           body = fieldValue;
@@ -414,7 +483,7 @@ async function fillRequestFromField(request, fieldOrFieldGroup, input) {
       }
     }
     if (params) {
-      request.endpoint = fillUrl(request.endpoint, params);
+      request.endpoint = __fillUrl(request.endpoint, params);
     }
     request.queryParams = queryParams;
     request.headers = headers;
@@ -425,11 +494,13 @@ async function fillRequestFromField(request, fieldOrFieldGroup, input) {
     let params = new Map;
     let queryParams = new URLSearchParams;
     let headers = new Headers;
+    let urlForm = new URLSearchParams;
     let formData = new FormData;
     const json = {};
     let body = undefined;
+    let lastBodyField;
     for (const [propertyKey, field3] of Object.entries(fieldOrFieldGroup)) {
-      const meta = getFieldMetadata(field3);
+      const meta = __getFieldMetadata(field3);
       for (const [type, aliasName] of meta.alias) {
         const valueKey = aliasName || propertyKey;
         const value = input[propertyKey] || field3();
@@ -438,13 +509,15 @@ async function fillRequestFromField(request, fieldOrFieldGroup, input) {
           throw err;
         }
         switch (type) {
-          case 1 /* Json */:
+          case 1 /* Json */: {
             Object.defineProperty(json, valueKey, {
               value,
               writable: true,
               enumerable: true
             });
+            lastBodyField = 1 /* Json */;
             break;
+          }
           case 2 /* Query */:
             queryParams = appendValue(queryParams, valueKey, value);
             break;
@@ -454,32 +527,48 @@ async function fillRequestFromField(request, fieldOrFieldGroup, input) {
           case 4 /* Header */:
             headers = appendValue(headers, valueKey, value);
             break;
-          case 5 /* Form */:
+          case 5 /* Form */: {
             formData = appendValue(formData, valueKey, value);
+            lastBodyField = 5 /* Form */;
+            break;
+          }
+          case 7 /* UrlForm */: {
+            urlForm = appendValue(urlForm, valueKey, value);
+            lastBodyField = 7 /* UrlForm */;
             break;
-          case 6 /* Body */:
+          }
+          case 6 /* Body */: {
             body = value;
+            lastBodyField = 6 /* Body */;
             break;
+          }
         }
       }
     }
-    request.endpoint = fillUrl(request.endpoint, params);
+    request.endpoint = __fillUrl(request.endpoint, params);
     request.queryParams = queryParams;
     request.headers = headers;
-    if (body) {
-      request.body = body;
-    } else if (Array.from(formData.keys()).length > 0) {
-      request.body = formData;
-    } else if (Object.keys(json).length) {
-      request.body = json;
+    switch (lastBodyField) {
+      case 6 /* Body */:
+        request.body = body;
+        break;
+      case 5 /* Form */:
+        request.body = formData;
+        break;
+      case 7 /* UrlForm */:
+        request.body = urlForm;
+        break;
+      case 1 /* Json */:
+        request.body = json;
+        break;
     }
     return;
   }
-  throw new Error("unsupported field type");
+  throw ERR_UNSUPPORTED_FIELD_TYPE;
 }
 
 // src/handler/util.ts
-function getContentLength(headers) {
+function __getContentLength(headers) {
   const value = headers.get("Content-Length");
   if (!value) {
     return 0;
@@ -490,10 +579,10 @@ function getContentLength(headers) {
   }
   return num;
 }
-function getContentType(headers) {
+function __getContentType(headers) {
   return headers.get("Content-Type") || "";
 }
-function parseBody(params) {
+function __parseBody(params) {
   const { request, content, contentType } = params;
   const responseType = request.responseType;
   if (!responseType) {
@@ -505,6 +594,7 @@ function parseBody(params) {
       if (text === "") {
         return null;
       }
+      console.log(text);
       return JSON.parse(text);
     }
     case "text":
@@ -518,7 +608,7 @@ function parseBody(params) {
       return null;
   }
 }
-function concatChunks(chunks, totalLength) {
+function __concatChunks(chunks, totalLength) {
   const chunksAll = new Uint8Array(totalLength);
   let position = 0;
   for (const chunk of chunks) {
@@ -529,14 +619,14 @@ function concatChunks(chunks, totalLength) {
 }
 
 // src/handler/fetch/fetch.ts
-function createRequest(request2) {
+function __createRequest(request2) {
   const url = new URL(request2.endpoint, request2.host);
   if (request2.queryParams) {
     url.search = request2.queryParams.toString();
   }
   const headers = request2.headers ?? new Headers;
   if (!headers.has("Content-Type")) {
-    const detectedType = detectContentTypeHeader(request2.body);
+    const detectedType = __detectContentTypeHeader(request2.body);
     if (detectedType) {
       headers.set("Content-Type", detectedType);
     }
@@ -550,23 +640,31 @@ function createRequest(request2) {
     ...fetchConfig,
     headers,
     method: request2.method,
-    body: serializeBody(request2.body),
+    body: __serializeBody(request2.body),
     signal: request2.abort,
     credentials
   });
 }
 async function fetchHandler(httpRequest) {
   const downloadProgress = httpRequest.downloadProgress;
-  const request2 = createRequest(httpRequest);
+  const request2 = __createRequest(httpRequest);
   let response3;
   try {
     response3 = await (globalThis || window).fetch(request2);
-  } catch (error) {
-    throw new Error("Network Error", { cause: error });
+  } catch (error4) {
+    if (error4 instanceof DOMException) {
+      switch (true) {
+        case (error4.name === "AbortError" || error4.code === error4.ABORT_ERR):
+          throw new HttpErrorResponse({ error: ERR_ABORTED });
+        case (error4.name === "TimeoutError" || error4.code === error4.TIMEOUT_ERR):
+          throw new HttpErrorResponse({ error: ERR_TIMEOUT });
+      }
+    }
+    throw new HttpErrorResponse({ error: error4 });
   }
-  const { headers, status, statusText, url } = response3;
-  const contentLength = getContentLength(headers);
-  const contentType = getContentType(headers);
+  const { ok, headers, status, statusText, url } = response3;
+  const contentLength = __getContentLength(headers);
+  const contentType = __getContentType(headers);
   let body = null;
   if (response3.body) {
     const chunks = [];
@@ -585,18 +683,33 @@ async function fetchHandler(httpRequest) {
         total: contentLength
       });
     }
-    const chunksAll = concatChunks(chunks, receivedLength);
+    const chunksAll = __concatChunks(chunks, receivedLength);
     try {
-      body = parseBody({
+      body = __parseBody({
         request: httpRequest,
         content: chunksAll,
         contentType
       });
-    } catch (error) {
-      throw new Error("Parse response body error", { cause: error });
+    } catch (error4) {
+      throw new HttpErrorResponse({
+        error: error4,
+        status,
+        statusText,
+        headers,
+        url
+      });
     }
   }
-  return makeResponse({
+  if (!ok) {
+    throw new HttpErrorResponse({
+      status,
+      statusText,
+      headers,
+      url,
+      body
+    });
+  }
+  return __makeResponse({
     url,
     status,
     statusText,
@@ -611,7 +724,7 @@ function isClient(value) {
 }
 function getClientConfig(client2) {
   if (!isClient(client2)) {
-    throw new Error("Invalid client");
+    throw ERR_INVALID_CLIENT;
   }
   return client2[CLIENT];
 }
@@ -637,7 +750,7 @@ function cloneClient(client2, options) {
 }
 function getGlobalClient() {
   if (!globalClient) {
-    throw new Error("Global client not set");
+    throw ERR_NOT_FOUND_GLOBAL_CLIENT;
   }
   return globalClient;
 }
@@ -731,9 +844,6 @@ var pattern = (pattern2) => {
     if (typeof value !== "string") {
       return new Error("invalid string");
     }
-    if (typeof pattern2 === "string") {
-      pattern2 = new RegExp(pattern2);
-    }
     if (!pattern2.test(value)) {
       return new Error("pattern");
     }
@@ -751,10 +861,8 @@ export {
   min,
   maxLength,
   max,
-  makeResponse,
   makeHttpContextToken,
   makeHttpContext,
-  isHttpResponse,
   isHttpContextToken,
   isFieldGroup,
   isField,
@@ -768,5 +876,17 @@ export {
   cloneClient,
   basicAuthInterceptor,
   asyncValidatorField,
-  FETCH_CONFIG_KEY
+  HttpErrorResponse,
+  FETCH_CONFIG_KEY,
+  ERR_UNSUPPORTED_FIELD_TYPE,
+  ERR_UNKNOWN,
+  ERR_TIMEOUT,
+  ERR_OBSERVE,
+  ERR_NOT_SET_ALIAS,
+  ERR_NOT_FOUND_HANDLER,
+  ERR_NOT_FOUND_GLOBAL_CLIENT,
+  ERR_NETWORK,
+  ERR_INVALID_HTTP_CONTEXT_TOKEN,
+  ERR_INVALID_CLIENT,
+  ERR_ABORTED
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defjs/core",
-  "version": "0.0.0-test-000",
+  "version": "0.0.0-test-002",
   "type": "module",
   "module": "index.js",
   "typings": "index.d.ts",