Hoist initial assignment to exported names in cjs to they are not blocked by bindings made by __exportStar

src/compiler/transformers/module/module.ts

@@ -96,6 +96,9 @@ namespace ts {
             if (shouldEmitUnderscoreUnderscoreESModule()) {
                 append(statements, createUnderscoreUnderscoreESModule());
             }
+            if (length(currentModuleInfo.exportedNames)) {
+                append(statements, createExpressionStatement(reduceLeft(currentModuleInfo.exportedNames, (prev, nextId) => createAssignment(createPropertyAccess(createIdentifier("exports"), createIdentifier(idText(nextId))), prev), createVoidZero() as Expression)));
+            }
 
             append(statements, visitNode(currentModuleInfo.externalHelpersImportDeclaration, sourceElementVisitor, isStatement));
             addRange(statements, visitNodes(node.statements, sourceElementVisitor, isStatement, statementOffset));
@@ -414,6 +417,9 @@ namespace ts {
             if (shouldEmitUnderscoreUnderscoreESModule()) {
                 append(statements, createUnderscoreUnderscoreESModule());
             }
+            if (length(currentModuleInfo.exportedNames)) {
+                append(statements, createExpressionStatement(reduceLeft(currentModuleInfo.exportedNames, (prev, nextId) => createAssignment(createPropertyAccess(createIdentifier("exports"), createIdentifier(idText(nextId))), prev), createVoidZero() as Expression)));
+            }
 
             // Visit each statement of the module body.
             append(statements, visitNode(currentModuleInfo.externalHelpersImportDeclaration, sourceElementVisitor, isStatement));
@@ -1188,7 +1194,7 @@ namespace ts {
 
                         variables = append(variables, variable);
                     }
-                    else {
+                    else if (variable.initializer) {
                         expressions = append(expressions, transformInitializedVariable(variable));
                     }
                 }

src/testRunner/unittests/tsserver/compileOnSave.ts

@@ -714,7 +714,7 @@ namespace ts.projectSystem {
 
             const expectedEmittedFileName = "/a/b/f1.js";
             assert.isTrue(host.fileExists(expectedEmittedFileName));
-            assert.equal(host.readFile(expectedEmittedFileName), `"use strict";\r\nexports.__esModule = true;\r\nfunction Foo() { return 10; }\r\nexports.Foo = Foo;\r\n`);
+            assert.equal(host.readFile(expectedEmittedFileName), `"use strict";\r\nexports.__esModule = true;\r\nexports.Foo = void 0;\r\nfunction Foo() { return 10; }\r\nexports.Foo = Foo;\r\n`);
         });
 
         it("shoud not emit js files in external projects", () => {

src/testRunner/unittests/tsserver/projectReferenceCompileOnSave.ts

@@ -236,7 +236,7 @@ exports.fn3 = fn3;`;
                 expectedFiles: [{
                     path: `${usageLocation}/usage.js`,
                     content: `"use strict";
-exports.__esModule = true;
+exports.__esModule = true;${appendJsText === changeJs ? "\nexports.fn3 = void 0;" : ""}
 var fns_1 = require("../decls/fns");
 fns_1.fn1();
 fns_1.fn2();
@@ -286,6 +286,7 @@ ${appendJs}`
                         path: `${dependecyLocation}/fns.js`,
                         content: `"use strict";
 exports.__esModule = true;
+${appendJsText === changeJs ? "exports.fn3 = " : ""}exports.fn2 = exports.fn1 = void 0;
 function fn1() { }
 exports.fn1 = fn1;
 function fn2() { }

tests/baselines/reference/APISample_compile.js

@@ -53,6 +53,7 @@ compile(process.argv.slice(2), {
  *       Please log a "breaking change" issue for any API breaking change affecting this issue
  */
 exports.__esModule = true;
+exports.compile = void 0;
 var ts = require("typescript");
 function compile(fileNames, options) {
     var program = ts.createProgram(fileNames, options);

tests/baselines/reference/APISample_linter.js

@@ -78,6 +78,7 @@ fileNames.forEach(fileName => {
  *       Please log a "breaking change" issue for any API breaking change affecting this issue
  */
 exports.__esModule = true;
+exports.delint = void 0;
 var ts = require("typescript");
 function delint(sourceFile) {
     delintNode(sourceFile);

tests/baselines/reference/APISample_parseConfig.js

@@ -50,6 +50,7 @@ export function createProgram(rootFiles: string[], compilerOptionsJson: string):
  *       Please log a "breaking change" issue for any API breaking change affecting this issue
  */
 exports.__esModule = true;
+exports.createProgram = void 0;
 var ts = require("typescript");
 function printError(error) {
     if (!error) {

tests/baselines/reference/ExportAssignment7.js

@@ -6,6 +6,7 @@ export = B;
 
 //// [ExportAssignment7.js]
 "use strict";
+exports.C = void 0;
 var C = /** @class */ (function () {
     function C() {
     }

tests/baselines/reference/ExportAssignment8.js

@@ -6,6 +6,7 @@ export class C {
 
 //// [ExportAssignment8.js]
 "use strict";
+exports.C = void 0;
 var C = /** @class */ (function () {
     function C() {
     }

tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.js

@@ -32,6 +32,7 @@ export module A {
 //// [part1.js]
 "use strict";
 exports.__esModule = true;
+exports.A = void 0;
 var A;
 (function (A) {
     var Utils;
@@ -46,6 +47,7 @@ var A;
 //// [part2.js]
 "use strict";
 exports.__esModule = true;
+exports.A = void 0;
 var A;
 (function (A) {
     // collision with 'Origin' var in other part of merged module

tests/baselines/reference/aliasAssignments.js

@@ -16,6 +16,7 @@ y = moduleA; // should be error
 //// [aliasAssignments_moduleA.js]
 "use strict";
 exports.__esModule = true;
+exports.someClass = void 0;
 var someClass = /** @class */ (function () {
     function someClass() {
     }

tests/baselines/reference/aliasUsageInAccessorsOfClass.js

@@ -30,6 +30,7 @@ class C2 {
 //// [aliasUsage1_backbone.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Model = void 0;
 var Model = /** @class */ (function () {
     function Model() {
     }
@@ -52,6 +53,7 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.VisualizationModel = void 0;
 var Backbone = require("./aliasUsage1_backbone");
 var VisualizationModel = /** @class */ (function (_super) {
     __extends(VisualizationModel, _super);

tests/baselines/reference/aliasUsageInArray.js

@@ -24,6 +24,7 @@ var xs2: typeof moduleA[] = [moduleA];
 //// [aliasUsageInArray_backbone.js]
 "use strict";
 exports.__esModule = true;
+exports.Model = void 0;
 var Model = /** @class */ (function () {
     function Model() {
     }
@@ -46,6 +47,7 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 exports.__esModule = true;
+exports.VisualizationModel = void 0;
 var Backbone = require("./aliasUsageInArray_backbone");
 var VisualizationModel = /** @class */ (function (_super) {
     __extends(VisualizationModel, _super);

tests/baselines/reference/aliasUsageInFunctionExpression.js

@@ -23,6 +23,7 @@ f = (x) => moduleA;
 //// [aliasUsageInFunctionExpression_backbone.js]
 "use strict";
 exports.__esModule = true;
+exports.Model = void 0;
 var Model = /** @class */ (function () {
     function Model() {
     }
@@ -45,6 +46,7 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 exports.__esModule = true;
+exports.VisualizationModel = void 0;
 var Backbone = require("./aliasUsageInFunctionExpression_backbone");
 var VisualizationModel = /** @class */ (function (_super) {
     __extends(VisualizationModel, _super);

tests/baselines/reference/aliasUsageInGenericFunction.js

@@ -27,6 +27,7 @@ var r2 = foo({ a: <IHasVisualizationModel>null });
 //// [aliasUsageInGenericFunction_backbone.js]
 "use strict";
 exports.__esModule = true;
+exports.Model = void 0;
 var Model = /** @class */ (function () {
     function Model() {
     }
@@ -49,6 +50,7 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 exports.__esModule = true;
+exports.VisualizationModel = void 0;
 var Backbone = require("./aliasUsageInGenericFunction_backbone");
 var VisualizationModel = /** @class */ (function (_super) {
     __extends(VisualizationModel, _super);

tests/baselines/reference/aliasUsageInIndexerOfClass.js

@@ -29,6 +29,7 @@ class N2 {
 //// [aliasUsageInIndexerOfClass_backbone.js]
 "use strict";
 exports.__esModule = true;
+exports.Model = void 0;
 var Model = /** @class */ (function () {
     function Model() {
     }
@@ -51,6 +52,7 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 exports.__esModule = true;
+exports.VisualizationModel = void 0;
 var Backbone = require("./aliasUsageInIndexerOfClass_backbone");
 var VisualizationModel = /** @class */ (function (_super) {
     __extends(VisualizationModel, _super);

tests/baselines/reference/aliasUsageInObjectLiteral.js

@@ -24,6 +24,7 @@ var c: { y: { z: IHasVisualizationModel } } = { y: { z: moduleA } };
 //// [aliasUsageInObjectLiteral_backbone.js]
 "use strict";
 exports.__esModule = true;
+exports.Model = void 0;
 var Model = /** @class */ (function () {
     function Model() {
     }
@@ -46,6 +47,7 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 exports.__esModule = true;
+exports.VisualizationModel = void 0;
 var Backbone = require("./aliasUsageInObjectLiteral_backbone");
 var VisualizationModel = /** @class */ (function (_super) {
     __extends(VisualizationModel, _super);

tests/baselines/reference/aliasUsageInOrExpression.js

@@ -27,6 +27,7 @@ var f: { x: IHasVisualizationModel } = <{ x: IHasVisualizationModel }>null ? { x
 //// [aliasUsageInOrExpression_backbone.js]
 "use strict";
 exports.__esModule = true;
+exports.Model = void 0;
 var Model = /** @class */ (function () {
     function Model() {
     }
@@ -49,6 +50,7 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 exports.__esModule = true;
+exports.VisualizationModel = void 0;
 var Backbone = require("./aliasUsageInOrExpression_backbone");
 var VisualizationModel = /** @class */ (function (_super) {
     __extends(VisualizationModel, _super);

tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js

@@ -27,6 +27,7 @@ class D extends C<IHasVisualizationModel> {
 //// [aliasUsageInTypeArgumentOfExtendsClause_backbone.js]
 "use strict";
 exports.__esModule = true;
+exports.Model = void 0;
 var Model = /** @class */ (function () {
     function Model() {
     }
@@ -49,6 +50,7 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 exports.__esModule = true;
+exports.VisualizationModel = void 0;
 var Backbone = require("./aliasUsageInTypeArgumentOfExtendsClause_backbone");
 var VisualizationModel = /** @class */ (function (_super) {
     __extends(VisualizationModel, _super);