fix(es/modules): Preserve extensions

crates/swc/tests/fixture/deno/paths/cjs-001/output/index.ts

@@ -2,5 +2,5 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-require("./src/dep");
-require("./src2/dep-2");
+require("./src/dep.ts");
+require("./src2/dep-2.ts");

crates/swc/tests/fixture/deno/paths/ext/002/output/index.js

@@ -1,2 +1,2 @@
-import styles from "./foo.ts/index";
+import styles from "./foo.ts/index.js";
 console.log(styles);

crates/swc/tests/fixture/deno/paths/issue-2126/output/src/index.ts

@@ -2,5 +2,5 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-const _a = require("../packages/a/src/index");
+const _a = require("../packages/a/src/index.ts");
 console.log(`${(0, _a.displayA)()}`);

crates/swc/tests/fixture/deno/paths/issue-2724/output/src/index.ts

@@ -4,6 +4,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 const _interopRequireWildcard = require("@swc/helpers/lib/_interop_require_wildcard.js").default;
 (async function() {
-    const { displayA  } = await Promise.resolve().then(()=>/*#__PURE__*/ _interopRequireWildcard(require("../packages/a/src/index")));
+    const { displayA  } = await Promise.resolve().then(()=>/*#__PURE__*/ _interopRequireWildcard(require("../packages/a/src/index.ts")));
     console.log(displayA());
 })();

crates/swc/tests/fixture/deno/paths/issue-2844/output/src/index.ts

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-require("./core/module/moduleFile");
+require("./core/module/moduleFile.ts");
 require("./core/utils");
 require("./core/utilFile");
 require("./utils");

crates/swc/tests/fixture/deno/paths/issue-3447/output/src/index.ts

@@ -1,3 +1,3 @@
-import { sum } from "./modules/01-moduleA/utils";
+import { sum } from "./modules/01-moduleA/utils.ts";
 export { multiply } from "./modules/03-moduleB/utils";
 console.log(sum(1, 2));

crates/swc/tests/fixture/issues-2xxx/2050/output/index.ts

@@ -3,5 +3,5 @@ Object.defineProperty(exports, "__esModule", {
     value: true
 });
 const _interopRequireDefault = require("@swc/helpers/lib/_interop_require_default.js").default;
-const _a = /*#__PURE__*/ _interopRequireDefault(require("./subfolder/A"));
+const _a = /*#__PURE__*/ _interopRequireDefault(require("./subfolder/A.ts"));
 console.log(_a.default);

crates/swc/tests/fixture/issues-5xxx/5214/1/output/input1.js

@@ -1,2 +1,2 @@
-import styles from "./src/foo.bar.baz";
+import styles from "./src/foo.bar.baz.js";
 console.log(styles);

crates/swc/tests/fixture/issues-6xxx/6209/1/input/.swcrc

@@ -0,0 +1,17 @@
+{
+    "jsc": {
+        "baseUrl": "./src",
+        "paths": {
+            "@modules/*": [
+                "./modules/*"
+            ]
+        },
+        "target": "es2020",
+        "parser": {
+            "syntax": "typescript"
+        }
+    },
+    "module": {
+        "type": "es6"
+    }
+}

crates/swc/tests/fixture/issues-6xxx/6209/1/input/index.js

@@ -0,0 +1,5 @@
+import { modulo } from '@modules/style.module.less'
+import { sum } from './sum.js'
+
+console.log(modulo)
+console.log(sum)

crates/swc/tests/fixture/issues-6xxx/6209/1/input/src/sum.ts

@@ -0,0 +1,5 @@
+
+
+export function sum(a: number, b: number) {
+    return a + b;
+}

crates/swc/tests/fixture/issues-6xxx/6209/1/output/index.js

@@ -0,0 +1,4 @@
+import { modulo } from "./src/modules/style.module.less";
+import { sum } from "./sum.js";
+console.log(modulo);
+console.log(sum);

crates/swc/tests/fixture/issues-6xxx/6209/1/output/src/sum.ts

@@ -0,0 +1,3 @@
+export function sum(a, b) {
+    return a + b;
+}

crates/swc_ecma_transforms_module/src/path.rs

@@ -112,51 +112,13 @@ where
     R: Resolve,
 {
     fn resolve_import(&self, base: &FileName, module_specifier: &str) -> Result<JsWord, Error> {
-        fn to_specifier(
-            target_path: &str,
-            is_file: Option<bool>,
-            orig_ext: Option<&str>,
-        ) -> JsWord {
-            let mut p = PathBuf::from(target_path);
+        fn to_specifier(target_path: &str, orig_ext: Option<&str>) -> JsWord {
+            let p = PathBuf::from(target_path);
 
             if cfg!(debug_assertions) {
                 trace!("to_specifier: orig_ext={:?}", orig_ext);
             }
 
-            let dot_count = p
-                .file_name()
-                .map(|s| s.to_string_lossy())
-                .map(|v| v.as_bytes().iter().filter(|&&c| c == b'.').count())
-                .unwrap_or(0);
-
-            match orig_ext {
-                Some(orig_ext) => {
-                    if is_file.unwrap_or_else(|| p.is_file()) {
-                        if let Some(..) = p.extension() {
-                            if orig_ext == "ts"
-                                || orig_ext == "tsx"
-                                || orig_ext == "js"
-                                || orig_ext == "jsx"
-                                || dot_count == 1
-                            {
-                                p.set_extension(orig_ext);
-                            } else {
-                                p.set_extension("");
-                            }
-                        }
-                    }
-                }
-                _ => {
-                    if is_file.unwrap_or_else(|| p.is_file()) {
-                        if let Some(v) = p.extension() {
-                            if v == "ts" || v == "tsx" || v == "js" || v == "jsx" {
-                                p.set_extension("");
-                            }
-                        }
-                    }
-                }
-            }
-
             p.display().to_string().into()
         }
 
@@ -197,7 +159,7 @@ where
 
         let mut target = match target {
             FileName::Real(v) => v,
-            FileName::Custom(s) => return Ok(to_specifier(&s, None, orig_ext)),
+            FileName::Custom(s) => return Ok(to_specifier(&s, orig_ext)),
             _ => {
                 unreachable!(
                     "Node path provider does not support using `{:?}` as a target file name",
@@ -222,8 +184,6 @@ where
             }
         };
 
-        let is_file = target.is_file();
-
         if base.is_absolute() != target.is_absolute() {
             base = Cow::Owned(absolute_path(&base)?);
             target = absolute_path(&target)?;
@@ -239,13 +199,7 @@ where
 
         let rel_path = match rel_path {
             Some(v) => v,
-            None => {
-                return Ok(to_specifier(
-                    &target.display().to_string(),
-                    Some(is_file),
-                    orig_ext,
-                ))
-            }
+            None => return Ok(to_specifier(&target.display().to_string(), orig_ext)),
         };
 
         {
@@ -273,9 +227,9 @@ where
             Cow::Owned(format!("./{}", s))
         };
         if cfg!(target_os = "windows") {
-            Ok(to_specifier(&s.replace('\\', "/"), Some(is_file), orig_ext))
+            Ok(to_specifier(&s.replace('\\', "/"), orig_ext))
         } else {
-            Ok(to_specifier(&s, Some(is_file), orig_ext))
+            Ok(to_specifier(&s, orig_ext))
         }
     }
 }

crates/swc_ecma_transforms_module/tests/fixture-manual/issue-4730/output/index.js

@@ -1,6 +1,6 @@
-import { displayB } from "../packages/b/src/index";
+import { displayB } from "../packages/b/src/index.ts";
 async function display() {
-    const displayA = await import("../packages/a/src/index").then((c)=>c.displayA);
+    const displayA = await import("../packages/a/src/index.ts").then((c)=>c.displayA);
     console.log(displayA());
     console.log(displayB());
 }

crates/swc_ecma_transforms_module/tests/paths/issue-4532/output/index.ts

@@ -1 +1 @@
-import "./rel.js";
+import "./rel.ts";

crates/swc_ecma_transforms_module/tests/paths/issue-4585/output/index.ts

@@ -1 +1 @@
-import "./src/feat.js";
+import "./src/feat.ts";

crates/swc_ecma_transforms_module/tests/paths/issue-4605/1/output/index.ts

@@ -1 +1 @@
-import "./src/rel.decorator.js";
+import "./src/rel.decorator.ts";

crates/swc_ecma_transforms_module/tests/paths/issue-4605/2/output/index.ts

@@ -1 +1 @@
-import "./src/rel.decorator";
+import "./src/rel.decorator.ts";

crates/swc_ecma_transforms_module/tests/paths/issue-4619/1/output/index.ts

@@ -1 +1 @@
-import "./src/rel.decorator.js";
+import "./src/rel.decorator.ts";

crates/swc_ecma_transforms_module/tests/paths/issue-4619/2/output/index.ts

@@ -1 +1 @@
-import "./src/rel.decorator";
+import "./src/rel.decorator.ts";

packages/swc-helpers/package.json

@@ -30,7 +30,7 @@
     "homepage": "https://swc.rs",
     "devDependencies": {
         "@swc/cli": "^0.1.36",
-        "@swc/core": "^1.2.196"
+        "@swc/core": "=1.3.3"
     },
     "dependencies": {
         "tslib": "^2.4.0"