fixed a few miss code

Author: Code-Hex

src/myzod/index.ts

@@ -91,18 +91,19 @@ export const MyZodSchemaVisitor = (schema: GraphQLSchema, config: ValidationSche
         .withContent(`myzod.enum(${enumname})`).string;
     },
     UnionTypeDefinition: (node: UnionTypeDefinitionNode) => {
+      if (!node.types) return;
+
       const unionName = tsVisitor.convertName(node.name.value);
       const unionElements = node.types?.map(t => `${tsVisitor.convertName(t.name.value)}Schema()`).join(', ');
       const unionElementsCount = node.types?.length ?? 0;
 
-      const union =
-        unionElementsCount > 1 ? indent(`return myzod.union([${unionElements}])`) : indent(`return ${unionElements}`);
+      const union = unionElementsCount > 1 ? `myzod.union([${unionElements}])` : unionElements;
 
       const result = new DeclarationBlock({})
         .export()
-        .asKind('function')
-        .withName(`${unionName}Schema()`)
-        .withBlock(union);
+        .asKind('const')
+        .withName(`${unionName}Schema`)
+        .withContent(union);
 
       return result.string;
     },
@@ -200,7 +201,7 @@ const generateNameNodeMyZodSchema = (
 
   if (typ?.astNode?.kind === 'UnionTypeDefinition') {
     const enumName = tsVisitor.convertName(typ.astNode.name.value);
-    return `${enumName}Schema()`;
+    return `${enumName}Schema`;
   }
 
   return myzod4Scalar(config, tsVisitor, node.value);

src/yup/index.ts

@@ -30,6 +30,7 @@ export const YupSchemaVisitor = (schema: GraphQLSchema, config: ValidationSchema
       return [importYup];
     },
     initialEmit: (): string =>
+      '\n' +
       new DeclarationBlock({})
         .asKind('function')
         .withName('union<T>(...schemas: ReadonlyArray<yup.SchemaOf<T>>): yup.BaseSchema<T>')
@@ -101,22 +102,21 @@ export const YupSchemaVisitor = (schema: GraphQLSchema, config: ValidationSchema
         .withContent(`yup.mixed().oneOf([${values}])`).string;
     },
     UnionTypeDefinition: (node: UnionTypeDefinitionNode) => {
+      if (!node.types) return;
+
       const unionName = tsVisitor.convertName(node.name.value);
+      importTypes.push(unionName);
+
       const unionElements = node.types?.map(t => `${tsVisitor.convertName(t.name.value)}Schema()`).join(', ');
       const unionElementsCount = node.types?.length ?? 0;
 
-      const union =
-        unionElementsCount > 1
-          ? indent(`return union<${unionName}>(${unionElements})`)
-          : indent(`return ${unionElements}`);
+      const union = unionElementsCount > 1 ? `union<${unionName}>(${unionElements})` : unionElements;
 
-      const result = new DeclarationBlock({})
+      return new DeclarationBlock({})
         .export()
-        .asKind('function')
-        .withName(`${unionName}Schema(): yup.BaseSchema<${unionName}>`)
-        .withBlock(union);
-
-      return result.string;
+        .asKind('const')
+        .withName(`${unionName}Schema: yup.BaseSchema<${unionName}>`)
+        .withContent(union).string;
     },
     // ScalarTypeDefinition: (node) => {
     //   const decl = new DeclarationBlock({})
@@ -209,6 +209,11 @@ const generateNameNodeYupSchema = (
     return `${enumName}Schema`;
   }
 
+  if (typ?.astNode?.kind === 'UnionTypeDefinition') {
+    const enumName = tsVisitor.convertName(typ.astNode.name.value);
+    return `${enumName}Schema`;
+  }
+
   const primitive = yup4Scalar(config, tsVisitor, node.value);
   return primitive;
 };

src/zod/index.ts

@@ -102,20 +102,15 @@ export const ZodSchemaVisitor = (schema: GraphQLSchema, config: ValidationSchema
         .withContent(`z.nativeEnum(${enumname})`).string;
     },
     UnionTypeDefinition: (node: UnionTypeDefinitionNode) => {
-      const unionName = tsVisitor.convertName(node.name.value);
-      const unionElements = node.types?.map(t => `${tsVisitor.convertName(t.name.value)}Schema()`).join(', ');
-      const unionElementsCount = node.types?.length ?? 0;
+      if (!node.types) return;
 
-      const union =
-        unionElementsCount > 1 ? indent(`return z.union([${unionElements}])`) : indent(`return ${unionElements}`);
+      const unionName = tsVisitor.convertName(node.name.value);
+      const unionElements = node.types.map(t => `${tsVisitor.convertName(t.name.value)}Schema()`).join(', ');
+      const unionElementsCount = node.types.length ?? 0;
 
-      const result = new DeclarationBlock({})
-        .export()
-        .asKind('function')
-        .withName(`${unionName}Schema()`)
-        .withBlock(union);
+      const union = unionElementsCount > 1 ? `z.union([${unionElements}])` : unionElements;
 
-      return result.string;
+      return new DeclarationBlock({}).export().asKind('const').withName(`${unionName}Schema`).withContent(union).string;
     },
   };
 };
@@ -211,7 +206,7 @@ const generateNameNodeZodSchema = (
 
   if (typ?.astNode?.kind === 'UnionTypeDefinition') {
     const enumName = tsVisitor.convertName(typ.astNode.name.value);
-    return `${enumName}Schema()`;
+    return `${enumName}Schema`;
   }
 
   return zod4Scalar(config, tsVisitor, node.value);