JavaScriptExpert
diff --git a/‎apps/api-extractor/src/generators/packageTypings/AstSymbolTable.ts‎
Lines changed: 4 additions & 5 deletions b/‎apps/api-extractor/src/generators/packageTypings/AstSymbolTable.ts‎
Lines changed: 4 additions & 5 deletions
diff --git a/‎apps/api-extractor/src/generators/packageTypings/PackageTypingsGenerator.ts‎
Lines changed: 3 additions & 2 deletions b/‎apps/api-extractor/src/generators/packageTypings/PackageTypingsGenerator.ts‎
Lines changed: 3 additions & 2 deletions
@@ -283,7 +283,7 @@ export class AstSymbolTable {
 
         // Is there a parent AstSymbol?
         const arbitaryParent: ts.Node | undefined
-          = this._findFirstParentDeclaration(followedSymbol.declarations[0]);
+          = this._tryFindFirstAstDeclarationParent(followedSymbol.declarations[0]);
 
         let parentAstSymbol: AstSymbol | undefined = undefined;
 
@@ -294,13 +294,12 @@ export class AstSymbolTable {
         }
 
         // Okay, now while creating the declarations we will wire them up to the
-        // their corresopnding parent declarations
+        // their corresponding parent declarations
         for (const declaration of followedSymbol.declarations || []) {
 
           let parentAstDeclaration: AstDeclaration | undefined = undefined;
           if (parentAstSymbol) {
-            const parentDeclaration: ts.Node | undefined
-              = this._findFirstParentDeclaration(declaration);
+            const parentDeclaration: ts.Node | undefined = this._tryFindFirstAstDeclarationParent(declaration);
 
             if (!parentDeclaration) {
               throw new Error('Program bug: Missing parent declaration');
@@ -326,7 +325,7 @@ export class AstSymbolTable {
   /**
    * Returns the first parent satisfying isAstDeclaration(), or undefined if none is found.
    */
-  private _findFirstParentDeclaration(node: ts.Node): ts.Node | undefined {
+  private _tryFindFirstAstDeclarationParent(node: ts.Node): ts.Node | undefined {
     let currentNode: ts.Node | undefined = node.parent;
     while (currentNode) {
       if (this.isAstDeclaration(currentNode)) {
 
@@ -76,7 +76,8 @@ export class PackageTypingsGenerator {
     }
 
     // Build the entry point
-    this._astEntryPoint = this._astSymbolTable.fetchEntryPoint(this._context.package.getDeclaration().getSourceFile());
+    const sourceFile: ts.SourceFile = this._context.package.getDeclaration().getSourceFile();
+    this._astEntryPoint = this._astSymbolTable.fetchEntryPoint(sourceFile);
 
     const exportedAstSymbols: AstSymbol[] = [];
 
@@ -199,7 +200,7 @@ export class PackageTypingsGenerator {
         dtsEntry.nameForEmit = dtsEntry.originalName;
 
         while (usedNames.has(dtsEntry.nameForEmit)) {
-          dtsEntry.nameForEmit = dtsEntry.originalName + '_' + ++suffix;
+          dtsEntry.nameForEmit = `${dtsEntry.originalName}_${++suffix}`;
         }
 
         usedNames.add(dtsEntry.nameForEmit);
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,8 @@ export class PackageTypingsGenerator {`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`// Build the entry point`
`79`		`- this._astEntryPoint = this._astSymbolTable.fetchEntryPoint(this._context.package.getDeclaration().getSourceFile());`
	`79`	`+ const sourceFile: ts.SourceFile = this._context.package.getDeclaration().getSourceFile();`
	`80`	`+ this._astEntryPoint = this._astSymbolTable.fetchEntryPoint(sourceFile);`
`80`	`81`
`81`	`82`	`const exportedAstSymbols: AstSymbol[] = [];`
`82`	`83`
`@@ -199,7 +200,7 @@ export class PackageTypingsGenerator {`
`199`	`200`	`dtsEntry.nameForEmit = dtsEntry.originalName;`
`200`	`201`
`201`	`202`	`while (usedNames.has(dtsEntry.nameForEmit)) {`
`202`		`- dtsEntry.nameForEmit = dtsEntry.originalName + '_' + ++suffix;`
	`203`	+ dtsEntry.nameForEmit = `${dtsEntry.originalName}_${++suffix}`;
`203`	`204`	`}`
`204`	`205`
`205`	`206`	`usedNames.add(dtsEntry.nameForEmit);`