Merge branch 'main' into visit-fq-all

.github/workflows/CI.yml

@@ -19,6 +19,10 @@ env:
   # https://github.com/actions/setup-node/issues/899#issuecomment-1819151595
   SKIP_YARN_COREPACK_CHECK: 1
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: "${{ github.event_name == 'pull_request' }}"
+
 jobs:
   cargo-fmt:
     name: Cargo fmt

CHANGELOG.md

@@ -20,6 +20,9 @@
 - **(es/compat)** Split declaration and init in `block-scoping` pass ([#8648](https://github.com/swc-project/swc/issues/8648)) ([6fe6810](https://github.com/swc-project/swc/commit/6fe6810c492ca20ad73d1536e328ddb804533537))
 
 
+- **(es/module)** Allow `FileName::Anon` from node resolver ([#8686](https://github.com/swc-project/swc/issues/8686)) ([761365e](https://github.com/swc-project/swc/commit/761365eb56254005ddbbfc8079cf1376e5edbd32))
+
+
 - **(es/modules)** Do not call `Path::parent()` for `FileName::Anon` ([#8662](https://github.com/swc-project/swc/issues/8662)) ([1bc4cb7](https://github.com/swc-project/swc/commit/1bc4cb7c0548483980e27483022d6abf0888891d))
 
 

crates/swc/tests/fixture/issues-8xxx/8674/input/.swcrc

@@ -0,0 +1,6 @@
+{
+    "$schema": "http://json.schemastore.org/swcrc",
+    "jsc": {
+        "baseUrl": "."
+    }
+}

crates/swc/tests/fixture/issues-8xxx/8674/input/index.ts

@@ -0,0 +1,2 @@
+import { foo } from "src/foo"
+console.log(foo)

crates/swc/tests/fixture/issues-8xxx/8674/input/src/foo.ts

@@ -0,0 +1 @@
+export { }

crates/swc/tests/fixture/issues-8xxx/8674/output/index.ts

@@ -0,0 +1,2 @@
+import { foo } from "./src/foo";
+console.log(foo);

crates/swc/tests/fixture/issues-8xxx/8674/output/src/foo.ts

@@ -0,0 +1 @@
+export { };

crates/swc/tests/projects.rs

@@ -1,4 +1,5 @@
 use std::{
+    env::current_dir,
     fs::create_dir_all,
     path::{Path, PathBuf},
 };
@@ -1123,6 +1124,37 @@ fn issue_7513_2() {
     );
 }
 
+#[test]
+fn issue_8674_1() {
+    static INPUT: &str = "import { foo } from 'src/foo'";
+
+    let base_url = current_dir()
+        .unwrap()
+        .join("../../node-swc/tests/issue-8674")
+        .canonicalize()
+        .unwrap();
+
+    dbg!(&base_url);
+
+    let output = str_with_opt(
+        INPUT,
+        Options {
+            config: Config {
+                jsc: JscConfig {
+                    base_url,
+                    ..Default::default()
+                },
+                ..Default::default()
+            },
+            ..Default::default()
+        },
+    )
+    .unwrap();
+    println!("{}", output);
+
+    assert_eq!(output.to_string(), "import { foo } from \"./src/foo\";\n");
+}
+
 #[testing::fixture("tests/minify/**/input.js")]
 fn minify(input_js: PathBuf) {
     let input_dir = input_js.parent().unwrap();

crates/swc_ecma_loader/src/resolvers/node.rs

@@ -413,12 +413,27 @@ impl NodeModulesResolver {
         Ok(None)
     }
 
-    fn resolve_filename(&self, base: &FileName, target: &str) -> Result<FileName, Error> {
+    fn resolve_filename(&self, base: &FileName, module_specifier: &str) -> Result<FileName, Error> {
         debug!(
             "Resolving {} from {:#?} for {:#?}",
-            target, base, self.target_env
+            module_specifier, base, self.target_env
         );
 
+        {
+            // Handle absolute path
+
+            let path = Path::new(module_specifier);
+
+            if let Ok(file) = self
+                .resolve_as_file(path)
+                .or_else(|_| self.resolve_as_directory(path, false))
+            {
+                if let Ok(file) = self.wrap(file) {
+                    return Ok(file);
+                }
+            }
+        }
+
         let base = match base {
             FileName::Real(v) => v,
             _ => bail!("node-resolver supports only files"),
@@ -437,10 +452,10 @@ impl NodeModulesResolver {
             if let Some(pkg_base) = find_package_root(base) {
                 if let Some(item) = BROWSER_CACHE.get(&pkg_base) {
                     let value = item.value();
-                    if value.module_ignores.contains(target) {
-                        return Ok(FileName::Custom(target.into()));
+                    if value.module_ignores.contains(module_specifier) {
+                        return Ok(FileName::Custom(module_specifier.into()));
                     }
-                    if let Some(rewrite) = value.module_rewrites.get(target) {
+                    if let Some(rewrite) = value.module_rewrites.get(module_specifier) {
                         return self.wrap(Some(rewrite.to_path_buf()));
                     }
                 }
@@ -449,21 +464,21 @@ impl NodeModulesResolver {
 
         // Handle builtin modules for nodejs
         if let TargetEnv::Node = self.target_env {
-            if target.starts_with("node:") {
-                return Ok(FileName::Custom(target.into()));
+            if module_specifier.starts_with("node:") {
+                return Ok(FileName::Custom(module_specifier.into()));
             }
 
-            if is_core_module(target) {
-                return Ok(FileName::Custom(format!("node:{}", target)));
+            if is_core_module(module_specifier) {
+                return Ok(FileName::Custom(format!("node:{}", module_specifier)));
             }
         }
 
         // Aliases allow browser shims to be renamed so we can
         // map `stream` to `stream-browserify` for example
-        let target = if let Some(alias) = self.alias.get(target) {
+        let target = if let Some(alias) = self.alias.get(module_specifier) {
             &alias[..]
         } else {
-            target
+            module_specifier
         };
 
         let target_path = Path::new(target);

crates/swc_ecma_loader/src/resolvers/tsc.rs

@@ -320,13 +320,9 @@ where
         }
 
         let path = self.base_url.join(module_specifier);
-        #[cfg(windows)]
-        let path_string: String = path.to_string_lossy().replace("\\", "/");
-        #[cfg(not(windows))]
-        let path_string: String = path.to_string_lossy().to_string();
 
         // https://www.typescriptlang.org/docs/handbook/modules/reference.html#baseurl
-        if let Ok(v) = self.invoke_inner_resolver(base, path_string.as_str()) {
+        if let Ok(v) = self.invoke_inner_resolver(base, &path.to_string_lossy()) {
             return Ok(v);
         }
 

crates/swc_ecma_loader/tests/tsc_resolver.rs

@@ -193,8 +193,10 @@ struct TestResolver(AHashMap<String, String>);
 
 impl Resolve for TestResolver {
     fn resolve(&self, _: &FileName, src: &str) -> Result<Resolution, Error> {
+        let src = src.replace('\\', "/");
+
         self.0
-            .get(src)
+            .get(&src)
             .cloned()
             .map(FileName::Custom)
             .map(|v| Resolution {

crates/swc_ecma_transforms_module/src/path.rs

@@ -280,13 +280,16 @@ where
                 v.parent()
                     .ok_or_else(|| anyhow!("failed to get parent of {:?}", v))?,
             ),
-            FileName::Anon => {
-                if cfg!(target_arch = "wasm32") {
-                    panic!("Please specify `filename`")
-                } else {
-                    Cow::Owned(current_dir().expect("failed to get current directory"))
+            FileName::Anon => match &self.config.base_dir {
+                Some(v) => Cow::Borrowed(&**v),
+                None => {
+                    if cfg!(target_arch = "wasm32") {
+                        panic!("Please specify `filename`")
+                    } else {
+                        Cow::Owned(current_dir().expect("failed to get current directory"))
+                    }
                 }
-            }
+            },
             _ => {
                 unreachable!(
                     "Node path provider does not support using `{:?}` as a base file name",

node-swc/__tests__/transform/issue_8674_test.mjs

@@ -0,0 +1,29 @@
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import swc from "../../..";
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+
+it("should transpile import path correctly", async () => {
+    const baseUrl = path.resolve(__dirname, "../../tests/issue-8674");
+    console.log("baseUrl", baseUrl);
+    process.chdir(baseUrl);
+
+    const { code } = await swc.transform(
+        `
+        import { foo } from "src/foo"
+        console.log(foo)
+    `,
+        {
+            jsc: {
+                baseUrl,
+            },
+        }
+    );
+
+    expect(code).toMatchInlineSnapshot(`
+        "import { foo } from "./src/foo";
+        console.log(foo);
+        "
+    `);
+});

node-swc/tests/issue-8674/src/bar.ts

@@ -0,0 +1 @@
+export default 'bar'

node-swc/tests/issue-8674/src/foo.ts

@@ -0,0 +1 @@
+export default 'foo'