Fixed the "Unsupported re-export" bug

pgonzal · pgonzal · commit 166eb546abcd · 2018-01-11T17:01:10.000-08:00
diff --git a/apps/api-extractor/src/generators/PackageTypingsGenerator.ts b/apps/api-extractor/src/generators/PackageTypingsGenerator.ts
@@ -178,7 +178,26 @@ export default class PackageTypingsGenerator {
   private static _followAliases(symbol: ts.Symbol, typeChecker: ts.TypeChecker): IFollowAliasesResult {
     let current: ts.Symbol = symbol;
 
+    // Is it ambient?  We will examine all of the declarations we encounter
+    // to see if any of them contains the "export" keyword; if not, then it's ambient.
+    let isAmbient: boolean = true;
+
     while (true) { // tslint:disable-line:no-constant-condition
+
+      for (const declaration of current.declarations || []) {
+        if (declaration.kind === ts.SyntaxKind.ExportSpecifier
+          || declaration.kind === ts.SyntaxKind.ExportAssignment) {
+          isAmbient = false;
+          break;
+        }
+
+        const modifiers: ts.ModifierFlags = ts.getCombinedModifierFlags(declaration);
+        if (modifiers & (ts.ModifierFlags.Export | ts.ModifierFlags.ExportDefault)) {
+            isAmbient = false;
+            break;
+        }
+      }
+
       if (!(current.flags & ts.SymbolFlags.Alias)) {
         break;
       }
@@ -228,17 +247,6 @@ export default class PackageTypingsGenerator {
       current = currentAlias;
     }
 
-    // Is it ambient?  We examine all of the declarations to see if any of them contains
-    // the "export" keyword; if not, then it's ambient.
-    let isAmbient: boolean = true;
-    for (const declaration of current.declarations || []) {
-      const modifiers: ts.ModifierFlags = ts.getCombinedModifierFlags(declaration);
-      if (modifiers & (ts.ModifierFlags.Export | ts.ModifierFlags.ExportDefault)) {
-        isAmbient = false;
-        break;
-      }
-    }
-
     return {
       symbol: current,
       importPackagePath: undefined,
diff --git a/build-tests/api-extractor-test-01/dist/index-internal.d.ts b/build-tests/api-extractor-test-01/dist/index-internal.d.ts
@@ -1,4 +1,3 @@
-// Unsupported re-export: IInterfaceAsDefaultExport
 /**
  * Example documentation for the package.
  * 
@@ -75,6 +74,17 @@ declare interface IForgottenExport_2 {
     instance2: string;
 }
 
+/**
+ * This interface is exported as the default export for its source file.
+ * @public
+ */
+export declare interface IInterfaceAsDefaultExport {
+    /**
+     * A member of the interface
+     */
+    member: string;
+}
+
 /**
  * A simple, normal definition
  * @public
