@npmcli/arborist 2.7.1 → 2.8.3

package/lib/printable.js

@@ -7,41 +7,62 @@ const relpath = require('./relpath.js')
 class ArboristNode {
   constructor (tree, path) {
     this.name = tree.name
-    if (tree.packageName && tree.packageName !== this.name)
+    if (tree.packageName && tree.packageName !== this.name) {
       this.packageName = tree.packageName
-    if (tree.version)
+    }
+    if (tree.version) {
       this.version = tree.version
+    }
     this.location = tree.location
     this.path = tree.path
-    if (tree.realpath !== this.path)
+    if (tree.realpath !== this.path) {
       this.realpath = tree.realpath
-    if (tree.resolved !== null)
+    }
+    if (tree.resolved !== null) {
       this.resolved = tree.resolved
-    if (tree.extraneous)
+    }
+    if (tree.extraneous) {
       this.extraneous = true
-    if (tree.dev)
+    }
+    if (tree.dev) {
       this.dev = true
-    if (tree.optional)
+    }
+    if (tree.optional) {
       this.optional = true
-    if (tree.devOptional && !tree.dev && !tree.optional)
+    }
+    if (tree.devOptional && !tree.dev && !tree.optional) {
       this.devOptional = true
-    if (tree.peer)
+    }
+    if (tree.peer) {
       this.peer = true
-    if (tree.inBundle)
+    }
+    if (tree.inBundle) {
       this.bundled = true
-    if (tree.inDepBundle)
+    }
+    if (tree.inDepBundle) {
       this.bundler = tree.getBundler().location
+    }
+    if (tree.isProjectRoot) {
+      this.isProjectRoot = true
+    }
+    if (tree.isWorkspace) {
+      this.isWorkspace = true
+    }
     const bd = tree.package && tree.package.bundleDependencies
-    if (bd && bd.length)
+    if (bd && bd.length) {
       this.bundleDependencies = bd
-    if (tree.inShrinkwrap)
+    }
+    if (tree.inShrinkwrap) {
       this.inShrinkwrap = true
-    else if (tree.hasShrinkwrap)
+    } else if (tree.hasShrinkwrap) {
       this.hasShrinkwrap = true
-    if (tree.error)
+    }
+    if (tree.error) {
       this.error = treeError(tree.error)
-    if (tree.errors && tree.errors.length)
+    }
+    if (tree.errors && tree.errors.length) {
       this.errors = tree.errors.map(treeError)
+    }
 
     // edgesOut sorted by name
     if (tree.edgesOut.size) {
@@ -105,8 +126,12 @@ class Edge {
     this.type = edge.type
     this.name = edge.name
     this.spec = edge.spec || '*'
-    if (edge.error)
+    if (edge.error) {
       this.error = edge.error
+    }
+    if (edge.overridden) {
+      this.overridden = edge.overridden
+    }
   }
 }
 
@@ -122,6 +147,8 @@ class EdgeOut extends Edge {
       this.to ? ' -> ' + this.to : ''
     }${
       this.error ? ' ' + this.error : ''
+    }${
+      this.overridden ? ' overridden' : ''
     } }`
   }
 }
@@ -136,13 +163,16 @@ class EdgeIn extends Edge {
   [util.inspect.custom] () {
     return `{ ${this.from || '""'} ${this.type} ${this.name}@${this.spec}${
       this.error ? ' ' + this.error : ''
+    }${
+      this.overridden ? ' overridden' : ''
     } }`
   }
 }
 
 const printableTree = (tree, path = []) => {
-  if (!tree)
+  if (!tree) {
     return tree
+  }
 
   const Cls = tree.isLink ? ArboristLink
     : tree.sourceReference ? ArboristVirtualNode

package/lib/realpath.js

@@ -14,18 +14,21 @@ const { resolve, basename, dirname } = require('path')
 const realpathCached = (path, rpcache, stcache, depth) => {
   // just a safety against extremely deep eloops
   /* istanbul ignore next */
-  if (depth > 2000)
+  if (depth > 2000) {
     throw eloop(path)
+  }
 
   path = resolve(path)
-  if (rpcache.has(path))
+  if (rpcache.has(path)) {
     return Promise.resolve(rpcache.get(path))
+  }
 
   const dir = dirname(path)
   const base = basename(path)
 
-  if (base && rpcache.has(dir))
+  if (base && rpcache.has(dir)) {
     return realpathChild(dir, base, rpcache, stcache, depth)
+  }
 
   // if it's the root, then we know it's real
   if (!base) {
@@ -40,8 +43,9 @@ const realpathCached = (path, rpcache, stcache, depth) => {
 }
 
 const lstatCached = (path, stcache) => {
-  if (stcache.has(path))
+  if (stcache.has(path)) {
     return Promise.resolve(stcache.get(path))
+  }
 
   const p = lstat(path).then(st => {
     stcache.set(path, st)
@@ -66,8 +70,9 @@ const realpathChild = (dir, base, rpcache, stcache, depth) => {
   const realdir = rpcache.get(dir)
   // that unpossible
   /* istanbul ignore next */
-  if (typeof realdir === 'undefined')
+  if (typeof realdir === 'undefined') {
     throw new Error('in realpathChild without parent being in realpath cache')
+  }
 
   const realish = resolve(realdir, base)
   return lstatCached(realish, stcache).then(st => {
@@ -78,8 +83,9 @@ const realpathChild = (dir, base, rpcache, stcache, depth) => {
 
     return readlink(realish).then(target => {
       const resolved = resolve(realdir, target)
-      if (realish === resolved)
+      if (realish === resolved) {
         throw eloop(realish)
+      }
 
       return realpathCached(resolved, rpcache, stcache, depth + 1)
     }).then(real => {