Fix for-in emit under systemjs (microsoft#19223)

weswigham · web-flow · commit 40222d1a77a3 · 2017-10-16T12:57:23.000-07:00
diff --git a/src/compiler/transformers/module/system.ts b/src/compiler/transformers/module/system.ts
@@ -826,7 +826,7 @@ namespace ts {
                     /*needsValue*/ false,
                     createAssignment
                 )
-                : createAssignment(node.name, visitNode(node.initializer, destructuringAndImportCallVisitor, isExpression));
+                : node.initializer ? createAssignment(node.name, visitNode(node.initializer, destructuringAndImportCallVisitor, isExpression)) : node.name;
         }
 
         /**
@@ -1296,6 +1296,9 @@ namespace ts {
                 let expressions: Expression[];
                 for (const variable of node.declarations) {
                     expressions = append(expressions, transformInitializedVariable(variable, /*isExportedDeclaration*/ false));
+                    if (!variable.initializer) {
+                        hoistBindingElement(variable);
+                    }
                 }
 
                 return expressions ? inlineExpressions(expressions) : createOmittedExpression();
diff --git a/tests/baselines/reference/systemJsForInNoException.js b/tests/baselines/reference/systemJsForInNoException.js
@@ -0,0 +1,19 @@
+//// [systemJsForInNoException.ts]
+export const obj = { a: 1 };
+for (var key in obj)
+    console.log(obj[key]);
+
+//// [systemJsForInNoException.js]
+System.register([], function (exports_1, context_1) {
+    "use strict";
+    var __moduleName = context_1 && context_1.id;
+    var obj, key;
+    return {
+        setters: [],
+        execute: function () {
+            exports_1("obj", obj = { a: 1 });
+            for (key in obj)
+                console.log(obj[key]);
+        }
+    };
+});
diff --git a/tests/baselines/reference/systemJsForInNoException.symbols b/tests/baselines/reference/systemJsForInNoException.symbols
@@ -0,0 +1,16 @@
+=== tests/cases/compiler/systemJsForInNoException.ts ===
+export const obj = { a: 1 };
+>obj : Symbol(obj, Decl(systemJsForInNoException.ts, 0, 12))
+>a : Symbol(a, Decl(systemJsForInNoException.ts, 0, 20))
+
+for (var key in obj)
+>key : Symbol(key, Decl(systemJsForInNoException.ts, 1, 8))
+>obj : Symbol(obj, Decl(systemJsForInNoException.ts, 0, 12))
+
+    console.log(obj[key]);
+>console.log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --))
+>console : Symbol(console, Decl(lib.dom.d.ts, --, --))
+>log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --))
+>obj : Symbol(obj, Decl(systemJsForInNoException.ts, 0, 12))
+>key : Symbol(key, Decl(systemJsForInNoException.ts, 1, 8))
+
diff --git a/tests/baselines/reference/systemJsForInNoException.types b/tests/baselines/reference/systemJsForInNoException.types
@@ -0,0 +1,20 @@
+=== tests/cases/compiler/systemJsForInNoException.ts ===
+export const obj = { a: 1 };
+>obj : { a: number; }
+>{ a: 1 } : { a: number; }
+>a : number
+>1 : 1
+
+for (var key in obj)
+>key : string
+>obj : { a: number; }
+
+    console.log(obj[key]);
+>console.log(obj[key]) : void
+>console.log : (message?: any, ...optionalParams: any[]) => void
+>console : Console
+>log : (message?: any, ...optionalParams: any[]) => void
+>obj[key] : any
+>obj : { a: number; }
+>key : string
+
diff --git a/tests/cases/compiler/systemJsForInNoException.ts b/tests/cases/compiler/systemJsForInNoException.ts
@@ -0,0 +1,5 @@
+// @module: system
+// @lib: es6,dom
+export const obj = { a: 1 };
+for (var key in obj)
+    console.log(obj[key]);

Original file line number	Diff line number	Diff line change
`@@ -826,7 +826,7 @@ namespace ts {`
`826`	`826`	`/needsValue/ false,`
`827`	`827`	`createAssignment`
`828`	`828`	`)`
`829`		`- : createAssignment(node.name, visitNode(node.initializer, destructuringAndImportCallVisitor, isExpression));`
	`829`	`+ : node.initializer ? createAssignment(node.name, visitNode(node.initializer, destructuringAndImportCallVisitor, isExpression)) : node.name;`
`830`	`830`	`}`
`831`	`831`
`832`	`832`	`/**`
`@@ -1296,6 +1296,9 @@ namespace ts {`
`1296`	`1296`	`let expressions: Expression[];`
`1297`	`1297`	`for (const variable of node.declarations) {`
`1298`	`1298`	`expressions = append(expressions, transformInitializedVariable(variable, /isExportedDeclaration/ false));`
	`1299`	`+ if (!variable.initializer) {`
	`1300`	`+ hoistBindingElement(variable);`
	`1301`	`+ }`
`1299`	`1302`	`}`
`1300`	`1303`
`1301`	`1304`	`return expressions ? inlineExpressions(expressions) : createOmittedExpression();`