Skip to content

Commit 8410b59

Browse files
authored
fix(typescript): Remove the usages of private members (#10037)
**Related issue:** - Closes #10034
1 parent 5059ece commit 8410b59

File tree

7 files changed

+112
-3
lines changed

7 files changed

+112
-3
lines changed

Diff for: .changeset/strange-eggs-jump.md

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
swc_core: patch
3+
swc_typescript: patch
4+
---
5+
6+
fix(typescript): Remove the usage of private members

Diff for: crates/swc_typescript/src/fast_dts/class.rs

+12
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,18 @@ impl FastDts {
229229
continue;
230230
}
231231

232+
if auto_accessor
233+
.accessibility
234+
.is_some_and(|accessibility| accessibility == Accessibility::Private)
235+
{
236+
auto_accessor.decorators.clear();
237+
auto_accessor.definite = false;
238+
auto_accessor.type_ann = None;
239+
auto_accessor.accessibility =
240+
self.transform_accessibility(auto_accessor.accessibility);
241+
}
242+
243+
auto_accessor.is_override = false;
232244
auto_accessor.value = None;
233245
class.body.push(member);
234246
}

Diff for: crates/swc_typescript/src/fast_dts/visitors/type_usage.rs

+31-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ use petgraph::{
66
use rustc_hash::{FxHashMap, FxHashSet};
77
use swc_common::{BytePos, Spanned, SyntaxContext};
88
use swc_ecma_ast::{
9-
Class, ClassMember, Decl, ExportDecl, ExportDefaultDecl, ExportDefaultExpr, Function, Id,
10-
Ident, ModuleExportName, ModuleItem, NamedExport, TsEntityName, TsExportAssignment,
11-
TsExprWithTypeArgs, TsPropertySignature, TsTypeElement,
9+
Accessibility, Class, ClassMember, Decl, ExportDecl, ExportDefaultDecl, ExportDefaultExpr,
10+
Function, Id, Ident, ModuleExportName, ModuleItem, NamedExport, TsEntityName,
11+
TsExportAssignment, TsExprWithTypeArgs, TsPropertySignature, TsTypeElement,
1212
};
1313
use swc_ecma_visit::{Visit, VisitWith};
1414

@@ -251,6 +251,34 @@ impl Visit for TypeUsageAnalyzer<'_> {
251251
if self.has_internal_annotation(node.span_lo()) {
252252
return;
253253
}
254+
255+
let is_private = match node {
256+
ClassMember::Constructor(constructor) => constructor
257+
.accessibility
258+
.is_some_and(|accessibility| accessibility == Accessibility::Private),
259+
ClassMember::Method(class_method) => class_method
260+
.accessibility
261+
.is_some_and(|accessibility| accessibility == Accessibility::Private),
262+
ClassMember::PrivateMethod(_) => true,
263+
ClassMember::ClassProp(class_prop) => class_prop
264+
.accessibility
265+
.is_some_and(|accessibility| accessibility == Accessibility::Private),
266+
ClassMember::PrivateProp(_) => true,
267+
ClassMember::TsIndexSignature(_) => false,
268+
ClassMember::Empty(_) => false,
269+
ClassMember::StaticBlock(_) => false,
270+
ClassMember::AutoAccessor(auto_accessor) => {
271+
auto_accessor
272+
.accessibility
273+
.is_some_and(|accessibility| accessibility == Accessibility::Private)
274+
|| auto_accessor.key.is_private()
275+
}
276+
};
277+
278+
if is_private {
279+
return;
280+
}
281+
254282
node.visit_children_with(self);
255283
}
256284

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
```==================== .D.TS ====================
2+
3+
export declare class SomeClass {
4+
private func;
5+
private func2;
6+
}
7+
8+

Diff for: crates/swc_typescript/tests/fixture/issues/10034.ts

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
const A_SYMBOL = Symbol("A_SYMBOL");
2+
const func = () => null;
3+
4+
export class SomeClass {
5+
private func(
6+
queryFingerprint: string,
7+
onStale: () => void
8+
): null | typeof A_SYMBOL {
9+
return null;
10+
}
11+
12+
private func2(
13+
queryFingerprint: string,
14+
onStale: () => void
15+
): null | typeof func {
16+
return null;
17+
}
18+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
```==================== .D.TS ====================
2+
3+
export declare class A {
4+
private p1;
5+
private constructor();
6+
private accessor myProperty;
7+
private func1;
8+
}
9+
export declare class B {
10+
private a;
11+
private constructor();
12+
}
13+
export declare class C {
14+
#private;
15+
}
16+
17+
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
const A_SYMBOL = Symbol("A_SYMBOL");
2+
3+
export class A {
4+
private p1: typeof A_SYMBOL;
5+
private constructor(a: typeof A_SYMBOL) {}
6+
private accessor myProperty: typeof A_SYMBOL;
7+
private func1(a: typeof A_SYMBOL): typeof A_SYMBOL | null {
8+
return null;
9+
}
10+
}
11+
12+
export class B {
13+
private constructor(private a: typeof A_SYMBOL) {}
14+
}
15+
16+
export class C {
17+
#p1: typeof A_SYMBOL;
18+
accessor #myProperty: typeof A_SYMBOL;
19+
#f(a: typeof A_SYMBOL) {}
20+
}

0 commit comments

Comments
 (0)