@modernpoacher/deps 2.3.2 → 2.3.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modernpoacher/deps",
-  "version": "2.3.2",
+  "version": "2.3.4",
   "description": "Update NPM package dependencies from the command line",
   "keywords": [
     "deps",

package/src/common/format/index.mjs

@@ -108,7 +108,15 @@ export function use (key) {
    *  @returns {void}
    */
   function write (v) {
-    if (v.trim()) log(formatDirectory(v.trimEnd()))
+    const s = v.trim()
+    if (s) {
+      const d = resolve(normalize(s))
+      if (d.startsWith(HOME)) {
+        log(d.replace(new RegExp('^' + HOME), '~'))
+      } else {
+        log(v.trimEnd())
+      }
+    }
   }
 
   /**

package/src/common/git/index.mjs

@@ -12,7 +12,8 @@
 import stripAnsi from 'strip-ansi'
 
 import {
-  normalize
+  normalize,
+  resolve
 } from 'node:path'
 
 import {
@@ -23,11 +24,11 @@ import debug from '#deps/src/common/debug'
 
 import {
   BIN,
-  PLATFORM
+  PLATFORM,
+  HOME
 } from '#deps/src/common/env'
 
 import {
-  formatDirectory,
   use,
   trim
 } from '#deps/src/common/format'
@@ -131,9 +132,21 @@ export function out (key, directory) {
    *  @returns {void}
    */
   function write (v) {
-    if (v.trim()) log(formatDirectory(v.trimEnd()))
+    const s = v.trim()
+    if (s) {
+      const d = resolve(normalize(s))
+      if (d.startsWith(HOME)) {
+        log(d.replace(new RegExp('^' + HOME), '~'))
+      } else {
+        log(v.trimEnd())
+      }
+    }
   }
 
+  /**
+   *  @param {string} value
+   *  @returns {void}
+   */
   return function out (value) {
     value.split(LF)
       .filter(filter).filter(filterOut)
@@ -168,9 +181,21 @@ export function err (key, directory) {
    *  @returns {void}
    */
   function write (v) {
-    if (v.trim()) log(formatDirectory(v.trimEnd()))
+    const s = v.trim()
+    if (s) {
+      const d = resolve(normalize(s))
+      if (d.startsWith(HOME)) {
+        log(d.replace(new RegExp('^' + HOME), '~'))
+      } else {
+        log(v.trimEnd())
+      }
+    }
   }
 
+  /**
+   *  @param {string} value
+   *  @returns {void}
+   */
   return function err (value) {
     value.split(LF)
       .filter(filter).filter(filterErr)
@@ -242,8 +267,8 @@ export function gitConfigUserName (d = DIRECTORY) {
         stderr
       } = exec(commands, options, handleComplete)
 
-      if (stdout) stdout.on('data', out('git-config-user-name', formatDirectory(directory)))
-      if (stderr) stderr.on('data', err('git-config-user-name', formatDirectory(directory)))
+      if (stdout) stdout.on('data', out('git-config-user-name', directory))
+      if (stderr) stderr.on('data', err('git-config-user-name', directory))
     })
   )
 }
@@ -278,8 +303,8 @@ export function gitConfigUserEmail (d = DIRECTORY) {
         stderr
       } = exec(commands, options, handleComplete)
 
-      if (stdout) stdout.on('data', out('git-config-user-email', formatDirectory(directory)))
-      if (stderr) stderr.on('data', err('git-config-user-email', formatDirectory(directory)))
+      if (stdout) stdout.on('data', out('git-config-user-email', directory))
+      if (stderr) stderr.on('data', err('git-config-user-email', directory))
     })
   )
 }
@@ -316,8 +341,8 @@ export function catGitRefsRemotesOriginHead (d = DIRECTORY) {
         stderr
       } = exec(commands, options, handleComplete)
 
-      if (stdout) stdout.on('data', out('cat-git-refs-remotes-origin-head', formatDirectory(directory)))
-      if (stderr) stderr.on('data', err('cat-git-refs-remotes-origin-head', formatDirectory(directory)))
+      if (stdout) stdout.on('data', out('cat-git-refs-remotes-origin-head', directory))
+      if (stderr) stderr.on('data', err('cat-git-refs-remotes-origin-head', directory))
     })
   )
 }
@@ -354,8 +379,8 @@ export function awkGitRemoteShowOriginHead (d = DIRECTORY) {
         stderr
       } = exec(commands, options, handleComplete)
 
-      if (stdout) stdout.on('data', out('git-remote-show-origin-head', formatDirectory(directory)))
-      if (stderr) stderr.on('data', err('git-remote-show-origin-head', formatDirectory(directory)))
+      if (stdout) stdout.on('data', out('git-remote-show-origin-head', directory))
+      if (stderr) stderr.on('data', err('git-remote-show-origin-head', directory))
     })
   )
 }
@@ -392,8 +417,8 @@ export function gitRevParseShowTopLevel (d = DIRECTORY) {
         stderr
       } = exec(commands, options, handleComplete)
 
-      if (stdout) stdout.on('data', out('git-rev-parse-show-toplevel', formatDirectory(directory)))
-      if (stderr) stderr.on('data', err('git-rev-parse-show-toplevel', formatDirectory(directory)))
+      if (stdout) stdout.on('data', out('git-rev-parse-show-toplevel', directory))
+      if (stderr) stderr.on('data', err('git-rev-parse-show-toplevel', directory))
     })
   )
 }
@@ -430,8 +455,8 @@ export function gitRevParseAbbrevRefHead (d = DIRECTORY) {
         stderr
       } = exec(commands, options, handleComplete)
 
-      if (stdout) stdout.on('data', out('git-rev-parse-abbrev-ref-head', formatDirectory(directory)))
-      if (stderr) stderr.on('data', err('git-rev-parse-abbrev-ref-head', formatDirectory(directory)))
+      if (stdout) stdout.on('data', out('git-rev-parse-abbrev-ref-head', directory))
+      if (stderr) stderr.on('data', err('git-rev-parse-abbrev-ref-head', directory))
     })
   )
 }