Skip to content

fix(parser): add modifier ordering validation (TS1029) #19024

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Boshen merged 1 commit into from
Feb 6, 2026
Merged

fix(parser): add modifier ordering validation (TS1029) #19024

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions crates/oxc_linter/src/rules/unicorn/no_static_only_class.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,8 +243,8 @@ fn test() {
r"const A = class { static #a() {}; }",
r"const A = class { static #a = 1; }",
r"@decorator class A { static a = 1; }",
r"class A { static public a = 1; }",
r"class A { static private a = 1; }",
r"class A { public static a = 1; }",
r"class A { private static a = 1; }",
r"class A { static readonly a = 1; }",
r"class A { static declare a = 1; }",
r"class A { static {}; }",
Expand Down
20 changes: 1 addition & 19 deletions crates/oxc_parser/src/js/class.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,31 +292,13 @@ impl<'a> ParserImpl<'a> {
self.error(diagnostics::decorators_are_not_valid_here(decorator.span));
}

// No modifiers except `static` and `readonly` are valid here, and they must appear in that order
// No modifiers except `static` and `readonly` are valid here
self.verify_modifiers(
&modifiers,
ModifierFlags::READONLY | ModifierFlags::STATIC,
true,
diagnostics::cannot_appear_on_an_index_signature,
);
if modifiers.contains_all_flags(ModifierFlags::READONLY | ModifierFlags::STATIC) {
// Has both `readonly` and `static` modifiers. Make sure `static` comes before `readonly`.
let mut has_seen_readonly_modifier = false;
for modifier in modifiers.iter() {
match modifier.kind {
ModifierKind::Readonly => has_seen_readonly_modifier = true,
ModifierKind::Static => {
if has_seen_readonly_modifier {
self.error(diagnostics::modifier_must_precede_other_modifier(
modifier,
ModifierKind::Readonly,
));
}
}
_ => {}
}
}
}

return ClassElement::TSIndexSignature(
self.parse_index_signature_declaration(span, &modifiers),
Expand Down
146 changes: 124 additions & 22 deletions crates/oxc_parser/src/modifiers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,10 +202,6 @@ impl<'a> Modifiers<'a> {
self.flags.contains(target.into())
}

pub fn contains_all_flags(&self, flags: ModifierFlags) -> bool {
self.flags.contains(flags)
}

pub fn iter(&self) -> impl Iterator<Item = &Modifier> + '_ {
self.modifiers.as_ref().into_iter().flat_map(|modifiers| modifiers.iter())
}
Expand Down Expand Up @@ -330,13 +326,7 @@ 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::modifier_must_precede_other_modifier(
&modifier,
ModifierKind::Declare,
));
}
self.check_for_duplicate_modifiers(flags, &modifier);
self.check_modifier(flags, &modifier);
flags.set(modifier_flags, true);
modifiers.push(modifier);
}
Expand Down Expand Up @@ -395,7 +385,7 @@ impl<'a> ParserImpl<'a> {
if modifier.is_static() {
has_seen_static_modifier = true;
}
self.check_for_duplicate_modifiers(modifier_flags, &modifier);
self.check_modifier(modifier_flags, &modifier);
modifier_flags.set(modifier.kind.into(), true);
modifiers.get_or_insert_with(|| self.ast.vec()).push(modifier);
}
Expand Down Expand Up @@ -492,16 +482,128 @@ impl<'a> ParserImpl<'a> {
kind == Kind::LBrack || kind == Kind::PrivateIdentifier || kind.is_literal_property_name()
}

fn check_for_duplicate_modifiers(&mut self, seen_flags: ModifierFlags, modifier: &Modifier) {
if matches!(
modifier.kind,
ModifierKind::Public | ModifierKind::Protected | ModifierKind::Private
) && seen_flags
.intersects(ModifierFlags::PUBLIC | ModifierFlags::PROTECTED | ModifierFlags::PRIVATE)
{
self.error(diagnostics::accessibility_modifier_already_seen(modifier));
} else if seen_flags.contains(modifier.kind.into()) {
self.error(diagnostics::modifier_already_seen(modifier));
fn check_modifier(&mut self, flags: ModifierFlags, modifier: &Modifier) {
match modifier.kind {
ModifierKind::Public | ModifierKind::Private | ModifierKind::Protected => {
if flags.intersects(ModifierFlags::ACCESSIBILITY) {
self.error(diagnostics::accessibility_modifier_already_seen(modifier));
} else if flags.contains(ModifierFlags::OVERRIDE) {
self.error(diagnostics::modifier_must_precede_other_modifier(
modifier,
ModifierKind::Override,
));
} else if flags.contains(ModifierFlags::STATIC) {
self.error(diagnostics::modifier_must_precede_other_modifier(
modifier,
ModifierKind::Static,
));
} else if flags.contains(ModifierFlags::ACCESSOR) {
self.error(diagnostics::modifier_must_precede_other_modifier(
modifier,
ModifierKind::Accessor,
));
} else if flags.contains(ModifierFlags::READONLY) {
self.error(diagnostics::modifier_must_precede_other_modifier(
modifier,
ModifierKind::Readonly,
));
} else if flags.contains(ModifierFlags::ASYNC) {
self.error(diagnostics::modifier_must_precede_other_modifier(
modifier,
ModifierKind::Async,
));
} else if flags.contains(ModifierFlags::ABSTRACT) {
self.error(diagnostics::modifier_must_precede_other_modifier(
modifier,
ModifierKind::Abstract,
));
}
}
ModifierKind::Static => {
if flags.contains(ModifierFlags::STATIC) {
self.error(diagnostics::modifier_already_seen(modifier));
} else if flags.contains(ModifierFlags::READONLY) {
self.error(diagnostics::modifier_must_precede_other_modifier(
modifier,
ModifierKind::Readonly,
));
} else if flags.contains(ModifierFlags::ASYNC) {
self.error(diagnostics::modifier_must_precede_other_modifier(
modifier,
ModifierKind::Async,
));
} else if flags.contains(ModifierFlags::ACCESSOR) {
self.error(diagnostics::modifier_must_precede_other_modifier(
modifier,
ModifierKind::Accessor,
));
} else if flags.contains(ModifierFlags::OVERRIDE) {
self.error(diagnostics::modifier_must_precede_other_modifier(
modifier,
ModifierKind::Override,
));
}
}
ModifierKind::Override => {
if flags.contains(ModifierFlags::OVERRIDE) {
self.error(diagnostics::modifier_already_seen(modifier));
} else if flags.contains(ModifierFlags::READONLY) {
self.error(diagnostics::modifier_must_precede_other_modifier(
modifier,
ModifierKind::Readonly,
));
} else if flags.contains(ModifierFlags::ACCESSOR) {
self.error(diagnostics::modifier_must_precede_other_modifier(
modifier,
ModifierKind::Accessor,
));
} else if flags.contains(ModifierFlags::ASYNC) {
self.error(diagnostics::modifier_must_precede_other_modifier(
modifier,
ModifierKind::Async,
));
}
}
ModifierKind::Abstract => {
if flags.contains(ModifierFlags::ABSTRACT) {
self.error(diagnostics::modifier_already_seen(modifier));
} else if flags.contains(ModifierFlags::OVERRIDE) {
self.error(diagnostics::modifier_must_precede_other_modifier(
modifier,
ModifierKind::Override,
));
} else if flags.contains(ModifierFlags::ACCESSOR) {
self.error(diagnostics::modifier_must_precede_other_modifier(
modifier,
ModifierKind::Accessor,
));
}
}
ModifierKind::Export => {
if flags.contains(ModifierFlags::EXPORT) {
self.error(diagnostics::modifier_already_seen(modifier));
} else if flags.contains(ModifierFlags::DECLARE) {
self.error(diagnostics::modifier_must_precede_other_modifier(
modifier,
ModifierKind::Declare,
));
} else if flags.contains(ModifierFlags::ABSTRACT) {
self.error(diagnostics::modifier_must_precede_other_modifier(
modifier,
ModifierKind::Abstract,
));
} else if flags.contains(ModifierFlags::ASYNC) {
self.error(diagnostics::modifier_must_precede_other_modifier(
modifier,
ModifierKind::Async,
));
}
}
_ => {
if flags.contains(modifier.kind.into()) {
self.error(diagnostics::modifier_already_seen(modifier));
}
}
}
}

Expand Down
Loading
Loading