Fix swc_ts_fast_strip

Author: CPunisher

Cargo.lock

@@ -493,7 +493,7 @@ impl std::fmt::Debug for Token {
 }
 
 impl Token {
-    pub(crate) fn is_reserved(&self, ctx: Context) -> bool {
+    pub fn is_reserved(&self, ctx: Context) -> bool {
         match self {
             Token::Let | Token::Static => ctx.contains(Context::Strict),
             Token::Await => {
@@ -558,7 +558,7 @@ impl Token {
     }
 
     #[cold]
-    pub(crate) fn to_string(self, value: Option<&TokenValue>) -> String {
+    pub fn to_string(self, value: Option<&TokenValue>) -> String {
         match self {
             Token::LParen => "(",
             Token::RParen => ")",
@@ -778,7 +778,7 @@ impl Token {
         .to_string()
     }
 
-    pub(crate) fn as_keyword_atom(self) -> Option<Atom> {
+    pub fn as_keyword_atom(self) -> Option<Atom> {
         let atom = match self {
             Token::Await => atom!("await"),
             Token::Break => atom!("break"),
@@ -821,12 +821,12 @@ impl Token {
         Some(atom)
     }
 
-    pub(crate) const fn is_keyword(self) -> bool {
+    pub const fn is_keyword(self) -> bool {
         let t = self as u8;
         t >= Token::Await as u8 && t <= Token::Module as u8
     }
 
-    pub(crate) fn as_known_ident_atom(self) -> Option<Atom> {
+    pub fn as_known_ident_atom(self) -> Option<Atom> {
         let atom = match self {
             Token::Abstract => atom!("abstract"),
             Token::Any => atom!("any"),
@@ -880,20 +880,20 @@ impl Token {
     }
 
     #[inline(always)]
-    pub(crate) const fn is_known_ident(self) -> bool {
+    pub const fn is_known_ident(self) -> bool {
         let t = self as u8;
         t >= Token::Abstract as u8 && t <= Token::Target as u8
     }
 
-    pub(crate) const fn is_word(self) -> bool {
+    pub const fn is_word(self) -> bool {
         matches!(
             self,
             Token::Null | Token::True | Token::False | Token::Ident
         ) || self.is_known_ident()
             || self.is_keyword()
     }
 
-    pub(crate) fn as_word_atom(self, value: Option<&TokenValue>) -> Option<Atom> {
+    pub fn as_word_atom(self, value: Option<&TokenValue>) -> Option<Atom> {
         match self {
             Token::Null => Some(atom!("null")),
             Token::True => Some(atom!("true")),
@@ -911,13 +911,13 @@ impl Token {
     }
 
     #[inline(always)]
-    pub(crate) const fn is_bin_op(self) -> bool {
+    pub const fn is_bin_op(self) -> bool {
         let t = self as u8;
         (t >= Token::EqEq as u8 && t <= Token::NullishCoalescing as u8)
             || (t >= Token::Plus as u8 && t <= Token::Ampersand as u8)
     }
 
-    pub(crate) fn as_bin_op(self) -> Option<swc_ecma_ast::BinaryOp> {
+    pub fn as_bin_op(self) -> Option<swc_ecma_ast::BinaryOp> {
         match self {
             Token::EqEq => Some(swc_ecma_ast::BinaryOp::EqEq),
             Token::NotEq => Some(swc_ecma_ast::BinaryOp::NotEq),
@@ -949,12 +949,12 @@ impl Token {
     }
 
     #[inline(always)]
-    pub(crate) const fn is_assign_op(self) -> bool {
+    pub const fn is_assign_op(self) -> bool {
         let t = self as u8;
         matches!(self, Token::Eq) || (t >= Token::PlusEq as u8 && t <= Token::NullishEq as u8)
     }
 
-    pub(crate) fn as_assign_op(self) -> Option<swc_ecma_ast::AssignOp> {
+    pub fn as_assign_op(self) -> Option<swc_ecma_ast::AssignOp> {
         match self {
             Self::Eq => Some(AssignOp::Assign),
             Self::PlusEq => Some(AssignOp::AddAssign),
@@ -977,7 +977,7 @@ impl Token {
     }
 
     #[inline(always)]
-    pub(crate) const fn before_expr(self) -> bool {
+    pub const fn before_expr(self) -> bool {
         match self {
             Self::Await
             | Self::Case
@@ -1014,7 +1014,7 @@ impl Token {
     }
 
     #[inline(always)]
-    pub(crate) const fn starts_expr(self) -> bool {
+    pub const fn starts_expr(self) -> bool {
         matches!(
             self,
             Self::Ident
@@ -1055,7 +1055,7 @@ impl Token {
         ) || self.is_known_ident()
     }
 
-    pub(crate) fn follows_keyword_let(self) -> bool {
+    pub fn follows_keyword_let(self) -> bool {
         match self {
             Token::Let
             | Token::LBrace
@@ -1068,7 +1068,7 @@ impl Token {
         }
     }
 
-    pub(crate) fn should_rescan_into_gt_in_jsx(self) -> bool {
+    pub fn should_rescan_into_gt_in_jsx(self) -> bool {
         matches!(
             self,
             Token::GtEq

crates/swc_ecma_parser/src/lexer/token.rs

@@ -71,12 +71,12 @@ impl<I: Tokens> Parser<I> {
     // type TokenAndSpan = TokenAndSpan;
 
     #[inline(always)]
-    fn input(&self) -> &Buffer<I> {
+    pub fn input(&self) -> &Buffer<I> {
         &self.input
     }
 
     #[inline(always)]
-    fn input_mut(&mut self) -> &mut Buffer<I> {
+    pub fn input_mut(&mut self) -> &mut Buffer<I> {
         &mut self.input
     }
 

crates/swc_ecma_parser/src/parser/mod.rs

@@ -141,9 +141,6 @@ impl ExprExt for Expr {
 
 pub trait IsDirective {
     fn as_ref(&self) -> Option<&Stmt>;
-    fn is_use_strict(&self) -> bool {
-        self.as_ref().is_some_and(Stmt::is_use_strict)
-    }
 }
 
 impl<T> IsDirective for Box<T>

crates/swc_ecma_parser/src/parser/util.rs

@@ -26,7 +26,6 @@ swc_common = { version = "14.0.4", path = "../swc_common", features = [
 ] }
 swc_ecma_ast = { version = "15.0.0", path = "../swc_ecma_ast" }
 swc_ecma_codegen = { version = "17.0.2", path = "../swc_ecma_codegen" }
-swc_ecma_lexer = { version = "23.0.2", path = "../swc_ecma_lexer" }
 swc_ecma_parser = { version = "24.0.3", path = "../swc_ecma_parser", default-features = false, features = [
   "typescript",
   "unstable",

crates/swc_ts_fast_strip/Cargo.toml

@@ -21,10 +21,9 @@ use swc_ecma_ast::{
     TsSatisfiesExpr, TsTypeAliasDecl, TsTypeAnn, TsTypeAssertion, TsTypeParamDecl,
     TsTypeParamInstantiation, VarDeclarator, WhileStmt, YieldExpr,
 };
-use swc_ecma_lexer::common::parser::{buffer::Buffer, Parser as _};
 use swc_ecma_parser::{
     lexer::Lexer,
-    unstable::{Capturing, Token, TokenAndSpan, TokenFactory},
+    unstable::{Capturing, Token, TokenAndSpan},
     Parser, StringInput, Syntax, TsSyntax,
 };
 use swc_ecma_transforms_base::{
@@ -732,7 +731,7 @@ impl TsStrip {
 
             // see ts_next_token_can_follow_modifier
             // class { public public() {} }
-            if !<Token as TokenFactory<'_, TokenAndSpan, Capturing<Lexer>>>::is_word(&next.token)
+            if !next.token.is_word()
                 && !matches!(
                     next.token,
                     Token::LBracket