npq 3.11.4 → 3.11.6

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,6 +54,16 @@ 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()
   }

package/lib/marshalls/age.marshall.js

@@ -28,8 +28,9 @@ class Marshall extends BaseMarshall {
 
     const pkgCreatedDate = data.time.created
     const dateDiff = Date.now() - Date.parse(pkgCreatedDate)
+    const thresholdMs = PACKAGE_AGE_THRESHOLD * 24 * 60 * 60 * 1000
 
-    if (dateDiff < PACKAGE_AGE_THRESHOLD) {
+    if (dateDiff < thresholdMs) {
       throw new Error(
         `Detected a newly published package (created < ${PACKAGE_AGE_THRESHOLD} days) act carefully`
       )
@@ -46,8 +47,9 @@ class Marshall extends BaseMarshall {
     }
 
     const versionReleaseDate = data.time[packageVersion]
-    const versionDateDiff = new Date() - new Date(versionReleaseDate)
+    const versionDateDiff = Date.now() - Date.parse(versionReleaseDate)
     const versionDateDiffInDays = Math.round(versionDateDiff / (1000 * 60 * 60 * 24))
+    const unmaintainedThresholdMs = PACKAGE_AGE_UNMAINTAINED_RISK * 24 * 60 * 60 * 1000
 
     let timeAgoText = 'days'
     let timeAgoNumber = versionDateDiffInDays
@@ -57,7 +59,7 @@ class Marshall extends BaseMarshall {
       timeAgoNumber = Math.floor(versionDateDiffInDays / 365)
     }
 
-    if (versionDateDiffInDays >= PACKAGE_AGE_UNMAINTAINED_RISK) {
+    if (versionDateDiff >= unmaintainedThresholdMs) {
       throw new Warning(`Detected an old package (created ${timeAgoNumber} ${timeAgoText} ago)`)
     }
   }

package/lib/marshalls/baseMarshall.js

@@ -1,5 +1,6 @@
 'use strict'
 
+const semver = require('semver')
 const util = require('node:util')
 const Warning = require('../helpers/warning')
 const { marshallCategories } = require('./constants')
@@ -76,20 +77,26 @@ class BaseMarshall {
    * @param {Object} packageData - Optional package data to avoid re-fetching
    * @returns {Promise<string|null>} - The resolved semver version or null if not found
    */
-  async resolvePackageVersion(packageName, versionSpec, packageData = null) {
-    // Get package data if not provided
+
+  async resolvePackageVersion(packageName, versionSpec, packageData) {
+    if (typeof versionSpec !== 'string' || versionSpec.trim() === '') return null
     const data = packageData || (await this.packageRepoUtils.getPackageInfo(packageName))
 
-    if (!data || !data['dist-tags']) {
-      return null
-    }
+    if (!data) return null
 
-    // Check if versionSpec is a dist-tag
-    if (Object.prototype.hasOwnProperty.call(data['dist-tags'], versionSpec)) {
+    // Handle dist-tags first
+    if (data['dist-tags'] && data['dist-tags'][versionSpec]) {
       return data['dist-tags'][versionSpec]
     }
 
-    // If not a dist-tag, try parsing as semver
+    // Handle semver ranges and exact versions using all available versions
+    if (data.versions) {
+      const availableVersions = Object.keys(data.versions)
+      const resolved = semver.maxSatisfying(availableVersions, versionSpec)
+      if (resolved) return resolved
+    }
+
+    // Fallback for simple parsing if range resolution fails
     const parsed = this.packageRepoUtils.parsePackageVersion(versionSpec)
     return parsed ? parsed.version : null
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npq",
-  "version": "3.11.4",
+  "version": "3.11.6",
   "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"