Add back some install passes and fix isTopLevel (#559)

Author: jdalton

src/commands/fix/npm-fix.mts

@@ -70,7 +70,9 @@ async function install(
   } as InstallOptions
   const newArb = new Arborist({ path: cwd })
   newArb.idealTree = await arb.buildIdealTree()
-  return await newArb.reify()
+  const actualTree = await newArb.reify()
+  arb.actualTree = actualTree
+  return actualTree
 }
 
 export async function npmFix(
@@ -253,6 +255,8 @@ export async function npmFix(
             if (isCi) {
               // eslint-disable-next-line no-await-in-loop
               await gitResetAndClean(baseBranch, cwd)
+              // eslint-disable-next-line no-await-in-loop
+              actualTree = await install(arb, { cwd })
             }
             continue
           }
@@ -361,6 +365,8 @@ export async function npmFix(
           if (isCi) {
             // eslint-disable-next-line no-await-in-loop
             await gitResetAndClean(baseBranch, cwd)
+            // eslint-disable-next-line no-await-in-loop
+            actualTree = await install(arb, { cwd })
           }
           if (errored) {
             if (!isCi) {
@@ -370,6 +376,8 @@ export async function npmFix(
                 removeNodeModules(cwd),
                 editablePkgJson.save({ ignoreWhitespace: true })
               ])
+              // eslint-disable-next-line no-await-in-loop
+              actualTree = await install(arb, { cwd })
             }
             spinner?.failAndStop(
               `Update failed for ${oldId} in ${workspaceName}`,

src/commands/fix/pnpm-fix.mts

@@ -163,6 +163,7 @@ export async function pnpmFix(
     logger.error('Required pnpm-lock.yaml not found.')
     return
   }
+
   const alertsMap = purls.length
     ? await getAlertsMapFromPurls(purls, getAlertMapOptions({ limit }))
     : await getAlertsMapFromPnpmLockfile(
@@ -353,6 +354,8 @@ export async function pnpmFix(
             if (isCi) {
               // eslint-disable-next-line no-await-in-loop
               await gitResetAndClean(baseBranch, cwd)
+              // eslint-disable-next-line no-await-in-loop
+              actualTree = await install(pkgEnvDetails, { cwd, spinner })
             }
             continue
           }
@@ -461,6 +464,8 @@ export async function pnpmFix(
           if (isCi) {
             // eslint-disable-next-line no-await-in-loop
             await gitResetAndClean(baseBranch, cwd)
+            // eslint-disable-next-line no-await-in-loop
+            actualTree = await install(pkgEnvDetails, { cwd, spinner })
           }
           if (errored) {
             if (!isCi) {
@@ -470,6 +475,8 @@ export async function pnpmFix(
                 removeNodeModules(cwd),
                 editablePkgJson.save({ ignoreWhitespace: true })
               ])
+              // eslint-disable-next-line no-await-in-loop
+              actualTree = await install(pkgEnvDetails, { cwd, spinner })
             }
             spinner?.failAndStop(
               `Update failed for ${oldId} in ${workspaceName}`,

src/shadow/npm/arborist-helpers.mts

@@ -77,7 +77,7 @@ export function findPackageNode(
   let sentinel = 0
   while (queue.length) {
     if (sentinel++ === LOOP_SENTINEL) {
-      throw new Error('Detected infinite loop in findPackageNodes')
+      throw new Error('Detected infinite loop in findPackageNode')
     }
     const nodeOrLink = queue.pop()!
     const node = nodeOrLink.isLink ? nodeOrLink.target : nodeOrLink
@@ -300,7 +300,11 @@ export function getDetailsFromDiff(
 }
 
 export function isTopLevel(tree: SafeNode, node: SafeNode): boolean {
-  return tree.children.get(node.name) === node
+  const childNodeOrLink = tree.children.get(node.name)
+  const childNode = childNodeOrLink?.isLink
+    ? childNodeOrLink.target
+    : childNodeOrLink
+  return childNode === node
 }
 
 export type Packument = Exclude<