libnpmexec 5.0.2 → 5.0.4

package/lib/index.js

@@ -4,7 +4,7 @@ const { mkdir } = require('fs/promises')
 const { promisify } = require('util')
 
 const Arborist = require('@npmcli/arborist')
-const ciDetect = require('@npmcli/ci-detect')
+const ciInfo = require('ci-info')
 const crypto = require('crypto')
 const log = require('proc-log')
 const npa = require('npm-package-arg')
@@ -79,7 +79,6 @@ const exec = async (opts) => {
   const {
     args = [],
     call = '',
-    color = false,
     localBin = resolve('./node_modules/.bin'),
     locationMsg = undefined,
     globalBin = '',
@@ -97,7 +96,6 @@ const exec = async (opts) => {
   const run = () => runScript({
     args,
     call,
-    color,
     flatOptions,
     locationMsg,
     output,
@@ -112,22 +110,40 @@ const exec = async (opts) => {
     return run()
   }
 
-  const needPackageCommandSwap = (args.length > 0) && (packages.length === 0)
+  let needPackageCommandSwap = (args.length > 0) && (packages.length === 0)
   // If they asked for a command w/o specifying a package, see if there is a
-  // bin that directly matches that name either globally or in the local tree.
+  // bin that directly matches that name:
+  // - in the local package itself
+  // - in the local tree
+  // - globally
   if (needPackageCommandSwap) {
-    const dir = dirname(dirname(localBin))
-    const localBinPath = await localFileExists(dir, args[0], '/')
-    if (localBinPath) {
-      binPaths.push(localBinPath)
-      return await run()
-    } else if (globalPath && await fileExists(`${globalBin}/${args[0]}`)) {
-      binPaths.push(globalBin)
-      return await run()
+    let localManifest
+    try {
+      localManifest = await pacote.manifest(path, flatOptions)
+    } catch {
+      // no local package.json? no problem, move one.
+    }
+    if (localManifest?.bin?.[args[0]]) {
+      // we have to install the local package into the npx cache so that its
+      // bin links get set up
+      flatOptions.installLinks = false
+      // args[0] will exist when the package is installed
+      packages.push(path)
+      yes = true
+      needPackageCommandSwap = false
+    } else {
+      const dir = dirname(dirname(localBin))
+      const localBinPath = await localFileExists(dir, args[0], '/')
+      if (localBinPath) {
+        binPaths.push(localBinPath)
+        return await run()
+      } else if (globalPath && await fileExists(`${globalBin}/${args[0]}`)) {
+        binPaths.push(globalBin)
+        return await run()
+      }
+      // We swap out args[0] with the bin from the manifest later
+      packages.push(args[0])
     }
-
-    // We swap out args[0] with the bin from the manifest later
-    packages.push(args[0])
   }
 
   // Resolve any directory specs so that the npx directory is unique to the
@@ -228,7 +244,7 @@ const exec = async (opts) => {
           throw new Error('canceled')
         }
 
-        if (noTTY() || ciDetect()) {
+        if (noTTY() || ciInfo.isCI) {
           log.warn('exec', `The following package${
             add.length === 1 ? ' was' : 's were'
           } not found and will be installed: ${

package/lib/run-script.js

@@ -1,5 +1,5 @@
 const chalk = require('chalk')
-const ciDetect = require('@npmcli/ci-detect')
+const ciInfo = require('ci-info')
 const runScript = require('@npmcli/run-script')
 const readPackageJson = require('read-package-json-fast')
 const npmlog = require('npmlog')
@@ -15,7 +15,6 @@ const nocolor = {
 const run = async ({
   args,
   call,
-  color,
   flatOptions,
   locationMsg,
   output = () => {},
@@ -26,6 +25,7 @@ const run = async ({
 }) => {
   // turn list of args into command string
   const script = call || args.shift() || scriptShell
+  const color = !!flatOptions.color
   const colorize = color ? chalk : nocolor
 
   // do the fakey runScript dance
@@ -44,10 +44,8 @@ const run = async ({
 
   try {
     if (script === scriptShell) {
-      const isTTY = !noTTY()
-
-      if (isTTY) {
-        if (ciDetect()) {
+      if (!noTTY()) {
+        if (ciInfo.isCI) {
           return log.warn('exec', 'Interactive mode disabled in CI environment')
         }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "libnpmexec",
-  "version": "5.0.2",
+  "version": "5.0.4",
   "files": [
     "bin/",
     "lib/"
@@ -51,17 +51,17 @@
   },
   "devDependencies": {
     "@npmcli/eslint-config": "^4.0.0",
-    "@npmcli/template-oss": "4.8.0",
+    "@npmcli/template-oss": "4.10.0",
     "bin-links": "^4.0.1",
     "minify-registry-metadata": "^2.2.0",
     "mkdirp": "^1.0.4",
     "tap": "^16.0.1"
   },
   "dependencies": {
-    "@npmcli/arborist": "^6.1.1",
-    "@npmcli/ci-detect": "^3.0.1",
+    "@npmcli/arborist": "^6.1.3",
     "@npmcli/run-script": "^6.0.0",
     "chalk": "^4.1.0",
+    "ci-info": "^3.6.1",
     "npm-package-arg": "^10.0.0",
     "npmlog": "^7.0.1",
     "pacote": "^15.0.2",
@@ -73,7 +73,7 @@
   },
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
-    "version": "4.8.0",
+    "version": "4.10.0",
     "content": "../../scripts/template-oss/index.js"
   }
 }