A bit more cleanup

Author: zelliott

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

@@ -204,16 +204,14 @@ export class MessageRouter {
       // NOTE: Since compiler errors pertain to issues specific to the .d.ts files,
       // we do not apply source mappings for them.
       const sourceFile: ts.SourceFile = diagnostic.file;
-      const sourceLocation: ISourceLocation | undefined = this._sourceMapper.getSourceLocationFromFileAndPos(
+      const sourceLocation: ISourceLocation = this._sourceMapper.getSourceLocationFromFileAndPos(
         sourceFile,
         diagnostic.start || 0,
         true /* useDtsLocation */
       );
-      if (sourceLocation) {
-        options.sourceFilePath = sourceLocation.sourceFilePath;
-        options.sourceFileLine = sourceLocation.sourceFileLine;
-        options.sourceFileColumn = sourceLocation.sourceFileColumn;
-      }
+      options.sourceFilePath = sourceLocation.sourceFilePath;
+      options.sourceFileLine = sourceLocation.sourceFileLine;
+      options.sourceFileColumn = sourceLocation.sourceFileColumn;
     }
 
     this._messages.push(new ExtractorMessage(options));
@@ -262,15 +260,13 @@ export class MessageRouter {
         text: message.unformattedText
       };
 
-      const sourceLocation: ISourceLocation | undefined = this._sourceMapper.getSourceLocationFromFileAndPos(
+      const sourceLocation: ISourceLocation = this._sourceMapper.getSourceLocationFromFileAndPos(
         sourceFile,
         message.textRange.pos
       );
-      if (sourceLocation) {
-        options.sourceFilePath = sourceLocation.sourceFilePath;
-        options.sourceFileLine = sourceLocation.sourceFileLine;
-        options.sourceFileColumn = sourceLocation.sourceFileColumn;
-      }
+      options.sourceFilePath = sourceLocation.sourceFilePath;
+      options.sourceFileLine = sourceLocation.sourceFileLine;
+      options.sourceFileColumn = sourceLocation.sourceFileColumn;
 
       const extractorMessage: ExtractorMessage = new ExtractorMessage(options);
 
@@ -382,15 +378,13 @@ export class MessageRouter {
       properties
     };
 
-    const sourceLocation: ISourceLocation | undefined = this._sourceMapper.getSourceLocationFromFileAndPos(
+    const sourceLocation: ISourceLocation = this._sourceMapper.getSourceLocationFromFileAndPos(
       sourceFile,
       pos
     );
-    if (sourceLocation) {
-      options.sourceFilePath = sourceLocation.sourceFilePath;
-      options.sourceFileLine = sourceLocation.sourceFileLine;
-      options.sourceFileColumn = sourceLocation.sourceFileColumn;
-    }
+    options.sourceFilePath = sourceLocation.sourceFilePath;
+    options.sourceFileLine = sourceLocation.sourceFileLine;
+    options.sourceFileColumn = sourceLocation.sourceFileColumn;
 
     const extractorMessage: ExtractorMessage = new ExtractorMessage(options);
 

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

@@ -1132,8 +1132,10 @@ export class ApiModelGenerator {
 
   private _getSourceFile(declaration: ts.Declaration): string | undefined {
     const sourceFile: ts.SourceFile = declaration.getSourceFile();
-    const sourceLocation: ISourceLocation | undefined =
-      this._collector.sourceMapper.getSourceLocationFromFileAndPos(sourceFile, declaration.pos);
+    const sourceLocation: ISourceLocation = this._collector.sourceMapper.getSourceLocationFromFileAndPos(
+      sourceFile,
+      declaration.pos
+    );
 
     return path.relative(this._collector.extractorConfig.projectFolder, sourceLocation.sourceFilePath);
   }