Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions crates/oxc_ast/src/ast/js.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1136,6 +1136,9 @@ impl<'a> AssignmentTarget<'a> {
pub fn get_identifier(&self) -> Option<&str> {
self.as_simple_assignment_target().and_then(|it| it.get_identifier())
}
pub fn get_expression(&self) -> Option<&Expression<'a>> {
self.as_simple_assignment_target().and_then(|it| it.get_expression())
}
}

/// Macro for matching `AssignmentTarget`'s variants.
Expand Down
8 changes: 8 additions & 0 deletions crates/oxc_transformer/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,14 @@ impl<'a> Traverse<'a> for Transformer<'a> {
self.x0_typescript.transform_simple_assignment_target(node);
}

fn enter_assignment_target(
&mut self,
node: &mut AssignmentTarget<'a>,
_ctx: &mut TraverseCtx<'a>,
) {
self.x0_typescript.transform_assignment_target(node);
}

fn enter_formal_parameter(
&mut self,
param: &mut FormalParameter<'a>,
Expand Down
35 changes: 27 additions & 8 deletions crates/oxc_transformer/src/typescript/annotations.rs
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ impl<'a> TypeScriptAnnotations<'a> {
.as_ref()
.is_some_and(|specifiers| specifiers.is_empty()))
}
_ => false,
_ => module_decl.is_typescript_syntax(),
};

if need_delete {
Expand Down Expand Up @@ -265,6 +265,23 @@ impl<'a> TypeScriptAnnotations<'a> {
}
}

pub fn transform_assignment_target(&mut self, target: &mut AssignmentTarget<'a>) {
if let Some(new_target) = target
.get_expression()
.map(Expression::get_inner_expression)
.and_then(|expr| match expr {
match_member_expression!(Expression) => {
Some(self.ctx.ast.simple_assignment_target_member_expression(
self.ctx.ast.copy(expr.as_member_expression().unwrap()),
))
}
_ => None,
})
{
*target = new_target;
}
}

pub fn transform_formal_parameter(&mut self, param: &mut FormalParameter<'a>) {
param.accessibility = None;
}
Expand All @@ -283,15 +300,17 @@ impl<'a> TypeScriptAnnotations<'a> {
// Collects parameter properties so that we can add an assignment
// for each of them in the constructor body.
if def.kind == MethodDefinitionKind::Constructor {
for param in &def.value.params.items {
if !param.is_public() {
continue;
for param in def.value.params.items.as_mut_slice() {
if param.is_public() {
if let Some(id) = param.pattern.get_identifier() {
let assignment = self.create_this_property_assignment(id);
self.assignments.push(assignment);
}
}

if let Some(id) = param.pattern.get_identifier() {
let assignment = self.create_this_property_assignment(id);
self.assignments.push(assignment);
}
param.readonly = false;
param.accessibility = None;
param.r#override = false;
}
}

Expand Down
4 changes: 4 additions & 0 deletions crates/oxc_transformer/src/typescript/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,10 @@ impl<'a> TypeScript<'a> {
self.annotations.transform_simple_assignment_target(target);
}

pub fn transform_assignment_target(&mut self, target: &mut AssignmentTarget<'a>) {
self.annotations.transform_assignment_target(target);
}

pub fn transform_formal_parameter(&mut self, param: &mut FormalParameter<'a>) {
self.annotations.transform_formal_parameter(param);
}
Expand Down
4 changes: 1 addition & 3 deletions tasks/coverage/transformer_babel.snap
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,4 @@ commit: 4bd1b2c2

transformer_babel Summary:
AST Parsed : 2099/2099 (100.00%)
Positive Passed: 2097/2099 (99.90%)
Mismatch: "typescript/class/parameter-properties/input.ts"
Mismatch: "typescript/export/as-namespace/input.ts"
Positive Passed: 2099/2099 (100.00%)
34 changes: 1 addition & 33 deletions tasks/coverage/transformer_typescript.snap
Original file line number Diff line number Diff line change
Expand Up @@ -2,37 +2,5 @@ commit: 64d2eeea

transformer_typescript Summary:
AST Parsed : 5243/5243 (100.00%)
Positive Passed: 5210/5243 (99.37%)
Mismatch: "compiler/amdModuleName1.ts"
Mismatch: "compiler/avoidCycleWithVoidExpressionReturnedFromArrow.ts"
Mismatch: "compiler/clinterfaces.ts"
Mismatch: "compiler/collectionPatternNoError.ts"
Mismatch: "compiler/comparabilityTypeParametersRelatedByUnion.ts"
Mismatch: "compiler/constEnumMergingWithValues1.ts"
Mismatch: "compiler/constEnumMergingWithValues2.ts"
Mismatch: "compiler/constEnumMergingWithValues3.ts"
Mismatch: "compiler/constEnumMergingWithValues4.ts"
Mismatch: "compiler/constEnumMergingWithValues5.ts"
Positive Passed: 5242/5243 (99.98%)
Mismatch: "compiler/elidedEmbeddedStatementsReplacedWithSemicolon.ts"
Mismatch: "compiler/es5-umd4.ts"
Mismatch: "compiler/exportAssignValueAndType.ts"
Mismatch: "compiler/exportAssignmentWithPrivacyError.ts"
Mismatch: "compiler/exportAssignmentWithoutIdentifier1.ts"
Mismatch: "compiler/exportEqualNamespaces.ts"
Mismatch: "compiler/exportEqualsAmd.ts"
Mismatch: "compiler/exportEqualsClassNoRedeclarationError.ts"
Mismatch: "compiler/exportEqualsCommonJs.ts"
Mismatch: "compiler/exportEqualsUmd.ts"
Mismatch: "compiler/module_augmentUninstantiatedModule2.ts"
Mismatch: "compiler/noCircularDefinitionOnExportOfPrivateInMergedNamespace.ts"
Mismatch: "compiler/noErrorUsingImportExportModuleAugmentationInDeclarationFile1.ts"
Mismatch: "compiler/recursiveFieldSetting.ts"
Mismatch: "compiler/sourceMapValidationExportAssignment.ts"
Mismatch: "compiler/sourceMapValidationExportAssignmentCommonjs.ts"
Mismatch: "compiler/varianceProblingAndZeroOrderIndexSignatureRelationsAlign.ts"
Mismatch: "compiler/varianceProblingAndZeroOrderIndexSignatureRelationsAlign2.ts"
Mismatch: "conformance/classes/members/privateNames/privateNameFieldParenthesisLeftAssignment.ts"
Mismatch: "conformance/classes/propertyMemberDeclarations/initializationOrdering1.ts"
Mismatch: "conformance/classes/propertyMemberDeclarations/instanceMemberInitialization.ts"
Mismatch: "conformance/decorators/class/constructor/parameter/decoratorOnClassConstructorParameter5.ts"
Mismatch: "conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsTopLevelOfModule.2.ts"