allows optional enums (#694)

ianstormtaylor · May 6, 2021 · ad647b5 · ad647b5
1 parent 403d5a7
commit ad647b5
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/utils.ts b/src/utils.ts
@@ -203,7 +203,9 @@ export type Assign<T, U> = Simplify<U & Omit<T, keyof U>>
  * A schema for enum structs.
  */
 
-export type EnumSchema<T extends string | number> = { [K in T]: K }
+export type EnumSchema<T extends string | number | undefined> = {
+  [K in NonNullable<T>]: K
+}
 
 /**
  * Check if a type is an exact match.
@@ -307,14 +309,14 @@ export type If<B extends Boolean, Then, Else> = B extends true ? Then : Else
  * A schema for any type of struct.
  */
 
-export type StructSchema<T> = [T] extends [string]
-  ? [T] extends [IsMatch<T, string>]
+export type StructSchema<T> = [T] extends [string | undefined]
+  ? [T] extends [IsMatch<T, string | undefined>]
     ? null
     : [T] extends [IsUnion<T>]
     ? EnumSchema<T>
     : T
-  : [T] extends [number]
-  ? [T] extends [IsMatch<T, number>]
+  : [T] extends [number | undefined]
+  ? [T] extends [IsMatch<T, number | undefined>]
     ? null
     : [T] extends [IsUnion<T>]
     ? EnumSchema<T>