fixed generator for union type again

Author: Code-Hex

src/myzod/index.ts

@@ -97,15 +97,11 @@ export const MyZodSchemaVisitor = (schema: GraphQLSchema, config: ValidationSche
       const unionElements = node.types?.map(t => `${tsVisitor.convertName(t.name.value)}Schema()`).join(', ');
       const unionElementsCount = node.types?.length ?? 0;
 
-      const union = unionElementsCount > 1 ? `myzod.union([${unionElements}])` : unionElements;
+      const union =
+        unionElementsCount > 1 ? indent(`return myzod.union([${unionElements}])`) : indent(`return ${unionElements}`);
 
-      const result = new DeclarationBlock({})
-        .export()
-        .asKind('const')
-        .withName(`${unionName}Schema`)
-        .withContent(union);
-
-      return result.string;
+      return new DeclarationBlock({}).export().asKind('function').withName(`${unionName}Schema()`).withBlock(union)
+        .string;
     },
   };
 };
@@ -201,7 +197,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

@@ -108,15 +108,13 @@ export const YupSchemaVisitor = (schema: GraphQLSchema, config: ValidationSchema
       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 ? `union<${unionName}>(${unionElements})` : unionElements;
+      const union = indent(`return union<${unionName}>(${unionElements})`);
 
       return new DeclarationBlock({})
         .export()
-        .asKind('const')
-        .withName(`${unionName}Schema: yup.BaseSchema<${unionName}>`)
-        .withContent(union).string;
+        .asKind('function')
+        .withName(`${unionName}Schema(): yup.BaseSchema<${unionName}>`)
+        .withBlock(union).string;
     },
     // ScalarTypeDefinition: (node) => {
     //   const decl = new DeclarationBlock({})
@@ -211,7 +209,7 @@ const generateNameNodeYupSchema = (
 
   if (typ?.astNode?.kind === 'UnionTypeDefinition') {
     const enumName = tsVisitor.convertName(typ.astNode.name.value);
-    return `${enumName}Schema`;
+    return `${enumName}Schema()`;
   }
 
   const primitive = yup4Scalar(config, tsVisitor, node.value);

src/zod/index.ts

@@ -108,9 +108,11 @@ export const ZodSchemaVisitor = (schema: GraphQLSchema, config: ValidationSchema
       const unionElements = node.types.map(t => `${tsVisitor.convertName(t.name.value)}Schema()`).join(', ');
       const unionElementsCount = node.types.length ?? 0;
 
-      const union = unionElementsCount > 1 ? `z.union([${unionElements}])` : unionElements;
+      const union =
+        unionElementsCount > 1 ? indent(`return z.union([${unionElements}])`) : indent(`return ${unionElements}`);
 
-      return new DeclarationBlock({}).export().asKind('const').withName(`${unionName}Schema`).withContent(union).string;
+      return new DeclarationBlock({}).export().asKind('function').withName(`${unionName}Schema()`).withBlock(union)
+        .string;
     },
   };
 };
@@ -206,7 +208,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);