owlstronaut/tap upgrade

docs/bin/build.js

@@ -3,7 +3,9 @@ const { paths } = require('../lib/index')
 
 run(paths)
   .then((res) => console.error(`Wrote ${res.length} files`))
+  /* c8 ignore start - covered in istanbul not not in the c8 swap */
   .catch((err) => {
     process.exitCode = 1
     console.error(err)
   })
+  /* c8 ignore stop */

docs/lib/check-nav.js

@@ -17,9 +17,10 @@ function ensureNavigationComplete (nav, fsPaths, ext) {
     // otherwise its unmarked in the nav
     if (unmatchedFs[key]) {
       delete unmatchedFs[key]
-    } else {
+    } /* c8 ignore start - covered in istanbul not not in the c8 swap */ else {
       unmatchedNav[key] = true
     }
+    /* c8 ignore stop */
   }
 
   const toKeys = (v) => Object.keys(v).sort().map((p) => p.split(posix.sep).join(sep))
@@ -28,6 +29,7 @@ function ensureNavigationComplete (nav, fsPaths, ext) {
 
   const errors = []
 
+  /* c8 ignore start - covered in istanbul not not in the c8 swap */
   if (missingNav.length) {
     errors.push('The following path(s) exist on disk but are not present in /lib/content/nav.yml:')
     errors.push(...missingNav.map(n => `  ${n}`))
@@ -43,6 +45,7 @@ function ensureNavigationComplete (nav, fsPaths, ext) {
     errors.push('Update nav.yml to ensure that all files are listed in the appropriate place.')
     throw new Error(errors.join('\n'))
   }
+  /* c8 ignore stop */
 }
 
 function getNavigationPaths (entries) {

docs/lib/index.js

@@ -14,11 +14,13 @@ const TAGS = {
 }
 
 const assertPlaceholder = (src, path, placeholder) => {
+  /* c8 ignore start - covered in istanbul not not in the c8 swap */
   if (!src.includes(placeholder)) {
     throw new Error(
       `Cannot replace ${placeholder} in ${path} due to missing placeholder`
     )
   }
+  /* c8 ignore stop */
   return placeholder
 }
 

docs/lib/transform-html.js

@@ -40,8 +40,10 @@ function transformHTML (
       case 'version':
         return version
 
+      /* c8 ignore start - covered in istanbul not not in the c8 swap */
       default:
         throw new Error(`warning: unknown token '${token}' in ${path}`)
+      /* c8 ignore stop */
     }
   })
 
@@ -62,7 +64,7 @@ function transformHTML (
 
       if (url.startsWith('/')) {
         const childDepth = path.split('/').length - 1
-        const prefix = childDepth > 0 ? '../'.repeat(childDepth) : './'
+        const prefix = childDepth > 0 ? '../'.repeat(childDepth) : /* c8 ignore start - covered in istanbul not not in the c8 swap */ './' /* c8 ignore stop */
 
         url = url.replace(/^\//, prefix)
 

docs/package.json

@@ -33,7 +33,7 @@
     "remark-parse": "^10.0.1",
     "remark-rehype": "^10.1.0",
     "semver": "^7.3.8",
-    "tap": "^16.3.8",
+    "tap": "^21.1.0",
     "unified": "^10.1.2",
     "yaml": "^2.2.1"
   },

lib/base-cmd.js

@@ -31,10 +31,11 @@ class BaseCommand {
       let results = ''
       let line = ''
       for (const param of params) {
-        /* istanbul ignore next */
+        /* c8 ignore start */
         if (seenExclusive.has(param)) {
           continue
         }
+        /* c8 ignore stop */
         const { exclusive } = definitions[param]
         let paramUsage = `${definitions[param].usage}`
         if (exclusive) {

lib/cli.js

@@ -1,10 +1,11 @@
 try {
   const { enableCompileCache } = require('node:module')
-  /* istanbul ignore next */
+  /* c8 ignore start */
   if (enableCompileCache) {
     enableCompileCache()
   }
-} catch (e) { /* istanbul ignore next */ }
+  /* c8 ignore stop */
+} catch (e) { /* c8 ignore next */ }
 
 const validateEngines = require('./cli/validate-engines.js')
 const cliEntry = require('node:path').resolve(__dirname, 'cli/entry.js')

lib/cli/validate-engines.js

@@ -17,7 +17,7 @@ module.exports = (process, getCli) => {
 
   // coverage ignored because this is only hit in very unsupported node versions
   // and it's a best effort attempt to show something nice in those cases
-  /* istanbul ignore next */
+  /* c8 ignore start */
   const syntaxErrorHandler = (err) => {
     if (err instanceof SyntaxError) {
       // eslint-disable-next-line no-console
@@ -28,6 +28,7 @@ module.exports = (process, getCli) => {
     }
     throw err
   }
+  /* c8 ignore stop */
 
   process.on('uncaughtException', syntaxErrorHandler)
   process.on('unhandledRejection', syntaxErrorHandler)

lib/commands/completion.js

@@ -163,9 +163,10 @@ class Completion extends BaseCommand {
         const comps = await completion(opts, this.npm)
         return this.wrap(opts, comps)
       }
-    } catch {
+    } /* c8 ignore start - covered in istanbul not not in the c8 swap */ catch {
       // it wasnt a valid command, so do nothing
     }
+    /* c8 ignore stop */
   }
 
   // The command should respond with an array.  Loop over that,
@@ -212,12 +213,12 @@ const dumpScript = async (p) => {
       // errors, so casually.  But, without this, `. <(npm completion)`
       // can never ever work on OS X.
       // TODO Ignoring coverage, see 'non EPIPE errors cause failures' test.
-      /* istanbul ignore next */
-      if (er.errno === 'EPIPE') {
+      if (er.errno === 'EPIPE') /* c8 ignore next */ {
         res()
-      } else {
+      } /* c8 ignore start - covered in istanbul not not in the c8 swap */ else {
         rej(er)
       }
+      /* c8 ignore stop */
     })
 
     process.stdout.write(d, () => {

lib/commands/config.js

@@ -57,11 +57,13 @@ const isProtected = (k) => {
     }
     // //registry:_authToken or //registry:authToken
     for (const p of protected) {
-      if (k.endsWith(`:${p}`) || k.endsWith(`:_${p}`)) {
+      if (k.endsWith(`:${p}`) || /* c8 ignore start - covered in istanbul not not in the c8 swap */ k.endsWith(`:_${p}`) /* c8 ignore stop */) {
         return true
       }
     }
+  /* c8 ignore start - covered in istanbul not not in the c8 swap */
   }
+  /* c8 ignore stop */
   return false
 }
 
@@ -290,10 +292,11 @@ ${defData}
       return // if validate doesn't throw we have nothing to do
     } catch (err) {
       // coverage skipped because we don't need to test rethrowing errors
-      // istanbul ignore next
+      /* c8 ignore start */
       if (err.code !== 'ERR_INVALID_AUTH') {
         throw err
       }
+      /* c8 ignore stop */
 
       problems = err.problems
     }
@@ -310,12 +313,11 @@ ${defData}
     output.standard('The following configuration problems have been repaired:\n')
     const summary = problems.map(({ action, from, to, key, where }) => {
       // coverage disabled for else branch because it is intentionally omitted
-      // istanbul ignore else
       if (action === 'rename') {
         // we keep track of which configs were modified here so we know what to save later
         locations.push(where)
         return `~ \`${from}\` renamed to \`${to}\` in ${where} config`
-      } else if (action === 'delete') {
+      } /* c8 ignore next */ else if (action === 'delete') {
         locations.push(where)
         return `- \`${key}\` deleted from ${where} config`
       }

lib/commands/diff.js

@@ -177,7 +177,9 @@ class Diff extends BaseCommand {
         for (const edge of node.edgesIn) {
           return edge.spec
         }
+      /* c8 ignore start - covered in istanbul not not in the c8 swap */
       }
+      /* c8 ignore stop */
 
       const aSpec = `file:${node.realpath}`
 

lib/commands/edit.js

@@ -34,10 +34,11 @@ class Edit extends BaseCommand {
   static ignoreImplicitWorkspace = false
 
   // TODO
-  /* istanbul ignore next */
+  /* c8 ignore start */
   static async completion (opts, npm) {
     return completion(npm, opts)
   }
+  /* c8 ignore stop */
 
   async exec (args) {
     if (args.length !== 1) {

lib/commands/explain.js

@@ -18,11 +18,12 @@ class Explain extends ArboristWorkspaceCmd {
   static ignoreImplicitWorkspace = false
 
   // TODO
-  /* istanbul ignore next */
+  /* c8 ignore start */
   static async completion (opts, npm) {
     const completion = require('../utils/installed-deep.js')
     return completion(npm, opts)
   }
+  /* c8 ignore stop */
 
   async exec (args) {
     if (!args.length) {

lib/commands/explore.js

@@ -15,10 +15,11 @@ class Explore extends BaseCommand {
   static ignoreImplicitWorkspace = false
 
   // TODO
-  /* istanbul ignore next */
+  /* c8 ignore start */
   static async completion (opts, npm) {
     return completion(npm, opts)
   }
+  /* c8 ignore stop */
 
   async exec (args) {
     if (args.length < 1 || !args[0]) {

lib/commands/fund.js

@@ -35,11 +35,12 @@ class Fund extends ArboristWorkspaceCmd {
   }
 
   // TODO
-  /* istanbul ignore next */
+  /* c8 ignore start */
   static async completion (opts, npm) {
     const completion = require('../utils/installed-deep.js')
     return completion(npm, opts)
   }
+  /* c8 ignore stop */
 
   async exec (args) {
     const spec = args[0]
@@ -166,7 +167,9 @@ class Fund extends ArboristWorkspaceCmd {
               return item.package
             }
           }
+        /* c8 ignore start - covered in istanbul not not in the c8 swap */
         }
+        /* c8 ignore stop */
       } else {
         // tries to retrieve a package from arborist inventory
         // by matching resulted package name from the provided spec

lib/commands/get.js

@@ -9,11 +9,12 @@ class Get extends BaseCommand {
   static ignoreImplicitWorkspace = false
 
   // TODO
-  /* istanbul ignore next */
+  /* c8 ignore start */
   static async completion (opts) {
     const Config = Npm.cmd('config')
     return Config.completion(opts)
   }
+  /* c8 ignore stop */
 
   async exec (args) {
     return this.npm.exec('config', ['get'].concat(args))

lib/commands/help-search.js

@@ -128,7 +128,7 @@ class HelpSearch extends BaseCommand {
 
     // coverage is ignored here because the contents of results are
     // nondeterministic due to either glob or readFiles or Object.entries
-    return results.sort(/* istanbul ignore next */ (a, b) =>
+    return results.sort(/* c8 ignore next */ (a, b) =>
       a.found.length > b.found.length ? -1
       : a.found.length < b.found.length ? 1
       : a.totalHits > b.totalHits ? -1

lib/commands/link.js

@@ -164,10 +164,11 @@ class Link extends ArboristWorkspaceCmd {
       const argFound = [...nodes].every(node => {
         // TODO: write tests for unmatching version specs, this is hard to test
         // atm but should be simple once we have a mocked registry again
-        if (arg.name !== node.name /* istanbul ignore next */ || (
+        if (arg.name !== node.name /* c8 ignore next */ || (
+          /* c8 ignore start - covered in istanbul not not in the c8 swap */
           arg.version &&
-          /* istanbul ignore next */
           !semver.satisfies(node.version, arg.version)
+          /* c8 ignore stop */
         )) {
           foundNodes.push(node)
           return true

lib/commands/ls.js

@@ -40,11 +40,12 @@ class LS extends ArboristWorkspaceCmd {
   ]
 
   // TODO
-  /* istanbul ignore next */
+  /* c8 ignore start */
   static async completion (opts, npm) {
     const completion = require('../utils/installed-deep.js')
     return completion(npm, opts)
   }
+  /* c8 ignore stop */
 
   async exec (args) {
     const all = this.npm.config.get('all')

lib/commands/rebuild.js

@@ -18,11 +18,12 @@ class Rebuild extends ArboristWorkspaceCmd {
   static usage = ['[<package-spec>] ...]']
 
   // TODO
-  /* istanbul ignore next */
+  /* c8 ignore start */
   static async completion (opts, npm) {
     const completion = require('../utils/installed-deep.js')
     return completion(npm, opts)
   }
+  /* c8 ignore stop */
 
   async exec (args) {
     const globalTop = resolve(this.npm.globalDir, '..')

lib/commands/repo.js

@@ -41,10 +41,11 @@ const unknownHostedUrl = url => {
       pathname,
     } = new URL(url)
 
-    /* istanbul ignore next - URL ctor should prevent this */
+    /* c8 ignore start - URL ctor should prevent this */
     if (!protocol || !hostname) {
       return null
     }
+    /* c8 ignore stop */
 
     const proto = /(git\+)http:$/.test(protocol) ? 'http:' : 'https:'
     const path = pathname.replace(/\.git$/, '')

lib/commands/sbom.js

@@ -119,7 +119,7 @@ const detectErrors = (node) => {
     }
 
     if (edge.invalid) {
-      /* istanbul ignore next */
+      /* c8 ignore next */
       const spec = edge.spec || '*'
       const from = edge.from.pkgid
       errors.push(`invalid: ${edge.to.pkgid}, ${spec} required by ${from}`)

lib/commands/set.js

@@ -9,11 +9,12 @@ class Set extends BaseCommand {
   static ignoreImplicitWorkspace = false
 
   // TODO
-  /* istanbul ignore next */
+  /* c8 ignore start */
   static async completion (opts) {
     const Config = Npm.cmd('config')
     return Config.completion(opts)
   }
+  /* c8 ignore stop */
 
   async exec (args) {
     if (!args.length) {

lib/commands/star.js

@@ -66,7 +66,9 @@ class Star extends BaseCommand {
       log.verbose('star', data)
       return data
     }
+  /* c8 ignore start - covered in istanbul not not in the c8 swap */
   }
+  /* c8 ignore stop */
 }
 
 module.exports = Star

lib/commands/uninstall.js

@@ -12,10 +12,11 @@ class Uninstall extends ArboristWorkspaceCmd {
   static ignoreImplicitWorkspace = false
 
   // TODO
-  /* istanbul ignore next */
+  /* c8 ignore start */
   static async completion (opts, npm) {
     return completion(npm, opts)
   }
+  /* c8 ignore stop */
 
   async exec (args) {
     if (!args.length) {