From 0cb12b32a5abbe37b847fd93c94a435319480e61 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Thu, 5 Oct 2017 09:03:03 -0700
Subject: [PATCH] Test:{} in union from spread gets implicit index signature

Also tighten up the existing test code in the file.
---
 .../objectSpreadIndexSignature.errors.txt     | 19 ++++++
 .../reference/objectSpreadIndexSignature.js   | 28 ++++-----
 .../objectSpreadIndexSignature.symbols        | 63 +++++++++----------
 .../objectSpreadIndexSignature.types          | 56 ++++++++---------
 .../spread/objectSpreadIndexSignature.ts      | 21 +++----
 5 files changed, 98 insertions(+), 89 deletions(-)
 create mode 100644 tests/baselines/reference/objectSpreadIndexSignature.errors.txt

diff --git a/tests/baselines/reference/objectSpreadIndexSignature.errors.txt b/tests/baselines/reference/objectSpreadIndexSignature.errors.txt
new file mode 100644
index 00000000000..ee7425909c2
--- /dev/null
+++ b/tests/baselines/reference/objectSpreadIndexSignature.errors.txt
@@ -0,0 +1,19 @@
+tests/cases/conformance/types/spread/objectSpreadIndexSignature.ts(6,1): error TS7017: Element implicitly has an 'any' type because type '{ b: number; a: number; }' has no index signature.
+
+
+==== tests/cases/conformance/types/spread/objectSpreadIndexSignature.ts (1 errors) ====
+    declare let indexed1: { [n: string]: number; a: number; };
+    declare let indexed2: { [n: string]: boolean; c: boolean; };
+    declare let indexed3: { [n: string]: number };
+    let i = { ...indexed1, b: 11 };
+    // only indexed has indexer, so i[101]: any
+    i[101];
+    ~~~~~~
+!!! error TS7017: Element implicitly has an 'any' type because type '{ b: number; a: number; }' has no index signature.
+    let ii = { ...indexed1, ...indexed2 };
+    // both have indexer, so i[1001]: number | boolean
+    ii[1001];
+    
+    declare const b: boolean;
+    indexed3 = { ...b ? indexed3 : undefined };
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/objectSpreadIndexSignature.js b/tests/baselines/reference/objectSpreadIndexSignature.js
index 22e92e6a844..283129036da 100644
--- a/tests/baselines/reference/objectSpreadIndexSignature.js
+++ b/tests/baselines/reference/objectSpreadIndexSignature.js
@@ -1,23 +1,20 @@
 //// [objectSpreadIndexSignature.ts]
-interface Indexed {
-    [n: string]: number;
-    a: number;
-}
-interface Indexed2 {
-    [n: string]: boolean;
-    c: boolean;
-}
-let indexed: Indexed;
-let indexed2: Indexed2;
-let i = { ...indexed, b: 11 };
+declare let indexed1: { [n: string]: number; a: number; };
+declare let indexed2: { [n: string]: boolean; c: boolean; };
+declare let indexed3: { [n: string]: number };
+let i = { ...indexed1, b: 11 };
 // only indexed has indexer, so i[101]: any
 i[101];
-let ii = { ...indexed, ...indexed2 };
+let ii = { ...indexed1, ...indexed2 };
 // both have indexer, so i[1001]: number | boolean
 ii[1001];
+
+declare const b: boolean;
+indexed3 = { ...b ? indexed3 : undefined };
 
 
 //// [objectSpreadIndexSignature.js]
+"use strict";
 var __assign = (this && this.__assign) || Object.assign || function(t) {
     for (var s, i = 1, n = arguments.length; i < n; i++) {
         s = arguments[i];
@@ -26,11 +23,10 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
     }
     return t;
 };
-var indexed;
-var indexed2;
-var i = __assign({}, indexed, { b: 11 });
+var i = __assign({}, indexed1, { b: 11 });
 // only indexed has indexer, so i[101]: any
 i[101];
-var ii = __assign({}, indexed, indexed2);
+var ii = __assign({}, indexed1, indexed2);
 // both have indexer, so i[1001]: number | boolean
 ii[1001];
+indexed3 = __assign({}, b ? indexed3 : undefined);
diff --git a/tests/baselines/reference/objectSpreadIndexSignature.symbols b/tests/baselines/reference/objectSpreadIndexSignature.symbols
index cd64b157196..d08cfff53ff 100644
--- a/tests/baselines/reference/objectSpreadIndexSignature.symbols
+++ b/tests/baselines/reference/objectSpreadIndexSignature.symbols
@@ -1,45 +1,42 @@
 === tests/cases/conformance/types/spread/objectSpreadIndexSignature.ts ===
-interface Indexed {
->Indexed : Symbol(Indexed, Decl(objectSpreadIndexSignature.ts, 0, 0))
+declare let indexed1: { [n: string]: number; a: number; };
+>indexed1 : Symbol(indexed1, Decl(objectSpreadIndexSignature.ts, 0, 11))
+>n : Symbol(n, Decl(objectSpreadIndexSignature.ts, 0, 25))
+>a : Symbol(a, Decl(objectSpreadIndexSignature.ts, 0, 44))
 
-    [n: string]: number;
->n : Symbol(n, Decl(objectSpreadIndexSignature.ts, 1, 5))
+declare let indexed2: { [n: string]: boolean; c: boolean; };
+>indexed2 : Symbol(indexed2, Decl(objectSpreadIndexSignature.ts, 1, 11))
+>n : Symbol(n, Decl(objectSpreadIndexSignature.ts, 1, 25))
+>c : Symbol(c, Decl(objectSpreadIndexSignature.ts, 1, 45))
 
-    a: number;
->a : Symbol(Indexed.a, Decl(objectSpreadIndexSignature.ts, 1, 24))
-}
-interface Indexed2 {
->Indexed2 : Symbol(Indexed2, Decl(objectSpreadIndexSignature.ts, 3, 1))
+declare let indexed3: { [n: string]: number };
+>indexed3 : Symbol(indexed3, Decl(objectSpreadIndexSignature.ts, 2, 11))
+>n : Symbol(n, Decl(objectSpreadIndexSignature.ts, 2, 25))
 
-    [n: string]: boolean;
->n : Symbol(n, Decl(objectSpreadIndexSignature.ts, 5, 5))
-
-    c: boolean;
->c : Symbol(Indexed2.c, Decl(objectSpreadIndexSignature.ts, 5, 25))
-}
-let indexed: Indexed;
->indexed : Symbol(indexed, Decl(objectSpreadIndexSignature.ts, 8, 3))
->Indexed : Symbol(Indexed, Decl(objectSpreadIndexSignature.ts, 0, 0))
-
-let indexed2: Indexed2;
->indexed2 : Symbol(indexed2, Decl(objectSpreadIndexSignature.ts, 9, 3))
->Indexed2 : Symbol(Indexed2, Decl(objectSpreadIndexSignature.ts, 3, 1))
-
-let i = { ...indexed, b: 11 };
->i : Symbol(i, Decl(objectSpreadIndexSignature.ts, 10, 3))
->indexed : Symbol(indexed, Decl(objectSpreadIndexSignature.ts, 8, 3))
->b : Symbol(b, Decl(objectSpreadIndexSignature.ts, 10, 21))
+let i = { ...indexed1, b: 11 };
+>i : Symbol(i, Decl(objectSpreadIndexSignature.ts, 3, 3))
+>indexed1 : Symbol(indexed1, Decl(objectSpreadIndexSignature.ts, 0, 11))
+>b : Symbol(b, Decl(objectSpreadIndexSignature.ts, 3, 22))
 
 // only indexed has indexer, so i[101]: any
 i[101];
->i : Symbol(i, Decl(objectSpreadIndexSignature.ts, 10, 3))
+>i : Symbol(i, Decl(objectSpreadIndexSignature.ts, 3, 3))
 
-let ii = { ...indexed, ...indexed2 };
->ii : Symbol(ii, Decl(objectSpreadIndexSignature.ts, 13, 3))
->indexed : Symbol(indexed, Decl(objectSpreadIndexSignature.ts, 8, 3))
->indexed2 : Symbol(indexed2, Decl(objectSpreadIndexSignature.ts, 9, 3))
+let ii = { ...indexed1, ...indexed2 };
+>ii : Symbol(ii, Decl(objectSpreadIndexSignature.ts, 6, 3))
+>indexed1 : Symbol(indexed1, Decl(objectSpreadIndexSignature.ts, 0, 11))
+>indexed2 : Symbol(indexed2, Decl(objectSpreadIndexSignature.ts, 1, 11))
 
 // both have indexer, so i[1001]: number | boolean
 ii[1001];
->ii : Symbol(ii, Decl(objectSpreadIndexSignature.ts, 13, 3))
+>ii : Symbol(ii, Decl(objectSpreadIndexSignature.ts, 6, 3))
+
+declare const b: boolean;
+>b : Symbol(b, Decl(objectSpreadIndexSignature.ts, 10, 13))
+
+indexed3 = { ...b ? indexed3 : undefined };
+>indexed3 : Symbol(indexed3, Decl(objectSpreadIndexSignature.ts, 2, 11))
+>b : Symbol(b, Decl(objectSpreadIndexSignature.ts, 10, 13))
+>indexed3 : Symbol(indexed3, Decl(objectSpreadIndexSignature.ts, 2, 11))
+>undefined : Symbol(undefined)
 
diff --git a/tests/baselines/reference/objectSpreadIndexSignature.types b/tests/baselines/reference/objectSpreadIndexSignature.types
index 5eebc2ffa02..eff3b04b8f6 100644
--- a/tests/baselines/reference/objectSpreadIndexSignature.types
+++ b/tests/baselines/reference/objectSpreadIndexSignature.types
@@ -1,34 +1,22 @@
 === tests/cases/conformance/types/spread/objectSpreadIndexSignature.ts ===
-interface Indexed {
->Indexed : Indexed
-
-    [n: string]: number;
+declare let indexed1: { [n: string]: number; a: number; };
+>indexed1 : { [n: string]: number; a: number; }
 >n : string
-
-    a: number;
 >a : number
-}
-interface Indexed2 {
->Indexed2 : Indexed2
 
-    [n: string]: boolean;
+declare let indexed2: { [n: string]: boolean; c: boolean; };
+>indexed2 : { [n: string]: boolean; c: boolean; }
+>n : string
+>c : boolean
+
+declare let indexed3: { [n: string]: number };
+>indexed3 : { [n: string]: number; }
 >n : string
 
-    c: boolean;
->c : boolean
-}
-let indexed: Indexed;
->indexed : Indexed
->Indexed : Indexed
-
-let indexed2: Indexed2;
->indexed2 : Indexed2
->Indexed2 : Indexed2
-
-let i = { ...indexed, b: 11 };
+let i = { ...indexed1, b: 11 };
 >i : { b: number; a: number; }
->{ ...indexed, b: 11 } : { b: number; a: number; }
->indexed : Indexed
+>{ ...indexed1, b: 11 } : { b: number; a: number; }
+>indexed1 : { [n: string]: number; a: number; }
 >b : number
 >11 : 11
 
@@ -38,11 +26,11 @@ i[101];
 >i : { b: number; a: number; }
 >101 : 101
 
-let ii = { ...indexed, ...indexed2 };
+let ii = { ...indexed1, ...indexed2 };
 >ii : { [x: string]: number | boolean; c: boolean; a: number; }
->{ ...indexed, ...indexed2 } : { [x: string]: number | boolean; c: boolean; a: number; }
->indexed : Indexed
->indexed2 : Indexed2
+>{ ...indexed1, ...indexed2 } : { [x: string]: number | boolean; c: boolean; a: number; }
+>indexed1 : { [n: string]: number; a: number; }
+>indexed2 : { [n: string]: boolean; c: boolean; }
 
 // both have indexer, so i[1001]: number | boolean
 ii[1001];
@@ -50,3 +38,15 @@ ii[1001];
 >ii : { [x: string]: number | boolean; c: boolean; a: number; }
 >1001 : 1001
 
+declare const b: boolean;
+>b : boolean
+
+indexed3 = { ...b ? indexed3 : undefined };
+>indexed3 = { ...b ? indexed3 : undefined } : {} | { [n: string]: number; }
+>indexed3 : { [n: string]: number; }
+>{ ...b ? indexed3 : undefined } : {} | { [n: string]: number; }
+>b ? indexed3 : undefined : { [n: string]: number; } | undefined
+>b : boolean
+>indexed3 : { [n: string]: number; }
+>undefined : undefined
+
diff --git a/tests/cases/conformance/types/spread/objectSpreadIndexSignature.ts b/tests/cases/conformance/types/spread/objectSpreadIndexSignature.ts
index ae46f2547d5..83649d465f1 100644
--- a/tests/cases/conformance/types/spread/objectSpreadIndexSignature.ts
+++ b/tests/cases/conformance/types/spread/objectSpreadIndexSignature.ts
@@ -1,16 +1,13 @@
-interface Indexed {
-    [n: string]: number;
-    a: number;
-}
-interface Indexed2 {
-    [n: string]: boolean;
-    c: boolean;
-}
-let indexed: Indexed;
-let indexed2: Indexed2;
-let i = { ...indexed, b: 11 };
+// @strict: true
+declare let indexed1: { [n: string]: number; a: number; };
+declare let indexed2: { [n: string]: boolean; c: boolean; };
+declare let indexed3: { [n: string]: number };
+let i = { ...indexed1, b: 11 };
 // only indexed has indexer, so i[101]: any
 i[101];
-let ii = { ...indexed, ...indexed2 };
+let ii = { ...indexed1, ...indexed2 };
 // both have indexer, so i[1001]: number | boolean
 ii[1001];
+
+declare const b: boolean;
+indexed3 = { ...b ? indexed3 : undefined };