Use more loop labels in fix (#560)

jdalton · web-flow · commit 17724f8110c0 · 2025-05-18T09:24:31.000-04:00
diff --git a/src/commands/fix/npm-fix.mts b/src/commands/fix/npm-fix.mts
@@ -137,7 +137,7 @@ export async function npmFix(
   const sortedInfoEntries = [...infoByPkgName.entries()].sort((a, b) =>
     naturalCompare(a[0], b[0])
   )
-  infoByPkgNameLoop: for (const { 0: name, 1: infos } of sortedInfoEntries) {
+  infoEntriesLoop: for (const { 0: name, 1: infos } of sortedInfoEntries) {
     logger.log(`Processing vulnerable package: ${name}`)
     logger.indent()
     spinner?.indent()
@@ -151,13 +151,13 @@ export async function npmFix(
       logger.warn(`Unexpected condition: No packument found for ${name}\n`)
       logger.dedent()
       spinner?.dedent()
-      continue
+      continue infoEntriesLoop
     }
 
     const availableVersions = Object.keys(packument.versions)
     const warningsForAfter = new Set<string>()
 
-    for (const pkgJsonPath of pkgJsonPaths) {
+    pkgJsonPathsLoop: for (const pkgJsonPath of pkgJsonPaths) {
       const pkgPath = path.dirname(pkgJsonPath)
       const isWorkspaceRoot =
         pkgJsonPath === pkgEnvDetails.editablePkgJson.filename
@@ -180,7 +180,7 @@ export async function npmFix(
         logger.warn(
           `Unexpected condition: Lockfile entries not found for ${name}.\n`
         )
-        continue
+        continue pkgJsonPathsLoop
       }
 
       // Always re-read the editable package.json to avoid stale mutations
@@ -190,7 +190,7 @@ export async function npmFix(
         editable: true
       })
 
-      for (const oldVersion of oldVersions) {
+      oldVersionsLoop: for (const oldVersion of oldVersions) {
         const oldId = `${name}@${oldVersion}`
         const oldPurl = idToPurl(oldId)
 
@@ -199,10 +199,10 @@ export async function npmFix(
           logger.warn(
             `Unexpected condition: Arborist node not found, skipping ${oldId}`
           )
-          continue
+          continue oldVersionsLoop
         }
 
-        for (const {
+        infosLoop: for (const {
           firstPatchedVersionIdentifier,
           vulnerableVersionRange
         } of infos.values()) {
@@ -220,7 +220,7 @@ export async function npmFix(
             warningsForAfter.add(
               `No update applied. ${oldId} needs >=${firstPatchedVersionIdentifier}`
             )
-            continue
+            continue infosLoop
           }
 
           const newVersionRange = applyRange(oldVersion, newVersion, rangeStyle)
@@ -258,7 +258,7 @@ export async function npmFix(
               // eslint-disable-next-line no-await-in-loop
               actualTree = await install(arb, { cwd })
             }
-            continue
+            continue infosLoop
           }
 
           spinner?.start()
@@ -291,14 +291,14 @@ export async function npmFix(
               // eslint-disable-next-line no-await-in-loop
               if (await prExistForBranch(owner, repo, branch)) {
                 debugLog(`Branch "${branch}" exists, skipping PR creation.`)
-                continue
+                continue infosLoop
               }
               // eslint-disable-next-line no-await-in-loop
               if (await gitRemoteBranchExists(branch, cwd)) {
                 debugLog(
                   `Remote branch "${branch}" exists, skipping PR creation.`
                 )
-                continue
+                continue infosLoop
               }
 
               const moddedFilepaths =
@@ -314,7 +314,7 @@ export async function npmFix(
                 logger.warn(
                   'Unexpected condition: Nothing to commit, skipping PR creation.'
                 )
-                continue
+                continue infosLoop
               }
 
               if (
@@ -329,7 +329,7 @@ export async function npmFix(
                 logger.warn(
                   'Unexpected condition: Push failed, skipping PR creation.'
                 )
-                continue
+                continue infosLoop
               }
               // eslint-disable-next-line no-await-in-loop
               await cleanupOpenPrs(owner, repo, oldPurl, newVersion, {
@@ -385,7 +385,7 @@ export async function npmFix(
             )
           }
           if (++count >= limit) {
-            break infoByPkgNameLoop
+            break infoEntriesLoop
           }
         }
       }
diff --git a/src/commands/fix/pnpm-fix.mts b/src/commands/fix/pnpm-fix.mts
@@ -197,7 +197,7 @@ export async function pnpmFix(
   const sortedInfoEntries = [...infoByPkgName.entries()].sort((a, b) =>
     naturalCompare(a[0], b[0])
   )
-  infoByPkgNameLoop: for (const { 0: name, 1: infos } of sortedInfoEntries) {
+  infoEntriesLoop: for (const { 0: name, 1: infos } of sortedInfoEntries) {
     logger.log(`Processing vulnerable package: ${name}`)
     logger.indent()
     spinner?.indent()
@@ -211,13 +211,13 @@ export async function pnpmFix(
       logger.warn(`Unexpected condition: No packument found for ${name}\n`)
       logger.dedent()
       spinner?.dedent()
-      continue
+      continue infoEntriesLoop
     }
 
     const availableVersions = Object.keys(packument.versions)
     const warningsForAfter = new Set<string>()
 
-    for (const pkgJsonPath of pkgJsonPaths) {
+    pkgJsonPathsLoop: for (const pkgJsonPath of pkgJsonPaths) {
       const pkgPath = path.dirname(pkgJsonPath)
       const isWorkspaceRoot =
         pkgJsonPath === pkgEnvDetails.editablePkgJson.filename
@@ -240,7 +240,7 @@ export async function pnpmFix(
         logger.warn(
           `Unexpected condition: Lockfile entries not found for ${name}.\n`
         )
-        continue
+        continue pkgJsonPathsLoop
       }
 
       // Always re-read the editable package.json to avoid stale mutations
@@ -258,7 +258,7 @@ export async function pnpmFix(
         | Record<string, string>
         | undefined
 
-      for (const oldVersion of oldVersions) {
+      oldVersionsLoop: for (const oldVersion of oldVersions) {
         const oldId = `${name}@${oldVersion}`
         const oldPurl = idToPurl(oldId)
 
@@ -267,9 +267,9 @@ export async function pnpmFix(
           logger.warn(
             `Unexpected condition: Arborist node not found, skipping ${oldId}`
           )
-          continue
+          continue oldVersionsLoop
         }
-        for (const {
+        infosLoop: for (const {
           firstPatchedVersionIdentifier,
           vulnerableVersionRange
         } of infos.values()) {
@@ -287,7 +287,7 @@ export async function pnpmFix(
             warningsForAfter.add(
               `No update applied. ${oldId} needs >=${firstPatchedVersionIdentifier}`
             )
-            continue
+            continue infosLoop
           }
 
           const overrideKey = `${name}@${vulnerableVersionRange}`
@@ -357,7 +357,7 @@ export async function pnpmFix(
               // eslint-disable-next-line no-await-in-loop
               actualTree = await install(pkgEnvDetails, { cwd, spinner })
             }
-            continue
+            continue infosLoop
           }
 
           spinner?.start()
@@ -391,14 +391,14 @@ export async function pnpmFix(
               // eslint-disable-next-line no-await-in-loop
               if (await prExistForBranch(owner, repo, branch)) {
                 debugLog(`Branch "${branch}" exists, skipping PR creation.`)
-                continue
+                continue infosLoop
               }
               // eslint-disable-next-line no-await-in-loop
               if (await gitRemoteBranchExists(branch, cwd)) {
                 debugLog(
                   `Remote branch "${branch}" exists, skipping PR creation.`
                 )
-                continue
+                continue infosLoop
               }
 
               const moddedFilepaths =
@@ -413,7 +413,7 @@ export async function pnpmFix(
                 logger.warn(
                   'Unexpected condition: Nothing to commit, skipping PR creation.'
                 )
-                continue
+                continue infosLoop
               }
 
               if (
@@ -428,7 +428,7 @@ export async function pnpmFix(
                 logger.warn(
                   'Unexpected condition: Push failed, skipping PR creation.'
                 )
-                continue
+                continue infosLoop
               }
               // eslint-disable-next-line no-await-in-loop
               await cleanupOpenPrs(owner, repo, oldPurl, newVersion, {
@@ -484,7 +484,7 @@ export async function pnpmFix(
             )
           }
           if (++count >= limit) {
-            break infoByPkgNameLoop
+            break infoEntriesLoop
           }
         }
       }

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ export async function npmFix(`
`137`	`137`	`const sortedInfoEntries = [...infoByPkgName.entries()].sort((a, b) =>`
`138`	`138`	`naturalCompare(a[0], b[0])`
`139`	`139`	`)`
`140`		`- infoByPkgNameLoop: for (const { 0: name, 1: infos } of sortedInfoEntries) {`
	`140`	`+ infoEntriesLoop: for (const { 0: name, 1: infos } of sortedInfoEntries) {`
`141`	`141`	logger.log(`Processing vulnerable package: ${name}`)
`142`	`142`	`logger.indent()`
`143`	`143`	`spinner?.indent()`
`@@ -151,13 +151,13 @@ export async function npmFix(`
`151`	`151`	logger.warn(`Unexpected condition: No packument found for ${name}\n`)
`152`	`152`	`logger.dedent()`
`153`	`153`	`spinner?.dedent()`
`154`		`- continue`
	`154`	`+ continue infoEntriesLoop`
`155`	`155`	`}`
`156`	`156`
`157`	`157`	`const availableVersions = Object.keys(packument.versions)`
`158`	`158`	`const warningsForAfter = new Set<string>()`
`159`	`159`
`160`		`- for (const pkgJsonPath of pkgJsonPaths) {`
	`160`	`+ pkgJsonPathsLoop: for (const pkgJsonPath of pkgJsonPaths) {`
`161`	`161`	`const pkgPath = path.dirname(pkgJsonPath)`
`162`	`162`	`const isWorkspaceRoot =`
`163`	`163`	`pkgJsonPath === pkgEnvDetails.editablePkgJson.filename`
`@@ -180,7 +180,7 @@ export async function npmFix(`
`180`	`180`	`logger.warn(`
`181`	`181`	`Unexpected condition: Lockfile entries not found for ${name}.\n`
`182`	`182`	`)`
`183`		`- continue`
	`183`	`+ continue pkgJsonPathsLoop`
`184`	`184`	`}`
`185`	`185`
`186`	`186`	`// Always re-read the editable package.json to avoid stale mutations`
`@@ -190,7 +190,7 @@ export async function npmFix(`
`190`	`190`	`editable: true`
`191`	`191`	`})`
`192`	`192`
`193`		`- for (const oldVersion of oldVersions) {`
	`193`	`+ oldVersionsLoop: for (const oldVersion of oldVersions) {`
`194`	`194`	const oldId = `${name}@${oldVersion}`
`195`	`195`	`const oldPurl = idToPurl(oldId)`
`196`	`196`
`@@ -199,10 +199,10 @@ export async function npmFix(`
`199`	`199`	`logger.warn(`
`200`	`200`	`Unexpected condition: Arborist node not found, skipping ${oldId}`
`201`	`201`	`)`
`202`		`- continue`
	`202`	`+ continue oldVersionsLoop`
`203`	`203`	`}`
`204`	`204`
`205`		`- for (const {`
	`205`	`+ infosLoop: for (const {`
`206`	`206`	`firstPatchedVersionIdentifier,`
`207`	`207`	`vulnerableVersionRange`
`208`	`208`	`} of infos.values()) {`
`@@ -220,7 +220,7 @@ export async function npmFix(`
`220`	`220`	`warningsForAfter.add(`
`221`	`221`	`No update applied. ${oldId} needs >=${firstPatchedVersionIdentifier}`
`222`	`222`	`)`
`223`		`- continue`
	`223`	`+ continue infosLoop`
`224`	`224`	`}`
`225`	`225`
`226`	`226`	`const newVersionRange = applyRange(oldVersion, newVersion, rangeStyle)`
`@@ -258,7 +258,7 @@ export async function npmFix(`
`258`	`258`	`// eslint-disable-next-line no-await-in-loop`
`259`	`259`	`actualTree = await install(arb, { cwd })`
`260`	`260`	`}`
`261`		`- continue`
	`261`	`+ continue infosLoop`
`262`	`262`	`}`
`263`	`263`
`264`	`264`	`spinner?.start()`
`@@ -291,14 +291,14 @@ export async function npmFix(`
`291`	`291`	`// eslint-disable-next-line no-await-in-loop`
`292`	`292`	`if (await prExistForBranch(owner, repo, branch)) {`
`293`	`293`	debugLog(`Branch "${branch}" exists, skipping PR creation.`)
`294`		`- continue`
	`294`	`+ continue infosLoop`
`295`	`295`	`}`
`296`	`296`	`// eslint-disable-next-line no-await-in-loop`
`297`	`297`	`if (await gitRemoteBranchExists(branch, cwd)) {`
`298`	`298`	`debugLog(`
`299`	`299`	`Remote branch "${branch}" exists, skipping PR creation.`
`300`	`300`	`)`
`301`		`- continue`
	`301`	`+ continue infosLoop`
`302`	`302`	`}`
`303`	`303`
`304`	`304`	`const moddedFilepaths =`
`@@ -314,7 +314,7 @@ export async function npmFix(`
`314`	`314`	`logger.warn(`
`315`	`315`	`'Unexpected condition: Nothing to commit, skipping PR creation.'`
`316`	`316`	`)`
`317`		`- continue`
	`317`	`+ continue infosLoop`
`318`	`318`	`}`
`319`	`319`
`320`	`320`	`if (`
`@@ -329,7 +329,7 @@ export async function npmFix(`
`329`	`329`	`logger.warn(`
`330`	`330`	`'Unexpected condition: Push failed, skipping PR creation.'`
`331`	`331`	`)`
`332`		`- continue`
	`332`	`+ continue infosLoop`
`333`	`333`	`}`
`334`	`334`	`// eslint-disable-next-line no-await-in-loop`
`335`	`335`	`await cleanupOpenPrs(owner, repo, oldPurl, newVersion, {`
`@@ -385,7 +385,7 @@ export async function npmFix(`
`385`	`385`	`)`
`386`	`386`	`}`
`387`	`387`	`if (++count >= limit) {`
`388`		`- break infoByPkgNameLoop`
	`388`	`+ break infoEntriesLoop`
`389`	`389`	`}`
`390`	`390`	`}`
`391`	`391`	`}`
Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,7 @@ export async function pnpmFix(`
`197`	`197`	`const sortedInfoEntries = [...infoByPkgName.entries()].sort((a, b) =>`
`198`	`198`	`naturalCompare(a[0], b[0])`
`199`	`199`	`)`
`200`		`- infoByPkgNameLoop: for (const { 0: name, 1: infos } of sortedInfoEntries) {`
	`200`	`+ infoEntriesLoop: for (const { 0: name, 1: infos } of sortedInfoEntries) {`
`201`	`201`	logger.log(`Processing vulnerable package: ${name}`)
`202`	`202`	`logger.indent()`
`203`	`203`	`spinner?.indent()`
`@@ -211,13 +211,13 @@ export async function pnpmFix(`
`211`	`211`	logger.warn(`Unexpected condition: No packument found for ${name}\n`)
`212`	`212`	`logger.dedent()`
`213`	`213`	`spinner?.dedent()`
`214`		`- continue`
	`214`	`+ continue infoEntriesLoop`
`215`	`215`	`}`
`216`	`216`
`217`	`217`	`const availableVersions = Object.keys(packument.versions)`
`218`	`218`	`const warningsForAfter = new Set<string>()`
`219`	`219`
`220`		`- for (const pkgJsonPath of pkgJsonPaths) {`
	`220`	`+ pkgJsonPathsLoop: for (const pkgJsonPath of pkgJsonPaths) {`
`221`	`221`	`const pkgPath = path.dirname(pkgJsonPath)`
`222`	`222`	`const isWorkspaceRoot =`
`223`	`223`	`pkgJsonPath === pkgEnvDetails.editablePkgJson.filename`
`@@ -240,7 +240,7 @@ export async function pnpmFix(`
`240`	`240`	`logger.warn(`
`241`	`241`	`Unexpected condition: Lockfile entries not found for ${name}.\n`
`242`	`242`	`)`
`243`		`- continue`
	`243`	`+ continue pkgJsonPathsLoop`
`244`	`244`	`}`
`245`	`245`
`246`	`246`	`// Always re-read the editable package.json to avoid stale mutations`
`@@ -258,7 +258,7 @@ export async function pnpmFix(`
`258`	`258`	`\| Record<string, string>`
`259`	`259`	`\| undefined`
`260`	`260`
`261`		`- for (const oldVersion of oldVersions) {`
	`261`	`+ oldVersionsLoop: for (const oldVersion of oldVersions) {`
`262`	`262`	const oldId = `${name}@${oldVersion}`
`263`	`263`	`const oldPurl = idToPurl(oldId)`
`264`	`264`
`@@ -267,9 +267,9 @@ export async function pnpmFix(`
`267`	`267`	`logger.warn(`
`268`	`268`	`Unexpected condition: Arborist node not found, skipping ${oldId}`
`269`	`269`	`)`
`270`		`- continue`
	`270`	`+ continue oldVersionsLoop`
`271`	`271`	`}`
`272`		`- for (const {`
	`272`	`+ infosLoop: for (const {`
`273`	`273`	`firstPatchedVersionIdentifier,`
`274`	`274`	`vulnerableVersionRange`
`275`	`275`	`} of infos.values()) {`
`@@ -287,7 +287,7 @@ export async function pnpmFix(`
`287`	`287`	`warningsForAfter.add(`
`288`	`288`	`No update applied. ${oldId} needs >=${firstPatchedVersionIdentifier}`
`289`	`289`	`)`
`290`		`- continue`
	`290`	`+ continue infosLoop`
`291`	`291`	`}`
`292`	`292`
`293`	`293`	const overrideKey = `${name}@${vulnerableVersionRange}`
`@@ -357,7 +357,7 @@ export async function pnpmFix(`
`357`	`357`	`// eslint-disable-next-line no-await-in-loop`
`358`	`358`	`actualTree = await install(pkgEnvDetails, { cwd, spinner })`
`359`	`359`	`}`
`360`		`- continue`
	`360`	`+ continue infosLoop`
`361`	`361`	`}`
`362`	`362`
`363`	`363`	`spinner?.start()`
`@@ -391,14 +391,14 @@ export async function pnpmFix(`
`391`	`391`	`// eslint-disable-next-line no-await-in-loop`
`392`	`392`	`if (await prExistForBranch(owner, repo, branch)) {`
`393`	`393`	debugLog(`Branch "${branch}" exists, skipping PR creation.`)
`394`		`- continue`
	`394`	`+ continue infosLoop`
`395`	`395`	`}`
`396`	`396`	`// eslint-disable-next-line no-await-in-loop`
`397`	`397`	`if (await gitRemoteBranchExists(branch, cwd)) {`
`398`	`398`	`debugLog(`
`399`	`399`	`Remote branch "${branch}" exists, skipping PR creation.`
`400`	`400`	`)`
`401`		`- continue`
	`401`	`+ continue infosLoop`
`402`	`402`	`}`
`403`	`403`
`404`	`404`	`const moddedFilepaths =`
`@@ -413,7 +413,7 @@ export async function pnpmFix(`
`413`	`413`	`logger.warn(`
`414`	`414`	`'Unexpected condition: Nothing to commit, skipping PR creation.'`
`415`	`415`	`)`
`416`		`- continue`
	`416`	`+ continue infosLoop`
`417`	`417`	`}`
`418`	`418`
`419`	`419`	`if (`
`@@ -428,7 +428,7 @@ export async function pnpmFix(`
`428`	`428`	`logger.warn(`
`429`	`429`	`'Unexpected condition: Push failed, skipping PR creation.'`
`430`	`430`	`)`
`431`		`- continue`
	`431`	`+ continue infosLoop`
`432`	`432`	`}`
`433`	`433`	`// eslint-disable-next-line no-await-in-loop`
`434`	`434`	`await cleanupOpenPrs(owner, repo, oldPurl, newVersion, {`
`@@ -484,7 +484,7 @@ export async function pnpmFix(`
`484`	`484`	`)`
`485`	`485`	`}`
`486`	`486`	`if (++count >= limit) {`
`487`		`- break infoByPkgNameLoop`
	`487`	`+ break infoEntriesLoop`
`488`	`488`	`}`
`489`	`489`	`}`
`490`	`490`	`}`