Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/wide-pianos-exist.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"openapi-typescript-helpers": patch
---

Preserve tuple types in Readable<T> and Writable<T> by using mapped type instead of (infer E)[] pattern
8 changes: 4 additions & 4 deletions packages/openapi-typescript-helpers/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -221,8 +221,8 @@ export type Readable<T> =
? never
: T extends $Read<infer U>
? Readable<U>
: T extends (infer E)[]
? Readable<E>[]
: T extends readonly any[]
? { [K in keyof T]: Readable<T[K]> }
: T extends object
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
: T extends object
: T extends object | readonly any[]

Would that work as well? Then we could have one less branch (same below).

IIUC the mapped type for object "just" recursively resolved $Read / $Write in keys, that behavior doesn't bother us.

? { [K in keyof T as NonNullable<T[K]> extends $Write<any> ? never : K]: Readable<T[K]> }
: T;
Expand All @@ -238,8 +238,8 @@ export type Writable<T> =
? never
: T extends $Write<infer U>
? Writable<U>
: T extends (infer E)[]
? Writable<E>[]
: T extends readonly any[]
? { [K in keyof T]: Writable<T[K]> }
: T extends object
? { [K in keyof T as NonNullable<T[K]> extends $Read<any> ? never : K]: Writable<T[K]> } & {
[K in keyof T as NonNullable<T[K]> extends $Read<any> ? K : never]?: never;
Expand Down
Loading