Support export *

NOTICE

@@ -9,6 +9,7 @@ under the licensing terms detailed in LICENSE:
 * Norton Wang <[email protected]>
 * Alan Pierce <[email protected]>
 * Palmer <[email protected]>
+* Andy Hanson <[email protected]>
 
 Portions of this software are derived from third-party works licensed under
 the following terms:

src/ast.ts

@@ -1821,7 +1821,10 @@ export class ImportStatement extends Statement {
   path: StringLiteralExpression;
   /** Normalized path. */
   normalizedPath: string;
-  /** Mangled internal path being referenced. */
+  /**
+   * Mangled internal path being referenced.
+   * Note: actual referenced path may be this + "/index". See `lookupSourceByPath` in `program.ts`.
+   */
   internalPath: string;
 }
 
@@ -1972,9 +1975,15 @@ export function mangleInternalName(declaration: DeclarationStatement, asGlobal:
     return mangleInternalName(<DeclarationStatement>parent, asGlobal) +
            STATIC_DELIMITER + name;
   }
-  return asGlobal
-    ? name
-    : declaration.range.source.internalPath + PATH_DELIMITER + name;
+  return asGlobal ? name : getSourceLevelName(declaration.range.source, name);
+}
+
+export function getSourceLevelName({ internalPath }: Source, simpleName: string): string {
+  return getSourceLevelNameFromInternalPath(internalPath, simpleName);
+}
+
+export function getSourceLevelNameFromInternalPath(internalPath: string, simpleName: string): string {
+  return internalPath + PATH_DELIMITER + simpleName;
 }
 
 /** Mangles an external to an internal path. */

src/compiler.ts

@@ -144,7 +144,8 @@ import {
 
   nodeIsConstantValue,
   isLastStatement,
-  findDecorator
+  findDecorator,
+  getSourceLevelName
 } from "./ast";
 
 import {
@@ -1266,9 +1267,7 @@ export class Compiler extends DiagnosticEmitter {
     if (!members) return; // filespace
     for (let i = 0, k = members.length; i < k; ++i) {
       let member = members[i];
-      let element = fileLevelExports.get(
-        statement.range.source.internalPath + PATH_DELIMITER + member.externalName.text
-      );
+      let element = fileLevelExports.get(getSourceLevelName(statement.range.source, member.externalName.text));
       if (!element) continue; // reported in Program#initialize
       switch (element.kind) {
         case ElementKind.CLASS_PROTOTYPE: {

src/diagnosticMessages.generated.ts

@@ -85,6 +85,7 @@ export enum DiagnosticCode {
   Duplicate_identifier_0 = 2300,
   Cannot_find_name_0 = 2304,
   Module_0_has_no_exported_member_1 = 2305,
+  Module_0_has_already_exported_a_member_named_1_Consider_explicitly_re_exporting_to_resolve_the_ambiguity = 2308,
   Generic_type_0_requires_1_type_argument_s = 2314,
   Type_0_is_not_generic = 2315,
   Type_0_is_not_assignable_to_type_1 = 2322,
@@ -204,6 +205,7 @@ export function diagnosticCodeToString(code: DiagnosticCode): string {
     case 2300: return "Duplicate identifier '{0}'.";
     case 2304: return "Cannot find name '{0}'.";
     case 2305: return "Module '{0}' has no exported member '{1}'.";
+    case 2308: return "Module {0} has already exported a member named '{1}'. Consider explicitly re-exporting to resolve the ambiguity.";
     case 2314: return "Generic type '{0}' requires {1} type argument(s).";
     case 2315: return "Type '{0}' is not generic.";
     case 2322: return "Type '{0}' is not assignable to type '{1}'.";

src/diagnosticMessages.json

@@ -79,6 +79,7 @@
   "Duplicate identifier '{0}'.": 2300,
   "Cannot find name '{0}'.": 2304,
   "Module '{0}' has no exported member '{1}'.": 2305,
+  "Module {0} has already exported a member named '{1}'. Consider explicitly re-exporting to resolve the ambiguity.": 2308,
   "Generic type '{0}' requires {1} type argument(s).": 2314,
   "Type '{0}' is not generic.": 2315,
   "Type '{0}' is not assignable to type '{1}'.": 2322,