Fix json import (#1213)

Author: ije

server/build.go

@@ -489,7 +489,7 @@ func (ctx *BuildContext) buildModule(analyzeMode bool) (meta *BuildMeta, include
 								if isRelPathSpecifier(specifier) {
 									specifier = ctx.esmPath.PkgName + "/" + strings.TrimPrefix(specifier, "./")
 								}
-							} else if m, ok := v.(map[string]interface{}); ok {
+							} else if m, ok := v.(map[string]any); ok {
 								targets := []string{"browser", "module", "import", "default"}
 								if ctx.isDenoTarget() {
 									targets = []string{"deno", "module", "import", "default"}
@@ -690,13 +690,18 @@ func (ctx *BuildContext) buildModule(analyzeMode bool) (meta *BuildMeta, include
 								}, nil
 							}
 
-							if len(args.With) > 0 && args.With["type"] == "json" {
-								return esbuild.OnResolveResult{
-									Path:        "/" + ctx.esmPath.Name() + utils.NormalizePathname(modulePath) + "?module",
-									External:    true,
-									SideEffects: esbuild.SideEffectsFalse,
-								}, nil
-							}
+							// if len(args.With) > 0 && args.With["type"] == "json" {
+							// 	path := "/" + ctx.esmPath.Name() + utils.NormalizePathname(modulePath)
+							// 	if args.Kind == esbuild.ResolveJSDynamicImport {
+							// 		// esbuild removes the `{ type: "json" }` when it's a dynamic import
+							// 		path += "?module"
+							// 	}
+							// 	return esbuild.OnResolveResult{
+							// 		Path:        path,
+							// 		External:    true,
+							// 		SideEffects: esbuild.SideEffectsFalse,
+							// 	}, nil
+							// }
 
 							filename = path.Join(ctx.wd, "node_modules", ctx.esmPath.PkgName, modulePath)
 

server/build_resolver.go

@@ -741,8 +741,8 @@ func (ctx *BuildContext) resolveExternalModule(specifier string, kind esbuild.Re
 	}
 
 	// if it's a sub-module of current package
-	if strings.HasPrefix(specifier, ctx.pkgJson.Name+"/") {
-		subPath := strings.TrimPrefix(specifier, ctx.pkgJson.Name+"/")
+	if after, ok := strings.CutPrefix(specifier, ctx.pkgJson.Name+"/"); ok {
+		subPath := after
 		subModule := EsmPath{
 			GhPrefix:      ctx.esmPath.GhPrefix,
 			PrPrefix:      ctx.esmPath.PrPrefix,
@@ -759,6 +759,10 @@ func (ctx *BuildContext) resolveExternalModule(specifier string, kind esbuild.Re
 					resolvedPath = "/" + subModule.Name() + entry.main[1:]
 				}
 			}
+			if kind == esbuild.ResolveJSDynamicImport {
+				// esbuild removes the `{ type: "json" }` when it's a dynamic import
+				resolvedPath += "?module"
+			}
 		} else {
 			resolvedPath = ctx.getImportPath(subModule, ctx.getBuildArgsPrefix(false), ctx.externalAll)
 			if ctx.bundleMode == BundleFalse {
@@ -861,6 +865,10 @@ func (ctx *BuildContext) resolveExternalModule(specifier string, kind esbuild.Re
 				resolvedPath = "/" + dep.Name() + entry.main[1:]
 			}
 		}
+		if kind == esbuild.ResolveJSDynamicImport {
+			// esbuild removes the `{ type: "json" }` when it's a dynamic import
+			resolvedPath += "?module"
+		}
 		return
 	}
 

test/import-json/test.ts

@@ -0,0 +1,48 @@
+import { assert, assertEquals, assertStringIncludes } from "jsr:@std/assert";
+
+Deno.test(
+  "bundle json",
+  async () => {
+    const res = await fetch("http://localhost:8080/cli-spinners@3.2.1/denonext/cli-spinners.mjs");
+    const text = await res.text();
+    assert(res.ok);
+    assertEquals(res.headers.get("content-type"), "application/javascript; charset=utf-8");
+    assertEquals(res.headers.get("cache-control"), "public, max-age=31536000, immutable");
+    assertStringIncludes(text, `dots:{interval:80,frames:[`);
+  },
+);
+
+Deno.test(
+  "import mod from 'url' with { type: 'json' }",
+  async () => {
+    const res = await fetch("http://localhost:8080/cli-spinners@3.2.1/denonext/cli-spinners.nobundle.mjs");
+    const text = await res.text();
+    assert(res.ok);
+    assertEquals(res.headers.get("content-type"), "application/javascript; charset=utf-8");
+    assertEquals(res.headers.get("cache-control"), "public, max-age=31536000, immutable");
+    assertStringIncludes(text, `from"/cli-spinners@3.2.1/spinners.json"with{type:"json"}`);
+  },
+);
+
+Deno.test(
+  "import(url, { type: 'json' })",
+  async () => {
+    const res = await fetch("http://localhost:8080/aleman@1.1.0/es2022/menu/menu.mjs");
+    const text = await res.text();
+    assert(res.ok);
+    assertEquals(res.headers.get("content-type"), "application/javascript; charset=utf-8");
+    assertEquals(res.headers.get("cache-control"), "public, max-age=31536000, immutable");
+    assertStringIncludes(text, `import("/aleman@1.1.0/menu/importmap.json?module")`);
+  },
+);
+
+Deno.test(
+  "json?module",
+  async () => {
+    const res = await fetch("http://localhost:8080/aleman@1.1.0/menu/importmap.json?module");
+    const text = await res.text();
+    assert(res.ok);
+    assertEquals(res.headers.get("content-type"), "application/javascript; charset=utf-8");
+    assertEquals(res.headers.get("cache-control"), "public, max-age=31536000, immutable");
+  },
+);