microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-06 20:14:01 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Don't allow properties inherited from Object to be automatically included in TSX attributes

Browse Source
This commit is contained in:
Andy Hanson 2016-08-04 14:13:07 -07:00
parent 18fb33d36f
commit 9947ac2ece
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/compiler/checker.ts
View File

@ -10060,7 +10060,7 @@ namespace ts {
for (const prop of props) {
// Is there a corresponding property in the element attributes type? Skip checking of properties
// that have already been assigned to, as these are not actually pushed into the resulting type
if (!nameTable[prop.name]) {
if (!hasProperty(nameTable, prop.name)) {
const targetPropSym = getPropertyOfType(elementAttributesType, prop.name);
if (targetPropSym) {
const msg = chainDiagnosticMessages(undefined, Diagnostics.Property_0_of_JSX_spread_attribute_is_not_assignable_to_target_property, prop.name);
@ -10406,7 +10406,7 @@ namespace ts {
const targetProperties = getPropertiesOfType(targetAttributesType);
for (let i = 0; i < targetProperties.length; i++) {
if (!(targetProperties[i].flags & SymbolFlags.Optional) &&
nameTable[targetProperties[i].name] === undefined) {
!hasProperty(nameTable, targetProperties[i].name)) {
error(node, Diagnostics.Property_0_is_missing_in_type_1, targetProperties[i].name, typeToString(targetAttributesType));
}

7
tests/baselines/reference/tsxAttributeResolution5.errors.txt
View File

@ -2,9 +2,10 @@ tests/cases/conformance/jsx/file.tsx(21,16): error TS2606: Property 'x' of JSX s
Type 'number' is not assignable to type 'string'.
tests/cases/conformance/jsx/file.tsx(25,9): error TS2324: Property 'x' is missing in type 'Attribs1'.
tests/cases/conformance/jsx/file.tsx(29,1): error TS2324: Property 'x' is missing in type 'Attribs1'.
tests/cases/conformance/jsx/file.tsx(30,1): error TS2324: Property 'toString' is missing in type 'Attribs2'.
==== tests/cases/conformance/jsx/file.tsx (3 errors) ====
==== tests/cases/conformance/jsx/file.tsx (4 errors) ====
declare module JSX {
interface Element { }
interface IntrinsicElements {
@ -41,5 +42,7 @@ tests/cases/conformance/jsx/file.tsx(29,1): error TS2324: Property 'x' is missin
<test1 {...{}} />; // Error, missing x
~~~~~~~~~~~~~~~~~
!!! error TS2324: Property 'x' is missing in type 'Attribs1'.
<test2 {...{}} />; // OK
<test2 {...{}} />; // Error, missing toString
~~~~~~~~~~~~~~~~~
!!! error TS2324: Property 'toString' is missing in type 'Attribs2'.

4
tests/baselines/reference/tsxAttributeResolution5.js
View File

@ -28,7 +28,7 @@ function make3<T extends {y: string}> (obj: T) {
<test1 {...{}} />; // Error, missing x
<test2 {...{}} />; // OK
<test2 {...{}} />; // Error, missing toString
//// [file.jsx]
@ -42,4 +42,4 @@ function make3(obj) {
return <test1 {...obj}/>; // Error, missing x
}
<test1 {...{}}/>; // Error, missing x
<test2 {...{}}/>; // OK
<test2 {...{}}/>; // Error, missing toString

2
tests/cases/conformance/jsx/tsxAttributeResolution5.tsx
View File

@ -29,4 +29,4 @@ function make3<T extends {y: string}> (obj: T) {
<test1 {...{}} />; // Error, missing x
<test2 {...{}} />; // OK
<test2 {...{}} />; // Error, missing toString