libnpmexec 3.0.1 → 4.0.0

package/README.md

@@ -35,7 +35,6 @@ await libexec({
   - `color`: Output should use color? **Boolean**, defaults to `false`
   - `localBin`: Location to the `node_modules/.bin` folder of the local project to start scanning for bin files **String**, defaults to `./node_modules/.bin`. **libexec** will walk up the directory structure looking for `node_modules/.bin` folders in parent folders that might satisfy the current `arg` and will use that bin if found.
   - `locationMsg`: Overrides "at location" message when entering interactive mode **String**
-  - `log`: Sets an optional logger **Object**, defaults to `proc-log` module usage.
   - `globalBin`: Location to the global space bin folder, same as: `$(npm bin -g)` **String**, defaults to empty string.
   - `output`: A function to print output to **Function**
   - `packages`: A list of packages to be used (possibly fetch from the registry) **Array<String>**, defaults to `[]`

package/lib/cache-install-dir.js

@@ -3,8 +3,9 @@ const crypto = require('crypto')
 const { resolve } = require('path')
 
 const cacheInstallDir = ({ npxCache, packages }) => {
-  if (!npxCache)
+  if (!npxCache) {
     throw new Error('Must provide a valid npxCache path')
+  }
 
   // only packages not found in ${prefix}/node_modules
   return resolve(npxCache, getHash(packages))

package/lib/file-exists.js

@@ -13,11 +13,13 @@ const localFileExists = async (dir, binName, root = '/') => {
   for (const path of walkUp(resolve(dir))) {
     const binDir = resolve(path, 'node_modules', '.bin')
 
-    if (await fileExists(resolve(binDir, binName)))
+    if (await fileExists(resolve(binDir, binName))) {
       return binDir
+    }
 
-    if (path.toLowerCase() === root)
+    if (path.toLowerCase() === root) {
       return false
+    }
   }
 
   return false

package/lib/get-bin-from-manifest.js

@@ -3,13 +3,15 @@ const getBinFromManifest = (mani) => {
   // otherwise if there's 1 bin or all bin value is the same (alias), use
   // that, otherwise fail
   const bin = mani.bin || {}
-  if (new Set(Object.values(bin)).size === 1)
+  if (new Set(Object.values(bin)).size === 1) {
     return Object.keys(bin)[0]
+  }
 
   // XXX probably a util to parse this better?
   const name = mani.name.replace(/^@[^/]+\//, '')
-  if (bin[name])
+  if (bin[name]) {
     return name
+  }
 
   // XXX need better error message
   throw Object.assign(new Error('could not determine executable to run'), {

package/lib/index.js

@@ -4,7 +4,8 @@ const read = promisify(require('read'))
 
 const Arborist = require('@npmcli/arborist')
 const ciDetect = require('@npmcli/ci-detect')
-const logger = require('proc-log')
+const log = require('proc-log')
+const npmlog = require('npmlog')
 const mkdirp = require('mkdirp-infer-owner')
 const npa = require('npm-package-arg')
 const pacote = require('pacote')
@@ -39,7 +40,6 @@ const exec = async (opts) => {
     yes = undefined,
     ...flatOptions
   } = opts
-  const log = flatOptions.log || logger
 
   // dereferences values because we manipulate it later
   const packages = [..._packages]
@@ -50,7 +50,6 @@ const exec = async (opts) => {
     color,
     flatOptions,
     locationMsg,
-    log,
     output,
     path,
     pathArr,
@@ -59,8 +58,9 @@ const exec = async (opts) => {
   })
 
   // nothing to maybe install, skip the arborist dance
-  if (!call && !args.length && !packages.length)
+  if (!call && !args.length && !packages.length) {
     return await _run()
+  }
 
   const needPackageCommandSwap = args.length && !packages.length
   // if there's an argument and no package has been explicitly asked for
@@ -79,8 +79,9 @@ const exec = async (opts) => {
       binExists = true
     }
 
-    if (binExists)
+    if (binExists) {
       return await _run()
+    }
 
     packages.push(args[0])
   }
@@ -109,8 +110,9 @@ const exec = async (opts) => {
     })
   }))
 
-  if (needPackageCommandSwap)
+  if (needPackageCommandSwap) {
     args[0] = getBinFromManifest(manis[0])
+  }
 
   // figure out whether we need to install stuff, or if local is fine
   const localArb = new Arborist({
@@ -150,8 +152,9 @@ const exec = async (opts) => {
     if (add.length) {
       if (!yes) {
         // set -n to always say no
-        if (yes === false)
+        if (yes === false) {
           throw new Error('canceled')
+        }
 
         if (noTTY() || ciDetect()) {
           log.warn('exec', `The following package${
@@ -165,11 +168,11 @@ const exec = async (opts) => {
           const prompt = `Need to install the following packages:\n${
           addList
         }Ok to proceed? `
-          if (typeof log.clearProgress === 'function')
-            log.clearProgress()
+          npmlog.clearProgress()
           const confirm = await read({ prompt, default: 'y' })
-          if (confirm.trim().toLowerCase().charAt(0) !== 'y')
+          if (confirm.trim().toLowerCase().charAt(0) !== 'y') {
             throw new Error('canceled')
+          }
         }
       }
       await arb.reify({

package/lib/manifest-missing.js

@@ -3,12 +3,14 @@ const manifestMissing = ({ tree, manifest }) => {
   // true means we need to install it
   const child = tree.children.get(manifest.name)
   // if no child, we have to load it
-  if (!child)
+  if (!child) {
     return true
+  }
 
   // if no version/tag specified, allow whatever's there
-  if (manifest._from === `${manifest.name}@`)
+  if (manifest._from === `${manifest.name}@`) {
     return false
+  }
 
   // otherwise the version has to match what we WOULD get
   return child.version !== manifest.version

package/lib/run-script.js

@@ -4,6 +4,8 @@ const chalk = require('chalk')
 const ciDetect = require('@npmcli/ci-detect')
 const runScript = require('@npmcli/run-script')
 const readPackageJson = require('read-package-json-fast')
+const npmlog = require('npmlog')
+const log = require('proc-log')
 const noTTY = require('./no-tty.js')
 
 const nocolor = {
@@ -18,7 +20,6 @@ const run = async ({
   color,
   flatOptions,
   locationMsg,
-  log,
   output = () => {},
   path,
   pathArr,
@@ -41,16 +42,16 @@ const run = async ({
     },
   }
 
-  if (log && log.disableProgress)
-    log.disableProgress()
+  npmlog.disableProgress()
 
   try {
     if (script === scriptShell) {
       const isTTY = !noTTY()
 
       if (isTTY) {
-        if (ciDetect())
+        if (ciDetect()) {
           return log.warn('exec', 'Interactive mode disabled in CI environment')
+        }
 
         locationMsg = locationMsg || ` at location:\n${colorize.dim(runPath)}`
 
@@ -78,8 +79,7 @@ const run = async ({
       stdio: 'inherit',
     })
   } finally {
-    if (log && log.enableProgress)
-      log.enableProgress()
+    npmlog.enableProgress()
   }
 }
 

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "libnpmexec",
-  "version": "3.0.1",
+  "version": "4.0.0",
   "files": [
+    "bin",
     "lib"
   ],
   "main": "lib/index.js",
@@ -28,38 +29,41 @@
   ],
   "license": "ISC",
   "scripts": {
-    "lint": "eslint lib/*.js",
-    "pretest": "npm run lint",
-    "test": "tap test/*.js",
-    "snap": "tap test/*.js",
+    "lint": "eslint '**/*.js'",
+    "posttest": "npm run lint",
+    "test": "tap",
+    "snap": "tap",
     "preversion": "npm test",
     "postversion": "npm publish",
-    "prepublishOnly": "git push origin --follow-tags"
+    "prepublishOnly": "git push origin --follow-tags",
+    "postlint": "npm-template-check",
+    "lintfix": "npm run lint -- --fix"
   },
   "tap": {
     "color": true,
-    "check-coverage": true
+    "check-coverage": true,
+    "files": "test/*.js"
   },
   "devDependencies": {
-    "bin-links": "^2.2.1",
-    "eslint": "^7.24.0",
-    "eslint-plugin-import": "^2.22.1",
-    "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^5.1.0",
-    "eslint-plugin-standard": "^5.0.0",
+    "@npmcli/template-oss": "^2.4.2",
+    "bin-links": "^3.0.0",
     "tap": "^15.0.6"
   },
   "dependencies": {
-    "@npmcli/arborist": "^4.0.0",
-    "@npmcli/ci-detect": "^1.3.0",
-    "@npmcli/run-script": "^2.0.0",
+    "@npmcli/arborist": "^5.0.0",
+    "@npmcli/ci-detect": "^2.0.0",
+    "@npmcli/run-script": "^3.0.0",
     "chalk": "^4.1.0",
     "mkdirp-infer-owner": "^2.0.0",
-    "npm-package-arg": "^8.1.2",
-    "pacote": "^12.0.0",
-    "proc-log": "^1.0.0",
+    "npm-package-arg": "^9.0.0",
+    "npmlog": "^6.0.1",
+    "pacote": "^13.0.2",
+    "proc-log": "^2.0.0",
     "read": "^1.0.7",
     "read-package-json-fast": "^2.0.2",
     "walk-up-path": "^1.0.0"
+  },
+  "templateOSS": {
+    "version": "2.4.3"
   }
 }