@hapaul/api 0.1.9 → 0.1.11

package/dist/index.js

@@ -18,16 +18,19 @@ var Client = class {
 		requestConfig = await this.beforeRequest({ config: requestConfig });
 		method = requestConfig.method;
 		const baseUrl = requestConfig.baseUrl ?? this.baseUrl;
-		const url = baseUrl + path;
+		let url = baseUrl + path;
+		const query = requestConfig.params?.query;
+		if (query && typeof query === "object" && Object.entries(query).filter(([_, v]) => v !== void 0).length > 0) url = url + "?" + defaultQuerySerializer(query);
 		const headersOptions = requestConfig.headers;
 		const headers = mergeHeaders(headersOptions);
 		const contentType = headers.get("Content-Type");
 		const body = requestConfig.body;
 		if (!contentType) headers.set("Content-Type", "application/json");
 		try {
+			const serializedBody = defaultBodySerializer(body, headers);
 			let response = await fetch(url, {
 				...requestConfig,
-				body: defaultBodySerializer(body, headers),
+				body: serializedBody,
 				method: method.toUpperCase(),
 				headers
 			});
@@ -46,17 +49,16 @@ var Client = class {
 			if (status >= 200 && status < 300) isOk = true;
 			else if (status >= 400) isOk = false;
 			const contentType$1 = response.headers.get("Content-Type") || "application/json";
-			switch (contentType$1) {
-				case "application/json":
-					assign(await response.json());
-					break;
-				case "text":
-					assign(await response.text());
-					break;
-				case "arrayBuffer":
-					assign(await response.arrayBuffer());
-					break;
-				default: assign(await response.bytes());
+			if (contentType$1.includes("application/json")) assign(await response.json());
+			else if (contentType$1.includes("text/plain")) assign(await response.text());
+			else assign(await response.arrayBuffer());
+			if (!isOk) {
+				let message = response.statusText;
+				if (typeof error === "object" && "message" in error) message = error.message;
+				for (const middleware of this.middlewares) middleware.onError?.(requestConfig, response, {
+					status,
+					message
+				});
 			}
 			return {
 				data,
@@ -84,12 +86,12 @@ var Client = class {
 	}
 	async beforeRequest(params) {
 		let config = params.config;
-		for (const middleware of this.middlewares) config = await middleware.onRequest?.(config);
+		for (const middleware of this.middlewares) config = await middleware.onRequest?.(config) ?? config;
 		return config;
 	}
 	async afterResponse(params) {
 		let response = params.response;
-		for (const middleware of this.middlewares) response = await middleware.onResponse?.(params.config, response);
+		for (const middleware of this.middlewares) response = await middleware.onResponse?.(params.config, response) ?? response;
 		return response;
 	}
 };
@@ -104,11 +106,29 @@ function mergeHeaders(...allHeaders) {
 	}
 	return finalHeaders;
 }
+function defaultQuerySerializer(query) {
+	return new URLSearchParams(query).toString();
+}
 function defaultBodySerializer(body, headers) {
 	if (body instanceof FormData) return body;
 	if (headers) {
 		const contentType = headers.get("Content-Type");
-		if (contentType === "application/x-www-form-urlencoded") return new URLSearchParams(body).toString();
+		switch (contentType) {
+			case "application/x-www-form-urlencoded": return new URLSearchParams(body).toString();
+			case "multipart/form-data": {
+				headers.delete("Content-Type");
+				const formData = new FormData();
+				Object.entries(body).forEach(([k, v]) => {
+					if (isArray(v)) v.forEach((x) => {
+						formData.append(k, x);
+					});
+					else if (isObject(v)) formData.append(k, JSON.stringify(v));
+					else if (isDate(v)) formData.append(k, v.toISOString());
+					else formData.append(k, v);
+				});
+				return formData;
+			}
+		}
 	}
 	return JSON.stringify(body);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hapaul/api",
-  "version": "0.1.9",
+  "version": "0.1.11",
   "description": "",
   "type": "module",
   "files": [
@@ -15,19 +15,20 @@
   },
   "types": "./dist/index.d.ts",
   "scripts": {
-    "generate": "openapi-typescript http://localhost:4000/api/openapi.yaml -o ./schema.d.ts",
+    "generate": "openapi-typescript http://localhost:4000/docs/openapi.yaml -o ./schema.d.ts",
+    "prebuild": "npm run generate",
     "build": "rolldown -c rolldown.config.ts"
   },
   "keywords": [],
   "author": "",
   "license": "ISC",
-  "packageManager": "pnpm@10.13.1",
+  "packageManager": "pnpm@10.23.0+sha512.21c4e5698002ade97e4efe8b8b4a89a8de3c85a37919f957e7a0f30f38fbc5bbdd05980ffe29179b2fb6e6e691242e098d945d1601772cad0fef5fb6411e2a4b",
   "devDependencies": {
-    "@hapaul/dev": "^0.0.2",
-    "openapi-typescript": "^7.8.0",
+    "@hapaul/dev": "^0.0.3",
+    "openapi-typescript": "^7.10.1",
     "openapi-typescript-helpers": "^0.0.15",
     "rolldown": "1.0.0-beta.30",
-    "rolldown-plugin-dts": "^0.14.2",
-    "typescript": "^5.8.3"
+    "rolldown-plugin-dts": "^0.14.3",
+    "typescript": "^5.9.3"
   }
 }