Move node lookup to inner loops

Author: jdalton

src/commands/fix/npm-fix.ts

@@ -155,30 +155,32 @@ export async function npmFix(
         firstPatchedVersionIdentifier,
         vulnerableVersionRange
       } of infos) {
-        const revertTree = arb.idealTree!
-        arb.idealTree = null
-        // eslint-disable-next-line no-await-in-loop
-        await arb.buildIdealTree()
-        const node = findPackageNode(arb.idealTree!, name, oldVersion)
-        if (!node) {
-          continue
-        }
-        if (
-          !updateNode(
-            node,
-            packument,
-            vulnerableVersionRange,
-            firstPatchedVersionIdentifier
-          )
-        ) {
-          if (!unavailableSpecs.has(oldSpec)) {
-            unavailableSpecs.add(oldSpec)
-            spinner?.fail(`No update available for ${oldSpec}`)
+        for (const pkgJsonPath of pkgJsonPaths) {
+          const revertTree = arb.idealTree!
+          arb.idealTree = null
+          // eslint-disable-next-line no-await-in-loop
+          await arb.buildIdealTree()
+
+          const node = findPackageNode(arb.idealTree!, name, oldVersion)
+          if (!node) {
+            continue
+          }
+
+          if (
+            !updateNode(
+              node,
+              packument,
+              vulnerableVersionRange,
+              firstPatchedVersionIdentifier
+            )
+          ) {
+            if (!unavailableSpecs.has(oldSpec)) {
+              unavailableSpecs.add(oldSpec)
+              spinner?.fail(`No update available for ${oldSpec}`)
+            }
+            continue
           }
-          continue
-        }
 
-        for (const pkgJsonPath of pkgJsonPaths) {
           const isWorkspaceRoot =
             pkgJsonPath === pkgEnvDetails.editablePkgJson.filename
           const workspaceName = isWorkspaceRoot

src/commands/fix/pnpm-fix.ts

@@ -171,32 +171,32 @@ export async function pnpmFix(
         firstPatchedVersionIdentifier,
         vulnerableVersionRange
       } of infos) {
-        const node = findPackageNode(actualTree, name, oldVersion)
-        if (!node) {
-          continue
-        }
+        debugLog('pkgJsonPaths', pkgJsonPaths)
+        for (const pkgJsonPath of pkgJsonPaths) {
+          const node = findPackageNode(actualTree, name, oldVersion)
+          if (!node) {
+            continue
+          }
+
+          const availableVersions = Object.keys(packument.versions)
+          const newVersion = findBestPatchVersion(
+            node,
+            availableVersions,
+            vulnerableVersionRange,
+            firstPatchedVersionIdentifier
+          )
+          const newVersionPackument = newVersion
+            ? packument.versions[newVersion]
+            : undefined
 
-        const availableVersions = Object.keys(packument.versions)
-        const newVersion = findBestPatchVersion(
-          node,
-          availableVersions,
-          vulnerableVersionRange,
-          firstPatchedVersionIdentifier
-        )
-        const newVersionPackument = newVersion
-          ? packument.versions[newVersion]
-          : undefined
-
-        if (!(newVersion && newVersionPackument)) {
-          if (!unavailableSpecs.has(oldSpec)) {
-            unavailableSpecs.add(oldSpec)
-            spinner?.fail(`No update available for ${oldSpec}`)
+          if (!(newVersion && newVersionPackument)) {
+            if (!unavailableSpecs.has(oldSpec)) {
+              unavailableSpecs.add(oldSpec)
+              spinner?.fail(`No update available for ${oldSpec}`)
+            }
+            continue
           }
-          continue
-        }
 
-        debugLog('pkgJsonPaths', pkgJsonPaths)
-        for (const pkgJsonPath of pkgJsonPaths) {
           const isWorkspaceRoot =
             pkgJsonPath === pkgEnvDetails.editablePkgJson.filename
           const workspaceName = isWorkspaceRoot