add return type for getModeForUsageLocation

microsoft · May 25, 2022 · 18b51b5 · 18b51b5
1 parent 9b25861
commit 18b51b5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/apps/api-extractor/src/analyzer/ExportAnalyzer.ts b/apps/api-extractor/src/analyzer/ExportAnalyzer.ts
@@ -262,7 +262,7 @@ export class ExportAnalyzer {
     const specifier: ts.TypeNode | ts.Expression | undefined = ts.isImportTypeNode(importOrExportDeclaration)
       ? importOrExportDeclaration.argument
       : importOrExportDeclaration.moduleSpecifier;
-    const mode: ts.StringLiteralLike =
+    const mode: ts.ModuleKind.CommonJS | ts.ModuleKind.ESNext | undefined =
       specifier && ts.isStringLiteralLike(specifier)
         ? TypeScriptInternals.getModeForUsageLocation(importOrExportDeclaration.getSourceFile(), specifier)
         : undefined;
@@ -872,7 +872,7 @@ export class ExportAnalyzer {
     exportSymbol: ts.Symbol
   ): AstModule {
     const moduleSpecifier: string = this._getModuleSpecifier(importOrExportDeclaration);
-    const mode: ts.StringLiteralLike | undefined =
+    const mode: ts.ModuleKind.CommonJS | ts.ModuleKind.ESNext | undefined =
       importOrExportDeclaration.moduleSpecifier &&
       ts.isStringLiteralLike(importOrExportDeclaration.moduleSpecifier)
         ? TypeScriptInternals.getModeForUsageLocation(

diff --git a/apps/api-extractor/src/analyzer/TypeScriptInternals.ts b/apps/api-extractor/src/analyzer/TypeScriptInternals.ts
@@ -84,10 +84,10 @@ export class TypeScriptInternals {
   public static getResolvedModule(
     sourceFile: ts.SourceFile,
     moduleNameText: string,
-    mode: ts.StringLiteralLike | undefined
+    mode: ts.ModuleKind.CommonJS | ts.ModuleKind.ESNext | undefined
   ): ts.ResolvedModuleFull | undefined {
     // Compiler internal:
-    // https://github.com/microsoft/TypeScript/blob/v3.2.2/src/compiler/utilities.ts#L218
+    // https://github.com/microsoft/TypeScript/blob/v4.7.2/src/compiler/utilities.ts#L161
 
     return (ts as any).getResolvedModule(sourceFile, moduleNameText, mode);
   }
@@ -97,12 +97,12 @@ export class TypeScriptInternals {
    */
   public static getModeForUsageLocation(
     file: { impliedNodeFormat?: ts.SourceFile['impliedNodeFormat'] },
-    usage: ts.StringLiteralLike
-  ) {
+    usage: ts.StringLiteralLike | undefined
+  ): ts.ModuleKind.CommonJS | ts.ModuleKind.ESNext | undefined {
     // Compiler internal:
     // https://github.com/microsoft/TypeScript/blob/v4.7.2/src/compiler/program.ts#L568
 
-    return (ts as any).getModeForUsageLocation(file, usage);
+    return (ts as any).getModeForUsageLocation?.(file, usage);
   }
 
   /**