Merge pull request microsoft#10807 from Microsoft/release-2.0_re_export_shorthand

Andy · web-flow · commit 5c16cb6f320f · 2016-09-09T12:58:25.000-07:00
A shorthand ambient module should be considered as possibly exporting a value
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -1039,7 +1039,7 @@ namespace ts {
             const moduleSymbol = resolveExternalModuleName(node, (<ImportDeclaration>node.parent).moduleSpecifier);
 
             if (moduleSymbol) {
-                const exportDefaultSymbol = isShorthandAmbientModule(moduleSymbol.valueDeclaration) ?
+                const exportDefaultSymbol = isShorthandAmbientModuleSymbol(moduleSymbol) ?
                     moduleSymbol :
                     moduleSymbol.exports["export="] ?
                         getPropertyOfType(getTypeOfSymbol(moduleSymbol.exports["export="]), "default") :
@@ -1115,7 +1115,7 @@ namespace ts {
             if (targetSymbol) {
                 const name = specifier.propertyName || specifier.name;
                 if (name.text) {
-                    if (isShorthandAmbientModule(moduleSymbol.valueDeclaration)) {
+                    if (isShorthandAmbientModuleSymbol(moduleSymbol)) {
                         return moduleSymbol;
                     }
 
@@ -3371,7 +3371,7 @@ namespace ts {
         function getTypeOfFuncClassEnumModule(symbol: Symbol): Type {
             const links = getSymbolLinks(symbol);
             if (!links.type) {
-                if (symbol.valueDeclaration.kind === SyntaxKind.ModuleDeclaration && isShorthandAmbientModule(<ModuleDeclaration>symbol.valueDeclaration)) {
+                if (symbol.valueDeclaration.kind === SyntaxKind.ModuleDeclaration && isShorthandAmbientModuleSymbol(symbol)) {
                     links.type = anyType;
                 }
                 else {
@@ -18295,8 +18295,8 @@ namespace ts {
 
         function moduleExportsSomeValue(moduleReferenceExpression: Expression): boolean {
             let moduleSymbol = resolveExternalModuleName(moduleReferenceExpression.parent, moduleReferenceExpression);
-            if (!moduleSymbol) {
-                // module not found - be conservative
+            if (!moduleSymbol || isShorthandAmbientModuleSymbol(moduleSymbol)) {
+                // If the module is not found or is shorthand, assume that it may export a value.
                 return true;
             }
 
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
@@ -360,7 +360,11 @@ namespace ts {
             ((<ModuleDeclaration>node).name.kind === SyntaxKind.StringLiteral || isGlobalScopeAugmentation(<ModuleDeclaration>node));
     }
 
-    export function isShorthandAmbientModule(node: Node): boolean {
+    export function isShorthandAmbientModuleSymbol(moduleSymbol: Symbol): boolean {
+        return isShorthandAmbientModule(moduleSymbol.valueDeclaration);
+    }
+
+    function isShorthandAmbientModule(node: Node): boolean {
         // The only kind of module that can be missing a body is a shorthand ambient module.
         return node.kind === SyntaxKind.ModuleDeclaration && (!(<ModuleDeclaration>node).body);
     }
diff --git a/tests/baselines/reference/ambientShorthand_reExport.js b/tests/baselines/reference/ambientShorthand_reExport.js
@@ -22,6 +22,10 @@ var jquery_1 = require("jquery");
 exports.x = jquery_1.x;
 //// [reExportAll.js]
 "use strict";
+function __export(m) {
+    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
+}
+__export(require("jquery"));
 //// [reExportUser.js]
 "use strict";
 var reExportX_1 = require("./reExportX");

Original file line number	Diff line number	Diff line change
`@@ -360,7 +360,11 @@ namespace ts {`
`360`	`360`	`((<ModuleDeclaration>node).name.kind === SyntaxKind.StringLiteral \|\| isGlobalScopeAugmentation(<ModuleDeclaration>node));`
`361`	`361`	`}`
`362`	`362`
`363`		`- export function isShorthandAmbientModule(node: Node): boolean {`
	`363`	`+ export function isShorthandAmbientModuleSymbol(moduleSymbol: Symbol): boolean {`
	`364`	`+ return isShorthandAmbientModule(moduleSymbol.valueDeclaration);`
	`365`	`+ }`
	`366`	`+`
	`367`	`+ function isShorthandAmbientModule(node: Node): boolean {`
`364`	`368`	`// The only kind of module that can be missing a body is a shorthand ambient module.`
`365`	`369`	`return node.kind === SyntaxKind.ModuleDeclaration && (!(<ModuleDeclaration>node).body);`
`366`	`370`	`}`