@npmcli/arborist 2.8.2 → 2.9.0

package/lib/arborist/reify.js

@@ -158,8 +158,9 @@ module.exports = cls => class Reifier extends cls {
 
   async [_validatePath] () {
     // don't create missing dirs on dry runs
-    if (this[_packageLockOnly] || this[_dryRun])
+    if (this[_packageLockOnly] || this[_dryRun]) {
       return
+    }
 
     // we do NOT want to set ownership on this folder, especially
     // recursively, because it can have other side effects to do that
@@ -172,8 +173,9 @@ module.exports = cls => class Reifier extends cls {
 
   async [_reifyPackages] () {
     // we don't submit the audit report or write to disk on dry runs
-    if (this[_dryRun])
+    if (this[_dryRun]) {
       return
+    }
 
     if (this[_packageLockOnly]) {
       // we already have the complete tree, so just audit it now,
@@ -220,8 +222,9 @@ module.exports = cls => class Reifier extends cls {
       for (const action of actions) {
         try {
           await this[action]()
-          if (reifyTerminated)
+          if (reifyTerminated) {
             throw reifyTerminated
+          }
         } catch (er) {
           await this[rollback](er)
           /* istanbul ignore next - rollback throws, should never hit this */
@@ -233,8 +236,9 @@ module.exports = cls => class Reifier extends cls {
     // no rollback for this one, just exit with the error, since the
     // install completed and can't be safely recovered at this point.
     await this[_removeTrash]()
-    if (reifyTerminated)
+    if (reifyTerminated) {
       throw reifyTerminated
+    }
 
     // done modifying the file system, no need to keep listening for sigs
     removeHandler()
@@ -261,18 +265,21 @@ module.exports = cls => class Reifier extends cls {
       filter: (node, kid) => {
         // if it's not the project root, and we have no explicit requests,
         // then we're already into a nested dep, so we keep it
-        if (this.explicitRequests.size === 0 || !node.isProjectRoot)
+        if (this.explicitRequests.size === 0 || !node.isProjectRoot) {
           return true
+        }
 
         // if we added it as an edgeOut, then we want it
-        if (this.idealTree.edgesOut.has(kid))
+        if (this.idealTree.edgesOut.has(kid)) {
           return true
+        }
 
         // if it's an explicit request, then we want it
         const hasExplicit = [...this.explicitRequests]
           .some(edge => edge.name === kid)
-        if (hasExplicit)
+        if (hasExplicit) {
           return true
+        }
 
         // ignore the rest of the global install folder
         return false
@@ -280,8 +287,10 @@ module.exports = cls => class Reifier extends cls {
     } : { ignoreMissing: true }
 
     if (!this[_global]) {
-      return Promise.all([this.loadActual(actualOpt), this.buildIdealTree(bitOpt)])
-        .then(() => process.emit('timeEnd', 'reify:loadTrees'))
+      return Promise.all([
+        this.loadActual(actualOpt),
+        this.buildIdealTree(bitOpt),
+      ]).then(() => process.emit('timeEnd', 'reify:loadTrees'))
     }
 
     // the global install space tends to have a lot of stuff in it.  don't
@@ -295,8 +304,9 @@ module.exports = cls => class Reifier extends cls {
   }
 
   [_diffTrees] () {
-    if (this[_packageLockOnly])
+    if (this[_packageLockOnly]) {
       return
+    }
 
     process.emit('time', 'reify:diffTrees')
     // XXX if we have an existing diff already, there should be a way
@@ -311,20 +321,24 @@ module.exports = cls => class Reifier extends cls {
       // children where there's an explicit request.
       for (const { name } of this.explicitRequests) {
         const ideal = idealTree.children.get(name)
-        if (ideal)
+        if (ideal) {
           filterNodes.push(ideal)
+        }
         const actual = actualTree.children.get(name)
-        if (actual)
+        if (actual) {
           filterNodes.push(actual)
+        }
       }
     } else {
       for (const ws of this[_workspaces]) {
         const ideal = this.idealTree.children.get(ws)
-        if (ideal)
+        if (ideal) {
           filterNodes.push(ideal)
+        }
         const actual = this.actualTree.children.get(ws)
-        if (actual)
+        if (actual) {
           filterNodes.push(actual)
+        }
       }
     }
 
@@ -360,8 +374,9 @@ module.exports = cls => class Reifier extends cls {
         const retired = retirePath(path)
         moves[path] = retired
         this[_trashList].add(retired)
-      } else
+      } else {
         this[_trashList].add(path)
+      }
     }
   }
 
@@ -393,10 +408,11 @@ module.exports = cls => class Reifier extends cls {
         if (er.code === 'ENOENT') {
           return didMkdirp ? null : mkdirp(dirname(to)).then(() =>
             this[_renamePath](from, to, true))
-        } else if (er.code === 'EEXIST')
+        } else if (er.code === 'EEXIST') {
           return rimraf(to).then(() => moveFile(from, to))
-        else
+        } else {
           throw er
+        }
       })
   }
 
@@ -417,8 +433,9 @@ module.exports = cls => class Reifier extends cls {
   // adding to the trash list will skip reifying, and delete them
   // if they are currently in the tree and otherwise untouched.
   [_addOmitsToTrashList] () {
-    if (!this[_omitDev] && !this[_omitOptional] && !this[_omitPeer])
+    if (!this[_omitDev] && !this[_omitOptional] && !this[_omitPeer]) {
       return
+    }
 
     process.emit('time', 'reify:trashOmits')
 
@@ -429,8 +446,9 @@ module.exports = cls => class Reifier extends cls {
           node.optional && this[_omitOptional] ||
           node.devOptional && this[_omitOptional] && this[_omitDev])
 
-    for (const node of this.idealTree.inventory.filter(filter))
+    for (const node of this.idealTree.inventory.filter(filter)) {
       this[_addNodeToTrashList](node)
+    }
 
     process.emit('timeEnd', 'reify:trashOmits')
   }
@@ -452,10 +470,12 @@ module.exports = cls => class Reifier extends cls {
     const dirsChecked = new Set()
     return promiseAllRejectLate(leaves.map(async node => {
       for (const d of walkUp(node.path)) {
-        if (d === node.top.path)
+        if (d === node.top.path) {
           break
-        if (dirsChecked.has(d))
+        }
+        if (dirsChecked.has(d)) {
           continue
+        }
         dirsChecked.add(d)
         const st = await lstat(d).catch(er => null)
         // this can happen if we have a link to a package with a name
@@ -487,8 +507,9 @@ module.exports = cls => class Reifier extends cls {
       .map(path => rimraf(path).catch(er => failures.push([path, er])))
     return promiseAllRejectLate(unlinks)
       .then(() => {
-        if (failures.length)
+        if (failures.length) {
           this.log.warn('cleanup', 'Failed to remove some directories', failures)
+        }
       })
       .then(() => process.emit('timeEnd', 'reify:rollback:createSparse'))
       .then(() => this[_rollbackRetireShallowNodes](er))
@@ -504,8 +525,9 @@ module.exports = cls => class Reifier extends cls {
         d.ideal.hasShrinkwrap && !seen.has(d.ideal) &&
         !this[_trashList].has(d.ideal.path))
 
-    if (!shrinkwraps.length)
+    if (!shrinkwraps.length) {
       return
+    }
 
     process.emit('time', 'reify:loadShrinkwraps')
 
@@ -535,8 +557,9 @@ module.exports = cls => class Reifier extends cls {
   // to the trash list
   // Always return the node.
   [_reifyNode] (node) {
-    if (this[_trashList].has(node.path))
+    if (this[_trashList].has(node.path)) {
       return node
+    }
 
     const timer = `reifyNode:${node.location}`
     process.emit('time', timer)
@@ -569,8 +592,9 @@ module.exports = cls => class Reifier extends cls {
 
   // do not allow node_modules to be a symlink
   async [_validateNodeModules] (nm) {
-    if (this[_force] || this[_nmValidated].has(nm))
+    if (this[_force] || this[_nmValidated].has(nm)) {
       return
+    }
     const st = await lstat(nm).catch(() => null)
     if (!st || st.isDirectory()) {
       this[_nmValidated].add(nm)
@@ -642,8 +666,9 @@ module.exports = cls => class Reifier extends cls {
 
   [_warnDeprecated] (node) {
     const {_id, deprecated} = node.package
-    if (deprecated)
+    if (deprecated) {
       this.log.warn('deprecated', `${_id}: ${deprecated}`)
+    }
   }
 
   // if the node is optional, then the failure of the promise is nonfatal
@@ -677,8 +702,9 @@ module.exports = cls => class Reifier extends cls {
   [_loadBundlesAndUpdateTrees] (
     depth = 0, bundlesByDepth = this[_getBundlesByDepth]()
   ) {
-    if (depth === 0)
+    if (depth === 0) {
       process.emit('time', 'reify:loadBundles')
+    }
 
     const maxBundleDepth = bundlesByDepth.get('maxBundleDepth')
     if (depth > maxBundleDepth) {
@@ -698,8 +724,9 @@ module.exports = cls => class Reifier extends cls {
         node.target !== node.root &&
         !this[_trashList].has(node.path))
 
-    if (!set.length)
+    if (!set.length) {
       return this[_loadBundlesAndUpdateTrees](depth + 1, bundlesByDepth)
+    }
 
     // extract all the nodes with bundles
     return promiseAllRejectLate(set.map(node => {
@@ -725,12 +752,14 @@ module.exports = cls => class Reifier extends cls {
                 // it's actually in the bundle if it gets transplanted
                 notTransplanted.delete(node.name)
                 return true
-              } else
+              } else {
                 return false
+              }
             },
           })
-          for (const name of notTransplanted)
+          for (const name of notTransplanted) {
             this[_bundleMissing].add(node.children.get(name))
+          }
         })))
     // move onto the next level of bundled items
       .then(() => this[_loadBundlesAndUpdateTrees](depth + 1, bundlesByDepth))
@@ -743,18 +772,21 @@ module.exports = cls => class Reifier extends cls {
       tree: this.diff,
       visit: diff => {
         const node = diff.ideal
-        if (!node)
+        if (!node) {
           return
-        if (node.isProjectRoot)
+        }
+        if (node.isProjectRoot) {
           return
+        }
 
         const { bundleDependencies } = node.package
         if (bundleDependencies && bundleDependencies.length) {
           maxBundleDepth = Math.max(maxBundleDepth, node.depth)
-          if (!bundlesByDepth.has(node.depth))
+          if (!bundlesByDepth.has(node.depth)) {
             bundlesByDepth.set(node.depth, [node])
-          else
+          } else {
             bundlesByDepth.get(node.depth).push(node)
+          }
         }
       },
       getChildren: diff => diff.children,
@@ -791,13 +823,15 @@ module.exports = cls => class Reifier extends cls {
     // create the list of nodes shadowed by children of bundlers
     for (const bundles of bundlesByDepth.values()) {
       // skip the 'maxBundleDepth' item
-      if (!Array.isArray(bundles))
+      if (!Array.isArray(bundles)) {
         continue
+      }
       for (const node of bundles) {
         for (const name of node.children.keys()) {
           const shadow = node.parent.resolve(name)
-          if (!shadow)
+          if (!shadow) {
             continue
+          }
           bundleShadowed.add(shadow)
           shadow.extraneous = true
         }
@@ -851,8 +885,9 @@ module.exports = cls => class Reifier extends cls {
   }
 
   [_submitQuickAudit] () {
-    if (this.options.audit === false)
+    if (this.options.audit === false) {
       return this.auditReport = null
+    }
 
     // we submit the quick audit at this point in the process, as soon as
     // we have all the deps resolved, so that it can overlap with the other
@@ -865,8 +900,9 @@ module.exports = cls => class Reifier extends cls {
     const tree = this.idealTree
 
     // if we're operating on a workspace, only audit the workspace deps
-    if (this[_workspaces] && this[_workspaces].length)
+    if (this[_workspaces] && this[_workspaces].length) {
       options.filterSet = this.workspaceDependencySet(tree, this[_workspaces])
+    }
 
     this.auditReport = AuditReport.load(tree, options)
       .then(res => {
@@ -891,8 +927,9 @@ module.exports = cls => class Reifier extends cls {
       tree: this.diff,
       visit: diff => {
         // no unpacking if we don't want to change this thing
-        if (diff.action !== 'CHANGE' && diff.action !== 'ADD')
+        if (diff.action !== 'CHANGE' && diff.action !== 'ADD') {
           return
+        }
 
         const node = diff.ideal
         const bd = this[_bundleUnpacked].has(node)
@@ -902,13 +939,18 @@ module.exports = cls => class Reifier extends cls {
         // check whether we still need to unpack this one.
         // test the inDepBundle last, since that's potentially a tree walk.
         const doUnpack = node && // can't unpack if removed!
-          !node.isRoot && // root node already exists
-          !bd && // already unpacked to read bundle
-          !sw && // already unpacked to read sw
-          (bundleMissing || !node.inDepBundle) // already unpacked by another dep's bundle
-
-        if (doUnpack)
+          // root node already exists
+          !node.isRoot &&
+          // already unpacked to read bundle
+          !bd &&
+          // already unpacked to read sw
+          !sw &&
+          // already unpacked by another dep's bundle
+          (bundleMissing || !node.inDepBundle)
+
+        if (doUnpack) {
           unpacks.push(this[_reifyNode](node))
+        }
       },
       getChildren: diff => diff.children,
     })
@@ -933,8 +975,9 @@ module.exports = cls => class Reifier extends cls {
     this[_retiredUnchanged] = {}
     return promiseAllRejectLate(this.diff.children.map(diff => {
       // skip if nothing was retired
-      if (diff.action !== 'CHANGE' && diff.action !== 'REMOVE')
+      if (diff.action !== 'CHANGE' && diff.action !== 'REMOVE') {
         return
+      }
 
       const { path: realFolder } = diff.actual
       const retireFolder = moves[realFolder]
@@ -955,12 +998,14 @@ module.exports = cls => class Reifier extends cls {
       this[_retiredUnchanged][retireFolder] = []
       return promiseAllRejectLate(diff.unchanged.map(node => {
         // no need to roll back links, since we'll just delete them anyway
-        if (node.isLink)
+        if (node.isLink) {
           return mkdirp(dirname(node.path)).then(() => this[_reifyNode](node))
+        }
 
         // will have been moved/unpacked along with bundler
-        if (node.inDepBundle && !this[_bundleMissing].has(node))
+        if (node.inDepBundle && !this[_bundleMissing].has(node)) {
           return
+        }
 
         this[_retiredUnchanged][retireFolder].push(node)
 
@@ -1014,8 +1059,9 @@ module.exports = cls => class Reifier extends cls {
     dfwalk({
       tree: this.diff,
       leave: diff => {
-        if (!diff.ideal.isProjectRoot)
+        if (!diff.ideal.isProjectRoot) {
           nodes.push(diff.ideal)
+        }
       },
       // process adds before changes, ignore removals
       getChildren: diff => diff && diff.children,
@@ -1030,8 +1076,9 @@ module.exports = cls => class Reifier extends cls {
       // skip links that only live within node_modules as they are most
       // likely managed by packages we installed, we only want to rebuild
       // unchanged links we directly manage
-      if (node.isLink && node.target.fsTop === tree)
+      if (node.isLink && node.target.fsTop === tree) {
         nodes.push(node)
+      }
     }
 
     return this.rebuild({ nodes, handleOptionalFailure: true })
@@ -1048,12 +1095,14 @@ module.exports = cls => class Reifier extends cls {
     const failures = []
     const rm = path => rimraf(path).catch(er => failures.push([path, er]))
 
-    for (const path of this[_trashList])
+    for (const path of this[_trashList]) {
       promises.push(rm(path))
+    }
 
     return promiseAllRejectLate(promises).then(() => {
-      if (failures.length)
+      if (failures.length) {
         this.log.warn('cleanup', 'Failed to remove some directories', failures)
+      }
     })
       .then(() => process.emit('timeEnd', 'reify:trash'))
   }
@@ -1067,8 +1116,9 @@ module.exports = cls => class Reifier extends cls {
     // save it first, then prune out the optional trash, and then return it.
 
     // support save=false option
-    if (options.save === false || this[_global] || this[_dryRun])
+    if (options.save === false || this[_global] || this[_dryRun]) {
       return false
+    }
 
     process.emit('time', 'reify:save')
 
@@ -1089,6 +1139,14 @@ module.exports = cls => class Reifier extends cls {
         const spec = subSpec ? subSpec.rawSpec : rawSpec
         const child = edge.to
 
+        // if we tried to install an optional dep, but it was a version
+        // that we couldn't resolve, this MAY be missing.  if we haven't
+        // blown up by now, it's because it was not a problem, though, so
+        // just move on.
+        if (!child) {
+          continue
+        }
+
         let newSpec
         if (req.registry) {
           const version = child.version
@@ -1105,8 +1163,9 @@ module.exports = cls => class Reifier extends cls {
             !isRange ||
             spec === '*' ||
             subset(prefixRange, spec, { loose: true })
-          )
+          ) {
             range = prefixRange
+          }
 
           const pname = child.packageName
           const alias = name !== pname
@@ -1115,10 +1174,11 @@ module.exports = cls => class Reifier extends cls {
           // save the git+https url if it has auth, otherwise shortcut
           const h = req.hosted
           const opt = { noCommittish: false }
-          if (h.https && h.auth)
+          if (h.https && h.auth) {
             newSpec = `git+${h.https(opt)}`
-          else
+          } else {
             newSpec = h.shortcut(opt)
+          }
         } else if (req.type === 'directory' || req.type === 'file') {
           // save the relative path in package.json
           // Normally saveSpec is updated with the proper relative
@@ -1128,34 +1188,41 @@ module.exports = cls => class Reifier extends cls {
           const p = req.fetchSpec.replace(/^file:/, '')
           const rel = relpath(addTree.realpath, p)
           newSpec = `file:${rel}`
-        } else
+        } else {
           newSpec = req.saveSpec
+        }
 
         if (options.saveType) {
           const depType = saveTypeMap.get(options.saveType)
           pkg[depType][name] = newSpec
           // rpj will have moved it here if it was in both
           // if it is empty it will be deleted later
-          if (options.saveType === 'prod' && pkg.optionalDependencies)
+          if (options.saveType === 'prod' && pkg.optionalDependencies) {
             delete pkg.optionalDependencies[name]
+          }
         } else {
-          if (hasSubKey(pkg, 'dependencies', name))
+          if (hasSubKey(pkg, 'dependencies', name)) {
             pkg.dependencies[name] = newSpec
+          }
 
           if (hasSubKey(pkg, 'devDependencies', name)) {
             pkg.devDependencies[name] = newSpec
             // don't update peer or optional if we don't have to
-            if (hasSubKey(pkg, 'peerDependencies', name) && !intersects(newSpec, pkg.peerDependencies[name]))
+            if (hasSubKey(pkg, 'peerDependencies', name) && !intersects(newSpec, pkg.peerDependencies[name])) {
               pkg.peerDependencies[name] = newSpec
+            }
 
-            if (hasSubKey(pkg, 'optionalDependencies', name) && !intersects(newSpec, pkg.optionalDependencies[name]))
+            if (hasSubKey(pkg, 'optionalDependencies', name) && !intersects(newSpec, pkg.optionalDependencies[name])) {
               pkg.optionalDependencies[name] = newSpec
+            }
           } else {
-            if (hasSubKey(pkg, 'peerDependencies', name))
+            if (hasSubKey(pkg, 'peerDependencies', name)) {
               pkg.peerDependencies[name] = newSpec
+            }
 
-            if (hasSubKey(pkg, 'optionalDependencies', name))
+            if (hasSubKey(pkg, 'optionalDependencies', name)) {
               pkg.optionalDependencies[name] = newSpec
+            }
           }
         }
 
@@ -1196,8 +1263,9 @@ module.exports = cls => class Reifier extends cls {
     }
 
     // grab any from explicitRequests that had deps removed
-    for (const { from: tree } of this.explicitRequests)
+    for (const { from: tree } of this.explicitRequests) {
       updatedTrees.add(tree)
+    }
 
     for (const tree of updatedTrees) {
       // refresh the edges so they have the correct specs
@@ -1211,8 +1279,9 @@ module.exports = cls => class Reifier extends cls {
   }
 
   async [_saveLockFile] (saveOpt) {
-    if (!this[_usePackageLock])
+    if (!this[_usePackageLock]) {
       return
+    }
 
     const { meta } = this.idealTree
 
@@ -1224,8 +1293,9 @@ module.exports = cls => class Reifier extends cls {
     for (const path of this[_trashList]) {
       const loc = relpath(this.idealTree.realpath, path)
       const node = this.idealTree.inventory.get(loc)
-      if (node && node.root === this.idealTree)
+      if (node && node.root === this.idealTree) {
         node.parent = null
+      }
     }
 
     // if we filtered to only certain nodes, then anything ELSE needs
@@ -1244,54 +1314,60 @@ module.exports = cls => class Reifier extends cls {
 
         // if it's an ideal node from the filter set, then skip it
         // because we already made whatever changes were necessary
-        if (filterSet.has(ideal))
+        if (filterSet.has(ideal)) {
           continue
+        }
 
         // otherwise, if it's not in the actualTree, then it's not a thing
         // that we actually added.  And if it IS in the actualTree, then
         // it's something that we left untouched, so we need to record
         // that.
         const actual = this.actualTree.inventory.get(loc)
-        if (!actual)
+        if (!actual) {
           ideal.root = null
-        else {
+        } else {
           if ([...actual.linksIn].some(link => filterSet.has(link))) {
             seen.add(actual.location)
             continue
           }
           const { realpath, isLink } = actual
-          if (isLink && ideal.isLink && ideal.realpath === realpath)
+          if (isLink && ideal.isLink && ideal.realpath === realpath) {
             continue
-          else
+          } else {
             reroot.add(actual)
+          }
         }
       }
 
       // now find any actual nodes that may not be present in the ideal
       // tree, but were left behind by virtue of not being in the filter
       for (const [loc, actual] of this.actualTree.inventory.entries()) {
-        if (seen.has(loc))
+        if (seen.has(loc)) {
           continue
+        }
         seen.add(loc)
 
         // we know that this is something that ISN'T in the idealTree,
         // or else we will have addressed it in the previous loop.
         // If it's in the filterSet, that means we intentionally removed
         // it, so nothing to do here.
-        if (filterSet.has(actual))
+        if (filterSet.has(actual)) {
           continue
+        }
 
         reroot.add(actual)
       }
 
       // go through the rerooted actual nodes, and move them over.
-      for (const actual of reroot)
+      for (const actual of reroot) {
         actual.root = this.idealTree
+      }
 
       // prune out any tops that lack a linkIn, they are no longer relevant.
       for (const top of this.idealTree.tops) {
-        if (top.linksIn.size === 0)
+        if (top.linksIn.size === 0) {
           top.root = null
+        }
       }
 
       // need to calculate dep flags, since nodes may have been marked
@@ -1307,7 +1383,8 @@ module.exports = cls => class Reifier extends cls {
     this.actualTree = this.idealTree
     this.idealTree = null
 
-    if (!this[_global])
+    if (!this[_global]) {
       await this.actualTree.meta.save()
+    }
   }
 }