这是indexloc提供的服务，不要输入任何密码
Skip to content

refactor: valibot plugin use dsl #2997

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

Merged
merged 1 commit into from
Nov 17, 2025
+1,026 −2,090
Merged

refactor: valibot plugin use dsl #2997

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ...test/__snapshots__/2.0.x/plugins/@hey-api/transformers/type-format-valibot/valibot.gen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export const vFoo = v.object({
v.number(),
v.string(),
v.bigint()
]), v.transform(x => BigInt(x)), v.minValue(BigInt('-9223372036854775808'), 'Invalid value: Expected int64 to be >= -2^63'), v.maxValue(BigInt('9223372036854775807'), 'Invalid value: Expected int64 to be <= 2^63-1')), BigInt(0)),
]), v.transform(x => BigInt(x)), v.minValue(BigInt("-9223372036854775808"), "Invalid value: Expected int64 to be >= -2^63"), v.maxValue(BigInt("9223372036854775807"), "Invalid value: Expected int64 to be <= 2^63-1")), BigInt(0)),
id: v.string()
});

Expand Down
116 changes: 47 additions & 69 deletions ...ges/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/valibot/default/valibot.gen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,12 @@ export const vSimpleStringWithPattern = v.pipe(v.string(), v.maxLength(64), v.re
* This is a simple enum with strings
*/
export const vEnumWithStrings = v.picklist([
'Success',
'Warning',
'Error',
"Success",
"Warning",
"Error",
"'Single Quote'",
'"Double Quotes"',
'Non-ascii: øæåôöØÆÅÔÖ字符串'
"\"Double Quotes\"",
"Non-ascii: øæåôöØÆÅÔÖ字符串"
]);

/**
Expand Down Expand Up @@ -197,33 +197,27 @@ export const vModelWithStringError = v.object({
* This is a model with one string property
*/
export const vModelWithNullableString = v.object({
nullableProp: v.optional(v.union([
v.string(),
v.null()
])),
nullableRequiredProp: v.union([
v.string(),
v.null()
])
nullableProp: v.optional(v.union([v.string(), v.null()])),
nullableRequiredProp: v.union([v.string(), v.null()])
});

/**
* This is a model with one enum
*/
export const vModelWithEnum = v.object({
test: v.optional(v.picklist([
'Success',
'Warning',
'Error',
'ØÆÅ字符串'
"Success",
"Warning",
"Error",
"ØÆÅ字符串"
])),
statusCode: v.optional(v.picklist([
'100',
'200 FOO',
'300 FOO_BAR',
'400 foo-bar',
'500 foo.bar',
'600 foo&bar'
"100",
"200 FOO",
"300 FOO_BAR",
"400 foo-bar",
"500 foo.bar",
"600 foo&bar"
])),
bool: v.optional(v.unknown())
});
Expand All @@ -240,15 +234,15 @@ export const vModelWithEnumFromDescription = v.object({
*/
export const vModelWithNestedEnums = v.object({
dictionaryWithEnum: v.optional(v.record(v.string(), v.picklist([
'Success',
'Warning',
'Error'
"Success",
"Warning",
"Error"
]))),
dictionaryWithEnumFromDescription: v.optional(v.record(v.string(), v.pipe(v.number(), v.integer()))),
arrayWithEnum: v.optional(v.array(v.picklist([
'Success',
'Warning',
'Error'
"Success",
"Warning",
"Error"
]))),
arrayWithDescription: v.optional(v.array(v.pipe(v.number(), v.integer())))
});
Expand All @@ -273,9 +267,7 @@ export const vModelWithDictionary = v.object({
* This is a model with one property containing a circular reference
*/
export const vModelWithCircularReference: v.GenericSchema = v.object({
prop: v.optional(v.lazy(() => {
return vModelWithCircularReference;
}))
prop: v.optional(v.lazy(() => vModelWithCircularReference))
});

/**
Expand Down Expand Up @@ -341,13 +333,10 @@ export const vModelWithDuplicateImports = v.object({
/**
* This is a model that extends another model
*/
export const vModelThatExtends = v.intersect([
vModelWithString,
v.object({
export const vModelThatExtends = v.intersect([vModelWithString, v.object({
propExtendsA: v.optional(v.string()),
propExtendsB: v.optional(vModelWithString)
})
]);
})]);

/**
* This is a model that extends another model
Expand Down Expand Up @@ -553,33 +542,31 @@ export const vCallWithDefaultParametersData = v.object({
body: v.optional(v.never()),
path: v.optional(v.never()),
query: v.object({
parameterString: v.optional(v.string(), 'Hello World!'),
parameterString: v.optional(v.string(), "Hello World!"),
parameterNumber: v.optional(v.number(), 123),
parameterBoolean: v.optional(v.boolean(), true),
parameterEnum: v.picklist([
'Success',
'Warning',
'Error'
"Success",
"Warning",
"Error"
]),
parameterModel: v.optional(v.object({
prop: v.optional(v.string())
}), {
prop: 'Hello World!'
})
}), { prop: "Hello World!" })
})
});

export const vCallWithDefaultOptionalParametersData = v.object({
body: v.optional(v.never()),
path: v.optional(v.never()),
query: v.optional(v.object({
parameterString: v.optional(v.string(), 'Hello World!'),
parameterString: v.optional(v.string(), "Hello World!"),
parameterNumber: v.optional(v.number(), 123),
parameterBoolean: v.optional(v.boolean(), true),
parameterEnum: v.optional(v.picklist([
'Success',
'Warning',
'Error'
"Success",
"Warning",
"Error"
]))
}))
});
Expand All @@ -588,20 +575,14 @@ export const vCallToTestOrderOfParamsData = v.object({
body: v.optional(v.never()),
path: v.optional(v.never()),
query: v.object({
parameterOptionalStringWithDefault: v.optional(v.string(), 'Hello World!'),
parameterOptionalStringWithEmptyDefault: v.optional(v.string(), ''),
parameterOptionalStringWithDefault: v.optional(v.string(), "Hello World!"),
parameterOptionalStringWithEmptyDefault: v.optional(v.string(), ""),
parameterOptionalStringWithNoDefault: v.optional(v.string()),
parameterStringWithDefault: v.optional(v.string(), 'Hello World!'),
parameterStringWithEmptyDefault: v.optional(v.string(), ''),
parameterStringWithDefault: v.optional(v.string(), "Hello World!"),
parameterStringWithEmptyDefault: v.optional(v.string(), ""),
parameterStringWithNoDefault: v.string(),
parameterStringNullableWithNoDefault: v.optional(v.union([
v.string(),
v.null()
])),
parameterStringNullableWithDefault: v.optional(v.union([
v.string(),
v.null()
]), null)
parameterStringNullableWithNoDefault: v.optional(v.union([v.string(), v.null()])),
parameterStringNullableWithDefault: v.optional(v.union([v.string(), v.null()]), null)
})
});

Expand Down Expand Up @@ -641,10 +622,7 @@ export const vCallWithResponseAndNoContentResponseData = v.object({
query: v.optional(v.never())
});

export const vCallWithResponseAndNoContentResponseResponse = v.union([
v.number(),
v.unknown()
]);
export const vCallWithResponseAndNoContentResponseResponse = v.union([v.number(), v.unknown()]);

export const vDummyAData = v.object({
body: v.optional(v.never()),
Expand Down Expand Up @@ -711,18 +689,18 @@ export const vCollectionFormatData = v.object({
export const vTypesData = v.object({
body: v.optional(v.never()),
path: v.optional(v.object({
id: v.optional(v.pipe(v.number(), v.integer(), v.minValue(-2147483648, 'Invalid value: Expected int32 to be >= -2^31'), v.maxValue(2147483647, 'Invalid value: Expected int32 to be <= 2^31-1')))
id: v.optional(v.pipe(v.number(), v.integer(), v.minValue(-2147483648, "Invalid value: Expected int32 to be >= -2^31"), v.maxValue(2147483647, "Invalid value: Expected int32 to be <= 2^31-1")))
})),
query: v.object({
parameterNumber: v.optional(v.number(), 123),
parameterString: v.optional(v.string(), 'default'),
parameterString: v.optional(v.string(), "default"),
parameterBoolean: v.optional(v.boolean(), true),
parameterArray: v.array(v.string()),
parameterDictionary: v.record(v.string(), v.unknown()),
parameterEnum: v.picklist([
'Success',
'Warning',
'Error'
"Success",
"Warning",
"Error"
])
})
});
Expand Down
15 changes: 3 additions & 12 deletions packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/enum-null/valibot.gen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,8 @@

import * as v from 'valibot';

export const vFoo = v.nullable(v.picklist([
'foo',
'bar'
]));
export const vFoo = v.nullable(v.picklist(["foo", "bar"]));

export const vBar = v.picklist([
'foo',
'bar'
]);
export const vBar = v.picklist(["foo", "bar"]);

export const vBaz = v.picklist([
'foo',
'bar'
]);
export const vBaz = v.picklist(["foo", "bar"]);
2 changes: 1 addition & 1 deletion ...test/__snapshots__/3.0.x/plugins/@hey-api/transformers/type-format-valibot/valibot.gen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export const vFoo = v.object({
v.number(),
v.string(),
v.bigint()
]), v.transform(x => BigInt(x)), v.minValue(BigInt('-9223372036854775808'), 'Invalid value: Expected int64 to be >= -2^63'), v.maxValue(BigInt('9223372036854775807'), 'Invalid value: Expected int64 to be <= 2^63-1')), BigInt(0)),
]), v.transform(x => BigInt(x)), v.minValue(BigInt("-9223372036854775808"), "Invalid value: Expected int64 to be >= -2^63"), v.maxValue(BigInt("9223372036854775807"), "Invalid value: Expected int64 to be <= 2^63-1")), BigInt(0)),
id: v.string()
});

Expand Down
Loading
Loading