support api review

Author: adventure-yunfei

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

@@ -303,6 +303,20 @@ export class ApiReportGenerator {
       case ts.SyntaxKind.ExportKeyword:
       case ts.SyntaxKind.DefaultKeyword:
       case ts.SyntaxKind.DeclareKeyword:
+        if (astDeclaration.parent) {
+          // Keep it as is for nested declarations.
+          break;
+        }
+        if (
+          ts.isModuleDeclaration(astDeclaration.declaration) &&
+          !astDeclaration.declaration.modifiers?.includes(span.node as ts.Modifier)
+        ) {
+          // 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;"
+          break;
+        }
+
         // Delete any explicit "export" or "declare" keywords -- we will re-add them below
         span.modification.skipAll();
         break;
@@ -314,6 +328,11 @@ export class ApiReportGenerator {
       case ts.SyntaxKind.ModuleKeyword:
       case ts.SyntaxKind.TypeKeyword:
       case ts.SyntaxKind.FunctionKeyword:
+        if (astDeclaration.parent) {
+          // Keep it as is for nested declarations
+          break;
+        }
+
         // Replace the stuff we possibly deleted above
         let replacedModifiers: string = '';
 
@@ -385,6 +404,17 @@ 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 {

build-tests/api-documenter-scenarios/etc/inheritedMembers/api-documenter-scenarios.api.md

@@ -76,7 +76,7 @@ export type IInterfaceLikeTypeAlias = {
 // @public (undocumented)
 export namespace Namespace1 {
     // (undocumented)
-    export class Class3 {
+    class Class3 {
         someMethod(x: boolean | string): void;
         someOverload(x: boolean): void;
         someOverload(x: string): void;

build-tests/api-extractor-lib1-test/etc/api-extractor-lib1-test.api.md

@@ -27,13 +27,13 @@ export interface Lib1Interface {
 // @public (undocumented)
 export namespace Lib1Namespace {
     // (undocumented)
-    export namespace Inner {
+    namespace Inner {
         // (undocumented)
-        export class X {
+        class X {
         }
     }
     // (undocumented)
-    export class Y {
+    class Y {
     }
 }
 

build-tests/api-extractor-scenarios/etc/apiItemKinds/api-extractor-scenarios.api.md

@@ -42,22 +42,22 @@ export namespace n1 {
     // (undocumented)
     export namespace n2 {
         // (undocumented)
-        export class SomeClass3 {
+        class SomeClass3 {
         }
     }
     // (undocumented)
-    export class SomeClass1 {
+    class SomeClass1 {
     }
     // (undocumented)
     export class SomeClass2 extends SomeClass1 {
     }
-        {};
+    export {};
 }
 
 // @public (undocumented)
 export namespace n1 {
     // (undocumented)
-    export class SomeClass4 {
+    class SomeClass4 {
     }
 }
 

build-tests/api-extractor-scenarios/etc/docReferences/api-extractor-scenarios.api.md

@@ -17,7 +17,7 @@ export function failWithMissingReference(): void;
 // @public (undocumented)
 export namespace MyNamespace {
     // (undocumented)
-    export class MyClass {
+    class MyClass {
         // @beta
         myMethod(x: number): number;
     }

build-tests/api-extractor-scenarios/etc/docReferences3/api-extractor-scenarios.api.md

@@ -7,7 +7,7 @@
 // @public (undocumented)
 export namespace A {
     // (undocumented)
-    export class B {
+    class B {
         // (undocumented)
         myMethod(): void;
     }

build-tests/api-extractor-scenarios/etc/includeForgottenExports/api-extractor-scenarios.api.md

@@ -82,11 +82,11 @@ export function someFunction7(): AnotherDuplicateName_2;
 // @public (undocumented)
 export namespace SomeNamespace1 {
     // (undocumented)
-    export class ForgottenExport3 {
+    class ForgottenExport3 {
     }
     // (undocumented)
     export function someFunction3(): ForgottenExport3;
-        {};
+    export {};
 }
 
 // (No @packageDocumentation comment for this package)

build-tests/api-extractor-scenarios/etc/mergedDeclarations/api-extractor-scenarios.api.md

@@ -45,14 +45,14 @@ export interface MergedInterfaces {
 // @public (undocumented)
 export namespace MergedNamespaces {
     // (undocumented)
-    export class SomeClass {
+    class SomeClass {
     }
 }
 
 // @public (undocumented)
 export namespace MergedNamespaces {
     // (undocumented)
-    export class AnotherClass {
+    class AnotherClass {
     }
 }
 

build-tests/api-extractor-scenarios/etc/namespaceDeclaration/api-extractor-scenarios.api.md

@@ -7,10 +7,10 @@
 // @public (undocumented)
 export namespace AllExportedNS {
     // (undocumented)
-    export class ExportedClass {
+    class ExportedClass {
     }
     // (undocumented)
-    export interface ExportedInterface {
+    interface ExportedInterface {
     }
 }
 
@@ -20,7 +20,7 @@ export class FinalRenamedClass {
 
 // @public (undocumented)
 export namespace PartalExportedNS {
-    const // (undocumented)
+    export const // (undocumented)
     var1 = 1, // (undocumented)
     var2 = 2;
     // (undocumented)
@@ -29,15 +29,15 @@ export namespace PartalExportedNS {
         prop: UnexportedClass;
     }
     // (undocumented)
-    export interface UnexportedClass {
+    interface UnexportedClass {
     }
-        {};
+    export {};
 }
 
 // @public (undocumented)
 export namespace ReexportNS {
-        { FinalRenamedClass };
-        { FinalRenamedClass as RenamedClass3 };
+    export { FinalRenamedClass as RenamedClass };
+    export { FinalRenamedClass as RenamedClass3 };
 }
 
 // (No @packageDocumentation comment for this package)

build-tests/api-extractor-scenarios/etc/referenceTokens/api-extractor-scenarios.api.md

@@ -13,21 +13,21 @@ export namespace n1 {
         // (undocumented)
         export namespace n3 {
             // (undocumented)
-            export function someFunction3(): n2.n3.SomeType3;
+            function someFunction3(): n2.n3.SomeType3;
             // (undocumented)
-            export type SomeType3 = number;
+            type SomeType3 = number;
         }
         // (undocumented)
         export function someFunction2(): SomeType2;
         // (undocumented)
-        export type SomeType2 = number;
-            {};
+        type SomeType2 = number;
+        export {};
     }
     // (undocumented)
     export function someFunction1(): SomeType1;
     // (undocumented)
-    export type SomeType1 = number;
-        {};
+    type SomeType1 = number;
+    export {};
 }
 
 // @public (undocumented)