refactor: clean up

Author: mrlubos

packages/openapi-ts-tests/valibot/v1/__snapshots__/3.1.x/discriminator-all-of/valibot.gen.ts

@@ -50,7 +50,7 @@ export const vBazUnion = v.object({
     baz: v.optional(v.string())
 });
 
-export const vFooUnion = v.variant('id', [v.intersect([v.object({
+export const vFooUnion = v.union([v.intersect([v.object({
             id: v.literal('bar')
         }), vBarUnion]), v.intersect([v.object({
             id: v.literal('baz')

packages/openapi-ts-tests/valibot/v1/__snapshots__/3.1.x/discriminator-any-of/valibot.gen.ts

@@ -13,15 +13,15 @@ export const vBaz = vQux;
 
 export const vBar = vQux;
 
-export const vFoo = v.variant('type', [v.intersect([v.object({
+export const vFoo = v.union([v.intersect([v.object({
             type: v.optional(v.literal('Bar'))
         }), vBar]), v.intersect([v.object({
             type: v.optional(v.literal('Baz'))
         }), vBaz])]);
 
 export const vSpæcial = vQux;
 
-export const vQuuz = v.variant('type', [
+export const vQuuz = v.union([
     v.intersect([v.object({
             type: v.optional(v.literal('bar'))
         }), vBar]),

packages/openapi-ts-tests/valibot/v1/__snapshots__/3.1.x/discriminator-one-of/valibot.gen.ts

@@ -13,15 +13,15 @@ export const vBaz = vQux;
 
 export const vBar = vQux;
 
-export const vFoo = v.variant('type', [v.intersect([v.object({
+export const vFoo = v.union([v.intersect([v.object({
             type: v.literal('Bar')
         }), vBar]), v.intersect([v.object({
             type: v.literal('Baz')
         }), vBaz])]);
 
 export const vSpæcial = vQux;
 
-export const vQuuz = v.variant('type', [
+export const vQuuz = v.union([
     v.intersect([v.object({
             type: v.literal('bar')
         }), vBar]),

packages/openapi-ts-tests/zod/v3/__snapshots__/3.0.x/mini/default/zod.gen.ts

@@ -423,13 +423,9 @@ export const zModelSquare = z.object({
 /**
  * This is a model with one property with a 'one of' relationship where the options are not $ref
  */
-export const zCompositionWithOneOfDiscriminator = z.union([
-    z.intersection(z.object({
-        kind: z.literal('circle')
-    }), zModelCircle),
-    z.intersection(z.object({
-        kind: z.literal('square')
-    }), zModelSquare)
+export const zCompositionWithOneOfDiscriminator = z.discriminatedUnion('kind', [
+    z.extend(zModelCircle, { kind: z.literal('circle') }),
+    z.extend(zModelSquare, { kind: z.literal('square') })
 ]);
 
 /**

packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/mini/default/zod.gen.ts

@@ -423,13 +423,9 @@ export const zModelSquare = z.object({
 /**
  * This is a model with one property with a 'one of' relationship where the options are not $ref
  */
-export const zCompositionWithOneOfDiscriminator = z.union([
-    z.intersection(z.object({
-        kind: z.literal('circle')
-    }), zModelCircle),
-    z.intersection(z.object({
-        kind: z.literal('square')
-    }), zModelSquare)
+export const zCompositionWithOneOfDiscriminator = z.discriminatedUnion('kind', [
+    z.extend(zModelCircle, { kind: z.literal('circle') }),
+    z.extend(zModelSquare, { kind: z.literal('square') })
 ]);
 
 /**

packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/mini/discriminator-all-of/zod.gen.ts

@@ -50,13 +50,9 @@ export const zBazUnion = z.object({
     baz: z.optional(z.string())
 });
 
-export const zFooUnion = z.union([
-    z.intersection(z.object({
-        id: z.literal('bar')
-    }), zBarUnion),
-    z.intersection(z.object({
-        id: z.literal('baz')
-    }), zBazUnion)
+export const zFooUnion = z.discriminatedUnion('id', [
+    z.extend(zBarUnion, { id: z.literal('bar') }),
+    z.extend(zBazUnion, { id: z.literal('baz') })
 ]);
 
 export const zQuxExtend = zFooUnion;

packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/mini/discriminator-any-of/zod.gen.ts

@@ -13,25 +13,15 @@ export const zBaz = zQux;
 
 export const zBar = zQux;
 
-export const zFoo = z.union([
-    z.intersection(z.object({
-        type: z.optional(z.literal('Bar'))
-    }), zBar),
-    z.intersection(z.object({
-        type: z.optional(z.literal('Baz'))
-    }), zBaz)
+export const zFoo = z.discriminatedUnion('type', [
+    z.extend(zBar, { type: z.literal('Bar') }),
+    z.extend(zBaz, { type: z.literal('Baz') })
 ]);
 
 export const zSpæcial = zQux;
 
-export const zQuuz = z.union([
-    z.intersection(z.object({
-        type: z.optional(z.literal('bar'))
-    }), zBar),
-    z.intersection(z.object({
-        type: z.optional(z.literal('baz'))
-    }), zBaz),
-    z.intersection(z.object({
-        type: z.optional(z.literal('non-ascii'))
-    }), zSpæcial)
+export const zQuuz = z.discriminatedUnion('type', [
+    z.extend(zBar, { type: z.literal('bar') }),
+    z.extend(zBaz, { type: z.literal('baz') }),
+    z.extend(zSpæcial, { type: z.literal('non-ascii') })
 ]);

packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/mini/discriminator-one-of/zod.gen.ts

@@ -13,25 +13,15 @@ export const zBaz = zQux;
 
 export const zBar = zQux;
 
-export const zFoo = z.union([
-    z.intersection(z.object({
-        type: z.literal('Bar')
-    }), zBar),
-    z.intersection(z.object({
-        type: z.literal('Baz')
-    }), zBaz)
+export const zFoo = z.discriminatedUnion('type', [
+    z.extend(zBar, { type: z.literal('Bar') }),
+    z.extend(zBaz, { type: z.literal('Baz') })
 ]);
 
 export const zSpæcial = zQux;
 
-export const zQuuz = z.union([
-    z.intersection(z.object({
-        type: z.literal('bar')
-    }), zBar),
-    z.intersection(z.object({
-        type: z.literal('baz')
-    }), zBaz),
-    z.intersection(z.object({
-        type: z.literal('non-ascii')
-    }), zSpæcial)
+export const zQuuz = z.discriminatedUnion('type', [
+    z.extend(zBar, { type: z.literal('bar') }),
+    z.extend(zBaz, { type: z.literal('baz') }),
+    z.extend(zSpæcial, { type: z.literal('non-ascii') })
 ]);

packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/mini/default/zod.gen.ts

@@ -423,13 +423,9 @@ export const zModelSquare = z.object({
 /**
  * This is a model with one property with a 'one of' relationship where the options are not $ref
  */
-export const zCompositionWithOneOfDiscriminator = z.union([
-    z.intersection(z.object({
-        kind: z.literal('circle')
-    }), zModelCircle),
-    z.intersection(z.object({
-        kind: z.literal('square')
-    }), zModelSquare)
+export const zCompositionWithOneOfDiscriminator = z.discriminatedUnion('kind', [
+    z.extend(zModelCircle, { kind: z.literal('circle') }),
+    z.extend(zModelSquare, { kind: z.literal('square') })
 ]);
 
 /**

packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/mini/default/zod.gen.ts

@@ -423,13 +423,9 @@ export const zModelSquare = z.object({
 /**
  * This is a model with one property with a 'one of' relationship where the options are not $ref
  */
-export const zCompositionWithOneOfDiscriminator = z.union([
-    z.intersection(z.object({
-        kind: z.literal('circle')
-    }), zModelCircle),
-    z.intersection(z.object({
-        kind: z.literal('square')
-    }), zModelSquare)
+export const zCompositionWithOneOfDiscriminator = z.discriminatedUnion('kind', [
+    z.extend(zModelCircle, { kind: z.literal('circle') }),
+    z.extend(zModelSquare, { kind: z.literal('square') })
 ]);
 
 /**