Merge branch 'main' into refactor/jsx

Author: magic-akari

.changeset/long-cars-sing.md

@@ -0,0 +1,6 @@
+---
+hstr: minor
+swc_atoms: major
+---
+
+Optimize `atom!` for inlinable strings and adopt it across swc

CHANGELOG-CORE.md

@@ -1,6 +1,17 @@
 # Changelog
 ## [unreleased]
 
+### Bug Fixes
+
+
+
+- **(es/codegen)** Fix `.map` path when using `output_path` ([01e5bd1](https://github.com/swc-project/swc/commit/01e5bd1d6560d3b40e98122e09d0f7bd7c73b4c5))
+
+
+- **(swc)** Fix wrong caching of resolvers regarding file exts ([#10615](https://github.com/swc-project/swc/issues/10615)) ([68aacd1](https://github.com/swc-project/swc/commit/68aacd1dfc2dd97feb5636f1833a6fa1e15407bd))
+
+## [[email protected]] - 2025-06-14
+
 ### Performance
 
 

CHANGELOG.md

@@ -1,6 +1,15 @@
 # Changelog
 ## [unreleased]
 
+### Bug Fixes
+
+
+
+- **(es/codegen)** Fix `.map` path when using `output_path` ([01e5bd1](https://github.com/swc-project/swc/commit/01e5bd1d6560d3b40e98122e09d0f7bd7c73b4c5))
+
+
+- **(swc)** Fix wrong caching of resolvers regarding file exts ([#10615](https://github.com/swc-project/swc/issues/10615)) ([68aacd1](https://github.com/swc-project/swc/commit/68aacd1dfc2dd97feb5636f1833a6fa1e15407bd))
+
 ### Performance
 
 

Cargo.lock

@@ -402,7 +402,7 @@ impl MinifyCss for CssMinifier {
                                         span: Default::default(),
                                         name: swc_css_ast::AtRuleName::Ident(swc_css_ast::Ident {
                                             span: Default::default(),
-                                            value: "media".into(),
+                                            value: atom!("media"),
                                             raw: None,
                                         }),
                                         prelude: Some(
@@ -423,7 +423,7 @@ impl MinifyCss for CssMinifier {
                                             value: vec![swc_css_ast::ComponentValue::Str(
                                                 Box::new(swc_css_ast::Str {
                                                     span: Default::default(),
-                                                    value: "placeholder".into(),
+                                                    value: atom!("placeholder"),
                                                     raw: None,
                                                 }),
                                             )],

bindings/binding_html_node/src/lib.rs

@@ -33,7 +33,7 @@ binding_wasm = [
 
 [dependencies]
 # Common deps for the SWC imports
-swc                 = { optional = true, version = "26.0.0", path = "../swc" }
+swc                 = { optional = true, version = "26.0.1", path = "../swc" }
 swc_common          = { optional = true, version = "12.0.1", path = "../swc_common" }
 swc_ecma_ast        = { optional = true, version = "12.0.0", path = "../swc_ecma_ast" }
 swc_ecma_transforms = { optional = true, version = "20.0.0", path = "../swc_ecma_transforms" }

crates/binding_macros/Cargo.toml

@@ -4,6 +4,7 @@ use std::{
     ffi::c_void,
     hash::{BuildHasherDefault, Hash, Hasher},
     mem::{forget, ManuallyDrop},
+    num::NonZeroU8,
     ops::Deref,
     ptr::{self, NonNull},
 };
@@ -13,7 +14,7 @@ use triomphe::{HeaderWithLength, ThinArc};
 
 use crate::{
     tagged_value::{TaggedValue, MAX_INLINE_LEN},
-    Atom, INLINE_TAG_INIT, LEN_OFFSET, TAG_MASK,
+    Atom, INLINE_TAG, INLINE_TAG_INIT, LEN_OFFSET, TAG_MASK,
 };
 
 #[derive(PartialEq, Eq)]
@@ -146,6 +147,28 @@ where
     }
 }
 
+/// Attempts to construct an Atom but only if it can be constructed inline.
+/// This is primarily useful in constant contexts.
+pub(crate) const fn inline_atom(text: &str) -> Option<Atom> {
+    let len = text.len();
+    if len < MAX_INLINE_LEN {
+        // INLINE_TAG ensures this is never zero
+        let tag = INLINE_TAG | ((len as u8) << LEN_OFFSET);
+        let mut unsafe_data = TaggedValue::new_tag(NonZeroU8::new(tag).unwrap());
+        // This odd pattern is needed because we cannot create slices from ranges in
+        // constant context.
+        unsafe {
+            unsafe_data
+                .data_mut()
+                .split_at_mut(len)
+                .0
+                .copy_from_slice(text.as_bytes());
+        }
+        return Some(Atom { unsafe_data });
+    }
+    None
+}
+
 pub(crate) trait Storage {
     fn insert_entry(self, text: &str, hash: u64, is_global: bool) -> Item;
 }

crates/hstr/src/dynamic.rs

@@ -96,18 +96,32 @@ pub struct Atom {
 #[doc(hidden)]
 pub type CachedAtom = Lazy<Atom>;
 
+#[doc(hidden)]
+pub const fn inline_atom(s: &str) -> Option<Atom> {
+    dynamic::inline_atom(s)
+}
+
 /// Create an atom from a string literal. This atom is never dropped.
 #[macro_export]
 macro_rules! atom {
-    ($s:tt) => {{
-        #[inline(never)]
-        fn get_atom() -> $crate::Atom {
-            static CACHE: $crate::CachedAtom = $crate::CachedAtom::new(|| $crate::Atom::from($s));
+    ($s:expr) => {{
+        const INLINE: ::core::option::Option<$crate::Atom> = $crate::inline_atom($s);
+        // This condition can be evaluated at compile time to enable inlining as a
+        // simple constant
+        if INLINE.is_some() {
+            INLINE.unwrap()
+        } else {
+            // Otherwise we use a
+            #[inline(never)]
+            fn get_atom() -> $crate::Atom {
+                static CACHE: $crate::CachedAtom =
+                    $crate::CachedAtom::new(|| $crate::Atom::from($s));
 
-            (*CACHE).clone()
-        }
+                (*CACHE).clone()
+            }
 
-        get_atom()
+            get_atom()
+        }
     }};
 }
 
@@ -430,3 +444,39 @@ where
         Ok(Atom::new(s))
     }
 }
+
+#[cfg(test)]
+mod macro_tests {
+
+    use super::*;
+    #[test]
+    fn test_atom() {
+        // Test enough to exceed the small string optimization
+        assert_eq!(atom!(""), Atom::default());
+        assert_eq!(atom!(""), Atom::from(""));
+        assert_eq!(atom!("a"), Atom::from("a"));
+        assert_eq!(atom!("ab"), Atom::from("ab"));
+        assert_eq!(atom!("abc"), Atom::from("abc"));
+        assert_eq!(atom!("abcd"), Atom::from("abcd"));
+        assert_eq!(atom!("abcde"), Atom::from("abcde"));
+        assert_eq!(atom!("abcdef"), Atom::from("abcdef"));
+        assert_eq!(atom!("abcdefg"), Atom::from("abcdefg"));
+        assert_eq!(atom!("abcdefgh"), Atom::from("abcdefgh"));
+        assert_eq!(atom!("abcdefghi"), Atom::from("abcdefghi"));
+    }
+
+    #[test]
+    fn test_inline_atom() {
+        // This is a silly test, just asserts that rustc can evaluate the pattern from
+        // our macro in a constant context.
+        const STR: Atom = {
+            let inline = inline_atom("hello");
+            if inline.is_some() {
+                inline.unwrap()
+            } else {
+                unreachable!();
+            }
+        };
+        assert_eq!(STR, Atom::from("hello"));
+    }
+}

crates/hstr/src/lib.rs

@@ -72,7 +72,7 @@ impl TaggedValue {
     }
 
     #[inline(always)]
-    pub fn new_tag(value: NonZeroU8) -> Self {
+    pub const fn new_tag(value: NonZeroU8) -> Self {
         let value = value.get() as RawTaggedValue;
         Self {
             value: unsafe { std::mem::transmute(value) },
@@ -134,7 +134,7 @@ impl TaggedValue {
     /// used when setting the untagged slice part of this value. If tag is
     /// zero and the slice is zeroed out, using this `TaggedValue` will be
     /// UB!
-    pub unsafe fn data_mut(&mut self) -> &mut [u8] {
+    pub const unsafe fn data_mut(&mut self) -> &mut [u8] {
         let x: *mut _ = &mut self.value;
         let mut data = x as *mut u8;
         // All except the lowest byte, which is first in little-endian, last in

crates/hstr/src/tagged_value.rs

@@ -9,7 +9,7 @@ include       = ["Cargo.toml", "src/**/*.rs"]
 license       = { workspace = true }
 name          = "swc"
 repository    = { workspace = true }
-version       = "26.0.0"
+version       = "26.0.1"
 
 [lib]
 bench = false
@@ -78,7 +78,7 @@ swc_common = { version = "12.0.1", path = "../swc_common", features = [
   "sourcemap",
   "parking_lot",
 ] }
-swc_compiler_base = { version = "23.0.1", path = "../swc_compiler_base" }
+swc_compiler_base = { version = "23.0.2", path = "../swc_compiler_base" }
 swc_config = { version = "3.1.1", path = "../swc_config" }
 swc_ecma_ast = { version = "12.0.0", path = "../swc_ecma_ast" }
 swc_ecma_codegen = { version = "14.0.0", path = "../swc_ecma_codegen" }

crates/swc/Cargo.toml

@@ -1838,8 +1838,9 @@ fn build_resolver(
     resolve_fully: bool,
     file_extension: &str,
 ) -> SwcImportResolver {
-    static CACHE: Lazy<DashMap<(PathBuf, CompiledPaths, bool), SwcImportResolver, FxBuildHasher>> =
-        Lazy::new(Default::default);
+    static CACHE: Lazy<
+        DashMap<(PathBuf, CompiledPaths, bool, String), SwcImportResolver, FxBuildHasher>,
+    > = Lazy::new(Default::default);
 
     // On Windows, we need to normalize path as UNC path.
     if cfg!(target_os = "windows") {
@@ -1855,7 +1856,12 @@ fn build_resolver(
             .unwrap();
     }
 
-    if let Some(cached) = CACHE.get(&(base_url.clone(), paths.clone(), resolve_fully)) {
+    if let Some(cached) = CACHE.get(&(
+        base_url.clone(),
+        paths.clone(),
+        resolve_fully,
+        file_extension.to_owned(),
+    )) {
         return cached.clone();
     }
 
@@ -1882,7 +1888,10 @@ fn build_resolver(
         Arc::new(r)
     };
 
-    CACHE.insert((base_url, paths, resolve_fully), r.clone());
+    CACHE.insert(
+        (base_url, paths, resolve_fully, file_extension.to_owned()),
+        r.clone(),
+    );
 
     r
 }

crates/swc/src/config/mod.rs

@@ -7,7 +7,7 @@
     "Error"
   ],
   "sources": [
-    "../../input/index.ts"
+    "../input/index.ts"
   ],
   "sourcesContent": [
     "import \"./errors.ts\";\n\nfunction a() {\n    t();\n}\n\nfunction t(x = false) {\n    if (x) {\n        throw new Error(\"Hello\");\n    }\n    t(!0);\n}\n\na();\n"

crates/swc/tests/fixture/deno/deno-10014/case1/output/index.map

@@ -4,7 +4,7 @@
     "foo"
   ],
   "sources": [
-    "../../input/input.js"
+    "../input/input.js"
   ],
   "sourcesContent": [
     "\nexport const foo = 1;"

crates/swc/tests/fixture/issues-10xxx/10346/output/input.map

@@ -8,7 +8,7 @@
     "log"
   ],
   "sources": [
-    "../../input/index.js"
+    "../input/index.js"
   ],
   "sourcesContent": [
     "console.log('foo');"

crates/swc/tests/fixture/issues-10xxx/10442-ignoreList/output/index.map

@@ -8,7 +8,7 @@
     "log"
   ],
   "sources": [
-    "../../input/index.js"
+    "../input/index.js"
   ],
   "sourcesContent": [
     "console.log('foo');"

crates/swc/tests/fixture/issues-10xxx/10445-glob-filepattern/output/index.map

@@ -4,7 +4,7 @@
     "foo"
   ],
   "sources": [
-    "../../input/index.ts"
+    "../input/index.ts"
   ],
   "sourcesContent": [
     "export const foo = 1;\n"

crates/swc/tests/fixture/issues-1xxx/1309/case1/output/index.map

@@ -4,7 +4,7 @@
     "foo"
   ],
   "sources": [
-    "../../input/index.js"
+    "../input/index.js"
   ],
   "sourcesContent": [
     "export const foo = () => {\n    return 2;\n};\n"

crates/swc/tests/fixture/issues-1xxx/1581/case2/output/index.map

@@ -8,7 +8,7 @@
     "log"
   ],
   "sources": [
-    "../../input/index.ts"
+    "../input/index.ts"
   ],
   "sourcesContent": [
     "namespace A {\n    export const v = 25;\n    export function a() {\n        console.log(v);\n    }\n}\n"

crates/swc/tests/fixture/issues-2xxx/2423/output/index.map

@@ -4,7 +4,7 @@
     "a"
   ],
   "sources": [
-    "../../input/index.js"
+    "../input/index.js"
   ],
   "sourcesContent": [
     "a() /* IMPORTANT_DO_NOT_REMOVE */;\n"

crates/swc/tests/fixture/issues-3xxx/3715/1/output/index.map

@@ -4,7 +4,7 @@
     "a"
   ],
   "sources": [
-    "../../input/index.js"
+    "../input/index.js"
   ],
   "sourcesContent": [
     "a() /* IMPORTANT_DO_NOT_REMOVE */;\n"

crates/swc/tests/fixture/issues-3xxx/3715/2/output/index.map

@@ -4,7 +4,7 @@
     "a"
   ],
   "sources": [
-    "../../input/index.js"
+    "../input/index.js"
   ],
   "sourcesContent": [
     "a(); /*?*/\n\na(); //?\n\na(); /*?*/\n\na(); //?\n"

crates/swc/tests/fixture/issues-3xxx/3716/output/index.map

@@ -9,7 +9,7 @@
     "setTimeout"
   ],
   "sources": [
-    "../../input/index.ts"
+    "../input/index.ts"
   ],
   "sourcesContent": [
     "// index.ts\nexport * as get from \"./get\";\n\n// get/index.ts\n\nexport const byID = (id: string): Promise<string> => {\n    // Do some async stuff\n    return new Promise((resolve) =>\n        setTimeout(() => {\n            resolve(\"result\");\n        }, 2000)\n    );\n};\n"