🐛 Narrow union-valued and optional discriminants
The tagged-union matcher selected handler parameters with
`Extract<T, Record<K, V>>`, which only keeps a member whose
discriminant is a singleton literal. A property that is itself a
union (`{ color: "red" | "green" | "blue" }`) or optional
(`{ type?: "x" }`) matched no member, so every handler received
`never`, and the fallback saw the whole shape instead of the
unhandled tags.
Replace the selector with `Narrowed`, which distributes over `T`,
drops a member whose `K` cannot take the tag, and narrows `K`. The
`T[K] extends V` fast path keeps an exact member (a discriminated
union's declared interface) untouched. The fallback reuses
`Narrowed` over `Exclude<Tags, HandledTags>`, so a union-valued
property narrows to the unhandled tags rather than the whole shape.
Matching a defined tag on an optional property makes the key
required (`{ type: "x" }`); the `undefined` tag yields
`{ type?: never }` under `exactOptionalPropertyTypes` (absence) or
`{ type?: undefined }` when the property admits an explicit
`undefined`.
This commit is contained in:
1 parent
e7b5c0284d
commit
55bf6c24a7
5 files changed
+357
-25
No files matched your search
+17
-6
@@ -208,16 +208,27 @@ The key is a separate call because `K` is inferred from its literal argument and
|
||||
|
||||
#### Why
|
||||
|
||||
- **Same fallback/remainder machinery as the primitive-union matcher.** `HandledMembers`
|
||||
maps the handled tags to their members and `Exclude<T, …>` is the fallback's
|
||||
parameter; the redundant-fallback guard is the same F-bounded constraint. Only
|
||||
the "universe" changes — `T`'s members instead of primitive values.
|
||||
- **Same fallback/remainder machinery as the primitive-union matcher.** `HandledTags`
|
||||
recovers the tag values the map handled (`Member<Tags, keyof Handled>`) and
|
||||
`Narrowed<T, K, Exclude<Tags, …>>` is the fallback's parameter; the
|
||||
redundant-fallback guard is the same F-bounded constraint. Only the "universe"
|
||||
changes — `T`'s members instead of primitive values.
|
||||
- **`T extends object`, not `Record<PropertyKey, unknown>`.** An `interface` has
|
||||
no implicit index signature, so the `Record` constraint would reject
|
||||
interface-based unions. The runtime reads the tag off `object` with one
|
||||
assertion, the tagged twin of the primitive-union dispatch's `shape as string | number`.
|
||||
- **`MapTaggedUnion` distributes with `Extract`.** A duplicated tag yields a
|
||||
union of members instead of dropping one.
|
||||
- **`Narrowed` distributes over `T`, narrowing `K` to the tag.** A member whose
|
||||
`K` cannot take the tag drops out; a duplicated tag yields a union of members
|
||||
instead of dropping one. `T[K] extends V` returns the exact member (a
|
||||
discriminated union's declared interface) untouched, so the mapped form only
|
||||
handles a property that is itself a union.
|
||||
- **A union-valued or optional discriminant is supported.** A single shape whose
|
||||
property is a union (`{ color: "red" | "green" | "blue" }`) is narrowed per
|
||||
handler instead of being passed `never`. Matching a defined tag on an optional
|
||||
property (`{ type?: "x" }`) proves the key is present, so it becomes required
|
||||
(`{ type: "x" }`); the `undefined` tag narrows it to `{ type?: never }` under
|
||||
`exactOptionalPropertyTypes` (absence) or `{ type?: undefined }` when the
|
||||
property explicitly admits `undefined`.
|
||||
- **A `boolean` / `null` / `undefined` tag goes through the shared
|
||||
`PatternKey` / `Member` projection.** `Discriminated` admits those tags
|
||||
(they are in `Tag`), but they cannot key a mapped type, so the handler map is
|
||||
|
||||
Reference in new issue
Block a user