fix(validator): GetSchema

fjc0k · Jul 16, 2023 · e30c7ae · e30c7ae
1 parent e2de55c
commit e30c7ae
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 15 deletions.
diff --git a/src/validator/yup.test.ts b/src/validator/yup.test.ts
@@ -486,4 +486,20 @@ describe('yup', () => {
       }),
     ).toMatchSnapshot()
   })
+
+  test('mixed', () => {
+    type Message = {
+      id: number
+      image: File
+    }
+
+    const _ = yup
+    const messageSchemaIgnored: yup.GetSchema<Message> = _.object($ =>
+      $.shape({
+        id: _.number().required(),
+        image: _.mixed().required(),
+      }),
+    )
+    expect(1).toBe(1)
+  })
 })
diff --git a/src/validator/yupTypes/mixed.ts b/src/validator/yupTypes/mixed.ts
@@ -176,21 +176,22 @@ export interface MixedSchema<T = any> {
 }
 
 export type GetSchema<T> =
-  // 为何要加 []
-  // https://www.typescriptlang.org/docs/handbook/2/conditional-types.html#distributive-conditional-types
-  [T] extends [string]
-    ? StringSchema<T>
-    : [T] extends [number]
-    ? NumberSchema<T>
-    : [T] extends [boolean]
-    ? BooleanSchema<T>
-    : T extends Date
-    ? DateSchema<T>
-    : T extends Array<infer X>
-    ? ArraySchema<X>
-    : T extends {}
-    ? ObjectSchema<T>
-    : MixedSchema<T>
+  | (// 为何要加 []
+    // https://www.typescriptlang.org/docs/handbook/2/conditional-types.html#distributive-conditional-types
+    [T] extends [string]
+      ? StringSchema<T>
+      : [T] extends [number]
+      ? NumberSchema<T>
+      : [T] extends [boolean]
+      ? BooleanSchema<T>
+      : [T] extends [Date]
+      ? DateSchema<T>
+      : T extends Array<infer X>
+      ? ArraySchema<X>
+      : T extends {}
+      ? ObjectSchema<T>
+      : MixedSchema<T>)
+  | MixedSchema<T>
 
 export type GetObjectSchema<T extends {}> = {
   [K in keyof T]: GetSchema<T[K]>