mirror of
https://github.com/YuzuZensai/Termix.git
synced 2026-11-12 15:26:36 +00:00
d1a8dcf3c6
* chore(deps-dev): bump the dev-minor-updates group across 1 directory with 12 updates (#910) Bumps the dev-minor-updates group with 12 updates in the / directory: | Package | From | To | | --- | --- | --- | | [@radix-ui/react-select](https://github.com/radix-ui/primitives/tree/HEAD/packages/react/select) | `2.2.6` | `2.3.1` | | [@radix-ui/react-slider](https://github.com/radix-ui/primitives/tree/HEAD/packages/react/slider) | `1.3.6` | `1.4.1` | | [@radix-ui/react-slot](https://github.com/radix-ui/primitives/tree/HEAD/packages/react/slot) | `1.2.5` | `1.3.0` | | [@radix-ui/react-switch](https://github.com/radix-ui/primitives/tree/HEAD/packages/react/switch) | `1.2.6` | `1.3.1` | | [cytoscape](https://github.com/cytoscape/cytoscape.js) | `3.33.4` | `3.34.0` | | [electron](https://github.com/electron/electron) | `42.2.0` | `42.4.1` | | [electron-builder](https://github.com/electron-userland/electron-builder/tree/HEAD/packages/electron-builder) | `26.8.1` | `26.15.3` | | [lucide-react](https://github.com/lucide-icons/lucide/tree/HEAD/packages/lucide-react) | `1.16.0` | `1.20.0` | | [radix-ui](https://github.com/radix-ui/primitives/tree/HEAD/packages/react/radix-ui) | `1.4.3` | `1.6.0` | | [react-hook-form](https://github.com/react-hook-form/react-hook-form) | `7.76.1` | `7.79.0` | | [sharp](https://github.com/lovell/sharp) | `0.34.5` | `0.35.1` | | [typescript-eslint](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/typescript-eslint) | `8.60.0` | `8.61.1` | Updates `@radix-ui/react-select` from 2.2.6 to 2.3.1 - [Changelog](https://github.com/radix-ui/primitives/blob/main/packages/react/select/CHANGELOG.md) - [Commits](https://github.com/radix-ui/primitives/commits/HEAD/packages/react/select) Updates `@radix-ui/react-slider` from 1.3.6 to 1.4.1 - [Changelog](https://github.com/radix-ui/primitives/blob/main/packages/react/slider/CHANGELOG.md) - [Commits](https://github.com/radix-ui/primitives/commits/HEAD/packages/react/slider) Updates `@radix-ui/react-slot` from 1.2.5 to 1.3.0 - [Changelog](https://github.com/radix-ui/primitives/blob/main/packages/react/slot/CHANGELOG.md) - [Commits](https://github.com/radix-ui/primitives/commits/HEAD/packages/react/slot) Updates `@radix-ui/react-switch` from 1.2.6 to 1.3.1 - [Changelog](https://github.com/radix-ui/primitives/blob/main/packages/react/switch/CHANGELOG.md) - [Commits](https://github.com/radix-ui/primitives/commits/HEAD/packages/react/switch) Updates `cytoscape` from 3.33.4 to 3.34.0 - [Release notes](https://github.com/cytoscape/cytoscape.js/releases) - [Commits](https://github.com/cytoscape/cytoscape.js/compare/v3.33.4...v3.34.0) Updates `electron` from 42.2.0 to 42.4.1 - [Release notes](https://github.com/electron/electron/releases) - [Commits](https://github.com/electron/electron/compare/v42.2.0...v42.4.1) Updates `electron-builder` from 26.8.1 to 26.15.3 - [Release notes](https://github.com/electron-userland/electron-builder/releases) - [Changelog](https://github.com/electron-userland/electron-builder/blob/master/packages/electron-builder/CHANGELOG.md) - [Commits](https://github.com/electron-userland/electron-builder/commits/electron-builder@26.15.3/packages/electron-builder) Updates `lucide-react` from 1.16.0 to 1.20.0 - [Release notes](https://github.com/lucide-icons/lucide/releases) - [Commits](https://github.com/lucide-icons/lucide/commits/1.20.0/packages/lucide-react) Updates `radix-ui` from 1.4.3 to 1.6.0 - [Changelog](https://github.com/radix-ui/primitives/blob/main/packages/react/radix-ui/CHANGELOG.md) - [Commits](https://github.com/radix-ui/primitives/commits/HEAD/packages/react/radix-ui) Updates `react-hook-form` from 7.76.1 to 7.79.0 - [Release notes](https://github.com/react-hook-form/react-hook-form/releases) - [Changelog](https://github.com/react-hook-form/react-hook-form/blob/master/CHANGELOG.md) - [Commits](https://github.com/react-hook-form/react-hook-form/compare/v7.76.1...v7.79.0) Updates `sharp` from 0.34.5 to 0.35.1 - [Release notes](https://github.com/lovell/sharp/releases) - [Commits](https://github.com/lovell/sharp/compare/v0.34.5...v0.35.1) Updates `typescript-eslint` from 8.60.0 to 8.61.1 - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/typescript-eslint/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.61.1/packages/typescript-eslint) --- updated-dependencies: - dependency-name: "@radix-ui/react-select" dependency-version: 2.3.1 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: dev-minor-updates - dependency-name: "@radix-ui/react-slider" dependency-version: 1.4.1 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: dev-minor-updates - dependency-name: "@radix-ui/react-slot" dependency-version: 1.3.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: dev-minor-updates - dependency-name: "@radix-ui/react-switch" dependency-version: 1.3.1 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: dev-minor-updates - dependency-name: cytoscape dependency-version: 3.34.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: dev-minor-updates - dependency-name: electron dependency-version: 42.4.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: dev-minor-updates - dependency-name: electron-builder dependency-version: 26.15.3 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: dev-minor-updates - dependency-name: lucide-react dependency-version: 1.18.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: dev-minor-updates - dependency-name: radix-ui dependency-version: 1.6.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: dev-minor-updates - dependency-name: react-hook-form dependency-version: 7.79.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: dev-minor-updates - dependency-name: sharp dependency-version: 0.35.1 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: dev-minor-updates - dependency-name: typescript-eslint dependency-version: 8.61.1 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: dev-minor-updates ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump node in /docker in the docker-major-updates group (#914) Bumps the docker-major-updates group in /docker with 1 update: node. Updates `node` from 24-slim to 26-slim --- updated-dependencies: - dependency-name: node dependency-version: 26-slim dependency-type: direct:production dependency-group: docker-major-updates ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * ci(deps): bump the github-actions group with 2 updates (#915) Bumps the github-actions group with 2 updates: [actions/checkout](https://github.com/actions/checkout) and [actions/setup-node](https://github.com/actions/setup-node). Updates `actions/checkout` from 5 to 6 - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v5...v6) Updates `actions/setup-node` from 4 to 6 - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/v4...v6) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major dependency-group: github-actions - dependency-name: actions/setup-node dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major dependency-group: github-actions ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump the prod-minor-updates group across 1 directory with 5 updates (#916) Bumps the prod-minor-updates group with 5 updates in the / directory: | Package | From | To | | --- | --- | --- | | [axios](https://github.com/axios/axios) | `1.17.0` | `1.18.0` | | [better-sqlite3](https://github.com/WiseLibs/better-sqlite3) | `12.10.0` | `12.11.1` | | [body-parser](https://github.com/expressjs/body-parser) | `2.2.2` | `2.3.0` | | [multer](https://github.com/expressjs/multer) | `2.1.1` | `2.2.0` | | [undici](https://github.com/nodejs/undici) | `8.4.0` | `8.5.0` | Updates `axios` from 1.17.0 to 1.18.0 - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md) - [Commits](https://github.com/axios/axios/compare/v1.17.0...v1.18.0) Updates `better-sqlite3` from 12.10.0 to 12.11.1 - [Release notes](https://github.com/WiseLibs/better-sqlite3/releases) - [Commits](https://github.com/WiseLibs/better-sqlite3/compare/v12.10.0...v12.11.1) Updates `body-parser` from 2.2.2 to 2.3.0 - [Release notes](https://github.com/expressjs/body-parser/releases) - [Changelog](https://github.com/expressjs/body-parser/blob/master/HISTORY.md) - [Commits](https://github.com/expressjs/body-parser/compare/v2.2.2...v2.3.0) Updates `multer` from 2.1.1 to 2.2.0 - [Release notes](https://github.com/expressjs/multer/releases) - [Changelog](https://github.com/expressjs/multer/blob/main/CHANGELOG.md) - [Commits](https://github.com/expressjs/multer/compare/v2.1.1...v2.2.0) Updates `undici` from 8.4.0 to 8.5.0 - [Release notes](https://github.com/nodejs/undici/releases) - [Commits](https://github.com/nodejs/undici/compare/v8.4.0...v8.5.0) --- updated-dependencies: - dependency-name: axios dependency-version: 1.18.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: prod-minor-updates - dependency-name: better-sqlite3 dependency-version: 12.11.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: prod-minor-updates - dependency-name: body-parser dependency-version: 2.3.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: prod-minor-updates - dependency-name: multer dependency-version: 2.2.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: prod-minor-updates - dependency-name: undici dependency-version: 8.5.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: prod-minor-updates ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * feat: add unlink button for dual auth * fix: general bug fixes * fix: general qol/small feature additions * fix: 100mb max upload size * fix: terminal syntax not handling carriage returns or shell prompt lines properly * feat: continued general improvements * fix: terminal outputting success right after folder path * chore: update release notes * feat: continued fixes and improvements * chore: lint, format, and bump version to 2.4.1 * chore: sync Crowdin translations for 2.4.1 * fix: rebase dev branch onto main before Crowdin download * fix: use merge instead of rebase to sync main before Crowdin --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
389 lines
11 KiB
TypeScript
389 lines
11 KiB
TypeScript
const ANSI = {
|
|
reset: "\x1b[0m",
|
|
red: "\x1b[31m",
|
|
green: "\x1b[32m",
|
|
yellow: "\x1b[33m",
|
|
blue: "\x1b[34m",
|
|
magenta: "\x1b[35m",
|
|
cyan: "\x1b[36m",
|
|
brightBlack: "\x1b[90m",
|
|
brightRed: "\x1b[91m",
|
|
brightGreen: "\x1b[92m",
|
|
brightYellow: "\x1b[93m",
|
|
brightBlue: "\x1b[94m",
|
|
brightCyan: "\x1b[96m",
|
|
bold: "\x1b[1m",
|
|
underline: "\x1b[4m",
|
|
} as const;
|
|
|
|
export interface SyntaxHighlightOptions {
|
|
logLevels?: boolean;
|
|
paths?: boolean;
|
|
timestamps?: boolean;
|
|
ipAddresses?: boolean;
|
|
urls?: boolean;
|
|
numbers?: boolean;
|
|
}
|
|
|
|
interface HighlightPattern {
|
|
name: string;
|
|
regex: RegExp;
|
|
ansiCode: string;
|
|
priority: number;
|
|
category: keyof SyntaxHighlightOptions;
|
|
}
|
|
|
|
interface MatchResult {
|
|
start: number;
|
|
end: number;
|
|
ansiCode: string;
|
|
priority: number;
|
|
// capture group offset: some patterns capture a sub-group rather than whole match
|
|
captureStart?: number;
|
|
captureEnd?: number;
|
|
}
|
|
|
|
interface TextSegment {
|
|
isAnsi: boolean;
|
|
content: string;
|
|
// the last active SGR code before this segment (for state restoration)
|
|
activeSgr?: string;
|
|
}
|
|
|
|
const MAX_LINE_LENGTH = 2000;
|
|
|
|
// Cursor-positioning and erase sequences used by TUI apps (nano, vim, htop).
|
|
// If a chunk contains these, we skip highlighting entirely.
|
|
const TUI_SEQUENCE = /\x1b\[[\d;]*[ABCDEFGHJKST]/;
|
|
|
|
// A bare \r (not immediately followed by \n) means the terminal is overwriting
|
|
// the current line (shell prompts, progress bars). Highlighting mid-rewrite
|
|
// chunks corrupts the cursor state, so we skip the whole chunk.
|
|
const MID_LINE_CR = /\r(?!\n)/;
|
|
|
|
// Detects shell prompt lines (user@host:/path$ or similar) after stripping ANSI.
|
|
// These should not be highlighted — the server already colored them, and injecting
|
|
// additional ANSI codes into the prompt fragments causes display corruption.
|
|
const STRIP_ANSI_RE = /\x1b(?:[@-Z\\-_]|\[[0-9;?>=!]*[@-~])/g;
|
|
|
|
function isShellPromptLine(bare: string): boolean {
|
|
const plain = bare.replace(STRIP_ANSI_RE, "");
|
|
// Matches a trailing prompt: "user@host:~$ ", "root@pi:/home/pi# ", "[user@host dir]$ "
|
|
if (/(?:[\w.-]+@[\w.-]+|[\w.-]+).*?[$#%>]\s*$/.test(plain)) return true;
|
|
// Matches a leading prompt followed by a command: "user@host:/path$ cmd arg"
|
|
// This is the echoed command line — the shell colors the prompt prefix itself,
|
|
// so injecting extra ANSI codes into it causes visual corruption / doubled paths.
|
|
if (/^(?:\[?[\w.-]+@[\w.-]+[\w./ ~-]*\]?|[\w.-]+).*?[$#%>]\s+\S/.test(plain))
|
|
return true;
|
|
return false;
|
|
}
|
|
|
|
// Matches any complete ANSI escape sequence
|
|
const ANSI_REGEX = /\x1b(?:[@-Z\\-_]|\[[0-9;?>=!]*[@-~])/g;
|
|
|
|
// Matches SGR sequences (color/style setters) specifically — used to track active color state
|
|
const SGR_REGEX = /\x1b\[[0-9;]*m/;
|
|
|
|
// All patterns, ordered roughly by specificity. Priority determines which wins on overlap.
|
|
const ALL_PATTERNS: HighlightPattern[] = [
|
|
// IPv4 with optional :port — well-bounded, very specific
|
|
{
|
|
name: "ipv4",
|
|
regex:
|
|
/(?:(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])\.){3}(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])(?::\d{1,5})?/g,
|
|
ansiCode: ANSI.magenta,
|
|
priority: 10,
|
|
category: "ipAddresses",
|
|
},
|
|
|
|
// Bracket timestamps [HH:MM] or [HH:MM:SS] — tight range checks prevent false positives
|
|
{
|
|
name: "timestamp-bracket",
|
|
regex: /\[(?:[01]\d|2[0-3]):[0-5]\d(?::[0-5]\d)?\]/g,
|
|
ansiCode: ANSI.brightBlack,
|
|
priority: 9,
|
|
category: "timestamps",
|
|
},
|
|
|
|
// ISO 8601 date with optional time. Require non-digit before to avoid matching
|
|
// inside version strings like "1.2024.3". The \b on the right ensures we don't
|
|
// match partial tokens.
|
|
{
|
|
name: "timestamp-iso",
|
|
regex:
|
|
/(?<![0-9])\b\d{4}-(?:0[1-9]|1[0-2])-(?:0[1-9]|[12]\d|3[01])(?:[T ]\d{2}:\d{2}(?::\d{2})?(?:\.\d+)?(?:Z|[+-]\d{2}:?\d{2})?)?\b/g,
|
|
ansiCode: ANSI.brightBlack,
|
|
priority: 9,
|
|
category: "timestamps",
|
|
},
|
|
|
|
// Error-level keywords — case-insensitive, catches "Error", "error", "FAILED", etc.
|
|
{
|
|
name: "log-error",
|
|
regex:
|
|
/\b(?:error|fatal|critical|fail(?:ed)?|denied|exception)\b|\[(?:error|fatal|critical)\]/gi,
|
|
ansiCode: ANSI.brightRed,
|
|
priority: 9,
|
|
category: "logLevels",
|
|
},
|
|
|
|
// Warning-level keywords — case-insensitive
|
|
{
|
|
name: "log-warn",
|
|
regex: /\b(?:warn(?:ing)?|alert|caution)\b|\[warn(?:ing)?\]/gi,
|
|
ansiCode: ANSI.brightYellow,
|
|
priority: 9,
|
|
category: "logLevels",
|
|
},
|
|
|
|
// Success keywords — kept conservative to avoid noise.
|
|
// Negative lookahead prevents matching when directly followed by a path separator
|
|
// (e.g. shell `cd` output that prints "success~/new/dir").
|
|
{
|
|
name: "log-success",
|
|
regex:
|
|
/\b(?:success(?:ful(?:ly)?)?|pass(?:ed)?|complete(?:d)?|ok\b)\b(?![\\/~])/gi,
|
|
ansiCode: ANSI.brightGreen,
|
|
priority: 8,
|
|
category: "logLevels",
|
|
},
|
|
|
|
// URLs — blue + underline
|
|
{
|
|
name: "url",
|
|
regex: /https?:\/\/[^\s\])}>"']+/g,
|
|
ansiCode: `${ANSI.blue}${ANSI.underline}`,
|
|
priority: 8,
|
|
category: "urls",
|
|
},
|
|
|
|
// Absolute paths — permissive character class that allows *, ?, [], globs, etc.
|
|
// Requires at least one slash after the root segment so we don't match bare /dev or /tmp.
|
|
// Boundary: must start at beginning of text or after whitespace/colon/comma/paren.
|
|
{
|
|
name: "path-absolute",
|
|
regex:
|
|
/(?:(?<=^)|(?<=[\s:,;('"]))\/[^\s"'`|<>&;\\]+(?:\/[^\s"'`|<>&;\\]+)+/g,
|
|
ansiCode: ANSI.cyan,
|
|
priority: 7,
|
|
category: "paths",
|
|
},
|
|
|
|
// Home-relative paths
|
|
{
|
|
name: "path-home",
|
|
regex: /~\/[^\s"'`|<>&;(){}[\]\\]+/g,
|
|
ansiCode: ANSI.cyan,
|
|
priority: 7,
|
|
category: "paths",
|
|
},
|
|
|
|
// Info keyword
|
|
{
|
|
name: "log-info",
|
|
regex: /\binfo\b|\[info\]/gi,
|
|
ansiCode: ANSI.blue,
|
|
priority: 6,
|
|
category: "logLevels",
|
|
},
|
|
|
|
// Debug/trace
|
|
{
|
|
name: "log-debug",
|
|
regex: /\b(?:debug|trace|verbose)\b|\[(?:debug|trace)\]/gi,
|
|
ansiCode: ANSI.brightBlack,
|
|
priority: 6,
|
|
category: "logLevels",
|
|
},
|
|
|
|
// Labeled numbers: port 8080, exit 1, code 127, status 404, signal 9, returned 0
|
|
// Captures just the number portion so only the digit is highlighted.
|
|
{
|
|
name: "number-labeled",
|
|
regex: /\b(?:port|exit|code|status|signal|returned?)\s+(\d+)\b/gi,
|
|
ansiCode: ANSI.brightCyan,
|
|
priority: 5,
|
|
category: "numbers",
|
|
},
|
|
];
|
|
|
|
function hasIncompleteAnsiSequence(text: string): boolean {
|
|
return /\x1b\[[0-9;?>=!]*$/.test(text);
|
|
}
|
|
|
|
function parseAnsiSegments(text: string): TextSegment[] {
|
|
const segments: TextSegment[] = [];
|
|
ANSI_REGEX.lastIndex = 0;
|
|
let lastIndex = 0;
|
|
let activeSgr = "";
|
|
let match;
|
|
|
|
while ((match = ANSI_REGEX.exec(text)) !== null) {
|
|
if (match.index > lastIndex) {
|
|
segments.push({
|
|
isAnsi: false,
|
|
content: text.slice(lastIndex, match.index),
|
|
activeSgr,
|
|
});
|
|
}
|
|
const seq = match[0];
|
|
segments.push({ isAnsi: true, content: seq });
|
|
// Track the active SGR state so we can restore it after a highlight reset
|
|
if (SGR_REGEX.test(seq)) {
|
|
activeSgr = seq === ANSI.reset ? "" : seq;
|
|
}
|
|
lastIndex = ANSI_REGEX.lastIndex;
|
|
}
|
|
|
|
if (lastIndex < text.length) {
|
|
segments.push({ isAnsi: false, content: text.slice(lastIndex), activeSgr });
|
|
}
|
|
|
|
return segments;
|
|
}
|
|
|
|
function highlightPlainText(
|
|
text: string,
|
|
activePatterns: HighlightPattern[],
|
|
activeSgr: string,
|
|
): string {
|
|
if (text.length > MAX_LINE_LENGTH || !text.trim()) return text;
|
|
|
|
const matches: MatchResult[] = [];
|
|
|
|
for (const pattern of activePatterns) {
|
|
pattern.regex.lastIndex = 0;
|
|
let m;
|
|
while ((m = pattern.regex.exec(text)) !== null) {
|
|
// For patterns with a capture group (labeled numbers), highlight only the capture
|
|
if (m[1] !== undefined) {
|
|
const captureOffset = m[0].indexOf(m[1], m[0].search(/\d/));
|
|
const captureStart = m.index + captureOffset;
|
|
const captureEnd = captureStart + m[1].length;
|
|
matches.push({
|
|
start: m.index,
|
|
end: m.index + m[0].length,
|
|
ansiCode: pattern.ansiCode,
|
|
priority: pattern.priority,
|
|
captureStart,
|
|
captureEnd,
|
|
});
|
|
} else {
|
|
matches.push({
|
|
start: m.index,
|
|
end: m.index + m[0].length,
|
|
ansiCode: pattern.ansiCode,
|
|
priority: pattern.priority,
|
|
});
|
|
}
|
|
}
|
|
}
|
|
|
|
if (matches.length === 0) return text;
|
|
|
|
// Highest priority wins; ties broken by earlier start position
|
|
matches.sort((a, b) =>
|
|
a.priority !== b.priority ? b.priority - a.priority : a.start - b.start,
|
|
);
|
|
|
|
const used: Array<{ start: number; end: number }> = [];
|
|
const final = matches.filter((m) => {
|
|
const overlaps = used.some(
|
|
(r) =>
|
|
(m.start >= r.start && m.start < r.end) ||
|
|
(m.end > r.start && m.end <= r.end) ||
|
|
(m.start <= r.start && m.end >= r.end),
|
|
);
|
|
if (!overlaps) {
|
|
used.push({ start: m.start, end: m.end });
|
|
return true;
|
|
}
|
|
return false;
|
|
});
|
|
|
|
// Apply in reverse order so indices stay valid as we insert escape codes
|
|
final.sort((a, b) => a.start - b.start).reverse();
|
|
|
|
let result = text;
|
|
for (const m of final) {
|
|
const hs = m.captureStart ?? m.start;
|
|
const he = m.captureEnd ?? m.end;
|
|
|
|
// After reset, re-emit the SGR that was active before this plain-text segment
|
|
// so we don't clobber colors set by the server earlier in the line.
|
|
const restore = activeSgr || "";
|
|
result =
|
|
result.slice(0, hs) +
|
|
m.ansiCode +
|
|
result.slice(hs, he) +
|
|
ANSI.reset +
|
|
restore +
|
|
result.slice(he);
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
function buildActivePatterns(
|
|
options: SyntaxHighlightOptions,
|
|
): HighlightPattern[] {
|
|
return ALL_PATTERNS.filter((p) => options[p.category] !== false);
|
|
}
|
|
|
|
function highlightLine(
|
|
line: string,
|
|
activePatterns: HighlightPattern[],
|
|
): string {
|
|
const cr = line.endsWith("\r");
|
|
const bare = cr ? line.slice(0, -1) : line;
|
|
|
|
if (!bare.trim()) return line;
|
|
if (isShellPromptLine(bare)) return line;
|
|
|
|
const segments = parseAnsiSegments(bare);
|
|
const result = segments
|
|
.map((s) =>
|
|
s.isAnsi
|
|
? s.content
|
|
: highlightPlainText(s.content, activePatterns, s.activeSgr ?? ""),
|
|
)
|
|
.join("");
|
|
|
|
return cr ? result + "\r" : result;
|
|
}
|
|
|
|
export function highlightTerminalOutput(
|
|
text: string,
|
|
options: SyntaxHighlightOptions = {},
|
|
): string {
|
|
if (!text || !text.trim()) return text;
|
|
if (hasIncompleteAnsiSequence(text)) return text;
|
|
|
|
if (TUI_SEQUENCE.test(text)) return text;
|
|
if (MID_LINE_CR.test(text)) return text;
|
|
|
|
const activePatterns = buildActivePatterns(options);
|
|
if (activePatterns.length === 0) return text;
|
|
|
|
const lines = text.split("\n");
|
|
const endsWithNewline = text.endsWith("\n");
|
|
const hasMultipleLines = lines.length > 1;
|
|
|
|
// When a multi-line chunk has a trailing fragment without \n, that fragment
|
|
// could be a live readline input line that bash will redraw with \r +
|
|
// cursor-positioning sequences. Injecting ANSI bytes into it adds invisible
|
|
// chars that bash doesn't count, so bash's cursor arithmetic diverges from
|
|
// xterm's actual column position — causing the cursor to jump and text to
|
|
// shift when the user types or navigates with arrow keys.
|
|
// Only skip the last fragment when the chunk already has complete lines
|
|
// before it (single-line chunks with no \n are plain output, not input).
|
|
const highlightCount =
|
|
hasMultipleLines && !endsWithNewline ? lines.length - 1 : lines.length;
|
|
|
|
return lines
|
|
.map((line, i) =>
|
|
i < highlightCount ? highlightLine(line, activePatterns) : line,
|
|
)
|
|
.join("\n");
|
|
}
|