fix: add missing required parameter for getResolvedModule to ensure typescript can resolve accurately

Author: chrisdholt

apps/api-extractor/src/analyzer/ExportAnalyzer.ts

@@ -259,9 +259,18 @@ export class ExportAnalyzer {
  importOrExportDeclaration: ts.ImportDeclaration | ts.ExportDeclaration | ts.ImportTypeNode,
  moduleSpecifier: string
  ): boolean {
+ const specifier: ts.TypeNode | ts.Expression | undefined = ts.isImportTypeNode(importOrExportDeclaration)
+ ? importOrExportDeclaration.argument
+ : importOrExportDeclaration.moduleSpecifier;
+ const mode: ts.StringLiteralLike =
+ specifier && ts.isStringLiteralLike(specifier)
+ ? TypeScriptInternals.getModeForUsageLocation(importOrExportDeclaration.getSourceFile(), specifier)
+ : undefined;
+
  const resolvedModule: ts.ResolvedModuleFull | undefined = TypeScriptInternals.getResolvedModule(
  importOrExportDeclaration.getSourceFile(),
- moduleSpecifier
+ moduleSpecifier,
+ mode
  );
 
  if (resolvedModule === undefined) {
@@ -863,9 +872,18 @@ export class ExportAnalyzer {
  exportSymbol: ts.Symbol
  ): AstModule {
  const moduleSpecifier: string = this._getModuleSpecifier(importOrExportDeclaration);
+ const mode: ts.StringLiteralLike | undefined =
+ importOrExportDeclaration.moduleSpecifier &&
+ ts.isStringLiteralLike(importOrExportDeclaration.moduleSpecifier)
+ ? TypeScriptInternals.getModeForUsageLocation(
+ importOrExportDeclaration.getSourceFile(),
+ importOrExportDeclaration.moduleSpecifier
+ )
+ : undefined;
  const resolvedModule: ts.ResolvedModuleFull | undefined = TypeScriptInternals.getResolvedModule(
  importOrExportDeclaration.getSourceFile(),
- moduleSpecifier
+ moduleSpecifier,
+ mode
  );
 
  if (resolvedModule === undefined) {

apps/api-extractor/src/analyzer/TypeScriptInternals.ts

@@ -83,12 +83,26 @@ export class TypeScriptInternals {
  */
  public static getResolvedModule(
  sourceFile: ts.SourceFile,
- moduleNameText: string
+ moduleNameText: string,
+ mode: ts.StringLiteralLike | undefined
  ): ts.ResolvedModuleFull | undefined {
  // Compiler internal:
  // https://github.com/microsoft/TypeScript/blob/v3.2.2/src/compiler/utilities.ts#L218
 
- return (ts as any).getResolvedModule(sourceFile, moduleNameText);
+ return (ts as any).getResolvedModule(sourceFile, moduleNameText, mode);
+ }
+
+ /**
+ * Gets the mode required for module resolution required with the addition of Node16/nodenext
+ */
+ public static getModeForUsageLocation(
+ file: { impliedNodeFormat?: ts.SourceFile['impliedNodeFormat'] },
+ usage: ts.StringLiteralLike
+ ) {
+ // Compiler internal:
+ // https://github.com/microsoft/TypeScript/blob/v4.7.2/src/compiler/program.ts#L568
+
+ return (ts as any).getModeForUsageLocation(file, usage);
  }
 
  /**

common/changes/@microsoft/api-extractor/users-chhol-fix-getResolvedModule-params_2022-05-25-17-20.json

@@ -0,0 +1,10 @@
+{
+ "changes": [
+ {
+ "packageName": "@microsoft/api-extractor",
+ "comment": "add missing required parameter for getResolvedModule to ensure typescript can accurately resolve module kind",
+ "type": "minor"
+ }
+ ],
+ "packageName": "@microsoft/api-extractor"
+}