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

package/dist/index.d.ts

@@ -84,19 +84,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>;
@@ -111,6 +111,7 @@ export type RequestOptions<Output = unknown, Input extends Field<any> | Record<P
 	responseType?: HttpResponseType;
 	context?: HttpContext;
 	observe?: "body" | "response";
+	withCredentials?: boolean;
 	validators?: (ValidatorFn<RequestInputValue<Input>> | AsyncValidatorFn<RequestInputValue<Input>>)[];
 	transformRequest?: TransformRequestFn;
 	transformResponse?: TransformResponseFn<Output>;
@@ -129,6 +130,7 @@ export declare function defineRequest<Output = unknown, Input extends Field<any>
 	responseType?: "json";
 	observe?: "body";
 	context?: HttpContext;
+	withCredentials?: boolean;
 	validators?: (ValidatorFn<RequestInputValue<Input>> | AsyncValidatorFn<RequestInputValue<Input>>)[];
 	transformRequest?: TransformRequestFn;
 	transformResponse?: TransformResponseFn<Output>;
@@ -141,6 +143,7 @@ export declare function defineRequest<Input extends Field<any> | Record<Property
 	responseType: "text";
 	observe?: "body";
 	context?: HttpContext;
+	withCredentials?: boolean;
 	validators?: (ValidatorFn<RequestInputValue<Input>> | AsyncValidatorFn<RequestInputValue<Input>>)[];
 	transformRequest?: TransformRequestFn;
 	transformResponse?: TransformResponseFn;
@@ -153,6 +156,7 @@ export declare function defineRequest<Input extends Field<any> | Record<Property
 	responseType: "blob";
 	observe?: "body";
 	context?: HttpContext;
+	withCredentials?: boolean;
 	validators?: (ValidatorFn<RequestInputValue<Input>> | AsyncValidatorFn<RequestInputValue<Input>>)[];
 	transformRequest?: TransformRequestFn;
 	transformResponse?: TransformResponseFn;
@@ -165,6 +169,7 @@ export declare function defineRequest<Input extends Field<any> | Record<Property
 	responseType: "arraybuffer";
 	observe?: "body";
 	context?: HttpContext;
+	withCredentials?: boolean;
 	validators?: (ValidatorFn<RequestInputValue<Input>> | AsyncValidatorFn<RequestInputValue<Input>>)[];
 	transformRequest?: TransformRequestFn;
 	transformResponse?: TransformResponseFn;
@@ -178,6 +183,7 @@ export declare function defineRequest<Output = unknown, Input extends Field<any>
 	responseType?: "json";
 	observe: "response";
 	context?: HttpContext;
+	withCredentials?: boolean;
 	validators?: (ValidatorFn<RequestInputValue<Input>> | AsyncValidatorFn<RequestInputValue<Input>>)[];
 	transformRequest?: TransformRequestFn;
 	transformResponse?: TransformResponseFn<Output>;
@@ -190,6 +196,7 @@ export declare function defineRequest<Input extends Field<any> | Record<Property
 	responseType?: "text";
 	observe: "response";
 	context?: HttpContext;
+	withCredentials?: boolean;
 	validators?: (ValidatorFn<RequestInputValue<Input>> | AsyncValidatorFn<RequestInputValue<Input>>)[];
 	transformRequest?: TransformRequestFn;
 	transformResponse?: TransformResponseFn;
@@ -202,6 +209,7 @@ export declare function defineRequest<Input extends Field<any> | Record<Property
 	responseType: "blob";
 	observe: "response";
 	context?: HttpContext;
+	withCredentials?: boolean;
 	validators?: (ValidatorFn<RequestInputValue<Input>> | AsyncValidatorFn<RequestInputValue<Input>>)[];
 	transformRequest?: TransformRequestFn;
 	transformResponse?: TransformResponseFn;
@@ -214,6 +222,7 @@ export declare function defineRequest<Input extends Field<any> | Record<Property
 	responseType?: "arraybuffer";
 	observe: "response";
 	context?: HttpContext;
+	withCredentials?: boolean;
 	validators?: (ValidatorFn<RequestInputValue<Input>> | AsyncValidatorFn<RequestInputValue<Input>>)[];
 	transformRequest?: TransformRequestFn;
 	transformResponse?: TransformResponseFn;

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) {
@@ -178,7 +177,7 @@ async function fillRequestFromField(request, fieldOrFieldGroup, input) {
     return typeof input2 === "object" && input2 !== null;
   }
   if (isField(fieldOrFieldGroup)) {
-    const param = new Map;
+    const params = new Map;
     const queryParams = new URLSearchParams;
     const headers = new Headers;
     let body = undefined;
@@ -204,7 +203,7 @@ async function fillRequestFromField(request, fieldOrFieldGroup, input) {
           if (!aliasName) {
             throwAliaNotSet();
           }
-          param.set(aliasName, String(fieldValue));
+          params.set(aliasName, String(fieldValue));
           break;
         }
         case 4 /* Header */: {
@@ -228,25 +227,24 @@ async function fillRequestFromField(request, fieldOrFieldGroup, input) {
           break;
       }
     }
-    request.endpoint = fillUrl(request.endpoint, param);
+    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 params = new Map;
     const queryParams = new URLSearchParams;
     const headers = new Headers;
     const formData = new FormData;
     const json = {};
     let body = undefined;
     for (const [propertyKey, field3] of Object.entries(fieldOrFieldGroup)) {
-      const defaultValue = field3();
       const meta = getFieldMetadata(field3);
       for (const [type, aliasName] of meta.alias) {
         const valueKey = aliasName || propertyKey;
-        const value = input[valueKey] || defaultValue;
+        const value = input[propertyKey] || field3();
         const err = await doValid([...meta.validators, ...meta.asyncValidator], value);
         if (err) {
           throw err;
@@ -262,7 +260,7 @@ async function fillRequestFromField(request, fieldOrFieldGroup, input) {
             queryParams.append(valueKey, value);
             break;
           case 3 /* Param */:
-            param.set(valueKey, value);
+            params.set(valueKey, value);
             break;
           case 4 /* Header */:
             headers.set(valueKey, value);
@@ -275,16 +273,16 @@ async function fillRequestFromField(request, fieldOrFieldGroup, input) {
             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;
   }
@@ -332,6 +330,7 @@ async function doRequest(...args) {
     queryParams: new URLSearchParams,
     headers: new Headers,
     body: undefined,
+    withCredentials: requestOptions.withCredentials,
     responseType: requestOptions.responseType ?? "json",
     context: requestOptions.context || makeHttpContext(),
     observe: requestOptions.observe ?? "body",
@@ -349,9 +348,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 +405,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,6 +1,6 @@
 {
 	"name": "@defjs/core",
-	"version": "0.0.0-test-0004",
+	"version": "0.0.0-test-0006",
 	"type": "module",
 	"scripts": {
 		"build": "bun run ./scripts/build.ts",