Skip to content

Commit 595ae0e

Browse files
mrlubosmrlubos
authored
Merge pull request #2997 from hey-api/refactor/dsl-type-nodes-6
refactor: valibot plugin use dsl
2 parents 7b9a4d0 + 7b18139 commit 595ae0e

File tree

39 files changed

+1026
-2090
lines changed

39 files changed

+1026
-2090
lines changed

‎packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/transformers/type-format-valibot/valibot.gen.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export const vFoo = v.object({
88
v.number(),
99
v.string(),
1010
v.bigint()
11-
]), 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)),
11+
]), 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)),
1212
id: v.string()
1313
});
1414

‎packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/valibot/default/valibot.gen.ts‎

Lines changed: 47 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,12 @@ export const vSimpleStringWithPattern = v.pipe(v.string(), v.maxLength(64), v.re
7474
* This is a simple enum with strings
7575
*/
7676
export const vEnumWithStrings = v.picklist([
77-
'Success',
78-
'Warning',
79-
'Error',
77+
"Success",
78+
"Warning",
79+
"Error",
8080
"'Single Quote'",
81-
'"Double Quotes"',
82-
'Non-ascii: øæåôöØÆÅÔÖ字符串'
81+
"\"Double Quotes\"",
82+
"Non-ascii: øæåôöØÆÅÔÖ字符串"
8383
]);
8484

8585
/**
@@ -197,33 +197,27 @@ export const vModelWithStringError = v.object({
197197
* This is a model with one string property
198198
*/
199199
export const vModelWithNullableString = v.object({
200-
nullableProp: v.optional(v.union([
201-
v.string(),
202-
v.null()
203-
])),
204-
nullableRequiredProp: v.union([
205-
v.string(),
206-
v.null()
207-
])
200+
nullableProp: v.optional(v.union([v.string(), v.null()])),
201+
nullableRequiredProp: v.union([v.string(), v.null()])
208202
});
209203

210204
/**
211205
* This is a model with one enum
212206
*/
213207
export const vModelWithEnum = v.object({
214208
test: v.optional(v.picklist([
215-
'Success',
216-
'Warning',
217-
'Error',
218-
'ØÆÅ字符串'
209+
"Success",
210+
"Warning",
211+
"Error",
212+
"ØÆÅ字符串"
219213
])),
220214
statusCode: v.optional(v.picklist([
221-
'100',
222-
'200 FOO',
223-
'300 FOO_BAR',
224-
'400 foo-bar',
225-
'500 foo.bar',
226-
'600 foo&bar'
215+
"100",
216+
"200 FOO",
217+
"300 FOO_BAR",
218+
"400 foo-bar",
219+
"500 foo.bar",
220+
"600 foo&bar"
227221
])),
228222
bool: v.optional(v.unknown())
229223
});
@@ -240,15 +234,15 @@ export const vModelWithEnumFromDescription = v.object({
240234
*/
241235
export const vModelWithNestedEnums = v.object({
242236
dictionaryWithEnum: v.optional(v.record(v.string(), v.picklist([
243-
'Success',
244-
'Warning',
245-
'Error'
237+
"Success",
238+
"Warning",
239+
"Error"
246240
]))),
247241
dictionaryWithEnumFromDescription: v.optional(v.record(v.string(), v.pipe(v.number(), v.integer()))),
248242
arrayWithEnum: v.optional(v.array(v.picklist([
249-
'Success',
250-
'Warning',
251-
'Error'
243+
"Success",
244+
"Warning",
245+
"Error"
252246
]))),
253247
arrayWithDescription: v.optional(v.array(v.pipe(v.number(), v.integer())))
254248
});
@@ -273,9 +267,7 @@ export const vModelWithDictionary = v.object({
273267
* This is a model with one property containing a circular reference
274268
*/
275269
export const vModelWithCircularReference: v.GenericSchema = v.object({
276-
prop: v.optional(v.lazy(() => {
277-
return vModelWithCircularReference;
278-
}))
270+
prop: v.optional(v.lazy(() => vModelWithCircularReference))
279271
});
280272

281273
/**
@@ -341,13 +333,10 @@ export const vModelWithDuplicateImports = v.object({
341333
/**
342334
* This is a model that extends another model
343335
*/
344-
export const vModelThatExtends = v.intersect([
345-
vModelWithString,
346-
v.object({
336+
export const vModelThatExtends = v.intersect([vModelWithString, v.object({
347337
propExtendsA: v.optional(v.string()),
348338
propExtendsB: v.optional(vModelWithString)
349-
})
350-
]);
339+
})]);
351340

352341
/**
353342
* This is a model that extends another model
@@ -553,33 +542,31 @@ export const vCallWithDefaultParametersData = v.object({
553542
body: v.optional(v.never()),
554543
path: v.optional(v.never()),
555544
query: v.object({
556-
parameterString: v.optional(v.string(), 'Hello World!'),
545+
parameterString: v.optional(v.string(), "Hello World!"),
557546
parameterNumber: v.optional(v.number(), 123),
558547
parameterBoolean: v.optional(v.boolean(), true),
559548
parameterEnum: v.picklist([
560-
'Success',
561-
'Warning',
562-
'Error'
549+
"Success",
550+
"Warning",
551+
"Error"
563552
]),
564553
parameterModel: v.optional(v.object({
565554
prop: v.optional(v.string())
566-
}), {
567-
prop: 'Hello World!'
568-
})
555+
}), { prop: "Hello World!" })
569556
})
570557
});
571558

572559
export const vCallWithDefaultOptionalParametersData = v.object({
573560
body: v.optional(v.never()),
574561
path: v.optional(v.never()),
575562
query: v.optional(v.object({
576-
parameterString: v.optional(v.string(), 'Hello World!'),
563+
parameterString: v.optional(v.string(), "Hello World!"),
577564
parameterNumber: v.optional(v.number(), 123),
578565
parameterBoolean: v.optional(v.boolean(), true),
579566
parameterEnum: v.optional(v.picklist([
580-
'Success',
581-
'Warning',
582-
'Error'
567+
"Success",
568+
"Warning",
569+
"Error"
583570
]))
584571
}))
585572
});
@@ -588,20 +575,14 @@ export const vCallToTestOrderOfParamsData = v.object({
588575
body: v.optional(v.never()),
589576
path: v.optional(v.never()),
590577
query: v.object({
591-
parameterOptionalStringWithDefault: v.optional(v.string(), 'Hello World!'),
592-
parameterOptionalStringWithEmptyDefault: v.optional(v.string(), ''),
578+
parameterOptionalStringWithDefault: v.optional(v.string(), "Hello World!"),
579+
parameterOptionalStringWithEmptyDefault: v.optional(v.string(), ""),
593580
parameterOptionalStringWithNoDefault: v.optional(v.string()),
594-
parameterStringWithDefault: v.optional(v.string(), 'Hello World!'),
595-
parameterStringWithEmptyDefault: v.optional(v.string(), ''),
581+
parameterStringWithDefault: v.optional(v.string(), "Hello World!"),
582+
parameterStringWithEmptyDefault: v.optional(v.string(), ""),
596583
parameterStringWithNoDefault: v.string(),
597-
parameterStringNullableWithNoDefault: v.optional(v.union([
598-
v.string(),
599-
v.null()
600-
])),
601-
parameterStringNullableWithDefault: v.optional(v.union([
602-
v.string(),
603-
v.null()
604-
]), null)
584+
parameterStringNullableWithNoDefault: v.optional(v.union([v.string(), v.null()])),
585+
parameterStringNullableWithDefault: v.optional(v.union([v.string(), v.null()]), null)
605586
})
606587
});
607588

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

644-
export const vCallWithResponseAndNoContentResponseResponse = v.union([
645-
v.number(),
646-
v.unknown()
647-
]);
625+
export const vCallWithResponseAndNoContentResponseResponse = v.union([v.number(), v.unknown()]);
648626

649627
export const vDummyAData = v.object({
650628
body: v.optional(v.never()),
@@ -711,18 +689,18 @@ export const vCollectionFormatData = v.object({
711689
export const vTypesData = v.object({
712690
body: v.optional(v.never()),
713691
path: v.optional(v.object({
714-
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')))
692+
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")))
715693
})),
716694
query: v.object({
717695
parameterNumber: v.optional(v.number(), 123),
718-
parameterString: v.optional(v.string(), 'default'),
696+
parameterString: v.optional(v.string(), "default"),
719697
parameterBoolean: v.optional(v.boolean(), true),
720698
parameterArray: v.array(v.string()),
721699
parameterDictionary: v.record(v.string(), v.unknown()),
722700
parameterEnum: v.picklist([
723-
'Success',
724-
'Warning',
725-
'Error'
701+
"Success",
702+
"Warning",
703+
"Error"
726704
])
727705
})
728706
});

‎packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/enum-null/valibot.gen.ts‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,8 @@
22

33
import * as v from 'valibot';
44

5-
export const vFoo = v.nullable(v.picklist([
6-
'foo',
7-
'bar'
8-
]));
5+
export const vFoo = v.nullable(v.picklist(["foo", "bar"]));
96

10-
export const vBar = v.picklist([
11-
'foo',
12-
'bar'
13-
]);
7+
export const vBar = v.picklist(["foo", "bar"]);
148

15-
export const vBaz = v.picklist([
16-
'foo',
17-
'bar'
18-
]);
9+
export const vBaz = v.picklist(["foo", "bar"]);

‎packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/transformers/type-format-valibot/valibot.gen.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export const vFoo = v.object({
88
v.number(),
99
v.string(),
1010
v.bigint()
11-
]), 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)),
11+
]), 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)),
1212
id: v.string()
1313
});
1414

0 commit comments

Comments
 (0)