Fix destructuring and narrowing interaction #47337
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
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,89 @@ | ||
| //// [narrowingDestructuring.ts] | ||
| type X = { kind: "a", a: string } | { kind: "b", b: string } | ||
|
|
||
| function func<T extends X>(value: T) { | ||
| if (value.kind === "a") { | ||
| value.a; | ||
| const { a } = value; | ||
| } else { | ||
| value.b; | ||
| const { b } = value; | ||
| } | ||
| } | ||
|
|
||
| type Z = { kind: "f", f: { a: number, b: string, c: number } } | ||
| | { kind: "g", g: { a: string, b: number, c: string }}; | ||
|
|
||
| function func2<T extends Z>(value: T) { | ||
| if (value.kind === "f") { | ||
| const { f: f1 } = value; | ||
| const { f: { a, ...spread } } = value; | ||
| value.f; | ||
| } else { | ||
| const { g: { c, ...spread } } = value; | ||
| value.g; | ||
| } | ||
| } | ||
|
|
||
| function func3<T extends { kind: "a", a: string } | { kind: "b", b: number }>(t: T) { | ||
| if (t.kind === "a") { | ||
| const { kind, ...r1 } = t; | ||
| const r2 = (({ kind, ...rest }) => rest)(t); | ||
| } | ||
| } | ||
|
|
||
| function farr<T extends [number, string, string] | [string, number, number]>(x: T) { | ||
| const [head, ...tail] = x; | ||
| if (x[0] === 'number') { | ||
| const [head, ...tail] = x; | ||
| } | ||
| } | ||
|
|
||
| //// [narrowingDestructuring.js] | ||
| var __rest = (this && this.__rest) || function (s, e) { | ||
| var t = {}; | ||
| for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) | ||
| t[p] = s[p]; | ||
| if (s != null && typeof Object.getOwnPropertySymbols === "function") | ||
| for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) { | ||
| if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) | ||
| t[p[i]] = s[p[i]]; | ||
| } | ||
| return t; | ||
| }; | ||
| function func(value) { | ||
| if (value.kind === "a") { | ||
| value.a; | ||
| var a = value.a; | ||
| } | ||
| else { | ||
| value.b; | ||
| var b = value.b; | ||
| } | ||
| } | ||
| function func2(value) { | ||
| if (value.kind === "f") { | ||
| var f1 = value.f; | ||
| var _a = value.f, a = _a.a, spread = __rest(_a, ["a"]); | ||
| value.f; | ||
| } | ||
| else { | ||
| var _b = value.g, c = _b.c, spread = __rest(_b, ["c"]); | ||
| value.g; | ||
| } | ||
| } | ||
| function func3(t) { | ||
| if (t.kind === "a") { | ||
| var kind = t.kind, r1 = __rest(t, ["kind"]); | ||
| var r2 = (function (_a) { | ||
| var kind = _a.kind, rest = __rest(_a, ["kind"]); | ||
| return rest; | ||
| })(t); | ||
| } | ||
| } | ||
| function farr(x) { | ||
| var head = x[0], tail = x.slice(1); | ||
| if (x[0] === 'number') { | ||
| var head_1 = x[0], tail_1 = x.slice(1); | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'll add this flag instead of the
includeOptionalityparameter in another commit, once we settle on the other changes of this PRThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should definitely get this change in the PR as well.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since replacing the
includeOptionalityby aCheckModeflag affects our caching behavior incheckExpressionCached(or we'll have to add an exception for that flag only), I'm gonna merge this without that part for the 4.6 RC, and I can add this change in another PR if we really want this.