dan/oxc
1
0
Fork 0
mirror of https://github.com/danbulant/oxc synced 2026-05-19 12:19:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(transformer-dts): remove type annotation from private field (#3689)

Browse source
This commit is contained in:
Dunqing 2024-06-15 13:34:27 +00:00
parent 0e6d3ceee5
commit 35c382ef24
2 changed files with 67 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
crates/oxc_ast/src/ast/ts.rs
View file

@ -729,6 +729,12 @@ pub enum TSAccessibility {
Public,
}
impl TSAccessibility {
pub fn is_private(&self) -> bool {
matches!(self, TSAccessibility::Private)
}
}
#[visited_node]
#[derive(Debug, Hash)]
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]

76
crates/oxc_transformer_dts/src/class.rs
View file

@ -42,22 +42,26 @@ impl<'a> TransformerDts<'a> {
&self,
property: &PropertyDefinition<'a>,
) -> ClassElement<'a> {
let type_annotations = property
.type_annotation
.as_ref()
.map(|type_annotation| self.ctx.ast.copy(type_annotation))
.or_else(|| {
let new_type = property
.value
.as_ref()
.and_then(|expr| self.infer_type_from_expression(expr))
.unwrap_or_else(|| {
// report error for has no type annotation
self.ctx.ast.ts_unknown_keyword(property.span)
});
let type_annotations = if property.accessibility.is_some_and(|a| a.is_private()) {
None
} else {
property
.type_annotation
.as_ref()
.map(|type_annotation| self.ctx.ast.copy(type_annotation))
.or_else(|| {
let new_type = property
.value
.as_ref()
.and_then(|expr| self.infer_type_from_expression(expr))
.unwrap_or_else(|| {
// report error for has no type annotation
self.ctx.ast.ts_unknown_keyword(property.span)
});
Some(self.ctx.ast.ts_type_annotation(SPAN, new_type))
});
Some(self.ctx.ast.ts_type_annotation(SPAN, new_type))
})
};
self.ctx.ast.class_property(
property.r#type,
@ -83,6 +87,23 @@ impl<'a> TransformerDts<'a> {
params: Box<'a, FormalParameters<'a>>,
) -> ClassElement<'a> {
let function = &definition.value;
if definition.accessibility.is_some_and(|a| a.is_private()) {
let r#type = match definition.r#type {
MethodDefinitionType::MethodDefinition => {
PropertyDefinitionType::PropertyDefinition
}
MethodDefinitionType::TSAbstractMethodDefinition => {
PropertyDefinitionType::TSAbstractPropertyDefinition
}
};
return self.create_class_property(
r#type,
self.ctx.ast.copy(&definition.key),
definition.r#override,
self.transform_accessibility(definition.accessibility),
);
}
let type_annotation = self.infer_function_return_type(function);
let value = self.ctx.ast.function(
@ -113,6 +134,31 @@ impl<'a> TransformerDts<'a> {
)
}
pub fn create_class_property(
&self,
r#type: PropertyDefinitionType,
key: PropertyKey<'a>,
r#override: bool,
accessibility: Option<TSAccessibility>,
) -> ClassElement<'a> {
self.ctx.ast.class_property(
r#type,
SPAN,
key,
None,
false,
false,
false,
r#override,
false,
false,
false,
None,
accessibility,
self.ctx.ast.new_vec(),
)
}
pub fn transform_formal_parameter_to_class_property(
&self,
param: &FormalParameter<'a>,