@faapi/faapi 6.18.1 → 6.20.0

package/dist/cli/index.js

@@ -2608,6 +2608,37 @@ function collectRouteSchemaSources(routes, rootDir) {
         typeInfo,
         coerce: isForm || void 0
       });
+      const paramsArg = meta.params.find((p) => p.type === "params");
+      if (paramsArg?.typeName) {
+        sources.push({
+          urlPath: entry.urlPath,
+          filePath,
+          schemaName: getSchemaName(method, "params"),
+          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 };
@@ -7474,8 +7505,10 @@ var init_agentHandle = __esm({
 // src/injection/injectParams.ts
 function getBuiltinInjectionValue(type, ctx, body) {
   switch (type) {
-    case "query":
-      return queryToObject(ctx.query);
+    case "query": {
+      const validated = ctx.__validatedQuery;
+      return validated ?? queryToObject(ctx.query);
+    }
     case "params":
       return ctx.params;
     case "headers":
@@ -8738,7 +8771,48 @@ function createRoutePipeline(opts) {
     if (!result.valid) {
       throw new ValidationError("\u53C2\u6570\u6821\u9A8C\u5931\u8D25", result.issues);
     }
-    const body = inputType === "query" && hasBody(route.method) ? await resolveBodyForQueryMethod(request) : hasBody(route.method) ? result.data : void 0;
+    if (inputType === "query" && result.data !== input && typeof result.data === "object" && result.data !== null) {
+      ctx.__validatedQuery = {
+        ...input,
+        ...result.data
+      };
+    }
+    const paramsResult = await validateInput(schemaPath, route.method, "params", match.params);
+    if (!paramsResult.valid) {
+      throw new ValidationError("\u53C2\u6570\u6821\u9A8C\u5931\u8D25", paramsResult.issues);
+    }
+    if (paramsResult.data !== match.params) {
+      ctx.params = typeof paramsResult.data === "object" && paramsResult.data !== null ? {
+        ...match.params,
+        ...paramsResult.data
+      } : match.params;
+    }
+    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);
@@ -8828,6 +8902,7 @@ var init_createServer = __esm({
     init_httpErrors();
     init_validateInput();
     init_inputType();
+    init_queryToObject();
     init_getClientIp();
     init_cors();
     init_helmet();