fix: infer types (#79)

src/schema/builder.ts

@@ -27,7 +27,13 @@ import { group } from './object/group_builder.js'
 import { VineNativeEnum } from './enum/native_enum.js'
 import { VineUnionOfTypes } from './union_of_types/main.js'
 import { ITYPE, OTYPE, COTYPE, IS_OF_TYPE, UNIQUE_NAME } from '../symbols.js'
-import type { DateFieldOptions, EnumLike, FieldContext, SchemaTypes } from '../types.js'
+import type {
+  UndefinedOptional,
+  DateFieldOptions,
+  EnumLike,
+  FieldContext,
+  SchemaTypes,
+} from '../types.js'
 
 /**
  * Schema builder exposes methods to construct a Vine schema. You may
@@ -94,15 +100,15 @@ export class SchemaBuilder extends Macroable {
   object<Properties extends Record<string, SchemaTypes>>(properties: Properties) {
     return new VineObject<
       Properties,
-      {
+      UndefinedOptional<{
         [K in keyof Properties]: Properties[K][typeof ITYPE]
-      },
-      {
+      }>,
+      UndefinedOptional<{
         [K in keyof Properties]: Properties[K][typeof OTYPE]
-      },
-      {
+      }>,
+      UndefinedOptional<{
         [K in keyof Properties as CamelCase<K & string>]: Properties[K][typeof COTYPE]
-      }
+      }>
     >(properties)
   }
 

src/schema/object/group_builder.ts

@@ -11,7 +11,7 @@ import { ObjectGroup } from './group.js'
 import { CamelCase } from '../camelcase_types.js'
 import { GroupConditional } from './conditional.js'
 import { OTYPE, COTYPE, ITYPE } from '../../symbols.js'
-import type { FieldContext, SchemaTypes } from '../../types.js'
+import type { FieldContext, SchemaTypes, UndefinedOptional } from '../../types.js'
 
 /**
  * Create an object group. Groups are used to conditionally merge properties
@@ -32,15 +32,15 @@ group.if = function groupIf<Properties extends Record<string, SchemaTypes>>(
 ) {
   return new GroupConditional<
     Properties,
-    {
+    UndefinedOptional<{
       [K in keyof Properties]: Properties[K][typeof ITYPE]
-    },
-    {
+    }>,
+    UndefinedOptional<{
       [K in keyof Properties]: Properties[K][typeof OTYPE]
-    },
-    {
+    }>,
+    UndefinedOptional<{
       [K in keyof Properties as CamelCase<K & string>]: Properties[K][typeof COTYPE]
-    }
+    }>
   >(conditon, properties)
 }
 
@@ -52,14 +52,14 @@ group.else = function groupElse<Properties extends Record<string, SchemaTypes>>(
 ) {
   return new GroupConditional<
     Properties,
-    {
+    UndefinedOptional<{
       [K in keyof Properties]: Properties[K][typeof ITYPE]
-    },
-    {
+    }>,
+    UndefinedOptional<{
       [K in keyof Properties]: Properties[K][typeof OTYPE]
-    },
-    {
+    }>,
+    UndefinedOptional<{
       [K in keyof Properties as CamelCase<K & string>]: Properties[K][typeof COTYPE]
-    }
+    }>
   >(() => true, properties)
 }

src/types.ts

@@ -280,3 +280,21 @@ export type InferInput<Schema extends { [ITYPE]: any }> = Schema[typeof ITYPE]
 export type NumericComparisonOperators = '>' | '<' | '>=' | '<='
 export type ArrayComparisonOperators = 'in' | 'notIn'
 export type ComparisonOperators = ArrayComparisonOperators | NumericComparisonOperators | '=' | '!='
+
+type PickUndefined<T> = {
+  [K in keyof T]: undefined extends T[K] ? K : never
+}[keyof T]
+
+type PickNotUndefined<T> = {
+  [K in keyof T]: undefined extends T[K] ? never : K
+}[keyof T]
+
+type Id<T> = T extends infer U ? { [K in keyof U]: U[K] } : never
+
+export type UndefinedOptional<T> = Id<
+  {
+    [K in PickUndefined<T>]?: T[K]
+  } & {
+    [K in PickNotUndefined<T>]: T[K]
+  }
+>