Merge pull request #4408 from microsoft/octogonz/ae-ts-5.3.0-beta

Update API Extractor to support TypeScript 5.3.3

Author: octogonz

apps/api-extractor/package.json

@@ -48,7 +48,7 @@
     "resolve": "~1.22.1",
     "semver": "~7.5.4",
     "source-map": "~0.6.1",
-    "typescript": "~5.0.4"
+    "typescript": "5.3.3"
   },
   "devDependencies": {
     "local-eslint-config": "workspace:*",

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

@@ -268,6 +268,7 @@ export class ExportAnalyzer {
         : undefined;
 
     const resolvedModule: ts.ResolvedModuleFull | undefined = TypeScriptInternals.getResolvedModule(
+      this._program,
       importOrExportDeclaration.getSourceFile(),
       moduleSpecifier,
       mode
@@ -882,6 +883,7 @@ export class ExportAnalyzer {
           )
         : undefined;
     const resolvedModule: ts.ResolvedModuleFull | undefined = TypeScriptInternals.getResolvedModule(
+      this._program,
       importOrExportDeclaration.getSourceFile(),
       moduleSpecifier,
       mode

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

@@ -82,14 +82,19 @@ export class TypeScriptInternals {
    * The compiler populates this cache as part of analyzing the source file.
    */
   public static getResolvedModule(
+    program: ts.Program,
     sourceFile: ts.SourceFile,
     moduleNameText: string,
     mode: ts.ModuleKind.CommonJS | ts.ModuleKind.ESNext | undefined
   ): ts.ResolvedModuleFull | undefined {
     // Compiler internal:
-    // https://github.com/microsoft/TypeScript/blob/v4.7.2/src/compiler/utilities.ts#L161
-
-    return (ts as any).getResolvedModule(sourceFile, moduleNameText, mode);
+    // https://github.com/microsoft/TypeScript/blob/v5.3.3/src/compiler/types.ts#L4698
+    const result: ts.ResolvedModuleWithFailedLookupLocations | undefined = (program as any).getResolvedModule(
+      sourceFile,
+      moduleNameText,
+      mode
+    );
+    return result?.resolvedModule;
   }
 
   /**

build-tests/install-test-workspace/workspace/common/pnpm-lock.yaml

@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@microsoft/api-extractor",
+      "comment": "Update API Extractor to support TypeScript 5.3.3",
+      "type": "minor"
+    }
+  ],
+  "packageName": "@microsoft/api-extractor"
+}

common/changes/@microsoft/api-extractor/octogonz-ae-ts-5.3.0-beta_2023-10-24-21-05.json

@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@rushstack/eslint-patch",
+      "comment": "",
+      "type": "none"
+    }
+  ],
+  "packageName": "@rushstack/eslint-patch"
+}

common/changes/@rushstack/eslint-patch/octogonz-ae-ts-5.3.0-beta_2023-12-19-23-03.json

@@ -76,7 +76,9 @@
       // For testing Heft with TS V3
       "~3.9.10",
       // For testing Heft with TS V4
-      "~4.9.5"
+      "~4.9.5",
+
+      "5.3.3"
     ],
     "source-map": [
       "~0.6.1" // API Extractor is using an older version of source-map because newer versions are async

common/config/rush/common-versions.json

@@ -1,5 +1,5 @@
 // DO NOT MODIFY THIS FILE MANUALLY BUT DO COMMIT IT. It is generated and used by Rush.
 {
-  "pnpmShrinkwrapHash": "148b38e4e98c98edfcfa2d368a33cff4b835df8f",
+  "pnpmShrinkwrapHash": "e42e10f7ac97560c9546f9077901b92b19a54310",
   "preferredVersionsHash": "1926a5b12ac8f4ab41e76503a0d1d0dccc9c0e06"
 }

common/config/rush/pnpm-lock.yaml

@@ -74,7 +74,11 @@ export function getGitRootPath(): string {
 export const GitRootPath = getGitRootPath();
 
 function findEslintrcDirectory(fileAbsolutePath: string): string {
-  for (let currentDir = fileAbsolutePath; currentDir.startsWith(GitRootPath); currentDir = path.dirname(currentDir))
+  for (
+    let currentDir = fileAbsolutePath;
+    currentDir.startsWith(GitRootPath);
+    currentDir = path.dirname(currentDir)
+  )
     if (['.eslintrc.js', '.eslintrc.cjs'].some((eslintrc) => fs.existsSync(path.join(currentDir, eslintrc))))
       return currentDir;
   throw new Error('Cannot locate eslintrc');