npq 3.11.5 → 3.12.0

package/bin/npq-hero.js

@@ -100,8 +100,18 @@ marshall
     }
   })
   .catch((error) => {
+    // Ensure errorCode is always a number
+    let errorCode = -1
+    if (typeof error.code === 'number') {
+      errorCode = error.code
+    } else if (error.code === 'ABORT_ERR') {
+      errorCode = 1
+    } else if (error.code === 'USER_ABORT') {
+      errorCode = error.exitCode || 1
+    }
+
     CliParser.exit({
-      errorCode: error.code || -1,
+      errorCode,
       message: error.message || 'An error occurred',
       spinner
     })

package/bin/npq.js

@@ -126,8 +126,18 @@ Promise.resolve()
     }
   })
   .catch((error) => {
+    // Ensure errorCode is always a number
+    let errorCode = -1
+    if (typeof error.code === 'number') {
+      errorCode = error.code
+    } else if (error.code === 'ABORT_ERR') {
+      errorCode = 1
+    } else if (error.code === 'USER_ABORT') {
+      errorCode = error.exitCode || 1
+    }
+
     CliParser.exit({
-      errorCode: error.code || -1,
+      errorCode,
       message: error.message || 'An error occurred',
       spinner
     })

package/lib/cli.js

@@ -11,10 +11,13 @@ class CliParser {
     }
 
     if (message) {
+      console.error('\n')
       console.error(message)
     }
 
-    process.exit(errorCode || -1)
+    // Ensure errorCode is always a number
+    const exitCode = typeof errorCode === 'number' ? errorCode : -1
+    process.exit(exitCode)
   }
 
   static _extractPackagesFromPositionals(positionals, earlyExitNoInstall = false) {

package/lib/helpers/cliPrompt.js

@@ -54,41 +54,129 @@ async function prompt(options = {}) {
     }
 
     return { [name]: result }
+  } catch (error) {
+    // Handle Ctrl+C gracefully - user cancelled the operation
+    if (error.code === 'ABORT_ERR') {
+      // Throw a specific error that can be caught and handled by the caller
+      const abortError = new Error('Operation aborted by user')
+      abortError.code = 'USER_ABORT'
+      abortError.exitCode = 1
+      throw abortError
+    }
+    throw error
   } finally {
     rl.close()
   }
 }
 
 async function autoContinue({ name, message, timeInSeconds = 5 } = {}) {
-  // Show initial message with countdown
-  process.stdout.write(`${message}${timeInSeconds}`)
+  let aborted = false
+  let userProceeded = false
+
+  // Setup stdin to capture keypresses during countdown
+  if (process.stdin.isTTY) {
+    process.stdin.setRawMode(true)
+    process.stdin.resume()
+
+    // Handle keypresses during countdown
+    const onKeypress = (chunk) => {
+      // Check for Ctrl+C (ASCII 3)
+      if (chunk && chunk.length === 1 && chunk[0] === 3) {
+        aborted = true
+      }
+      // Check for 'y' or 'Y' (ASCII 121 or 89)
+      else if (chunk && chunk.length === 1 && (chunk[0] === 121 || chunk[0] === 89)) {
+        userProceeded = true
+      }
+      // Ignore all other keypresses during countdown
+    }
 
-  // Count down from timeInSeconds-1 to 1
-  for (let i = timeInSeconds - 1; i > 0; i--) {
-    await setTimeout(1000)
+    process.stdin.on('data', onKeypress)
 
-    // Calculate how many characters to backspace (previous number length)
-    const prevNumber = i + 1
-    const prevLength = prevNumber.toString().length
-    const currentLength = i.toString().length
+    // Cleanup function
+    const cleanup = () => {
+      process.stdin.removeListener('data', onKeypress)
+      if (process.stdin.isTTY) {
+        process.stdin.setRawMode(false)
+        process.stdin.pause()
+      }
+    }
 
-    // Backspace to beginning of number
-    const backspaces = '\b'.repeat(prevLength)
+    try {
+      // Show countdown message with instruction in parentheses
+      process.stdout.write(`${message}${timeInSeconds} (press 'y' to proceed)`)
 
-    // Write new number and pad with spaces if needed to clear any remaining digits
-    const padding = ' '.repeat(Math.max(0, prevLength - currentLength))
-    const moveBack = '\b'.repeat(Math.max(0, prevLength - currentLength))
+      let currentNumber = timeInSeconds
 
-    process.stdout.write(`${backspaces}${i}${padding}${moveBack}`)
-  }
+      // Count down from timeInSeconds-1 to 1
+      for (let i = timeInSeconds - 1; i > 0 && !aborted && !userProceeded; i--) {
+        await setTimeout(1000)
+
+        if (aborted || userProceeded) break
+
+        // Update the countdown number using backspace
+        // We need to backspace over both the number AND the instruction text
+        const instructionText = " (press 'y' to proceed)"
+        const totalTextLength = currentNumber.toString().length + instructionText.length
+
+        // Backspace over everything, write new number and instruction
+        const backspaces = '\b'.repeat(totalTextLength)
+        process.stdout.write(`${backspaces}${i}${instructionText}`)
+
+        currentNumber = i
+      }
 
-  // Wait for the final second
-  await setTimeout(1000)
+      if (!aborted && !userProceeded) {
+        // Wait for the final second
+        await setTimeout(1000)
+      }
 
-  // Move to next line after countdown completes
-  console.log()
+      // Move to a clean new line for any follow-up output
+      if (!aborted) {
+        console.log('') // Just move to next line
+      }
 
-  return { [name]: true }
+      cleanup()
+
+      if (aborted) {
+        const abortError = new Error('Operation aborted by user')
+        abortError.code = 'USER_ABORT'
+        abortError.exitCode = 1
+        throw abortError
+      }
+
+      return { [name]: true }
+    } catch (error) {
+      cleanup()
+      throw error
+    }
+  } else {
+    // Fallback for non-TTY environments (tests, etc.)
+    // Show countdown message with instruction
+    process.stdout.write(`${message}${timeInSeconds} (press 'y' to proceed)`)
+
+    // Count down from timeInSeconds-1 to 1
+    for (let i = timeInSeconds - 1; i > 0; i--) {
+      await setTimeout(1000)
+
+      // Update similar to TTY version - backspace over number and instruction
+      const instructionText = " (press 'y' to proceed)"
+      const prevNumber = i + 1
+      const totalTextLength = prevNumber.toString().length + instructionText.length
+
+      // Backspace over everything, write new number and instruction
+      const backspaces = '\b'.repeat(totalTextLength)
+      process.stdout.write(`${backspaces}${i}${instructionText}`)
+    }
+
+    // Wait for the final second
+    await setTimeout(1000)
+
+    // Move to next line after countdown completes
+    console.log('')
+
+    return { [name]: true }
+  }
 }
 
 module.exports = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npq",
-  "version": "3.11.5",
+  "version": "3.12.0",
   "description": "marshall your npm/npm package installs with high quality and class 🎖",
   "bin": {
     "npq": "./bin/npq.js",
@@ -44,6 +44,7 @@
   },
   "dependencies": {
     "fastest-levenshtein": "^1.0.16",
+    "lodash": "^4.17.21",
     "npm-package-arg": "^13.0.0",
     "pacote": "^21.0.0",
     "semver": "^7.7.2"