fix: revert ueber-optimization

afbobak · Jun 11, 2015 · e1162f4 · e1162f4
1 parent 7aefc0e
commit e1162f4
Showing 1 changed file with 47 additions and 46 deletions.
diff --git a/lib/registry.js b/lib/registry.js
@@ -276,52 +276,6 @@ exports.getPackage = function (pkgName, version, settings) {
       winston.error("Failed to stat pkgMetaPath=" + pkgMetaPath, e);
     }
 
-    // Sort versions and get latest version number (as opposed to latest published)
-    try {
-      var versions = Object.keys(pkgMeta.versions);
-      versions.sort(semver.compare);
-      var highest = versions[versions.length - 1];
-      if (!pkgMeta["dist-tags"]) {
-        pkgMeta["dist-tags"] = {
-          latest : highest
-        };
-      }
-      delete pkgMeta["_highest-version"];
-      if (highest !== pkgMeta["dist-tags"].latest) {
-        pkgMeta["_highest-version"] = highest;
-      }
-    } catch (e) {
-      // Ignoring, can't sort versions as not semver compatible
-      winston.debug("Unable to sort versions by semver.", e);
-    }
-
-    var v, tag;
-    var inversedDistTags = {};
-    for (tag in pkgMeta["dist-tags"]) {
-      if (pkgMeta["dist-tags"].hasOwnProperty(tag)) {
-        v = pkgMeta["dist-tags"][tag];
-        if (!inversedDistTags[v]) {
-          inversedDistTags[v] = [];
-        }
-        inversedDistTags[v].push(tag);
-      }
-    }
-    pkgMeta["_inversed-dist-tags"] = inversedDistTags;
-
-    if (settings) {
-      for (v in pkgMeta.versions) {
-        if (pkgMeta.versions.hasOwnProperty(v)) {
-          // Rewrite all URLs
-          var p = pkgMeta.versions[v];
-          var attachment  = p.dist.tarball.substr(
-            p.dist.tarball.lastIndexOf("/") + 1);
-          var tarballUrl       = "";
-          tarballUrl           = url.parse(settings.get("baseUrl"));
-          tarballUrl.pathname += pkgName + "/-/" + attachment;
-          p.dist.tarball       = url.format(tarballUrl);
-        }
-      }
-    }
   }
 
   if (typeof pkgMeta._mtime === 'string') {
@@ -333,6 +287,53 @@ exports.getPackage = function (pkgName, version, settings) {
   }
   packageCache[pkgName] = pkgMeta;
 
+  // Sort versions and get latest version number (as opposed to latest published)
+  try {
+    var versions = Object.keys(pkgMeta.versions);
+    versions.sort(semver.compare);
+    var highest = versions[versions.length - 1];
+    if (!pkgMeta["dist-tags"]) {
+      pkgMeta["dist-tags"] = {
+        latest : highest
+      };
+    }
+    delete pkgMeta["_highest-version"];
+    if (highest !== pkgMeta["dist-tags"].latest) {
+      pkgMeta["_highest-version"] = highest;
+    }
+  } catch (e) {
+    // Ignoring, can't sort versions as not semver compatible
+    winston.debug("Unable to sort versions by semver.", e);
+  }
+
+  var v, tag;
+  var inversedDistTags = {};
+  for (tag in pkgMeta["dist-tags"]) {
+    if (pkgMeta["dist-tags"].hasOwnProperty(tag)) {
+      v = pkgMeta["dist-tags"][tag];
+      if (!inversedDistTags[v]) {
+        inversedDistTags[v] = [];
+      }
+      inversedDistTags[v].push(tag);
+    }
+  }
+  pkgMeta["_inversed-dist-tags"] = inversedDistTags;
+
+  if (settings) {
+    for (v in pkgMeta.versions) {
+      if (pkgMeta.versions.hasOwnProperty(v)) {
+        // Rewrite all URLs
+        var p = pkgMeta.versions[v];
+        var attachment  = p.dist.tarball.substr(
+          p.dist.tarball.lastIndexOf("/") + 1);
+        var tarballUrl       = "";
+        tarballUrl           = url.parse(settings.get("baseUrl"));
+        tarballUrl.pathname += pkgName + "/-/" + attachment;
+        p.dist.tarball       = url.format(tarballUrl);
+      }
+    }
+  }
+
   if (version) {
     return pkgMeta.versions ? pkgMeta.versions[version] : null;
   }