wip: recursively infer parser return type

beenotung · Oct 30, 2023 · 9b4036d · 9b4036d
1 parent 1d8e50e
commit 9b4036d
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 7 deletions.
diff --git a/examples/infer-demo.ts b/examples/infer-demo.ts
@@ -29,7 +29,10 @@ console.log(parser.type)
 
 type Result = ParseResult<typeof parser>
 type Post = Result['postList'][number]
-// @ts-expect-error
 type PostStatus = Post['status']
 
-// TODO extract object field name without $suffix
+function checkType<T>(t: T) {
+  /* noop */
+}
+
+checkType<'active' | 'hidden'>(null as unknown as PostStatus)
diff --git a/src/core.spec.ts b/src/core.spec.ts
@@ -461,7 +461,7 @@ describe('object parser', () => {
 }`)
     }
   })
-  it('should infer result type without $ flags', () => {
+  it('should infer result type without enums/nullable/optional flags', () => {
     let parser = inferFromSampleValue({
       'status_1$enums': ['a' as const, 'b' as const],
       'status_2$enum': ['a' as const, 'b' as const],
@@ -500,6 +500,17 @@ describe('object parser', () => {
       status_11?: undefined | null | 'a' | 'b'
     }>(result)
   })
+  it('should recursively infer result type', () => {
+    let parser = inferFromSampleValue({
+      a$nullable: {
+        b$optional: {
+          c$enums: ['a' as const, 'b' as const],
+        },
+      },
+    })
+    let result = parser.parse({ a: { b: { c: 'a' } } })
+    expect(result.a?.b?.c).to.equals('a')
+  })
 })
 
 describe('date parser', () => {

diff --git a/src/core.ts b/src/core.ts
@@ -1097,27 +1097,27 @@ type InferNullableField<O> = {
     ? never
     : P extends `${string}$null${string}`
     ? never
-    : P]: O[P]
+    : P]: InferType<O[P]>
 } & {
   [P in keyof O as P extends `${infer H}$nullable${infer T}`
     ? `${H}${T}`
     : P extends `${infer H}$null${infer T}`
     ? `${H}${T}`
-    : never]: null | O[P]
+    : never]: null | InferType<O[P]>
 }
 
 type InferOptionalField<O> = {
   [P in keyof O as P extends `${string}$optional${string}`
     ? never
     : P extends `${string}?${string}`
     ? never
-    : P]: O[P]
+    : P]: InferType<O[P]>
 } & {
   [P in keyof O as P extends `${infer H}$optional${infer T}`
     ? `${H}${T}`
     : P extends `${infer H}?${infer T}`
     ? `${H}${T}`
-    : never]?: O[P]
+    : never]?: InferType<O[P]>
 }
 
 type InferObjectType<T> = InferOptionalField<