Skip to content

Commit

Permalink
feat(isolated-declarations): support optional class methods (#4035)
Browse files Browse the repository at this point in the history
Example class
```
export class A {
  m1?(): void;
  m2(): void {}
}
```

Before the fix:
```
export declare class A {
  m1(): void;
}
```

with the fix:
```
export declare class A {
  m1?(): void;
  m2(): void;
}
```
  • Loading branch information
escaton committed Jul 3, 2024
1 parent c043bec commit 7768d23
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 1 deletion.
3 changes: 3 additions & 0 deletions crates/oxc_codegen/src/gen.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2413,6 +2413,9 @@ impl<'a, const MINIFY: bool> Gen<MINIFY> for MethodDefinition<'a> {
if self.computed {
p.print(b']');
}
if self.optional {
p.print(b'?');
}
if let Some(type_parameters) = self.value.type_parameters.as_ref() {
type_parameters.gen(p, ctx);
}
Expand Down
1 change: 1 addition & 0 deletions crates/oxc_codegen/tests/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@ fn typescript() {
);
test_ts("let foo: { <T>(t: T): void }", "let foo: {<T>(t: T): void};\n", false);
test_ts("function <const T>(){}", "function<const T>() {}\n", false);
test_ts("class A {m?(): void}", "class A {\n\tm?(): void;\n}\n", false);
}

fn test_comment_helper(source_text: &str, expected: &str) {
Expand Down
4 changes: 3 additions & 1 deletion crates/oxc_isolated_declarations/src/class.rs
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,9 @@ impl<'a> IsolatedDeclarations<'a> {
match element {
ClassElement::StaticBlock(_) => {}
ClassElement::MethodDefinition(ref method) => {
if !method.r#type.is_abstract() && method.value.body.is_none() {
if !(method.r#type.is_abstract() || method.optional)
&& method.value.body.is_none()
{
is_function_overloads = true;
} else if is_function_overloads {
// Skip implementation of function overloads
Expand Down
1 change: 1 addition & 0 deletions crates/oxc_isolated_declarations/tests/fixtures/class.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ export class Zoo {

export abstract class Qux {
abstract foo(): void;
protected foo2?(): void;
bar(): void {}
baz(): void {}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ export declare class Zoo {
}
export declare abstract class Qux {
abstract foo(): void;
protected foo2?(): void;
bar(): void;
baz(): void;
}
Expand Down

0 comments on commit 7768d23

Please sign in to comment.