Fix type of computed name following spread (microsoft#39319)

weswigham · web-flow · commit ff1f449b9951 · 2020-06-30T13:37:59.000-07:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -23836,10 +23836,15 @@ namespace ts {
             return links.resolvedType;
         }
 
+        function isSymbolWithNumericName(symbol: Symbol) {
+            const firstDecl = symbol.declarations?.[0];
+            return isNumericLiteralName(symbol.escapedName) || (firstDecl && isNamedDeclaration(firstDecl) && isNumericName(firstDecl.name));
+        }
+
         function getObjectLiteralIndexInfo(node: ObjectLiteralExpression, offset: number, properties: Symbol[], kind: IndexKind): IndexInfo {
             const propTypes: Type[] = [];
             for (let i = offset; i < properties.length; i++) {
-                if (kind === IndexKind.String || isNumericName(node.properties[i].name!)) {
+                if (kind === IndexKind.String || isSymbolWithNumericName(properties[i])) {
                     propTypes.push(getTypeOfSymbol(properties[i]));
                 }
             }
@@ -23892,8 +23897,7 @@ namespace ts {
             }
 
             let offset = 0;
-            for (let i = 0; i < node.properties.length; i++) {
-                const memberDecl = node.properties[i];
+            for (const memberDecl of node.properties) {
                 let member = getSymbolOfNode(memberDecl);
                 const computedNameType = memberDecl.name && memberDecl.name.kind === SyntaxKind.ComputedPropertyName && !isWellKnownSymbolSyntactically(memberDecl.name.expression) ?
                     checkComputedPropertyName(memberDecl.name) : undefined;
@@ -23980,7 +23984,7 @@ namespace ts {
                         checkSpreadPropOverrides(type, allPropertiesTable, memberDecl);
                     }
                     spread = getSpreadType(spread, type, node.symbol, objectFlags, inConstContext);
-                    offset = i + 1;
+                    offset = propertiesArray.length;
                     continue;
                 }
                 else {
diff --git a/tests/baselines/reference/spreadObjectWithIndexDoesNotAddUndefinedToLocalIndex.js b/tests/baselines/reference/spreadObjectWithIndexDoesNotAddUndefinedToLocalIndex.js
@@ -0,0 +1,19 @@
+//// [spreadObjectWithIndexDoesNotAddUndefinedToLocalIndex.ts]
+declare const m: { [k: string]: string };
+const x: { [k: string]: string } = { ...m, ["a" + "b"]: "" };
+
+//// [spreadObjectWithIndexDoesNotAddUndefinedToLocalIndex.js]
+"use strict";
+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 _a;
+var x = __assign(__assign({}, m), (_a = {}, _a["a" + "b"] = "", _a));
diff --git a/tests/baselines/reference/spreadObjectWithIndexDoesNotAddUndefinedToLocalIndex.symbols b/tests/baselines/reference/spreadObjectWithIndexDoesNotAddUndefinedToLocalIndex.symbols
@@ -0,0 +1,11 @@
+=== tests/cases/compiler/spreadObjectWithIndexDoesNotAddUndefinedToLocalIndex.ts ===
+declare const m: { [k: string]: string };
+>m : Symbol(m, Decl(spreadObjectWithIndexDoesNotAddUndefinedToLocalIndex.ts, 0, 13))
+>k : Symbol(k, Decl(spreadObjectWithIndexDoesNotAddUndefinedToLocalIndex.ts, 0, 20))
+
+const x: { [k: string]: string } = { ...m, ["a" + "b"]: "" };
+>x : Symbol(x, Decl(spreadObjectWithIndexDoesNotAddUndefinedToLocalIndex.ts, 1, 5))
+>k : Symbol(k, Decl(spreadObjectWithIndexDoesNotAddUndefinedToLocalIndex.ts, 1, 12))
+>m : Symbol(m, Decl(spreadObjectWithIndexDoesNotAddUndefinedToLocalIndex.ts, 0, 13))
+>["a" + "b"] : Symbol(["a" + "b"], Decl(spreadObjectWithIndexDoesNotAddUndefinedToLocalIndex.ts, 1, 42))
+
diff --git a/tests/baselines/reference/spreadObjectWithIndexDoesNotAddUndefinedToLocalIndex.types b/tests/baselines/reference/spreadObjectWithIndexDoesNotAddUndefinedToLocalIndex.types
@@ -0,0 +1,16 @@
+=== tests/cases/compiler/spreadObjectWithIndexDoesNotAddUndefinedToLocalIndex.ts ===
+declare const m: { [k: string]: string };
+>m : { [k: string]: string; }
+>k : string
+
+const x: { [k: string]: string } = { ...m, ["a" + "b"]: "" };
+>x : { [k: string]: string; }
+>k : string
+>{ ...m, ["a" + "b"]: "" } : { [x: string]: string; }
+>m : { [k: string]: string; }
+>["a" + "b"] : string
+>"a" + "b" : string
+>"a" : "a"
+>"b" : "b"
+>"" : ""
+
diff --git a/tests/cases/compiler/spreadObjectWithIndexDoesNotAddUndefinedToLocalIndex.ts b/tests/cases/compiler/spreadObjectWithIndexDoesNotAddUndefinedToLocalIndex.ts
@@ -0,0 +1,3 @@
+// @strict: true
+declare const m: { [k: string]: string };
+const x: { [k: string]: string } = { ...m, ["a" + "b"]: "" };

Original file line number	Diff line number	Diff line change
`@@ -23836,10 +23836,15 @@ namespace ts {`
`23836`	`23836`	`return links.resolvedType;`
`23837`	`23837`	`}`
`23838`	`23838`
	`23839`	`+ function isSymbolWithNumericName(symbol: Symbol) {`
	`23840`	`+ const firstDecl = symbol.declarations?.[0];`
	`23841`	`+ return isNumericLiteralName(symbol.escapedName) \|\| (firstDecl && isNamedDeclaration(firstDecl) && isNumericName(firstDecl.name));`
	`23842`	`+ }`
	`23843`	`+`
`23839`	`23844`	`function getObjectLiteralIndexInfo(node: ObjectLiteralExpression, offset: number, properties: Symbol[], kind: IndexKind): IndexInfo {`
`23840`	`23845`	`const propTypes: Type[] = [];`
`23841`	`23846`	`for (let i = offset; i < properties.length; i++) {`
`23842`		`- if (kind === IndexKind.String \|\| isNumericName(node.properties[i].name!)) {`
	`23847`	`+ if (kind === IndexKind.String \|\| isSymbolWithNumericName(properties[i])) {`
`23843`	`23848`	`propTypes.push(getTypeOfSymbol(properties[i]));`
`23844`	`23849`	`}`
`23845`	`23850`	`}`
`@@ -23892,8 +23897,7 @@ namespace ts {`
`23892`	`23897`	`}`
`23893`	`23898`
`23894`	`23899`	`let offset = 0;`
`23895`		`- for (let i = 0; i < node.properties.length; i++) {`
`23896`		`- const memberDecl = node.properties[i];`
	`23900`	`+ for (const memberDecl of node.properties) {`
`23897`	`23901`	`let member = getSymbolOfNode(memberDecl);`
`23898`	`23902`	`const computedNameType = memberDecl.name && memberDecl.name.kind === SyntaxKind.ComputedPropertyName && !isWellKnownSymbolSyntactically(memberDecl.name.expression) ?`
`23899`	`23903`	`checkComputedPropertyName(memberDecl.name) : undefined;`
`@@ -23980,7 +23984,7 @@ namespace ts {`
`23980`	`23984`	`checkSpreadPropOverrides(type, allPropertiesTable, memberDecl);`
`23981`	`23985`	`}`
`23982`	`23986`	`spread = getSpreadType(spread, type, node.symbol, objectFlags, inConstContext);`
`23983`		`- offset = i + 1;`
	`23987`	`+ offset = propertiesArray.length;`
`23984`	`23988`	`continue;`
`23985`	`23989`	`}`
`23986`	`23990`	`else {`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+// @strict: true`
	`2`	`+declare const m: { [k: string]: string };`
	`3`	`+const x: { [k: string]: string } = { ...m, ["a" + "b"]: "" };`