fixup esmsh

Author: guybedford

src/providers/esmsh.ts

@@ -54,32 +54,7 @@ export async function getPackageConfig(
       );
   }
 
-  const pcfg = await res.json();
-
-  // esm.sh uses exports paths as paths
-  // so we rewrite all exports paths to point to their internal path and let esm.sh do resolution
-  // note: strictly speaking we should add ?conditions=... here for the condition set
-  // but that will require some more wiring
-  if (pcfg.exports) {
-    // in the conditional expoort case, paths seem to work?
-    // so go with that
-    if (Object.keys(pcfg.exports).every((key) => !key.startsWith("./"))) {
-      pcfg.exports["."] = pcfg.exports;
-    } else {
-      // let esm.sh resolve conditions
-      for (const key of Object.keys(pcfg.exports)) {
-        pcfg.exports[key] = key;
-      }
-    }
-    // wildcard key for esmsh to do its own fallback resolution too
-    pcfg.exports["./*"] = "./*";
-  }
-  if (pcfg.imports) {
-    for (const key of Object.keys(pcfg.imports)) {
-      pcfg.imports[key] = key;
-    }
-  }
-  return pcfg;
+  return await res.json();
 }
 
 export async function resolveLatestTarget(

src/trace/tracemap.ts

@@ -254,7 +254,8 @@ export default class TraceMap {
 
     await Promise.all(
       allDeps.map(async (dep) => {
-        if (dep.indexOf("*") !== -1) {
+        // Special wildcard tracing syntax for dynamic imports, todo
+        if (dep.indexOf("\x10") !== -1) {
           this.log("todo", "Handle wildcard trace " + dep + " in " + resolved);
           return;
         }

src/trace/ts.ts

@@ -123,6 +123,7 @@ export async function createTsAnalysis(
   };
 }
 
+// We use the special character \x10 as a "wildcard symbol"
 function buildDynamicString(
   node,
   fileName,
@@ -149,7 +150,7 @@ function buildDynamicString(
           lastIsWildcard
         );
         if (nextStr.length) {
-          lastIsWildcard = nextStr.endsWith("*");
+          lastIsWildcard = nextStr.endsWith("\x10");
           str += nextStr;
         }
       }
@@ -163,7 +164,7 @@ function buildDynamicString(
       isEsm,
       lastIsWildcard
     );
-    if (leftResolved.length) lastIsWildcard = leftResolved.endsWith("*");
+    if (leftResolved.length) lastIsWildcard = leftResolved.endsWith("\x10");
     const rightResolved = buildDynamicString(
       node.right,
       fileName,
@@ -186,5 +187,5 @@ function buildDynamicString(
       return './' + fileName;
     }
   }*/
-  return lastIsWildcard ? "" : "*";
+  return lastIsWildcard ? "" : "\x10";
 }

test/html/esmsh.test.js

@@ -23,5 +23,5 @@ html = `
 pins = await generator.addMappings(html);
 
 assert(
-  (await generator.htmlInject(html, { pins })).includes("https://esm.sh/v")
+  (await generator.htmlInject(html, { pins })).includes("https://esm.sh/*")
 );

test/providers/esmsh.test.js

@@ -7,15 +7,21 @@ const generator = new Generator({
   env: ["production", "browser"],
 });
 
-await generator.install("lit@2.0.0-rc.1");
+await generator.install("react@18");
 const json = generator.getMap();
 
-assert.strictEqual(json.imports.lit, "https://esm.sh/*lit@2.0.0-rc.1");
+assert.strictEqual(json.imports.react, "https://esm.sh/*react@18.3.1/index.js");
 
-const scope = json.scopes["https://esm.sh/"];
-assert.ok(scope["@lit/reactive-element"]);
-assert.ok(scope["lit-element/lit-element.js"]);
-assert.ok(scope["lit-html"]);
+// TODO: Reenable lit test when fixed upstream
+// await generator.install("lit@2.0.0-rc.1");
+// const json = generator.getMap();
+
+// assert.strictEqual(json.imports.lit, "https://esm.sh/*lit@2.0.0-rc.1/index.js");
+
+// const scope = json.scopes["https://esm.sh/"];
+// assert.ok(scope["@lit/reactive-element"]);
+// assert.ok(scope["lit-element/lit-element.js"]);
+// assert.ok(scope["lit-html"]);
 
 await generator.install("twind");