@rhythmjs/openapi 0.0.2 → 0.0.3

package/dist/body/body.js

@@ -1,4 +1,4 @@
-import { a as schemaMiddleware, t as bodyExtractor } from "../runtime-CCU9lE2d.js";
+import { a as schemaMiddleware, t as bodyExtractor } from "../runtime-BrscD_hj.js";
 //#region src/body/body.ts
 function apiBody(schema, options = {}) {
 	const contentType = options.contentType ?? "application/json";

package/dist/cookie/cookie.js

@@ -1,4 +1,4 @@
-import { a as schemaMiddleware, n as collectCookies } from "../runtime-CCU9lE2d.js";
+import { a as schemaMiddleware, n as collectCookies } from "../runtime-BrscD_hj.js";
 //#region src/cookie/cookie.ts
 function apiCookie(schema, options = {}) {
 	return schemaMiddleware("cookie", schema, { parameters: [{

package/dist/header/header.js

@@ -1,4 +1,4 @@
-import { a as schemaMiddleware, r as collectHeaders } from "../runtime-CCU9lE2d.js";
+import { a as schemaMiddleware, r as collectHeaders } from "../runtime-BrscD_hj.js";
 //#region src/header/header.ts
 function apiHeader(schema, options = {}) {
 	return schemaMiddleware("header", schema, { parameters: [{

package/dist/param/param.js

@@ -1,4 +1,4 @@
-import { a as schemaMiddleware } from "../runtime-CCU9lE2d.js";
+import { a as schemaMiddleware } from "../runtime-BrscD_hj.js";
 //#region src/param/param.ts
 function apiParam(schema, options = {}) {
 	return schemaMiddleware("param", schema, { parameters: [{

package/dist/query/query.js

@@ -1,4 +1,4 @@
-import { a as schemaMiddleware, i as collectQuery } from "../runtime-CCU9lE2d.js";
+import { a as schemaMiddleware, i as collectQuery } from "../runtime-BrscD_hj.js";
 //#region src/query/query.ts
 function apiQuery(schema, options = {}) {
 	return schemaMiddleware("query", schema, { parameters: [{

package/dist/{runtime-CCU9lE2d.js → runtime-BrscD_hj.js}

@@ -46,21 +46,6 @@ function collectCookies(request) {
 	}
 	return out;
 }
-function parseMultipart(body, contentTypeHeader) {
-	const boundary = /boundary="?([^";]+)"?/i.exec(contentTypeHeader)?.[1];
-	if (!boundary) return void 0;
-	const pairs = [];
-	for (const part of body.split(`--${boundary}`)) {
-		const headerEnd = part.indexOf("\r\n\r\n");
-		if (headerEnd === -1) continue;
-		const headers = part.slice(0, headerEnd);
-		const name = /content-disposition:[^\r\n]*\sname="([^"]*)"/i.exec(headers)?.[1];
-		if (name === void 0) continue;
-		const value = /\sfilename="([^"]*)"/i.exec(headers)?.[1] ?? part.slice(headerEnd + 4).replace(/\r\n$/, "");
-		pairs.push([name, value]);
-	}
-	return collectMultiValue(pairs);
-}
 function bodyExtractor(contentType) {
 	return async (ctx) => {
 		if (contentType.includes("json")) try {
@@ -74,6 +59,17 @@ function bodyExtractor(contentType) {
 				message: "Malformed JSON in request body"
 			};
 		}
+		if (contentType.includes("form-data")) try {
+			return {
+				ok: true,
+				value: collectMultiValue(await ctx.request.clone().formData())
+			};
+		} catch {
+			return {
+				ok: false,
+				message: "Malformed form data in request body"
+			};
+		}
 		let text;
 		try {
 			text = await ctx.request.clone().text();
@@ -87,16 +83,6 @@ function bodyExtractor(contentType) {
 			ok: true,
 			value: collectMultiValue(new URLSearchParams(text))
 		};
-		if (contentType.includes("form-data")) {
-			const value = parseMultipart(text, ctx.request.headers.get("content-type") ?? contentType);
-			return value ? {
-				ok: true,
-				value
-			} : {
-				ok: false,
-				message: "Malformed form data in request body"
-			};
-		}
 		return {
 			ok: true,
 			value: text

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rhythmjs/openapi",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "OpenAPI 3.1 documentation middleware (request/response schemas, operations, security, docs UI) for Rhythm routers and handlers.",
   "keywords": [
     "documentation",