fix #348, add testcase (#350)

Author: codehz

server/helper.ts

@@ -147,6 +147,8 @@ export function getSourceType(url: string, contentType?: string): SourceType {
   return SourceType.Unknown
 }
 
+const reEndsWithVersion = /@\d+(\.\d+){0,2}(\-[a-z0-9]+(\.[a-z0-9]+)?)?$/
+
 /**
  * fix remote import url to local
  * https://esm.sh/react.js?bundle -> /-/esm.sh/react.YnVuZGxl.js
@@ -161,9 +163,10 @@ export function toLocalPath(url: string): string {
     if (search !== '') {
       const a = util.splitPath(pathname)
       const basename = a.pop()!
-      const ext = extname(basename)
+      const realext = extname(basename)
+      const ext = realext != "" && !basename.match(reEndsWithVersion) ? realext : "js"
       const search64 = util.btoaUrl(search.slice(1))
-      a.push(util.trimSuffix(basename, ext) + `.${search64}` + ext)
+      a.push(util.trimSuffix(basename, ext) + `.${search64}.` + ext)
       pathname = '/' + a.join('/')
     }
     return [

server/helper_test.ts

@@ -38,8 +38,9 @@ Deno.test('server/helper: toRelativePath', () => {
 })
 
 Deno.test('server/helper: toLocalPath', () => {
+  assertEquals(toLocalPath('https://foo.com/[email protected]?action'), `/-/foo.com/[email protected].${util.btoaUrl('action')}.js`)
   assertEquals(toLocalPath('https://deno.land/x/[email protected]/'), '/-/deno.land/x/[email protected]/')
-  assertEquals(toLocalPath('http://foo.com/bar?lang=us-en'), `/-/http_foo.com/bar.${util.btoaUrl('lang=us-en')}`)
+  assertEquals(toLocalPath('http://foo.com/bar?lang=us-en'), `/-/http_foo.com/bar.${util.btoaUrl('lang=us-en')}.js`)
   assertEquals(toLocalPath('http://foo.com:8080/bar'), '/-/http_foo.com_8080/bar')
   assertEquals(toLocalPath('file://foo/bar/'), 'foo/bar/')
   assertEquals(toLocalPath('/foo/bar/'), '/foo/bar/')