@npmcli/arborist 7.5.0 → 7.5.1

package/lib/arborist/build-ideal-tree.js

@@ -463,7 +463,7 @@ module.exports = cls => class IdealTreeBuilder extends cls {
           }
           const dir = resolve(nm, name)
           const st = await lstat(dir)
-            .catch(/* istanbul ignore next */ er => null)
+            .catch(/* istanbul ignore next */ () => null)
           if (st && st.isSymbolicLink()) {
             const target = await readlink(dir)
             const real = resolve(dirname(dir), target).replace(/#/g, '%23')
@@ -1024,7 +1024,7 @@ This is a one-time fix-up, please be patient...
           for (const e of this.#problemEdges(placed)) {
             promises.push(() =>
               this.#fetchManifest(npa.resolve(e.name, e.spec, fromPath(placed, e)))
-                .catch(er => null)
+                .catch(() => null)
             )
           }
         },
@@ -1273,7 +1273,7 @@ This is a one-time fix-up, please be patient...
       })
   }
 
-  #linkFromSpec (name, spec, parent, edge) {
+  #linkFromSpec (name, spec, parent) {
     const realpath = spec.fetchSpec
     const { installLinks, legacyPeerDeps } = this
     return rpj(realpath + '/package.json').catch(() => ({})).then(pkg => {

package/lib/arborist/index.js

@@ -74,20 +74,26 @@ class Arborist extends Base {
       Arborist: this.constructor,
       binLinks: 'binLinks' in options ? !!options.binLinks : true,
       cache: options.cache || `${homedir()}/.npm/_cacache`,
+      dryRun: !!options.dryRun,
+      formatPackageLock: 'formatPackageLock' in options ? !!options.formatPackageLock : true,
       force: !!options.force,
       global: !!options.global,
       ignoreScripts: !!options.ignoreScripts,
       installStrategy: options.global ? 'shallow' : (options.installStrategy ? options.installStrategy : 'hoisted'),
       lockfileVersion: lockfileVersion(options.lockfileVersion),
+      packageLockOnly: !!options.packageLockOnly,
       packumentCache: options.packumentCache || new Map(),
       path: options.path || '.',
       rebuildBundle: 'rebuildBundle' in options ? !!options.rebuildBundle : true,
       replaceRegistryHost: options.replaceRegistryHost,
+      savePrefix: 'savePrefix' in options ? options.savePrefix : '^',
       scriptShell: options.scriptShell,
       workspaces: options.workspaces || [],
       workspacesEnabled: options.workspacesEnabled !== false,
     }
-    // TODO is this even used? If not is that a bug?
+    // TODO we only ever look at this.options.replaceRegistryHost, not
+    // this.replaceRegistryHost.  Defaulting needs to be written back to
+    // this.options to work properly
     this.replaceRegistryHost = this.options.replaceRegistryHost =
       (!this.options.replaceRegistryHost || this.options.replaceRegistryHost === 'npmjs') ?
         'registry.npmjs.org' : this.options.replaceRegistryHost
@@ -96,6 +102,7 @@ class Arborist extends Base {
       throw new Error(`Invalid saveType ${options.saveType}`)
     }
     this.cache = resolve(this.options.cache)
+    this.diff = null
     this.path = resolve(this.options.path)
     timeEnd()
   }
@@ -250,6 +257,24 @@ class Arborist extends Base {
     this.finishTracker('audit')
     return ret
   }
+
+  async dedupe (options = {}) {
+    // allow the user to set options on the ctor as well.
+    // XXX: deprecate separate method options objects.
+    options = { ...this.options, ...options }
+    const tree = await this.loadVirtual().catch(() => this.loadActual())
+    const names = []
+    for (const name of tree.inventory.query('name')) {
+      if (tree.inventory.query('name', name).size > 1) {
+        names.push(name)
+      }
+    }
+    return this.reify({
+      ...options,
+      preferDedupe: true,
+      update: { names },
+    })
+  }
 }
 
 module.exports = Arborist

package/lib/arborist/isolated-reifier.js

@@ -212,7 +212,7 @@ module.exports = cls => class IsolatedReifier extends cls {
     return { edges, nodes }
   }
 
-  async [_createIsolatedTree] (idealTree) {
+  async [_createIsolatedTree] () {
     await this[_makeIdealGraph](this.options)
 
     const proxiedIdealTree = this.idealGraph

package/lib/arborist/load-actual.js

@@ -336,8 +336,8 @@ module.exports = cls => class ActualLoader extends cls {
       await this.#loadFSChildren(node.target)
       return Promise.all(
         [...node.target.children.entries()]
-          .filter(([name, kid]) => !did.has(kid.realpath))
-          .map(([name, kid]) => this.#loadFSTree(kid))
+          .filter(([, kid]) => !did.has(kid.realpath))
+          .map(([, kid]) => this.#loadFSTree(kid))
       )
     }
   }

package/lib/arborist/load-virtual.js

@@ -283,7 +283,7 @@ module.exports = cls => class VirtualLoader extends cls {
     return node
   }
 
-  #loadLink (location, targetLoc, target, meta) {
+  #loadLink (location, targetLoc, target) {
     const path = resolve(this.path, location)
     const link = new Link({
       installLinks: this.installLinks,

package/lib/arborist/reify.js

@@ -38,119 +38,96 @@ const { saveTypeMap, hasSubKey } = require('../add-rm-pkg-deps.js')
 const Shrinkwrap = require('../shrinkwrap.js')
 const { defaultLockfileVersion } = Shrinkwrap
 
-const _retiredPaths = Symbol('retiredPaths')
-const _retiredUnchanged = Symbol('retiredUnchanged')
-const _sparseTreeDirs = Symbol('sparseTreeDirs')
-const _sparseTreeRoots = Symbol('sparseTreeRoots')
-const _savePrefix = Symbol('savePrefix')
+// Part of steps (steps need refactoring before we can do anything about these)
 const _retireShallowNodes = Symbol.for('retireShallowNodes')
-const _getBundlesByDepth = Symbol('getBundlesByDepth')
-const _registryResolved = Symbol('registryResolved')
-const _addNodeToTrashList = Symbol.for('addNodeToTrashList')
+const _loadBundlesAndUpdateTrees = Symbol.for('loadBundlesAndUpdateTrees')
+const _submitQuickAudit = Symbol('submitQuickAudit')
+const _addOmitsToTrashList = Symbol('addOmitsToTrashList')
+const _unpackNewModules = Symbol.for('unpackNewModules')
+const _build = Symbol.for('build')
 
 // shared by rebuild mixin
 const _trashList = Symbol.for('trashList')
 const _handleOptionalFailure = Symbol.for('handleOptionalFailure')
 const _loadTrees = Symbol.for('loadTrees')
+// defined by rebuild mixin
+const _checkBins = Symbol.for('checkBins')
 
 // shared symbols for swapping out when testing
+// TODO tests should not be this deep into internals
 const _diffTrees = Symbol.for('diffTrees')
 const _createSparseTree = Symbol.for('createSparseTree')
 const _loadShrinkwrapsAndUpdateTrees = Symbol.for('loadShrinkwrapsAndUpdateTrees')
-const _shrinkwrapInflated = Symbol('shrinkwrapInflated')
-const _bundleUnpacked = Symbol('bundleUnpacked')
-const _bundleMissing = Symbol('bundleMissing')
 const _reifyNode = Symbol.for('reifyNode')
-const _extractOrLink = Symbol('extractOrLink')
 const _updateAll = Symbol.for('updateAll')
 const _updateNames = Symbol.for('updateNames')
-// defined by rebuild mixin
-const _checkBins = Symbol.for('checkBins')
-const _symlink = Symbol('symlink')
-const _warnDeprecated = Symbol('warnDeprecated')
-const _loadBundlesAndUpdateTrees = Symbol.for('loadBundlesAndUpdateTrees')
-const _submitQuickAudit = Symbol('submitQuickAudit')
-const _unpackNewModules = Symbol.for('unpackNewModules')
 const _moveContents = Symbol.for('moveContents')
 const _moveBackRetiredUnchanged = Symbol.for('moveBackRetiredUnchanged')
-const _build = Symbol.for('build')
 const _removeTrash = Symbol.for('removeTrash')
 const _renamePath = Symbol.for('renamePath')
 const _rollbackRetireShallowNodes = Symbol.for('rollbackRetireShallowNodes')
 const _rollbackCreateSparseTree = Symbol.for('rollbackCreateSparseTree')
 const _rollbackMoveBackRetiredUnchanged = Symbol.for('rollbackMoveBackRetiredUnchanged')
 const _saveIdealTree = Symbol.for('saveIdealTree')
-const _copyIdealToActual = Symbol('copyIdealToActual')
-const _addOmitsToTrashList = Symbol('addOmitsToTrashList')
-const _packageLockOnly = Symbol('packageLockOnly')
-const _dryRun = Symbol('dryRun')
-const _validateNodeModules = Symbol('validateNodeModules')
-const _nmValidated = Symbol('nmValidated')
-const _validatePath = Symbol('validatePath')
 const _reifyPackages = Symbol.for('reifyPackages')
 
-const _omitDev = Symbol('omitDev')
-const _omitOptional = Symbol('omitOptional')
-const _omitPeer = Symbol('omitPeer')
-
-const _pruneBundledMetadeps = Symbol('pruneBundledMetadeps')
-
-// defined by Ideal mixin
+// defined by build-ideal-tree mixin
 const _resolvedAdd = Symbol.for('resolvedAdd')
 const _usePackageLock = Symbol.for('usePackageLock')
-const _formatPackageLock = Symbol.for('formatPackageLock')
+// used by build-ideal-tree mixin
+const _addNodeToTrashList = Symbol.for('addNodeToTrashList')
 
 const _createIsolatedTree = Symbol.for('createIsolatedTree')
 
 module.exports = cls => class Reifier extends cls {
+  #bundleMissing = new Set() // child nodes we'd EXPECT to be included in a bundle, but aren't
+  #bundleUnpacked = new Set() // the nodes we unpack to read their bundles
+  #dryRun
+  #nmValidated = new Set()
+  #omitDev
+  #omitPeer
+  #omitOptional
+  #retiredPaths = {}
+  #retiredUnchanged = {}
+  #savePrefix
+  #shrinkwrapInflated = new Set()
+  #sparseTreeDirs = new Set()
+  #sparseTreeRoots = new Set()
+
   constructor (options) {
     super(options)
 
-    const {
-      savePrefix = '^',
-      packageLockOnly = false,
-      dryRun = false,
-      formatPackageLock = true,
-    } = options
-
-    this[_dryRun] = !!dryRun
-    this[_packageLockOnly] = !!packageLockOnly
-    this[_savePrefix] = savePrefix
-    this[_formatPackageLock] = !!formatPackageLock
-
-    this.diff = null
-    this[_retiredPaths] = {}
-    this[_shrinkwrapInflated] = new Set()
-    this[_retiredUnchanged] = {}
-    this[_sparseTreeDirs] = new Set()
-    this[_sparseTreeRoots] = new Set()
     this[_trashList] = new Set()
-    // the nodes we unpack to read their bundles
-    this[_bundleUnpacked] = new Set()
-    // child nodes we'd EXPECT to be included in a bundle, but aren't
-    this[_bundleMissing] = new Set()
-    this[_nmValidated] = new Set()
   }
 
   // public method
   async reify (options = {}) {
     const linked = (options.installStrategy || this.options.installStrategy) === 'linked'
 
-    if (this[_packageLockOnly] && this.options.global) {
+    if (this.options.packageLockOnly && this.options.global) {
       const er = new Error('cannot generate lockfile for global packages')
       er.code = 'ESHRINKWRAPGLOBAL'
       throw er
     }
 
     const omit = new Set(options.omit || [])
-    this[_omitDev] = omit.has('dev')
-    this[_omitOptional] = omit.has('optional')
-    this[_omitPeer] = omit.has('peer')
+    this.#omitDev = omit.has('dev')
+    this.#omitOptional = omit.has('optional')
+    this.#omitPeer = omit.has('peer')
 
     // start tracker block
     this.addTracker('reify')
     const timeEnd = time.start('reify')
-    await this[_validatePath]()
+    // don't create missing dirs on dry runs
+    if (!this.options.packageLockOnly && !this.options.dryRun) {
+      // we do NOT want to set ownership on this folder, especially
+      // recursively, because it can have other side effects to do that
+      // in a project directory.  We just want to make it if it's missing.
+      await mkdir(resolve(this.path), { recursive: true })
+
+      // do not allow the top-level node_modules to be a symlink
+      await this.#validateNodeModules(resolve(this.path, 'node_modules'))
+    }
     await this[_loadTrees](options)
 
     const oldTree = this.idealTree
@@ -159,7 +136,7 @@ module.exports = cls => class Reifier extends cls {
       // this is currently technical debt which will be resolved in a refactor
       // of Node/Link trees
       log.warn('reify', 'The "linked" install strategy is EXPERIMENTAL and may contain bugs.')
-      this.idealTree = await this[_createIsolatedTree](this.idealTree)
+      this.idealTree = await this[_createIsolatedTree]()
     }
     await this[_diffTrees]()
     await this[_reifyPackages]()
@@ -169,7 +146,124 @@ module.exports = cls => class Reifier extends cls {
       this.idealTree = oldTree
     }
     await this[_saveIdealTree](options)
-    await this[_copyIdealToActual]()
+    // clean up any trash that is still in the tree
+    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) {
+        node.parent = null
+      }
+    }
+
+    // if we filtered to only certain nodes, then anything ELSE needs
+    // to be untouched in the resulting actual tree, even if it differs
+    // in the idealTree.  Copy over anything that was in the actual and
+    // was not changed, delete anything in the ideal and not actual.
+    // Then we move the entire idealTree over to this.actualTree, and
+    // save the hidden lockfile.
+    if (this.diff && this.diff.filterSet.size) {
+      const reroot = new Set()
+
+      const { filterSet } = this.diff
+      const seen = new Set()
+      for (const [loc, ideal] of this.idealTree.inventory.entries()) {
+        seen.add(loc)
+
+        // 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)) {
+          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) {
+          ideal.root = null
+        } 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) {
+            continue
+          } 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)) {
+          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)) {
+          continue
+        }
+
+        reroot.add(actual)
+      }
+
+      // go through the rerooted actual nodes, and move them over.
+      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) {
+          top.root = null
+        }
+      }
+
+      // need to calculate dep flags, since nodes may have been marked
+      // as extraneous or otherwise incorrect during transit.
+      calcDepFlags(this.idealTree)
+    }
+
+    // save the ideal's meta as a hidden lockfile after we actualize it
+    this.idealTree.meta.filename =
+      this.idealTree.realpath + '/node_modules/.package-lock.json'
+    this.idealTree.meta.hiddenLockfile = true
+    this.idealTree.meta.lockfileVersion = defaultLockfileVersion
+
+    this.actualTree = this.idealTree
+    this.idealTree = null
+
+    if (!this.options.global) {
+      await this.actualTree.meta.save()
+      const ignoreScripts = !!this.options.ignoreScripts
+      // if we aren't doing a dry run or ignoring scripts and we actually made changes to the dep
+      // tree, then run the dependencies scripts
+      if (!this.options.dryRun && !ignoreScripts && this.diff && this.diff.children.length) {
+        const { path, package: pkg } = this.actualTree.target
+        const stdio = this.options.foregroundScripts ? 'inherit' : 'pipe'
+        const { scripts = {} } = pkg
+        for (const event of ['predependencies', 'dependencies', 'postdependencies']) {
+          if (Object.prototype.hasOwnProperty.call(scripts, event)) {
+            log.info('run', pkg._id, event, scripts[event])
+            await time.start(`reify:run:${event}`, () => runScript({
+              event,
+              path,
+              pkg,
+              stdio,
+              scriptShell: this.options.scriptShell,
+            }))
+          }
+        }
+      }
+    }
     // This is a very bad pattern and I can't wait to stop doing it
     this.auditReport = await this.auditReport
 
@@ -178,28 +272,13 @@ module.exports = cls => class Reifier extends cls {
     return treeCheck(this.actualTree)
   }
 
-  async [_validatePath] () {
-    // don't create missing dirs on dry runs
-    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
-    // in a project directory.  We just want to make it if it's missing.
-    await mkdir(resolve(this.path), { recursive: true })
-
-    // do not allow the top-level node_modules to be a symlink
-    await this[_validateNodeModules](resolve(this.path, 'node_modules'))
-  }
-
   async [_reifyPackages] () {
     // we don't submit the audit report or write to disk on dry runs
-    if (this[_dryRun]) {
+    if (this.options.dryRun) {
       return
     }
 
-    if (this[_packageLockOnly]) {
+    if (this.options.packageLockOnly) {
       // we already have the complete tree, so just audit it now,
       // and that's all we have to do here.
       return this[_submitQuickAudit]()
@@ -248,6 +327,7 @@ module.exports = cls => class Reifier extends cls {
             throw reifyTerminated
           }
         } catch (er) {
+          // TODO rollbacks shouldn't be relied on to throw err
           await this[rollback](er)
           /* istanbul ignore next - rollback throws, should never hit this */
           throw er
@@ -272,11 +352,11 @@ module.exports = cls => class Reifier extends cls {
     const timeEnd = time.start('reify:loadTrees')
     const bitOpt = {
       ...options,
-      complete: this[_packageLockOnly] || this[_dryRun],
+      complete: this.options.packageLockOnly || this.options.dryRun,
     }
 
     // if we're only writing a package lock, then it doesn't matter what's here
-    if (this[_packageLockOnly]) {
+    if (this.options.packageLockOnly) {
       return this.buildIdealTree(bitOpt).then(timeEnd)
     }
 
@@ -325,7 +405,7 @@ module.exports = cls => class Reifier extends cls {
   }
 
   [_diffTrees] () {
-    if (this[_packageLockOnly]) {
+    if (this.options.packageLockOnly) {
       return
     }
 
@@ -383,7 +463,7 @@ module.exports = cls => class Reifier extends cls {
     // find all the nodes that need to change between the actual
     // and ideal trees.
     this.diff = Diff.calculate({
-      shrinkwrapInflated: this[_shrinkwrapInflated],
+      shrinkwrapInflated: this.#shrinkwrapInflated,
       filterNodes,
       actual: this.actualTree,
       ideal: this.idealTree,
@@ -405,7 +485,7 @@ module.exports = cls => class Reifier extends cls {
   // replace them when rolling back on failure.
   [_addNodeToTrashList] (node, retire = false) {
     const paths = [node.path, ...node.binPaths]
-    const moves = this[_retiredPaths]
+    const moves = this.#retiredPaths
     log.silly('reify', 'mark', retire ? 'retired' : 'deleted', paths)
     for (const path of paths) {
       if (retire) {
@@ -422,7 +502,7 @@ module.exports = cls => class Reifier extends cls {
   // changed or removed, so that we can rollback if necessary.
   [_retireShallowNodes] () {
     const timeEnd = time.start('reify:retireShallow')
-    const moves = this[_retiredPaths] = {}
+    const moves = this.#retiredPaths = {}
     for (const diff of this.diff.children) {
       if (diff.action === 'CHANGE' || diff.action === 'REMOVE') {
         // we'll have to clean these up at the end, so add them to the list
@@ -455,12 +535,12 @@ module.exports = cls => class Reifier extends cls {
 
   [_rollbackRetireShallowNodes] (er) {
     const timeEnd = time.start('reify:rollback:retireShallow')
-    const moves = this[_retiredPaths]
+    const moves = this.#retiredPaths
     const movePromises = Object.entries(moves)
       .map(([from, to]) => this[_renamePath](to, from))
     return promiseAllRejectLate(movePromises)
       // ignore subsequent rollback errors
-      .catch(er => {})
+      .catch(() => {})
       .then(timeEnd)
       .then(() => {
         throw er
@@ -470,7 +550,7 @@ 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
     }
 
@@ -492,10 +572,10 @@ module.exports = cls => class Reifier extends cls {
 
       // omit node if the dep type matches any omit flags that were set
       if (
-        node.peer && this[_omitPeer] ||
-        node.dev && this[_omitDev] ||
-        node.optional && this[_omitOptional] ||
-        node.devOptional && this[_omitOptional] && this[_omitDev]
+        node.peer && this.#omitPeer ||
+        node.dev && this.#omitDev ||
+        node.optional && this.#omitOptional ||
+        node.devOptional && this.#omitOptional && this.#omitDev
       ) {
         this[_addNodeToTrashList](node)
       }
@@ -511,7 +591,7 @@ module.exports = cls => class Reifier extends cls {
     const leaves = this.diff.leaves
       .filter(diff => {
         return (diff.action === 'ADD' || diff.action === 'CHANGE') &&
-          !this[_sparseTreeDirs].has(diff.ideal.path) &&
+          !this.#sparseTreeDirs.has(diff.ideal.path) &&
           !diff.ideal.isLink
       })
       .map(diff => diff.ideal)
@@ -528,25 +608,25 @@ module.exports = cls => class Reifier extends cls {
           continue
         }
         dirsChecked.add(d)
-        const st = await lstat(d).catch(er => null)
+        const st = await lstat(d).catch(() => null)
         // this can happen if we have a link to a package with a name
         // that the filesystem treats as if it is the same thing.
         // would be nice to have conditional istanbul ignores here...
         /* istanbul ignore next - defense in depth */
         if (st && !st.isDirectory()) {
           const retired = retirePath(d)
-          this[_retiredPaths][d] = retired
+          this.#retiredPaths[d] = retired
           this[_trashList].add(retired)
           await this[_renamePath](d, retired)
         }
       }
-      this[_sparseTreeDirs].add(node.path)
+      this.#sparseTreeDirs.add(node.path)
       const made = await mkdir(node.path, { recursive: true })
       // if the directory already exists, made will be undefined. if that's the case
       // we don't want to remove it because we aren't the ones who created it so we
-      // omit it from the _sparseTreeRoots
+      // omit it from the #sparseTreeRoots
       if (made) {
-        this[_sparseTreeRoots].add(made)
+        this.#sparseTreeRoots.add(made)
       }
     })).then(timeEnd)
   }
@@ -554,10 +634,10 @@ module.exports = cls => class Reifier extends cls {
   [_rollbackCreateSparseTree] (er) {
     const timeEnd = time.start('reify:rollback:createSparse')
     // cut the roots of the sparse tree that were created, not the leaves
-    const roots = this[_sparseTreeRoots]
+    const roots = this.#sparseTreeRoots
     // also delete the moves that we retired, so that we can move them back
     const failures = []
-    const targets = [...roots, ...Object.keys(this[_retiredPaths])]
+    const targets = [...roots, ...Object.keys(this.#retiredPaths)]
     const unlinks = targets
       .map(path => rm(path, { recursive: true, force: true }).catch(er => failures.push([path, er])))
     return promiseAllRejectLate(unlinks).then(() => {
@@ -574,7 +654,7 @@ module.exports = cls => class Reifier extends cls {
   // we need to unpack them, read that shrinkwrap file, and then update
   // the tree by calling loadVirtual with the node as the root.
   [_loadShrinkwrapsAndUpdateTrees] () {
-    const seen = this[_shrinkwrapInflated]
+    const seen = this.#shrinkwrapInflated
     const shrinkwraps = this.diff.leaves
       .filter(d => (d.action === 'CHANGE' || d.action === 'ADD' || !d.action) &&
         d.ideal.hasShrinkwrap && !seen.has(d.ideal) &&
@@ -632,8 +712,13 @@ module.exports = cls => class Reifier extends cls {
         checkPlatform(node.package, false, { cpu, os, libc })
       }
       await this[_checkBins](node)
-      await this[_extractOrLink](node)
-      await this[_warnDeprecated](node)
+      await this.#extractOrLink(node)
+      const { _id, deprecated } = node.package
+      // The .catch is in _handleOptionalFailure.  Not ideal, this should be cleaned up.
+      // eslint-disable-next-line promise/always-return
+      if (deprecated) {
+        log.warn('deprecated', `${_id}: ${deprecated}`)
+      }
     })
 
     return this[_handleOptionalFailure](node, p)
@@ -645,22 +730,22 @@ module.exports = cls => class Reifier extends cls {
   }
 
   // do not allow node_modules to be a symlink
-  async [_validateNodeModules] (nm) {
-    if (this.options.force || this[_nmValidated].has(nm)) {
+  async #validateNodeModules (nm) {
+    if (this.options.force || this.#nmValidated.has(nm)) {
       return
     }
     const st = await lstat(nm).catch(() => null)
     if (!st || st.isDirectory()) {
-      this[_nmValidated].add(nm)
+      this.#nmValidated.add(nm)
       return
     }
     log.warn('reify', 'Removing non-directory', nm)
     await rm(nm, { recursive: true, force: true })
   }
 
-  async [_extractOrLink] (node) {
+  async #extractOrLink (node) {
     const nm = resolve(node.parent.path, 'node_modules')
-    await this[_validateNodeModules](nm)
+    await this.#validateNodeModules(nm)
 
     if (!node.isLink) {
       // in normal cases, node.resolved should *always* be set by now.
@@ -672,7 +757,7 @@ module.exports = cls => class Reifier extends cls {
       // entirely, since we can't possibly reify it.
       let res = null
       if (node.resolved) {
-        const registryResolved = this[_registryResolved](node.resolved)
+        const registryResolved = this.#registryResolved(node.resolved)
         if (registryResolved) {
           res = `${node.name}@${registryResolved}`
         }
@@ -694,7 +779,7 @@ module.exports = cls => class Reifier extends cls {
         return
       }
       await debug(async () => {
-        const st = await lstat(node.path).catch(e => null)
+        const st = await lstat(node.path).catch(() => null)
         if (st && !st.isDirectory()) {
           debug.log('unpacking into a non-directory', node)
           throw Object.assign(new Error('ENOTDIR: not a directory'), {
@@ -718,10 +803,8 @@ module.exports = cls => class Reifier extends cls {
 
     // node.isLink
     await rm(node.path, { recursive: true, force: true })
-    await this[_symlink](node)
-  }
 
-  async [_symlink] (node) {
+    // symlink
     const dir = dirname(node.path)
     const target = node.realpath
     const rel = relative(dir, target)
@@ -729,17 +812,10 @@ module.exports = cls => class Reifier extends cls {
     return symlink(rel, node.path, 'junction')
   }
 
-  [_warnDeprecated] (node) {
-    const { _id, deprecated } = node.package
-    if (deprecated) {
-      log.warn('deprecated', `${_id}: ${deprecated}`)
-    }
-  }
-
   // if the node is optional, then the failure of the promise is nonfatal
   // just add it and its optional set to the trash list.
   [_handleOptionalFailure] (node, p) {
-    return (node.optional ? p.catch(er => {
+    return (node.optional ? p.catch(() => {
       const set = optionalSet(node)
       for (node of set) {
         log.verbose('reify', 'failed optional dependency', node.path)
@@ -748,7 +824,7 @@ module.exports = cls => class Reifier extends cls {
     }) : p).then(() => node)
   }
 
-  [_registryResolved] (resolved) {
+  #registryResolved (resolved) {
     // the default registry url is a magic value meaning "the currently
     // configured registry".
     // `resolved` must never be falsey.
@@ -778,18 +854,48 @@ module.exports = cls => class Reifier extends cls {
   // by the contents of the package.  however, in their case, rather than
   // shipping a virtual tree that must be reified, they ship an entire
   // reified actual tree that must be unpacked and not modified.
-  [_loadBundlesAndUpdateTrees] (
-    depth = 0, bundlesByDepth = this[_getBundlesByDepth]()
-  ) {
+  [_loadBundlesAndUpdateTrees] (depth = 0, bundlesByDepth) {
+    let maxBundleDepth
+    if (!bundlesByDepth) {
+      bundlesByDepth = new Map()
+      maxBundleDepth = -1
+      dfwalk({
+        tree: this.diff,
+        visit: diff => {
+          const node = diff.ideal
+          if (!node) {
+            return
+          }
+          if (node.isProjectRoot) {
+            return
+          }
+
+          const { bundleDependencies } = node.package
+          if (bundleDependencies && bundleDependencies.length) {
+            maxBundleDepth = Math.max(maxBundleDepth, node.depth)
+            if (!bundlesByDepth.has(node.depth)) {
+              bundlesByDepth.set(node.depth, [node])
+            } else {
+              bundlesByDepth.get(node.depth).push(node)
+            }
+          }
+        },
+        getChildren: diff => diff.children,
+      })
+
+      bundlesByDepth.set('maxBundleDepth', maxBundleDepth)
+    } else {
+      maxBundleDepth = bundlesByDepth.get('maxBundleDepth')
+    }
+
     if (depth === 0) {
       time.start('reify:loadBundles')
     }
 
-    const maxBundleDepth = bundlesByDepth.get('maxBundleDepth')
     if (depth > maxBundleDepth) {
       // if we did something, then prune the tree and update the diffs
       if (maxBundleDepth !== -1) {
-        this[_pruneBundledMetadeps](bundlesByDepth)
+        this.#pruneBundledMetadeps(bundlesByDepth)
         this[_diffTrees]()
       }
       time.end('reify:loadBundles')
@@ -810,7 +916,7 @@ module.exports = cls => class Reifier extends cls {
     // extract all the nodes with bundles
     return promiseCallLimit(set.map(node => {
       return () => {
-        this[_bundleUnpacked].add(node)
+        this.#bundleUnpacked.add(node)
         return this[_reifyNode](node)
       }
     }), { rejectLate: true })
@@ -839,46 +945,15 @@ module.exports = cls => class Reifier extends cls {
             },
           })
           for (const name of notTransplanted) {
-            this[_bundleMissing].add(node.children.get(name))
+            this.#bundleMissing.add(node.children.get(name))
           }
         })))
     // move onto the next level of bundled items
       .then(() => this[_loadBundlesAndUpdateTrees](depth + 1, bundlesByDepth))
   }
 
-  [_getBundlesByDepth] () {
-    const bundlesByDepth = new Map()
-    let maxBundleDepth = -1
-    dfwalk({
-      tree: this.diff,
-      visit: diff => {
-        const node = diff.ideal
-        if (!node) {
-          return
-        }
-        if (node.isProjectRoot) {
-          return
-        }
-
-        const { bundleDependencies } = node.package
-        if (bundleDependencies && bundleDependencies.length) {
-          maxBundleDepth = Math.max(maxBundleDepth, node.depth)
-          if (!bundlesByDepth.has(node.depth)) {
-            bundlesByDepth.set(node.depth, [node])
-          } else {
-            bundlesByDepth.get(node.depth).push(node)
-          }
-        }
-      },
-      getChildren: diff => diff.children,
-    })
-
-    bundlesByDepth.set('maxBundleDepth', maxBundleDepth)
-    return bundlesByDepth
-  }
-
   // https://github.com/npm/cli/issues/1597#issuecomment-667639545
-  [_pruneBundledMetadeps] (bundlesByDepth) {
+  #pruneBundledMetadeps (bundlesByDepth) {
     const bundleShadowed = new Set()
 
     // Example dep graph:
@@ -1012,9 +1087,9 @@ module.exports = cls => class Reifier extends cls {
         }
 
         const node = diff.ideal
-        const bd = this[_bundleUnpacked].has(node)
-        const sw = this[_shrinkwrapInflated].has(node)
-        const bundleMissing = this[_bundleMissing].has(node)
+        const bd = this.#bundleUnpacked.has(node)
+        const sw = this.#shrinkwrapInflated.has(node)
+        const bundleMissing = this.#bundleMissing.has(node)
 
         // check whether we still need to unpack this one.
         // test the inDepBundle last, since that's potentially a tree walk.
@@ -1050,8 +1125,8 @@ module.exports = cls => class Reifier extends cls {
     // the actualTree and idealTree _don't_ differ, starting from the
     // shallowest nodes that we moved aside in the first place.
     const timeEnd = time.start('reify:unretire')
-    const moves = this[_retiredPaths]
-    this[_retiredUnchanged] = {}
+    const moves = this.#retiredPaths
+    this.#retiredUnchanged = {}
     return promiseAllRejectLate(this.diff.children.map(diff => {
       // skip if nothing was retired
       if (diff.action !== 'CHANGE' && diff.action !== 'REMOVE') {
@@ -1074,7 +1149,7 @@ module.exports = cls => class Reifier extends cls {
         }
       })
 
-      this[_retiredUnchanged][retireFolder] = []
+      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) {
@@ -1083,11 +1158,11 @@ module.exports = cls => class Reifier extends cls {
         }
 
         // 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)
+        this.#retiredUnchanged[retireFolder].push(node)
 
         const rel = relative(realFolder, node.path)
         const fromPath = resolve(retireFolder, rel)
@@ -1114,10 +1189,10 @@ module.exports = cls => class Reifier extends cls {
   }
 
   [_rollbackMoveBackRetiredUnchanged] (er) {
-    const moves = this[_retiredPaths]
+    const moves = this.#retiredPaths
     // flip the mapping around to go back
     const realFolders = new Map(Object.entries(moves).map(([k, v]) => [v, k]))
-    const promises = Object.entries(this[_retiredUnchanged])
+    const promises = Object.entries(this.#retiredUnchanged)
       .map(([retireFolder, nodes]) => promiseAllRejectLate(nodes.map(node => {
         const realFolder = realFolders.get(retireFolder)
         const rel = relative(realFolder, node.path)
@@ -1209,7 +1284,7 @@ module.exports = cls => class Reifier extends cls {
     const saveIdealTree = !(
       (!save && !hasUpdates)
       || this.options.global
-      || this[_dryRun]
+      || this.options.dryRun
     )
 
     if (!saveIdealTree) {
@@ -1245,7 +1320,7 @@ module.exports = cls => class Reifier extends cls {
         const isLocalDep = req.type === 'directory' || req.type === 'file'
         if (req.registry) {
           const version = child.version
-          const prefixRange = version ? this[_savePrefix] + version : '*'
+          const prefixRange = version ? this.options.savePrefix + version : '*'
           // if we installed a range, then we save the range specified
           // if it is not a subset of the ^x.y.z.  eg, installing a range
           // of `1.x <1.2.3` will not be saved as `^1.2.0`, because that
@@ -1280,7 +1355,7 @@ module.exports = cls => class Reifier extends cls {
           // using their relative path
           if (edge.type === 'workspace') {
             const { version } = edge.to.target
-            const prefixRange = version ? this[_savePrefix] + version : '*'
+            const prefixRange = version ? this.options.savePrefix + version : '*'
             newSpec = prefixRange
           } else {
             // save the relative path in package.json
@@ -1449,151 +1524,12 @@ module.exports = cls => class Reifier extends cls {
 
       // TODO this ignores options.save
       await this.idealTree.meta.save({
-        format: (this[_formatPackageLock] && format) ? format
-        : this[_formatPackageLock],
+        format: (this.options.formatPackageLock && format) ? format
+        : this.options.formatPackageLock,
       })
     }
 
     timeEnd()
     return true
   }
-
-  async [_copyIdealToActual] () {
-    // clean up any trash that is still in the tree
-    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) {
-        node.parent = null
-      }
-    }
-
-    // if we filtered to only certain nodes, then anything ELSE needs
-    // to be untouched in the resulting actual tree, even if it differs
-    // in the idealTree.  Copy over anything that was in the actual and
-    // was not changed, delete anything in the ideal and not actual.
-    // Then we move the entire idealTree over to this.actualTree, and
-    // save the hidden lockfile.
-    if (this.diff && this.diff.filterSet.size) {
-      const reroot = new Set()
-
-      const { filterSet } = this.diff
-      const seen = new Set()
-      for (const [loc, ideal] of this.idealTree.inventory.entries()) {
-        seen.add(loc)
-
-        // 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)) {
-          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) {
-          ideal.root = null
-        } 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) {
-            continue
-          } 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)) {
-          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)) {
-          continue
-        }
-
-        reroot.add(actual)
-      }
-
-      // go through the rerooted actual nodes, and move them over.
-      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) {
-          top.root = null
-        }
-      }
-
-      // need to calculate dep flags, since nodes may have been marked
-      // as extraneous or otherwise incorrect during transit.
-      calcDepFlags(this.idealTree)
-    }
-
-    // save the ideal's meta as a hidden lockfile after we actualize it
-    this.idealTree.meta.filename =
-      this.idealTree.realpath + '/node_modules/.package-lock.json'
-    this.idealTree.meta.hiddenLockfile = true
-    this.idealTree.meta.lockfileVersion = defaultLockfileVersion
-
-    this.actualTree = this.idealTree
-    this.idealTree = null
-
-    if (!this.options.global) {
-      await this.actualTree.meta.save()
-      const ignoreScripts = !!this.options.ignoreScripts
-      // if we aren't doing a dry run or ignoring scripts and we actually made changes to the dep
-      // tree, then run the dependencies scripts
-      if (!this[_dryRun] && !ignoreScripts && this.diff && this.diff.children.length) {
-        const { path, package: pkg } = this.actualTree.target
-        const stdio = this.options.foregroundScripts ? 'inherit' : 'pipe'
-        const { scripts = {} } = pkg
-        for (const event of ['predependencies', 'dependencies', 'postdependencies']) {
-          if (Object.prototype.hasOwnProperty.call(scripts, event)) {
-            log.info('run', pkg._id, event, scripts[event])
-            await time.start(`reify:run:${event}`, () => runScript({
-              event,
-              path,
-              pkg,
-              stdio,
-              scriptShell: this.options.scriptShell,
-            }))
-          }
-        }
-      }
-    }
-  }
-
-  async dedupe (options = {}) {
-    // allow the user to set options on the ctor as well.
-    // XXX: deprecate separate method options objects.
-    options = { ...this.options, ...options }
-    const tree = await this.loadVirtual().catch(() => this.loadActual())
-    const names = []
-    for (const name of tree.inventory.query('name')) {
-      if (tree.inventory.query('name', name).size > 1) {
-        names.push(name)
-      }
-    }
-    return this.reify({
-      ...options,
-      preferDedupe: true,
-      update: { names },
-    })
-  }
 }

package/lib/dep-valid.js

@@ -124,7 +124,7 @@ const linkValid = (child, requested, requestor) => {
   return isLink && relative(child.realpath, requested.fetchSpec) === ''
 }
 
-const tarballValid = (child, requested, requestor) => {
+const tarballValid = (child, requested) => {
   if (child.isLink) {
     return false
   }

package/lib/inventory.js

@@ -130,7 +130,7 @@ class Inventory extends Map {
     return super.get(node.location) === node
   }
 
-  set (k, v) {
+  set () {
     throw new Error('direct set() not supported, use inventory.add(node)')
   }
 }

package/lib/query-selector-all.js

@@ -650,27 +650,27 @@ class Results {
 // operators for attribute selectors
 const attributeOperators = {
   // attribute value is equivalent
-  '=' ({ attr, value, insensitive }) {
+  '=' ({ attr, value }) {
     return attr === value
   },
   // attribute value contains word
-  '~=' ({ attr, value, insensitive }) {
+  '~=' ({ attr, value }) {
     return (attr.match(/\w+/g) || []).includes(value)
   },
   // attribute value contains string
-  '*=' ({ attr, value, insensitive }) {
+  '*=' ({ attr, value }) {
     return attr.includes(value)
   },
   // attribute value is equal or starts with
-  '|=' ({ attr, value, insensitive }) {
+  '|=' ({ attr, value }) {
     return attr.startsWith(`${value}-`)
   },
   // attribute value starts with
-  '^=' ({ attr, value, insensitive }) {
+  '^=' ({ attr, value }) {
     return attr.startsWith(value)
   },
   // attribute value ends with
-  '$=' ({ attr, value, insensitive }) {
+  '$=' ({ attr, value }) {
     return attr.endsWith(value)
   },
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@npmcli/arborist",
-  "version": "7.5.0",
+  "version": "7.5.1",
   "description": "Manage node_modules trees",
   "dependencies": {
     "@isaacs/string-locale-compare": "^1.1.0",
@@ -12,8 +12,8 @@
     "@npmcli/node-gyp": "^3.0.0",
     "@npmcli/package-json": "^5.1.0",
     "@npmcli/query": "^3.1.0",
-    "@npmcli/redact": "^1.1.0",
-    "@npmcli/run-script": "^8.0.0",
+    "@npmcli/redact": "^2.0.0",
+    "@npmcli/run-script": "^8.1.0",
     "bin-links": "^4.0.1",
     "cacache": "^18.0.0",
     "common-ancestor-path": "^1.0.1",
@@ -25,7 +25,7 @@
     "npm-install-checks": "^6.2.0",
     "npm-package-arg": "^11.0.2",
     "npm-pick-manifest": "^9.0.0",
-    "npm-registry-fetch": "^16.2.1",
+    "npm-registry-fetch": "^17.0.0",
     "pacote": "^18.0.1",
     "parse-conflict-json": "^3.0.0",
     "proc-log": "^4.2.0",
@@ -62,7 +62,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/npm/cli.git",
+    "url": "git+https://github.com/npm/cli.git",
     "directory": "workspaces/arborist"
   },
   "author": "GitHub Inc.",