@defjs/core 0.0.0-test-0005 → 0.0.0-test-0007

package/dist/index.d.ts

@@ -69,11 +69,17 @@ export declare function makeResponse<R>(options: MakeResponseOptions<R>): HttpRe
 export type InterceptorFn = (req: HttpRequest, next: HttpHandler) => Promise<HttpResponse<unknown>>;
 export type HttpResponseType = "arraybuffer" | "blob" | "json" | "text";
 export interface HttpProgressEvent {
-	/** 表示 Progress 所关联的资源是否具有可以计算的长度。否则，Progress.total 属性将是一个无意义的值 */
+	/**
+	 * Indicates whether the resources associated with Progress have a computable length.
+	 * Otherwise, the Progress.total attribute will be a meaningless value.
+	 */
 	readonly lengthComputable: boolean;
-	/** 表示底层的进程已经执行的工作量 */
+	/** Indicates the workload of the underlying process. */
 	readonly loaded: number;
-	/** 正在处理或者传输的数据的总大小. 如果 Progress.lengthComputable 属性是 false，这个值是没有意义的并且应该被忽略 */
+	/**
+	 * The total size of the data being processed or transmitted.
+	 * If the Progress.lengthComputable attribute is false, this value is meaningless and should be ignored.
+	 */
 	readonly total: number;
 }
 export type HttpProgressFn = (value: HttpProgressEvent) => void;
@@ -84,19 +90,19 @@ export interface HttpRequest {
 	method: string;
 	endpoint: string;
 	body?: Blob | ArrayBuffer | FormData | object | string | number | boolean | null;
-	headers: Headers;
-	queryParams: URLSearchParams;
-	/** 默认：json */
-	responseType: HttpResponseType;
-	context: HttpContext;
-	timeout: number;
+	headers?: Headers;
+	queryParams?: URLSearchParams;
+	/** default：json */
+	responseType?: HttpResponseType;
+	context?: HttpContext;
+	timeout?: number;
 	withCredentials?: boolean;
 	/** when use fetch handler, no upload progress */
 	uploadProgress?: HttpProgressFn;
 	downloadProgress?: HttpProgressFn;
-	/** 默认：body */
-	observe: "body" | "stream" | "response";
-	abort: AbortSignal;
+	/** default：body */
+	observe?: "body" | "stream" | "response";
+	abort?: AbortSignal;
 }
 export type RequestInputValue<T> = T extends Field<infer V> ? V : T extends {
 	[K in keyof T]: Field<any>;

package/dist/index.js

@@ -159,10 +159,9 @@ function throwAliaNotSet() {
   throw new Error("alias not set");
 }
 function fillUrl(endpoint, params) {
-  for (const [key, value] of params) {
-    endpoint = endpoint.replace(`:${key}`, value.toString());
-  }
-  return endpoint;
+  return endpoint.replace(/:([^\/]+)/g, (_, p1) => {
+    return params.get(p1) ?? "undefined";
+  });
 }
 async function fillRequestFromField(request, fieldOrFieldGroup, input) {
   async function doValid(validators, value) {
@@ -177,10 +176,30 @@ async function fillRequestFromField(request, fieldOrFieldGroup, input) {
   function inputIsObject(input2) {
     return typeof input2 === "object" && input2 !== null;
   }
+  function appendValue(sp, key, value) {
+    if (Array.isArray(value)) {
+      for (const v of value) {
+        sp.append(key, String(v));
+      }
+    } else {
+      sp.set(key, String(value));
+    }
+    return sp;
+  }
+  function setValue(sp, key, value) {
+    if (Array.isArray(value)) {
+      for (const v of value) {
+        sp.set(key, String(v));
+      }
+    } else {
+      sp.set(key, String(value));
+    }
+    return sp;
+  }
   if (isField(fieldOrFieldGroup)) {
-    const param = new Map;
-    const queryParams = new URLSearchParams;
-    const headers = new Headers;
+    let params;
+    let queryParams;
+    let headers;
     let body = undefined;
     const fieldValue = input ?? fieldOrFieldGroup();
     const meta = getFieldMetadata(fieldOrFieldGroup);
@@ -197,30 +216,28 @@ async function fillRequestFromField(request, fieldOrFieldGroup, input) {
           if (!aliasName) {
             throwAliaNotSet();
           }
-          queryParams.append(aliasName, String(fieldValue));
+          queryParams = appendValue(new URLSearchParams, aliasName, fieldValue);
           break;
         }
         case 3 /* Param */: {
           if (!aliasName) {
             throwAliaNotSet();
           }
-          param.set(aliasName, String(fieldValue));
+          params = setValue(new Map, aliasName, fieldValue);
           break;
         }
         case 4 /* Header */: {
           if (!aliasName) {
             throwAliaNotSet();
           }
-          headers.set(aliasName, String(fieldValue));
+          headers = appendValue(new Headers, aliasName, fieldValue);
           break;
         }
         case 5 /* Form */: {
           if (!aliasName) {
             throwAliaNotSet();
           }
-          const form = new FormData;
-          form.append(aliasName, String(fieldValue));
-          body = form;
+          body = appendValue(new FormData, aliasName, fieldValue);
           break;
         }
         case 6 /* Body */:
@@ -228,17 +245,19 @@ async function fillRequestFromField(request, fieldOrFieldGroup, input) {
           break;
       }
     }
-    request.endpoint = fillUrl(request.endpoint, param);
+    if (params) {
+      request.endpoint = fillUrl(request.endpoint, params);
+    }
     request.queryParams = queryParams;
     request.headers = headers;
     request.body = body;
     return;
   }
   if (isFieldGroup(fieldOrFieldGroup) && inputIsObject(input)) {
-    const param = new Map;
-    const queryParams = new URLSearchParams;
-    const headers = new Headers;
-    const formData = new FormData;
+    let params = new Map;
+    let queryParams = new URLSearchParams;
+    let headers = new Headers;
+    let formData = new FormData;
     const json = {};
     let body = undefined;
     for (const [propertyKey, field3] of Object.entries(fieldOrFieldGroup)) {
@@ -258,32 +277,32 @@ async function fillRequestFromField(request, fieldOrFieldGroup, input) {
             });
             break;
           case 2 /* Query */:
-            queryParams.append(valueKey, value);
+            queryParams = appendValue(queryParams, valueKey, value);
             break;
           case 3 /* Param */:
-            param.set(valueKey, value);
+            params = setValue(params, valueKey, value);
             break;
           case 4 /* Header */:
-            headers.set(valueKey, value);
+            headers = appendValue(headers, valueKey, value);
             break;
           case 5 /* Form */:
-            formData.append(valueKey, value);
+            formData = appendValue(formData, valueKey, value);
             break;
           case 6 /* Body */:
             body = value;
             break;
         }
       }
-      request.endpoint = fillUrl(request.endpoint, param);
-      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.stringify(json);
-      }
+    }
+    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.stringify(json);
     }
     return;
   }
@@ -325,7 +344,7 @@ async function doRequest(...args) {
   }
   const clientOptions = getClientConfig(options?.client || getGlobalClient());
   const req = {
-    host: clientOptions?.host || "",
+    host: clientOptions?.host,
     method: requestOptions.method,
     endpoint: requestOptions.endpoint,
     queryParams: new URLSearchParams,
@@ -349,9 +368,9 @@ async function doRequest(...args) {
     req.body = requestOptions.transformRequest(req);
   }
   const chain = makeInterceptorChain([...clientOptions?.interceptors || [], ...requestOptions?.interceptors || []]);
-  if (req.timeout > 0 && abortController) {
+  if (typeof req.timeout === "number" && req.timeout > 0 && abortController) {
     setTimeout(() => {
-      if (!req.abort.aborted) {
+      if (!req.abort?.aborted) {
         abortController.abort("timeout");
       }
     }, req.timeout);
@@ -406,18 +425,22 @@ function makeResponse(options) {
 // src/handler/fetch/fetch.ts
 function createRequest(request2) {
   const url = new URL(request2.endpoint, request2.host);
-  url.search = request2.queryParams.toString();
-  if (!request2.headers.has("Content-Type")) {
-    const detectedType = detectContentTypeHeader(request2.body);
-    if (detectedType) {
-      request2.headers.set("Content-Type", detectedType);
-    }
+  if (request2.queryParams) {
+    url.search = request2.queryParams.toString();
   }
-  if (!request2.headers.has("Accept")) {
-    request2.headers.set("Accept", "application/json, text/plain, */*");
+  if (request2.headers) {
+    if (!request2.headers.has("Content-Type")) {
+      const detectedType = detectContentTypeHeader(request2.body);
+      if (detectedType) {
+        request2.headers.set("Content-Type", detectedType);
+      }
+    }
+    if (!request2.headers.has("Accept")) {
+      request2.headers.set("Accept", "application/json, text/plain, */*");
+    }
   }
   const credentials = request2.withCredentials ? "include" : undefined;
-  const fetchConfig = request2.context.get(FETCH_CONFIG_KEY);
+  const fetchConfig = request2.context?.get(FETCH_CONFIG_KEY) || {};
   return new Request(url, {
     ...fetchConfig,
     headers: request2.headers,

package/package.json

@@ -1,25 +1,25 @@
 {
-	"name": "@defjs/core",
-	"version": "0.0.0-test-0005",
-	"type": "module",
-	"scripts": {
-		"build": "bun run ./scripts/build.ts",
-		"test": "bun test",
-		"lint": "biome check",
-		"lint:fix": "biome check --write",
-		"pub": "npm publish"
-	},
-	"peerDependencies": {
-		"typescript": "^5.0"
-	},
-	"files": ["dist"],
-	"module": "dist/index.js",
-	"typings": "dist/index.d.ts",
-	"exports": {
-		"./package.json": "./package.json",
-		".": {
-			"types": "./index.d.ts",
-			"default": "./index.js"
-		}
-	}
+  "name": "@defjs/core",
+  "version": "0.0.0-test-0007",
+  "type": "module",
+  "scripts": {
+    "build": "bun run ./scripts/build.ts",
+    "test": "bun test",
+    "lint": "biome check",
+    "lint:fix": "biome check --write",
+    "pub": "npm publish"
+  },
+  "peerDependencies": {
+    "typescript": "^5.0"
+  },
+  "files": ["dist"],
+  "module": "dist/index.js",
+  "typings": "dist/index.d.ts",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "types": "./index.d.ts",
+      "default": "./index.js"
+    }
+  }
 }