fixed Union of enums: zod enum has no native call signature issue

example/yup/schemas.ts

@@ -1,7 +1,7 @@
 import * as yup from 'yup'
 import { Admin, AttributeInput, ButtonComponentType, ComponentInput, DropDownComponentInput, EventArgumentInput, EventInput, EventOptionType, Guest, HttpInput, HttpMethod, LayoutInput, PageInput, PageType, User, UserKind } from '../types'
 
-function union<T extends {}>(...schemas: ReadonlyArray<yup.ObjectSchema<T>>): yup.MixedSchema<T> {
+function union<T extends {}>(...schemas: ReadonlyArray<yup.Schema<T>>): yup.MixedSchema<T> {
   return yup.mixed<T>().test({
     test: (value) => schemas.some((schema) => schema.isValidSync(value))
   }).defined()

src/myzod/index.ts

@@ -102,7 +102,16 @@ export const MyZodSchemaVisitor = (schema: GraphQLSchema, config: ValidationSche
         if (!node.types || !config.withObjectType) return;
 
         const unionName = tsVisitor.convertName(node.name.value);
-        const unionElements = node.types?.map(t => `${tsVisitor.convertName(t.name.value)}Schema()`).join(', ');
+        const unionElements = node.types
+          ?.map(t => {
+            const element = tsVisitor.convertName(t.name.value);
+            const typ = schema.getType(t.name.value);
+            if (typ?.astNode?.kind === 'EnumTypeDefinition') {
+              return `${element}Schema`;
+            }
+            return `${element}Schema()`;
+          })
+          .join(', ');
         const unionElementsCount = node.types?.length ?? 0;
 
         const union =

src/yup/index.ts

@@ -36,7 +36,7 @@ export const YupSchemaVisitor = (schema: GraphQLSchema, config: ValidationSchema
         '\n' +
         new DeclarationBlock({})
           .asKind('function')
-          .withName('union<T extends {}>(...schemas: ReadonlyArray<yup.ObjectSchema<T>>): yup.MixedSchema<T>')
+          .withName('union<T extends {}>(...schemas: ReadonlyArray<yup.Schema<T>>): yup.MixedSchema<T>')
           .withBlock(
             [
               indent('return yup.mixed<T>().test({'),
@@ -129,7 +129,16 @@ export const YupSchemaVisitor = (schema: GraphQLSchema, config: ValidationSchema
         const unionName = tsVisitor.convertName(node.name.value);
         importTypes.push(unionName);
 
-        const unionElements = node.types?.map(t => `${tsVisitor.convertName(t.name.value)}Schema()`).join(', ');
+        const unionElements = node.types
+          ?.map(t => {
+            const element = tsVisitor.convertName(t.name.value);
+            const typ = schema.getType(t.name.value);
+            if (typ?.astNode?.kind === 'EnumTypeDefinition') {
+              return `${element}Schema`;
+            }
+            return `${element}Schema()`;
+          })
+          .join(', ');
         const union = indent(`return union<${unionName}>(${unionElements})`);
 
         return new DeclarationBlock({})

src/zod/index.ts

@@ -117,7 +117,16 @@ export const ZodSchemaVisitor = (schema: GraphQLSchema, config: ValidationSchema
         if (!node.types || !config.withObjectType) return;
 
         const unionName = tsVisitor.convertName(node.name.value);
-        const unionElements = node.types.map(t => `${tsVisitor.convertName(t.name.value)}Schema()`).join(', ');
+        const unionElements = node.types
+          .map(t => {
+            const element = tsVisitor.convertName(t.name.value);
+            const typ = schema.getType(t.name.value);
+            if (typ?.astNode?.kind === 'EnumTypeDefinition') {
+              return `${element}Schema`;
+            }
+            return `${element}Schema()`;
+          })
+          .join(', ');
         const unionElementsCount = node.types.length ?? 0;
 
         const union =

tests/myzod.spec.ts

@@ -636,6 +636,41 @@ describe('myzod', () => {
         expect(result.content).toContain(wantContain);
       }
     });
+
+    it('generate enum union types', async () => {
+      const schema = buildSchema(/* GraphQL */ `
+        enum PageType {
+          PUBLIC
+          BASIC_AUTH
+        }
+
+        enum MethodType {
+          GET
+          POST
+        }
+
+        union AnyType = PageType | MethodType
+      `);
+
+      const result = await plugin(
+        schema,
+        [],
+        {
+          schema: 'myzod',
+          withObjectType: true,
+        },
+        {}
+      );
+
+      const wantContains = [
+        'export function AnyTypeSchema() {',
+        'return myzod.union([PageTypeSchema, MethodTypeSchema])',
+        '}',
+      ];
+      for (const wantContain of wantContains) {
+        expect(result.content).toContain(wantContain);
+      }
+    });
   });
 
   it('properly generates custom directive values', async () => {

tests/yup.spec.ts

@@ -551,6 +551,41 @@ describe('yup', () => {
         expect(result.content).toContain(wantContain);
       }
     });
+
+    it('generate enum union types', async () => {
+      const schema = buildSchema(/* GraphQL */ `
+        enum PageType {
+          PUBLIC
+          BASIC_AUTH
+        }
+
+        enum MethodType {
+          GET
+          POST
+        }
+
+        union AnyType = PageType | MethodType
+      `);
+
+      const result = await plugin(
+        schema,
+        [],
+        {
+          schema: 'yup',
+          withObjectType: true,
+        },
+        {}
+      );
+
+      const wantContains = [
+        'export function AnyTypeSchema(): yup.MixedSchema<AnyType> {',
+        'union<AnyType>(PageTypeSchema, MethodTypeSchema)',
+        '}',
+      ];
+      for (const wantContain of wantContains) {
+        expect(result.content).toContain(wantContain);
+      }
+    });
   });
 
   it('properly generates custom directive values', async () => {

tests/zod.spec.ts

@@ -320,6 +320,7 @@ describe('zod', () => {
     expect(result.prepend).toContain("import { SayI } from './types'");
     expect(result.content).toContain('export function SayISchema(): z.ZodObject<Properties<SayI>> {');
   });
+
   describe('issues #19', () => {
     it('string field', async () => {
       const schema = buildSchema(/* GraphQL */ `
@@ -351,6 +352,7 @@ describe('zod', () => {
         expect(result.content).toContain(wantContain);
       }
     });
+
     it('not null field', async () => {
       const schema = buildSchema(/* GraphQL */ `
         input UserCreateInput {
@@ -381,6 +383,7 @@ describe('zod', () => {
         expect(result.content).toContain(wantContain);
       }
     });
+
     it('list field', async () => {
       const schema = buildSchema(/* GraphQL */ `
         input UserCreateInput {
@@ -412,6 +415,7 @@ describe('zod', () => {
       }
     });
   });
+
   describe('PR #112', () => {
     it('with notAllowEmptyString', async () => {
       const schema = buildSchema(/* GraphQL */ `
@@ -476,6 +480,7 @@ describe('zod', () => {
       }
     });
   });
+
   describe('with withObjectType', () => {
     const schema = buildSchema(/* GraphQL */ `
       input ScalarsInput {
@@ -732,6 +737,41 @@ describe('zod', () => {
         expect(result.content).toContain(wantContain);
       }
     });
+
+    it('generate enum union types', async () => {
+      const schema = buildSchema(/* GraphQL */ `
+        enum PageType {
+          PUBLIC
+          BASIC_AUTH
+        }
+
+        enum MethodType {
+          GET
+          POST
+        }
+
+        union AnyType = PageType | MethodType
+      `);
+
+      const result = await plugin(
+        schema,
+        [],
+        {
+          schema: 'zod',
+          withObjectType: true,
+        },
+        {}
+      );
+
+      const wantContains = [
+        'export function AnyTypeSchema() {',
+        'return z.union([PageTypeSchema, MethodTypeSchema])',
+        '}',
+      ];
+      for (const wantContain of wantContains) {
+        expect(result.content).toContain(wantContain);
+      }
+    });
   });
 
   it('properly generates custom directive values', async () => {