Fix transform api (esm-dev#1333)

Author: ije

server/router.go

@@ -130,8 +130,8 @@ func esmRouter(esmStorage storage.Storage, logger *log.Logger) rex.Handle {
 				h.Write([]byte(options.Lang))
 				h.Write([]byte(options.Code))
 				h.Write([]byte(options.Target))
-				h.Write(options.ImportMap)
-				h.Write([]byte(options.JsxImportSource))
+				h.Write(options.ImportMapRaw)
+				h.Write([]byte(options.JSXImportSource))
 				h.Write([]byte(options.SourceMap))
 				fmt.Fprintf(h, "%v", options.Minify)
 				hash := hex.EncodeToString(h.Sum(nil))
@@ -159,8 +159,8 @@ func esmRouter(esmStorage storage.Storage, logger *log.Logger) rex.Handle {
 				}
 
 				var importMap *importmap.ImportMap
-				if len(options.ImportMap) > 0 {
-					importMap, err = importmap.Parse(nil, options.ImportMap)
+				if len(options.ImportMapRaw) > 0 {
+					importMap, err = importmap.Parse(nil, options.ImportMapRaw)
 					if err != nil {
 						return rex.Err(400, "Invalid ImportMap")
 					}

server/transform.go

@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"net/url"
 	"strings"
 
 	"github.com/esm-dev/esm.sh/internal/importmap"
@@ -17,17 +16,16 @@ type TransformOptions struct {
 	Filename        string          `json:"filename"`
 	Lang            string          `json:"lang"`
 	Code            string          `json:"code"`
-	ImportMap       json.RawMessage `json:"importMap"`
-	JsxImportSource string          `json:"jsxImportSource"`
+	ImportMapRaw    json.RawMessage `json:"importMap"`
+	JSXImportSource string          `json:"jsxImportSource"`
 	Target          string          `json:"target"`
 	SourceMap       string          `json:"sourceMap"`
 	Minify          bool            `json:"minify"`
 }
 
 type ResolvedTransformOptions struct {
 	TransformOptions
-	importMap     *importmap.ImportMap
-	globalVersion string
+	importMap *importmap.ImportMap
 }
 
 type TransformOutput struct {
@@ -49,7 +47,8 @@ func transform(options *ResolvedTransformOptions) (out *TransformOutput, err err
 
 	loader := esbuild.LoaderJS
 	sourceCode := options.Code
-	jsxImportSource := options.JsxImportSource
+	jsxImportSource := options.JSXImportSource
+	importMap := options.importMap
 
 	if options.Lang == "" && options.Filename != "" {
 		filename, _ := utils.SplitByFirstByte(options.Filename, '?')
@@ -72,16 +71,16 @@ func transform(options *ResolvedTransformOptions) (out *TransformOutput, err err
 		return
 	}
 
-	if jsxImportSource == "" && (loader == esbuild.LoaderJSX || loader == esbuild.LoaderTSX) && options.importMap != nil {
-		for _, key := range options.importMap.Imports.Keys() {
+	if jsxImportSource == "" && (loader == esbuild.LoaderJSX || loader == esbuild.LoaderTSX) && importMap != nil {
+		for _, key := range importMap.Imports.Keys() {
 			if before, ok := strings.CutSuffix(key, "/jsx-runtime"); ok {
 				jsxImportSource = before
 				break
 			}
 		}
 		if jsxImportSource == "" {
 			for _, key := range []string{"react/", "preact/", "solid-js/", "mono-jsx/dom/", "mono-jsx/", "vue/"} {
-				if options.importMap.Imports.Has(key) {
+				if importMap.Imports.Has(key) {
 					jsxImportSource = strings.TrimSuffix(key, "/")
 					break
 				}
@@ -121,18 +120,18 @@ func transform(options *ResolvedTransformOptions) (out *TransformOutput, err err
 		MinifyIdentifiers: options.Minify,
 		Sourcemap:         sourceMap,
 		Bundle:            true,
+		TreeShaking:       esbuild.TreeShakingTrue,
 		Outdir:            "/esbuild",
 		Write:             false,
 		Plugins: []esbuild.Plugin{
 			{
 				Name: "resolver",
 				Setup: func(build esbuild.PluginBuild) {
 					build.OnResolve(esbuild.OnResolveOptions{Filter: ".*"}, func(args esbuild.OnResolveArgs) (esbuild.OnResolveResult, error) {
-						importerUrl, _ := url.Parse(args.Importer)
-						if options.importMap != nil {
-							path, ok := options.importMap.Resolve(args.Path, importerUrl)
+						if importMap != nil {
+							path, ok := importMap.Resolve(args.Path, nil)
 							if ok && isHttpSpecifier(path) {
-								return esbuild.OnResolveResult{Path: args.Path, External: true}, nil
+								return esbuild.OnResolveResult{Path: path, External: true}, nil
 							}
 						}
 						return esbuild.OnResolveResult{Path: args.Path, External: true}, nil

test/transform/transform.test.ts

@@ -2,10 +2,11 @@ import { assertEquals, assertStringIncludes } from "jsr:@std/assert";
 
 Deno.test("transform API", async () => {
   const options = {
-    lang: "jsx",
+    lang: "tsx",
     code: `
       import { renderToString } from "preact-render-to-string";
-      export default () => renderToString(<h1>esm.sh</h1>);
+      const render: (() => string) = () => renderToString(<h1>esm.sh</h1>);
+      export default render;
     `,
     target: "es2022",
     importMap: {
@@ -27,7 +28,9 @@ Deno.test("transform API", async () => {
   });
   assertEquals(res1.status, 200);
   const transformOut = await res1.json();
-  assertStringIncludes(transformOut.code, `"preact/jsx-runtime"`);
+  assertStringIncludes(transformOut.code, `"https://esm.sh/preact-render-to-string@6.0.2"`);
+  assertStringIncludes(transformOut.code, `"https://esm.sh/preact@10.13.2/jsx-runtime"`);
+  assertStringIncludes(transformOut.code, `jsx as`);
   assertStringIncludes(transformOut.code, `("h1"`);
   assertStringIncludes(transformOut.code, `//# sourceMappingURL=+${hash}.mjs.map`);
   assertStringIncludes(transformOut.map, `"mappings":`);