numux 1.10.2 → 1.10.4

package/dist/numux.js

@@ -22,7 +22,7 @@ var __commonJS = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports,
 var require_package = __commonJS((exports, module) => {
   module.exports = {
     name: "numux",
-    version: "1.10.2",
+    version: "1.10.4",
     description: "Terminal multiplexer with dependency orchestration",
     type: "module",
     license: "MIT",
@@ -608,6 +608,24 @@ function detectPackageManager(pkgJson, cwd) {
 function isGlobPattern(name) {
   return /[*?[]/.test(name);
 }
+function deriveShortName(pattern, scriptName) {
+  let prefixEnd = 0;
+  while (prefixEnd < pattern.length && !"*?[".includes(pattern[prefixEnd])) {
+    prefixEnd++;
+  }
+  let suffixStart = pattern.length;
+  while (suffixStart > 0 && !"*?[".includes(pattern[suffixStart - 1])) {
+    suffixStart--;
+  }
+  const prefix = pattern.slice(0, prefixEnd);
+  const suffix = pattern.slice(suffixStart);
+  let short = scriptName;
+  if (prefix && short.startsWith(prefix))
+    short = short.slice(prefix.length);
+  if (suffix && short.endsWith(suffix))
+    short = short.slice(0, short.length - suffix.length);
+  return short || scriptName;
+}
 function splitPatternArgs(raw) {
   const i = raw.indexOf(" ");
   if (i === -1)
@@ -652,12 +670,13 @@ function expandScriptPatterns(config, cwd) {
     const singleColor = typeof template.color === "string" ? template.color : undefined;
     for (let i = 0;i < matches.length; i++) {
       const scriptName = matches[i];
-      if (expanded[scriptName]) {
+      const displayName = deriveShortName(globPattern, scriptName);
+      if (expanded[displayName]) {
         throw new Error(`"${name}": expanded script "${scriptName}" collides with an existing process name`);
       }
       const color = colors ? colors[i % colors.length] : singleColor;
       const { color: _color, ...rest } = template;
-      expanded[scriptName] = {
+      expanded[displayName] = {
         ...rest,
         command: `${pm} run ${scriptName}${extraArgs}`,
         ...color ? { color } : {}
@@ -2100,6 +2119,37 @@ var STATUS_ICON_HEX = {
   skipped: "#888888"
 };
 var TERMINAL_STATUSES = new Set(["finished", "stopped", "failed", "skipped"]);
+function formatTab(name, status) {
+  return `${STATUS_ICONS[status]} ${name}`;
+}
+function formatDescription(status, exitCode, restartCount) {
+  let desc = status;
+  if ((status === "failed" || status === "stopped") && exitCode != null && exitCode !== 0) {
+    desc = `exit ${exitCode}`;
+  }
+  if (restartCount && restartCount > 0) {
+    desc += ` \xD7${restartCount}`;
+  }
+  return desc;
+}
+function getDisplayOrder(originalNames, statuses) {
+  const active = originalNames.filter((n) => !TERMINAL_STATUSES.has(statuses.get(n)));
+  const terminal = originalNames.filter((n) => TERMINAL_STATUSES.has(statuses.get(n)));
+  return [...active, ...terminal];
+}
+function resolveOptionColors(names, statuses, processColors, inputWaiting, erroredProcesses) {
+  return names.map((name) => {
+    const status = statuses.get(name);
+    const waiting = inputWaiting.has(name);
+    const errored = erroredProcesses.has(name);
+    const statusHex = waiting ? "#ffaa00" : errored ? "#ff5555" : STATUS_ICON_HEX[status];
+    const processHex = processColors.get(name);
+    return {
+      iconHex: statusHex ?? processHex ?? "#888888",
+      nameHex: processHex ?? null
+    };
+  });
+}
 
 class ColoredSelectRenderable extends SelectRenderable {
   _optionColors = [];
@@ -2107,12 +2157,11 @@ class ColoredSelectRenderable extends SelectRenderable {
     this._optionColors = colors;
     this.requestRender();
   }
-  renderSelf(buffer, deltaTime) {
-    const wasDirty = this.isDirty;
-    super.renderSelf(buffer, deltaTime);
-    if (wasDirty && this.frameBuffer && this._optionColors.length > 0) {
-      this.colorizeOptions();
-    }
+  renderSelf(_buffer, _deltaTime) {
+    if (!(this.visible && this.frameBuffer))
+      return;
+    if (this.isDirty)
+      this.renderOptions();
   }
   onMouseEvent(event) {
     if (event.type === "down") {
@@ -2125,28 +2174,45 @@ class ColoredSelectRenderable extends SelectRenderable {
       }
     }
   }
-  colorizeOptions() {
+  renderOptions() {
+    if (!this.frameBuffer || this.options.length === 0)
+      return;
     const fb = this.frameBuffer;
+    const bgColor = this._focused ? this._focusedBackgroundColor : this._backgroundColor;
+    fb.clear(bgColor);
     const scrollOffset = this.scrollOffset;
     const maxVisibleItems = this.maxVisibleItems;
     const linesPerItem = this.linesPerItem;
+    const fontHeight = this.fontHeight;
     const selectedIndex = this.getSelectedIndex();
-    const options = this.options;
-    const visibleCount = Math.min(maxVisibleItems, options.length - scrollOffset);
+    const showDescription = this._showDescription;
     const baseTextColor = this._focused ? this._focusedTextColor : this._textColor;
     const selectedTextColor = this._selectedTextColor;
-    const lineWidth = fb.width;
+    const descColor = this._descriptionColor;
+    const selectedDescColor = this._selectedDescriptionColor;
+    const selectedBgColor = this._selectedBackgroundColor;
+    const itemSpacing = this._itemSpacing;
+    const visibleCount = Math.min(maxVisibleItems, this.options.length - scrollOffset);
     for (let i = 0;i < visibleCount; i++) {
       const actualIndex = scrollOffset + i;
-      const itemY = i * linesPerItem;
-      const optName = options[actualIndex].name;
+      const option = this.options[actualIndex];
       const isSelected = actualIndex === selectedIndex;
-      const defaultColor = isSelected ? selectedTextColor : baseTextColor;
+      const itemY = i * linesPerItem;
+      if (itemY + linesPerItem - 1 >= this.height)
+        break;
+      if (isSelected) {
+        fb.fillRect(0, itemY, this.width, linesPerItem - itemSpacing, selectedBgColor);
+      }
       const colors = this._optionColors[actualIndex];
-      const textColor = colors?.name ?? defaultColor;
-      fb.drawText(optName.padEnd(lineWidth), 1, itemY, textColor);
+      const defaultColor = isSelected ? selectedTextColor : baseTextColor;
+      const nameColor = colors?.name ?? defaultColor;
+      fb.drawText(option.name, 1, itemY, nameColor);
       if (colors?.icon) {
-        fb.drawText(optName.charAt(0), 1, itemY, colors.icon);
+        fb.drawText(option.name.charAt(0), 1, itemY, colors.icon);
+      }
+      if (showDescription && itemY + fontHeight < this.height) {
+        const dc = isSelected ? selectedDescColor : descColor;
+        fb.drawText(option.description, 3, itemY + fontHeight, dc);
       }
     }
   }
@@ -2172,7 +2238,7 @@ class TabBar {
       width: "100%",
       height: "100%",
       options: names.map((n) => ({
-        name: this.formatTab(n, "pending"),
+        name: formatTab(n, "pending"),
         description: "pending"
       })),
       selectedBackgroundColor: "#334455",
@@ -2195,7 +2261,7 @@ class TabBar {
   }
   updateStatus(name, status, exitCode, restartCount) {
     this.statuses.set(name, status);
-    this.baseDescriptions.set(name, this.formatDescription(status, exitCode, restartCount));
+    this.baseDescriptions.set(name, formatDescription(status, exitCode, restartCount));
     if (TERMINAL_STATUSES.has(status) || status === "stopping") {
       this.inputWaiting.delete(name);
     }
@@ -2227,9 +2293,9 @@ class TabBar {
   refreshOptions() {
     const currentIdx = this.renderable.getSelectedIndex();
     const currentName = this.names[currentIdx];
-    this.names = this.getDisplayOrder();
+    this.names = getDisplayOrder(this.originalNames, this.statuses);
     this.renderable.options = this.names.map((n) => ({
-      name: this.formatTab(n, this.statuses.get(n)),
+      name: formatTab(n, this.statuses.get(n)),
       description: this.getDescription(n)
     }));
     const newIdx = this.names.indexOf(currentName);
@@ -2238,11 +2304,6 @@ class TabBar {
     }
     this.updateOptionColors();
   }
-  getDisplayOrder() {
-    const active = this.originalNames.filter((n) => !TERMINAL_STATUSES.has(this.statuses.get(n)));
-    const terminal = this.originalNames.filter((n) => TERMINAL_STATUSES.has(this.statuses.get(n)));
-    return [...active, ...terminal];
-  }
   getDescription(name) {
     if (this.inputWaiting.has(name))
       return "awaiting input";
@@ -2251,33 +2312,13 @@ class TabBar {
     return this.baseDescriptions.get(name) ?? "pending";
   }
   updateOptionColors() {
-    const colors = this.names.map((name) => {
-      const status = this.statuses.get(name);
-      const waiting = this.inputWaiting.has(name);
-      const errored = this.erroredProcesses.has(name);
-      const statusHex = waiting ? "#ffaa00" : errored ? "#ff5555" : STATUS_ICON_HEX[status];
-      const processHex = this.processColors.get(name);
-      return {
-        icon: parseColor(statusHex ?? processHex ?? "#888888"),
-        name: processHex ? parseColor(processHex) : null
-      };
-    });
+    const resolved = resolveOptionColors(this.names, this.statuses, this.processColors, this.inputWaiting, this.erroredProcesses);
+    const colors = resolved.map((c) => ({
+      icon: parseColor(c.iconHex),
+      name: c.nameHex ? parseColor(c.nameHex) : null
+    }));
     this.renderable.setOptionColors(colors);
   }
-  formatDescription(status, exitCode, restartCount) {
-    let desc = status;
-    if ((status === "failed" || status === "stopped") && exitCode != null && exitCode !== 0) {
-      desc = `exit ${exitCode}`;
-    }
-    if (restartCount && restartCount > 0) {
-      desc += ` \xD7${restartCount}`;
-    }
-    return desc;
-  }
-  formatTab(name, status) {
-    const icon = STATUS_ICONS[status];
-    return `${icon} ${name}`;
-  }
   getSelectedIndex() {
     return this.renderable.getSelectedIndex();
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "numux",
-  "version": "1.10.2",
+  "version": "1.10.4",
   "description": "Terminal multiplexer with dependency orchestration",
   "type": "module",
   "license": "MIT",