@npmcli/arborist 7.5.2 → 7.5.4

package/bin/index.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
-const fs = require('fs')
-const path = require('path')
+const fs = require('node:fs')
+const path = require('node:path')
 const { time } = require('proc-log')
 
 const { bin, arb: options } = require('./lib/options')

package/bin/lib/logging.js

@@ -1,8 +1,8 @@
 const { log } = require('proc-log')
-const fs = require('fs')
-const { dirname } = require('path')
-const os = require('os')
-const { inspect, format } = require('util')
+const fs = require('node:fs')
+const { dirname } = require('node:path')
+const os = require('node:os')
+const { inspect, format } = require('node:util')
 
 const { bin: options } = require('./options.js')
 

package/bin/lib/options.js

@@ -1,5 +1,5 @@
 const nopt = require('nopt')
-const path = require('path')
+const path = require('node:path')
 
 const has = (o, k) => Object.prototype.hasOwnProperty.call(o, k)
 

package/bin/lib/print-tree.js

@@ -1,4 +1,4 @@
-const { inspect } = require('util')
+const { inspect } = require('node:util')
 const log = require('./logging.js')
 
 module.exports = tree => log.info(inspect(tree.toJSON(), { depth: Infinity }))

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

@@ -6,10 +6,10 @@ const pacote = require('pacote')
 const cacache = require('cacache')
 const { callLimit: promiseCallLimit } = require('promise-call-limit')
 const realpath = require('../../lib/realpath.js')
-const { resolve, dirname } = require('path')
+const { resolve, dirname } = require('node:path')
 const treeCheck = require('../tree-check.js')
 const { readdirScoped } = require('@npmcli/fs')
-const { lstat, readlink } = require('fs/promises')
+const { lstat, readlink } = require('node:fs/promises')
 const { depth } = require('treeverse')
 const { log, time } = require('proc-log')
 const { redact } = require('@npmcli/redact')

package/lib/arborist/index.js

@@ -26,8 +26,8 @@
 // the base class, so that the overall voltron class is easier to test and
 // cover, and separation of concerns can be maintained.
 
-const { resolve } = require('path')
-const { homedir } = require('os')
+const { resolve } = require('node:path')
+const { homedir } = require('node:os')
 const { depth } = require('treeverse')
 const mapWorkspaces = require('@npmcli/map-workspaces')
 const { log, time } = require('proc-log')
@@ -47,7 +47,7 @@ const mixins = [
 ]
 
 const _setWorkspaces = Symbol.for('setWorkspaces')
-const Base = mixins.reduce((a, b) => b(a), require('events'))
+const Base = mixins.reduce((a, b) => b(a), require('node:events'))
 
 // if it's 1, 2, or 3, set it explicitly that.
 // if undefined or null, set it null

package/lib/arborist/isolated-reifier.js

@@ -1,11 +1,11 @@
 const _makeIdealGraph = Symbol('makeIdealGraph')
 const _createIsolatedTree = Symbol.for('createIsolatedTree')
 const _createBundledTree = Symbol('createBundledTree')
-const { mkdirSync } = require('fs')
+const { mkdirSync } = require('node:fs')
 const pacote = require('pacote')
-const { join } = require('path')
+const { join } = require('node:path')
 const { depth } = require('treeverse')
-const crypto = require('crypto')
+const crypto = require('node:crypto')
 
 // cache complicated function results
 const memoize = (fn) => {

package/lib/arborist/load-actual.js

@@ -1,6 +1,6 @@
 // mix-in implementing the loadActual method
 
-const { relative, dirname, resolve, join, normalize } = require('path')
+const { relative, dirname, resolve, join, normalize } = require('node:path')
 
 const rpj = require('read-package-json-fast')
 const { readdirScoped } = require('@npmcli/fs')

package/lib/arborist/load-virtual.js

@@ -1,7 +1,7 @@
 // mixin providing the loadVirtual method
 const mapWorkspaces = require('@npmcli/map-workspaces')
 
-const { resolve } = require('path')
+const { resolve } = require('node:path')
 
 const nameFromFolder = require('@npmcli/name-from-folder')
 const consistentResolve = require('../consistent-resolve.js')

package/lib/arborist/rebuild.js

@@ -8,7 +8,7 @@ const rpj = require('read-package-json-fast')
 const binLinks = require('bin-links')
 const runScript = require('@npmcli/run-script')
 const { callLimit: promiseCallLimit } = require('promise-call-limit')
-const { resolve } = require('path')
+const { resolve } = require('node:path')
 const { isNodeGypPackage, defaultGypInstallScript } = require('@npmcli/node-gyp')
 const { log, time } = require('proc-log')
 

package/lib/arborist/reify.js

@@ -11,14 +11,14 @@ const { log, time } = require('proc-log')
 const hgi = require('hosted-git-info')
 const rpj = require('read-package-json-fast')
 
-const { dirname, resolve, relative, join } = require('path')
+const { dirname, resolve, relative, join } = require('node:path')
 const { depth: dfwalk } = require('treeverse')
 const {
   lstat,
   mkdir,
   rm,
   symlink,
-} = require('fs/promises')
+} = require('node:fs/promises')
 const { moveFile } = require('@npmcli/fs')
 const PackageJson = require('@npmcli/package-json')
 const packageContents = require('@npmcli/installed-package-contents')

package/lib/calc-dep-flags.js

@@ -31,6 +31,10 @@ const calcDepFlagsStep = (node) => {
 
   // for links, map their hierarchy appropriately
   if (node.isLink) {
+    // node.target can be null, we check to ensure it's not null before proceeding
+    if (node.target == null) {
+      return node
+    }
     node.target.dev = node.dev
     node.target.optional = node.optional
     node.target.devOptional = node.devOptional
@@ -97,15 +101,18 @@ const unsetFlag = (node, flag) => {
       tree: node,
       visit: node => {
         node.extraneous = node[flag] = false
-        if (node.isLink) {
+        if (node.isLink && node.target) {
           node.target.extraneous = node.target[flag] = false
         }
       },
       getChildren: node => {
         const children = []
-        for (const edge of node.target.edgesOut.values()) {
-          if (edge.to && edge.to[flag] &&
-            (flag !== 'peer' && edge.type === 'peer' || edge.type === 'prod')
+        const targetNode = node.isLink && node.target ? node.target : node
+        for (const edge of targetNode.edgesOut.values()) {
+          if (
+            edge.to &&
+            edge.to[flag] &&
+            ((flag !== 'peer' && edge.type === 'peer') || edge.type === 'prod')
           ) {
             children.push(edge.to)
           }

package/lib/debug.js

@@ -18,14 +18,15 @@ const debug = process.env.ARBORIST_DEBUG !== '0' && (
   /\barborist\b/.test(process.env.NODE_DEBUG || '') ||
   process.env.npm_package_name === '@npmcli/arborist' &&
   ['test', 'snap'].includes(process.env.npm_lifecycle_event) ||
-  process.cwd() === require('path').resolve(__dirname, '..')
+  process.cwd() === require('node:path').resolve(__dirname, '..')
 )
 
 module.exports = debug ? fn => fn() : () => {}
 const red = process.stderr.isTTY ? msg => `\x1B[31m${msg}\x1B[39m` : m => m
 module.exports.log = (...msg) => module.exports(() => {
-  const { format } = require('util')
+  const { format } = require('node:util')
   const prefix = `\n${process.pid} ${red(format(msg.shift()))} `
   msg = (prefix + format(...msg).trim().split('\n').join(prefix)).trim()
+  /* eslint-disable-next-line no-console */
   console.error(msg)
 })

package/lib/dep-valid.js

@@ -6,7 +6,7 @@
 
 const semver = require('semver')
 const npa = require('npm-package-arg')
-const { relative } = require('path')
+const { relative } = require('node:path')
 const fromPath = require('./from-path.js')
 
 const depValid = (child, requested, requestor) => {

package/lib/diff.js

@@ -6,7 +6,7 @@
 // for a given branch of the tree being mutated.
 
 const { depth } = require('treeverse')
-const { existsSync } = require('fs')
+const { existsSync } = require('node:fs')
 
 const ssri = require('ssri')
 

package/lib/edge.js

@@ -1,7 +1,7 @@
 // An edge in the dependency graph
 // Represents a dependency relationship of some kind
 
-const util = require('util')
+const util = require('node:util')
 const npa = require('npm-package-arg')
 const depValid = require('./dep-valid.js')
 

package/lib/from-path.js

@@ -3,7 +3,7 @@
 // installed.  directory (ie, symlink) deps also need to be resolved based on
 // their targets, but that's what realpath is
 
-const { dirname } = require('path')
+const { dirname } = require('node:path')
 const npa = require('npm-package-arg')
 
 const fromPath = (node, edge) => {

package/lib/link.js

@@ -2,7 +2,7 @@ const relpath = require('./relpath.js')
 const Node = require('./node.js')
 const _loadDeps = Symbol.for('Arborist.Node._loadDeps')
 const _target = Symbol.for('_target')
-const { dirname } = require('path')
+const { dirname } = require('node:path')
 // defined by Node class
 const _delistFromMeta = Symbol.for('_delistFromMeta')
 const _refreshLocation = Symbol.for('_refreshLocation')

package/lib/node.js

@@ -41,8 +41,8 @@ const gatherDepSet = require('./gather-dep-set.js')
 const treeCheck = require('./tree-check.js')
 const { walkUp } = require('walk-up-path')
 
-const { resolve, relative, dirname, basename } = require('path')
-const util = require('util')
+const { resolve, relative, dirname, basename } = require('node:path')
+const util = require('node:util')
 const _package = Symbol('_package')
 const _parent = Symbol('_parent')
 const _target = Symbol.for('_target')

package/lib/printable.js

@@ -1,7 +1,7 @@
 // helper function to output a clearer visualization
 // of the current node and its descendents
 const localeCompare = require('@isaacs/string-locale-compare')('en')
-const util = require('util')
+const util = require('node:util')
 const relpath = require('./relpath.js')
 
 class ArboristNode {

package/lib/query-selector-all.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const { resolve } = require('path')
+const { resolve } = require('node:path')
 const { parser, arrayDelimiter } = require('@npmcli/query')
 const localeCompare = require('@isaacs/string-locale-compare')('en')
 const { log } = require('proc-log')

package/lib/realpath.js

@@ -5,8 +5,8 @@
 // built-in fs.realpath, because we only care about symbolic links,
 // so we can handle many fewer edge cases.
 
-const { lstat, readlink } = require('fs/promises')
-const { resolve, basename, dirname } = require('path')
+const { lstat, readlink } = require('node:fs/promises')
+const { resolve, basename, dirname } = require('node:path')
 
 const realpathCached = (path, rpcache, stcache, depth) => {
   // just a safety against extremely deep eloops

package/lib/relpath.js

@@ -1,3 +1,3 @@
-const { relative } = require('path')
+const { relative } = require('node:path')
 const relpath = (from, to) => relative(from, to).replace(/\\/g, '/')
 module.exports = relpath

package/lib/retire-path.js

@@ -1,5 +1,5 @@
-const crypto = require('crypto')
-const { dirname, basename, resolve } = require('path')
+const crypto = require('node:crypto')
+const { dirname, basename, resolve } = require('node:path')
 
 // use sha1 because it's faster, and collisions extremely unlikely anyway
 const pathSafeHash = s =>

package/lib/shrinkwrap.js

@@ -42,14 +42,15 @@ const {
   rm,
   stat,
   writeFile,
-} = require('fs/promises')
+} = require('node:fs/promises')
 
-const { resolve, basename, relative } = require('path')
+const { resolve, basename, relative } = require('node:path')
 const specFromLock = require('./spec-from-lock.js')
 const versionFromTgz = require('./version-from-tgz.js')
 const npa = require('npm-package-arg')
 const pkgJson = require('@npmcli/package-json')
 const parseJSON = require('parse-conflict-json')
+const nameFromFolder = require('@npmcli/name-from-folder')
 
 const stringify = require('json-stringify-nice')
 const swKeyOrder = [
@@ -233,7 +234,8 @@ class Shrinkwrap {
     // root to help prevent churn based on the name of the directory the
     // project is in
     const pname = node.packageName
-    if (pname && (node === node.root || pname !== node.name)) {
+    // when Target package name and Target node share the same name, we include the name, target node should have name as per realpath.
+    if (pname && (node === node.root || pname !== node.name || nameFromFolder(node.realpath) !== pname)) {
       meta.name = pname
     }
 

package/lib/version-from-tgz.js

@@ -1,6 +1,6 @@
 const semver = require('semver')
-const { basename } = require('path')
-const { URL } = require('url')
+const { basename } = require('node:path')
+const { URL } = require('node:url')
 module.exports = (name, tgz) => {
   const base = basename(tgz)
   if (!base.endsWith('.tgz')) {

package/lib/yarn-lock.js

@@ -29,7 +29,7 @@
 
 const localeCompare = require('@isaacs/string-locale-compare')('en')
 const consistentResolve = require('./consistent-resolve.js')
-const { dirname } = require('path')
+const { dirname } = require('node:path')
 const { breadth } = require('treeverse')
 
 // Sort Yarn entries respecting the yarn.lock sort order

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@npmcli/arborist",
-  "version": "7.5.2",
+  "version": "7.5.4",
   "description": "Manage node_modules trees",
   "dependencies": {
     "@isaacs/string-locale-compare": "^1.1.0",