Support export *

Author: andy-hanson

NOTICE

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

src/ast.ts

@@ -1972,9 +1972,24 @@ 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 stripIndex(internalPath) + PATH_DELIMITER + simpleName;
+}
+
+// "foo/index" -> "foo"
+// "foo/bar" -> itself
+export function stripIndex(internalPath: string): string {
+  const indexPart = PATH_DELIMITER + "index";
+  return internalPath.endsWith(indexPart)
+    ? internalPath.substring(0, internalPath.length - indexPart.length)
+    : internalPath;
 }
 
 /** 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

@@ -83,6 +83,7 @@ export enum DiagnosticCode {
   A_class_may_only_extend_another_class = 1311,
   A_parameter_property_cannot_be_declared_using_a_rest_parameter = 1317,
   Duplicate_identifier_0 = 2300,
+  Identifier_0_is_re_exported_from_modules_1_and_2 = 2301,
   Cannot_find_name_0 = 2304,
   Module_0_has_no_exported_member_1 = 2305,
   Generic_type_0_requires_1_type_argument_s = 2314,
@@ -202,6 +203,7 @@ export function diagnosticCodeToString(code: DiagnosticCode): string {
     case 1311: return "A class may only extend another class.";
     case 1317: return "A parameter property cannot be declared using a rest parameter.";
     case 2300: return "Duplicate identifier '{0}'.";
+    case 2301: return "Identifier '{0}' is re-exported from modules '{1}' and '{2}'.";
     case 2304: return "Cannot find name '{0}'.";
     case 2305: return "Module '{0}' has no exported member '{1}'.";
     case 2314: return "Generic type '{0}' requires {1} type argument(s).";

src/diagnosticMessages.json

@@ -77,6 +77,7 @@
   "A parameter property cannot be declared using a rest parameter.": 1317,
 
   "Duplicate identifier '{0}'.": 2300,
+  "Identifier '{0}' is re-exported from modules '{1}' and '{2}'.": 2301,
   "Cannot find name '{0}'.": 2304,
   "Module '{0}' has no exported member '{1}'.": 2305,
   "Generic type '{0}' requires {1} type argument(s).": 2314,