@defjs/core 0.0.0-test-0006 → 0.0.0-test-0008

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;
@@ -242,7 +248,7 @@ export type RequestRefWithInput<T> = T extends RequestRef<unknown, infer Input>
 export declare function doRequest<Ref extends RequestRef>(ref: RequestRefWithInput<Ref> extends true ? never : Ref, options?: DoRequestOptions): Promise<RequestRefOutput<Ref>>;
 export declare function doRequest<Ref extends RequestRef>(ref: RequestRefWithInput<Ref> extends true ? Ref : never, input: RequestRefInput<Ref>, options?: DoRequestOptions): Promise<RequestRefOutput<Ref>>;
 export type HttpHandler = (req: HttpRequest) => Promise<HttpResponse<unknown>>;
-export declare const fetchHandler: HttpHandler;
+export declare function fetchHandler(httpRequest: HttpRequest): Promise<HttpResponse<unknown>>;
 export interface ClientOptions {
 	host: string;
 	interceptors?: InterceptorFn[];

package/dist/index.js

@@ -176,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 params = 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);
@@ -196,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();
           }
-          params.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 */:
@@ -227,17 +245,19 @@ async function fillRequestFromField(request, fieldOrFieldGroup, input) {
           break;
       }
     }
-    request.endpoint = fillUrl(request.endpoint, params);
+    if (params) {
+      request.endpoint = fillUrl(request.endpoint, params);
+    }
     request.queryParams = queryParams;
     request.headers = headers;
     request.body = body;
     return;
   }
   if (isFieldGroup(fieldOrFieldGroup) && inputIsObject(input)) {
-    const params = 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)) {
@@ -253,20 +273,21 @@ async function fillRequestFromField(request, fieldOrFieldGroup, input) {
           case 1 /* Json */:
             Object.defineProperty(json, valueKey, {
               value,
-              writable: true
+              writable: true,
+              enumerable: true
             });
             break;
           case 2 /* Query */:
-            queryParams.append(valueKey, value);
+            queryParams = appendValue(queryParams, valueKey, value);
             break;
           case 3 /* Param */:
-            params.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;
@@ -324,7 +345,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,
@@ -475,15 +496,15 @@ function getContentLength(headers) {
   }
   return num;
 }
-async function _request(httpRequest) {
+async function fetchHandler(httpRequest) {
+  const { downloadProgress } = httpRequest;
   const request2 = createRequest(httpRequest);
-  const downloadProgress = httpRequest.downloadProgress;
   let response2;
   try {
     response2 = await (globalThis || window).fetch(request2);
   } catch (error) {
     throw makeResponse({
-      error: error instanceof Error ? error : new Error("Unknown Error"),
+      error: error instanceof Error ? error : new Error("Network Error"),
       url: request2.url
     });
   }
@@ -511,7 +532,7 @@ async function _request(httpRequest) {
         body = parseBody(httpRequest, response2, chunksAll);
       } catch (error) {
         throw makeResponse({
-          error: error instanceof Error ? error : new Error("Unknown Error"),
+          error: error instanceof Error ? error : new Error("Parse response body error"),
           url,
           status,
           statusText,
@@ -529,7 +550,6 @@ async function _request(httpRequest) {
   });
 }
 var FETCH_CONFIG_KEY = makeHttpContextToken(() => ({}));
-var fetchHandler = _request;
 // src/client.ts
 function isClient(value) {
   return typeof value === "object" && value !== null && CLIENT in value;

package/package.json

@@ -1,25 +1,25 @@
 {
-	"name": "@defjs/core",
-	"version": "0.0.0-test-0006",
-	"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-0008",
+  "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"
+    }
+  }
 }