Fix a bug with handling of "import * as semver from 'semver';"

pgonzal · pgonzal · commit a99341e08bd8 · 2018-03-16T14:59:01.000-07:00
diff --git a/apps/api-extractor/src/generators/packageTypings/AstSymbolTable.ts b/apps/api-extractor/src/generators/packageTypings/AstSymbolTable.ts
@@ -114,8 +114,11 @@ export class AstSymbolTable {
       case ts.SyntaxKind.PropertyDeclaration:
       case ts.SyntaxKind.InterfaceDeclaration:
       case ts.SyntaxKind.FunctionDeclaration:
+      // ModuleDeclaration is used for both "module" and "namespace" declarations
       case ts.SyntaxKind.ModuleDeclaration:
       case ts.SyntaxKind.VariableDeclaration:
+      // This is used for "import * as file from 'file';"
+      case ts.SyntaxKind.SourceFile:
         return true;
     }
     return false;
@@ -245,8 +248,6 @@ export class AstSymbolTable {
 
       for (const declaration of followedSymbol.declarations || []) {
         if (!this.isAstDeclaration(declaration)) {
-          SymbolAnalyzer.followAliases(symbol, this._typeChecker);
-
           throw new Error('Program Bug: Followed a symbol with an invalid declaration: ' + followedSymbol.name);
         }
       }
diff --git a/apps/api-extractor/src/generators/packageTypings/SymbolAnalyzer.ts b/apps/api-extractor/src/generators/packageTypings/SymbolAnalyzer.ts
@@ -69,12 +69,12 @@ export class SymbolAnalyzer {
         // 2. Check for any signs that this was imported from an external package
         let result: IFollowAliasesResult | undefined;
 
-        result = SymbolAnalyzer._followAliasesForExportDeclaration(declaration, current);
+        result = SymbolAnalyzer._followAliasesForExportDeclaration(declaration, current, typeChecker);
         if (result) {
           return result;
         }
 
-        result = SymbolAnalyzer._followAliasesForImportDeclaration(declaration, current);
+        result = SymbolAnalyzer._followAliasesForImportDeclaration(declaration, current, typeChecker);
         if (result) {
           return result;
         }
@@ -125,7 +125,7 @@ export class SymbolAnalyzer {
    * Helper function for _followAliases(), for handling ts.ExportDeclaration patterns
    */
   private static _followAliasesForExportDeclaration(declaration: ts.Declaration,
-    symbol: ts.Symbol): IFollowAliasesResult | undefined {
+    symbol: ts.Symbol, typeChecker: ts.TypeChecker): IFollowAliasesResult | undefined {
 
     const exportDeclaration: ts.ExportDeclaration | undefined
       = TypeScriptHelpers.findFirstParent<ts.ExportDeclaration>(declaration, ts.SyntaxKind.ExportDeclaration);
@@ -165,7 +165,7 @@ export class SymbolAnalyzer {
 
         if (modulePath) {
           return {
-            followedSymbol: symbol,
+            followedSymbol: TypeScriptHelpers.followAliases(symbol, typeChecker),
             localName: exportName,
             astImport: new AstImport({ modulePath, exportName }),
             isAmbient: false
@@ -182,7 +182,7 @@ export class SymbolAnalyzer {
    * Helper function for _followAliases(), for handling ts.ImportDeclaration patterns
    */
   private static _followAliasesForImportDeclaration(declaration: ts.Declaration,
-    symbol: ts.Symbol): IFollowAliasesResult | undefined {
+    symbol: ts.Symbol, typeChecker: ts.TypeChecker): IFollowAliasesResult | undefined {
 
     const importDeclaration: ts.ImportDeclaration | undefined
       = TypeScriptHelpers.findFirstParent<ts.ImportDeclaration>(declaration, ts.SyntaxKind.ImportDeclaration);
@@ -260,7 +260,7 @@ export class SymbolAnalyzer {
 
         if (modulePath) {
           return {
-            followedSymbol: symbol,
+            followedSymbol: TypeScriptHelpers.followAliases(symbol, typeChecker),
             localName: symbol.name,
             astImport: new AstImport({ modulePath, exportName }),
             isAmbient: false

Original file line number	Diff line number	Diff line change
`@@ -114,8 +114,11 @@ export class AstSymbolTable {`
`114`	`114`	`case ts.SyntaxKind.PropertyDeclaration:`
`115`	`115`	`case ts.SyntaxKind.InterfaceDeclaration:`
`116`	`116`	`case ts.SyntaxKind.FunctionDeclaration:`
	`117`	`+ // ModuleDeclaration is used for both "module" and "namespace" declarations`
`117`	`118`	`case ts.SyntaxKind.ModuleDeclaration:`
`118`	`119`	`case ts.SyntaxKind.VariableDeclaration:`
	`120`	`+ // This is used for "import * as file from 'file';"`
	`121`	`+ case ts.SyntaxKind.SourceFile:`
`119`	`122`	`return true;`
`120`	`123`	`}`
`121`	`124`	`return false;`
`@@ -245,8 +248,6 @@ export class AstSymbolTable {`
`245`	`248`
`246`	`249`	`for (const declaration of followedSymbol.declarations \|\| []) {`
`247`	`250`	`if (!this.isAstDeclaration(declaration)) {`
`248`		`- SymbolAnalyzer.followAliases(symbol, this._typeChecker);`
`249`		`-`
`250`	`251`	`throw new Error('Program Bug: Followed a symbol with an invalid declaration: ' + followedSymbol.name);`
`251`	`252`	`}`
`252`	`253`	`}`