@modernpoacher/deps 2.2.18 → 2.2.20

package/bin/node/execute.mjs

@@ -1,7 +1,5 @@
 #!/usr/bin/env node
 
-import debug from 'debug'
-
 import {
   resolve,
   dirname
@@ -15,7 +13,7 @@ import {
   Command
 } from 'commander'
 
-import '#deps/src/common/debug'
+import debug from '#deps/src/common/debug'
 
 import {
   VERSION,
@@ -56,10 +54,14 @@ import {
 } from '#deps/bin/common'
 
 const log = debug('@modernpoacher/deps')
+const info = debug('@modernpoacher/deps:info')
 
 log(`\`execute\` (${VERSION} - ${PLATFORM}) is awake`)
 
-function handleCommandError (e) {
+/**
+ *  @param {{ code?: number, message?: string }} [e]
+ */
+function handleCommandError (e = {}) {
   const {
     code = 0
   } = e
@@ -67,6 +69,10 @@ function handleCommandError (e) {
   if (code !== 128) handleError(e)
 }
 
+/**
+ *  @param {string} directory
+ *  @returns {Promise<string>}
+ */
 async function getDefaultBranch (directory) {
   const branch = await catGitRefsRemotesOriginHead(directory)
   if (branch) return branch
@@ -75,12 +81,20 @@ async function getDefaultBranch (directory) {
   )
 }
 
+/**
+ *  @param {string} directory
+ *  @returns {Promise<string>}
+ */
 async function getCurrentBranch (directory) {
   return (
     await gitRevParseAbbrevRefHead(directory)
   )
 }
 
+/**
+ *  @param {string} directory
+ *  @returns {Promise<boolean>}
+ */
 async function isHeadDefaultBranch (directory) {
   const defaultBranch = await getDefaultBranch(directory)
   const currentBranch = await getCurrentBranch(directory)
@@ -91,9 +105,8 @@ async function isHeadDefaultBranch (directory) {
 
 /**
  *  @function getIgnoreFromConfiguration
- *
+ *  @description
  *  Interrogates `.depsrc` or `.depsrc.json` for an `ignore` value
- *
  *  @param {string} directory
  *  @returns {Promise<boolean>}
  */
@@ -113,11 +126,10 @@ async function getIgnoreFromConfiguration (directory) {
 
 /**
  *  @function getAuthorFromConfiguration
- *
+ *  @description
  *  Interrogates `.depsrc` or `.depsrc.json` for an `author` value
- *
  *  @param {string} directory
- *  @returns {Promise<string|null>}
+ *  @returns {Promise<string | null>}
  */
 async function getAuthorFromConfiguration (directory) {
   log('getAuthorFromConfiguration')
@@ -135,11 +147,10 @@ async function getAuthorFromConfiguration (directory) {
 
 /**
  *  @function getAuthorFromPackage
- *
+ *  @description
  *  Interrogates `package.json` for an `author` value
- *
  *  @param {string} directory
- *  @returns {Promise<string|null>}
+ *  @returns {Promise<string | null>}
  */
 async function getAuthorFromPackage (directory) {
   log('getAuthorFromPackage')
@@ -157,11 +168,10 @@ async function getAuthorFromPackage (directory) {
 
 /**
  *  @function getMessageFromConfiguration
- *
+ *  @description
  *  Interrogates `.depsrc` or `.depsrc.json` for a `message` value
- *
  *  @param {string} directory
- *  @returns {Promise<string|null>}
+ *  @returns {Promise<string | null>}
  */
 async function getMessageFromConfiguration (directory) {
   log('getMessageFromConfiguration')
@@ -179,15 +189,14 @@ async function getMessageFromConfiguration (directory) {
 
 /**
  *  @function toAuthor
- *
+ *  @description
  *  Ensures that the `author` is set either from the command line,
  *  configuration, package, or a default
  *
  *  Since it can be null `author` may not default in function arguments
- *
- *  @param {string|null} author
+ *  @param {string | { name: string; email: string }} author
  *  @param {string} directory
- *  @returns {Promise<string>}
+ *  @returns {Promise<string | { name: string; email: string }>}
  */
 async function toAuthor (author, directory) {
   return author || await getAuthorFromConfiguration(directory) || await getAuthorFromPackage(directory) || AUTHOR
@@ -195,13 +204,12 @@ async function toAuthor (author, directory) {
 
 /**
  *  @function toMessage
- *
+ *  @description
  *  Ensures that the `message` is set either from the command line,
  *  configuration, or a default
  *
  *  Since it can be null `message` may not default in function arguments
- *
- *  @param {string|null} message
+ *  @param {string | null} message
  *  @param {string} directory
  *  @returns {Promise<string>}
  */
@@ -209,14 +217,31 @@ async function toMessage (message, directory) {
   return message || await getMessageFromConfiguration(directory) || MESSAGE
 }
 
-const filterDeps = (v) => !!v // de-falsy
+/**
+ *  @param {string | undefined} v
+ *  @returns {boolean}
+ */
+const filterDeps = (v) => Boolean(v) // de-falsy
 
-const reduceDeps = (a, v) => a.includes(v) ? a : a.concat(v) // de-dupe
+/**
+ *  @param {string[]} a
+ *  @param {string} v
+ *  @returns {string[]}
+ */
+const reduceDeps = (a, v = '') => a.includes(v) ? a : a.concat(v) // de-dupe
 
+/**
+ *  @param {string[]} directories
+ *  @yields {string | undefined}
+ */
 function * genDirsList (directories = []) {
   while (directories.length) yield directories.shift()
 }
 
+/**
+ *  @param {string} directory
+ *  @returns {Promise<string[]>}
+ */
 async function getPathList (directory) {
   log('getPathList')
 
@@ -229,9 +254,16 @@ async function getPathList (directory) {
   )
 }
 
+/**
+ *  @param {Array<string | undefined>} [directories]
+ *  @returns {Promise<string[]>}
+ */
 async function getDepsList (directories = []) {
   log('getDepsList')
 
+  /**
+   *  Transform `directories` to create `alpha`
+   */
   const alpha = (
     directories
       .filter(filterDeps)
@@ -240,19 +272,39 @@ async function getDepsList (directories = []) {
   )
 
   try {
-    const omega = await Promise.all(alpha.map(mapRevParseShowTopLevel))
+    /**
+     *  Recreate `directories` from `alpha`
+     *  @type {Array<string | undefined>}
+     */
+    const directories = (
+      await Promise.all(
+        alpha
+          .map(mapRevParseShowTopLevel)
+      )
+    )
 
-    return (
-      omega
+    /**
+     *  Transform `directories` to create `omega`
+     */
+    const omega = (
+      directories
         .filter(filterDeps)
         .reduce(reduceDeps, [])
         .sort()
     )
+
+    return omega
   } catch (e) {
-    handleError(e)
+    if (e instanceof Error) handleError(e)
   }
+
+  return []
 }
 
+/**
+ *  @param {string} directory
+ *  @returns {Promise<string | undefined>}
+ */
 async function mapRevParseShowTopLevel (directory) {
   log('mapRevParseShowTopLevel')
 
@@ -261,10 +313,18 @@ async function mapRevParseShowTopLevel (directory) {
       await gitRevParseShowTopLevel(directory)
     )
   } catch (e) {
-    handleCommandError(e)
+    if (e instanceof Error) handleCommandError(e)
   }
 }
 
+/**
+ *  @param {string} directory
+ *  @param {string} registry
+ *  @param {boolean} force
+ *  @param {string} message
+ *  @param {string | { name: string; email: string }} author
+ *  @returns {Promise<void>}
+ */
 async function iterate (directory, registry, force, message, author) {
   log('iterate')
 
@@ -282,11 +342,18 @@ async function iterate (directory, registry, force, message, author) {
         }
       }
     } catch (e) {
-      handleCommandError(e)
+      if (e instanceof Error) handleCommandError(e)
     }
   }
 }
 
+/**
+ *  @param {string} directory
+ *  @param {string} registry
+ *  @param {boolean} force
+ *  @param {string} message
+ *  @param {string | { name: string; email: string }} author
+ */
 async function iteratePath (directory, registry, force, message, author) {
   log('iteratePath')
 
@@ -299,17 +366,29 @@ async function iteratePath (directory, registry, force, message, author) {
       const depsList = await getDepsList(pathList)
 
       if (depsList.length) {
-        for (const d of genDirsList(depsList)) await iterate(d, registry, force, message, author)
+        for (const d of genDirsList(depsList)) if (d) await iterate(d, registry, force, message, author)
       }
     }
   }
 }
 
+/**
+ *  @param {string} directory
+ *  @param {string} registry
+ *  @param {boolean} force
+ *  @param {string} message
+ *  @param {string | { name: string; email: string }} author
+ *  @returns {Promise<void>}
+ */
 async function execute (directory = DIRECTORY, registry = REGISTRY, force = false, message = MESSAGE, author = AUTHOR) {
   log('execute')
 
   try {
-    log({ directory, registry, force, message, author })
+    info(`Directory is "${directory}"`)
+    info(`Registry is "${registry}"`)
+    info(`Force is "${force}"`)
+    info(`Message is "${message}"`)
+    info(`Author is "${author}"`)
 
     await gitPull(directory)
     await rmrf(directory)
@@ -320,10 +399,18 @@ async function execute (directory = DIRECTORY, registry = REGISTRY, force = fals
     await gitPush(directory)
     await gitPushTags(directory)
   } catch (e) {
-    handleError(e)
+    if (e instanceof Error) handleError(e)
   }
 }
 
+/**
+ *  @param {string} directory
+ *  @param {string} registry
+ *  @param {boolean} force
+ *  @param {string} message
+ *  @param {string | { name: string; email: string }} author
+ *  @returns {Promise<void>}
+ */
 async function executeFrom (directory, registry, force, message, author) {
   log('executeFrom')
 
@@ -333,19 +420,29 @@ async function executeFrom (directory, registry, force, message, author) {
     try {
       if (D === await gitRevParseShowTopLevel(D)) {
         const B = await isHeadDefaultBranch(D)
+
         if (B) {
           const ignore = await getIgnoreFromConfiguration(D)
+
           if (!ignore) {
             await execute(D, registry, force, await toMessage(message, D), await toAuthor(author, D))
           }
         }
       }
     } catch (e) {
-      handleCommandError(e)
+      if (e instanceof Error) handleCommandError(e)
     }
   }
 }
 
+/**
+ *  @param {string} directory
+ *  @param {string} registry
+ *  @param {boolean} force
+ *  @param {string} message
+ *  @param {string | { name: string; email: string }} author
+ *  @returns {Promise<void>}
+ */
 async function executeOnly (directory, registry, force, message, author) {
   log('executeOnly')
 
@@ -355,19 +452,29 @@ async function executeOnly (directory, registry, force, message, author) {
     try {
       if (D === await gitRevParseShowTopLevel(D)) {
         const B = await isHeadDefaultBranch(D)
+
         if (B) {
           const ignore = await getIgnoreFromConfiguration(D)
+
           if (!ignore) {
             await execute(D, registry, force, await toMessage(message, D), await toAuthor(author, D))
           }
         }
       }
     } catch (e) {
-      handleCommandError(e)
+      if (e instanceof Error) handleCommandError(e)
     }
   }
 }
 
+/**
+ *  @param {string} directory
+ *  @param {string} registry
+ *  @param {boolean} force
+ *  @param {string} message
+ *  @param {string | { name: string; email: string }} author
+ *  @returns {Promise<void>}
+ */
 async function executePath (directory, registry, force, message, author) {
   log('executePath')
 
@@ -377,15 +484,17 @@ async function executePath (directory, registry, force, message, author) {
     try {
       if (D === await gitRevParseShowTopLevel(D)) {
         const B = await isHeadDefaultBranch(D)
+
         if (B) {
           const ignore = await getIgnoreFromConfiguration(D)
+
           if (!ignore) {
             await execute(D, registry, force, await toMessage(message, D), await toAuthor(author, D))
           }
         }
       }
     } catch (e) {
-      const {
+      const { // @ts-expect-error
         code
       } = e
 
@@ -395,11 +504,14 @@ async function executePath (directory, registry, force, message, author) {
         )
       }
 
-      handleCommandError(e)
+      if (e instanceof Error) handleCommandError(e)
     }
   }
 }
 
+/**
+ *  @function app
+ */
 async function app () {
   log('Deps')
 
@@ -449,7 +561,7 @@ async function app () {
     try {
       await executePath(P, registry, force, message, author)
     } catch (e) {
-      handleError(e)
+      if (e instanceof Error) handleError(e)
     }
   } else {
     if (F) {
@@ -458,7 +570,7 @@ async function app () {
       try {
         await executeFrom(P, registry, force, message, author)
       } catch (e) {
-        handleError(e)
+        if (e instanceof Error) handleError(e)
       }
     } else {
       if (O) {
@@ -467,7 +579,7 @@ async function app () {
         try {
           await executeOnly(P, registry, force, message, author)
         } catch (e) {
-          handleError(e)
+          if (e instanceof Error) handleError(e)
         }
       }
     }

package/bin/node/head.mjs

@@ -4,39 +4,23 @@ import {
   exec
 } from 'node:child_process'
 
-import {
-  join
-} from 'node:path'
-
 import '#deps/src/common/debug'
 
-import {
-  PLATFORM,
-  BIN
-} from '#deps/src/common/env'
-
 import {
   getOptions
 } from '#deps/src/common/options'
 
 import {
-  getArgs,
+  HEAD,
+  ARGS,
   use,
   handleComplete
 } from '#deps/bin/common'
 
-const command = (
-  PLATFORM === 'win32'
-    ? `bash "${join(BIN, '.\\bash\\head.sh')}"`
-    : `bash '${join(BIN, './bash/head.sh')}'`
-)
-
-const args = getArgs()
-
 const {
   stdout,
   stderr
-} = exec(`${command} ${args}`, getOptions(), handleComplete)
+} = exec(`${HEAD} ${ARGS}`, getOptions(), handleComplete)
 
-stdout.on('data', use('deps-head'))
-stderr.on('data', use('deps-head:error'))
+if (stdout) stdout.on('data', use('deps-head'))
+if (stderr) stderr.on('data', use('deps-head:error'))

package/bin/node/install.mjs

@@ -1,12 +1,10 @@
 #!/usr/bin/env node
 
-import debug from 'debug'
-
 import {
   Command
 } from 'commander'
 
-import '#deps/src/common/debug'
+import debug from '#deps/src/common/debug'
 
 import {
   VERSION,
@@ -37,6 +35,9 @@ const log = debug('@modernpoacher/deps')
 
 log(`\`install\` (${VERSION} - ${PLATFORM}) is awake`)
 
+/**
+ *  @function app
+ */
 async function app () {
   log('Deps')
 
@@ -115,7 +116,7 @@ async function app () {
     try {
       await execute(DEPS_PATH, getProdDependencies(PACKAGE), getProdDependencies(CONFIGURATION), save, registry, force)
     } catch (e) {
-      handleError(e)
+      if (e instanceof Error) handleError(e)
     }
   } else {
     if (D) {
@@ -124,7 +125,7 @@ async function app () {
       try {
         await execute(DEPS_PATH, getDevDependencies(PACKAGE), getDevDependencies(CONFIGURATION), save, registry, force)
       } catch (e) {
-        handleError(e)
+        if (e instanceof Error) handleError(e)
       }
     } else {
       if (O) {
@@ -133,7 +134,7 @@ async function app () {
         try {
           await execute(DEPS_PATH, getOptionalDependencies(PACKAGE), getOptionalDependencies(CONFIGURATION), save, registry, force)
         } catch (e) {
-          handleError(e)
+          if (e instanceof Error) handleError(e)
         }
       } else {
         if (B) {
@@ -142,7 +143,7 @@ async function app () {
           try {
             await execute(DEPS_PATH, getBundleDependencies(PACKAGE), getBundleDependencies(CONFIGURATION), save, registry, force)
           } catch (e) {
-            handleError(e)
+            if (e instanceof Error) handleError(e)
           }
         } else {
           if (p) {
@@ -151,7 +152,7 @@ async function app () {
             try {
               await execute(DEPS_PATH, getPeerDependencies(PACKAGE), getPeerDependencies(CONFIGURATION), save, registry, force)
             } catch (e) {
-              handleError(e)
+              if (e instanceof Error) handleError(e)
             }
           }
         }

package/bin/node/push.mjs

@@ -4,39 +4,23 @@ import {
   exec
 } from 'node:child_process'
 
-import {
-  join
-} from 'node:path'
-
 import '#deps/src/common/debug'
 
-import {
-  PLATFORM,
-  BIN
-} from '#deps/src/common/env'
-
 import {
   getOptions
 } from '#deps/src/common/options'
 
 import {
-  getArgs,
+  PUSH,
+  ARGS,
   use,
   handleComplete
 } from '#deps/bin/common'
 
-const command = (
-  PLATFORM === 'win32'
-    ? `bash "${join(BIN, '.\\bash\\push.sh')}"`
-    : `bash '${join(BIN, './bash/push.sh')}'`
-)
-
-const args = getArgs()
-
 const {
   stdout,
   stderr
-} = exec(`${command} ${args}`, getOptions(), handleComplete)
+} = exec(`${PUSH} ${ARGS}`, getOptions(), handleComplete)
 
-stdout.on('data', use('deps-push'))
-stderr.on('data', use('deps-push:error'))
+if (stdout) stdout.on('data', use('deps-push'))
+if (stderr) stderr.on('data', use('deps-push:error'))

package/bin/node/wipe.mjs

@@ -4,39 +4,23 @@ import {
   exec
 } from 'node:child_process'
 
-import {
-  join
-} from 'node:path'
-
 import '#deps/src/common/debug'
 
-import {
-  PLATFORM,
-  BIN
-} from '#deps/src/common/env'
-
 import {
   getOptions
 } from '#deps/src/common/options'
 
 import {
-  getArgs,
+  WIPE,
+  ARGS,
   use,
   handleComplete
 } from '#deps/bin/common'
 
-const command = (
-  PLATFORM === 'win32'
-    ? `bash "${join(BIN, '.\\bash\\wipe.sh')}"`
-    : `bash '${join(BIN, './bash/wipe.sh')}'`
-)
-
-const args = getArgs()
-
 const {
   stdout,
   stderr
-} = exec(`${command} ${args}`, getOptions(), handleComplete)
+} = exec(`${WIPE} ${ARGS}`, getOptions(), handleComplete)
 
-stdout.on('data', use('deps-wipe'))
-stderr.on('data', use('deps-wipe:error'))
+if (stdout) stdout.on('data', use('deps-wipe'))
+if (stderr) stderr.on('data', use('deps-wipe:error'))