WIP

Author: zelliott

apps/api-extractor/src/api/ExtractorConfig.ts

@@ -158,8 +158,10 @@ interface IExtractorConfigParameters {
   apiReportEnabled: boolean;
   reportFilePath: string;
   reportTempFilePath: string;
+  apiReportIncludeForgottenExports: boolean;
   docModelEnabled: boolean;
   apiJsonFilePath: string;
+  docModelIncludeForgottenExports: boolean;
   rollupEnabled: boolean;
   untrimmedFilePath: string;
   alphaTrimmedFilePath: string;
@@ -246,11 +248,15 @@ export class ExtractorConfig {
   public readonly reportFilePath: string;
   /** The `reportTempFolder` path combined with the `reportFileName`. */
   public readonly reportTempFilePath: string;
+  /** {@inheritDoc IConfigApiReport.includeForgottenExports} */
+  public readonly apiReportIncludeForgottenExports: boolean;
 
   /** {@inheritDoc IConfigDocModel.enabled} */
   public readonly docModelEnabled: boolean;
   /** {@inheritDoc IConfigDocModel.apiJsonFilePath} */
   public readonly apiJsonFilePath: string;
+  /** {@inheritDoc IConfigDocModel.includeForgottenExports} */
+  public readonly docModelIncludeForgottenExports: boolean;
 
   /** {@inheritDoc IConfigDtsRollup.enabled} */
   public readonly rollupEnabled: boolean;
@@ -307,8 +313,10 @@ export class ExtractorConfig {
     this.apiReportEnabled = parameters.apiReportEnabled;
     this.reportFilePath = parameters.reportFilePath;
     this.reportTempFilePath = parameters.reportTempFilePath;
+    this.apiReportIncludeForgottenExports = parameters.apiReportIncludeForgottenExports;
     this.docModelEnabled = parameters.docModelEnabled;
     this.apiJsonFilePath = parameters.apiJsonFilePath;
+    this.docModelIncludeForgottenExports = parameters.docModelIncludeForgottenExports;
     this.rollupEnabled = parameters.rollupEnabled;
     this.untrimmedFilePath = parameters.untrimmedFilePath;
     this.alphaTrimmedFilePath = parameters.alphaTrimmedFilePath;
@@ -848,6 +856,7 @@ export class ExtractorConfig {
       let apiReportEnabled: boolean = false;
       let reportFilePath: string = '';
       let reportTempFilePath: string = '';
+      let apiReportIncludeForgottenExports: boolean = false;
       if (configObject.apiReport) {
         apiReportEnabled = !!configObject.apiReport.enabled;
 
@@ -879,17 +888,20 @@ export class ExtractorConfig {
 
         reportFilePath = path.join(reportFolder, reportFilename);
         reportTempFilePath = path.join(reportTempFolder, reportFilename);
+        apiReportIncludeForgottenExports = !!configObject.apiReport.includeForgottenExports;
       }
 
       let docModelEnabled: boolean = false;
       let apiJsonFilePath: string = '';
+      let docModelIncludeForgottenExports: boolean = false;
       if (configObject.docModel) {
         docModelEnabled = !!configObject.docModel.enabled;
         apiJsonFilePath = ExtractorConfig._resolvePathWithTokens(
           'apiJsonFilePath',
           configObject.docModel.apiJsonFilePath,
           tokenContext
         );
+        docModelIncludeForgottenExports = !!configObject.docModel.includeForgottenExports;
       }
 
       let tsdocMetadataEnabled: boolean = false;
@@ -993,8 +1005,10 @@ export class ExtractorConfig {
         apiReportEnabled,
         reportFilePath,
         reportTempFilePath,
+        apiReportIncludeForgottenExports,
         docModelEnabled,
         apiJsonFilePath,
+        docModelIncludeForgottenExports,
         rollupEnabled,
         untrimmedFilePath,
         alphaTrimmedFilePath,

apps/api-extractor/src/api/IConfigFile.ts

@@ -96,6 +96,17 @@ export interface IConfigApiReport {
    * prepend a folder token such as `<projectFolder>`.
    */
   reportTempFolder?: string;
+
+  /**
+   * Whether "forgotten exports" should be included in the API report file.
+   *
+   * @remarks
+   * Forgotten exports are declarations flagged with `ae-forgotten-export` warnings. See
+   * https://api-extractor.com/pages/messages/ae-forgotten-export/ to learn more.
+   *
+   * @defaultValue `false`
+   */
+  includeForgottenExports?: boolean;
 }
 
 /**
@@ -120,6 +131,17 @@ export interface IConfigDocModel {
    * prepend a folder token such as `<projectFolder>`.
    */
   apiJsonFilePath?: string;
+
+  /**
+   * Whether "forgotten exports" should be included in the doc model file.
+   *
+   * @remarks
+   * Forgotten exports are declarations flagged with `ae-forgotten-export` warnings. See
+   * https://api-extractor.com/pages/messages/ae-forgotten-export/ to learn more.
+   *
+   * @defaultValue `false`
+   */
+  includeForgottenExports?: boolean;
 }
 
 /**
@@ -376,7 +398,7 @@ export interface IConfigFile {
   testMode?: boolean;
 
   /**
-   * Specifies how API Extractor sorts members of an enum when generating api.json.
+   * Specifies how API Extractor sorts members of an enum when generating the .api.json file.
    *
    * @remarks
    * By default, the output files will be sorted alphabetically, which is "by-name".

apps/api-extractor/src/collector/Collector.ts

@@ -246,28 +246,23 @@ export class Collector {
       this.workingPackage.tsdocComment = this.workingPackage.tsdocParserContext!.docComment;
     }
 
-    const exportedAstEntities: AstEntity[] = [];
-
-    // Create a CollectorEntity for each top-level export
-
     const astModuleExportInfo: AstModuleExportInfo =
       this.astSymbolTable.fetchAstModuleExportInfo(astEntryPoint);
 
+    // Create a CollectorEntity for each top-level export.
+    const processedAstEntities: AstEntity[] = [];
     for (const [exportName, astEntity] of astModuleExportInfo.exportedLocalEntities) {
       this._createCollectorEntity(astEntity, exportName);
-
-      exportedAstEntities.push(astEntity);
+      processedAstEntities.push(astEntity);
     }
 
-    // Create a CollectorEntity for each indirectly referenced export.
-    // Note that we do this *after* the above loop, so that references to exported AstSymbols
-    // are encountered first as exports.
-    const alreadySeenAstSymbols: Set<AstSymbol> = new Set<AstSymbol>();
-    for (const exportedAstEntity of exportedAstEntities) {
-      this._createEntityForIndirectReferences(exportedAstEntity, alreadySeenAstSymbols);
-
-      if (exportedAstEntity instanceof AstSymbol) {
-        this.fetchSymbolMetadata(exportedAstEntity);
+    // Recursively create the remaining CollectorEntities after the top-level entities
+    // have been processed.
+    const alreadySeenAstEntities: Set<AstEntity> = new Set<AstEntity>();
+    for (const astEntity of processedAstEntities) {
+      this._recursivelyCreateEntities(astEntity, alreadySeenAstEntities);
+      if (astEntity instanceof AstSymbol) {
+        this.fetchSymbolMetadata(astEntity);
       }
     }
 
@@ -414,7 +409,11 @@ export class Collector {
     return overloadIndex;
   }
 
-  private _createCollectorEntity(astEntity: AstEntity, exportedName: string | undefined): CollectorEntity {
+  private _createCollectorEntity(
+    astEntity: AstEntity,
+    exportName?: string,
+    parent?: CollectorEntity
+  ): CollectorEntity {
     let entity: CollectorEntity | undefined = this._entitiesByAstEntity.get(astEntity);
 
     if (!entity) {
@@ -425,50 +424,54 @@ export class Collector {
       this._collectReferenceDirectives(astEntity);
     }
 
-    if (exportedName) {
-      entity.addExportName(exportedName);
+    if (exportName) {
+      if (parent) {
+        entity.addLocalExportName(exportName, parent);
+      } else {
+        entity.addExportName(exportName);
+      }
     }
 
     return entity;
   }
 
-  private _createEntityForIndirectReferences(
-    astEntity: AstEntity,
-    alreadySeenAstEntities: Set<AstEntity>
-  ): void {
-    if (alreadySeenAstEntities.has(astEntity)) {
-      return;
-    }
+  private _recursivelyCreateEntities(astEntity: AstEntity, alreadySeenAstEntities: Set<AstEntity>): void {
+    if (alreadySeenAstEntities.has(astEntity)) return;
     alreadySeenAstEntities.add(astEntity);
 
     if (astEntity instanceof AstSymbol) {
       astEntity.forEachDeclarationRecursive((astDeclaration: AstDeclaration) => {
         for (const referencedAstEntity of astDeclaration.referencedAstEntities) {
           if (referencedAstEntity instanceof AstSymbol) {
-            // We only create collector entities for root-level symbols.
-            // For example, if a symbols is nested inside a namespace, only the root-level namespace
-            // get a collector entity
+            // We only create collector entities for root-level symbols. For example, if a symbol is
+            // nested inside a namespace, only the namespace gets a collector entity. Note that this
+            // is not true for AstNamespaceImports below.
             if (referencedAstEntity.parentAstSymbol === undefined) {
-              this._createCollectorEntity(referencedAstEntity, undefined);
+              this._createCollectorEntity(referencedAstEntity);
             }
           } else {
-            this._createCollectorEntity(referencedAstEntity, undefined);
+            this._createCollectorEntity(referencedAstEntity);
           }
 
-          this._createEntityForIndirectReferences(referencedAstEntity, alreadySeenAstEntities);
+          this._recursivelyCreateEntities(referencedAstEntity, alreadySeenAstEntities);
         }
       });
     }
 
     if (astEntity instanceof AstNamespaceImport) {
       const astModuleExportInfo: AstModuleExportInfo = astEntity.fetchAstModuleExportInfo(this);
+      const parentEntity: CollectorEntity | undefined = this._entitiesByAstEntity.get(astEntity);
+      if (!parentEntity) {
+        // This should never happen, as we've already created entities for all AstNamespaceImports.
+        throw new InternalError(
+          `Failed to get CollectorEntity for AstNamespaceImport with namespace name "${astEntity.namespaceName}"`
+        );
+      }
 
-      for (const exportedEntity of astModuleExportInfo.exportedLocalEntities.values()) {
-        // Create a CollectorEntity for each top-level export of AstImportInternal entity
-        const entity: CollectorEntity = this._createCollectorEntity(exportedEntity, undefined);
-        entity.addAstNamespaceImports(astEntity);
-
-        this._createEntityForIndirectReferences(exportedEntity, alreadySeenAstEntities);
+      for (const [localExportName, localAstEntity] of astModuleExportInfo.exportedLocalEntities) {
+        // Create a CollectorEntity for each local export within an AstNamespaceImport entity.
+        this._createCollectorEntity(localAstEntity, localExportName, parentEntity);
+        this._recursivelyCreateEntities(localAstEntity, alreadySeenAstEntities);
       }
     }
   }
@@ -815,7 +818,7 @@ export class Collector {
         // Don't report missing release tags for forgotten exports
         const astSymbol: AstSymbol = astDeclaration.astSymbol;
         const entity: CollectorEntity | undefined = this._entitiesByAstEntity.get(astSymbol.rootAstSymbol);
-        if (entity && entity.consumable) {
+        if (entity && entity.exported) {
           // We also don't report errors for the default export of an entry point, since its doc comment
           // isn't easy to obtain from the .d.ts file
           if (astSymbol.rootAstSymbol.localName !== '_default') {
@@ -826,10 +829,14 @@ export class Collector {
               astSymbol
             );
           }
+
+          // All internal, exported APIs default to public if no release tag is specified.
+          options.effectiveReleaseTag = ReleaseTag.Public;
         }
+      } else {
+        // All external APIs default to public if no release tag is specified.
+        options.effectiveReleaseTag = ReleaseTag.Public;
       }
-
-      options.effectiveReleaseTag = ReleaseTag.Public;
     }
 
     const apiItemMetadata: ApiItemMetadata = new ApiItemMetadata(options);