Sort dependencies when --save'ing.

Uses sorted-object package to abstract away code shared by shrinkwrap and install.
npm · Feb 20, 2014 · 6fd6ff7 · 6fd6ff7 · XhmikosR · Mar 17, 2014
1 parent 70fd532
commit 6fd6ff7
Show file tree

Hide file tree

Showing 7 changed files with 97 additions and 13 deletions.
diff --git a/lib/install.js b/lib/install.js
@@ -74,6 +74,7 @@ var npm = require("./npm.js")
   , archy = require("archy")
   , isGitUrl = require("./utils/is-git-url.js")
   , npmInstallChecks = require("npm-install-checks")
+  , sortedObject = require("sorted-object")
 
 function install (args, cb_) {
   var hasArguments = !!args.length
@@ -378,7 +379,7 @@ function save (where, installed, tree, pretty, hasArguments, cb) {
       var bundle = data.bundleDependencies || data.bundledDependencies
       delete data.bundledDependencies
       if (!Array.isArray(bundle)) bundle = []
-      data.bundleDependencies = bundle
+      data.bundleDependencies = bundle.sort()
     }
 
     log.verbose('saving', things)
@@ -391,6 +392,8 @@ function save (where, installed, tree, pretty, hasArguments, cb) {
       }
     })
 
+    data[deps] = sortedObject(data[deps])
+
     data = JSON.stringify(data, null, 2) + "\n"
     fs.writeFile(saveTarget, data, function (er) {
       cb(er, installed, tree, pretty)

diff --git a/lib/shrinkwrap.js b/lib/shrinkwrap.js
@@ -8,6 +8,7 @@ var npm = require("./npm.js")
   , fs = require("fs")
   , path = require("path")
   , readJson = require("read-package-json")
+  , sortedObject = require("sorted-object")
 
 shrinkwrap.usage = "npm shrinkwrap"
 
@@ -58,7 +59,7 @@ function shrinkwrap_ (pkginfo, silent, dev, cb) {
 function save (pkginfo, silent, cb) {
   // copy the keys over in a well defined order
   // because javascript objects serialize arbitrarily
-  pkginfo.dependencies = copyOrder(pkginfo.dependencies)
+  pkginfo.dependencies = sortedObject(pkginfo.dependencies)
   try {
     var swdata = JSON.stringify(pkginfo, null, 2) + "\n"
   } catch (er) {
@@ -75,12 +76,3 @@ function save (pkginfo, silent, cb) {
     cb(null, pkginfo)
   })
 }
-
-function copyOrder(obj) {
-  var result = {}
-  var keys = Object.keys(obj).sort()
-  keys.forEach(function (key) {
-    result[key] = obj[key]
-  })
-  return result
-}
diff --git a/node_modules/sorted-object/LICENSE.txt b/node_modules/sorted-object/LICENSE.txt
diff --git a/node_modules/sorted-object/README.md b/node_modules/sorted-object/README.md
diff --git a/node_modules/sorted-object/lib/sorted-object.js b/node_modules/sorted-object/lib/sorted-object.js
diff --git a/node_modules/sorted-object/package.json b/node_modules/sorted-object/package.json
diff --git a/package.json b/package.json
@@ -81,7 +81,8 @@
     "ansistyles": "~0.1.3",
     "path-is-inside": "~1.0.0",
     "columnify": "0.1.2",
-    "npm-install-checks": "~1.0.0"
+    "npm-install-checks": "~1.0.0",
+    "sorted-object": "~1.0.0"
   },
   "bundleDependencies": [
     "semver",
@@ -133,7 +134,8 @@
     "ansistyles",
     "path-is-inside",
     "columnify",
-    "npm-install-checks"
+    "npm-install-checks",
+    "sorted-object"
   ],
   "devDependencies": {
     "ronn": "~0.3.6",