fix: applying type change request and default function as part of struct

swc-project · Dec 9, 2024 · 252afff · 252afff
1 parent a05963a
commit 252afff
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/crates/swc/src/config/mod.rs b/crates/swc/src/config/mod.rs
@@ -1750,7 +1750,7 @@ fn build_resolver(
     mut base_url: PathBuf,
     paths: CompiledPaths,
     resolve_fully: bool,
-    file_extension: &String,
+    file_extension: &str,
 ) -> SwcImportResolver {
     static CACHE: Lazy<DashMap<(PathBuf, CompiledPaths, bool), SwcImportResolver, ARandomState>> =
         Lazy::new(Default::default);

diff --git a/crates/swc_ecma_transforms_module/src/path.rs b/crates/swc_ecma_transforms_module/src/path.rs
@@ -17,8 +17,6 @@ use swc_ecma_loader::resolve::{Resolution, Resolve};
 use swc_ecma_utils::{quote_ident, ExprFactory};
 use tracing::{debug, info, warn, Level};
 
-use crate::util::default_js_ext;
-
 #[derive(Default)]
 pub enum Resolver {
     Real {
@@ -108,7 +106,7 @@ pub struct Config {
 impl Default for Config {
     fn default() -> Config {
         Config {
-            file_extension: default_js_ext(),
+            file_extension: crate::util::Config::default_js_ext(),
             resolve_fully: bool::default(),
             base_dir: Option::default(),
         }

diff --git a/crates/swc_ecma_transforms_module/src/util.rs b/crates/swc_ecma_transforms_module/src/util.rs
@@ -47,12 +47,14 @@ pub struct Config {
     #[serde(default)]
     pub resolve_fully: bool,
 
-    #[serde(default = "default_js_ext")]
+    #[serde(default = "Config::default_js_ext")]
     pub out_file_extension: String,
 }
 
-pub fn default_js_ext() -> String {
-    "js".to_string()
+impl Config {
+    pub fn default_js_ext() -> String {
+        "js".to_string()
+    }
 }
 
 impl Default for Config {

diff --git a/crates/swc_ecma_transforms_module/tests/path_node.rs b/crates/swc_ecma_transforms_module/tests/path_node.rs
@@ -11,7 +11,6 @@ use swc_ecma_parser::Syntax;
 use swc_ecma_transforms_module::{
     path::{ImportResolver, NodeImportResolver},
     rewriter::import_rewriter,
-    util::default_js_ext,
 };
 use swc_ecma_transforms_testing::{test_fixture, FixtureTestConfig};
 use testing::run_test2;
@@ -107,7 +106,7 @@ fn paths_resolver(base_dir: &Path, rules: Vec<(String, Vec<String>)>) -> JscPath
         swc_ecma_transforms_module::path::Config {
             base_dir: Some(base_dir),
             resolve_fully: true,
-            file_extension: default_js_ext(),
+            file_extension: swc_ecma_transforms_module::util::Config::default_js_ext(),
         },
     )
 }