chore: update deps

crates/core/Cargo.toml

@@ -38,7 +38,6 @@ wax = { version = "0.6", default-features = false, features = [
 ] }
 globset = { version = "0.4.14" }
 swc_ecma_ast = { version = "3.0.0", features = ["rkyv-impl", "serde-impl"] }
-swc_typescript = { version = "3.0.0" }
 swc_ecma_parser = { version = "4.0.0" }
 swc_common = { version = "3.0.0", features = [
   "concurrent",

crates/core/src/lib.rs

@@ -47,7 +47,6 @@ pub use swc_css_ast;
 pub use swc_ecma_ast;
 pub use swc_ecma_parser;
 pub use swc_html_ast;
-pub use swc_typescript;
 pub use wax;
 
 // re-export common type alias

crates/toolkit/Cargo.toml

@@ -25,6 +25,7 @@ farmfe_testing_helpers = { path = "../testing_helpers", version = "0.0.15" }
 swc_ecma_parser = { version = "4.0.0" }
 swc_ecma_visit = { version = "3.0.0" }
 swc_ecma_codegen = { version = "3.0.0" }
+swc_typescript = { version = "3.0.0" }
 swc_ecma_transforms = { version = "4.0.0", features = [
   "module",
   "typescript",

crates/toolkit/src/lib.rs

@@ -12,6 +12,7 @@ pub mod script;
 pub use preset_env_base;
 pub use swc_ecma_codegen;
 pub use swc_ecma_minifier;
+pub use swc_typescript;
 pub use swc_ecma_parser;
 pub use swc_ecma_preset_env;
 pub use swc_ecma_transforms;

examples/lib/index.ts

@@ -3,6 +3,6 @@ import type { base } from './test.ts';
 export const a: number = 1;
 import type { UserInfo } from '@/test2.ts';
 // 我是奥特曼
-export function b<T extends string>(name: string, userInfo: UserInfo): T {
+export function b<T extends strin2222g>(name: string, userInfo: UserInfo): T {
   return name + names + '123' as T;
 }

rust-plugins/dts/src/lib.rs

@@ -1,6 +1,6 @@
 #![deny(clippy::all)]
 use farmfe_core::{
-  config::{config_regex::ConfigRegex,ResolveConfig, Config},
+  config::{config_regex::ConfigRegex, Config, ResolveConfig},
   context::{CompilationContext, EmitFileParams},
   error::CompilationError,
   plugin::{
@@ -13,7 +13,6 @@ use farmfe_core::{
   swc_common::{comments::SingleThreadedComments, BytePos, FileName, Mark},
   swc_ecma_ast::{ImportDecl, Module as EcmaAstModule, ModuleDecl, ModuleItem, Program},
   swc_ecma_parser::{lexer::Lexer, EsSyntax as EsConfig, JscTarget, Parser, StringInput, Syntax},
-  swc_typescript::fast_dts::FastDts,
 };
 use farmfe_plugin_resolve::resolver::{ResolveOptions, Resolver};
 
@@ -22,6 +21,7 @@ use farmfe_toolkit::{
   swc_ecma_codegen::{to_code, Node},
   swc_ecma_transforms::{helpers::inject_helpers, typescript},
   swc_ecma_visit::{VisitMut, VisitMutWith},
+  swc_typescript::fast_dts::FastDts,
 };
 use std::time::Duration;
 use std::{
@@ -158,13 +158,12 @@ struct ImportPathRewriter {
   resolver: Resolver,
 }
 
-// TODO 生成后缀 
+// TODO 生成后缀
 // 主要依据：根据 Rollup 的 outputOptions.entryFileNames 配置
 // 如果输出是 .js -> 生成 .d.ts
 // 如果输出是 .cjs -> 生成 .d.cts
 // 如果输出是 .mjs -> 生成 .d.mts
 
-
 // {
 //   output: {
 //     entryFileNames: '[name].cjs'  // 将生成 .d.cts
@@ -177,10 +176,9 @@ struct ImportPathRewriter {
 
 // 然后这个先不跟 format 走吧 format 未来可能会有问题 还是跟 entryFileNames 走吧
 
-
 // TODO emit_file baseDir
 // extraOutdir
-// 默认全放在根目录 
+// 默认全放在根目录
 
 // 如果设置了 extraOutdir 则需要根据 extraOutdir 来生成后缀
 
@@ -189,15 +187,14 @@ impl VisitMut for ImportPathRewriter {
     for item in items.iter_mut() {
       if let ModuleItem::ModuleDecl(ModuleDecl::Import(import)) = item {
         let src = &mut import.src;
-        let alias_context = 
-          CompilationContext::new(
-              Config {
-                  resolve: Box::new(ResolveConfig {
-                      alias: self.config.resolve.alias.clone(), 
-                      ..Default::default()
-                  }),
-                  ..Default::default()
-              },
+        let alias_context = CompilationContext::new(
+          Config {
+            resolve: Box::new(ResolveConfig {
+              alias: self.config.resolve.alias.clone(),
+              ..Default::default()
+            }),
+            ..Default::default()
+          },
           vec![],
         )
         .unwrap();
@@ -210,7 +207,7 @@ impl VisitMut for ImportPathRewriter {
         );
         if let Some(resolved_path) = resolved {
           let path = PathBuf::from(resolved_path.resolved_path);
-          
+
           let base_path = path.with_extension("");
           let final_value = base_path
             .with_extension("d.ts")