install: Add scaffolding for commit half of rollback/commit

PR-URL: npm#8859

lib/install.js

@@ -253,6 +253,7 @@ Installer.prototype.run = function (cb) {
       [this.newTracker(log, 'rollbackFailedOptional', 1)],
       [this, this.rollbackFailedOptional, staging, this.todo],
       [this, this.finishTracker, 'rollbackFailedOptional'],
+      [this, this.commit, staging, this.todo],
       [this.newTracker(log, 'runTopLevelLifecycles', 2)],
       [this, this.runTopLevelLifecycles],
       [this, this.finishTracker, 'runTopLevelLifecycles'])
@@ -452,6 +453,12 @@ Installer.prototype.executeActions = function (cb) {
     [doParallelActions, 'extract', staging, todo, cg.newGroup('extract', 10)],
     [doParallelActions, 'preinstall', staging, todo, trackLifecycle.newGroup('preinstall')],
     [doReverseSerialActions, 'remove', staging, todo, cg.newGroup('remove')],
+    // FIXME: We do this here to commit the removes prior to trying to move
+    // anything into place. Once we can rollback removes we should find
+    // a better solution for this.
+    // This is to protect against cruft in the node_modules folder (like dot files)
+    // that stop it from being removed.
+    [this, this.commit, staging, this.todo],
     [doSerialActions, 'move', staging, todo, cg.newGroup('move')],
     [doSerialActions, 'finalize', staging, todo, cg.newGroup('finalize')],
     [doSerialActions, 'build', staging, todo, trackLifecycle.newGroup('build')],
@@ -488,6 +495,18 @@ Installer.prototype.rollbackFailedOptional = function (staging, actionsToRun, cb
   }, cb)
 }
 
+Installer.prototype.commit = function (staging, actionsToRun, cb) {
+  var toCommit = actionsToRun.map(function (action) { return action[1] }).filter(function (pkg) { return !pkg.failed && pkg.commit })
+  asyncMap(toCommit, function (pkg, next) {
+    asyncMap(pkg.commit, function (commit, done) {
+      commit(staging, pkg, done)
+    }, function () {
+      pkg.commit = []
+      next.apply(null, arguments)
+    })
+  }, cb)
+}
+
 Installer.prototype.runTopLevelLifecycles = function (cb) {
   validate('F', arguments)
   if (this.failing) return cb()

lib/install/actions.js

@@ -39,6 +39,10 @@ Object.keys(actions).forEach(function (actionName) {
       if (!pkg.rollback) pkg.rollback = []
       pkg.rollback.unshift(action.rollback)
     }
+    if (action.commit) {
+      if (!pkg.commit) pkg.commit = []
+      pkg.commit.push(action.commit)
+    }
     return action(top, buildpath, pkg, log, andFinishTracker(log, andAddParentToErrors(pkg.parent, andHandleOptionalDepErrors(pkg, next))))
   }
 })