Valibot: correctly support format: int64

packages/openapi-ts-tests/main/test/3.1.x.test.ts

@@ -798,6 +798,15 @@ describe(`OpenAPI ${version}`, () => {
       }),
       description: "validator schemas with merged unions (can't use .merge())",
     },
+    {
+      config: createConfig({
+        input: 'integer-formats.json',
+        output: 'integer-formats',
+        plugins: ['valibot'],
+      }),
+      description:
+        'generates validator schemas for all integer format combinations (number/integer/string types with int8, int16, int32, int64, uint8, uint16, uint32, uint64 formats)',
+    },
   ];
 
   it.each(scenarios)('$description', async ({ config }) => {

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

@@ -4,7 +4,11 @@ import * as v from 'valibot';
 
 export const vFoo = v.object({
     bar: v.optional(v.pipe(v.number(), v.integer())),
-    foo: v.optional(v.bigint(), BigInt(0)),
+    foo: v.optional(v.pipe(v.union([
+        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)),
     id: v.string()
 });
 

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

@@ -664,7 +664,7 @@ 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()))
+        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),

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

@@ -4,7 +4,11 @@ import * as v from 'valibot';
 
 export const vFoo = v.object({
     bar: v.optional(v.pipe(v.number(), v.integer())),
-    foo: v.optional(v.bigint(), BigInt(0)),
+    foo: v.optional(v.pipe(v.union([
+        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)),
     id: v.string()
 });
 

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

@@ -714,8 +714,8 @@ export const vDefault = v.object({
 });
 
 export const vPageable = v.object({
-    page: v.optional(v.pipe(v.number(), v.integer(), v.minValue(0)), 0),
-    size: v.optional(v.pipe(v.number(), v.integer(), v.minValue(1))),
+    page: 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'), v.minValue(0)), 0),
+    size: 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'), v.minValue(1))),
     sort: v.optional(v.array(v.string()))
 });
 
@@ -775,10 +775,10 @@ export const vCompositionWithOneOfAndProperties = v.intersect([
     ]),
     v.object({
         baz: v.union([
-            v.pipe(v.number(), v.integer(), v.minValue(0)),
+            v.pipe(v.number(), v.integer(), v.minValue(0, 'Invalid value: Expected uint16 to be >= 0'), v.maxValue(65535, 'Invalid value: Expected uint16 to be <= 2^16-1'), v.minValue(0)),
             v.null()
         ]),
-        qux: v.pipe(v.number(), v.integer(), v.minValue(0))
+        qux: v.pipe(v.number(), v.integer(), v.minValue(0, 'Invalid value: Expected uint8 to be >= 0'), v.maxValue(255, 'Invalid value: Expected uint8 to be <= 2^8-1'), v.minValue(0))
     })
 ]);
 
@@ -943,10 +943,10 @@ export const vModelWithOneOfAndProperties = v.intersect([
     ]),
     v.object({
         baz: v.union([
-            v.pipe(v.number(), v.integer(), v.minValue(0)),
+            v.pipe(v.number(), v.integer(), v.minValue(0, 'Invalid value: Expected uint16 to be >= 0'), v.maxValue(65535, 'Invalid value: Expected uint16 to be <= 2^16-1'), v.minValue(0)),
             v.null()
         ]),
-        qux: v.pipe(v.number(), v.integer(), v.minValue(0))
+        qux: v.pipe(v.number(), v.integer(), v.minValue(0, 'Invalid value: Expected uint8 to be >= 0'), v.maxValue(255, 'Invalid value: Expected uint8 to be <= 2^8-1'), v.minValue(0))
     })
 ]);
 
@@ -1812,7 +1812,7 @@ 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()))
+        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),
@@ -1958,15 +1958,15 @@ export const vComplexParamsData = v.object({
             vModelWithDictionary
         ]),
         user: v.optional(v.pipe(v.object({
-            id: v.optional(v.pipe(v.pipe(v.number(), v.integer()), v.readonly())),
+            id: v.optional(v.pipe(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')), v.readonly())),
             name: v.optional(v.pipe(v.union([
                 v.pipe(v.string(), v.readonly()),
                 v.null()
             ]), v.readonly()))
         }), v.readonly()))
     })),
     path: v.object({
-        id: v.pipe(v.number(), v.integer()),
+        id: 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')),
         'api-version': v.string()
     }),
     query: v.optional(v.never())

packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/integer-formats/valibot.gen.ts

@@ -0,0 +1,50 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import * as v from 'valibot';
+
+export const vIntegerFormats = v.object({
+    numberNoFormat: v.optional(v.number()),
+    numberInt8: v.optional(v.pipe(v.number(), v.minValue(-128, 'Invalid value: Expected int8 to be >= -2^7'), v.maxValue(127, 'Invalid value: Expected int8 to be <= 2^7-1'))),
+    numberInt16: v.optional(v.pipe(v.number(), v.minValue(-32768, 'Invalid value: Expected int16 to be >= -2^15'), v.maxValue(32767, 'Invalid value: Expected int16 to be <= 2^15-1'))),
+    numberInt32: v.optional(v.pipe(v.number(), v.minValue(-2147483648, 'Invalid value: Expected int32 to be >= -2^31'), v.maxValue(2147483647, 'Invalid value: Expected int32 to be <= 2^31-1'))),
+    numberInt64: v.optional(v.pipe(v.union([
+        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'))),
+    numberUint8: v.optional(v.pipe(v.number(), v.minValue(0, 'Invalid value: Expected uint8 to be >= 0'), v.maxValue(255, 'Invalid value: Expected uint8 to be <= 2^8-1'))),
+    numberUint16: v.optional(v.pipe(v.number(), v.minValue(0, 'Invalid value: Expected uint16 to be >= 0'), v.maxValue(65535, 'Invalid value: Expected uint16 to be <= 2^16-1'))),
+    numberUint32: v.optional(v.pipe(v.number(), v.minValue(0, 'Invalid value: Expected uint32 to be >= 0'), v.maxValue(4294967295, 'Invalid value: Expected uint32 to be <= 2^32-1'))),
+    numberUint64: v.optional(v.pipe(v.union([
+        v.number(),
+        v.string(),
+        v.bigint()
+    ]), v.transform(x => BigInt(x)), v.minValue(BigInt('0'), 'Invalid value: Expected uint64 to be >= 0'), v.maxValue(BigInt('18446744073709551615'), 'Invalid value: Expected uint64 to be <= 2^64-1'))),
+    integerNoFormat: v.optional(v.pipe(v.number(), v.integer())),
+    integerInt8: v.optional(v.pipe(v.number(), v.integer(), v.minValue(-128, 'Invalid value: Expected int8 to be >= -2^7'), v.maxValue(127, 'Invalid value: Expected int8 to be <= 2^7-1'))),
+    integerInt16: v.optional(v.pipe(v.number(), v.integer(), v.minValue(-32768, 'Invalid value: Expected int16 to be >= -2^15'), v.maxValue(32767, 'Invalid value: Expected int16 to be <= 2^15-1'))),
+    integerInt32: 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'))),
+    integerInt64: v.optional(v.pipe(v.union([
+        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'))),
+    integerUint8: v.optional(v.pipe(v.number(), v.integer(), v.minValue(0, 'Invalid value: Expected uint8 to be >= 0'), v.maxValue(255, 'Invalid value: Expected uint8 to be <= 2^8-1'))),
+    integerUint16: v.optional(v.pipe(v.number(), v.integer(), v.minValue(0, 'Invalid value: Expected uint16 to be >= 0'), v.maxValue(65535, 'Invalid value: Expected uint16 to be <= 2^16-1'))),
+    integerUint32: v.optional(v.pipe(v.number(), v.integer(), v.minValue(0, 'Invalid value: Expected uint32 to be >= 0'), v.maxValue(4294967295, 'Invalid value: Expected uint32 to be <= 2^32-1'))),
+    integerUint64: v.optional(v.pipe(v.union([
+        v.number(),
+        v.string(),
+        v.bigint()
+    ]), v.transform(x => BigInt(x)), v.minValue(BigInt('0'), 'Invalid value: Expected uint64 to be >= 0'), v.maxValue(BigInt('18446744073709551615'), 'Invalid value: Expected uint64 to be <= 2^64-1'))),
+    stringInt64: v.optional(v.pipe(v.union([
+        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'))),
+    stringUint64: v.optional(v.pipe(v.union([
+        v.number(),
+        v.string(),
+        v.bigint()
+    ]), v.transform(x => BigInt(x)), v.minValue(BigInt('0'), 'Invalid value: Expected uint64 to be >= 0'), v.maxValue(BigInt('18446744073709551615'), 'Invalid value: Expected uint64 to be <= 2^64-1')))
+});

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

@@ -4,7 +4,11 @@ import * as v from 'valibot';
 
 export const vFoo = v.object({
     bar: v.optional(v.pipe(v.number(), v.integer())),
-    foo: v.optional(v.bigint(), BigInt(0)),
+    foo: v.optional(v.pipe(v.union([
+        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)),
     id: v.string()
 });
 

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

@@ -709,8 +709,8 @@ export const vDefault = v.object({
 });
 
 export const vPageable = v.object({
-    page: v.optional(v.pipe(v.number(), v.integer(), v.minValue(0)), 0),
-    size: v.optional(v.pipe(v.number(), v.integer(), v.minValue(1))),
+    page: 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'), v.minValue(0)), 0),
+    size: 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'), v.minValue(1))),
     sort: v.optional(v.array(v.string()))
 });
 
@@ -766,10 +766,10 @@ export const vCompositionWithOneOfAndProperties = v.intersect([
     ]),
     v.object({
         baz: v.union([
-            v.pipe(v.number(), v.integer(), v.minValue(0)),
+            v.pipe(v.number(), v.integer(), v.minValue(0, 'Invalid value: Expected uint16 to be >= 0'), v.maxValue(65535, 'Invalid value: Expected uint16 to be <= 2^16-1'), v.minValue(0)),
             v.null()
         ]),
-        qux: v.pipe(v.number(), v.integer(), v.minValue(0))
+        qux: v.pipe(v.number(), v.integer(), v.minValue(0, 'Invalid value: Expected uint8 to be >= 0'), v.maxValue(255, 'Invalid value: Expected uint8 to be <= 2^8-1'), v.minValue(0))
     })
 ]);
 
@@ -941,10 +941,10 @@ export const vModelWithOneOfAndProperties = v.intersect([
     ]),
     v.object({
         baz: v.union([
-            v.pipe(v.number(), v.integer(), v.minValue(0)),
+            v.pipe(v.number(), v.integer(), v.minValue(0, 'Invalid value: Expected uint16 to be >= 0'), v.maxValue(65535, 'Invalid value: Expected uint16 to be <= 2^16-1'), v.minValue(0)),
             v.null()
         ]),
-        qux: v.pipe(v.number(), v.integer(), v.minValue(0))
+        qux: v.pipe(v.number(), v.integer(), v.minValue(0, 'Invalid value: Expected uint8 to be >= 0'), v.maxValue(255, 'Invalid value: Expected uint8 to be <= 2^8-1'), v.minValue(0))
     })
 ]);
 
@@ -1817,7 +1817,7 @@ 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()))
+        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),
@@ -1964,15 +1964,15 @@ export const vComplexParamsData = v.object({
             vModelWithDictionary
         ]),
         user: v.optional(v.pipe(v.object({
-            id: v.optional(v.pipe(v.pipe(v.number(), v.integer()), v.readonly())),
+            id: v.optional(v.pipe(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')), v.readonly())),
             name: v.optional(v.pipe(v.union([
                 v.pipe(v.string(), v.readonly()),
                 v.null()
             ]), v.readonly()))
         }), v.readonly()))
     })),
     path: v.object({
-        id: v.pipe(v.number(), v.integer()),
+        id: 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')),
         'api-version': v.string()
     }),
     query: v.optional(v.never())

packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/schema-const/types.gen.ts

@@ -16,6 +16,24 @@ export type Foo = {
         [key: string]: unknown;
     };
     garply?: 10n;
+    numberInt8?: 100;
+    numberInt16?: 1000;
+    numberInt32?: 100000;
+    numberInt64?: 1000000000000;
+    numberUint8?: 200;
+    numberUint16?: 50000;
+    numberUint32?: 3000000000;
+    numberUint64?: 18000000000000000000;
+    integerInt8?: -100;
+    integerInt16?: -1000;
+    integerInt32?: -100000;
+    integerInt64?: -1000000000000;
+    integerUint8?: 255;
+    integerUint16?: 65535;
+    integerUint32?: 4294967295;
+    integerUint64?: 18446744073709551615n;
+    stringInt64?: '-9223372036854775808';
+    stringUint64?: '18446744073709551615';
 };
 
 export type ClientOptions = {

packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/schema-const/valibot.gen.ts

@@ -15,5 +15,23 @@ export const vFoo = v.object({
         v.literal(true)
     ])),
     corge: v.optional(v.object({})),
-    garply: v.optional(v.bigint())
+    garply: v.optional(v.literal(BigInt('10'))),
+    numberInt8: v.optional(v.literal(100)),
+    numberInt16: v.optional(v.literal(1000)),
+    numberInt32: v.optional(v.literal(100000)),
+    numberInt64: v.optional(v.literal(BigInt('1000000000000'))),
+    numberUint8: v.optional(v.literal(200)),
+    numberUint16: v.optional(v.literal(50000)),
+    numberUint32: v.optional(v.literal(3000000000)),
+    numberUint64: v.optional(v.literal(BigInt('18000000000000000000'))),
+    integerInt8: v.optional(v.literal(-100)),
+    integerInt16: v.optional(v.literal(-1000)),
+    integerInt32: v.optional(v.literal(-100000)),
+    integerInt64: v.optional(v.literal(BigInt('-1000000000000'))),
+    integerUint8: v.optional(v.literal(255)),
+    integerUint16: v.optional(v.literal(65535)),
+    integerUint32: v.optional(v.literal(4294967295)),
+    integerUint64: v.optional(v.literal(BigInt('18446744073709551615'))),
+    stringInt64: v.optional(v.literal(BigInt('-9223372036854775808'))),
+    stringUint64: v.optional(v.literal(BigInt('18446744073709551615')))
 });

packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/validators-bigint-min-max/valibot.gen.ts

@@ -3,5 +3,9 @@
 import * as v from 'valibot';
 
 export const vFoo = v.object({
-    foo: v.optional(v.pipe(v.bigint(), v.minValue(BigInt(0)), v.maxValue(BigInt(100))))
+    foo: v.optional(v.pipe(v.union([
+        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'), v.minValue(BigInt(0)), v.maxValue(BigInt(100))))
 });