Merge pull request microsoft#13900 from Microsoft/object-literal-freshness-with-spread

sandersn · web-flow · commit 86661b527224 · 2017-05-17T11:44:25.000-07:00
Object literal freshness errors with spreads
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -13306,6 +13306,8 @@ namespace ts {
                 if (spread.flags & TypeFlags.Object) {
                     // only set the symbol and flags if this is a (fresh) object type
                     spread.flags |= propagatedFlags;
+                    spread.flags |= TypeFlags.FreshLiteral;
+                    (spread as ObjectType).objectFlags |= ObjectFlags.ObjectLiteral;
                     spread.symbol = node.symbol;
                 }
                 return spread;
diff --git a/tests/baselines/reference/objectLiteralFreshnessWithSpread.errors.txt b/tests/baselines/reference/objectLiteralFreshnessWithSpread.errors.txt
@@ -0,0 +1,11 @@
+tests/cases/compiler/objectLiteralFreshnessWithSpread.ts(2,35): error TS2322: Type '{ z: number; b: number; extra: number; a: number; }' is not assignable to type '{ a: any; b: any; }'.
+  Object literal may only specify known properties, and 'z' does not exist in type '{ a: any; b: any; }'.
+
+
+==== tests/cases/compiler/objectLiteralFreshnessWithSpread.ts (1 errors) ====
+    let x = { b: 1, extra: 2 }
+    let xx: { a, b }  = { a: 1, ...x, z: 3 } // error for 'z', no error for 'extra'
+                                      ~~~~
+!!! error TS2322: Type '{ z: number; b: number; extra: number; a: number; }' is not assignable to type '{ a: any; b: any; }'.
+!!! error TS2322:   Object literal may only specify known properties, and 'z' does not exist in type '{ a: any; b: any; }'.
+    
diff --git a/tests/baselines/reference/objectLiteralFreshnessWithSpread.js b/tests/baselines/reference/objectLiteralFreshnessWithSpread.js
@@ -0,0 +1,16 @@
+//// [objectLiteralFreshnessWithSpread.ts]
+let x = { b: 1, extra: 2 }
+let xx: { a, b }  = { a: 1, ...x, z: 3 } // error for 'z', no error for 'extra'
+
+
+//// [objectLiteralFreshnessWithSpread.js]
+var __assign = (this && this.__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;
+};
+var x = { b: 1, extra: 2 };
+var xx = __assign({ a: 1 }, x, { z: 3 }); // error for 'z', no error for 'extra'
diff --git a/tests/cases/compiler/objectLiteralFreshnessWithSpread.ts b/tests/cases/compiler/objectLiteralFreshnessWithSpread.ts
@@ -0,0 +1,2 @@
+let x = { b: 1, extra: 2 }
+let xx: { a, b }  = { a: 1, ...x, z: 3 } // error for 'z', no error for 'extra'

Original file line number	Diff line number	Diff line change
`@@ -13306,6 +13306,8 @@ namespace ts {`
`13306`	`13306`	`if (spread.flags & TypeFlags.Object) {`
`13307`	`13307`	`// only set the symbol and flags if this is a (fresh) object type`
`13308`	`13308`	`spread.flags \|= propagatedFlags;`
	`13309`	`+ spread.flags \|= TypeFlags.FreshLiteral;`
	`13310`	`+ (spread as ObjectType).objectFlags \|= ObjectFlags.ObjectLiteral;`
`13309`	`13311`	`spread.symbol = node.symbol;`
`13310`	`13312`	`}`
`13311`	`13313`	`return spread;`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+let x = { b: 1, extra: 2 }`
	`2`	`+let xx: { a, b } = { a: 1, ...x, z: 3 } // error for 'z', no error for 'extra'`