@npmcli/arborist 9.1.9 → 9.2.0

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

@@ -504,27 +504,25 @@ module.exports = cls => class IdealTreeBuilder extends cls {
     this.#depsQueue.push(tree)
   }
 
-  // This returns a promise because we might not have the name yet, and need to
-  // call pacote.manifest to find the name.
+  // This returns a promise because we might not have the name yet, and need to call pacote.manifest to find the name.
   async #add (tree, { add, saveType = null, saveBundle = false }) {
     // If we have a link it will need to be added relative to the target's path
     const path = tree.target.path
 
-    // get the name for each of the specs in the list.
-    // ie, doing `foo@bar` we just return foo but if it's a url or git, we
-    // don't know the name until we fetch it and look in its manifest.
+    // Get the name for each of the specs in the list.
+    // e.g. doing `foo@bar` we just return foo but if it's a url or git, we don't know the name until we fetch it and look in its manifest.
     await Promise.all(add.map(async rawSpec => {
-      // We do NOT provide the path to npa here, because user-additions need to
-      // be resolved relative to the tree being added to.
+      // We do NOT provide the path to npa here, because user-additions need to be resolved relative to the tree being added to.
       let spec = npa(rawSpec)
 
-      // if it's just @'' then we reload whatever's there, or get latest
-      // if it's an explicit tag, we need to install that specific tag version
+      // if it's just @'' then we reload whatever's there, or get latest.
+      // if it's an explicit tag, we need to install that specific tag version.
       const isTag = spec.rawSpec && spec.type === 'tag'
 
       // look up the names of file/directory/git specs
       if (!spec.name || isTag) {
-        const mani = await pacote.manifest(spec, { ...this.options })
+        const _isRoot = tree.isProjectRoot || tree.isWorkspace
+        const mani = await pacote.manifest(spec, { ...this.options, _isRoot })
         if (isTag) {
           // translate tag to a version
           spec = npa(`${mani.name}@${mani.version}`)

package/lib/arborist/load-actual.js

@@ -5,7 +5,7 @@ const { dirname, join, normalize, relative, resolve } = require('node:path')
 const PackageJson = require('@npmcli/package-json')
 const { readdirScoped } = require('@npmcli/fs')
 const { walkUp } = require('walk-up-path')
-const ancestorPath = require('common-ancestor-path')
+const { commonAncestorPath } = require('common-ancestor-path')
 const treeCheck = require('../tree-check.js')
 
 const Shrinkwrap = require('../shrinkwrap.js')
@@ -364,7 +364,7 @@ module.exports = cls => class ActualLoader extends cls {
     const nmContents = new Map()
     const tree = this.#actualTree
     for (const node of tree.inventory.values()) {
-      const ancestor = ancestorPath(node.realpath, this.path)
+      const ancestor = commonAncestorPath(node.realpath, this.path)
 
       const depPromises = []
       for (const [name, edge] of node.edgesOut.entries()) {

package/lib/node.js

@@ -584,9 +584,7 @@ class Node {
   }
 
   get isProjectRoot () {
-    // only treat as project root if it's the actual link that is the root,
-    // or the target of the root link, but NOT if it's another link to the
-    // same root that happens to be somewhere else.
+    // only treat as project root if it's the actual link that is the root, or the target of the root link, but NOT if it's another link to the same root that happens to be somewhere else.
     return this === this.root || this === this.root.target
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@npmcli/arborist",
-  "version": "9.1.9",
+  "version": "9.2.0",
   "description": "Manage node_modules trees",
   "dependencies": {
     "@isaacs/string-locale-compare": "^1.1.0",
@@ -16,7 +16,7 @@
     "@npmcli/run-script": "^10.0.0",
     "bin-links": "^6.0.0",
     "cacache": "^20.0.1",
-    "common-ancestor-path": "^1.0.1",
+    "common-ancestor-path": "^2.0.0",
     "hosted-git-info": "^9.0.0",
     "json-stringify-nice": "^1.1.4",
     "lru-cache": "^11.2.1",