[Babel 8] Align TSMappedType AST (#17479)

JLHwung · web-flow · commit f04083a70573 · 2025-08-14T17:09:29.000-04:00
diff --git a/eslint/babel-eslint-parser/package.json b/eslint/babel-eslint-parser/package.json
@@ -51,7 +51,7 @@
     "@typescript-eslint/scope-manager": "^6.19.0",
     "dedent": "^1.5.3",
     "eslint": "^9.21.0",
-    "typescript-eslint": "8.29.1"
+    "typescript-eslint": "8.39.1"
   },
   "conditions": {
     "BABEL_8_BREAKING": [
diff --git a/eslint/babel-eslint-parser/test/typescript-estree.test.js b/eslint/babel-eslint-parser/test/typescript-estree.test.js
@@ -341,7 +341,7 @@ function deeplyRemoveProperties(obj, props) {
         // Pending release https://github.com/microsoft/TypeScript/pull/61764
         "typescript/explicit-resource-management/valid-for-using-declaration-binding-of/input.js",
 
-        // Pending ts-eslint upgrade
+        // Pending https://github.com/typescript-eslint/typescript-eslint/issues/11474
         "typescript/types/import-type-options-with-trailing-comma/input.ts",
 
         // ts-eslint/tsc does not support arrow generic in tsx mode
diff --git a/package.json b/package.json
@@ -84,8 +84,8 @@
     "semver": "^6.3.1",
     "shelljs": "^0.8.5",
     "test262-stream": "^1.4.0",
-    "typescript": "5.8.3",
-    "typescript-eslint": "8.29.1"
+    "typescript": "5.9.2",
+    "typescript-eslint": "8.39.1"
   },
   "workspaces": [
     "codemods/*",
diff --git a/packages/babel-parser/src/plugins/typescript/index.ts b/packages/babel-parser/src/plugins/typescript/index.ts
@@ -4575,6 +4575,10 @@ export default (superClass: ClassWithMixin<typeof Parser, IJSXParserMixin>) =>
           node.declare ??= false;
           node.extends ??= [];
           return;
+        case "TSMappedType":
+          node.optional ??= false;
+          node.readonly ??= undefined;
+          return;
         case "TSModuleDeclaration":
           node.declare ??= false;
           node.global ??= node.kind === "global";
diff --git a/packages/babel-parser/src/types.ts b/packages/babel-parser/src/types.ts
@@ -1812,7 +1812,7 @@ export interface TsMappedType extends TsTypeBase {
   key: Identifier;
   constraint: TsType;
   readonly?: true | "+" | "-";
-  optional?: true | "+" | "-";
+  optional?: boolean | "+" | "-";
   typeAnnotation: TsType | undefined | null;
   nameType: TsType | undefined | null;
 }
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1812,7 +1812,7 @@ export interface TsMappedType extends TsTypeBase {`
`1812`	`1812`	`key: Identifier;`
`1813`	`1813`	`constraint: TsType;`
`1814`	`1814`	`readonly?: true \| "+" \| "-";`
`1815`		`- optional?: true \| "+" \| "-";`
	`1815`	`+ optional?: boolean \| "+" \| "-";`
`1816`	`1816`	`typeAnnotation: TsType \| undefined \| null;`
`1817`	`1817`	`nameType: TsType \| undefined \| null;`
`1818`	`1818`	`}`