Skip to content

fix(64421): convert nested rest bindings to assignment targets #64422

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Oleksandr Tarasiuk (a-tarasyuk) wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(64421): convert nested rest bindings to assignment targets #64422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions tsc/internal/transformers/utilities.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,13 +116,13 @@ func convertBindingElementToArrayAssignmentElement(emitContext *printer.EmitCont
emitContext.AssignCommentAndSourceMapRanges(elision, element.AsNode())
return elision
}
expression := convertBindingNameToAssignmentElementTarget(emitContext, element.Name())
if element.DotDotDotToken != nil {
spread := emitContext.Factory.NewSpreadElement(element.Name())
spread := emitContext.Factory.NewSpreadElement(expression)
emitContext.SetOriginal(spread, element.AsNode())
emitContext.AssignCommentAndSourceMapRanges(spread, element.AsNode())
return spread
}
expression := convertBindingNameToAssignmentElementTarget(emitContext, element.Name())
if element.Initializer != nil {
assignment := emitContext.Factory.NewAssignmentExpression(expression, element.Initializer)
emitContext.SetOriginal(assignment, element.AsNode())
Expand Down
8 changes: 7 additions & 1 deletion tsc/testdata/baselines/reference/compiler/exportDestructuringIterator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,22 @@ export const [c, ...d] = foo();
export const [, e, , f] = foo();
export const [[g, h], { i, j: k }] = foo();
export const { m: [n, o], p: { q } } = foo();
export const [...[r, s]] = foo();
export const [...{ length: t }] = foo();
export const [...[u = 1, , ...[v]]] = foo();


//// [exportDestructuringIterator.js]
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
exports.q = exports.o = exports.n = exports.k = exports.i = exports.h = exports.g = exports.f = exports.e = exports.d = exports.c = exports.b = exports.a = exports.y = exports.x = exports.V = exports.A = void 0;
exports.v = exports.u = exports.t = exports.s = exports.r = exports.q = exports.o = exports.n = exports.k = exports.i = exports.h = exports.g = exports.f = exports.e = exports.d = exports.c = exports.b = exports.a = exports.y = exports.x = exports.V = exports.A = void 0;
[exports.A, exports.V] = foo();
({ x: exports.x, y: exports.y } = foo());
[exports.a = 1, exports.b = 2] = foo();
[exports.c, ...exports.d] = foo();
[, exports.e, , exports.f] = foo();
[[exports.g, exports.h], { i: exports.i, j: exports.k }] = foo();
({ m: [exports.n, exports.o], p: { q: exports.q } } = foo());
[...[exports.r, exports.s]] = foo();
[...{ length: exports.t }] = foo();
[...[exports.u = 1, , ...[exports.v]]] = foo();
14 changes: 14 additions & 0 deletions tsc/testdata/baselines/reference/compiler/exportDestructuringIterator.symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,17 @@ export const { m: [n, o], p: { q } } = foo();
>q : Symbol(q, Decl(exportDestructuringIterator.ts, 7, 30))
>foo : Symbol(foo, Decl(exportDestructuringIterator.ts, 0, 0))

export const [...[r, s]] = foo();
>r : Symbol(r, Decl(exportDestructuringIterator.ts, 8, 18))
>s : Symbol(s, Decl(exportDestructuringIterator.ts, 8, 20))
>foo : Symbol(foo, Decl(exportDestructuringIterator.ts, 0, 0))

export const [...{ length: t }] = foo();
>t : Symbol(t, Decl(exportDestructuringIterator.ts, 9, 18))
>foo : Symbol(foo, Decl(exportDestructuringIterator.ts, 0, 0))

export const [...[u = 1, , ...[v]]] = foo();
>u : Symbol(u, Decl(exportDestructuringIterator.ts, 10, 18))
>v : Symbol(v, Decl(exportDestructuringIterator.ts, 10, 31))
>foo : Symbol(foo, Decl(exportDestructuringIterator.ts, 0, 0))

19 changes: 19 additions & 0 deletions tsc/testdata/baselines/reference/compiler/exportDestructuringIterator.types
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,3 +54,22 @@ export const { m: [n, o], p: { q } } = foo();
>foo() : any
>foo : () => any

export const [...[r, s]] = foo();
>r : any
>s : any
>foo() : any
>foo : () => any

export const [...{ length: t }] = foo();
>length : any
>t : any
>foo() : any
>foo : () => any

export const [...[u = 1, , ...[v]]] = foo();
>u : any
>1 : 1
>v : any
>foo() : any
>foo : () => any

26 changes: 26 additions & 0 deletions tsc/testdata/baselines/reference/compiler/usingDeclarationsNestedRest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
//// [tests/cases/compiler/usingDeclarationsNestedRest.ts] ////

//// [usingDeclarationsNestedRest.ts]
using z = { [Symbol.dispose]() {} };
var [...[a, b]] = [0, 1];
var [...{ length: c }] = [0, 1];
var [...[d = 2, , ...[e]]] = [undefined, 1, 3];


//// [usingDeclarationsNestedRest.js]
"use strict";
var z, a, b, c, d, e;
const env_1 = { stack: [], error: void 0, hasError: false };
try {
z = __addDisposableResource(env_1, { [Symbol.dispose]() { } }, false);
[...[a, b]] = [0, 1];
[...{ length: c }] = [0, 1];
[...[d = 2, , ...[e]]] = [undefined, 1, 3];
}
catch (e_1) {
env_1.error = e_1;
env_1.hasError = true;
}
finally {
__disposeResources(env_1);
}
23 changes: 23 additions & 0 deletions tsc/testdata/baselines/reference/compiler/usingDeclarationsNestedRest.symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
//// [tests/cases/compiler/usingDeclarationsNestedRest.ts] ////

=== usingDeclarationsNestedRest.ts ===
using z = { [Symbol.dispose]() {} };
>z : Symbol(z, Decl(usingDeclarationsNestedRest.ts, 0, 5))
>[Symbol.dispose] : Symbol([Symbol.dispose], Decl(usingDeclarationsNestedRest.ts, 0, 11))
>Symbol.dispose : Symbol(SymbolConstructor.dispose, Decl(lib.esnext.disposable.d.ts, --, --))
>Symbol : Symbol(Symbol, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2019.symbol.d.ts, --, --))
>dispose : Symbol(SymbolConstructor.dispose, Decl(lib.esnext.disposable.d.ts, --, --))

var [...[a, b]] = [0, 1];
>a : Symbol(a, Decl(usingDeclarationsNestedRest.ts, 1, 9))
>b : Symbol(b, Decl(usingDeclarationsNestedRest.ts, 1, 11))

var [...{ length: c }] = [0, 1];
>length : Symbol(Array.length, Decl(lib.es5.d.ts, --, --))
>c : Symbol(c, Decl(usingDeclarationsNestedRest.ts, 2, 9))

var [...[d = 2, , ...[e]]] = [undefined, 1, 3];
>d : Symbol(d, Decl(usingDeclarationsNestedRest.ts, 3, 9))
>e : Symbol(e, Decl(usingDeclarationsNestedRest.ts, 3, 22))
>undefined : Symbol(undefined)

34 changes: 34 additions & 0 deletions tsc/testdata/baselines/reference/compiler/usingDeclarationsNestedRest.types
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
//// [tests/cases/compiler/usingDeclarationsNestedRest.ts] ////

=== usingDeclarationsNestedRest.ts ===
using z = { [Symbol.dispose]() {} };
>z : { [Symbol.dispose](): void; }
>{ [Symbol.dispose]() {} } : { [Symbol.dispose](): void; }
>[Symbol.dispose] : () => void
>Symbol.dispose : unique symbol
>Symbol : SymbolConstructor
>dispose : unique symbol

var [...[a, b]] = [0, 1];
>a : number
>b : number
>[0, 1] : number[]
>0 : 0
>1 : 1

var [...{ length: c }] = [0, 1];
>length : any
>c : number
>[0, 1] : number[]
>0 : 0
>1 : 1

var [...[d = 2, , ...[e]]] = [undefined, 1, 3];
>d : number
>2 : 2
>e : number | undefined
>[undefined, 1, 3] : (number | undefined)[]
>undefined : undefined
>1 : 1
>3 : 3

3 changes: 3 additions & 0 deletions tsc/testdata/tests/cases/compiler/exportDestructuringIterator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,6 @@ export const [c, ...d] = foo();
export const [, e, , f] = foo();
export const [[g, h], { i, j: k }] = foo();
export const { m: [n, o], p: { q } } = foo();
export const [...[r, s]] = foo();
export const [...{ length: t }] = foo();
export const [...[u = 1, , ...[v]]] = foo();
8 changes: 8 additions & 0 deletions tsc/testdata/tests/cases/compiler/usingDeclarationsNestedRest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
// @target: es2022
// @lib: esnext,dom
// @noEmitHelpers: true

using z = { [Symbol.dispose]() {} };
var [...[a, b]] = [0, 1];
var [...{ length: c }] = [0, 1];
var [...[d = 2, , ...[e]]] = [undefined, 1, 3];