chore: reusing existing package parser routines

Author: eser

lib/npa.js

@@ -106,7 +106,7 @@ function resolve (name, spec, where, arg) {
   } else if (isAliasSpec(spec)) {
     return fromAlias(res, where)
   } else if (isJsrSpec(spec)) {
-    return fromJsr(res)
+    return fromJsr(res, where)
   }
 
   const hosted = HostedGit.fromUrl(spec, {
@@ -462,58 +462,42 @@ function fromAlias (res, where) {
   return res
 }
 
-function fromJsr (res) {
+function fromJsr (res, where) {
   // Remove 'jsr:' prefix
   const jsrSpec = res.rawSpec.substr(4)
 
   // Parse the JSR specifier to extract name and version
   // JSR format: @scope/name or @scope/name@version
-  const nameEnd = jsrSpec.indexOf('@', 1) // Skip the leading @ in @scope
-  const jsrName = nameEnd > 0 ? jsrSpec.slice(0, nameEnd) : jsrSpec
-  const versionSpec = nameEnd > 0 ? jsrSpec.slice(nameEnd + 1) : ''
+  const versionIndex = jsrSpec.indexOf('@', 1)
+  const packagePart = versionIndex > 0 ? jsrSpec.slice(0, versionIndex) : jsrSpec
 
   // Validate that JSR package is scoped
-  if (!jsrName.startsWith('@') || !jsrName.includes('/')) {
+  if (!packagePart.startsWith('@') || !packagePart.includes('/')) {
     throw new Error(`JSR packages must be scoped (e.g., jsr:@scope/name): ${res.raw}`)
   }
 
-  // Validate the package name
-  const valid = validatePackageName(jsrName)
-  if (!valid.validForOldPackages) {
-    throw invalidPackageName(jsrName, valid, res.raw)
+  const subSpec = npa(jsrSpec, where)
+
+  // Validate that it was parsed as a registry dependency
+  if (!subSpec.registry) {
+    throw new Error('JSR packages must be registry dependencies')
   }
 
   // Transform @scope/name to @jsr/scope__name
   // Extract scope and package name
-  const scopeEnd = jsrName.indexOf('/')
-  const scope = jsrName.slice(1, scopeEnd) // Remove leading @ from scope
-  const packageName = jsrName.slice(scopeEnd + 1)
-  const transformedName = `@jsr/${scope}__${packageName}`
+  const originalScope = subSpec.scope.slice(1) // Remove leading @ from scope
+  const packageName = subSpec.name.slice(subSpec.scope.length + 1)
+  const transformedName = `@jsr/${originalScope}__${packageName}`
 
-  // Set the transformed name
+  // Set the transformed name and copy properties from subSpec
   res.setName(transformedName)
   res.registry = true
+  res.type = subSpec.type
+  res.fetchSpec = subSpec.fetchSpec
+  res.rawSpec = subSpec.rawSpec
 
-  // Preserve the original JSR spec for saving
-  res.saveSpec = `jsr:${jsrName}${versionSpec ? '@' + versionSpec : ''}`
-
-  // Determine the type based on version specifier
-  const spec = versionSpec || '*'
-  res.rawSpec = spec
-  res.fetchSpec = spec
-
-  const version = semver.valid(spec, true)
-  const range = semver.validRange(spec, true)
-  if (version) {
-    res.type = 'version'
-  } else if (range) {
-    res.type = 'range'
-  } else {
-    if (encodeURIComponent(spec) !== spec) {
-      throw invalidTagName(spec, res.raw)
-    }
-    res.type = 'tag'
-  }
+  // Preserve original JSR spec for saving
+  res.saveSpec = res.raw
 
   return res
 }

test/jsr.js

@@ -136,8 +136,8 @@ t.test('JSR validation errors', t => {
   t.test('invalid package name characters', t => {
     t.throws(
       () => npa('jsr:@scope/in valid'),
-      /Invalid package name/,
-      'throws error for invalid package name with spaces'
+      /JSR packages must be registry dependencies/,
+      'throws error when package is parsed as non-registry (e.g., directory)'
     )
     t.end()
   })