Fix a regression for the defaultExportOfEntryPoint scenario

octogonz · octogonz · commit 4027d3504bb6 · 2019-07-22T15:55:55.000-07:00
diff --git a/apps/api-extractor/src/analyzer/AstSymbolTable.ts b/apps/api-extractor/src/analyzer/AstSymbolTable.ts
@@ -238,32 +238,35 @@ export class AstSymbolTable {
     const isUniqueSymbol: boolean = TypeScriptHelpers.isUniqueSymbolName(symbolName);
 
     // We will try to obtain the name from a declaration; otherwise we'll fall back to the symbol name.
-    // This handles cases such as "export default class X { }" where the symbol name is "default"
-    // but the declaration name is "X".
-    for (const declaration of symbol.declarations || []) {
-      const declarationName: ts.DeclarationName | undefined = ts.getNameOfDeclaration(declaration);
+    let unquotedName: string = symbolName;
 
-      if (declarationName && ts.isIdentifier(declarationName)) {
-        // It's an ordinary identifier, so the symbolName is what we want
-        break;
+    for (const declaration of symbol.declarations || []) {
+      // Handle cases such as "export default class X { }" where the symbol name is "default"
+      // but the local name is "X".
+      const localSymbol: ts.Symbol | undefined = TypeScriptInternals.tryGetLocalSymbol(declaration);
+      if (localSymbol) {
+        unquotedName = localSymbol.name;
       }
 
       // If it is a non-well-known symbol, then return the late bound name
-      if (isUniqueSymbol && declarationName && ts.isComputedPropertyName(declarationName)) {
-        const lateBoundName: string | undefined = TypeScriptHelpers.tryGetLateBoundName(declarationName);
-        if (lateBoundName) {
-          // Here the string may contain an expression such as "[x.y.z]".  Names starting with "[" are always
-          // expressions.  If a string literal contains those characters, the code below will JSON.stringify() it
-          // to avoid a collision.
-          return lateBoundName;
+      if (isUniqueSymbol) {
+        const declarationName: ts.DeclarationName | undefined = ts.getNameOfDeclaration(declaration);
+        if (declarationName && ts.isComputedPropertyName(declarationName)) {
+          const lateBoundName: string | undefined = TypeScriptHelpers.tryGetLateBoundName(declarationName);
+          if (lateBoundName) {
+            // Here the string may contain an expression such as "[x.y.z]".  Names starting with "[" are always
+            // expressions.  If a string literal contains those characters, the code below will JSON.stringify() it
+            // to avoid a collision.
+            return lateBoundName;
+          }
         }
       }
     }
 
     // Otherwise that name may come from a quoted string or pseudonym like `__constructor`.
     // If the string is not a safe identifier, then we must add quotes.
     // Note that if it was quoted but did not need to be quoted, here we will remove the quotes.
-    if (!StringChecks.isSafeUnquotedMemberIdentifier(symbolName)) {
+    if (!StringChecks.isSafeUnquotedMemberIdentifier(unquotedName)) {
       // For API Extractor's purposes, a canonical form is more appropriate than trying to reflect whatever
       // appeared in the source code.  The code is not even guaranteed to be consistent, for example:
       //
@@ -272,10 +275,10 @@ export class AstSymbolTable {
       //     public f1(x: boolean): void;
       //     public 'f1'(x: string | boolean): void { }
       //   }
-      return JSON.stringify(symbolName);
+      return JSON.stringify(unquotedName);
     }
 
-    return symbolName;
+    return unquotedName;
   }
 
   /**
diff --git a/apps/api-extractor/src/analyzer/TypeScriptInternals.ts b/apps/api-extractor/src/analyzer/TypeScriptInternals.ts
@@ -83,4 +83,13 @@ export class TypeScriptInternals {
   public static getSymbolParent(symbol: ts.Symbol): ts.Symbol | undefined {
     return (symbol as any).parent;
   }
+
+  /**
+   * In an statement like `export default class X { }`, the `Symbol.name` will be `default`
+   * whereas the `localSymbol` is `X`.
+   */
+  public static tryGetLocalSymbol(declaration: ts.Declaration): ts.Symbol | undefined {
+    return (declaration as any).localSymbol;
+  }
+
 }

Original file line number	Diff line number	Diff line change
`@@ -83,4 +83,13 @@ export class TypeScriptInternals {`
`83`	`83`	`public static getSymbolParent(symbol: ts.Symbol): ts.Symbol \| undefined {`
`84`	`84`	`return (symbol as any).parent;`
`85`	`85`	`}`
	`86`	`+`
	`87`	`+ /**`
	`88`	+ * In an statement like `export default class X { }`, the `Symbol.name` will be `default`
	`89`	+ * whereas the `localSymbol` is `X`.
	`90`	`+ */`
	`91`	`+ public static tryGetLocalSymbol(declaration: ts.Declaration): ts.Symbol \| undefined {`
	`92`	`+ return (declaration as any).localSymbol;`
	`93`	`+ }`
	`94`	`+`
`86`	`95`	`}`