Use asyncMap to read the installed versions more asyncly

Author: isaacs

lib/utils/read-installed.js

@@ -7,52 +7,46 @@ var npm = require("../../npm")
   , fs = require("./graceful-fs")
   , path = require("path")
   , mkdir = require("./mkdir-p")
+  , asyncMap = require("./async-map")
+  , semver = require("./semver")
 
 module.exports = readInstalled
 
 function readInstalled (args, cb) {
   var showAll = args.length === 0
+    , data = {}
   fs.readdir(npm.dir, function (er, packages) {
     if (er) return cb(er)
     packages = packages.filter(function (dir) {
       return (showAll || args.indexOf(dir) !== -1) && dir.charAt(0) !== "."
     })
-    // maybe nothing found
-    if (!packages.length) cb(null, [])
-
-    var p = packages.length
-      , data = {}
-    function listed () { if (--p === 0) cb(null, data) }
-    packages.forEach(function (package) {
-      var packageDir = path.join(npm.dir, package)
-        , activeVersion = null
+    asyncMap(packages, function (package, cb) {
       data[package] = data[package] || {}
+      var packageDir = path.join(npm.dir, package)
+        , active = path.join(packageDir, "active")
+
+      fs.lstat(active, function (er, s) {
+        if (er || !s.isSymbolicLink()) return cb()
+        fs.readlink(active, function (er, p) {
+          if (er) return cb(er)
+          var activeVersion = path.basename(p)
+          data[package][activeVersion] = data[package][activeVersion] || {}
+          data[package][activeVersion].active = true
+          return cb()
+        })
+      })
+
       fs.readdir(packageDir, function (er, versions) {
-        if (er) return listed() // skip over non-dirs or missing things.
-        ;(function V () {
-          var version = versions.pop()
-          if (activeVersion && data[package][activeVersion]) {
-            data[package][activeVersion].active = true
-          }
-          if (!version) return listed()
-          if (version !== "active" && version.charAt(0) !== ".") {
+        if (er) return cb() // skip over non-dirs or missing things.
+        asyncMap(versions, function (version, cb) {
+          if (!version) return cb()
+          if (semver.valid(version)) {
             data[package][version] = data[package][version] || {}
-            return process.nextTick(V)
           }
-          var active = path.join(packageDir, "active")
-          fs.lstat(active, function (er, s) {
-            if (er || !s.isSymbolicLink()) {
-              data[package][version] = data[package][version] || {}
-              return process.nextTick(V)
-            }
-            fs.readlink(active, function (er, p) {
-              if (er) return cb(er)
-              activeVersion = path.basename(active)
-              return process.nextTick(V)
-            })
-          })
-        })()
+        }, cb)
       })
-    })
+
+    // just return the data object we've created.
+    }, function (er) { cb(er, data) })
   })
 }