Merge pull request #15 from maxholman/fix/ref-query-header-coercion

maxholman · web-flow · commit 59fe1ed31127 · 2026-04-09T15:54:16.000+07:00
fix: resolve $ref schemas for query and header param coercion
diff --git a/__tests__/__snapshots__/nullables.test.ts.snap b/__tests__/__snapshots__/nullables.test.ts.snap
@@ -77,6 +77,7 @@ exports[`nullables 1`] = `
 
 exports[`query and header integer params coerce strings to numbers 1`] = `
 "export type Dummy = string;
+export type ExpireTime = number;
 export type ListFilesCommandQuery = {
         exp: \`\${number}\`;
         limit?: \`\${number}\` | undefined;
@@ -92,6 +93,7 @@ exports[`query and header integer params coerce strings to numbers 2`] = `
 "import * as v from "valibot";
 
 export const dummySchema = v.string();
+export const expireTimeSchema = v.pipe(v.number(), v.integer(), v.minValue(0));
 export const listFilesCommandQuerySchema = v.strictObject({
         "exp": v.pipe(v.string(), v.digits(), v.transform((n) => Number.parseInt(n, 10)), v.number(), v.integer(), v.minValue(0)),
         "limit": v.exactOptional(v.pipe(v.string(), v.digits(), v.transform((n) => Number.parseInt(n, 10)), v.number(), v.integer(), v.minValue(1), v.maxValue(100)))
diff --git a/__tests__/nullables.test.ts b/__tests__/nullables.test.ts
@@ -113,6 +113,11 @@ test("query and header integer params coerce strings to numbers", async () => {
 		components: {
 			schemas: {
 				Dummy: { type: "string" },
+				ExpireTime: {
+					type: "integer",
+					format: "int64",
+					minimum: 0,
+				},
 			},
 		},
 		paths: {
@@ -125,9 +130,7 @@ test("query and header integer params coerce strings to numbers", async () => {
 							in: "query",
 							required: true,
 							schema: {
-								type: "integer",
-								format: "int64",
-								minimum: 0,
+								$ref: "#/components/schemas/ExpireTime",
 							},
 						},
 						{
diff --git a/lib/process-document.ts b/lib/process-document.ts
@@ -407,12 +407,32 @@ export async function processOpenApiDocument(
 							// });
 						}
 
-						if (resolvedParameter.in === "query") {
-							queryParameters.push(resolvedParameter);
-						}
+						if (
+							resolvedParameter.in === "query" ||
+							resolvedParameter.in === "header"
+						) {
+							// Resolve $ref schemas so the valibot coercion
+							// pipeline can inspect the underlying type
+							const resolvedSchema =
+								resolvedParameter.schema &&
+								"$ref" in resolvedParameter.schema
+									? (refs.get(resolvedParameter.schema.$ref) ?? undefined)
+									: undefined;
+
+							const paramWithResolvedSchema: oas30.ParameterObject = {
+								...resolvedParameter,
+								...(resolvedSchema &&
+									typeof resolvedSchema === "object" &&
+									!Array.isArray(resolvedSchema) && {
+										schema: resolvedSchema,
+									}),
+							};
 
-						if (resolvedParameter.in === "header") {
-							headerParameters.push(resolvedParameter);
+							if (resolvedParameter.in === "query") {
+								queryParameters.push(paramWithResolvedSchema);
+							} else {
+								headerParameters.push(paramWithResolvedSchema);
+							}
 						}
 					}
 
