git-watchtower 2.3.23 → 2.3.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-watchtower",
-  "version": "2.3.23",
+  "version": "2.3.25",
   "description": "Terminal-based Git branch monitor with activity sparklines and optional dev server with live reload",
   "main": "bin/git-watchtower.js",
   "bin": {

package/src/ui/ansi.js

@@ -602,25 +602,79 @@ function style(text, ...styles) {
 }
 
 /**
- * Pad a string on the right, truncating if too long (uses raw string length)
+ * Walk graphemes up to a column budget, returning the longest prefix
+ * whose visible width does not exceed `maxCols`. Drops one grapheme
+ * past the budget (mirrors how truncate() consumes — never mid-cut
+ * a wide char or surrogate pair).
+ * @param {string} str
+ * @param {number} maxCols
+ * @returns {string}
+ * @private
+ */
+function _sliceByColumns(str, maxCols) {
+  if (maxCols <= 0) return '';
+  let acc = '';
+  let used = 0;
+  if (_graphemeSegmenter) {
+    for (const { segment } of _graphemeSegmenter.segment(str)) {
+      const w = visibleLength(segment);
+      if (used + w > maxCols) break;
+      acc += segment;
+      used += w;
+    }
+  } else {
+    for (const ch of str) {
+      const w = _codePointWidth(ch.codePointAt(0));
+      if (used + w > maxCols) break;
+      acc += ch;
+      used += w;
+    }
+  }
+  return acc;
+}
+
+/**
+ * Pad a string on the right to a target visible-column width.
+ * Truncates (without adding an ellipsis) when the input already
+ * exceeds the budget.
+ *
+ * Width is measured in display columns via visibleLength, NOT UTF-16
+ * `.length`. ASCII-only inputs keep their previous behaviour because
+ * `.length === visibleLength` for them. CJK / wide emoji / ZWJ
+ * clusters now pad by the columns they actually render in, and the
+ * truncate path slices on grapheme boundaries so a wide character
+ * isn't cut mid-byte.
+ *
+ * SGR-styled strings (e.g. `\x1b[31mhi\x1b[0m`) previously had their
+ * raw-byte length compared against `len`, so the colour wrapper made
+ * the string look "too long" and `substring(0, len)` cut the escape
+ * sequence in half — leaving the terminal in a stuck colour state.
+ * Now the width comparison uses visibleLength which strips ANSI
+ * before measuring, and the slice helper preserves SGR runs because
+ * they have width 0.
+ *
  * @param {string} str - String to pad
- * @param {number} len - Target length
+ * @param {number} len - Target visible-column width
  * @returns {string}
  */
 function padRight(str, len) {
-  if (str.length >= len) return str.substring(0, len);
-  return str + ' '.repeat(len - str.length);
+  const cols = visibleLength(str);
+  if (cols >= len) return _sliceByColumns(str, len);
+  return str + ' '.repeat(len - cols);
 }
 
 /**
- * Pad a string on the left, truncating if too long (uses raw string length)
+ * Pad a string on the left to a target visible-column width.
+ * Same column-vs-codeunit semantics as {@link padRight}.
+ *
  * @param {string} str - String to pad
- * @param {number} len - Target length
+ * @param {number} len - Target visible-column width
  * @returns {string}
  */
 function padLeft(str, len) {
-  if (str.length >= len) return str.substring(0, len);
-  return ' '.repeat(len - str.length) + str;
+  const cols = visibleLength(str);
+  if (cols >= len) return _sliceByColumns(str, len);
+  return ' '.repeat(len - cols) + str;
 }
 
 /**

package/src/ui/renderer.js

@@ -26,6 +26,32 @@ const { isBaseBranch } = require('../git/pr');
 const { detectInstallSource, getUpdateCommand } = require('../utils/install-source');
 const { version: PACKAGE_VERSION } = require('../../package.json');
 
+// ---------------------------------------------------------------------------
+// Branch-row layout helpers
+// ---------------------------------------------------------------------------
+
+/**
+ * Spaces to write after the (possibly truncated) branch name so the
+ * sparkline column lands at a consistent offset regardless of the
+ * branch name's actual byte count.
+ *
+ * Must measure in display columns, not UTF-16 code units. truncate()
+ * appends ansi.reset (4 bytes) on its long-string path; CJK / wide
+ * emoji span 1 code unit per 2 columns; ZWJ clusters render as 2
+ * columns from up to 8 units. Using raw .length would drift the
+ * sparkline by N columns per non-ASCII branch and by 4 for any
+ * truncated branch.
+ *
+ * Always returns at least 1 so consecutive writes never abut.
+ *
+ * @param {string} displayName - Already truncate()d branch name.
+ * @param {number} maxNameLen - Column budget the name was truncated to.
+ * @returns {number} Number of space characters to write.
+ */
+function computeNamePadding(displayName, maxNameLen) {
+  return Math.max(1, maxNameLen - visibleLength(displayName) + 2);
+}
+
 // ---------------------------------------------------------------------------
 // Compact number formatting
 // ---------------------------------------------------------------------------
@@ -239,7 +265,7 @@ function renderBranchList(state, write) {
     const fixedWidth = 27 + DIFF_TAG_FIXED_LEN;
     const maxNameLen = contentWidth - fixedWidth;
     const displayName = truncate(branch.name, maxNameLen);
-    const namePadding = Math.max(1, maxNameLen - displayName.length + 2);
+    const namePadding = computeNamePadding(displayName, maxNameLen);
 
     if (isSelected) write(ansi.inverse);
     write(cursor);
@@ -1600,4 +1626,6 @@ module.exports = {
   renderStashConfirm,
   renderCleanupConfirm,
   renderUpdateModal,
+  // Layout helpers — exported for unit testing
+  computeNamePadding,
 };