Skip to content

fix(isolated-declarations): produce incorrect types when getter/setter with different types #12046

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
graphite-app merged 1 commit into from
Jul 3, 2025
Merged

fix(isolated-declarations): produce incorrect types when getter/setter with different types #12046

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
68 changes: 58 additions & 10 deletions crates/oxc_isolated_declarations/src/class.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use oxc_allocator::{Box as ArenaBox, CloneIn, Vec as ArenaVec};
use oxc_allocator::{Allocator, Box as ArenaBox, CloneIn, Vec as ArenaVec};
use oxc_ast::{NONE, ast::*};
use oxc_span::{ContentEq, GetSpan, SPAN};

Expand All @@ -10,6 +10,27 @@ use crate::{
},
};

struct AccessorAnnotation<'a> {
setter: Option<ArenaBox<'a, TSTypeAnnotation<'a>>>,
getter: Option<ArenaBox<'a, TSTypeAnnotation<'a>>>,
}

impl<'a> AccessorAnnotation<'a> {
fn get_setter_annotation(
&self,
allocator: &'a Allocator,
) -> Option<ArenaBox<'a, TSTypeAnnotation<'a>>> {
self.setter.as_ref().or(self.getter.as_ref()).map(|t| t.clone_in(allocator))
}

fn get_getter_annotation(
&self,
allocator: &'a Allocator,
) -> Option<ArenaBox<'a, TSTypeAnnotation<'a>>> {
self.getter.as_ref().or(self.setter.as_ref()).map(|t| t.clone_in(allocator))
}
}

impl<'a> IsolatedDeclarations<'a> {
pub(crate) fn is_literal_key(key: &PropertyKey<'a>) -> bool {
match key {
Expand Down Expand Up @@ -294,8 +315,8 @@ impl<'a> IsolatedDeclarations<'a> {
fn collect_accessor_annotations(
&self,
decl: &Class<'a>,
) -> Vec<(PropertyKey<'a>, ArenaBox<'a, TSTypeAnnotation<'a>>)> {
let mut method_annotations = Vec::new();
) -> Vec<(PropertyKey<'a>, AccessorAnnotation<'a>)> {
let mut method_annotations: Vec<(PropertyKey<'_>, AccessorAnnotation<'_>)> = Vec::new();
for element in &decl.body.body {
if let ClassElement::MethodDefinition(method) = element {
if (method.key.is_private_identifier()
Expand All @@ -313,15 +334,33 @@ impl<'a> IsolatedDeclarations<'a> {
if let Some(annotation) =
first_param.pattern.type_annotation.clone_in(self.ast.allocator)
{
method_annotations
.push((method.key.clone_in(self.ast.allocator), annotation));
if let Some(entry) = method_annotations
.iter_mut()
.find(|(key, _)| method.key.content_eq(key))
{
entry.1.setter = Some(annotation);
} else {
method_annotations.push((
method.key.clone_in(self.ast.allocator),
AccessorAnnotation { setter: Some(annotation), getter: None },
));
}
}
}
MethodDefinitionKind::Get => {
let function = &method.value;
if let Some(annotation) = self.infer_function_return_type(function) {
method_annotations
.push((method.key.clone_in(self.ast.allocator), annotation));
if let Some(entry) = method_annotations
.iter_mut()
.find(|(key, _)| method.key.content_eq(key))
{
entry.1.getter = Some(annotation);
} else {
method_annotations.push((
method.key.clone_in(self.ast.allocator),
AccessorAnnotation { setter: None, getter: Some(annotation) },
));
}
}
}
_ => {}
Expand Down Expand Up @@ -400,13 +439,16 @@ impl<'a> IsolatedDeclarations<'a> {
if let Some(annotation) =
accessor_annotations.iter().find_map(|(key, annotation)| {
if method.key.content_eq(key) {
Some(annotation.clone_in(self.ast.allocator))
Some(
annotation
.get_setter_annotation(self.ast.allocator),
)
} else {
None
}
})
{
param.pattern.type_annotation = Some(annotation);
param.pattern.type_annotation = annotation;
}
}
params
Expand Down Expand Up @@ -461,7 +503,13 @@ impl<'a> IsolatedDeclarations<'a> {
MethodDefinitionKind::Get => {
let rt = accessor_annotations.iter().find_map(|(key, annotation)| {
if method.key.content_eq(key) {
Some(annotation.clone_in(self.ast.allocator))
// No explicit return type for getter, should infer it from the first parameter of setter, if not exists,
// use the inferred return type of getter.
if method.value.return_type.is_none() {
annotation.get_setter_annotation(self.ast.allocator)
} else {
annotation.get_getter_annotation(self.ast.allocator)
}
} else {
None
}
Expand Down
2 changes: 1 addition & 1 deletion crates/oxc_isolated_declarations/tests/snapshots/set-get-accessor.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ declare class GlobalSymbol2 {
// Infer type from the parameter type of the setter
declare class GlobalSymbol3 {
set [Symbol.toStringTag](v: number);
get [Symbol.toStringTag](): number;
get [Symbol.toStringTag](): string;
}
// Cannot infer type from the function body of the getter
declare class GlobalSymbol4 {
Expand Down
Loading