Skip to content

Commit

Permalink
fix(typescript): Remove the usages of private members (#10037)
Browse files Browse the repository at this point in the history
**Related issue:**

 - Closes #10034
  • Loading branch information
CPunisher authored Feb 15, 2025
1 parent 5059ece commit 8410b59
Show file tree
Hide file tree
Showing 7 changed files with 112 additions and 3 deletions.
6 changes: 6 additions & 0 deletions .changeset/strange-eggs-jump.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
swc_core: patch
swc_typescript: patch
---

fix(typescript): Remove the usage of private members
12 changes: 12 additions & 0 deletions crates/swc_typescript/src/fast_dts/class.rs
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,18 @@ impl FastDts {
continue;
}

if auto_accessor
.accessibility
.is_some_and(|accessibility| accessibility == Accessibility::Private)
{
auto_accessor.decorators.clear();
auto_accessor.definite = false;
auto_accessor.type_ann = None;
auto_accessor.accessibility =
self.transform_accessibility(auto_accessor.accessibility);
}

auto_accessor.is_override = false;
auto_accessor.value = None;
class.body.push(member);
}
Expand Down
34 changes: 31 additions & 3 deletions crates/swc_typescript/src/fast_dts/visitors/type_usage.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ use petgraph::{
use rustc_hash::{FxHashMap, FxHashSet};
use swc_common::{BytePos, Spanned, SyntaxContext};
use swc_ecma_ast::{
Class, ClassMember, Decl, ExportDecl, ExportDefaultDecl, ExportDefaultExpr, Function, Id,
Ident, ModuleExportName, ModuleItem, NamedExport, TsEntityName, TsExportAssignment,
TsExprWithTypeArgs, TsPropertySignature, TsTypeElement,
Accessibility, Class, ClassMember, Decl, ExportDecl, ExportDefaultDecl, ExportDefaultExpr,
Function, Id, Ident, ModuleExportName, ModuleItem, NamedExport, TsEntityName,
TsExportAssignment, TsExprWithTypeArgs, TsPropertySignature, TsTypeElement,
};
use swc_ecma_visit::{Visit, VisitWith};

Expand Down Expand Up @@ -251,6 +251,34 @@ impl Visit for TypeUsageAnalyzer<'_> {
if self.has_internal_annotation(node.span_lo()) {
return;
}

let is_private = match node {
ClassMember::Constructor(constructor) => constructor
.accessibility
.is_some_and(|accessibility| accessibility == Accessibility::Private),
ClassMember::Method(class_method) => class_method
.accessibility
.is_some_and(|accessibility| accessibility == Accessibility::Private),
ClassMember::PrivateMethod(_) => true,
ClassMember::ClassProp(class_prop) => class_prop
.accessibility
.is_some_and(|accessibility| accessibility == Accessibility::Private),
ClassMember::PrivateProp(_) => true,
ClassMember::TsIndexSignature(_) => false,
ClassMember::Empty(_) => false,
ClassMember::StaticBlock(_) => false,
ClassMember::AutoAccessor(auto_accessor) => {
auto_accessor
.accessibility
.is_some_and(|accessibility| accessibility == Accessibility::Private)
|| auto_accessor.key.is_private()
}
};

if is_private {
return;
}

node.visit_children_with(self);
}

Expand Down
8 changes: 8 additions & 0 deletions crates/swc_typescript/tests/fixture/issues/10034.snap
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
```==================== .D.TS ====================
export declare class SomeClass {
private func;
private func2;
}
18 changes: 18 additions & 0 deletions crates/swc_typescript/tests/fixture/issues/10034.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
const A_SYMBOL = Symbol("A_SYMBOL");
const func = () => null;

export class SomeClass {
private func(
queryFingerprint: string,
onStale: () => void
): null | typeof A_SYMBOL {
return null;
}

private func2(
queryFingerprint: string,
onStale: () => void
): null | typeof func {
return null;
}
}
17 changes: 17 additions & 0 deletions crates/swc_typescript/tests/fixture/private-accessibility.snap
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
```==================== .D.TS ====================
export declare class A {
private p1;
private constructor();
private accessor myProperty;
private func1;
}
export declare class B {
private a;
private constructor();
}
export declare class C {
#private;
}
20 changes: 20 additions & 0 deletions crates/swc_typescript/tests/fixture/private-accessibility.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
const A_SYMBOL = Symbol("A_SYMBOL");

export class A {
private p1: typeof A_SYMBOL;
private constructor(a: typeof A_SYMBOL) {}
private accessor myProperty: typeof A_SYMBOL;
private func1(a: typeof A_SYMBOL): typeof A_SYMBOL | null {
return null;
}
}

export class B {
private constructor(private a: typeof A_SYMBOL) {}
}

export class C {
#p1: typeof A_SYMBOL;
accessor #myProperty: typeof A_SYMBOL;
#f(a: typeof A_SYMBOL) {}
}

0 comments on commit 8410b59

Please sign in to comment.