feat: Support TypeScript 4.3

Author: dsherret

Cargo.toml

@@ -2,7 +2,7 @@
 name = "dprint-plugin-typescript"
 description = "TypeScript and JavaScript code formatter."
 keywords = ["formatting", "formatter", "typescript", "javascript"]
-version = "0.43.0"
+version = "0.44.0"
 authors = ["David Sherret <[email protected]>"]
 edition = "2018"
 license = "MIT"
@@ -26,9 +26,9 @@ wasm = ["serde_json", "dprint-core/wasm"]
 [dependencies]
 dprint-core = { version = "0.35.3", features = ["formatting"] }
 fnv = "1.0.7"
-swc_common = "0.10.13"
-swc_ecmascript = { version = "0.29.1", features = ["parser"] }
-swc_ast_view = { version = "0.13.1", package = "dprint-swc-ecma-ast-view" }
+swc_common = "0.10.14"
+swc_ecmascript = { version = "0.31.0", features = ["parser"] }
+swc_ast_view = { version = "0.15.0", package = "dprint-swc-ecma-ast-view" }
 serde = { version = "1.0.118", features = ["derive"] }
 serde_json = { version = "1.0", optional = true }
 

src/parsing/parser.rs

@@ -425,6 +425,7 @@ fn parse_class_method<'a>(node: &'a ClassMethod, context: &mut Context<'a>) -> P
         kind: node.method_kind().into(),
         is_generator: node.function.is_generator(),
         is_optional: node.is_optional(),
+        is_override: node.is_override(),
         key: node.key.into(),
         type_params: node.function.type_params.map(|x| x.into()),
         params: node.function.params.iter().map(|&x| x.into()).collect(),
@@ -445,6 +446,7 @@ fn parse_private_method<'a>(node: &'a PrivateMethod, context: &mut Context<'a>)
         kind: node.method_kind().into(),
         is_generator: node.function.is_generator(),
         is_optional: node.is_optional(),
+        is_override: node.is_override(),
         key: node.key.into(),
         type_params: node.function.type_params.map(|x| x.into()),
         params: node.function.params.iter().map(|&x| x.into()).collect(),
@@ -465,6 +467,7 @@ fn parse_class_prop<'a>(node: &'a ClassProp, context: &mut Context<'a>) -> Print
         accessibility: node.accessibility(),
         is_abstract: node.is_abstract(),
         is_optional: node.is_optional(),
+        is_override: node.is_override(),
         readonly: node.readonly(),
         definite: node.definite(),
     }, context)
@@ -482,6 +485,7 @@ fn parse_constructor<'a>(node: &'a Constructor, context: &mut Context<'a>) -> Pr
         kind: ClassOrObjectMethodKind::Constructor,
         is_generator: false,
         is_optional: node.is_optional(),
+        is_override: false,
         key: node.key.into(),
         type_params: None,
         params: node.params.iter().map(|x| x.into()).collect(),
@@ -527,6 +531,7 @@ fn parse_private_prop<'a>(node: &'a PrivateProp, context: &mut Context<'a>) -> P
         accessibility: node.accessibility(),
         is_abstract: node.is_abstract(),
         is_optional: node.is_optional(),
+        is_override: node.is_override(),
         readonly: node.readonly(),
         definite: node.definite(),
     }, context)
@@ -543,6 +548,7 @@ struct ParseClassPropCommon<'a> {
     pub accessibility: Option<Accessibility>,
     pub is_abstract: bool,
     pub is_optional: bool,
+    pub is_override: bool,
     pub readonly: bool,
     pub definite: bool,
 }
@@ -556,6 +562,7 @@ fn parse_class_prop_common<'a>(node: ParseClassPropCommon<'a>, context: &mut Con
     }
     if node.is_static { items.push_str("static "); }
     if node.is_abstract { items.push_str("abstract "); }
+    if node.is_override { items.push_str("override "); }
     if node.readonly { items.push_str("readonly "); }
     let key_span = node.key.span();
     items.extend(if node.computed {
@@ -1941,6 +1948,7 @@ fn parse_getter_prop<'a>(node: &'a GetterProp, context: &mut Context<'a>) -> Pri
         kind: ClassOrObjectMethodKind::Getter,
         is_generator: false,
         is_optional: false,
+        is_override: false,
         key: node.key.into(),
         type_params: None,
         params: Vec::new(),
@@ -2068,6 +2076,7 @@ fn parse_setter_prop<'a>(node: &'a SetterProp, context: &mut Context<'a>) -> Pri
         kind: ClassOrObjectMethodKind::Setter,
         is_generator: false,
         is_optional: false,
+        is_override: false,
         key: node.key.into(),
         type_params: None,
         params: vec![node.param.into()],
@@ -2384,6 +2393,7 @@ fn parse_construct_signature_decl<'a>(node: &'a TsConstructSignatureDecl, contex
 fn parse_index_signature<'a>(node: &'a TsIndexSignature, context: &mut Context<'a>) -> PrintItems {
     let mut items = PrintItems::new();
 
+    if node.is_static() { items.push_str("static "); }
     if node.readonly() { items.push_str("readonly "); }
 
     let param: Node<'a> = node.params.iter().next().expect("Expected the index signature to have one parameter.").into();
@@ -3025,6 +3035,7 @@ fn parse_method_prop<'a>(node: &'a MethodProp, context: &mut Context<'a>) -> Pri
         is_static: false,
         is_async: node.function.is_async(),
         is_abstract: false,
+        is_override: false,
         kind: ClassOrObjectMethodKind::Method,
         is_generator: node.function.is_generator(),
         is_optional: false,
@@ -3047,6 +3058,7 @@ struct ClassOrObjectMethod<'a> {
     kind: ClassOrObjectMethodKind,
     is_generator: bool,
     is_optional: bool,
+    is_override: bool,
     key: Node<'a>,
     type_params: Option<Node<'a>>,
     params: Vec<Node<'a>>,
@@ -3085,6 +3097,7 @@ fn parse_class_or_object_method<'a>(node: ClassOrObjectMethod<'a>, context: &mut
     }
     if node.is_static { items.push_str("static "); }
     if node.is_abstract { items.push_str("abstract "); }
+    if node.is_override { items.push_str("override "); }
     if node.is_async { items.push_str("async "); }
 
     match node.kind {

tests/specs/declarations/class/method/ClassMethod_All.txt

@@ -1,12 +1,12 @@
 ~~ lineWidth: 50 ~~
 == should format different kinds of class methods ==
-abstract class Test {
+abstract class Test extends Base {
     constructor() {
         super(5, 4);
     }
 
     @dec
-    public static async method1(): string {
+    public static override async method1(): 2 {
         // test
     }
 
@@ -46,13 +46,13 @@ abstract class Test {
 }
 
 [expect]
-abstract class Test {
+abstract class Test extends Base {
     constructor() {
         super(5, 4);
     }
 
     @dec
-    public static async method1(): string {
+    public static override async method1(): 2 {
         // test
     }
 

tests/specs/declarations/class/private_method/PrivateMethod_All.txt

@@ -1,20 +1,26 @@
 ~~ lineWidth: 50 ~~
 == should format private methods ==
-abstract class Test {
+abstract class Test extends Base {
     #method1(   arg   : string  )   : test {
         return    5   ;
     }
 
     #method2?() {
     }
+
+    override async #method3() {
+    }
 }
 
 [expect]
-abstract class Test {
+abstract class Test extends Base {
     #method1(arg: string): test {
         return 5;
     }
 
     #method2?() {
     }
+
+    override async #method3() {
+    }
 }

tests/specs/declarations/class/private_property/PrivateProperty_All.txt

@@ -1,22 +1,24 @@
 ~~ lineWidth: 40 ~~
 == should format ==
-class Test {
+class Test extends Base {
     #p1;
     #p2 : string;
     #p3    =   4;
     #p4 ?  : string;
+    override #p5;
 
     constructor() {
         this.#p1 = "test";
     }
 }
 
 [expect]
-class Test {
+class Test extends Base {
     #p1;
     #p2: string;
     #p3 = 4;
     #p4?: string;
+    override #p5;
 
     constructor() {
         this.#p1 = "test";

tests/specs/declarations/class/property/ClassProperty_All.txt

@@ -1,31 +1,33 @@
 ~~ lineWidth: 50 ~~
 == should format different kinds of class properties ==
-abstract class Test {
-    public static  readonly prop1: string;
+abstract class Test extends Base {
+    public static  readonly prop1: 2;
     protected  abstract readonly prop2: number;
-    prop3! : string;
-    prop4?: string;
-    prop5   ;
-    "prop6"   : string;
-    7 : number;
-    ["8"] : number;
-    prop9   :   number  =   5;
+    public override readonly  prop3: 2;
+    prop4! : string;
+    prop5?: string;
+    prop6   ;
+    "prop7"   : string;
+    8 : number;
+    ["9"] : number;
+    prop10   :   number  =   5;
     someVeryLongProperty: string | number | stringg | number;
     @dec
     readonly propReadonly = 3;
 }
 
 [expect]
-abstract class Test {
-    public static readonly prop1: string;
+abstract class Test extends Base {
+    public static readonly prop1: 2;
     protected abstract readonly prop2: number;
-    prop3!: string;
-    prop4?: string;
-    prop5;
-    "prop6": string;
-    7: number;
-    ["8"]: number;
-    prop9: number = 5;
+    public override readonly prop3: 2;
+    prop4!: string;
+    prop5?: string;
+    prop6;
+    "prop7": string;
+    8: number;
+    ["9"]: number;
+    prop10: number = 5;
     someVeryLongProperty:
         | string
         | number

tests/specs/declarations/interface/indexSignature/IndexSignature_All.txt

@@ -6,6 +6,10 @@ interface T {
     readonly [index]: string;
 }
 
+class Test {
+    static readonly [index]: number;
+}
+
 [expect]
 interface T {
     [index: number]: string;
@@ -15,3 +19,7 @@ interface T {
         | boolean;
     readonly [index]: string;
 }
+
+class Test {
+    static readonly [index]: number;
+}