refactor: improve remote module url resolve

Author: ije

compiler/src/resolve.rs

@@ -149,35 +149,40 @@ impl Resolver {
       },
       None => "js",
     });
-    match path.file_name() {
-      Some(os_str) => match os_str.to_str() {
-        Some(s) => {
-          let mut file_name = s.trim_end_matches(ext.as_str()).to_owned();
-          match url.query() {
-            Some(q) => {
-              file_name.push('_');
-              file_name.push_str(q);
-            }
-            _ => {}
-          };
+    if let Some(os_str) = path.file_name() {
+      if let Some(s) = os_str.to_str() {
+        let mut file_name = "".to_owned();
+        if let Some(q) = url.query() {
+          file_name.push('[');
+          file_name.push_str(
+            base64::encode(q)
+              .replace("+", "")
+              .replace("/", "")
+              .replace("=", "")
+              .as_str(),
+          );
+          file_name.push(']');
+        }
+        file_name.push_str(s);
+        if !file_name.ends_with(ext.as_str()) {
           file_name.push_str(ext.as_str());
-          path_buf.set_file_name(file_name);
         }
-        _ => {}
-      },
-      _ => {}
-    };
+        path_buf.set_file_name(file_name);
+      }
+    }
     let mut p = "/-/".to_owned();
-    if url.scheme() == "http" {
+    let scheme = url.scheme();
+    if scheme == "http" {
       p.push_str("http_");
     }
     p.push_str(url.host_str().unwrap());
-    match url.port() {
-      Some(port) => {
+    if let Some(port) = url.port() {
+      if scheme == "http" && port == 80 {
+      } else if scheme == "https" && port == 443 {
+      } else {
         p.push('_');
         p.push_str(port.to_string().as_str());
       }
-      _ => {}
     }
     p.push_str(path_buf.to_str().unwrap());
     p
@@ -387,7 +392,7 @@ mod tests {
     );
     assert_eq!(
       resolver.fix_import_url("https://esm.sh/[email protected]?target=es2015&dev"),
-      "/-/esm.sh/[email protected].1_target=es2015&dev.js"
+      "/-/esm.sh/[dGFyZ2V0PWVzMjAxNSZkZXY][email protected].1.js"
     );
     assert_eq!(
       resolver.fix_import_url("http://localhost:8080/mod"),

compiler/src/swc.rs

@@ -569,7 +569,11 @@ mod tests {
       None,
       None,
       true,
-      vec!["/components/logo.ts".into(), "/shared/iife.ts".into()],
+      vec![
+        "https://esm.sh/react".into(),
+        "/components/logo.ts".into(),
+        "/shared/iife.ts".into(),
+      ],
     )));
     let (code, _) = module
       .transform(resolver.clone(), &EmitOptions::default())

server/helper.ts

@@ -1,7 +1,6 @@
 import { colors, createHash, path } from '../deps.ts'
 import { existsDirSync } from '../shared/fs.ts'
 import { moduleExts } from '../shared/constants.ts'
-import log from '../shared/log.ts'
 import util from '../shared/util.ts'
 import { VERSION } from '../version.ts'
 
@@ -81,22 +80,28 @@ export function trimModuleExt(url: string) {
 
 /** fix remote import url to local */
 export function toLocalUrl(url: string): string {
-  const isRemote = util.isLikelyHttpURL(url)
-  if (isRemote) {
-    let { hostname, pathname, port, protocol, searchParams } = new URL(url)
-    let search = Array.from(searchParams.entries()).map(([key, value]) => value ? `${key}=${value}` : key)
-    if (search.length > 0) {
-      pathname += '_' + search.join(',')
+  if (util.isLikelyHttpURL(url)) {
+    let { hostname, pathname, port, protocol, search } = new URL(url)
+    const isHttp = protocol === 'http:'
+    if ((isHttp && port === '80') || (protocol === 'https:' && port === '443')) {
+      port = ''
+    }
+    if (search !== '') {
+      const a = util.splitPath(pathname)
+      const searchKey = btoa(search.slice(1)).replace(/[+/=]/g, '')
+      const basename = `[${searchKey}]${a.pop()}`
+      a.push(basename)
+      pathname = '/' + a.join('/')
     }
     return [
       '/-/',
-      (protocol === 'http:' ? 'http_' : ''),
+      (isHttp ? 'http_' : ''),
       hostname,
       (port ? '_' + port : ''),
       pathname
     ].join('')
   }
-  return url
+  return util.trimPrefix(url, 'file://')
 }
 
 /** compute hash of the content */
@@ -126,7 +131,7 @@ export async function clearCompilation(jsFile: string) {
 export function parsePortNumber(v: string): number {
   const num = parseInt(v)
   if (isNaN(num) || !Number.isInteger(num) || num <= 0 || num >= 1 << 16) {
-    log.fatal(`invalid port '${v}'`)
+    throw new Error(`invalid port '${v}'`)
   }
   return num
 }

server/helper_test.ts

@@ -0,0 +1,16 @@
+import { assertEquals } from 'https://deno.land/[email protected]/testing/asserts.ts'
+import { toLocalUrl } from './helper.ts'
+
+Deno.test(`server/helper`, async () => {
+  // test toLocalUrl()
+  {
+    assertEquals(toLocalUrl('https://esm.sh/[email protected]'), '/-/esm.sh/[email protected]')
+    assertEquals(toLocalUrl('https://esm.sh:443/[email protected]'), '/-/esm.sh/[email protected]')
+    assertEquals(toLocalUrl('https://esm.sh/[email protected]?dev'), `/-/esm.sh/[${btoa('dev').replace(/[+/=]/g, '')}][email protected]`)
+    assertEquals(toLocalUrl('https://esm.sh/[email protected]?target=es2015&dev'), `/-/esm.sh/[${btoa('target=es2015&dev').replace(/[+/=]/g, '')}][email protected]`)
+    assertEquals(toLocalUrl('http://localhost/mod.ts'), '/-/http_localhost/mod.ts')
+    assertEquals(toLocalUrl('http://localhost:80/mod.ts'), '/-/http_localhost/mod.ts')
+    assertEquals(toLocalUrl('http://localhost:8080/mod.ts'), '/-/http_localhost_8080/mod.ts')
+    assertEquals(toLocalUrl('file:///mod.ts'), '/mod.ts')
+  }
+})