diff --git a/ecmascript/parser/tests/typescript/class/declare/input.ts.json b/ecmascript/parser/tests/typescript/class/declare/input.ts.json
index 980f6612704..42bad07f358 100644
--- a/ecmascript/parser/tests/typescript/class/declare/input.ts.json
+++ b/ecmascript/parser/tests/typescript/class/declare/input.ts.json
@@ -81,6 +81,7 @@
           }
         },
         {
+          "type": "ClassProperty",
           "span": {
             "start": 44,
             "end": 46,
@@ -104,6 +105,7 @@
           "definite": false
         },
         {
+          "type": "ClassProperty",
           "span": {
             "start": 51,
             "end": 61,
@@ -144,6 +146,7 @@
           "definite": false
         },
         {
+          "type": "ClassMethod",
           "span": {
             "start": 66,
             "end": 70,
@@ -176,6 +179,7 @@
           "isOptional": false
         },
         {
+          "type": "ClassMethod",
           "span": {
             "start": 75,
             "end": 85,
diff --git a/ecmascript/parser/tests/typescript/class/get-generic/input.ts.json b/ecmascript/parser/tests/typescript/class/get-generic/input.ts.json
index 7674de777a5..80a14c7655b 100644
--- a/ecmascript/parser/tests/typescript/class/get-generic/input.ts.json
+++ b/ecmascript/parser/tests/typescript/class/get-generic/input.ts.json
@@ -26,6 +26,7 @@
       },
       "body": [
         {
+          "type": "ClassMethod",
           "span": {
             "start": 22,
             "end": 37,
diff --git a/ecmascript/parser/tests/typescript/class/members-with-modifier-names/input.ts.json b/ecmascript/parser/tests/typescript/class/members-with-modifier-names/input.ts.json
index 5424b21ab08..100e45b39ce 100644
--- a/ecmascript/parser/tests/typescript/class/members-with-modifier-names/input.ts.json
+++ b/ecmascript/parser/tests/typescript/class/members-with-modifier-names/input.ts.json
@@ -26,6 +26,7 @@
       },
       "body": [
         {
+          "type": "ClassMethod",
           "span": {
             "start": 14,
             "end": 29,
@@ -75,6 +76,7 @@
           "isOptional": false
         },
         {
+          "type": "ClassMethod",
           "span": {
             "start": 34,
             "end": 56,
@@ -125,6 +127,7 @@
           "isOptional": false
         },
         {
+          "type": "ClassProperty",
           "span": {
             "start": 61,
             "end": 74,
@@ -157,6 +160,7 @@
           "definite": false
         },
         {
+          "type": "ClassMethod",
           "span": {
             "start": 79,
             "end": 96,
diff --git a/ecmascript/parser/tests/typescript/class/members-with-reserved-names/input.ts.json b/ecmascript/parser/tests/typescript/class/members-with-reserved-names/input.ts.json
index f3a11091797..e58ff5148ad 100644
--- a/ecmascript/parser/tests/typescript/class/members-with-reserved-names/input.ts.json
+++ b/ecmascript/parser/tests/typescript/class/members-with-reserved-names/input.ts.json
@@ -26,6 +26,7 @@
       },
       "body": [
         {
+          "type": "ClassMethod",
           "span": {
             "start": 21,
             "end": 36,
diff --git a/ecmascript/parser/tests/typescript/class/method-computed/input.ts.json b/ecmascript/parser/tests/typescript/class/method-computed/input.ts.json
index 0fa37a4b1ea..6ae1d940e64 100644
--- a/ecmascript/parser/tests/typescript/class/method-computed/input.ts.json
+++ b/ecmascript/parser/tests/typescript/class/method-computed/input.ts.json
@@ -26,6 +26,7 @@
       },
       "body": [
         {
+          "type": "ClassMethod",
           "span": {
             "start": 14,
             "end": 40,
@@ -94,6 +95,7 @@
           "isOptional": false
         },
         {
+          "type": "ClassMethod",
           "span": {
             "start": 45,
             "end": 72,
diff --git a/ecmascript/parser/tests/typescript/class/method-generic/input.ts.json b/ecmascript/parser/tests/typescript/class/method-generic/input.ts.json
index 5cdf1a4b198..e8bd58db860 100644
--- a/ecmascript/parser/tests/typescript/class/method-generic/input.ts.json
+++ b/ecmascript/parser/tests/typescript/class/method-generic/input.ts.json
@@ -26,6 +26,7 @@
       },
       "body": [
         {
+          "type": "ClassMethod",
           "span": {
             "start": 14,
             "end": 48,
@@ -245,6 +246,7 @@
           "isOptional": false
         },
         {
+          "type": "ClassMethod",
           "span": {
             "start": 53,
             "end": 81,
diff --git a/ecmascript/parser/tests/typescript/class/method-no-body/input.ts.json b/ecmascript/parser/tests/typescript/class/method-no-body/input.ts.json
index eff7482f07a..0119e3ec982 100644
--- a/ecmascript/parser/tests/typescript/class/method-no-body/input.ts.json
+++ b/ecmascript/parser/tests/typescript/class/method-no-body/input.ts.json
@@ -26,6 +26,7 @@
       },
       "body": [
         {
+          "type": "ClassMethod",
           "span": {
             "start": 14,
             "end": 18,
@@ -58,6 +59,7 @@
           "isOptional": false
         },
         {
+          "type": "ClassMethod",
           "span": {
             "start": 23,
             "end": 33,
diff --git a/ecmascript/parser/tests/typescript/class/method-optional/input.ts.json b/ecmascript/parser/tests/typescript/class/method-optional/input.ts.json
index 89658a380c4..deb9c90115e 100644
--- a/ecmascript/parser/tests/typescript/class/method-optional/input.ts.json
+++ b/ecmascript/parser/tests/typescript/class/method-optional/input.ts.json
@@ -26,6 +26,7 @@
       },
       "body": [
         {
+          "type": "ClassMethod",
           "span": {
             "start": 14,
             "end": 27,
diff --git a/ecmascript/parser/tests/typescript/class/method-return-type/input.ts.json b/ecmascript/parser/tests/typescript/class/method-return-type/input.ts.json
index 0ee2e74518d..36bd8679dc9 100644
--- a/ecmascript/parser/tests/typescript/class/method-return-type/input.ts.json
+++ b/ecmascript/parser/tests/typescript/class/method-return-type/input.ts.json
@@ -26,6 +26,7 @@
       },
       "body": [
         {
+          "type": "ClassMethod",
           "span": {
             "start": 14,
             "end": 26,
diff --git a/ecmascript/parser/tests/typescript/class/method-with-newline-with-body/input.ts.json b/ecmascript/parser/tests/typescript/class/method-with-newline-with-body/input.ts.json
index a7d0f9f6a9f..4806ced9842 100644
--- a/ecmascript/parser/tests/typescript/class/method-with-newline-with-body/input.ts.json
+++ b/ecmascript/parser/tests/typescript/class/method-with-newline-with-body/input.ts.json
@@ -26,6 +26,7 @@
       },
       "body": [
         {
+          "type": "ClassMethod",
           "span": {
             "start": 14,
             "end": 29,
diff --git a/ecmascript/parser/tests/typescript/class/method-with-newline-without-body/input.ts.json b/ecmascript/parser/tests/typescript/class/method-with-newline-without-body/input.ts.json
index af8af5929bb..2cb35489628 100644
--- a/ecmascript/parser/tests/typescript/class/method-with-newline-without-body/input.ts.json
+++ b/ecmascript/parser/tests/typescript/class/method-with-newline-without-body/input.ts.json
@@ -26,6 +26,7 @@
       },
       "body": [
         {
+          "type": "ClassMethod",
           "span": {
             "start": 14,
             "end": 17,
@@ -58,6 +59,7 @@
           "isOptional": false
         },
         {
+          "type": "ClassMethod",
           "span": {
             "start": 22,
             "end": 25,
diff --git a/ecmascript/parser/tests/typescript/class/modifiers-accessors/input.ts.json b/ecmascript/parser/tests/typescript/class/modifiers-accessors/input.ts.json
index ef92fb860fa..52acedea603 100644
--- a/ecmascript/parser/tests/typescript/class/modifiers-accessors/input.ts.json
+++ b/ecmascript/parser/tests/typescript/class/modifiers-accessors/input.ts.json
@@ -26,6 +26,7 @@
       },
       "body": [
         {
+          "type": "ClassMethod",
           "span": {
             "start": 63,
             "end": 80,
@@ -58,6 +59,7 @@
           "isOptional": false
         },
         {
+          "type": "ClassMethod",
           "span": {
             "start": 85,
             "end": 113,
@@ -116,6 +118,7 @@
           "isOptional": false
         },
         {
+          "type": "ClassMethod",
           "span": {
             "start": 125,
             "end": 144,
@@ -149,6 +152,7 @@
           "isOptional": false
         },
         {
+          "type": "ClassMethod",
           "span": {
             "start": 156,
             "end": 186,
@@ -208,6 +212,7 @@
           "isOptional": false
         },
         {
+          "type": "ClassMethod",
           "span": {
             "start": 199,
             "end": 221,
@@ -267,6 +272,7 @@
           "isOptional": false
         },
         {
+          "type": "ClassMethod",
           "span": {
             "start": 236,
             "end": 258,
@@ -326,6 +332,7 @@
           "isOptional": false
         },
         {
+          "type": "ClassMethod",
           "span": {
             "start": 271,
             "end": 293,
diff --git a/ecmascript/parser/tests/typescript/class/modifiers-methods-async/input.ts.json b/ecmascript/parser/tests/typescript/class/modifiers-methods-async/input.ts.json
index 0b41c572384..44fb589aeba 100644
--- a/ecmascript/parser/tests/typescript/class/modifiers-methods-async/input.ts.json
+++ b/ecmascript/parser/tests/typescript/class/modifiers-methods-async/input.ts.json
@@ -26,6 +26,7 @@
       },
       "body": [
         {
+          "type": "ClassMethod",
           "span": {
             "start": 65,
             "end": 84,
@@ -58,6 +59,7 @@
           "isOptional": false
         },
         {
+          "type": "ClassMethod",
           "span": {
             "start": 89,
             "end": 108,
@@ -98,6 +100,7 @@
           "isOptional": false
         },
         {
+          "type": "ClassMethod",
           "span": {
             "start": 120,
             "end": 141,
@@ -131,6 +134,7 @@
           "isOptional": false
         },
         {
+          "type": "ClassMethod",
           "span": {
             "start": 153,
             "end": 174,
@@ -172,6 +176,7 @@
           "isOptional": false
         },
         {
+          "type": "ClassMethod",
           "span": {
             "start": 187,
             "end": 200,
@@ -213,6 +218,7 @@
           "isOptional": false
         },
         {
+          "type": "ClassMethod",
           "span": {
             "start": 215,
             "end": 228,
@@ -254,6 +260,7 @@
           "isOptional": false
         },
         {
+          "type": "ClassMethod",
           "span": {
             "start": 241,
             "end": 254,
diff --git a/ecmascript/parser/tests/typescript/class/modifiers-properties/input.ts.json b/ecmascript/parser/tests/typescript/class/modifiers-properties/input.ts.json
index c469403a9ac..c1154fddafe 100644
--- a/ecmascript/parser/tests/typescript/class/modifiers-properties/input.ts.json
+++ b/ecmascript/parser/tests/typescript/class/modifiers-properties/input.ts.json
@@ -26,6 +26,7 @@
       },
       "body": [
         {
+          "type": "ClassProperty",
           "span": {
             "start": 23,
             "end": 34,
@@ -49,6 +50,7 @@
           "definite": false
         },
         {
+          "type": "ClassProperty",
           "span": {
             "start": 39,
             "end": 60,
@@ -89,6 +91,7 @@
           "definite": false
         },
         {
+          "type": "ClassProperty",
           "span": {
             "start": 65,
             "end": 76,
@@ -112,6 +115,7 @@
           "definite": false
         },
         {
+          "type": "ClassProperty",
           "span": {
             "start": 81,
             "end": 90,
@@ -135,6 +139,7 @@
           "definite": false
         },
         {
+          "type": "ClassProperty",
           "span": {
             "start": 103,
             "end": 106,
@@ -159,6 +164,7 @@
           "definite": false
         },
         {
+          "type": "ClassProperty",
           "span": {
             "start": 121,
             "end": 124,
@@ -183,6 +189,7 @@
           "definite": false
         },
         {
+          "type": "ClassProperty",
           "span": {
             "start": 137,
             "end": 140,
@@ -207,6 +214,7 @@
           "definite": false
         },
         {
+          "type": "ClassProperty",
           "span": {
             "start": 146,
             "end": 167,
@@ -230,6 +238,7 @@
           "definite": false
         },
         {
+          "type": "ClassProperty",
           "span": {
             "start": 172,
             "end": 193,
@@ -253,6 +262,7 @@
           "definite": false
         },
         {
+          "type": "ClassProperty",
           "span": {
             "start": 198,
             "end": 217,
@@ -276,6 +286,7 @@
           "definite": false
         },
         {
+          "type": "ClassProperty",
           "span": {
             "start": 230,
             "end": 243,
@@ -300,6 +311,7 @@
           "definite": false
         },
         {
+          "type": "ClassProperty",
           "span": {
             "start": 255,
             "end": 268,
@@ -324,6 +336,7 @@
           "definite": false
         },
         {
+          "type": "ClassProperty",
           "span": {
             "start": 280,
             "end": 291,
@@ -348,6 +361,7 @@
           "definite": false
         },
         {
+          "type": "ClassProperty",
           "span": {
             "start": 303,
             "end": 326,
@@ -372,6 +386,7 @@
           "definite": false
         },
         {
+          "type": "ClassProperty",
           "span": {
             "start": 338,
             "end": 361,
@@ -396,6 +411,7 @@
           "definite": false
         },
         {
+          "type": "ClassProperty",
           "span": {
             "start": 373,
             "end": 394,
diff --git a/ecmascript/parser/tests/typescript/class/properties/input.ts.json b/ecmascript/parser/tests/typescript/class/properties/input.ts.json
index e0a52753e41..5d908d83f48 100644
--- a/ecmascript/parser/tests/typescript/class/properties/input.ts.json
+++ b/ecmascript/parser/tests/typescript/class/properties/input.ts.json
@@ -26,6 +26,7 @@
       },
       "body": [
         {
+          "type": "ClassProperty",
           "span": {
             "start": 14,
             "end": 16,
@@ -49,6 +50,7 @@
           "definite": false
         },
         {
+          "type": "ClassProperty",
           "span": {
             "start": 21,
             "end": 24,
@@ -72,6 +74,7 @@
           "definite": false
         },
         {
+          "type": "ClassProperty",
           "span": {
             "start": 29,
             "end": 39,
@@ -112,6 +115,7 @@
           "definite": false
         },
         {
+          "type": "ClassProperty",
           "span": {
             "start": 44,
             "end": 58,
@@ -161,6 +165,7 @@
           "definite": false
         },
         {
+          "type": "ClassProperty",
           "span": {
             "start": 63,
             "end": 66,
@@ -184,6 +189,7 @@
           "definite": true
         },
         {
+          "type": "ClassProperty",
           "span": {
             "start": 71,
             "end": 82,
diff --git a/ecmascript/parser/tests/typescript/class/property-computed/input.ts.json b/ecmascript/parser/tests/typescript/class/property-computed/input.ts.json
index d7b554c21ce..838c3c6d459 100644
--- a/ecmascript/parser/tests/typescript/class/property-computed/input.ts.json
+++ b/ecmascript/parser/tests/typescript/class/property-computed/input.ts.json
@@ -26,6 +26,7 @@
       },
       "body": [
         {
+          "type": "ClassProperty",
           "span": {
             "start": 14,
             "end": 40,
@@ -85,6 +86,7 @@
           "definite": false
         },
         {
+          "type": "ClassProperty",
           "span": {
             "start": 45,
             "end": 72,
diff --git a/ecmascript/parser/tests/typescript/class/static/input.ts.json b/ecmascript/parser/tests/typescript/class/static/input.ts.json
index 7a06dc0e34e..df16f31a9dc 100644
--- a/ecmascript/parser/tests/typescript/class/static/input.ts.json
+++ b/ecmascript/parser/tests/typescript/class/static/input.ts.json
@@ -26,6 +26,7 @@
       },
       "body": [
         {
+          "type": "ClassMethod",
           "span": {
             "start": 14,
             "end": 25,
@@ -58,6 +59,7 @@
           "isOptional": false
         },
         {
+          "type": "ClassMethod",
           "span": {
             "start": 37,
             "end": 48,
@@ -91,6 +93,7 @@
           "isOptional": false
         },
         {
+          "type": "ClassMethod",
           "span": {
             "start": 63,
             "end": 74,
@@ -124,6 +127,7 @@
           "isOptional": false
         },
         {
+          "type": "ClassMethod",
           "span": {
             "start": 87,
             "end": 98,