microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-15 12:51:30 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Fix initialization error when destructuring from object literal that includes a spread assignment (#36865)

Browse Source 
* Add test

* Fix superfluous error when destructuring from object that includes spread assignment

* Update baseline to include error case

* Remove redundant check
This commit is contained in:
Andrew Branch
2020-02-19 08:28:12 -08:00
committed by GitHub
parent 50e9c15e9d
commit 1236a1006c
6 changed files with 257 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/compiler/checker.ts
View File

@@ -22546,9 +22546,11 @@ namespace ts {
// If object literal is contextually typed by the implied type of a binding pattern, augment the result
// type with those properties for which the binding pattern specifies a default value.
if (contextualTypeHasPattern) {
// If the object literal is spread into another object literal, skip this step and let the top-level object
// literal handle it instead.
if (contextualTypeHasPattern && node.parent.kind !== SyntaxKind.SpreadAssignment) {
for (const prop of getPropertiesOfType(contextualType!)) {
if (!propertiesTable.get(prop.escapedName) && !(spread && getPropertyOfType(spread, prop.escapedName))) {
if (!propertiesTable.get(prop.escapedName) && !getPropertyOfType(spread, prop.escapedName)) {
if (!(prop.flags & SymbolFlags.Optional)) {
error(prop.valueDeclaration || (<TransientSymbol>prop).bindingElement,
Diagnostics.Initializer_provides_no_value_for_this_binding_element_and_the_binding_element_has_no_default_value);

34
tests/baselines/reference/destructuringSpread.errors.txt Normal file
View File

@@ -0,0 +1,34 @@
tests/cases/conformance/es6/destructuring/destructuringSpread.ts(16,21): error TS2525: Initializer provides no value for this binding element and the binding element has no default value.
==== tests/cases/conformance/es6/destructuring/destructuringSpread.ts (1 errors) ====
const { x } = {
...{},
x: 0
};
const { y } = {
y: 0,
...{}
};
const { z, a, b } = {
z: 0,
...{ a: 0, b: 0 }
};
const { c, d, e, f, g } = {
~
!!! error TS2525: Initializer provides no value for this binding element and the binding element has no default value.
...{
...{
...{
c: 0,
},
d: 0
},
e: 0
},
f: 0
};

48
tests/baselines/reference/destructuringSpread.js Normal file
View File

@@ -0,0 +1,48 @@
//// [destructuringSpread.ts]
const { x } = {
...{},
x: 0
};
const { y } = {
y: 0,
...{}
};
const { z, a, b } = {
z: 0,
...{ a: 0, b: 0 }
};
const { c, d, e, f, g } = {
...{
...{
...{
c: 0,
},
d: 0
},
e: 0
},
f: 0
};
//// [destructuringSpread.js]
var __assign = (this && this.__assign) || function () {
__assign = Object.assign || function(t) {
for (var s, i = 1, n = arguments.length; i < n; i++) {
s = arguments[i];
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
t[p] = s[p];
}
return t;
};
return __assign.apply(this, arguments);
};
var x = __assign({}, { x: 0 }).x;
var y = __assign({ y: 0 }, {}).y;
var _a = __assign({ z: 0 }, { a: 0, b: 0 }), z = _a.z, a = _a.a, b = _a.b;
var _b = __assign(__assign({}, __assign(__assign({}, __assign({
c: 0
}, { d: 0 })), { e: 0 })), { f: 0 }), c = _b.c, d = _b.d, e = _b.e, f = _b.f, g = _b.g;

60
tests/baselines/reference/destructuringSpread.symbols Normal file
View File

@@ -0,0 +1,60 @@
=== tests/cases/conformance/es6/destructuring/destructuringSpread.ts ===
const { x } = {
>x : Symbol(x, Decl(destructuringSpread.ts, 0, 7))
...{},
x: 0
>x : Symbol(x, Decl(destructuringSpread.ts, 1, 8))
};
const { y } = {
>y : Symbol(y, Decl(destructuringSpread.ts, 5, 7))
y: 0,
>y : Symbol(y, Decl(destructuringSpread.ts, 5, 15))
...{}
};
const { z, a, b } = {
>z : Symbol(z, Decl(destructuringSpread.ts, 10, 7))
>a : Symbol(a, Decl(destructuringSpread.ts, 10, 10))
>b : Symbol(b, Decl(destructuringSpread.ts, 10, 13))
z: 0,
>z : Symbol(z, Decl(destructuringSpread.ts, 10, 21))
...{ a: 0, b: 0 }
>a : Symbol(a, Decl(destructuringSpread.ts, 12, 6))
>b : Symbol(b, Decl(destructuringSpread.ts, 12, 12))
};
const { c, d, e, f, g } = {
>c : Symbol(c, Decl(destructuringSpread.ts, 15, 7))
>d : Symbol(d, Decl(destructuringSpread.ts, 15, 10))
>e : Symbol(e, Decl(destructuringSpread.ts, 15, 13))
>f : Symbol(f, Decl(destructuringSpread.ts, 15, 16))
>g : Symbol(g, Decl(destructuringSpread.ts, 15, 19))
...{
...{
...{
c: 0,
>c : Symbol(c, Decl(destructuringSpread.ts, 18, 10))
},
d: 0
>d : Symbol(d, Decl(destructuringSpread.ts, 20, 8))
},
e: 0
>e : Symbol(e, Decl(destructuringSpread.ts, 22, 6))
},
f: 0
>f : Symbol(f, Decl(destructuringSpread.ts, 24, 4))
};

84
tests/baselines/reference/destructuringSpread.types Normal file
View File

@@ -0,0 +1,84 @@
=== tests/cases/conformance/es6/destructuring/destructuringSpread.ts ===
const { x } = {
>x : number
>{ ...{}, x: 0} : { x: number; }
...{},
>{} : {}
x: 0
>x : number
>0 : 0
};
const { y } = {
>y : number
>{ y: 0, ...{}} : { y: number; }
y: 0,
>y : number
>0 : 0
...{}
>{} : {}
};
const { z, a, b } = {
>z : number
>a : number
>b : number
>{ z: 0, ...{ a: 0, b: 0 }} : { a: number; b: number; z: number; }
z: 0,
>z : number
>0 : 0
...{ a: 0, b: 0 }
>{ a: 0, b: 0 } : { a: number; b: number; }
>a : number
>0 : 0
>b : number
>0 : 0
};
const { c, d, e, f, g } = {
>c : number
>d : number
>e : number
>f : number
>g : any
>{ ...{ ...{ ...{ c: 0, }, d: 0 }, e: 0 }, f: 0} : { f: number; g: any; e: number; d: number; c: number; }
...{
>{ ...{ ...{ c: 0, }, d: 0 }, e: 0 } : { e: number; d: number; c: number; }
...{
>{ ...{ c: 0, }, d: 0 } : { d: number; c: number; }
...{
>{ c: 0, } : { c: number; }
c: 0,
>c : number
>0 : 0
},
d: 0
>d : number
>0 : 0
},
e: 0
>e : number
>0 : 0
},
f: 0
>f : number
>0 : 0
};

27
tests/cases/conformance/es6/destructuring/destructuringSpread.ts Normal file
View File

@@ -0,0 +1,27 @@
const { x } = {
...{},
x: 0
};
const { y } = {
y: 0,
...{}
};
const { z, a, b } = {
z: 0,
...{ a: 0, b: 0 }
};
const { c, d, e, f, g } = {
...{
...{
...{
c: 0,
},
d: 0
},
e: 0
},
f: 0
};