style(B1-1): 格式化 ink/buddy/cli/context/screens/tasks/services/keybindings/state (43 files)

纯格式化：移除分号、React Compiler import、import 多行展开。修复了 Box.tsx 和 ScrollBox.tsx 中无效的 global.d.ts import。 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-06-22 16:25:51 +00:00 · 2026-04-04 21:56:11 +08:00
parent 02694918b5
commit db1f531691
43 changed files with 12311 additions and 9559 deletions
--- a/src/ink/Ansi.tsx
+++ b/src/ink/Ansi.tsx
@@ -1,25 +1,31 @@
-import { c as _c } from "react/compiler-runtime";
-import React from 'react';
-import Link from './components/Link.js';
-import Text from './components/Text.js';
-import type { Color } from './styles.js';
-import { type NamedColor, Parser, type Color as TermioColor, type TextStyle } from './termio.js';
+import React from 'react'
+import Link from './components/Link.js'
+import Text from './components/Text.js'
+import type { Color } from './styles.js'
+import {
+  type NamedColor,
+  Parser,
+  type Color as TermioColor,
+  type TextStyle,
+} from './termio.js'
+
 type Props = {
-  children: string;
+  children: string
  /** When true, force all text to be rendered with dim styling */
-  dimColor?: boolean;
-};
+  dimColor?: boolean
+}
+
 type SpanProps = {
-  color?: Color;
-  backgroundColor?: Color;
-  dim?: boolean;
-  bold?: boolean;
-  italic?: boolean;
-  underline?: boolean;
-  strikethrough?: boolean;
-  inverse?: boolean;
-  hyperlink?: string;
-};
+  color?: Color
+  backgroundColor?: Color
+  dim?: boolean
+  bold?: boolean
+  italic?: boolean
+  underline?: boolean
+  strikethrough?: boolean
+  inverse?: boolean
+  hyperlink?: string
+}

 /**
 * Component that parses ANSI escape codes and renders them using Text components.
@@ -29,145 +35,156 @@ type SpanProps = {
 *
 * Memoized to prevent re-renders when parent changes but children string is the same.
 */
-export const Ansi = React.memo(function Ansi(t0: { children: React.ReactNode; dimColor?: boolean }) {
-  const $ = _c(12);
-  const {
-    children,
-    dimColor
-  } = t0;
-  if (typeof children !== "string") {
-    let t1;
-    if ($[0] !== children || $[1] !== dimColor) {
-      t1 = dimColor ? <Text dim={true}>{String(children)}</Text> : <Text>{String(children)}</Text>;
-      $[0] = children;
-      $[1] = dimColor;
-      $[2] = t1;
-    } else {
-      t1 = $[2];
+export const Ansi = React.memo(function Ansi({
+  children,
+  dimColor,
+}: Props): React.ReactNode {
+  if (typeof children !== 'string') {
+    return dimColor ? (
+      <Text dim>{String(children)}</Text>
+    ) : (
+      <Text>{String(children)}</Text>
+    )
+  }
+
+  if (children === '') {
+    return null
+  }
+
+  const spans = parseToSpans(children)
+
+  if (spans.length === 0) {
+    return null
+  }
+
+  if (spans.length === 1 && !hasAnyProps(spans[0]!.props)) {
+    return dimColor ? (
+      <Text dim>{spans[0]!.text}</Text>
+    ) : (
+      <Text>{spans[0]!.text}</Text>
+    )
+  }
+
+  const content = spans.map((span, i) => {
+    const hyperlink = span.props.hyperlink
+    // When dimColor is forced, override the span's dim prop
+    if (dimColor) {
+      span.props.dim = true
    }
-    return t1;
-  }
-  if (children === "") {
-    return null;
-  }
-  let t1;
-  let t2;
-  if ($[3] !== children || $[4] !== dimColor) {
-    t2 = Symbol.for("react.early_return_sentinel");
-    bb0: {
-      const spans = parseToSpans(children);
-      if (spans.length === 0) {
-        t2 = null;
-        break bb0;
-      }
-      if (spans.length === 1 && !hasAnyProps(spans[0].props)) {
-        t2 = dimColor ? <Text dim={true}>{spans[0].text}</Text> : <Text>{spans[0].text}</Text>;
-        break bb0;
-      }
-      let t3;
-      if ($[7] !== dimColor) {
-        t3 = (span, i) => {
-          const hyperlink = span.props.hyperlink;
-          if (dimColor) {
-            span.props.dim = true;
-          }
-          const hasTextProps = hasAnyTextProps(span.props);
-          if (hyperlink) {
-            return hasTextProps ? <Link key={i} url={hyperlink}><StyledText color={span.props.color} backgroundColor={span.props.backgroundColor} dim={span.props.dim} bold={span.props.bold} italic={span.props.italic} underline={span.props.underline} strikethrough={span.props.strikethrough} inverse={span.props.inverse}>{span.text}</StyledText></Link> : <Link key={i} url={hyperlink}>{span.text}</Link>;
-          }
-          return hasTextProps ? <StyledText key={i} color={span.props.color} backgroundColor={span.props.backgroundColor} dim={span.props.dim} bold={span.props.bold} italic={span.props.italic} underline={span.props.underline} strikethrough={span.props.strikethrough} inverse={span.props.inverse}>{span.text}</StyledText> : span.text;
-        };
-        $[7] = dimColor;
-        $[8] = t3;
-      } else {
-        t3 = $[8];
-      }
-      t1 = spans.map(t3);
+    const hasTextProps = hasAnyTextProps(span.props)
+
+    if (hyperlink) {
+      return hasTextProps ? (
+        <Link key={i} url={hyperlink}>
+          <StyledText
+            color={span.props.color}
+            backgroundColor={span.props.backgroundColor}
+            dim={span.props.dim}
+            bold={span.props.bold}
+            italic={span.props.italic}
+            underline={span.props.underline}
+            strikethrough={span.props.strikethrough}
+            inverse={span.props.inverse}
+          >
+            {span.text}
+          </StyledText>
+        </Link>
+      ) : (
+        <Link key={i} url={hyperlink}>
+          {span.text}
+        </Link>
+      )
    }
-    $[3] = children;
-    $[4] = dimColor;
-    $[5] = t1;
-    $[6] = t2;
-  } else {
-    t1 = $[5];
-    t2 = $[6];
-  }
-  if (t2 !== Symbol.for("react.early_return_sentinel")) {
-    return t2;
-  }
-  const content = t1;
-  let t3;
-  if ($[9] !== content || $[10] !== dimColor) {
-    t3 = dimColor ? <Text dim={true}>{content}</Text> : <Text>{content}</Text>;
-    $[9] = content;
-    $[10] = dimColor;
-    $[11] = t3;
-  } else {
-    t3 = $[11];
-  }
-  return t3;
-});
+
+    return hasTextProps ? (
+      <StyledText
+        key={i}
+        color={span.props.color}
+        backgroundColor={span.props.backgroundColor}
+        dim={span.props.dim}
+        bold={span.props.bold}
+        italic={span.props.italic}
+        underline={span.props.underline}
+        strikethrough={span.props.strikethrough}
+        inverse={span.props.inverse}
+      >
+        {span.text}
+      </StyledText>
+    ) : (
+      span.text
+    )
+  })
+
+  return dimColor ? <Text dim>{content}</Text> : <Text>{content}</Text>
+})
+
 type Span = {
-  text: string;
-  props: SpanProps;
-};
+  text: string
+  props: SpanProps
+}

 /**
 * Parse an ANSI string into spans using the termio parser.
 */
 function parseToSpans(input: string): Span[] {
-  const parser = new Parser();
-  const actions = parser.feed(input);
-  const spans: Span[] = [];
-  let currentHyperlink: string | undefined;
+  const parser = new Parser()
+  const actions = parser.feed(input)
+  const spans: Span[] = []
+
+  let currentHyperlink: string | undefined
+
  for (const action of actions) {
    if (action.type === 'link') {
      if (action.action.type === 'start') {
-        currentHyperlink = action.action.url;
+        currentHyperlink = action.action.url
      } else {
-        currentHyperlink = undefined;
+        currentHyperlink = undefined
      }
-      continue;
+      continue
    }
+
    if (action.type === 'text') {
-      const text = action.graphemes.map(g => g.value).join('');
-      if (!text) continue;
-      const props = textStyleToSpanProps(action.style);
+      const text = action.graphemes.map(g => g.value).join('')
+      if (!text) continue
+
+      const props = textStyleToSpanProps(action.style)
      if (currentHyperlink) {
-        props.hyperlink = currentHyperlink;
+        props.hyperlink = currentHyperlink
      }

      // Try to merge with previous span if props match
-      const lastSpan = spans[spans.length - 1];
+      const lastSpan = spans[spans.length - 1]
      if (lastSpan && propsEqual(lastSpan.props, props)) {
-        lastSpan.text += text;
+        lastSpan.text += text
      } else {
-        spans.push({
-          text,
-          props
-        });
+        spans.push({ text, props })
      }
    }
  }
-  return spans;
+
+  return spans
 }

 /**
 * Convert termio's TextStyle to SpanProps.
 */
 function textStyleToSpanProps(style: TextStyle): SpanProps {
-  const props: SpanProps = {};
-  if (style.bold) props.bold = true;
-  if (style.dim) props.dim = true;
-  if (style.italic) props.italic = true;
-  if (style.underline !== 'none') props.underline = true;
-  if (style.strikethrough) props.strikethrough = true;
-  if (style.inverse) props.inverse = true;
-  const fgColor = colorToString(style.fg);
-  if (fgColor) props.color = fgColor;
-  const bgColor = colorToString(style.bg);
-  if (bgColor) props.backgroundColor = bgColor;
-  return props;
+  const props: SpanProps = {}
+
+  if (style.bold) props.bold = true
+  if (style.dim) props.dim = true
+  if (style.italic) props.italic = true
+  if (style.underline !== 'none') props.underline = true
+  if (style.strikethrough) props.strikethrough = true
+  if (style.inverse) props.inverse = true
+
+  const fgColor = colorToString(style.fg)
+  if (fgColor) props.color = fgColor
+
+  const bgColor = colorToString(style.bg)
+  if (bgColor) props.backgroundColor = bgColor
+
+  return props
 }

 // Map termio named colors to the ansi: format
@@ -187,8 +204,8 @@ const NAMED_COLOR_MAP: Record<NamedColor, string> = {
  brightBlue: 'ansi:blueBright',
  brightMagenta: 'ansi:magentaBright',
  brightCyan: 'ansi:cyanBright',
-  brightWhite: 'ansi:whiteBright'
-};
+  brightWhite: 'ansi:whiteBright',
+}

 /**
 * Convert termio's Color to the string format used by Ink.
@@ -196,13 +213,13 @@ const NAMED_COLOR_MAP: Record<NamedColor, string> = {
 function colorToString(color: TermioColor): Color | undefined {
  switch (color.type) {
    case 'named':
-      return NAMED_COLOR_MAP[color.name] as Color;
+      return NAMED_COLOR_MAP[color.name] as Color
    case 'indexed':
-      return `ansi256(${color.index})` as Color;
+      return `ansi256(${color.index})` as Color
    case 'rgb':
-      return `rgb(${color.r},${color.g},${color.b})` as Color;
+      return `rgb(${color.r},${color.g},${color.b})` as Color
    case 'default':
-      return undefined;
+      return undefined
  }
 }

@@ -210,82 +227,81 @@ function colorToString(color: TermioColor): Color | undefined {
 * Check if two SpanProps are equal for merging.
 */
 function propsEqual(a: SpanProps, b: SpanProps): boolean {
-  return a.color === b.color && a.backgroundColor === b.backgroundColor && a.bold === b.bold && a.dim === b.dim && a.italic === b.italic && a.underline === b.underline && a.strikethrough === b.strikethrough && a.inverse === b.inverse && a.hyperlink === b.hyperlink;
+  return (
+    a.color === b.color &&
+    a.backgroundColor === b.backgroundColor &&
+    a.bold === b.bold &&
+    a.dim === b.dim &&
+    a.italic === b.italic &&
+    a.underline === b.underline &&
+    a.strikethrough === b.strikethrough &&
+    a.inverse === b.inverse &&
+    a.hyperlink === b.hyperlink
+  )
 }
+
 function hasAnyProps(props: SpanProps): boolean {
-  return props.color !== undefined || props.backgroundColor !== undefined || props.dim === true || props.bold === true || props.italic === true || props.underline === true || props.strikethrough === true || props.inverse === true || props.hyperlink !== undefined;
+  return (
+    props.color !== undefined ||
+    props.backgroundColor !== undefined ||
+    props.dim === true ||
+    props.bold === true ||
+    props.italic === true ||
+    props.underline === true ||
+    props.strikethrough === true ||
+    props.inverse === true ||
+    props.hyperlink !== undefined
+  )
 }
+
 function hasAnyTextProps(props: SpanProps): boolean {
-  return props.color !== undefined || props.backgroundColor !== undefined || props.dim === true || props.bold === true || props.italic === true || props.underline === true || props.strikethrough === true || props.inverse === true;
+  return (
+    props.color !== undefined ||
+    props.backgroundColor !== undefined ||
+    props.dim === true ||
+    props.bold === true ||
+    props.italic === true ||
+    props.underline === true ||
+    props.strikethrough === true ||
+    props.inverse === true
+  )
 }

 // Text style props without weight (bold/dim) - these are handled separately
 type BaseTextStyleProps = {
-  color?: Color;
-  backgroundColor?: Color;
-  italic?: boolean;
-  underline?: boolean;
-  strikethrough?: boolean;
-  inverse?: boolean;
-};
+  color?: Color
+  backgroundColor?: Color
+  italic?: boolean
+  underline?: boolean
+  strikethrough?: boolean
+  inverse?: boolean
+}

 // Wrapper component that handles bold/dim mutual exclusivity for Text
-function StyledText(t0) {
-  const $ = _c(14);
-  let bold;
-  let children;
-  let dim;
-  let rest;
-  if ($[0] !== t0) {
-    ({
-      bold,
-      dim,
-      children,
-      ...rest
-    } = t0);
-    $[0] = t0;
-    $[1] = bold;
-    $[2] = children;
-    $[3] = dim;
-    $[4] = rest;
-  } else {
-    bold = $[1];
-    children = $[2];
-    dim = $[3];
-    rest = $[4];
-  }
+function StyledText({
+  bold,
+  dim,
+  children,
+  ...rest
+}: BaseTextStyleProps & {
+  bold?: boolean
+  dim?: boolean
+  children: string
+}): React.ReactNode {
+  // dim takes precedence over bold when both are set (terminals treat them as mutually exclusive)
  if (dim) {
-    let t1;
-    if ($[5] !== children || $[6] !== rest) {
-      t1 = <Text {...rest} dim={true}>{children}</Text>;
-      $[5] = children;
-      $[6] = rest;
-      $[7] = t1;
-    } else {
-      t1 = $[7];
-    }
-    return t1;
+    return (
+      <Text {...rest} dim>
+        {children}
+      </Text>
+    )
  }
  if (bold) {
-    let t1;
-    if ($[8] !== children || $[9] !== rest) {
-      t1 = <Text {...rest} bold={true}>{children}</Text>;
-      $[8] = children;
-      $[9] = rest;
-      $[10] = t1;
-    } else {
-      t1 = $[10];
-    }
-    return t1;
+    return (
+      <Text {...rest} bold>
+        {children}
+      </Text>
+    )
  }
-  let t1;
-  if ($[11] !== children || $[12] !== rest) {
-    t1 = <Text {...rest}>{children}</Text>;
-    $[11] = children;
-    $[12] = rest;
-    $[13] = t1;
-  } else {
-    t1 = $[13];
-  }
-  return t1;
+  return <Text {...rest}>{children}</Text>
 }