Fix module resolver with imports of package.json (#1094)

Author: ije

server/build.go

@@ -469,15 +469,21 @@ func (ctx *BuildContext) buildModule(analyzeMode bool) (meta *BuildMeta, include
 							// check tailing slash
 							pkgName, _, subPath, _ := splitEsmPath(specifier)
 							v, ok = pkgJson.Imports[pkgName]
+							if !ok {
+								v, ok = pkgJson.Imports[pkgName+"/"]
+							}
 							if ok && subPath != "" {
 								if s, ok := v.(string); ok {
-									v = s + "/" + subPath
+									v = strings.TrimSuffix(s, "/") + "/" + subPath
 								}
 							}
 						}
 						if ok {
 							if s, ok := v.(string); ok {
 								specifier = normalizeImportSpecifier(s)
+								if isRelPathSpecifier(specifier) {
+									specifier = ctx.esm.PkgName + "/" + strings.TrimPrefix(specifier, "./")
+								}
 							} else if m, ok := v.(map[string]interface{}); ok {
 								targets := []string{"browser", "module", "import", "default"}
 								if ctx.isDenoTarget() {

server/router.go

@@ -1572,7 +1572,6 @@ func esmRouter(db Database, buildStorage storage.Storage, logger *log.Logger) re
 			}
 		}
 
-	BUILD:
 		build := &BuildContext{
 			npmrc:       npmrc,
 			logger:      logger,
@@ -1673,7 +1672,7 @@ func esmRouter(db Database, buildStorage storage.Storage, logger *log.Logger) re
 					key := npmrc.zoneId + ":" + build.Path()
 					db.Delete(key)
 					cacheStore.Delete("lru:" + key)
-					goto BUILD
+					return rex.Status(500, "Storage error")
 				}
 				return rex.Status(500, err.Error())
 			}

test/valtown/test.ts

@@ -0,0 +1,9 @@
+import { assertEquals, assertExists } from "jsr:@std/assert";
+
+import ValTown from "http://localhost:8080/@valtown/sdk@0.30.0";
+
+Deno.test("valtown SDK", () => {
+  assertEquals(typeof ValTown, "function");
+  const valtown = new ValTown({ bearerToken: "My Bearer Token" });
+  assertExists(valtown, "emails");
+});