@modernpoacher/deps 2.2.31 → 2.2.32

package/bin/bash/deps.sh

@@ -7,13 +7,6 @@ source "$BIN/common.sh"
 
 source_home "$BIN"
 
-# echo SSH auth sock is $SSH_AUTH_SOCK
-# echo Home is $HOME
-# echo Path is $PATH
-
-# echo DIR is $DIR
-# echo BIN is $BIN
-
 EXP="[-0-9a-zA-Z]*$"
 
 function update {

package/bin/bash/head.sh

@@ -7,13 +7,6 @@ source "$BIN/common.sh"
 
 source_home "$BIN"
 
-# echo SSH auth sock is $SSH_AUTH_SOCK
-# echo Home is $HOME
-# echo Path is $PATH
-
-# echo DIR is $DIR
-# echo BIN is $BIN
-
 EXP="[-0-9a-zA-Z]*$"
 
 function report {

package/bin/bash/push.sh

@@ -7,13 +7,6 @@ source "$BIN/common.sh"
 
 source_home "$BIN"
 
-# echo SSH auth sock is $SSH_AUTH_SOCK
-# echo Home is $HOME
-# echo Path is $PATH
-
-# echo DIR is $DIR
-# echo BIN is $BIN
-
 EXP="[-0-9a-zA-Z]*$"
 
 function report {

package/bin/bash/wipe.sh

@@ -7,13 +7,6 @@ source "$BIN/common.sh"
 
 source_home "$BIN"
 
-# echo SSH auth sock is $SSH_AUTH_SOCK
-# echo Home is $HOME
-# echo Path is $PATH
-
-# echo DIR is $DIR
-# echo BIN is $BIN
-
 EXP="[-0-9a-zA-Z]*$"
 
 function has_git {

package/bin/common/index.mjs

@@ -16,6 +16,8 @@
  *  @returns {void}
  */
 
+import stripAnsi from 'strip-ansi'
+
 import {
   argv
 } from 'node:process'
@@ -41,11 +43,6 @@ import {
 
 import debug from '#deps/src/common/debug'
 
-import {
-  use,
-  tidy
-} from '#deps/src/common/format'
-
 import {
   VERSION,
   PLATFORM,
@@ -79,14 +76,31 @@ const CODE = 0
 
 const MESSAGE = 'Either no error message has been defined or no error has been supplied'
 
+const LF = String.fromCodePoint(10)
 const SP = String.fromCodePoint(32)
 
 /**
  *  @param {string} v
  *  @returns {string}
  */
-export {
-  tidy
+export function trim (v) {
+  return v.split(LF).map(trimEnd).join(LF).trim()
+}
+
+/**
+ *  @param {string} v
+ *  @returns {string}
+ */
+export function trimEnd (v) {
+  return v.trimEnd()
+}
+
+/**
+ *  @param {string} v
+ *  @returns {string}
+ */
+export function tidy (v) {
+  return v.replace(/\n{2,}}/gm, LF).trim()
 }
 
 const getRmrfCommands = PLATFORM === 'win32'
@@ -141,6 +155,40 @@ export const ARGS = PLATFORM === 'win32'
   ? ARGV.map(toDouble).join(SP)
   : ARGV.map(toSingle).join(SP)
 
+/**
+ *  @param {string} v
+ *  @returns {boolean}
+ */
+function filter (v) {
+  return Boolean(stripAnsi(v).trim())
+}
+
+/**
+ *  @param {string} key
+ *  @returns {(value: string) => void}
+ */
+export function use (key) {
+  const log = debug(`@modernpoacher/deps:${key}`)
+
+  /**
+   *  @param {string} v
+   *  @returns {void}
+   */
+  function write (v) {
+    log(v.trimEnd())
+  }
+
+  /**
+   *  @param {string} value
+   *  @returns {void}
+   */
+  return function use (value) {
+    value.split(LF)
+      .filter(filter)
+      .forEach(write)
+  }
+}
+
 /**
  *  @param {{ code?: number, message?: string }} [e]
  */

package/bin/deps/deps.sh

@@ -7,11 +7,4 @@ source "$BIN/common.sh"
 
 source_home "$BIN"
 
-# echo SSH auth sock is $SSH_AUTH_SOCK
-# echo Home is $HOME
-# echo Path is $PATH
-
-# echo DIR is $DIR
-# echo BIN is $BIN
-
 node "$BIN/node/deps.mjs" "$@"

package/bin/deps/execute.sh

@@ -7,11 +7,4 @@ source "$BIN/common.sh"
 
 source_home "$BIN"
 
-# echo SSH auth sock is $SSH_AUTH_SOCK
-# echo Home is $HOME
-# echo Path is $PATH
-
-# echo DIR is $DIR
-# echo BIN is $BIN
-
 node "$BIN/node/execute.mjs" "$@"

package/bin/deps/head.sh

@@ -7,11 +7,4 @@ source "$BIN/common.sh"
 
 source_home "$BIN"
 
-# echo SSH auth sock is $SSH_AUTH_SOCK
-# echo Home is $HOME
-# echo Path is $PATH
-
-# echo DIR is $DIR
-# echo BIN is $BIN
-
 node "$BIN/node/head.mjs" "$@"

package/bin/deps/install.sh

@@ -7,11 +7,4 @@ source "$BIN/common.sh"
 
 source_home "$BIN"
 
-# echo SSH auth sock is $SSH_AUTH_SOCK
-# echo Home is $HOME
-# echo Path is $PATH
-
-# echo DIR is $DIR
-# echo BIN is $BIN
-
 node "$BIN/node/install.mjs" "$@"

package/bin/deps/push.sh

@@ -7,11 +7,4 @@ source "$BIN/common.sh"
 
 source_home "$BIN"
 
-# echo SSH auth sock is $SSH_AUTH_SOCK
-# echo Home is $HOME
-# echo Path is $PATH
-
-# echo DIR is $DIR
-# echo BIN is $BIN
-
 node "$BIN/node/push.mjs" "$@"

package/bin/deps/wipe.sh

@@ -7,11 +7,4 @@ source "$BIN/common.sh"
 
 source_home "$BIN"
 
-# echo SSH auth sock is $SSH_AUTH_SOCK
-# echo Home is $HOME
-# echo Path is $PATH
-
-# echo DIR is $DIR
-# echo BIN is $BIN
-
 node "$BIN/node/wipe.mjs" "$@"

package/bin/deps.sh

@@ -9,11 +9,4 @@ source "$BIN/common.sh"
 
 source_home "$BIN"
 
-# echo SSH auth sock is $SSH_AUTH_SOCK
-# echo Home is $HOME
-# echo Path is $PATH
-
-# echo DIR is $DIR
-# echo BIN is $BIN
-
 node "$BIN/deps.mjs" "$@"

package/bin/node/deps.mjs

@@ -6,9 +6,7 @@ import {
 
 import '#deps/src/common/write'
 
-import {
-  use
-} from '#deps/src/common/format'
+import '#deps/src/common/debug'
 
 import {
   getOptions
@@ -17,6 +15,7 @@ import {
 import {
   DEPS,
   ARGS,
+  use,
   handleComplete
 } from '#deps/bin/common'
 

package/bin/node/head.mjs

@@ -8,10 +8,6 @@ import '#deps/src/common/write'
 
 import '#deps/src/common/debug'
 
-import {
-  use
-} from '#deps/src/common/format'
-
 import {
   getOptions
 } from '#deps/src/common/options'
@@ -19,6 +15,7 @@ import {
 import {
   HEAD,
   ARGS,
+  use,
   handleComplete
 } from '#deps/bin/common'
 

package/bin/node/push.mjs

@@ -8,10 +8,6 @@ import '#deps/src/common/write'
 
 import '#deps/src/common/debug'
 
-import {
-  use
-} from '#deps/src/common/format'
-
 import {
   getOptions
 } from '#deps/src/common/options'
@@ -19,6 +15,7 @@ import {
 import {
   PUSH,
   ARGS,
+  use,
   handleComplete
 } from '#deps/bin/common'
 

package/bin/node/wipe.mjs

@@ -8,10 +8,6 @@ import '#deps/src/common/write'
 
 import '#deps/src/common/debug'
 
-import {
-  use
-} from '#deps/src/common/format'
-
 import {
   getOptions
 } from '#deps/src/common/options'
@@ -19,6 +15,7 @@ import {
 import {
   WIPE,
   ARGS,
+  use,
   handleComplete
 } from '#deps/bin/common'
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modernpoacher/deps",
-  "version": "2.2.31",
+  "version": "2.2.32",
   "description": "Update NPM package dependencies from the command line",
   "keywords": [
     "deps",
@@ -54,7 +54,7 @@
     "deps-wipe": "bin/deps/wipe.sh"
   },
   "dependencies": {
-    "@sequencemedia/write": "^0.2.8",
+    "@sequencemedia/write": "^0.2.9",
     "commander": "^14.0.1",
     "debug": "^4.4.3",
     "glob": "^11.0.3",
@@ -63,7 +63,7 @@
   },
   "devDependencies": {
     "@sequencemedia/eslint-config-standard": "^0.2.85",
-    "@sequencemedia/eslint-config-typescript": "^0.1.145",
+    "@sequencemedia/eslint-config-typescript": "^0.1.146",
     "@sequencemedia/eslint-merge": "^0.0.52",
     "@types/chai": "^5.2.2",
     "@types/debug": "^4.1.12",

package/src/common/git/index.mjs

@@ -21,11 +21,6 @@ import {
 
 import debug from '#deps/src/common/debug'
 
-import {
-  use,
-  trim
-} from '#deps/src/common/format'
-
 import {
   BIN,
   VERSION,
@@ -78,8 +73,28 @@ log(`\`common/git\` (${VERSION} - ${PLATFORM}) is awake`)
 
 const LF = String.fromCodePoint(10)
 
-export {
-  trim
+/**
+ *  @param {string} v
+ *  @returns {string}
+ */
+export function trim (v) {
+  return v.split(LF).map(trimEnd).join(LF).trim()
+}
+
+/**
+ *  @param {string} v
+ *  @returns {string}
+ */
+export function trimEnd (v) {
+  return v.trimEnd()
+}
+
+/**
+ *  @param {string} v
+ *  @returns {string}
+ */
+export function tidy (v) {
+  return v.replace(/\n{2,}}/gm, LF).trim()
 }
 
 /**
@@ -108,6 +123,32 @@ function isFatal (v) {
   return v.toLowerCase().startsWith('fatal: not a git repository')
 }
 
+/**
+ *  @param {string} key
+ *  @returns {(value: string) => void}
+ */
+export function use (key) {
+  const log = debug(`@modernpoacher/deps:${key}`)
+
+  /**
+   *  @param {string} v
+   *  @returns {void}
+   */
+  function write (v) {
+    log(v.trimEnd())
+  }
+
+  /**
+   *  @param {string} value
+   *  @returns {void}
+   */
+  return function use (value) {
+    value.split(LF)
+      .filter(filter)
+      .forEach(write)
+  }
+}
+
 /**
  *  @param {string} key
  *  @param {string} directory

package/src/common/index.mjs

@@ -13,10 +13,6 @@ import PATH from '#where-am-i'
 
 import debug from '#deps/src/common/debug'
 
-import {
-  tidy
-} from '#deps/src/common/format'
-
 import {
   VERSION,
   PLATFORM
@@ -34,8 +30,33 @@ const log = debug('@modernpoacher/deps')
 
 log(`\`common\` (${VERSION} - ${PLATFORM}) is awake`)
 
+const LF = String.fromCodePoint(10)
 const SP = String.fromCodePoint(32)
 
+/**
+ *  @param {string} v
+ *  @returns {string}
+ */
+export function trim (v) {
+  return v.split(LF).map(trimEnd).join(LF).trim()
+}
+
+/**
+ *  @param {string} v
+ *  @returns {string}
+ */
+export function trimEnd (v) {
+  return v.trimEnd()
+}
+
+/**
+ *  @param {string} v
+ *  @returns {string}
+ */
+export function tidy (v) {
+  return v.replace(/\n{2,}}/gm, LF).trim()
+}
+
 /**
  *  @function getSaveProdParameter
  *  @description

package/src/index.mjs

@@ -19,6 +19,8 @@
  *  @returns {void}
  */
 
+import stripAnsi from 'strip-ansi'
+
 import {
   normalize
 } from 'node:path'
@@ -29,10 +31,6 @@ import {
 
 import debug from '#deps/src/common/debug'
 
-import {
-  use
-} from '#deps/src/common/format'
-
 import {
   VERSION,
   PLATFORM
@@ -64,6 +62,42 @@ const info = debug('@modernpoacher/deps:info')
 
 log(`\`deps\` (${VERSION} - ${PLATFORM}) is awake`)
 
+const LF = String.fromCodePoint(10)
+
+/**
+ *  @param {string} v
+ *  @returns {boolean}
+ */
+function filter (v) {
+  return Boolean(stripAnsi(v).trim())
+}
+
+/**
+ *  @param {string} key
+ *  @returns {(value: string) => void}
+ */
+export function use (key) {
+  const log = debug(`@modernpoacher/deps:${key}`)
+
+  /**
+   *  @param {string} v
+   *  @returns {void}
+   */
+  function write (v) {
+    log(v.trimEnd())
+  }
+
+  /**
+   *  @param {string} value
+   *  @returns {void}
+   */
+  return function use (value) {
+    value.split(LF)
+      .filter(filter)
+      .forEach(write)
+  }
+}
+
 /**
  *  @function getInstallSaveExactCommands
  *  @description