fix: provider lookups to use standard npm packument (#381)

Author: guybedford

src/providers/esmsh.ts

@@ -1,8 +1,12 @@
-import { ExactPackage, PackageConfig } from "../install/package.js";
+import { ExactPackage, LatestPackageTarget, PackageConfig } from "../install/package.js";
 import { Resolver } from "../trace/resolver.js";
 // @ts-ignore
 import { fetch } from "#fetch";
 import { JspmError } from "../common/err.js";
+import { fetchVersions } from "./jspm.js";
+// @ts-ignore
+import { SemverRange } from "sver";
+import { importedFrom } from "../common/url.js";
 
 const cdnUrl = "https://esm.sh/";
 
@@ -74,5 +78,22 @@ export async function getPackageConfig(
   return pcfg;
 }
 
-// Use JSPM version resolver for now:
-export { resolveLatestTarget } from "./jspm.js";
+export async function resolveLatestTarget(
+  this: Resolver,
+  target: LatestPackageTarget,
+  layer: string,
+  parentUrl: string
+): Promise<ExactPackage | null> {
+  const { registry, name, range, unstable } = target;
+  const versions = await fetchVersions(name);
+  const semverRange = new SemverRange(String(range) || "*", unstable);
+  const version = semverRange.bestMatch(versions, unstable);
+  if (version) {
+    return { registry, name, version: version.toString() };
+  }
+  throw new JspmError(
+    `Unable to resolve ${registry}:${name}@${range} to a valid version${importedFrom(
+      parentUrl
+    )}`
+  );
+}

src/providers/jsdelivr.ts

@@ -1,4 +1,10 @@
-import { ExactPackage } from "../install/package.js";
+import { JspmError } from "../common/err.js";
+import { importedFrom } from "../common/url.js";
+import { ExactPackage, LatestPackageTarget } from "../install/package.js";
+import { Resolver } from "../trace/resolver.js";
+import { fetchVersions } from "./jspm.js";
+// @ts-ignore
+import { SemverRange } from "sver";
 
 const cdnUrl = "https://cdn.jsdelivr.net/";
 
@@ -16,5 +22,22 @@ export function parseUrlPkg(url: string) {
   return { registry, name, version };
 }
 
-// Use JSPM version resolver for now
-export { resolveLatestTarget } from "./jspm.js";
+export async function resolveLatestTarget(
+  this: Resolver,
+  target: LatestPackageTarget,
+  layer: string,
+  parentUrl: string
+): Promise<ExactPackage | null> {
+  const { registry, name, range, unstable } = target;
+  const versions = await fetchVersions(name);
+  const semverRange = new SemverRange(String(range) || "*", unstable);
+  const version = semverRange.bestMatch(versions, unstable);
+  if (version) {
+    return { registry, name, version: version.toString() };
+  }
+  throw new JspmError(
+    `Unable to resolve ${registry}:${name}@${range} to a valid version${importedFrom(
+      parentUrl
+    )}`
+  );
+}

src/providers/jspm.ts

@@ -305,7 +305,7 @@ async function lookupRange(
         `Unable to resolve ${registry}:${name}@${range} to a valid version${importedFrom(
           parentUrl
         )}`
-      ); 
+      );
     }
   })();
   lookupCache.set(url, lookupPromise);
@@ -314,7 +314,7 @@ async function lookupRange(
 
 const versionsCacheMap = new Map<string, string[]>();
 
-async function fetchVersions(name: string): Promise<string[]> {
+export async function fetchVersions(name: string): Promise<string[]> {
   if (versionsCacheMap.has(name)) {
     return versionsCacheMap.get(name);
   }

src/providers/skypack.ts

@@ -1,4 +1,10 @@
-import { ExactPackage } from "../install/package.js";
+import { JspmError } from "../common/err.js";
+import { importedFrom } from "../common/url.js";
+import { ExactPackage, LatestPackageTarget } from "../install/package.js";
+import { Resolver } from "../trace/resolver.js";
+import { fetchVersions } from "./jspm.js";
+// @ts-ignore
+import { SemverRange } from "sver";
 
 const cdnUrl = "https://cdn.skypack.dev/";
 
@@ -15,5 +21,22 @@ export function parseUrlPkg(url: string) {
   return { registry: "npm", name, version };
 }
 
-// Use JSPM version resolver for now:
-export { resolveLatestTarget } from "./jspm.js";
+export async function resolveLatestTarget(
+  this: Resolver,
+  target: LatestPackageTarget,
+  layer: string,
+  parentUrl: string
+): Promise<ExactPackage | null> {
+  const { registry, name, range, unstable } = target;
+  const versions = await fetchVersions(name);
+  const semverRange = new SemverRange(String(range) || "*", unstable);
+  const version = semverRange.bestMatch(versions, unstable);
+  if (version) {
+    return { registry, name, version: version.toString() };
+  }
+  throw new JspmError(
+    `Unable to resolve ${registry}:${name}@${range} to a valid version${importedFrom(
+      parentUrl
+    )}`
+  );
+}

src/providers/unpkg.ts

@@ -1,4 +1,10 @@
-import { ExactPackage } from "../install/package.js";
+import { JspmError } from "../common/err.js";
+import { importedFrom } from "../common/url.js";
+import { ExactPackage, LatestPackageTarget } from "../install/package.js";
+import { Resolver } from "../trace/resolver.js";
+import { fetchVersions } from "./jspm.js";
+// @ts-ignore
+import { SemverRange } from "sver";
 
 const cdnUrl = "https://unpkg.com/";
 
@@ -16,5 +22,22 @@ export function parseUrlPkg(url: string) {
   }
 }
 
-// Use JSPM version resolver for now
-export { resolveLatestTarget } from "./jspm.js";
+export async function resolveLatestTarget(
+  this: Resolver,
+  target: LatestPackageTarget,
+  layer: string,
+  parentUrl: string
+): Promise<ExactPackage | null> {
+  const { registry, name, range, unstable } = target;
+  const versions = await fetchVersions(name);
+  const semverRange = new SemverRange(String(range) || "*", unstable);
+  const version = semverRange.bestMatch(versions, unstable);
+  if (version) {
+    return { registry, name, version: version.toString() };
+  }
+  throw new JspmError(
+    `Unable to resolve ${registry}:${name}@${range} to a valid version${importedFrom(
+      parentUrl
+    )}`
+  );
+}