Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(transformer/typescript): should strip import specifiers type with only_remove_type_imports #8141

Merged
merged 5 commits into from
Jan 6, 2025
Merged

fix(transformer/typescript): should strip import specifiers type with only_remove_type_imports #8141

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bdd11fa
fix(transformer-typescript): should strip import specifiers type with…
underfin Dec 27, 2024
92508b4
chore: add comment
underfin Dec 27, 2024
6da9d10
Merge remote-tracking branch 'origin/main' into fix-ts-onlyRemoveType…
Dunqing Jan 6, 2025
da88ca3
support only_remove_type_imports
Dunqing Jan 6, 2025
447ca8e
Don't use return
Dunqing Jan 6, 2025
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
25 changes: 21 additions & 4 deletions crates/oxc_transformer/src/typescript/annotations.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,6 @@ impl<'a, 'ctx> Traverse<'a> for TypeScriptAnnotations<'a, 'ctx> {
Statement::ImportDeclaration(decl) => {
if decl.import_kind.is_type() {
false
} else if self.only_remove_type_imports {
true
} else if let Some(specifiers) = &mut decl.specifiers {
if specifiers.is_empty() {
// import {} from 'mod' -> import 'mod'
Expand All @@ -118,9 +116,28 @@ impl<'a, 'ctx> Traverse<'a> for TypeScriptAnnotations<'a, 'ctx> {
&s.local
}
};
self.has_value_reference(&id.name, ctx)
// If `only_remove_type_imports` is true, then we can return `true` to keep it because
// it is not a type import, otherwise we need to check if the identifier is referenced
if self.only_remove_type_imports {
true
} else {
self.has_value_reference(&id.name, ctx)
}
});
!specifiers.is_empty()

if !specifiers.is_empty() {
return true;
}

// `import { type A } from 'mod'`
if self.only_remove_type_imports {
// -> `import 'mod'`
decl.specifiers = None;
true
} else {
// Remove the import declaration if all specifiers are removed
false
}
}
} else {
true
Expand Down
8 changes: 6 additions & 2 deletions tasks/transform_conformance/snapshots/babel.snap.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2173,7 +2173,9 @@ after transform: []
rebuilt : ["require"]

* imports/only-remove-type-imports/input.ts
x Output mismatch
Bindings mismatch:
after transform: ScopeId(0): ["H", "I", "I2", "J", "K1", "K2", "L1", "L2", "L3", "a", "b", "c2", "d", "d2", "e", "e4"]
rebuilt : ScopeId(0): ["L2", "a", "b", "c2", "d", "d2", "e", "e4"]

* imports/property-signature/input.ts
Bindings mismatch:
Expand Down Expand Up @@ -2204,7 +2206,9 @@ after transform: ScopeId(0): ["Foo1", "Foo2"]
rebuilt : ScopeId(0): []

* imports/type-only-import-specifier-4/input.ts
x Output mismatch
Bindings mismatch:
after transform: ScopeId(0): ["A"]
rebuilt : ScopeId(0): []

* lvalues/TSTypeParameterInstantiation/input.ts
Symbol reference IDs mismatch for "AbstractClass":
Expand Down
Loading