Merge pull request microsoft#15257 from Microsoft/unknown-properties-are-assignable-to-Object-in-union

sandersn · web-flow · commit 2e43c869b43b · 2017-04-18T15:21:46.000-07:00
Unknown properties are assignable to `Object` in union
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -8708,7 +8708,7 @@ namespace ts {
                 if (maybeTypeOfKind(target, TypeFlags.Object) && !(getObjectFlags(target) & ObjectFlags.ObjectLiteralPatternWithComputedProperties)) {
                     const isComparingJsxAttributes = !!(source.flags & TypeFlags.JsxAttributes);
                     if ((relation === assignableRelation || relation === comparableRelation) &&
-                        (target === globalObjectType || (!isComparingJsxAttributes && isEmptyObjectType(target)))) {
+                        (isTypeSubsetOf(globalObjectType, target) || (!isComparingJsxAttributes && isEmptyObjectType(target)))) {
                         return false;
                     }
                     for (const prop of getPropertiesOfObjectType(source)) {
diff --git a/tests/baselines/reference/unknownPropertiesAreAssignableToObjectUnion.js b/tests/baselines/reference/unknownPropertiesAreAssignableToObjectUnion.js
@@ -0,0 +1,8 @@
+//// [unknownPropertiesAreAssignableToObjectUnion.ts]
+const x: Object | string = { x: 0 };
+const y: Object | undefined = { x: 0 };
+
+
+//// [unknownPropertiesAreAssignableToObjectUnion.js]
+var x = { x: 0 };
+var y = { x: 0 };
diff --git a/tests/baselines/reference/unknownPropertiesAreAssignableToObjectUnion.symbols b/tests/baselines/reference/unknownPropertiesAreAssignableToObjectUnion.symbols
@@ -0,0 +1,11 @@
+=== tests/cases/compiler/unknownPropertiesAreAssignableToObjectUnion.ts ===
+const x: Object | string = { x: 0 };
+>x : Symbol(x, Decl(unknownPropertiesAreAssignableToObjectUnion.ts, 0, 5))
+>Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>x : Symbol(x, Decl(unknownPropertiesAreAssignableToObjectUnion.ts, 0, 28))
+
+const y: Object | undefined = { x: 0 };
+>y : Symbol(y, Decl(unknownPropertiesAreAssignableToObjectUnion.ts, 1, 5))
+>Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>x : Symbol(x, Decl(unknownPropertiesAreAssignableToObjectUnion.ts, 1, 31))
+
diff --git a/tests/baselines/reference/unknownPropertiesAreAssignableToObjectUnion.types b/tests/baselines/reference/unknownPropertiesAreAssignableToObjectUnion.types
@@ -0,0 +1,15 @@
+=== tests/cases/compiler/unknownPropertiesAreAssignableToObjectUnion.ts ===
+const x: Object | string = { x: 0 };
+>x : string | Object
+>Object : Object
+>{ x: 0 } : { x: number; }
+>x : number
+>0 : 0
+
+const y: Object | undefined = { x: 0 };
+>y : Object | undefined
+>Object : Object
+>{ x: 0 } : { x: number; }
+>x : number
+>0 : 0
+
diff --git a/tests/cases/compiler/unknownPropertiesAreAssignableToObjectUnion.ts b/tests/cases/compiler/unknownPropertiesAreAssignableToObjectUnion.ts
@@ -0,0 +1,3 @@
+// @strictNullChecks: true
+const x: Object | string = { x: 0 };
+const y: Object | undefined = { x: 0 };

Original file line number	Diff line number	Diff line change
`@@ -8708,7 +8708,7 @@ namespace ts {`
`8708`	`8708`	`if (maybeTypeOfKind(target, TypeFlags.Object) && !(getObjectFlags(target) & ObjectFlags.ObjectLiteralPatternWithComputedProperties)) {`
`8709`	`8709`	`const isComparingJsxAttributes = !!(source.flags & TypeFlags.JsxAttributes);`
`8710`	`8710`	`if ((relation === assignableRelation \|\| relation === comparableRelation) &&`
`8711`		`- (target === globalObjectType \|\| (!isComparingJsxAttributes && isEmptyObjectType(target)))) {`
	`8711`	`+ (isTypeSubsetOf(globalObjectType, target) \|\| (!isComparingJsxAttributes && isEmptyObjectType(target)))) {`
`8712`	`8712`	`return false;`
`8713`	`8713`	`}`
`8714`	`8714`	`for (const prop of getPropertiesOfObjectType(source)) {`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+// @strictNullChecks: true`
	`2`	`+const x: Object \| string = { x: 0 };`
	`3`	`+const y: Object \| undefined = { x: 0 };`