wip: global installs, save in proper locations

Relies on npm/arborist#49, land that first.

Author: isaacs

lib/config/flat-options.js

@@ -161,13 +161,16 @@ const flatOptions = npm => npm.flatOptions || Object.freeze({
 
   // used to build up the appropriate {add:{...}} options to Arborist.reify
   save: npm.config.get('save'),
-  saveBundle: npm.config.get('save-bundle'),
-  saveDev: npm.config.get('save-dev'),
-  saveOptional: npm.config.get('save-optional'),
-  savePeer: npm.config.get('save-peer'),
-  saveProd: npm.config.get('save-prod'),
-  saveExact: npm.config.get('save-exact'),
-  savePrefix: npm.config.get('save-prefix'),
+  saveBundle: npm.config.get('save-bundle') && !npm.config.get('save-peer'),
+  saveType: npm.config.get('save-optional') && npm.config.get('save-peer')
+    ? 'peerOptional'
+      : npm.config.get('save-optional') ? 'optional'
+        : npm.config.get('save-dev') ? 'dev'
+          : npm.config.get('save-peer') ? 'peer'
+            : npm.config.get('save-prod') ? 'prod'
+              : null,
+  savePrefix: npm.config.get('save-exact') ? ''
+    : npm.config.get('save-prefix'),
 
   // configs for npm-registry-fetch
   otp: npm.config.get('otp'),

lib/install.js

@@ -123,13 +123,13 @@ function install (where, args, cb) {
     where = null
   }
   // the /path/to/node_modules/..
-  var globalTop = path.resolve(npm.globalDir, '..')
+  const globalTop = path.resolve(npm.globalDir, '..')
   if (!where) {
     where = npm.flatOptions.global
       ? globalTop
       : npm.prefix
   }
-  const {dryRun} = npm.flatOptions.dryRun
+  const {dryRun} = npm.flatOptions
 
   // TODO: Add warnings for other deprecated flags
   if (npm.config.get('dev')) {
@@ -141,33 +141,6 @@ function install (where, args, cb) {
   }
   args = args.filter(a => path.resolve(a) !== npm.prefix)
 
-  const saveWhere = npm.flatOptions.saveProd ? 'dependencies'
-    : npm.flatOptions.saveDev ? 'devDependencies'
-    : npm.flatOptions.saveOptional ? 'optionalDependencies'
-    : npm.flatOptions.savePeer ? 'peerDependencies'
-    : 'dependencies'
-
-  const {saveBundled} = npm.flatOptions
-  const add = !args.length ? null : args.reduce((add, a) => {
-    // npm install foo
-    // npm install @foo/bar
-    // npm install foo@bar
-    // npm install @foo/bar@baz
-    // npm install git+ssh://foogit.com:bar/baz#boo
-    const spec = npa(a, where)
-    add[saveWhere].push(spec)
-
-    // XXX need to fix this npm install http://foo.com/bar.tgz --save-bundled
-    // TODO: arborist should take saveBundled boolean
-    // Point of research: can you bundle any dep other than production?  If not,
-    // we can pass `bundleDependencies: [array, of, specs]` to arborist,
-    // it'll do {dependencies:{name:spec, ...}, bundleDependencies:[name,...]}
-    if (saveBundled && spec.name) {
-      add.bundleDependencies.push(spec.name)
-    }
-    return add
-  }, { [saveWhere]: [], bundleDependencies: [] })
-
   const arb = new Arborist({
     ...this.flatOptions,
     path: where,
@@ -181,7 +154,7 @@ function install (where, args, cb) {
 
   const opt = {
     ...this.flatOptions,
-    add,
+    add: args,
   }
   arb[dryRun ? 'buildIdealTree' : 'reify'](opt).then(tree => {
     output('TREEEEEEEE', tree)