ccstatusline 2.0.8 → 2.0.9

package/dist/ccstatusline.js

@@ -51037,7 +51037,7 @@ import { execSync as execSync3 } from "child_process";
 import * as fs5 from "fs";
 import * as path4 from "path";
 var __dirname = "/Users/sirmalloc/Projects/Personal/ccstatusline/src/utils";
-var PACKAGE_VERSION = "2.0.8";
+var PACKAGE_VERSION = "2.0.9";
 function getPackageVersion() {
   if (/^\d+\.\d+\.\d+/.test(PACKAGE_VERSION)) {
     return PACKAGE_VERSION;
@@ -52038,7 +52038,7 @@ function formatTokens(count) {
     return `${(count / 1000).toFixed(1)}k`;
   return count.toString();
 }
-function renderPowerlineStatusLine(widgets, settings, context, lineIndex = 0, globalSeparatorOffset = 0, allLinesWidgets) {
+function renderPowerlineStatusLine(widgets, settings, context, lineIndex = 0, globalSeparatorOffset = 0, preRenderedWidgets, preCalculatedMaxWidths) {
   const powerlineConfig = settings.powerline;
   const config2 = powerlineConfig ?? {};
   const separators = config2.separators ?? [""];
@@ -52101,12 +52101,13 @@ function renderPowerlineStatusLine(widgets, settings, context, lineIndex = 0, gl
     if (widget.type === "separator" || widget.type === "flex-separator") {
       continue;
     }
-    try {
-      const widgetImpl = getWidget(widget.type);
-      widgetText = widgetImpl.render(widget, context, settings) ?? "";
-      defaultColor = widgetImpl.getDefaultColor();
-    } catch {
-      continue;
+    const preRendered = preRenderedWidgets[i];
+    if (preRendered?.content) {
+      widgetText = preRendered.content;
+      try {
+        const widgetImpl = getWidget(widget.type);
+        defaultColor = widgetImpl.getDefaultColor();
+      } catch {}
     }
     if (widgetText) {
       const padding = settings.defaultPadding ?? "";
@@ -52146,47 +52147,10 @@ function renderPowerlineStatusLine(widgets, settings, context, lineIndex = 0, gl
   if (widgetElements.length === 0)
     return "";
   const autoAlign = config2.autoAlign;
-  if (autoAlign && allLinesWidgets) {
-    const maxWidths = [];
-    const allLinesElements = [];
-    for (const lineWidgets of allLinesWidgets) {
-      const filteredLineWidgets = lineWidgets.filter((w) => w.type !== "separator" && w.type !== "flex-separator");
-      const lineElements = [];
-      for (const widget of filteredLineWidgets) {
-        let widgetText = "";
-        try {
-          const widgetImpl = getWidget(widget.type);
-          widgetText = widgetImpl.render(widget, context, settings) ?? "";
-        } catch {
-          continue;
-        }
-        if (widgetText) {
-          const padding = settings.defaultPadding ?? "";
-          const paddedText = `${padding}${widgetText}${padding}`;
-          lineElements.push({
-            content: paddedText,
-            bgColor: widget.backgroundColor,
-            fgColor: widget.color,
-            widget
-          });
-        }
-      }
-      allLinesElements.push(lineElements);
-    }
-    for (let pos = 0;pos < Math.max(...allLinesElements.map((line) => line.length)); pos++) {
-      let maxWidth = 0;
-      for (const lineElements of allLinesElements) {
-        const element = lineElements[pos];
-        if (element) {
-          const plainLength = element.content.replace(ANSI_REGEX, "").length;
-          maxWidth = Math.max(maxWidth, plainLength);
-        }
-      }
-      maxWidths.push(maxWidth);
-    }
+  if (autoAlign) {
     for (let i = 0;i < widgetElements.length; i++) {
       const element = widgetElements[i];
-      const maxWidth = maxWidths[i];
+      const maxWidth = preCalculatedMaxWidths[i];
       if (element && maxWidth !== undefined) {
         const currentLength = element.content.replace(ANSI_REGEX, "").length;
         const paddingNeeded = maxWidth - currentLength;
@@ -52356,17 +52320,74 @@ function formatSeparator(sep) {
   }
   return sep;
 }
-function renderStatusLineWithInfo(widgets, settings, context, allLinesWidgets) {
-  const line = renderStatusLine(widgets, settings, context, allLinesWidgets);
+function preRenderAllWidgets(allLinesWidgets, settings, context) {
+  const preRenderedLines = [];
+  for (const lineWidgets of allLinesWidgets) {
+    const preRenderedLine = [];
+    for (const widget of lineWidgets) {
+      if (widget.type === "separator" || widget.type === "flex-separator") {
+        preRenderedLine.push({
+          content: "",
+          plainLength: 0,
+          widget
+        });
+        continue;
+      }
+      let widgetText = "";
+      try {
+        const widgetImpl = getWidget(widget.type);
+        widgetText = widgetImpl.render(widget, context, settings) ?? "";
+      } catch {
+        preRenderedLine.push({
+          content: "",
+          plainLength: 0,
+          widget
+        });
+        continue;
+      }
+      const plainLength = widgetText.replace(ANSI_REGEX, "").length;
+      preRenderedLine.push({
+        content: widgetText,
+        plainLength,
+        widget
+      });
+    }
+    preRenderedLines.push(preRenderedLine);
+  }
+  return preRenderedLines;
+}
+function calculateMaxWidthsFromPreRendered(preRenderedLines, settings) {
+  const maxWidths = [];
+  const defaultPadding = settings.defaultPadding ?? "";
+  const paddingLength = defaultPadding.length;
+  for (const preRenderedLine of preRenderedLines) {
+    const filteredWidgets = preRenderedLine.filter((w) => w.widget.type !== "separator" && w.widget.type !== "flex-separator" && w.content);
+    for (let pos = 0;pos < filteredWidgets.length; pos++) {
+      const widget = filteredWidgets[pos];
+      if (!widget)
+        continue;
+      const totalWidth = widget.plainLength + paddingLength * 2;
+      const currentMax = maxWidths[pos];
+      if (currentMax === undefined) {
+        maxWidths[pos] = totalWidth;
+      } else {
+        maxWidths[pos] = Math.max(currentMax, totalWidth);
+      }
+    }
+  }
+  return maxWidths;
+}
+function renderStatusLineWithInfo(widgets, settings, context, preRenderedWidgets, preCalculatedMaxWidths) {
+  const line = renderStatusLine(widgets, settings, context, preRenderedWidgets, preCalculatedMaxWidths);
   const wasTruncated = line.includes("...");
   return { line, wasTruncated };
 }
-function renderStatusLine(widgets, settings, context, allLinesWidgets) {
+function renderStatusLine(widgets, settings, context, preRenderedWidgets, preCalculatedMaxWidths) {
   const colorLevel = getColorLevelString(settings.colorLevel);
   const powerlineSettings = settings.powerline;
   const isPowerlineMode = Boolean(powerlineSettings?.enabled);
   if (isPowerlineMode)
-    return renderPowerlineStatusLine(widgets, settings, context, context.lineIndex ?? 0, context.globalSeparatorIndex ?? 0, allLinesWidgets);
+    return renderPowerlineStatusLine(widgets, settings, context, context.lineIndex ?? 0, context.globalSeparatorIndex ?? 0, preRenderedWidgets, preCalculatedMaxWidths);
   const applyColorsWithOverride = (text, foregroundColor, backgroundColor, bold) => {
     let fgColor = foregroundColor;
     if (settings.overrideForegroundColor && settings.overrideForegroundColor !== "none") {
@@ -52445,10 +52466,17 @@ function renderStatusLine(widgets, settings, context, allLinesWidgets) {
       continue;
     }
     try {
-      const widgetImpl = getWidget(widget.type);
-      const widgetText = widgetImpl.render(widget, context, settings);
+      let widgetText;
+      let defaultColor = "white";
+      const preRendered = preRenderedWidgets[i];
+      if (preRendered?.content) {
+        widgetText = preRendered.content;
+        try {
+          const widgetImpl = getWidget(widget.type);
+          defaultColor = widgetImpl.getDefaultColor();
+        } catch {}
+      }
       if (widgetText) {
-        const defaultColor = widgetImpl.getDefaultColor();
         if (widget.type === "custom-command" && widget.preserveColors) {
           let finalOutput = widgetText;
           if (widget.maxWidth && widget.maxWidth > 0) {
@@ -56365,30 +56393,30 @@ var PowerlineSetup = ({
 // src/tui/components/StatusLinePreview.tsx
 var import_react42 = __toESM(require_react(), 1);
 var jsx_dev_runtime14 = __toESM(require_jsx_dev_runtime(), 1);
-var renderSingleLine = (widgets, terminalWidth, widthDetectionAvailable, settings, lineIndex, globalSeparatorIndex, allLinesWidgets) => {
+var renderSingleLine = (widgets, terminalWidth, widthDetectionAvailable, settings, lineIndex, globalSeparatorIndex, preRenderedWidgets, preCalculatedMaxWidths) => {
   const context = {
     terminalWidth,
     isPreview: true,
     lineIndex,
     globalSeparatorIndex
   };
-  return renderStatusLineWithInfo(widgets, settings, context, allLinesWidgets);
+  return renderStatusLineWithInfo(widgets, settings, context, preRenderedWidgets, preCalculatedMaxWidths);
 };
 var StatusLinePreview = ({ lines, terminalWidth, settings, onTruncationChange }) => {
   const widthDetectionAvailable = import_react42.default.useMemo(() => canDetectTerminalWidth(), []);
   const { renderedLines, anyTruncated } = import_react42.default.useMemo(() => {
     if (!settings)
       return { renderedLines: [], anyTruncated: false };
-    const isPowerlineMode = settings.powerline.enabled;
-    const autoAlign = settings.powerline.autoAlign;
-    const allLinesWidgets = isPowerlineMode && autoAlign ? lines : undefined;
+    const preRenderedLines = preRenderAllWidgets(lines, settings, { terminalWidth, isPreview: true });
+    const preCalculatedMaxWidths = calculateMaxWidthsFromPreRendered(preRenderedLines, settings);
     let globalSeparatorIndex = 0;
     const result = [];
     let truncated = false;
     for (let i = 0;i < lines.length; i++) {
       const lineItems = lines[i];
       if (lineItems && lineItems.length > 0) {
-        const renderResult = renderSingleLine(lineItems, terminalWidth, widthDetectionAvailable, settings, i, globalSeparatorIndex, allLinesWidgets);
+        const preRenderedWidgets = preRenderedLines[i] ?? [];
+        const renderResult = renderSingleLine(lineItems, terminalWidth, widthDetectionAvailable, settings, i, globalSeparatorIndex, preRenderedWidgets, preCalculatedMaxWidths);
         result.push(renderResult.line);
         if (renderResult.wasTruncated) {
           truncated = true;
@@ -58330,15 +58358,15 @@ async function renderMultipleLines(data) {
     blockMetrics,
     isPreview: false
   };
-  const isPowerlineMode = settings.powerline.enabled;
-  const autoAlign = settings.powerline.autoAlign;
-  const allLinesWidgets = isPowerlineMode && autoAlign ? lines : undefined;
+  const preRenderedLines = preRenderAllWidgets(lines, settings, context);
+  const preCalculatedMaxWidths = calculateMaxWidthsFromPreRendered(preRenderedLines, settings);
   let globalSeparatorIndex = 0;
   for (let i = 0;i < lines.length; i++) {
     const lineItems = lines[i];
     if (lineItems && lineItems.length > 0) {
       const lineContext = { ...context, lineIndex: i, globalSeparatorIndex };
-      const line = renderStatusLine(lineItems, settings, lineContext, allLinesWidgets);
+      const preRenderedWidgets = preRenderedLines[i] ?? [];
+      const line = renderStatusLine(lineItems, settings, lineContext, preRenderedWidgets, preCalculatedMaxWidths);
       const strippedLine = line.replace(/\x1b\[[0-9;]*m/g, "").trim();
       if (strippedLine.length > 0) {
         const nonMergedWidgets = lineItems.filter((_, idx) => idx === lineItems.length - 1 || !lineItems[idx]?.merge);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccstatusline",
-  "version": "2.0.8",
+  "version": "2.0.9",
   "description": "A customizable status line formatter for Claude Code CLI",
   "module": "src/ccstatusline.ts",
   "type": "module",