@npmcli/arborist 6.2.9 → 6.3.0

package/lib/arborist/reify.js

@@ -483,17 +483,29 @@ module.exports = cls => class Reifier extends cls {
 
     process.emit('time', 'reify:trashOmits')
 
-    const filter = node =>
-      node.top.isProjectRoot &&
-        (
-          node.peer && this[_omitPeer] ||
-          node.dev && this[_omitDev] ||
-          node.optional && this[_omitOptional] ||
-          node.devOptional && this[_omitOptional] && this[_omitDev]
-        )
-
-    for (const node of this.idealTree.inventory.filter(filter)) {
-      this[_addNodeToTrashList](node)
+    for (const node of this.idealTree.inventory.values()) {
+      const { top } = node
+
+      // if the top is not the root or workspace then we do not want to omit it
+      if (!top.isProjectRoot && !top.isWorkspace) {
+        continue
+      }
+
+      // if a diff filter has been created, then we do not omit the node if the
+      // top node is not in that set
+      if (this.diff?.filterSet?.size && !this.diff.filterSet.has(top)) {
+        continue
+      }
+
+      // 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]
+      ) {
+        this[_addNodeToTrashList](node)
+      }
     }
 
     process.emit('timeEnd', 'reify:trashOmits')
@@ -1411,8 +1423,7 @@ module.exports = cls => class Reifier extends cls {
       for (const tree of updatedTrees) {
         // refresh the edges so they have the correct specs
         tree.package = tree.package
-        const pkgJson = await PackageJson.load(tree.path)
-          .catch(() => new PackageJson(tree.path))
+        const pkgJson = await PackageJson.load(tree.path, { create: true })
         const {
           dependencies = {},
           devDependencies = {},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@npmcli/arborist",
-  "version": "6.2.9",
+  "version": "6.3.0",
   "description": "Manage node_modules trees",
   "dependencies": {
     "@isaacs/string-locale-compare": "^1.1.0",
@@ -10,7 +10,7 @@
     "@npmcli/metavuln-calculator": "^5.0.0",
     "@npmcli/name-from-folder": "^2.0.0",
     "@npmcli/node-gyp": "^3.0.0",
-    "@npmcli/package-json": "^3.0.0",
+    "@npmcli/package-json": "^4.0.0",
     "@npmcli/query": "^3.0.0",
     "@npmcli/run-script": "^6.0.0",
     "bin-links": "^4.0.1",
@@ -41,7 +41,6 @@
     "@npmcli/eslint-config": "^4.0.0",
     "@npmcli/template-oss": "4.14.1",
     "benchmark": "^2.1.4",
-    "chalk": "^4.1.0",
     "minify-registry-metadata": "^3.0.0",
     "nock": "^13.3.0",
     "tap": "^16.3.4",
@@ -75,18 +74,12 @@
   "bin": {
     "arborist": "bin/index.js"
   },
-  "//": "sk test-env locale to catch locale-specific sorting",
   "tap": {
-    "color": true,
     "after": "test/fixtures/cleanup.js",
     "test-env": [
-      "NODE_OPTIONS=--no-warnings",
       "LC_ALL=sk"
     ],
-    "node-arg": [
-      "--no-warnings",
-      "--no-deprecation"
-    ],
+    "color": 1,
     "timeout": "360",
     "nyc-arg": [
       "--exclude",