Modified ts.ts to handle export defaults enum/namespace correctly.

Author: NaridaL

src/compiler/transformers/ts.ts

@@ -333,7 +333,7 @@ namespace ts {
             if (modifierToFlag(node.kind) & ModifierFlags.TypeScriptModifier) {
                 return undefined;
             }
-            else if (currentNamespace && node.kind === SyntaxKind.ExportKeyword) {
+            else if (node.kind === SyntaxKind.ExportKeyword || node.kind === SyntaxKind.DefaultKeyword) {
                 return undefined;
             }
 
@@ -2594,29 +2594,7 @@ namespace ts {
             // `containerName` is the expression used inside of the enum for assignments.
             const containerName = getNamespaceContainerName(node);
 
-            // `exportName` is the expression used within this node's container for any exported references.
-            const exportName = hasModifier(node, ModifierFlags.Export)
-                ? getExternalModuleOrNamespaceExportName(currentNamespaceContainerName, node, /*allowComments*/ false, /*allowSourceMaps*/ true)
-                : getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true);
-
-            //  x || (x = {})
-            //  exports.x || (exports.x = {})
-            let moduleArg =
-                createLogicalOr(
-                    exportName,
-                    createAssignment(
-                        exportName,
-                        createObjectLiteral()
-                    )
-                );
-
-            if (hasNamespaceQualifiedExportName(node)) {
-                // `localName` is the expression used within this node's containing scope for any local references.
-                const localName = getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true);
-
-                //  x = (exports.x || (exports.x = {}))
-                moduleArg = createAssignment(localName, moduleArg);
-            }
+            const localName = getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true);
 
             //  (function (x) {
             //      x[x["y"] = 0] = "y";
@@ -2634,18 +2612,19 @@ namespace ts {
                         transformEnumBody(node, containerName)
                     ),
                     /*typeArguments*/ undefined,
-                    [moduleArg]
+                    [localName]
                 )
             );
 
             setOriginalNode(enumStatement, node);
             setTextRange(enumStatement, node);
+            setCommentRange(enumStatement, node);
             setEmitFlags(enumStatement, emitFlags);
             statements.push(enumStatement);
 
             // Add a DeclarationMarker for the enum to preserve trailing comments and mark
             // the end of the declaration.
-            statements.push(createEndOfDeclarationMarker(node));
+            // statements.push(createEndOfDeclarationMarker(node));
             return statements;
         }
 
@@ -2738,18 +2717,6 @@ namespace ts {
             return isInstantiatedModule(node, compilerOptions.preserveConstEnums || compilerOptions.isolatedModules);
         }
 
-        /**
-         * Determines whether an exported declaration will have a qualified export name (e.g. `f.x`
-         * or `exports.x`).
-         */
-        function hasNamespaceQualifiedExportName(node: Node) {
-            return isExportOfNamespace(node)
-                || (isExternalModuleExport(node)
-                    && moduleKind !== ModuleKind.ES2015
-                    && moduleKind !== ModuleKind.ESNext
-                    && moduleKind !== ModuleKind.System);
-        }
-
         /**
          * Records that a declaration was emitted in the current scope, if it was the first
          * declaration for the provided symbol.
@@ -2786,22 +2753,58 @@ namespace ts {
          * Adds a leading VariableStatement for a enum or module declaration.
          */
         function addVarForEnumOrModuleDeclaration(statements: Statement[], node: ModuleDeclaration | EnumDeclaration) {
-            // Emit a variable statement for the module. We emit top-level enums as a `var`
-            // declaration to avoid static errors in global scripts scripts due to redeclaration.
-            // enums in any other scope are emitted as a `let` declaration.
-            const statement = createVariableStatement(
-                visitNodes(node.modifiers, modifierVisitor, isModifier),
-                createVariableDeclarationList([
-                    createVariableDeclaration(
-                        getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true)
-                    )
-                ], currentScope.kind === SyntaxKind.SourceFile ? NodeFlags.None : NodeFlags.Let)
-            );
-
-            setOriginalNode(statement, node);
 
             recordEmittedDeclarationInScope(node);
             if (isFirstEmittedDeclarationInScope(node)) {
+                // Emit a local variable statement for the module. We emit top-level enums as a `var`
+                // declaration to avoid static errors in global scripts scripts due to redeclaration.
+                // enums in any other scope are emitted as a `const` declaration.
+                const nodeModifierFlags = getModifierFlags(node);
+                const nodeIsExportDefault = (nodeModifierFlags & ModifierFlags.Export) && (nodeModifierFlags & ModifierFlags.Default);
+                // function modifierVisitor(node: Node): VisitResult<Node> {
+                //     if (modifierToFlag(node.kind) & ModifierFlags.TypeScriptModifier) {
+                //         return undefined;
+                //     }
+                //     else if ((currentNamespace || nodeIsExportDefault) && node.kind === SyntaxKind.ExportKeyword) {
+                //         return undefined;
+                //     }
+                //     if (node.kind === SyntaxKind.DefaultKeyword) {
+                //         return undefined;
+                //     }
+                //     return node;
+                // }
+
+                const fileIsExternalModule = isExternalModule(currentSourceFile);
+                const localName = getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true);
+                let varInitializer;
+                if (fileIsExternalModule && !currentNamespace) {
+                    // toplevel declaration in an external module
+                    // cannot merge with another var
+                    varInitializer = createObjectLiteral();
+                }
+                else {
+                    const exportName = hasModifier(node, ModifierFlags.Export) && !nodeIsExportDefault
+                        ? getExternalModuleOrNamespaceExportName(currentNamespaceContainerName, node, /*allowComments*/ false, /*allowSourceMaps*/ true)
+                        : getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true);
+                    varInitializer = createLogicalOr(
+                        exportName,
+                        createAssignment(exportName, createObjectLiteral())
+                    );
+                }
+                const statement = createVariableStatement(
+                    visitNodes(node.modifiers, modifierVisitor, isModifier),
+                    createVariableDeclarationList([
+                        createVariableDeclaration(
+                            localName,
+                            /* type */ undefined,
+                            varInitializer
+                        )
+                    ], currentScope.kind === SyntaxKind.SourceFile && !fileIsExternalModule ? NodeFlags.None : NodeFlags.Const)
+                );
+
+                setOriginalNode(statement, node);
+
+
                 // Adjust the source map emit to match the old emitter.
                 if (node.kind === SyntaxKind.EnumDeclaration) {
                     setSourceMapRange(statement.declarationList, node);
@@ -2817,32 +2820,28 @@ namespace ts {
                 //     module m1 {
                 //         function foo4Export() {
                 //         }
-                //     } // trailing comment module
+                //     } // trailing module comment
                 //
                 // Should emit:
                 //
                 //     /** Module comment*/
-                //     var m1;
+                //     var m1 = m1 || {};
                 //     (function (m1) {
                 //         function foo4Export() {
                 //         }
-                //     })(m1 || (m1 = {})); // trailing comment module
+                //     })(m1); // trailing module comment
                 //
                 setCommentRange(statement, node);
-                setEmitFlags(statement, EmitFlags.NoTrailingComments | EmitFlags.HasEndOfDeclarationMarker);
+                setEmitFlags(statement, EmitFlags.NoTrailingComments);
                 statements.push(statement);
+                if (nodeIsExportDefault) {
+                    statements.push(createExportAssignment(/* decorators */ undefined, /* modifiers */ undefined, /* isExportEquals */ false, localName));
+                }
+                else if (!currentNamespace && nodeModifierFlags & ModifierFlags.Export) {
+                    statements.push(createExternalModuleExport(localName));
+                }
                 return true;
             }
-            else {
-                // For an EnumDeclaration or ModuleDeclaration that merges with a preceeding
-                // declaration we do not emit a leading variable declaration. To preserve the
-                // begin/end semantics of the declararation and to properly handle exports
-                // we wrap the leading variable declaration in a `MergeDeclarationMarker`.
-                const mergeMarker = createMergeDeclarationMarker(statement);
-                setEmitFlags(mergeMarker, EmitFlags.NoComments | EmitFlags.HasEndOfDeclarationMarker);
-                statements.push(mergeMarker);
-                return false;
-            }
         }
 
         /**
@@ -2882,29 +2881,7 @@ namespace ts {
             // `containerName` is the expression used inside of the namespace for exports.
             const containerName = getNamespaceContainerName(node);
 
-            // `exportName` is the expression used within this node's container for any exported references.
-            const exportName = hasModifier(node, ModifierFlags.Export)
-                ? getExternalModuleOrNamespaceExportName(currentNamespaceContainerName, node, /*allowComments*/ false, /*allowSourceMaps*/ true)
-                : getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true);
-
-            //  x || (x = {})
-            //  exports.x || (exports.x = {})
-            let moduleArg =
-                createLogicalOr(
-                    exportName,
-                    createAssignment(
-                        exportName,
-                        createObjectLiteral()
-                    )
-                );
-
-            if (hasNamespaceQualifiedExportName(node)) {
-                // `localName` is the expression used within this node's containing scope for any local references.
-                const localName = getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true);
-
-                //  x = (exports.x || (exports.x = {}))
-                moduleArg = createAssignment(localName, moduleArg);
-            }
+            const localName = getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true);
 
             //  (function (x_1) {
             //      x_1.y = ...;
@@ -2921,18 +2898,16 @@ namespace ts {
                         transformModuleBody(node, containerName)
                     ),
                     /*typeArguments*/ undefined,
-                    [moduleArg]
+                    [localName]
                 )
             );
 
             setOriginalNode(moduleStatement, node);
+            setCommentRange(moduleStatement, node);
             setTextRange(moduleStatement, node);
             setEmitFlags(moduleStatement, emitFlags);
             statements.push(moduleStatement);
 
-            // Add a DeclarationMarker for the namespace to preserve trailing comments and mark
-            // the end of the declaration.
-            statements.push(createEndOfDeclarationMarker(node));
             return statements;
         }
 

tests/baselines/reference/APISample_compile.js

@@ -64,7 +64,6 @@ function compile(fileNames, options) {
     console.log("Process exiting with code '" + exitCode + "'.");
     process.exit(exitCode);
 }
-exports.compile = compile;
 compile(process.argv.slice(2), {
     noEmitOnError: true, noImplicitAny: true,
     target: ts.ScriptTarget.ES5, module: ts.ModuleKind.CommonJS

tests/baselines/reference/APISample_parseConfig.js

@@ -67,4 +67,3 @@ function createProgram(rootFiles, compilerOptionsJson) {
     }
     return ts.createProgram(rootFiles, settings.options);
 }
-exports.createProgram = createProgram;

tests/baselines/reference/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.js

@@ -23,7 +23,7 @@ var p = A.Point.Origin;
 var p = new A.Point(0, 0); // unexpected error here, bug 840000
 
 //// [classPoint.js]
-var A;
+var A = A || (A = {});
 (function (A) {
     var Point = /** @class */ (function () {
         function Point(x, y) {
@@ -33,7 +33,7 @@ var A;
         return Point;
     }());
     A.Point = Point;
-})(A || (A = {}));
+})(A);
 //// [test.js]
 var p;
 var p = A.Point.Origin;

tests/baselines/reference/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.js

@@ -58,7 +58,7 @@ var clodule1 = /** @class */ (function () {
 }());
 (function (clodule1) {
     function f(x) { }
-})(clodule1 || (clodule1 = {}));
+})(clodule1);
 var clodule2 = /** @class */ (function () {
     function clodule2() {
     }
@@ -71,15 +71,15 @@ var clodule2 = /** @class */ (function () {
         }
         return D;
     }());
-})(clodule2 || (clodule2 = {}));
+})(clodule2);
 var clodule3 = /** @class */ (function () {
     function clodule3() {
     }
     return clodule3;
 }());
 (function (clodule3) {
     clodule3.y = { id: T };
-})(clodule3 || (clodule3 = {}));
+})(clodule3);
 var clodule4 = /** @class */ (function () {
     function clodule4() {
     }
@@ -91,4 +91,4 @@ var clodule4 = /** @class */ (function () {
         }
         return D;
     }());
-})(clodule4 || (clodule4 = {}));
+})(clodule4);

tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.js

@@ -28,4 +28,4 @@ var clodule = /** @class */ (function () {
         return x;
     }
     clodule.fn = fn;
-})(clodule || (clodule = {}));
+})(clodule);

tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.js

@@ -28,4 +28,4 @@ var clodule = /** @class */ (function () {
         return x;
     }
     clodule.fn = fn;
-})(clodule || (clodule = {}));
+})(clodule);

tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.js

@@ -28,4 +28,4 @@ var clodule = /** @class */ (function () {
         return clodule.sfn('a');
     }
     clodule.fn = fn;
-})(clodule || (clodule = {}));
+})(clodule);

tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.js

@@ -34,8 +34,8 @@ var Point = /** @class */ (function () {
 (function (Point) {
     function Origin() { return null; } //expected duplicate identifier error
     Point.Origin = Origin;
-})(Point || (Point = {}));
-var A;
+})(Point);
+var A = A || (A = {});
 (function (A) {
     var Point = /** @class */ (function () {
         function Point(x, y) {
@@ -49,5 +49,5 @@ var A;
     (function (Point) {
         function Origin() { return ""; } //expected duplicate identifier error
         Point.Origin = Origin;
-    })(Point = A.Point || (A.Point = {}));
-})(A || (A = {}));
+    })(Point);
+})(A);

tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.js

@@ -33,8 +33,8 @@ var Point = /** @class */ (function () {
 }());
 (function (Point) {
     function Origin() { return ""; } // not an error, since not exported
-})(Point || (Point = {}));
-var A;
+})(Point);
+var A = A || (A = {});
 (function (A) {
     var Point = /** @class */ (function () {
         function Point(x, y) {
@@ -47,5 +47,5 @@ var A;
     A.Point = Point;
     (function (Point) {
         function Origin() { return ""; } // not an error since not exported
-    })(Point = A.Point || (A.Point = {}));
-})(A || (A = {}));
+    })(Point);
+})(A);