Add line breaks in between processing groups for fix (#561)

Author: jdalton

package-lock.json

@@ -107,7 +107,7 @@
     "@socketregistry/is-interactive": "1.0.5",
     "@socketregistry/packageurl-js": "1.0.6",
     "@socketsecurity/config": "2.1.3",
-    "@socketsecurity/registry": "1.0.183",
+    "@socketsecurity/registry": "1.0.184",
     "@socketsecurity/sdk": "1.4.36",
     "@types/blessed": "0.1.25",
     "@types/cmd-shim": "5.0.2",

package.json

@@ -137,7 +137,14 @@ export async function npmFix(
   const sortedInfoEntries = [...infoByPkgName.entries()].sort((a, b) =>
     naturalCompare(a[0], b[0])
   )
-  infoEntriesLoop: for (const { 0: name, 1: infos } of sortedInfoEntries) {
+  infoEntriesLoop: for (
+    let i = 0, { length } = sortedInfoEntries;
+    i < length;
+    i += 1
+  ) {
+    const { 0: name, 1: infos } = sortedInfoEntries[i]!
+    const isLastInfoEntry = i === length - 1
+
     logger.log(`Processing vulnerable package: ${name}`)
     logger.indent()
     spinner?.indent()
@@ -166,6 +173,7 @@ export async function npmFix(
         : path.relative(rootPath, pkgPath)
 
       logger.log(`Checking workspace: ${workspaceName}`)
+      const workspaceLogCallCount = logger.logCallCount
 
       // eslint-disable-next-line no-await-in-loop
       actualTree = await install(arb, { cwd })
@@ -389,13 +397,15 @@ export async function npmFix(
           }
         }
       }
-      logger.log('')
+      if (logger.logCallCount > workspaceLogCallCount) {
+        logger.log('')
+      }
     }
 
     for (const warningText of warningsForAfter) {
       logger.warn(warningText)
     }
-    if (warningsForAfter.size) {
+    if (!isLastInfoEntry) {
       logger.log('')
     }
 

src/commands/fix/npm-fix.mts

@@ -197,7 +197,14 @@ export async function pnpmFix(
   const sortedInfoEntries = [...infoByPkgName.entries()].sort((a, b) =>
     naturalCompare(a[0], b[0])
   )
-  infoEntriesLoop: for (const { 0: name, 1: infos } of sortedInfoEntries) {
+  infoEntriesLoop: for (
+    let i = 0, { length } = sortedInfoEntries;
+    i < length;
+    i += 1
+  ) {
+    const { 0: name, 1: infos } = sortedInfoEntries[i]!
+    const isLastInfoEntry = i === length - 1
+
     logger.log(`Processing vulnerable package: ${name}`)
     logger.indent()
     spinner?.indent()
@@ -226,6 +233,7 @@ export async function pnpmFix(
         : path.relative(rootPath, pkgPath)
 
       logger.log(`Checking workspace: ${workspaceName}`)
+      const workspaceLogCallCount = logger.logCallCount
 
       // eslint-disable-next-line no-await-in-loop
       actualTree = await install(pkgEnvDetails, { cwd, spinner })
@@ -488,13 +496,15 @@ export async function pnpmFix(
           }
         }
       }
-      logger.log('')
+      if (logger.logCallCount > workspaceLogCallCount) {
+        logger.log('')
+      }
     }
 
     for (const warningText of warningsForAfter) {
       logger.warn(warningText)
     }
-    if (warningsForAfter.size) {
+    if (!isLastInfoEntry) {
       logger.log('')
     }