fixup! addressed CR

Author: ruyadorno

lib/add-rm-pkg-deps.js

@@ -54,7 +54,8 @@ const addSingle = ({pkg, spec, saveBundle, saveType, path}) => {
 
   pkg[type] = pkg[type] || {}
   if (rawSpec !== '' || pkg[type][name] === undefined) {
-    // if we're in global mode, file specs are based on cwd, not arb path
+    // file specs are based on arb path, directories specs
+    // are normalized during build-ideal-tree instead
     pkg[type][name] = specType === 'file'
       ? `file:${relpath(path, fetchSpec)}`
       : (rawSpec || '*')

lib/arborist/build-ideal-tree.js

@@ -80,8 +80,8 @@ const _globalStyle = Symbol('globalStyle')
 const _globalRootNode = Symbol('globalRootNode')
 const _isVulnerable = Symbol.for('isVulnerable')
 const _usePackageLock = Symbol.for('usePackageLock')
-const _rpcache = Symbol('realpathCache')
-const _stcache = Symbol('statCache')
+const _rpcache = Symbol.for('realpathCache')
+const _stcache = Symbol.for('statCache')
 const _followSymlinkPath = Symbol('followSymlinkPath')
 const _retrieveSpecName = Symbol('retrieveSpecName')
 
@@ -139,8 +139,8 @@ module.exports = cls => class IdealTreeBuilder extends cls {
     // caches for cached realpath calls
     const cwd = process.cwd()
     // assume that the cwd is real enough for our purposes
-    this[_rpcache] = new Map([[ cwd, cwd ]])
-    this[_stcache] = new Map()
+    this[_rpcache] = this[_rpcache] || new Map([[ cwd, cwd ]])
+    this[_stcache] = this[_stcache] || new Map()
   }
 
   get explicitRequests () {
@@ -377,7 +377,7 @@ module.exports = cls => class IdealTreeBuilder extends cls {
   }
 
   async [_followSymlinkPath] (spec, currpath) {
-    if(spec.type === 'directory') {
+    if (spec.type === 'directory') {
       const real = await (
         realpath(spec.fetchSpec, this[_rpcache], this[_stcache])
           // TODO: create synthetic test case to simulate realpath failure

lib/arborist/load-actual.js

@@ -24,8 +24,8 @@ const _findMissingEdges = Symbol('findMissingEdges')
 const _findFSParents = Symbol('findFSParents')
 
 const _actualTreeLoaded = Symbol('actualTreeLoaded')
-const _rpcache = Symbol('realpathCache')
-const _stcache = Symbol('statCache')
+const _rpcache = Symbol.for('realpathCache')
+const _stcache = Symbol.for('statCache')
 const _topNodes = Symbol('linkTargets')
 const _cache = Symbol('nodeLoadingCache')
 const _loadActual = Symbol('loadActual')