Use "name@version" rather than "name-version". Everywhere.

This also affects the folders and files created for modules, man pages, and executables.  I'm pretty sure the tests cover all the relevant issues, but expect a bit of regression.

Author: isaacs

lib/activate.js

@@ -42,11 +42,19 @@ function activate (args, cb) {
             , toMain = path.join(npm.root, d.name+".js")
           shimIfExists(fromMain, toMain, cb)
         }
+      // todo: remove this step.  0.1.28
+      // required because old deps will be linked with - rather than @
       , function (d, cb) {
           var fromLib = path.join(npm.root, d.name + "-" + d.version)
             , toLib = path.join(npm.root, d.name)
           linkIfExists(fromLib, toLib, cb)
         }
+      // if both @ and - exist, then this will overwrite the kludge one.
+      , function (d, cb) {
+          var fromLib = path.join(npm.root, d.name + "@" + d.version)
+            , toLib = path.join(npm.root, d.name)
+          linkIfExists(fromLib, toLib, cb)
+        }
       , linkBins
       , linkMans
       , function (er) {
@@ -90,7 +98,7 @@ function preActivate (arg, cb) {
         readJson(jsonFile, function (er, data) {
           if (er) return cb(er)
           data.version = version
-          data._id = data.name + "-" + data.version
+          data._id = data.name + "@" + data.version
           npm.set(data)
           loadPackageDefaults(data, function (er, data) {
             if (er) return cb(er)
@@ -117,11 +125,13 @@ function linkMans (pkg, cb) {
                            , (bn.indexOf(pkg.name) === 0 ? bn
                              : pkg.name + "-" + bn)
                            )
-      , manSrc = manStem + "-" + pkg.version + "." + sxn + gz
+      , suff = pkg.version + "." + sxn + gz
       , manDest = manStem + "." + sxn + gz
-    log.silly(manSrc, "manSrc")
     log.silly(manDest, "manDest")
-    linkIfExists(manSrc, manDest, cb)
+    linkIfExists(manStem+"-"+suff, manDest, function (er) {
+      if (er) return cb(er)
+      linkIfExists(manStem+"@"+suff, manDest, cb)
+    })
   }, cb)
 }
 function linkBins (pkg, cb) {
@@ -131,7 +141,10 @@ function linkBins (pkg, cb) {
   if (!pkg.bin || !binroot) return cb()
   asyncMap(Object.keys(pkg.bin), function (i, cb) {
     var to = path.join(binroot, i)
-      , from = to+"-"+pkg.version
-    linkIfExists(from, to, cb)
+      , v = pkg.version
+    linkIfExists(to+"-"+v, to, function (er) {
+      if (er) return cb(er)
+      linkIfExists(to+"@"+v, to, cb)
+    })
   }, cb)
 }

lib/build.js

@@ -57,7 +57,7 @@ function build (args, cb) {
 function buildStep (pkg, cb) {
   pkg = pkg && pkg._data || pkg
   if (!pkg) return cb(new Error("Invalid package data "+sys.inspect(pkg)))
-  linkModules(pkg, path.join(npm.root, pkg.name+"-"+pkg.version), cb)
+  linkModules(pkg, path.join(npm.root, pkg.name+"@"+pkg.version), cb)
   linkBins(pkg, cb)
   linkMans(pkg, cb)
 }
@@ -166,7 +166,7 @@ function linkDependencies (args, cb) {
 function dependentLink (pkg, cb) {
   asyncMap(pkg._resolvedDeps, function (dep, cb) {
     var dependents = path.join(npm.dir, dep.name, dep.version, "dependents")
-      , to = path.join(dependents, pkg.name + "-" + pkg.version)
+      , to = path.join(dependents, pkg.name + "@" + pkg.version)
       , from = path.join(npm.dir, pkg.name, pkg.version)
     link(from, to, cb)
   }, cb)
@@ -180,15 +180,13 @@ function dependencyLink (pkg, cb) {
   asyncMap(pkg._resolvedDeps, function (dep, cb) {
     var depDir = path.join(npm.dir, dep.name, dep.version, "package")
       , dependsOn = path.join( npm.dir, pkg.name, pkg.version
-                             , "dependson", dep.name + "-" + dep.version
+                             , "dependson", dep.name + "@" + dep.version
                              )
       , fromRoot = path.join(npm.dir, dep.name, dep.version)
-      , fromLib = path.join(npm.root, dep.name + "-" + dep.version)
       , toLib = path.join(dependencies, dep.name)
       , linkToLib = (dep.name in pkg.link)
         ? path.join(npm.dir, pkg.name, pkg.version, "package", pkg.link[dep.name])
         : null
-    log.silly(fromLib, "dependency")
     log.silly(dep, "dependency")
     log.silly(toLib, "dependency")
     readJson(path.join(depDir, "package.json"), function (er, dep) {
@@ -232,7 +230,7 @@ function linkMans (pkg, cb) {
                              , "man"+sxn
                              , (bn.indexOf(pkg.name) === 0 ? bn
                                : pkg.name + "-" + bn)
-                               + "-" + pkg.version
+                               + "@" + pkg.version
                                + "." + sxn + gz
                              )
       // ln {cwd}/man {manroot}/man{sxn}/{bn}-{ver}.{sxn}{gz}
@@ -283,7 +281,7 @@ function linkBins (pkg, cb) {
     return i.charAt(0) !== "_"
   }), function (i, cb) {
     log.verbose(i+" "+pkg.bin[i], "linkBin")
-    var to = path.join(binroot, i+"-"+pkg.version)
+    var to = path.join(binroot, i+"@"+pkg.version)
       , from = path.join(npm.dir, pkg.name, pkg.version, "package", pkg.bin[i])
     shimTest(from, to, dep, cb)
   }, log.er(cb, "failed to link bins"))

lib/cache.js

@@ -39,8 +39,8 @@ function read (name, ver, cb) {
     if (!er) cacheSeen[data._id] = data
     return cb(er, data)
   }
-  if (name+"-"+ver in cacheSeen) {
-    return cb(null, cacheSeen[name+"-"+ver])
+  if (name+"@"+ver in cacheSeen) {
+    return cb(null, cacheSeen[name+"@"+ver])
   }
   readJson(jsonFile, function (er, data) {
     if (er) return addNameVersion(name, ver, c)

lib/deactivate.js

@@ -79,7 +79,7 @@ function preDeactivate (pkg, cb) {
     readJson(jsonFile, function (er, data) {
       if (er) return cb(er)
       data.version = version
-      data._id = data.name+"-"+data.version
+      data._id = data.name+"@"+data.version
       npm.set(data)
       loadPackageDefaults(data, function (er, data) {
         if (er) return cb(er)

lib/rebuild.js

@@ -25,7 +25,7 @@ function rebuild (args, cb) {
       readJson(path.join(npm.dir, n, v, "package", "package.json"), function (er, data) {
         if (er) return cb(er)
         data.version = v
-        data._id = data.name + "-" + data.version
+        data._id = data.name + "@" + data.version
         loadPackageDefaults(data, cb)
       })
     }, function (er, args) {

lib/uninstall.js

@@ -64,7 +64,7 @@ function unpackArgs (rawArgs, cb) {
                   loadPackageDefaults(data, function (er, data) {
                     if (er) return cb(er)
                     data.version = arg[1]
-                    data._id = data.name+"-"+data.version
+                    data._id = data.name+"@"+data.version
                     argData.push(data)
                     argData[data._id] = data
                     R(args.pop())
@@ -140,12 +140,20 @@ function secondPart (args, cb) {
         , removeBins
         , rmMans
         , function (a, cb) { log.verbose("remove public modules", "uninstall "+a._id, cb) }
+        // todo: remove this kludge v0.1.28
         , function (arg, cb) {
             rm(path.join(npm.root, arg.name+"-"+arg.version), cb)
           }
+        // todo: remove this kludge v0.1.28
         , function (arg, cb) {
             rm(path.join(npm.root, arg.name+"-"+arg.version+".js"), cb)
           }
+        , function (arg, cb) {
+            rm(path.join(npm.root, arg.name+"@"+arg.version), cb)
+          }
+        , function (arg, cb) {
+            rm(path.join(npm.root, arg.name+"@"+arg.version+".js"), cb)
+          }
         ]
       , [ lifecycle, arg, "postuninstall" ]
       , [ log.verbose, "remove package dir", "uninstall "+arg._id]
@@ -172,21 +180,27 @@ function rmMans (pkg, cb) {
       , sxn = parseMan[2]
       , gz = parseMan[3] || ""
       , bn = path.basename(stem)
-    rm(path.join( manroot
-                , "man"+sxn
-                , (bn.indexOf(pkg.name) === 0 ? bn
-                  : pkg.name + "-" + bn)
-                  + "-" + pkg.version
-                  + "." + sxn + gz
-                ), cb)
+      , mp = path.join( manroot
+                      , "man"+sxn
+                      , (bn.indexOf(pkg.name) === 0 ? bn
+                        : pkg.name + "-" + bn)
+                      )
+      , suff = pkg.version + "." + sxn + gz
+    // todo: remove this kludge v0.1.28
+    // just do the "@" only.
+    asyncMap([mp+"-"+suff, mp+"@"+suff], rm, cb)
   }, cb)
 }
 function removeBins (data, cb) {
   if (!data.bin) return cb()
   var binroot = npm.config.get("binroot")
   asyncMap(Object.keys(data.bin), function (bin, cb) {
     if (!bin) return cb()
-    rm(binroot + "/" + bin+"-"+data.version, cb)
+    var p = binroot + "/" + bin
+      , v = data.version
+    // todo: remove this kludge v0.1.28
+    // just do the "@" only.
+    asyncMap([p+"@"+v, p+"-"+v], rm, cb)
   }, cb)
 }
 function removeDependentLinks (data, cb) {
@@ -197,17 +211,14 @@ function removeDependentLinks (data, cb) {
     if (er) return cb() // meh
     fs.readdir(dependsOn, function (er, deps) {
       if (er) return cb(er)
-      ;(function R (er) {
-        if (er) return cb(er)
-        var dep = deps.pop()
-        if (!dep) return cb()
+      asyncMap(deps, function (dep, cb) {
         // <3 symlinks
-        rm(path.join( dependsOn
-                    , dep
-                    , "dependents"
-                    , data.name+"-"+data.version
-                    ), R)
-      })()
+        var p = path.join(dependsOn, dep, "dependents", data.name)
+          , v = data.version
+        // todo: remove this kludge v0.1.28
+        // just do the "@" only.
+        asyncMap([p+"@"+v, p+"-"+v], rm, cb)
+      }, cb)
     })
   })
 }

lib/update-dependents.js

@@ -92,9 +92,9 @@ function updateOtherVersionDeps (other, pkg, cb) {
     if (!deps.length) return cb()
     asyncMap(deps, function (d, cb) {
       // todo: make this a @ instead of a -
-      d = d.split("-")
+      d = d.split("@")
       var name = d.shift()
-        , ver = d.join("-")
+        , ver = d.join("@")
       return updateDepToNew(name, ver, pkg, other, cb)
     }, cb)
   })
@@ -138,21 +138,24 @@ function updateDepToNew (depName, depVer, pkg, other, cb) {
 
 function removeDependencyLinks (dep, pkg, other, cb) {
   var depdir = path.join(npm.dir, dep.name, dep.version)
-    , depsOn = path.join(depdir, "dependson", pkg.name+"-"+other)
+    // todo: remove this kludge.  v0.1.28
+    // only support "@", not "-"
+    , depsOnOld = path.join(depdir, "dependson", pkg.name+"-"+other)
+    , depsOn = path.join(depdir, "dependson", pkg.name+"@"+other)
     , deps = path.join(depdir, "dependencies", pkg.name)
     , dependentLink = path.join( npm.dir
                                , pkg.name
                                , other
                                , "dependents"
                                , dep.name + "-" + dep.version
                                )
-  asyncMap([deps+"js", deps, depsOn, dependentLink], rm, cb)
+  asyncMap([deps+"js", deps, depsOnOld, depsOn, dependentLink], rm, cb)
 }
 function createDependencyLinks (dep, pkg, cb) {
   var depdir = path.join(npm.dir, dep.name, dep.version)
     , depsOn = path.join( depdir
                         , "dependson"
-                        , pkg.name+"-"+pkg.version
+                        , pkg.name+"@"+pkg.version
                         )
     , deps = path.join(depdir, "dependencies", pkg.name)
     , targetRoot = path.join(npm.dir, pkg.name, pkg.version)
@@ -162,7 +165,7 @@ function createDependencyLinks (dep, pkg, cb) {
                                , pkg.name
                                , pkg.version
                                , "dependents"
-                               , dep.name + "-" + dep.version
+                               , dep.name + "@" + dep.version
                                )
   asyncMap
     ( [ [ link, targetRoot, depsOn ]

lib/utils/lifecycle.js

@@ -125,7 +125,7 @@ function cmd (stage, req) { return function (args, cb_) {
       if (er) return log.er(cb, "Couldn't find "+name + "@" + ver)(er)
       if (ver && ver !== data.version) {
         data.version = ver
-        data._id = data.name+"-"+ver
+        data._id = data.name+"@"+ver
       }
       if ( !data.scripts
           || !(stage in data.scripts)

lib/utils/read-json.js

@@ -126,7 +126,7 @@ function processObject (opts, cb) { return function (er, json) {
     json[d] = depObjectify(json[d])
   })
 
-  json._id = json.name+"-"+json.version
+  json._id = json.name+"@"+json.version
   json = testEngine(json)
   json = parsePeople(json)
   if (opts.file) {

lib/utils/registry/publish.js

@@ -34,11 +34,11 @@ function publish (data, cb) {
         }
       ]
     }
-  data._id = data.name+"-"+data.version
+  data._id = data.name+"@"+data.version
   var attURI = encodeURIComponent(data.name)
              + "/-/"
              + encodeURIComponent(data.name)
-             + "-"
+             + "@"
              + encodeURIComponent(data.version)
              + ".tgz"
   data.dist = { "tarball" : url.resolve(npm.config.get("registry"), attURI) }