feat(parser): report more invalid modifier locations

crates/oxc_parser/src/diagnostics.rs

@@ -543,13 +543,31 @@ pub fn accessibility_modifier_already_seen(modifier: &Modifier) -> OxcDiagnostic
         .with_help("Remove the duplicate modifier.")
 }
 
+#[cold]
+pub fn export_modifier_must_precede_declare(modifier: &Modifier) -> OxcDiagnostic {
+    ts_error("1029", "'export' modifier must precede 'declare' modifier.").with_label(modifier.span)
+}
+
 #[cold]
 pub fn modifier_already_seen(modifier: &Modifier) -> OxcDiagnostic {
     ts_error("1030", format!("'{}' modifier already seen.", modifier.kind))
         .with_label(modifier.span)
         .with_help("Remove the duplicate modifier.")
 }
 
+pub fn cannot_appear_on_class_elements(modifier: &Modifier) -> OxcDiagnostic {
+    ts_error(
+        "1031",
+        format!("'{}' modifier cannot appear on class elements of this kind.", modifier.kind),
+    )
+    .with_label(modifier.span)
+}
+
+pub fn cannot_appear_on_a_type_member(modifier: &Modifier) -> OxcDiagnostic {
+    ts_error("1070", format!("'{}' modifier cannot appear on a type member.", modifier.kind))
+        .with_label(modifier.span)
+}
+
 #[cold]
 pub fn cannot_appear_on_a_type_parameter(modifier: &Modifier) -> OxcDiagnostic {
     ts_error("1273", format!("'{}' modifier cannot be used on a type parameter.", modifier.kind))

crates/oxc_parser/src/js/class.rs

@@ -220,6 +220,11 @@ impl<'a> ParserImpl<'a> {
             /* permit_const_as_modifier */ true,
             /* stop_on_start_of_class_static_block */ true,
         );
+        self.verify_modifiers(
+            &modifiers,
+            ModifierFlags::all() - ModifierFlags::EXPORT,
+            diagnostics::cannot_appear_on_class_elements,
+        );
 
         // static { block }
         if self.at(Kind::Static) && self.lexer.peek_token().kind() == Kind::LCurly {
@@ -415,7 +420,7 @@ impl<'a> ParserImpl<'a> {
         let value = self.parse_method(
             modifiers.contains(ModifierKind::Async),
             false,
-            FunctionKind::ClassMethod,
+            FunctionKind::Constructor,
         );
         let method_definition = self.ast.alloc_method_definition(
             self.end_span(span),

crates/oxc_parser/src/js/function.rs

@@ -72,11 +72,15 @@ impl<'a> ParserImpl<'a> {
         let decorators = self.parse_decorators();
         let modifiers = self.parse_modifiers(false, false);
         if self.is_ts {
+            let mut allowed_modifiers = ModifierFlags::READONLY;
+            if func_kind == FunctionKind::Constructor {
+                allowed_modifiers = allowed_modifiers
+                    .union(ModifierFlags::ACCESSIBILITY)
+                    .union(ModifierFlags::OVERRIDE);
+            }
             self.verify_modifiers(
                 &modifiers,
-                ModifierFlags::ACCESSIBILITY
-                    .union(ModifierFlags::READONLY)
-                    .union(ModifierFlags::OVERRIDE),
+                allowed_modifiers,
                 diagnostics::cannot_appear_on_a_parameter,
             );
         } else {
@@ -87,7 +91,10 @@ impl<'a> ParserImpl<'a> {
             );
         }
         let pattern = self.parse_binding_pattern_with_initializer();
-        if func_kind != FunctionKind::ClassMethod || !self.is_ts {
+        let are_decorators_allowed =
+            matches!(func_kind, FunctionKind::ClassMethod | FunctionKind::Constructor)
+                && self.is_ts;
+        if !are_decorators_allowed {
             for decorator in &decorators {
                 self.error(diagnostics::decorators_are_not_valid_here(decorator.span));
             }
@@ -131,7 +138,10 @@ impl<'a> ParserImpl<'a> {
                     FunctionType::FunctionDeclaration
                 }
             }
-            FunctionKind::Expression | FunctionKind::ClassMethod | FunctionKind::ObjectMethod => {
+            FunctionKind::Expression
+            | FunctionKind::ClassMethod
+            | FunctionKind::Constructor
+            | FunctionKind::ObjectMethod => {
                 if body.is_none() {
                     FunctionType::TSEmptyBodyFunctionExpression
                 } else {

crates/oxc_parser/src/js/mod.rs

@@ -22,6 +22,7 @@ pub enum Tristate {
 
 #[derive(Debug, Clone, Copy, Eq, PartialEq)]
 pub enum FunctionKind {
+    Constructor,
     ClassMethod,
     ObjectMethod,
     Declaration,

crates/oxc_parser/src/lexer/kind.rs

@@ -405,6 +405,7 @@ impl Kind {
             self,
             Abstract | Accessor | Async | Const | Declare
             | In | Out | Public | Private | Protected | Readonly | Static | Override
+            | Default | Export
         )
     }
 

crates/oxc_parser/src/modifiers.rs

@@ -28,8 +28,8 @@ bitflags! {
       const OUT           = 1 << 11;
       const DEFAULT       = 1 << 13;
       const ACCESSOR      = 1 << 14;
+      const EXPORT        = 1 << 15;
       const ACCESSIBILITY = Self::PRIVATE.bits() | Self::PROTECTED.bits() | Self::PUBLIC.bits();
-      // NOTE: `export` and `default` are not handled here, they are parsed explicitly in the parser.
   }
 }
 
@@ -52,6 +52,8 @@ impl From<Kind> for ModifierFlags {
             Kind::In => Self::IN,
             Kind::Out => Self::OUT,
             Kind::Accessor => Self::ACCESSOR,
+            Kind::Default => Self::DEFAULT,
+            Kind::Export => Self::EXPORT,
             _ => unreachable!(),
         }
     }
@@ -73,6 +75,8 @@ impl From<ModifierKind> for ModifierFlags {
             ModifierKind::In => Self::IN,
             ModifierKind::Out => Self::OUT,
             ModifierKind::Accessor => Self::ACCESSOR,
+            ModifierKind::Default => Self::DEFAULT,
+            ModifierKind::Export => Self::EXPORT,
         }
     }
 }
@@ -235,6 +239,8 @@ pub enum ModifierKind {
     Static,
     Out,
     Override,
+    Default,
+    Export,
 }
 
 impl ModifierKind {
@@ -253,6 +259,8 @@ impl ModifierKind {
             Self::Static => "static",
             Self::Out => "out",
             Self::Override => "override",
+            Self::Default => "default",
+            Self::Export => "export",
         }
     }
 }
@@ -274,6 +282,8 @@ impl TryFrom<Kind> for ModifierKind {
             Kind::In => Ok(Self::In),
             Kind::Out => Ok(Self::Out),
             Kind::Accessor => Ok(Self::Accessor),
+            Kind::Default => Ok(Self::Default),
+            Kind::Export => Ok(Self::Export),
             _ => Err(()),
         }
     }
@@ -298,6 +308,9 @@ impl<'a> ParserImpl<'a> {
             let kind = self.cur_kind();
             self.bump_any();
             let modifier = self.modifier(kind, self.end_span(span));
+            if modifier.kind == ModifierKind::Export {
+                self.error(diagnostics::export_modifier_must_precede_declare(&modifier));
+            }
             self.check_for_duplicate_modifiers(flags, &modifier);
             flags.set(modifier_flags, true);
             modifiers.push(modifier);

crates/oxc_parser/src/ts/statement.rs

@@ -241,9 +241,14 @@ impl<'a> ParserImpl<'a> {
         }
 
         let modifiers = self.parse_modifiers(
-            /* permit_const_as_modifier */ false,
+            /* permit_const_as_modifier */ true,
             /* stop_on_start_of_class_static_block */ false,
         );
+        self.verify_modifiers(
+            &modifiers,
+            ModifierFlags::READONLY,
+            diagnostics::cannot_appear_on_a_type_member,
+        );
 
         if self.parse_contextual_modifier(Kind::Get) {
             return self.parse_getter_setter_signature_member(span, TSMethodSignatureKind::Get);

tasks/coverage/misc/fail/oxc-11713-1.ts

@@ -0,0 +1,3 @@
+interface Foo {
+	abstract method();
+}

tasks/coverage/misc/fail/oxc-11713-10.ts

@@ -0,0 +1,3 @@
+interface Foo {
+	async property;
+}

tasks/coverage/misc/fail/oxc-11713-11.ts

@@ -0,0 +1,3 @@
+interface Foo {
+	const method();
+}

tasks/coverage/misc/fail/oxc-11713-12.ts

@@ -0,0 +1,3 @@
+interface Foo {
+	const property;
+}

tasks/coverage/misc/fail/oxc-11713-13.ts

@@ -0,0 +1,2 @@
+const [index: string]: number
+}

tasks/coverage/misc/fail/oxc-11713-14.ts

@@ -0,0 +1,3 @@
+const foo: {
+	const [index: string] : string
+} = {};

tasks/coverage/misc/fail/oxc-11713-15.ts

@@ -0,0 +1,3 @@
+interface Foo {
+	declare method();
+}

tasks/coverage/misc/fail/oxc-11713-16.ts

@@ -0,0 +1,3 @@
+interface Foo {
+	declare property;
+}

tasks/coverage/misc/fail/oxc-11713-17.ts

@@ -0,0 +1,3 @@
+interface Foo {
+	default method();
+}

tasks/coverage/misc/fail/oxc-11713-18.ts

@@ -0,0 +1,3 @@
+interface Foo {
+	default property;
+}

tasks/coverage/misc/fail/oxc-11713-19.ts

@@ -0,0 +1,3 @@
+interface Foo {
+	default [index: string]: number
+}

tasks/coverage/misc/fail/oxc-11713-2.ts

@@ -0,0 +1,3 @@
+type Foo = {
+	static bar;
+}

tasks/coverage/misc/fail/oxc-11713-20.ts

@@ -0,0 +1,3 @@
+const foo: {
+	default [index: string] : string
+} = {};

tasks/coverage/misc/fail/oxc-11713-21.ts

@@ -0,0 +1,3 @@
+interface Foo {
+	export method();
+}

tasks/coverage/misc/fail/oxc-11713-22.ts

@@ -0,0 +1,3 @@
+interface Foo {
+	export property;
+}

tasks/coverage/misc/fail/oxc-11713-3.ts

@@ -0,0 +1 @@
+function foo(private parameter) {}

tasks/coverage/misc/fail/oxc-11713-4.ts

@@ -0,0 +1,3 @@
+class Foo {
+	declare get getter() {}
+}

tasks/coverage/misc/fail/oxc-11713-5.ts

@@ -0,0 +1,3 @@
+interface Foo {
+	abstract method();
+}

tasks/coverage/misc/fail/oxc-11713-6.ts

@@ -0,0 +1,3 @@
+interface Foo {
+	abstract property;
+}

tasks/coverage/misc/fail/oxc-11713-7.ts

@@ -0,0 +1,3 @@
+interface Foo {
+	accessor method();
+}

tasks/coverage/misc/fail/oxc-11713-8.ts

@@ -0,0 +1,3 @@
+interface Foo {
+	accessor property;
+}

tasks/coverage/misc/fail/oxc-11713-9.ts

@@ -0,0 +1,3 @@
+interface Foo {
+	async method();
+}