Merge pull request #561 from milan-wisdom/fix

Support yup enums with any naming conventions (EnumName.ENUM_VALUE)

Author: Code-Hex

example/yup/schemas.ts

@@ -1,13 +1,13 @@
 import * as yup from 'yup'
 import { Admin, AttributeInput, ButtonComponentType, ComponentInput, DropDownComponentInput, EventArgumentInput, EventInput, EventOptionType, Guest, HttpInput, HttpMethod, LayoutInput, MyType, MyTypeFooArgs, PageInput, PageType, User, UserKind } from '../types'
 
-export const ButtonComponentTypeSchema = yup.string<ButtonComponentType>().oneOf([ButtonComponentType.Button, ButtonComponentType.Submit]).defined();
+export const ButtonComponentTypeSchema = yup.string<ButtonComponentType>().oneOf(Object.values(ButtonComponentType)).defined();
 
-export const EventOptionTypeSchema = yup.string<EventOptionType>().oneOf([EventOptionType.Reload, EventOptionType.Retry]).defined();
+export const EventOptionTypeSchema = yup.string<EventOptionType>().oneOf(Object.values(EventOptionType)).defined();
 
-export const HttpMethodSchema = yup.string<HttpMethod>().oneOf([HttpMethod.Get, HttpMethod.Post]).defined();
+export const HttpMethodSchema = yup.string<HttpMethod>().oneOf(Object.values(HttpMethod)).defined();
 
-export const PageTypeSchema = yup.string<PageType>().oneOf([PageType.BasicAuth, PageType.Lp, PageType.Restricted, PageType.Service]).defined();
+export const PageTypeSchema = yup.string<PageType>().oneOf(Object.values(PageType)).defined();
 
 function union<T extends {}>(...schemas: ReadonlyArray<yup.Schema<T>>): yup.MixedSchema<T> {
   return yup.mixed<T>().test({

src/yup/index.ts

@@ -128,21 +128,12 @@ export class YupSchemaVisitor extends BaseSchemaVisitor {
               .withContent(`yup.string().oneOf([${enums?.join(', ')}]).defined()`).string
           );
         } else {
-          const values = node.values
-            ?.map(
-              enumOption =>
-                `${enumname}.${visitor.convertName(enumOption.name, {
-                  useTypesPrefix: false,
-                  transformUnderscore: true,
-                })}`
-            )
-            .join(', ');
           this.enumDeclarations.push(
             new DeclarationBlock({})
               .export()
               .asKind('const')
               .withName(`${enumname}Schema`)
-              .withContent(`yup.string<${enumname}>().oneOf([${values}]).defined()`).string
+              .withContent(`yup.string<${enumname}>().oneOf(Object.values(${enumname})).defined()`).string
           );
         }
       },

tests/yup.spec.ts

@@ -137,7 +137,7 @@ describe('yup', () => {
           }
         `,
         wantContains: [
-          'export const PageTypeSchema = yup.string<PageType>().oneOf([PageType.Public, PageType.BasicAuth]).defined();',
+          'export const PageTypeSchema = yup.string<PageType>().oneOf(Object.values(PageType)).defined();',
           'export function PageInputSchema(): yup.ObjectSchema<PageInput>',
           'pageType: PageTypeSchema.nonNullable()',
         ],
@@ -162,7 +162,7 @@ describe('yup', () => {
         `,
         wantContains: [
           'export function HttpInputSchema(): yup.ObjectSchema<HttpInput>',
-          'export const HttpMethodSchema = yup.string<HttpMethod>().oneOf([HttpMethod.Get, HttpMethod.Post]).defined();',
+          'export const HttpMethodSchema = yup.string<HttpMethod>().oneOf(Object.values(HttpMethod)).defined();',
           'method: HttpMethodSchema.nullable().optional(),',
           'url: yup.mixed().nonNullable()',
         ],
@@ -931,7 +931,7 @@ describe('yup', () => {
     );
 
     expect(result.content).toContain(
-      'export const PageTypeSchema = yup.string<PageType>().oneOf([PageType.Public, PageType.BasicAuth]).defined()'
+      'export const PageTypeSchema = yup.string<PageType>().oneOf(Object.values(PageType)).defined()'
     );
     expect(result.content).toContain('export function PageInputSchema(): yup.ObjectSchema<PageInput>');