fix(npa): ensure spec is a valid npa instance

Serialized npa objects will get printed funny otherwise, and lack methods
zkat · Oct 18, 2017 · 1757b2b · 1757b2b
1 parent 79ce949
commit 1757b2b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/extract.js b/extract.js
@@ -13,7 +13,7 @@ const rimraf = BB.promisify(require('rimraf'))
 module.exports = extract
 function extract (spec, dest, opts) {
   opts = optCheck(opts)
-  spec = typeof spec === 'string' ? npa(spec, opts.where) : spec
+  spec = npa(spec, opts.where)
   const startTime = Date.now()
   if (opts.integrity && opts.cache && !opts.preferOnline) {
     opts.log.silly('pacote', `trying ${spec} by hash: ${opts.integrity}`)

diff --git a/manifest.js b/manifest.js
@@ -9,7 +9,7 @@ const npa = require('npm-package-arg')
 module.exports = manifest
 function manifest (spec, opts) {
   opts = optCheck(opts)
-  spec = typeof spec === 'string' ? npa(spec, opts.where) : spec
+  spec = npa(spec, opts.where)
 
   const label = [
     spec.name,

diff --git a/prefetch.js b/prefetch.js
@@ -10,7 +10,7 @@ const npa = require('npm-package-arg')
 module.exports = prefetch
 function prefetch (spec, opts) {
   opts = optCheck(opts)
-  spec = typeof spec === 'string' ? npa(spec, opts.where) : spec
+  spec = npa(spec, opts.where)
   const startTime = Date.now()
   if (!opts.cache) {
     opts.log.info('prefetch', 'skipping prefetch: no cache provided')