clean code

Author: adventure-yunfei

apps/api-extractor/src/generators/ApiReportGenerator.ts

@@ -309,11 +309,11 @@ export class ApiReportGenerator {
         }
         if (
           ts.isModuleDeclaration(astDeclaration.declaration) &&
-          !astDeclaration.declaration.modifiers?.includes(span.node as ts.Modifier)
+          (TypeScriptHelpers.findFirstParent(span.node, ts.SyntaxKind.ExportDeclaration) ||
+            TypeScriptHelpers.findFirstParent(span.node, ts.SyntaxKind.VariableStatement))
         ) {
-          // Keep it as is for nested declarations. Handle special cases inside namespace. e.g.:
-          //  - export declaration: "export {};", "export { A as B };"
-          //  - variable declaration: "export const a: number, b: number;"
+          // Keep it as is for nested declarations.
+          // (special cases inside namespace. e.g. "export {};", "export const a: number;")
           break;
         }
 
@@ -392,6 +392,10 @@ export class ApiReportGenerator {
         }
         break;
 
+      case ts.SyntaxKind.ExportSpecifier:
+        DtsEmitHelpers.modifyExportSpecifierSpan(collector, span);
+        break;
+
       case ts.SyntaxKind.Identifier:
         const referencedEntity: CollectorEntity | undefined = collector.tryGetEntityForNode(
           span.node as ts.Identifier
@@ -404,17 +408,6 @@ export class ApiReportGenerator {
           }
 
           span.modification.prefix = referencedEntity.nameForEmit;
-
-          if (
-            ts.isExportSpecifier(span.node.parent) &&
-            !span.node.parent.propertyName &&
-            span.node.getText().trim() !== referencedEntity.nameForEmit
-          ) {
-            // For "export { A }" (inside namespace), if "A" is renamed (e.g. renamed to "B"),
-            //  we need to emit as "export { B as A }" instead
-            span.modification.prefix += ' as ' + span.node.getText().trim();
-          }
-
           // For debugging:
           // span.modification.prefix += '/*R=FIX*/';
         } else {

apps/api-extractor/src/generators/DtsEmitHelpers.ts

@@ -93,6 +93,30 @@ export class DtsEmitHelpers {
     }
   }
 
+  public static modifyExportSpecifierSpan(collector: Collector, span: Span): void {
+    // For "export { A }" (inside namespace), we need to emit as "export { AcutalName as A }"
+    const node: ts.ExportSpecifier = span.node as ts.ExportSpecifier;
+    if (!node.propertyName) {
+      if (!ts.isIdentifier(node.name)) {
+        throw new Error(
+          `Export specifier name should be an identifier, but got ${ts.SyntaxKind[node.name.kind]}.\n` +
+            SourceFileLocationFormatter.formatDeclaration(node)
+        );
+      }
+
+      const referencedEntity: CollectorEntity | undefined = collector.tryGetEntityForNode(node.name);
+      if (!referencedEntity?.nameForEmit) {
+        throw new InternalError('referencedEntry or referencedEntry.nameForEmit is undefined');
+      }
+
+      const exportName: string = node.name.getText().trim();
+      if (referencedEntity.nameForEmit !== exportName) {
+        span.modification.skipAll();
+        span.modification.prefix = `${referencedEntity.nameForEmit} as ${span.getText()}`;
+      }
+    }
+  }
+
   public static modifyImportTypeSpan(
     collector: Collector,
     span: Span,

apps/api-extractor/src/generators/DtsRollupGenerator.ts

@@ -277,11 +277,11 @@ export class DtsRollupGenerator {
         }
         if (
           ts.isModuleDeclaration(astDeclaration.declaration) &&
-          !astDeclaration.declaration.modifiers?.includes(span.node as ts.Modifier)
+          (TypeScriptHelpers.findFirstParent(span.node, ts.SyntaxKind.ExportDeclaration) ||
+            TypeScriptHelpers.findFirstParent(span.node, ts.SyntaxKind.VariableStatement))
         ) {
-          // Keep it as is for nested declarations. Handle special cases inside namespace. e.g.:
-          //  - export declaration: "export {};", "export { A as B };"
-          //  - variable declaration: "export const a: number, b: number;"
+          // Keep it as is for nested declarations.
+          // (special cases inside namespace. e.g. "export {};", "export const a: number;")
           break;
         }
 
@@ -366,6 +366,10 @@ export class DtsRollupGenerator {
         }
         break;
 
+      case ts.SyntaxKind.ExportSpecifier:
+        DtsEmitHelpers.modifyExportSpecifierSpan(collector, span);
+        break;
+
       case ts.SyntaxKind.Identifier:
         {
           const referencedEntity: CollectorEntity | undefined = collector.tryGetEntityForNode(
@@ -379,17 +383,6 @@ export class DtsRollupGenerator {
             }
 
             span.modification.prefix = referencedEntity.nameForEmit;
-
-            if (
-              ts.isExportSpecifier(span.node.parent) &&
-              !span.node.parent.propertyName &&
-              span.node.getText().trim() !== referencedEntity.nameForEmit
-            ) {
-              // For "export { A }" (inside namespace), if "A" is renamed (e.g. renamed to "B"),
-              //  we need to emit as "export { B as A }" instead
-              span.modification.prefix += ' as ' + span.node.getText().trim();
-            }
-
             // For debugging:
             // span.modification.prefix += '/*R=FIX*/';
           } else {

build-tests/api-extractor-scenarios/src/namespaceDeclaration/index.ts

@@ -1,3 +1,4 @@
+/** @public */
 export namespace PartalExportedNS {
   export const var1 = 1,
     var2 = 2;
@@ -7,16 +8,19 @@ export namespace PartalExportedNS {
   }
 }
 
+/** @public */
 export namespace AllExportedNS {
   export class ExportedClass {}
   export interface ExportedInterface {}
 }
 
+/** @public */
 export declare namespace ReexportNS {
   export { RenamedClass };
   export { RenamedClass as RenamedClass3 };
 }
 
+/** @public */
 class RenamedClass {}
 
 export { RenamedClass as FinalRenamedClass };