@faapi/faapi 6.19.0 → 6.20.0

package/dist/cli/index.js

@@ -2617,6 +2617,28 @@ function collectRouteSchemaSources(routes, rootDir) {
           typeInfo: resolver.resolve(paramsArg.typeName) ?? null
         });
       }
+      if (inputType === "body") {
+        const queryArg = meta.params.find((p) => p.type === "query");
+        if (queryArg?.typeName) {
+          sources.push({
+            urlPath: entry.urlPath,
+            filePath,
+            schemaName: getSchemaName(method, "query"),
+            typeInfo: resolver.resolve(queryArg.typeName) ?? null
+          });
+        }
+      } else if (hasBody(method)) {
+        const bodyArg = meta.params.find((p) => p.type === "body") ?? meta.params.find((p) => p.type === "form");
+        if (bodyArg?.typeName) {
+          sources.push({
+            urlPath: entry.urlPath,
+            filePath,
+            schemaName: getSchemaName(method, "body"),
+            typeInfo: resolver.resolve(bodyArg.typeName) ?? null,
+            coerce: bodyArg.type === "form" || void 0
+          });
+        }
+      }
     }
   }
   return { sources, resolversByFile };
@@ -8765,7 +8787,32 @@ function createRoutePipeline(opts) {
         ...paramsResult.data
       } : match.params;
     }
-    const body = inputType === "query" && hasBody(route.method) ? await resolveBodyForQueryMethod(request) : hasBody(route.method) ? result.data : void 0;
+    if (inputType === "body") {
+      const rawQuery = queryToObject(url.searchParams);
+      const queryResult = await validateInput(schemaPath, route.method, "query", rawQuery);
+      if (!queryResult.valid) {
+        throw new ValidationError("\u53C2\u6570\u6821\u9A8C\u5931\u8D25", queryResult.issues);
+      }
+      if (queryResult.data !== rawQuery && typeof queryResult.data === "object" && queryResult.data !== null) {
+        ctx.__validatedQuery = {
+          ...rawQuery,
+          ...queryResult.data
+        };
+      }
+    }
+    let body;
+    if (inputType === "query" && hasBody(route.method)) {
+      const parsed = await resolveBodyForQueryMethod(request);
+      if (parsed !== void 0) {
+        const bodyResult = await validateInput(schemaPath, route.method, "body", parsed);
+        if (!bodyResult.valid) {
+          throw new ValidationError("\u53C2\u6570\u6821\u9A8C\u5931\u8D25", bodyResult.issues);
+        }
+        body = bodyResult.data;
+      }
+    } else if (hasBody(route.method)) {
+      body = result.data;
+    }
     if (route.middlewares === void 0 && route.injectors === void 0 && route.middlewarePaths) {
       await ensureMiddlewaresCompiled(route.middlewarePaths, rootDir);
       const bundle = await loadMergedMiddlewares(route.middlewarePaths);
@@ -8855,6 +8902,7 @@ var init_createServer = __esm({
     init_httpErrors();
     init_validateInput();
     init_inputType();
+    init_queryToObject();
     init_getClientIp();
     init_cors();
     init_helmet();