review changes

Author: owlstronaut

workspaces/arborist/lib/calc-dep-flags.js

@@ -54,6 +54,8 @@ const calcDepFlagsStep = (node) => {
     // If this is a peer edge, mark the target as peer
     if (peer) {
       to.peer = true
+    } else if (to.peer && !hasIncomingPeerEdge(to)) {
+      unsetFlag(to, 'peer')
     }
 
     // devOptional is the *overlap* of the dev and optional tree.
@@ -66,11 +68,6 @@ const calcDepFlagsStep = (node) => {
     // either the dev or opt trees
     const unsetDev = unsetDevOpt || !node.dev && !dev
     const unsetOpt = unsetDevOpt || !node.optional && !optional
-    const unsetPeer = !peer && !hasIncomingPeerEdge(to)
-
-    if (unsetPeer) {
-      unsetFlag(to, 'peer')
-    }
 
     if (unsetDevOpt) {
       unsetFlag(to, 'devOptional')
@@ -124,7 +121,7 @@ const unsetFlag = (node, flag) => {
         const children = []
         const targetNode = node.isLink && node.target ? node.target : node
         for (const edge of targetNode.edgesOut.values()) {
-          if (edge.to && edge.to[flag]) {
+          if (edge.to?.[flag]) {
             // For the peer flag, only follow peer edges to unset the flag
             // Don't propagate peer flag through prod/dev/optional edges
             if (flag === 'peer') {
@@ -133,7 +130,7 @@ const unsetFlag = (node, flag) => {
               }
             } else {
               // For other flags, follow prod edges (and peer edges for non-peer flags)
-              if (edge.type === 'prod' || (flag !== 'peer' && edge.type === 'peer')) {
+              if (edge.type === 'prod' || edge.type === 'peer') {
                 children.push(edge.to)
               }
             }