Merge branch 'Convex-Helper-Types-Fix'

Author: ianmacartney

packages/convex-helpers/server/zod.test.ts

@@ -827,6 +827,10 @@ test("convexToZod complex types", () => {
 
   const unionValidator = convexToZod(v.union(v.string(), v.number()));
   expect(unionValidator.constructor.name).toBe("ZodUnion");
+  expect(unionValidator.options[0].constructor.name).toBe("ZodString");
+  expect(unionValidator.options[1].constructor.name).toBe("ZodNumber");
+  expectTypeOf(unionValidator.options[0]).toEqualTypeOf<z.ZodString>();
+  expectTypeOf(unionValidator.options[1]).toEqualTypeOf<z.ZodNumber>();
 
   const literalValidator = convexToZod(v.literal("hi"));
   expect(literalValidator.constructor.name).toBe("ZodLiteral");

packages/convex-helpers/server/zod.ts

@@ -1364,9 +1364,26 @@ type ZodFromValidatorBase<V extends GenericValidator> =
                       : z.ZodRecord<z.ZodString, ZodValidatorFromConvex<Value>>
                     : V extends VArray<any, any>
                       ? z.ZodArray<ZodValidatorFromConvex<V["element"]>>
-                      : V extends VUnion<any, any, any, any>
+                      : V extends VUnion<
+                            any,
+                            [
+                              infer A extends GenericValidator,
+                              infer B extends GenericValidator,
+                              ...infer Rest extends GenericValidator[],
+                            ],
+                            any,
+                            any
+                          >
                         ? z.ZodUnion<
-                            [ZodValidatorFromConvex<V["members"][number]>]
+                            [
+                              ZodValidatorFromConvex<A>,
+                              ZodValidatorFromConvex<B>,
+                              ...{
+                                [K in keyof Rest]: ZodValidatorFromConvex<
+                                  Rest[K]
+                                >;
+                              },
+                            ]
                           >
                         : z.ZodTypeAny; // fallback for unknown validators