forked from microsoft/TypeScript
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Smarter algorithm to distribute intersections of unions.
Helps avoid exponential blowup for `keyof` large unions even when `keyof` each type in the union is not a union of unit types (e.g., because there is an index signature or a type variable). Remove the special handling of intersections of unions of unit types because it's no longer needed. This reverts the code changes of pull request microsoft#24137 (commit 3fc3df3 with respect to 3fc727b) but keeps the test. Fixes microsoft#24223.
- Loading branch information
1 parent
1cedab1
commit 230c842
Showing
7 changed files
with
427 additions
and
40 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
45 changes: 45 additions & 0 deletions
45
tests/baselines/reference/intersectionsOfLargeUnions2.errors.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| tests/cases/compiler/intersectionsOfLargeUnions2.ts(31,15): error TS2536: Type 'T' cannot be used to index type 'HTMLElementTagNameMap'. | ||
| tests/cases/compiler/intersectionsOfLargeUnions2.ts(31,15): error TS2536: Type 'P' cannot be used to index type 'HTMLElementTagNameMap[T]'. | ||
|
|
||
|
|
||
| ==== tests/cases/compiler/intersectionsOfLargeUnions2.ts (2 errors) ==== | ||
| // Repro from #24223 | ||
|
|
||
| declare global { | ||
| interface ElementTagNameMap { | ||
| [index: number]: HTMLElement | ||
| } | ||
|
|
||
| interface HTMLElement { | ||
| [index: number]: HTMLElement; | ||
| } | ||
| } | ||
|
|
||
| export function assertIsElement(node: Node | null): node is Element { | ||
| let nodeType = node === null ? null : node.nodeType; | ||
| return nodeType === 1; | ||
| } | ||
|
|
||
| export function assertNodeTagName< | ||
| T extends keyof ElementTagNameMap, | ||
| U extends ElementTagNameMap[T]>(node: Node | null, tagName: T): node is U { | ||
| if (assertIsElement(node)) { | ||
| const nodeTagName = node.tagName.toLowerCase(); | ||
| return nodeTagName === tagName; | ||
| } | ||
| return false; | ||
| } | ||
|
|
||
| export function assertNodeProperty< | ||
| T extends keyof ElementTagNameMap, | ||
| P extends keyof ElementTagNameMap[T], | ||
| V extends HTMLElementTagNameMap[T][P]>(node: Node | null, tagName: T, prop: P, value: V) { | ||
| ~~~~~~~~~~~~~~~~~~~~~~~~ | ||
| !!! error TS2536: Type 'T' cannot be used to index type 'HTMLElementTagNameMap'. | ||
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
| !!! error TS2536: Type 'P' cannot be used to index type 'HTMLElementTagNameMap[T]'. | ||
| if (assertNodeTagName(node, tagName)) { | ||
| node[prop]; | ||
| } | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| //// [intersectionsOfLargeUnions2.ts] | ||
| // Repro from #24223 | ||
|
|
||
| declare global { | ||
| interface ElementTagNameMap { | ||
| [index: number]: HTMLElement | ||
| } | ||
|
|
||
| interface HTMLElement { | ||
| [index: number]: HTMLElement; | ||
| } | ||
| } | ||
|
|
||
| export function assertIsElement(node: Node | null): node is Element { | ||
| let nodeType = node === null ? null : node.nodeType; | ||
| return nodeType === 1; | ||
| } | ||
|
|
||
| export function assertNodeTagName< | ||
| T extends keyof ElementTagNameMap, | ||
| U extends ElementTagNameMap[T]>(node: Node | null, tagName: T): node is U { | ||
| if (assertIsElement(node)) { | ||
| const nodeTagName = node.tagName.toLowerCase(); | ||
| return nodeTagName === tagName; | ||
| } | ||
| return false; | ||
| } | ||
|
|
||
| export function assertNodeProperty< | ||
| T extends keyof ElementTagNameMap, | ||
| P extends keyof ElementTagNameMap[T], | ||
| V extends HTMLElementTagNameMap[T][P]>(node: Node | null, tagName: T, prop: P, value: V) { | ||
| if (assertNodeTagName(node, tagName)) { | ||
| node[prop]; | ||
| } | ||
| } | ||
|
|
||
|
|
||
| //// [intersectionsOfLargeUnions2.js] | ||
| "use strict"; | ||
| // Repro from #24223 | ||
| exports.__esModule = true; | ||
| function assertIsElement(node) { | ||
| var nodeType = node === null ? null : node.nodeType; | ||
| return nodeType === 1; | ||
| } | ||
| exports.assertIsElement = assertIsElement; | ||
| function assertNodeTagName(node, tagName) { | ||
| if (assertIsElement(node)) { | ||
| var nodeTagName = node.tagName.toLowerCase(); | ||
| return nodeTagName === tagName; | ||
| } | ||
| return false; | ||
| } | ||
| exports.assertNodeTagName = assertNodeTagName; | ||
| function assertNodeProperty(node, tagName, prop, value) { | ||
| if (assertNodeTagName(node, tagName)) { | ||
| node[prop]; | ||
| } | ||
| } | ||
| exports.assertNodeProperty = assertNodeProperty; |
115 changes: 115 additions & 0 deletions
115
tests/baselines/reference/intersectionsOfLargeUnions2.symbols
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,115 @@ | ||
| === tests/cases/compiler/intersectionsOfLargeUnions2.ts === | ||
| // Repro from #24223 | ||
|
|
||
| declare global { | ||
| >global : Symbol(global, Decl(intersectionsOfLargeUnions2.ts, 0, 0)) | ||
|
|
||
| interface ElementTagNameMap { | ||
| >ElementTagNameMap : Symbol(ElementTagNameMap, Decl(lib.dom.d.ts, --, --), Decl(intersectionsOfLargeUnions2.ts, 2, 16)) | ||
|
|
||
| [index: number]: HTMLElement | ||
| >index : Symbol(index, Decl(intersectionsOfLargeUnions2.ts, 4, 9)) | ||
| >HTMLElement : Symbol(HTMLElement, Decl(intersectionsOfLargeUnions2.ts, 5, 5)) | ||
| } | ||
|
|
||
| interface HTMLElement { | ||
| >HTMLElement : Symbol(HTMLElement, Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(intersectionsOfLargeUnions2.ts, 5, 5)) | ||
|
|
||
| [index: number]: HTMLElement; | ||
| >index : Symbol(index, Decl(intersectionsOfLargeUnions2.ts, 8, 9)) | ||
| >HTMLElement : Symbol(HTMLElement, Decl(intersectionsOfLargeUnions2.ts, 5, 5)) | ||
| } | ||
| } | ||
|
|
||
| export function assertIsElement(node: Node | null): node is Element { | ||
| >assertIsElement : Symbol(assertIsElement, Decl(intersectionsOfLargeUnions2.ts, 10, 1)) | ||
| >node : Symbol(node, Decl(intersectionsOfLargeUnions2.ts, 12, 32)) | ||
| >Node : Symbol(Node, Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --)) | ||
| >node : Symbol(node, Decl(intersectionsOfLargeUnions2.ts, 12, 32)) | ||
| >Element : Symbol(Element, Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --)) | ||
|
|
||
| let nodeType = node === null ? null : node.nodeType; | ||
| >nodeType : Symbol(nodeType, Decl(intersectionsOfLargeUnions2.ts, 13, 7)) | ||
| >node : Symbol(node, Decl(intersectionsOfLargeUnions2.ts, 12, 32)) | ||
| >node.nodeType : Symbol(Node.nodeType, Decl(lib.dom.d.ts, --, --)) | ||
| >node : Symbol(node, Decl(intersectionsOfLargeUnions2.ts, 12, 32)) | ||
| >nodeType : Symbol(Node.nodeType, Decl(lib.dom.d.ts, --, --)) | ||
|
|
||
| return nodeType === 1; | ||
| >nodeType : Symbol(nodeType, Decl(intersectionsOfLargeUnions2.ts, 13, 7)) | ||
| } | ||
|
|
||
| export function assertNodeTagName< | ||
| >assertNodeTagName : Symbol(assertNodeTagName, Decl(intersectionsOfLargeUnions2.ts, 15, 1)) | ||
|
|
||
| T extends keyof ElementTagNameMap, | ||
| >T : Symbol(T, Decl(intersectionsOfLargeUnions2.ts, 17, 34)) | ||
| >ElementTagNameMap : Symbol(ElementTagNameMap, Decl(lib.dom.d.ts, --, --), Decl(intersectionsOfLargeUnions2.ts, 2, 16)) | ||
|
|
||
| U extends ElementTagNameMap[T]>(node: Node | null, tagName: T): node is U { | ||
| >U : Symbol(U, Decl(intersectionsOfLargeUnions2.ts, 18, 38)) | ||
| >ElementTagNameMap : Symbol(ElementTagNameMap, Decl(lib.dom.d.ts, --, --), Decl(intersectionsOfLargeUnions2.ts, 2, 16)) | ||
| >T : Symbol(T, Decl(intersectionsOfLargeUnions2.ts, 17, 34)) | ||
| >node : Symbol(node, Decl(intersectionsOfLargeUnions2.ts, 19, 36)) | ||
| >Node : Symbol(Node, Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --)) | ||
| >tagName : Symbol(tagName, Decl(intersectionsOfLargeUnions2.ts, 19, 54)) | ||
| >T : Symbol(T, Decl(intersectionsOfLargeUnions2.ts, 17, 34)) | ||
| >node : Symbol(node, Decl(intersectionsOfLargeUnions2.ts, 19, 36)) | ||
| >U : Symbol(U, Decl(intersectionsOfLargeUnions2.ts, 18, 38)) | ||
|
|
||
| if (assertIsElement(node)) { | ||
| >assertIsElement : Symbol(assertIsElement, Decl(intersectionsOfLargeUnions2.ts, 10, 1)) | ||
| >node : Symbol(node, Decl(intersectionsOfLargeUnions2.ts, 19, 36)) | ||
|
|
||
| const nodeTagName = node.tagName.toLowerCase(); | ||
| >nodeTagName : Symbol(nodeTagName, Decl(intersectionsOfLargeUnions2.ts, 21, 13)) | ||
| >node.tagName.toLowerCase : Symbol(String.toLowerCase, Decl(lib.es5.d.ts, --, --)) | ||
| >node.tagName : Symbol(Element.tagName, Decl(lib.dom.d.ts, --, --)) | ||
| >node : Symbol(node, Decl(intersectionsOfLargeUnions2.ts, 19, 36)) | ||
| >tagName : Symbol(Element.tagName, Decl(lib.dom.d.ts, --, --)) | ||
| >toLowerCase : Symbol(String.toLowerCase, Decl(lib.es5.d.ts, --, --)) | ||
|
|
||
| return nodeTagName === tagName; | ||
| >nodeTagName : Symbol(nodeTagName, Decl(intersectionsOfLargeUnions2.ts, 21, 13)) | ||
| >tagName : Symbol(tagName, Decl(intersectionsOfLargeUnions2.ts, 19, 54)) | ||
| } | ||
| return false; | ||
| } | ||
|
|
||
| export function assertNodeProperty< | ||
| >assertNodeProperty : Symbol(assertNodeProperty, Decl(intersectionsOfLargeUnions2.ts, 25, 1)) | ||
|
|
||
| T extends keyof ElementTagNameMap, | ||
| >T : Symbol(T, Decl(intersectionsOfLargeUnions2.ts, 27, 35)) | ||
| >ElementTagNameMap : Symbol(ElementTagNameMap, Decl(lib.dom.d.ts, --, --), Decl(intersectionsOfLargeUnions2.ts, 2, 16)) | ||
|
|
||
| P extends keyof ElementTagNameMap[T], | ||
| >P : Symbol(P, Decl(intersectionsOfLargeUnions2.ts, 28, 38)) | ||
| >ElementTagNameMap : Symbol(ElementTagNameMap, Decl(lib.dom.d.ts, --, --), Decl(intersectionsOfLargeUnions2.ts, 2, 16)) | ||
| >T : Symbol(T, Decl(intersectionsOfLargeUnions2.ts, 27, 35)) | ||
|
|
||
| V extends HTMLElementTagNameMap[T][P]>(node: Node | null, tagName: T, prop: P, value: V) { | ||
| >V : Symbol(V, Decl(intersectionsOfLargeUnions2.ts, 29, 41)) | ||
| >HTMLElementTagNameMap : Symbol(HTMLElementTagNameMap, Decl(lib.dom.d.ts, --, --)) | ||
| >T : Symbol(T, Decl(intersectionsOfLargeUnions2.ts, 27, 35)) | ||
| >P : Symbol(P, Decl(intersectionsOfLargeUnions2.ts, 28, 38)) | ||
| >node : Symbol(node, Decl(intersectionsOfLargeUnions2.ts, 30, 43)) | ||
| >Node : Symbol(Node, Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --)) | ||
| >tagName : Symbol(tagName, Decl(intersectionsOfLargeUnions2.ts, 30, 61)) | ||
| >T : Symbol(T, Decl(intersectionsOfLargeUnions2.ts, 27, 35)) | ||
| >prop : Symbol(prop, Decl(intersectionsOfLargeUnions2.ts, 30, 73)) | ||
| >P : Symbol(P, Decl(intersectionsOfLargeUnions2.ts, 28, 38)) | ||
| >value : Symbol(value, Decl(intersectionsOfLargeUnions2.ts, 30, 82)) | ||
| >V : Symbol(V, Decl(intersectionsOfLargeUnions2.ts, 29, 41)) | ||
|
|
||
| if (assertNodeTagName(node, tagName)) { | ||
| >assertNodeTagName : Symbol(assertNodeTagName, Decl(intersectionsOfLargeUnions2.ts, 15, 1)) | ||
| >node : Symbol(node, Decl(intersectionsOfLargeUnions2.ts, 30, 43)) | ||
| >tagName : Symbol(tagName, Decl(intersectionsOfLargeUnions2.ts, 30, 61)) | ||
|
|
||
| node[prop]; | ||
| >node : Symbol(node, Decl(intersectionsOfLargeUnions2.ts, 30, 43)) | ||
| >prop : Symbol(prop, Decl(intersectionsOfLargeUnions2.ts, 30, 73)) | ||
| } | ||
| } | ||
|
|
Oops, something went wrong.