Skip to content

Commit 12a463c

Browse files
committed
🔧 fix: use StaticDecode to unwrap TImport
1 parent 0e77530 commit 12a463c

File tree

1 file changed

+16
-12
lines changed

1 file changed

+16
-12
lines changed

src/types.ts

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -427,12 +427,12 @@ export type UnwrapSchema<
427427
infer NamedSchema extends TAnySchema
428428
>
429429
? StaticDecode<NamedSchema>[]
430-
: TImport<Definitions, TrimArrayName<Schema>>['static'][]
430+
: StaticDecode<TImport<Definitions, TrimArrayName<Schema>>>[]
431431
: Schema extends string
432432
? Definitions extends keyof Schema
433433
? // @ts-ignore Definitions is always a Record<string, TAnySchema>
434434
StaticDecode<NamedSchema>
435-
: TImport<Definitions, Schema>['static']
435+
: StaticDecode<TImport<Definitions, Schema>>
436436
: unknown
437437

438438
export type UnwrapBodySchema<
@@ -443,31 +443,35 @@ export type UnwrapBodySchema<
443443
: Schema extends TSchema
444444
? Schema extends OptionalField
445445
? Partial<
446+
StaticDecode<
447+
TImport<
448+
Definitions & {
449+
readonly __elysia: Schema
450+
},
451+
'__elysia'
452+
>
453+
>
454+
> | null
455+
: StaticDecode<
446456
TImport<
447457
Definitions & {
448458
readonly __elysia: Schema
449459
},
450460
'__elysia'
451-
>['static']
452-
> | null
453-
: TImport<
454-
Definitions & {
455-
readonly __elysia: Schema
456-
},
457-
'__elysia'
458-
>['static']
461+
>
462+
>
459463
: Schema extends `${infer Key}[]`
460464
? Definitions extends Record<
461465
Key,
462466
infer NamedSchema extends TAnySchema
463467
>
464468
? StaticDecode<NamedSchema>[]
465-
: TImport<Definitions, TrimArrayName<Schema>>['static'][]
469+
: StaticDecode<TImport<Definitions, TrimArrayName<Schema>>>[]
466470
: Schema extends string
467471
? Definitions extends keyof Schema
468472
? // @ts-ignore Definitions is always a Record<string, TAnySchema>
469473
StaticDecode<NamedSchema>
470-
: TImport<Definitions, Schema>['static']
474+
: StaticDecode<TImport<Definitions, Schema>>
471475
: unknown
472476

473477
export interface UnwrapRoute<

0 commit comments

Comments
 (0)