Skip to content

fix: Treat undefinedable like other "optional"-ish schemas #1319

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: Treat undefinedable like other "optional"-ish schemas #1319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bfe6468
Add `undefinedable` to locations where "optional"-ish checks exist;
thedustinsmith Sep 23, 2025
cb506e1
Add additional check for `undefinedable`
thedustinsmith Sep 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions library/src/schemas/looseObject/looseObject.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,8 @@ export function looseObject(
key in input ||
((valueSchema.type === 'exact_optional' ||
valueSchema.type === 'optional' ||
valueSchema.type === 'nullish') &&
valueSchema.type === 'nullish' ||
valueSchema.type === 'undefinedable') &&
// @ts-expect-error
valueSchema.default !== undefined)
) {
Expand Down Expand Up @@ -177,7 +178,8 @@ export function looseObject(
} else if (
valueSchema.type !== 'exact_optional' &&
valueSchema.type !== 'optional' &&
valueSchema.type !== 'nullish'
valueSchema.type !== 'nullish' &&
valueSchema.type !== 'undefinedable'
) {
_addIssue(this, 'key', dataset, config, {
input: undefined,
Expand Down
6 changes: 4 additions & 2 deletions library/src/schemas/looseObject/looseObjectAsync.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,8 @@ export function looseObjectAsync(
key in input ||
((valueSchema.type === 'exact_optional' ||
valueSchema.type === 'optional' ||
valueSchema.type === 'nullish') &&
valueSchema.type === 'nullish' ||
valueSchema.type === 'undefinedable') &&
// @ts-expect-error
valueSchema.default !== undefined)
) {
Expand Down Expand Up @@ -199,7 +200,8 @@ export function looseObjectAsync(
} else if (
valueSchema.type !== 'exact_optional' &&
valueSchema.type !== 'optional' &&
valueSchema.type !== 'nullish'
valueSchema.type !== 'nullish' &&
valueSchema.type !== 'undefinedable'
) {
_addIssue(this, 'key', dataset, config, {
input: undefined,
Expand Down
6 changes: 4 additions & 2 deletions library/src/schemas/object/object.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,8 @@ export function object(
key in input ||
((valueSchema.type === 'exact_optional' ||
valueSchema.type === 'optional' ||
valueSchema.type === 'nullish') &&
valueSchema.type === 'nullish' ||
valueSchema.type === 'undefinedable') &&
// @ts-expect-error
valueSchema.default !== undefined)
) {
Expand Down Expand Up @@ -180,7 +181,8 @@ export function object(
} else if (
valueSchema.type !== 'exact_optional' &&
valueSchema.type !== 'optional' &&
valueSchema.type !== 'nullish'
valueSchema.type !== 'nullish' &&
valueSchema.type !== 'undefinedable'
) {
_addIssue(this, 'key', dataset, config, {
input: undefined,
Expand Down
6 changes: 4 additions & 2 deletions library/src/schemas/object/objectAsync.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,8 @@ export function objectAsync(
key in input ||
((valueSchema.type === 'exact_optional' ||
valueSchema.type === 'optional' ||
valueSchema.type === 'nullish') &&
valueSchema.type === 'nullish' ||
valueSchema.type === 'undefinedable') &&
// @ts-expect-error
valueSchema.default !== undefined)
) {
Expand Down Expand Up @@ -202,7 +203,8 @@ export function objectAsync(
} else if (
valueSchema.type !== 'exact_optional' &&
valueSchema.type !== 'optional' &&
valueSchema.type !== 'nullish'
valueSchema.type !== 'nullish' &&
valueSchema.type !== 'undefinedable'
) {
_addIssue(this, 'key', dataset, config, {
input: undefined,
Expand Down
6 changes: 4 additions & 2 deletions library/src/schemas/objectWithRest/objectWithRest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,8 @@ export function objectWithRest(
key in input ||
((valueSchema.type === 'exact_optional' ||
valueSchema.type === 'optional' ||
valueSchema.type === 'nullish') &&
valueSchema.type === 'nullish' ||
valueSchema.type === 'undefinedable') &&
// @ts-expect-error
valueSchema.default !== undefined)
) {
Expand Down Expand Up @@ -200,7 +201,8 @@ export function objectWithRest(
} else if (
valueSchema.type !== 'exact_optional' &&
valueSchema.type !== 'optional' &&
valueSchema.type !== 'nullish'
valueSchema.type !== 'nullish' &&
valueSchema.type !== 'undefinedable'
) {
_addIssue(this, 'key', dataset, config, {
input: undefined,
Expand Down
6 changes: 4 additions & 2 deletions library/src/schemas/objectWithRest/objectWithRestAsync.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,8 @@ export function objectWithRestAsync(
key in input ||
((valueSchema.type === 'exact_optional' ||
valueSchema.type === 'optional' ||
valueSchema.type === 'nullish') &&
valueSchema.type === 'nullish' ||
valueSchema.type === 'undefinedable') &&
// @ts-expect-error
valueSchema.default !== undefined)
) {
Expand Down Expand Up @@ -250,7 +251,8 @@ export function objectWithRestAsync(
} else if (
valueSchema.type !== 'exact_optional' &&
valueSchema.type !== 'optional' &&
valueSchema.type !== 'nullish'
valueSchema.type !== 'nullish' &&
valueSchema.type !== 'undefinedable'
) {
_addIssue(this, 'key', dataset, config, {
input: undefined,
Expand Down
6 changes: 4 additions & 2 deletions library/src/schemas/strictObject/strictObject.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,8 @@ export function strictObject(
key in input ||
((valueSchema.type === 'exact_optional' ||
valueSchema.type === 'optional' ||
valueSchema.type === 'nullish') &&
valueSchema.type === 'nullish' ||
valueSchema.type === 'undefinedable') &&
// @ts-expect-error
valueSchema.default !== undefined)
) {
Expand Down Expand Up @@ -173,7 +174,8 @@ export function strictObject(
} else if (
valueSchema.type !== 'exact_optional' &&
valueSchema.type !== 'optional' &&
valueSchema.type !== 'nullish'
valueSchema.type !== 'nullish' &&
valueSchema.type !== 'undefinedable'
) {
_addIssue(this, 'key', dataset, config, {
input: undefined,
Expand Down
6 changes: 4 additions & 2 deletions library/src/schemas/strictObject/strictObjectAsync.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,8 @@ export function strictObjectAsync(
key in input ||
((valueSchema.type === 'exact_optional' ||
valueSchema.type === 'optional' ||
valueSchema.type === 'nullish') &&
valueSchema.type === 'nullish' ||
valueSchema.type === 'undefinedable') &&
// @ts-expect-error
valueSchema.default !== undefined)
) {
Expand Down Expand Up @@ -195,7 +196,8 @@ export function strictObjectAsync(
} else if (
valueSchema.type !== 'exact_optional' &&
valueSchema.type !== 'optional' &&
valueSchema.type !== 'nullish'
valueSchema.type !== 'nullish' &&
valueSchema.type !== 'undefinedable'
) {
_addIssue(this, 'key', dataset, config, {
input: undefined,
Expand Down
3 changes: 2 additions & 1 deletion library/src/schemas/variant/variant.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,8 @@ export function variant(
).issues
: discriminatorSchema.type !== 'exact_optional' &&
discriminatorSchema.type !== 'optional' &&
discriminatorSchema.type !== 'nullish'
discriminatorSchema.type !== 'nullish' &&
discriminatorSchema.type !== 'undefinedable'
) {
keysAreValid = false;

Expand Down
3 changes: 2 additions & 1 deletion library/src/schemas/variant/variantAsync.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,8 @@ export function variantAsync(
).issues
: discriminatorSchema.type !== 'exact_optional' &&
discriminatorSchema.type !== 'optional' &&
discriminatorSchema.type !== 'nullish'
discriminatorSchema.type !== 'nullish' &&
discriminatorSchema.type !== 'undefinedable'
) {
keysAreValid = false;

Expand Down
2 changes: 1 addition & 1 deletion packages/to-json-schema/src/converters/convertSchema/convertSchema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ export function convertSchema(
for (const key in valibotSchema.entries) {
const entry = valibotSchema.entries[key] as SchemaOrPipe;
jsonSchema.properties[key] = convertSchema({}, entry, config, context);
if (entry.type !== 'nullish' && entry.type !== 'optional') {
if (entry.type !== 'nullish' && entry.type !== 'optional' && entry.type !== 'undefinedable') {
jsonSchema.required.push(key);
}
}
Expand Down