Merge pull request #16 from maxholman/fix/valibot-type-null

maxholman · web-flow · commit f6ad2cc37a7f · 2026-04-09T17:44:13.000+07:00
fix: generate v.null() for type: "null" schemas in valibot
diff --git a/__tests__/__snapshots__/nullables.test.ts.snap b/__tests__/__snapshots__/nullables.test.ts.snap
@@ -75,6 +75,13 @@ exports[`nullables 1`] = `
 "
 `;
 
+exports[`oneOf with type null generates v.null() 1`] = `
+"import * as v from "valibot";
+
+export const nullableImageSchema = v.union([v.string(), v.null()]);
+"
+`;
+
 exports[`query and header integer params coerce strings to numbers 1`] = `
 "export type Dummy = string;
 export type ExpireTime = number;
diff --git a/__tests__/nullables.test.ts b/__tests__/nullables.test.ts
@@ -103,6 +103,26 @@ test("const values", async () => {
 	expect(result.valibotFile?.getText()).toMatchSnapshot();
 });
 
+test("oneOf with type null generates v.null()", async () => {
+	const result = await processOpenApiDocument(
+		"/tmp/like-you-know-whatever",
+		{
+			openapi: "3.1.0",
+			info: { title: "Test", version: "1.0.0" },
+			paths: {},
+			components: {
+				schemas: {
+					NullableImage: {
+						oneOf: [{ type: "string", format: "uri" }, { type: "null" }],
+					},
+				},
+			},
+		},
+	);
+
+	expect(result.valibotFile.getText()).toMatchSnapshot();
+});
+
 test("query and header integer params coerce strings to numbers", async () => {
 	const schema: oas31.OpenAPIObject = {
 		openapi: "3.1.0",
diff --git a/lib/valibot.ts b/lib/valibot.ts
@@ -284,6 +284,10 @@ export function schemaToValidator(
 		return maybeNullable(vcall("strictObject", strictObjectWriter), isNullable);
 	}
 
+	if (schema.type === "null") {
+		return vcall("null");
+	}
+
 	return vcall("unknown");
 }
 

Original file line number	Diff line number	Diff line change
`@@ -284,6 +284,10 @@ export function schemaToValidator(`
`284`	`284`	`return maybeNullable(vcall("strictObject", strictObjectWriter), isNullable);`
`285`	`285`	`}`
`286`	`286`
	`287`	`+ if (schema.type === "null") {`
	`288`	`+ return vcall("null");`
	`289`	`+ }`
	`290`	`+`
`287`	`291`	`return vcall("unknown");`
`288`	`292`	`}`
`289`	`293`