cliedit 0.2.0 → 0.3.5

package/README.md

@@ -14,6 +14,7 @@ It includes line wrapping, visual navigation, smart auto-indentation, undo/redo,
 - **Undo/Redo:** `Ctrl+Z` / `Ctrl+Y` for persistent history.
 - **Text Selection:** `Ctrl+Arrow` keys to select text.
 - **Clipboard Support:** `Ctrl+C` (Copy), `Ctrl+X` (Cut), `Ctrl+V` (Paste) for system clipboard (macOS, Windows, **and Linux** via `xclip`).
+- **Syntax Highlighting:** Lightweight highlighting for Brackets `()` `[]` `{}` and Strings `""` `''`.
 - **File I/O:** Loads from and saves to the filesystem.
 - **Search & Replace:** `Ctrl+W` to find text, `Ctrl+R` to find and replace interactively.
 - **Go to Line:** `Ctrl+L` to quickly jump to a specific line number.
@@ -23,7 +24,7 @@ It includes line wrapping, visual navigation, smart auto-indentation, undo/redo,
 - **Crash Recovery:** Automatically saves changes to a hidden swap file (e.g. `.filename.swp`) to prevent data loss.
 
 ## Installation
-```bash
+```shell
 npm install cliedit
 ````
 
@@ -31,7 +32,7 @@ npm install cliedit
 
 The package exports an `async` function `openEditor` that returns a `Promise`. The promise resolves when the user quits the editor.
 
-```javascript
+```typescript
 import { openEditor } from 'cliedit';
 import path from 'path';
 
@@ -64,7 +65,7 @@ getCommitMessage();
 
 `cliedit` supports standard input piping. When used in a pipeline, it reads the input content, then re-opens the TTY to allow interactive editing.
 
-```bash
+```shell
 # Edit a file using cat
 cat README.md | node my-app.js
 
@@ -101,7 +102,7 @@ If the process crashes or is terminated abruptly, the next time you open the fil
 
 The main editor class. You can import this directly if you need to extend or instantiate the editor with custom logic.
 
-```javascript
+```typescript
 import { CliEditor } from 'cliedit';
 ```
 
@@ -109,7 +110,7 @@ import { CliEditor } from 'cliedit';
 
 Key types are also exported for convenience:
 
-```javascript
+```typescript
 import type {
   DocumentState,
   VisualRow,

package/dist/constants.d.ts

@@ -11,6 +11,9 @@ export declare const ANSI: {
     RESET_COLORS: string;
     ENTER_ALTERNATE_SCREEN: string;
     EXIT_ALTERNATE_SCREEN: string;
+    YELLOW: string;
+    CYAN: string;
+    GREEN: string;
 };
 /**
  * Key definitions for special keypresses (using Ctrl+ keys for reliable detection).

package/dist/constants.js

@@ -12,6 +12,10 @@ export const ANSI = {
     RESET_COLORS: '\x1b[0m', // Reset colors
     ENTER_ALTERNATE_SCREEN: '\x1b[?1049h', // Enter alternate screen
     EXIT_ALTERNATE_SCREEN: '\x1b[?1049l', // Exit alternate screen
+    // Syntax Highlighting Colors
+    YELLOW: '\x1b[33m',
+    CYAN: '\x1b[36m',
+    GREEN: '\x1b[32m',
 };
 /**
  * Key definitions for special keypresses (using Ctrl+ keys for reliable detection).

package/dist/editor.d.ts

@@ -10,6 +10,7 @@ import { historyMethods } from './editor.history.js';
 import { ioMethods } from './editor.io.js';
 import { TKeyHandlingMethods } from './editor.keys.js';
 import { TSelectionMethods } from './editor.selection.js';
+import { syntaxMethods } from './editor.syntax.js';
 type TEditingMethods = typeof editingMethods;
 type TClipboardMethods = typeof clipboardMethods;
 type TNavigationMethods = typeof navigationMethods;
@@ -17,7 +18,8 @@ type TRenderingMethods = typeof renderingMethods;
 type TSearchMethods = typeof searchMethods;
 type THistoryMethods = typeof historyMethods;
 type TIOMethods = typeof ioMethods;
-export interface CliEditor extends TEditingMethods, TClipboardMethods, TNavigationMethods, TRenderingMethods, TSearchMethods, THistoryMethods, TIOMethods, TKeyHandlingMethods, TSelectionMethods {
+type TSyntaxMethods = typeof syntaxMethods;
+export interface CliEditor extends TEditingMethods, TClipboardMethods, TNavigationMethods, TRenderingMethods, TSearchMethods, THistoryMethods, TIOMethods, TKeyHandlingMethods, TSelectionMethods, TSyntaxMethods {
 }
 /**
  * Main editor class managing application state, TTY interaction, and rendering.
@@ -52,7 +54,12 @@ export declare class CliEditor {
         y: number;
         x: number;
     }[];
+    searchResultMap: Map<number, Array<{
+        start: number;
+        end: number;
+    }>>;
     searchResultIndex: number;
+    syntaxCache: Map<number, Map<number, string>>;
     history: HistoryManager;
     swapManager: SwapManager;
     isCleanedUp: boolean;

package/dist/editor.editing.js

@@ -33,6 +33,7 @@ function insertContentAtCursor(contentLines) {
         this.cursorX = lastPasteLine.length;
     }
     this.setDirty();
+    this.invalidateSyntaxCache();
     this.recalculateVisualRows();
 }
 /**
@@ -42,6 +43,7 @@ function insertCharacter(char) {
     const line = this.lines[this.cursorY] || '';
     this.lines[this.cursorY] = line.slice(0, this.cursorX) + char + line.slice(this.cursorX);
     this.cursorX += char.length;
+    this.invalidateSyntaxCache();
 }
 /**
  * Inserts a soft tab (using configured tabSize).
@@ -49,6 +51,7 @@ function insertCharacter(char) {
 function insertSoftTab() {
     const spaces = ' '.repeat(this.tabSize || 4);
     this.insertCharacter(spaces);
+    // invalidation handled in insertCharacter
 }
 /**
  * Inserts a new line, splitting the current line at the cursor position.
@@ -66,6 +69,7 @@ function insertNewLine() {
     this.cursorY++;
     this.cursorX = indent.length; // Move cursor to end of indent
     this.setDirty();
+    this.invalidateSyntaxCache();
 }
 /**
  * Deletes the character before the cursor, or joins the current line with the previous one.
@@ -90,6 +94,7 @@ function deleteBackward() {
         this.cursorX = 0;
     }
     this.setDirty();
+    this.invalidateSyntaxCache();
 }
 /**
  * Deletes the character after the cursor, or joins the current line with the next one.
@@ -110,6 +115,7 @@ function deleteForward() {
         this.cursorX = 0;
     }
     this.setDirty();
+    this.invalidateSyntaxCache();
 }
 /**
  * Handles auto-pairing of brackets and quotes.

package/dist/editor.history.js

@@ -38,6 +38,7 @@ function undo() {
     if (state) {
         this.loadState(state);
         this.setDirty();
+        this.invalidateSyntaxCache();
         this.setStatusMessage('Undo successful');
     }
     else {
@@ -52,6 +53,7 @@ function redo() {
     if (state) {
         this.loadState(state);
         this.setDirty();
+        this.invalidateSyntaxCache();
         this.setStatusMessage('Redo successful');
     }
     else {

package/dist/editor.js

@@ -14,6 +14,7 @@ import { historyMethods } from './editor.history.js';
 import { ioMethods } from './editor.io.js';
 import { keyHandlingMethods } from './editor.keys.js';
 import { selectionMethods } from './editor.selection.js';
+import { syntaxMethods } from './editor.syntax.js';
 const DEFAULT_STATUS = 'HELP: Ctrl+S = Save | Ctrl+Q = Quit | Ctrl+W = Find | Ctrl+R = Replace | Ctrl+L = Go to Line';
 /**
  * Main editor class managing application state, TTY interaction, and rendering.
@@ -41,7 +42,10 @@ export class CliEditor {
         this.replaceQuery = null; // null = Find mode, string = Replace mode
         this.goToLineQuery = ''; // For Go to Line prompt
         this.searchResults = [];
+        // Map<lineNumber, Array<{ start, end }>> for fast rendering lookup
+        this.searchResultMap = new Map();
         this.searchResultIndex = -1;
+        this.syntaxCache = new Map();
         this.isCleanedUp = false;
         this.resolvePromise = null;
         this.rejectPromise = null;
@@ -78,7 +82,8 @@ export class CliEditor {
                 process.stdout.removeAllListeners('resize');
                 // 2. (FIX GHOST TUI) Write exit sequence and use callback to ensure it's written 
                 // before Node.js fully releases the TTY.
-                process.stdout.write(ANSI.CLEAR_SCREEN + ANSI.MOVE_CURSOR_TOP_LEFT + ANSI.SHOW_CURSOR + ANSI.EXIT_ALTERNATE_SCREEN, () => {
+                // Disable mouse tracking (1000 and 1006)
+                process.stdout.write(ANSI.CLEAR_SCREEN + ANSI.MOVE_CURSOR_TOP_LEFT + ANSI.SHOW_CURSOR + ANSI.EXIT_ALTERNATE_SCREEN + '\x1b[?1000l' + '\x1b[?1006l', () => {
                     // 3. Disable TTY raw mode and pause stdin after screen is cleared
                     if (this.inputStream.setRawMode) {
                         this.inputStream.setRawMode(false);
@@ -109,8 +114,8 @@ export class CliEditor {
         }
         this.updateScreenSize();
         this.recalculateVisualRows();
-        // Enter alternate screen and hide cursor
-        process.stdout.write(ANSI.ENTER_ALTERNATE_SCREEN + ANSI.HIDE_CURSOR + ANSI.CLEAR_SCREEN);
+        // Enter alternate screen and hide cursor + Enable SGR Mouse (1006) and Button Event (1000)
+        process.stdout.write(ANSI.ENTER_ALTERNATE_SCREEN + ANSI.HIDE_CURSOR + ANSI.CLEAR_SCREEN + '\x1b[?1000h' + '\x1b[?1006h');
         if (this.inputStream.setRawMode) {
             this.inputStream.setRawMode(true);
         }
@@ -142,3 +147,4 @@ Object.assign(CliEditor.prototype, historyMethods);
 Object.assign(CliEditor.prototype, ioMethods);
 Object.assign(CliEditor.prototype, keyHandlingMethods);
 Object.assign(CliEditor.prototype, selectionMethods);
+Object.assign(CliEditor.prototype, syntaxMethods);

package/dist/editor.keys.js

@@ -85,6 +85,11 @@ function handleKeypressEvent(ch, key) {
             keyName = 'ALT_LEFT';
         else if (key.meta && key.name === 'right')
             keyName = 'ALT_RIGHT';
+        // Handle Mouse Scroll events explicitly
+        else if (key.name === 'scrollup')
+            keyName = 'SCROLL_UP';
+        else if (key.name === 'scrolldown')
+            keyName = 'SCROLL_DOWN';
         else
             keyName = key.sequence;
     }
@@ -118,7 +123,55 @@ function handleKeypressEvent(ch, key) {
                 return;
         }
         // 5. Xử lý tất cả các phím lệnh/chỉnh sửa khác
-        edited = this.handleEditKeys(keyName || ch);
+        if (keyName === 'SCROLL_UP') {
+            const scrollAmount = 3;
+            this.rowOffset = Math.max(0, this.rowOffset - scrollAmount);
+            // Adjust cursor if it falls out of view (below the viewport)
+            // Actually if we scroll UP, the viewport moves UP. The cursor might be BELOW the viewport.
+            // Wait, scroll UP means viewing lines ABOVE. Viewport index decreases.
+            // Cursor (if previously in view) might now be >= rowOffset + screenRows.
+            // We need to ensure cursor is within [rowOffset, rowOffset + screenRows - 1]
+            // But verify after setting rowOffset.
+            const currentVisualRow = this.findCurrentVisualRowIndex();
+            const bottomEdge = this.rowOffset + this.screenRows - 1;
+            if (currentVisualRow > bottomEdge) {
+                const targetRow = this.visualRows[bottomEdge];
+                this.cursorY = targetRow.logicalY;
+                this.cursorX = targetRow.logicalXStart;
+            }
+            else if (currentVisualRow < this.rowOffset) {
+                // Should not happen when scrolling up (moving viewport up), unless cursor was already above?
+                // If we scroll up, rowOffset decreases. Current row stays same. 
+                // So current row > new rowOffset.
+                // It might be > bottomEdge.
+            }
+            // However, to be safe against 'scroll' method resetting it:
+            // The 'scroll' method checks:
+            // if (currentVisualRow < this.rowOffset) -> this.rowOffset = currentVisualRow
+            // if (currentVisualRow >= this.rowOffset + this.screenRows) -> this.rowOffset = ...
+            // So we MUST move cursor inside the new viewport.
+            if (currentVisualRow > bottomEdge) {
+                const targetRow = this.visualRows[bottomEdge];
+                this.cursorY = targetRow.logicalY;
+                this.cursorX = targetRow.logicalXStart;
+            }
+        }
+        else if (keyName === 'SCROLL_DOWN') {
+            const scrollAmount = 3;
+            const maxOffset = Math.max(0, this.visualRows.length - this.screenRows);
+            this.rowOffset = Math.min(maxOffset, this.rowOffset + scrollAmount);
+            // Scroll DOWN means viewport index increases.
+            // Cursor might be ABOVE the new viewport (currentVisualRow < rowOffset).
+            const currentVisualRow = this.findCurrentVisualRowIndex();
+            if (currentVisualRow < this.rowOffset) {
+                const targetRow = this.visualRows[this.rowOffset];
+                this.cursorY = targetRow.logicalY;
+                this.cursorX = targetRow.logicalXStart;
+            }
+        }
+        else {
+            edited = this.handleEditKeys(keyName || ch);
+        }
     }
     // 6. Cập nhật Trạng thái và Render
     if (edited) {
@@ -130,6 +183,7 @@ function handleKeypressEvent(ch, key) {
     }
 }
 function handleAltArrows(keyName) {
+    this.clearSearchResults(); // Clear highlights on smart navigation
     if (keyName === 'ALT_LEFT')
         this.moveCursorByWord('left');
     else if (keyName === 'ALT_RIGHT')
@@ -147,6 +201,7 @@ function handleEditKeys(key) {
     ].includes(key);
     if (isNavigation) {
         this.cancelSelection();
+        this.clearSearchResults(); // Clear highlights on navigation
         if (this.isMessageCustom) {
             this.setStatusMessage(this.DEFAULT_STATUS, 0);
         }
@@ -189,9 +244,11 @@ function handleEditKeys(key) {
             return false;
         // --- Editing ---
         case KEYS.ENTER:
+            this.clearSearchResults();
             this.insertNewLine();
             return true;
         case KEYS.BACKSPACE:
+            this.clearSearchResults();
             // Handle auto-pair deletion
             const line = this.lines[this.cursorY] || '';
             const charBefore = line[this.cursorX - 1];
@@ -212,12 +269,14 @@ function handleEditKeys(key) {
             }
             return true;
         case KEYS.DELETE:
+            this.clearSearchResults();
             if (this.selectionAnchor)
                 this.deleteSelectedText();
             else
                 this.deleteForward();
             return true;
         case KEYS.TAB:
+            this.clearSearchResults();
             this.insertSoftTab();
             return true;
         // --- Search & History ---
@@ -273,6 +332,7 @@ function handleEditKeys(key) {
         // Xử lý Ký tự in được
         default:
             if (key.length === 1 && key >= ' ' && key <= '~') {
+                this.clearSearchResults();
                 this.handleCharacterKey(key);
                 return true;
             }

package/dist/editor.rendering.js

@@ -41,6 +41,11 @@ function render() {
     const displayX = cursorVisualX + this.gutterWidth;
     const displayY = this.screenStartRow + (currentVisualRowIndex - this.rowOffset);
     const selectionRange = this.getNormalizedSelection();
+    // Scrollbar calculations
+    const totalLines = this.visualRows.length;
+    const showScrollbar = totalLines > this.screenRows;
+    const thumbHeight = showScrollbar ? Math.max(1, Math.floor((this.screenRows / totalLines) * this.screenRows)) : 0;
+    const thumbStart = showScrollbar ? Math.floor((this.rowOffset / totalLines) * this.screenRows) : 0;
     // Draw visual rows
     for (let y = 0; y < this.screenRows; y++) {
         const visualRowIndex = y + this.rowOffset;
@@ -58,6 +63,9 @@ function render() {
                 : ' '.padStart(this.gutterWidth - 2, ' ') + ' | ';
             buffer += lineNumber;
             let lineContent = row.content;
+            // Retrieve syntax color map for the full logical line
+            // We pass the full line content because the scanner needs context
+            const syntaxColorMap = this.getLineSyntaxColor(row.logicalY, this.lines[row.logicalY]);
             // 2. Draw Content (Character by Character for selection/cursor)
             for (let i = 0; i < lineContent.length; i++) {
                 const char = lineContent[i];
@@ -66,10 +74,24 @@ function render() {
                 const isCursorPosition = (visualRowIndex === currentVisualRowIndex && i === cursorVisualX);
                 const isSelected = selectionRange && this.isPositionInSelection(logicalY, logicalX, selectionRange);
                 // Highlight search result under cursor
-                const isSearchResult = (this.searchResultIndex !== -1 &&
+                // Check if this character is part of ANY search result
+                let isGlobalSearchResult = false;
+                if (this.searchResultMap.has(logicalY)) {
+                    const matches = this.searchResultMap.get(logicalY);
+                    for (const match of matches) {
+                        if (logicalX >= match.start && logicalX < match.end) {
+                            isGlobalSearchResult = true;
+                            break;
+                        }
+                    }
+                }
+                // Check if this character is part of the CURRENTLY SELECTED search result
+                const isCurrentSearchResult = (this.searchResultIndex !== -1 &&
                     this.searchResults[this.searchResultIndex]?.y === logicalY &&
                     logicalX >= this.searchResults[this.searchResultIndex]?.x &&
                     logicalX < (this.searchResults[this.searchResultIndex]?.x + this.searchQuery.length));
+                // Syntax highlight color
+                const syntaxColor = syntaxColorMap.get(logicalX);
                 if (isSelected) {
                     buffer += ANSI.INVERT_COLORS + char + ANSI.RESET_COLORS;
                 }
@@ -77,10 +99,18 @@ function render() {
                     // Cursor is a single inverted character if not already covered by selection
                     buffer += ANSI.INVERT_COLORS + char + ANSI.RESET_COLORS;
                 }
-                else if (isSearchResult) {
-                    // Highlight search result
+                else if (isCurrentSearchResult) {
+                    // Selected Match: Invert + Underline (if supported) or just Invert
+                    buffer += ANSI.INVERT_COLORS + '\x1b[4m' + char + ANSI.RESET_COLORS;
+                }
+                else if (isGlobalSearchResult) {
+                    // Global Match: Invert only
                     buffer += ANSI.INVERT_COLORS + char + ANSI.RESET_COLORS;
                 }
+                else if (syntaxColor) {
+                    // Apply syntax color
+                    buffer += syntaxColor + char + ANSI.RESET_COLORS;
+                }
                 else {
                     buffer += char;
                 }
@@ -93,6 +123,13 @@ function render() {
             }
             buffer += `${ANSI.CLEAR_LINE}`;
         }
+        // Draw Scrollbar (Phase 2)
+        if (showScrollbar) {
+            const isThumb = y >= thumbStart && y < thumbStart + thumbHeight;
+            const scrollChar = isThumb ? '┃' : '│';
+            // Move to last column and draw
+            buffer += `\x1b[${this.screenStartRow + y};${this.screenCols}H${ANSI.RESET_COLORS}${scrollChar}`;
+        }
     }
     // Draw status bar
     buffer += `\x1b[${this.screenRows + this.screenStartRow};1H`;

package/dist/editor.search.d.ts

@@ -33,6 +33,10 @@ declare function jumpToResult(this: CliEditor, result: {
     y: number;
     x: number;
 }): void;
+/**
+ * Clears the current search results and highlights.
+ */
+declare function clearSearchResults(this: CliEditor): void;
 export declare const searchMethods: {
     enterFindMode: typeof enterFindMode;
     enterReplaceMode: typeof enterReplaceMode;
@@ -41,5 +45,6 @@ export declare const searchMethods: {
     replaceCurrentAndFindNext: typeof replaceCurrentAndFindNext;
     replaceAll: typeof replaceAll;
     jumpToResult: typeof jumpToResult;
+    clearSearchResults: typeof clearSearchResults;
 };
 export {};

package/dist/editor.search.js

@@ -29,13 +29,20 @@ function enterReplaceMode() {
  */
 function executeSearch() {
     this.searchResults = [];
+    this.searchResultMap.clear();
     if (this.searchQuery === '')
         return;
+    const queryLen = this.searchQuery.length;
     for (let y = 0; y < this.lines.length; y++) {
         const line = this.lines[y];
         let index = -1;
+        const lineMatches = [];
         while ((index = line.indexOf(this.searchQuery, index + 1)) !== -1) {
             this.searchResults.push({ y, x: index });
+            lineMatches.push({ start: index, end: index + queryLen });
+        }
+        if (lineMatches.length > 0) {
+            this.searchResultMap.set(y, lineMatches);
         }
     }
     this.searchResultIndex = -1;
@@ -158,6 +165,14 @@ function jumpToResult(result) {
     // Calculate new scroll offset to center the result visually
     this.rowOffset = Math.max(0, visualRowIndex - Math.floor(this.screenRows / 2));
 }
+/**
+ * Clears the current search results and highlights.
+ */
+function clearSearchResults() {
+    this.searchResults = [];
+    this.searchResultMap.clear();
+    this.searchResultIndex = -1;
+}
 export const searchMethods = {
     enterFindMode,
     enterReplaceMode,
@@ -166,4 +181,5 @@ export const searchMethods = {
     replaceCurrentAndFindNext,
     replaceAll,
     jumpToResult,
+    clearSearchResults,
 };

package/dist/editor.syntax.d.ts

@@ -0,0 +1,16 @@
+import { CliEditor } from './editor.js';
+/**
+ * Single-pass character scanner to generate a color map for a line.
+ * Implements "Poor Man's Syntax Highlighting" focusing on Brackets and Quotes.
+ */
+declare function getLineSyntaxColor(this: CliEditor, lineIndex: number, lineContent: string): Map<number, string>;
+/**
+ * Invalidates the syntax highlighting cache.
+ * Clears the entire cache to be safe and simple ("Poor Man's" approach).
+ */
+declare function invalidateSyntaxCache(this: CliEditor): void;
+export declare const syntaxMethods: {
+    getLineSyntaxColor: typeof getLineSyntaxColor;
+    invalidateSyntaxCache: typeof invalidateSyntaxCache;
+};
+export {};

package/dist/editor.syntax.js

@@ -0,0 +1,84 @@
+import { ANSI } from './constants.js';
+// Syntax colors
+const COLOR_BRACKET_1 = ANSI.YELLOW;
+const COLOR_STRING = ANSI.GREEN;
+// State constants
+const STATE_NORMAL = 0;
+const STATE_IN_STRING_SINGLE = 1; // '
+const STATE_IN_STRING_DOUBLE = 2; // "
+/**
+ * Single-pass character scanner to generate a color map for a line.
+ * Implements "Poor Man's Syntax Highlighting" focusing on Brackets and Quotes.
+ */
+function getLineSyntaxColor(lineIndex, lineContent) {
+    // Check cache first
+    if (this.syntaxCache.has(lineIndex)) {
+        return this.syntaxCache.get(lineIndex);
+    }
+    const colorMap = new Map();
+    let state = STATE_NORMAL;
+    for (let i = 0; i < lineContent.length; i++) {
+        const char = lineContent[i];
+        if (state === STATE_NORMAL) {
+            if (char === '"') {
+                state = STATE_IN_STRING_DOUBLE;
+                colorMap.set(i, COLOR_STRING);
+            }
+            else if (char === "'") {
+                state = STATE_IN_STRING_SINGLE;
+                colorMap.set(i, COLOR_STRING);
+            }
+            else if ('()[]{}'.includes(char)) {
+                // Alternate bracket colors for fun, or just use one
+                colorMap.set(i, COLOR_BRACKET_1);
+            }
+        }
+        else if (state === STATE_IN_STRING_DOUBLE) {
+            colorMap.set(i, COLOR_STRING);
+            if (char === '"') {
+                // Check if escaped
+                let backslashCount = 0;
+                for (let j = i - 1; j >= 0; j--) {
+                    if (lineContent[j] === '\\')
+                        backslashCount++;
+                    else
+                        break;
+                }
+                // Even backslashes => not escaped (e.g., \\" is literal backslash then quote)
+                // Odd backslashes => escaped (e.g., \" is literal quote)
+                if (backslashCount % 2 === 0) {
+                    state = STATE_NORMAL;
+                }
+            }
+        }
+        else if (state === STATE_IN_STRING_SINGLE) {
+            colorMap.set(i, COLOR_STRING);
+            if (char === "'") {
+                // Check if escaped
+                let backslashCount = 0;
+                for (let j = i - 1; j >= 0; j--) {
+                    if (lineContent[j] === '\\')
+                        backslashCount++;
+                    else
+                        break;
+                }
+                if (backslashCount % 2 === 0) {
+                    state = STATE_NORMAL;
+                }
+            }
+        }
+    }
+    this.syntaxCache.set(lineIndex, colorMap);
+    return colorMap;
+}
+/**
+ * Invalidates the syntax highlighting cache.
+ * Clears the entire cache to be safe and simple ("Poor Man's" approach).
+ */
+function invalidateSyntaxCache() {
+    this.syntaxCache.clear();
+}
+export const syntaxMethods = {
+    getLineSyntaxColor,
+    invalidateSyntaxCache
+};

package/dist/vendor/keypress.d.ts

@@ -1,6 +1,6 @@
 /**
- * Định nghĩa giao diện cho một sự kiện keypress.
- * Được điều chỉnh từ file editor.ts.
+ * Defines the interface for a keypress event.
+ * Adapted from the editor.ts file.
  */
 export interface KeypressEvent {
     name?: string;
@@ -11,7 +11,7 @@ export interface KeypressEvent {
     code?: string;
 }
 /**
- * Hàm chính, chấp nhận một Readable Stream và làm cho nó
- * phát ra sự kiện "keypress".
+ * Main function, accepts a Readable Stream and makes it
+ * emit "keypress" events.
  */
 export default function keypress(stream: NodeJS.ReadStream): void;

package/dist/vendor/keypress.js

@@ -1,11 +1,11 @@
 // src/vendor/keypress.ts
-// Đây là phiên bản "vendored" của thư viện 'keypress' (0.2.1)
-// được chuyển đổi sang TypeScript và loại bỏ hỗ trợ chuột
-// để tích hợp trực tiếp vào cliedit.
+// This is a "vendored" version of the 'keypress' library (0.2.1)
+// converted to TypeScript and stripped of mouse support
+// to be integrated directly into cliedit.
 import { EventEmitter } from 'events';
 import { StringDecoder } from 'string_decoder';
 /**
- * Hàm polyfill cho `EventEmitter.listenerCount()`, để tương thích ngược.
+ * Polyfill for `EventEmitter.listenerCount()`, for backward compatibility.
  */
 let listenerCount = EventEmitter.listenerCount;
 if (!listenerCount) {
@@ -14,18 +14,19 @@ if (!listenerCount) {
     };
 }
 /**
- * Regexes dùng để phân tích escape code của ansi
+ * Regexes used to parse ansi escape codes.
  */
 const metaKeyCodeRe = /^(?:\x1b)([a-zA-Z0-9])$/;
 const functionKeyCodeRe = /^(?:\x1b+)(O|N|\[|\[\[)(?:(\d+)(?:;(\d+))?([~^$])|(?:1;)?(\d+)?([a-zA-Z]))/;
+const mouseSgrRe = /^\x1b\[<(\d+);(\d+);(\d+)([mM])/;
 /**
- * Hàm chính, chấp nhận một Readable Stream và làm cho nó
- * phát ra sự kiện "keypress".
+ * Main function, accepts a Readable Stream and makes it
+ * emit "keypress" events.
  */
 export default function keypress(stream) {
     if (isEmittingKeypress(stream))
         return;
-    // Gắn decoder vào stream để theo dõi
+    // Attach decoder to the stream to monitor data
     stream._keypressDecoder = new StringDecoder('utf8');
     function onData(b) {
         if (listenerCount(stream, 'keypress') > 0) {
@@ -34,7 +35,7 @@ export default function keypress(stream) {
                 emitKey(stream, r);
         }
         else {
-            // Không ai đang nghe, gỡ bỏ listener
+            // No one is listening, remove listener
             stream.removeListener('data', onData);
             stream.on('newListener', onNewListener);
         }
@@ -53,23 +54,23 @@ export default function keypress(stream) {
     }
 }
 /**
- * Kiểm tra xem stream đã phát ra sự kiện "keypress" hay chưa.
+ * Checks if the stream has already emitted the "keypress" event.
  */
 function isEmittingKeypress(stream) {
     let rtn = !!stream._keypressDecoder;
     if (!rtn) {
-        // XXX: Đối với các phiên bản node cũ, chúng ta muốn xóa các
-        // listener "data" và "newListener" hiện có vì chúng sẽ không
-        // bao gồm các phần mở rộng của module này (như "mousepress" đã bị loại bỏ).
+        // XXX: For older node versions, we want to remove existing
+        // "data" and "newListener" listeners because they won't
+        // include extensions from this module (like "mousepress" which was removed).
         stream.listeners('data').slice(0).forEach(function (l) {
             if (l.name === 'onData' && /emitKey/.test(l.toString())) {
-                // FIX TS2769: Ép kiểu 'l' thành kiểu listener hợp lệ
+                // FIX TS2769: Cast 'l' to a valid listener type
                 stream.removeListener('data', l);
             }
         });
         stream.listeners('newListener').slice(0).forEach(function (l) {
             if (l.name === 'onNewListener' && /keypress/.test(l.toString())) {
-                // FIX TS2769: Ép kiểu 'l' thành kiểu listener hợp lệ
+                // FIX TS2769: Cast 'l' to a valid listener type
                 stream.removeListener('newListener', l);
             }
         });
@@ -77,8 +78,8 @@ function isEmittingKeypress(stream) {
     return rtn;
 }
 /**
- * Phần code bên dưới được lấy từ module `readline.js` của node-core
- * và đã được chuyển đổi sang TypeScript.
+ * The code below is taken from node-core's `readline.js` module
+ * and has been converted to TypeScript.
  */
 function emitKey(stream, s) {
     let ch;
@@ -90,16 +91,16 @@ function emitKey(stream, s) {
         sequence: s,
     };
     let parts;
-    // Cảnh báo: Block `Buffer.isBuffer(s)` đã bị loại bỏ.
-    // Lý do: `onData` luôn gọi `emitKey` với một string (kết quả từ StringDecoder).
-    // Block đệ quy (paste) cũng gọi với string.
-    // Vì vậy, `s` luôn là string.
+    // Warning: The `Buffer.isBuffer(s)` block has been removed.
+    // Reason: `onData` always calls `emitKey` with a string (result from StringDecoder).
+    // The recursive block (paste) also calls with a string.
+    // Therefore, `s` is always a string.
     if (s === '\r') {
         // carriage return
         key.name = 'return';
     }
     else if (s === '\n') {
-        // enter, đáng lẽ phải là linefeed
+        // enter, should have been linefeed
         key.name = 'enter';
     }
     else if (s === '\t') {
@@ -110,7 +111,7 @@ function emitKey(stream, s) {
         s === '\x7f' ||
         s === '\x1b\x7f' ||
         s === '\x1b\b') {
-        // backspace hoặc ctrl+h
+        // backspace or ctrl+h
         key.name = 'backspace';
         key.meta = s.charAt(0) === '\x1b';
     }
@@ -155,20 +156,20 @@ function emitKey(stream, s) {
     }
     else if ((parts = functionKeyCodeRe.exec(s))) {
         // ansi escape sequence
-        // Lắp ráp lại key code, bỏ qua \x1b đứng đầu,
-        // bitflag của phím bổ trợ và bất kỳ chuỗi "1;" vô nghĩa nào
+        // Reassemble key code, ignoring leading \x1b,
+        // modifier bitflag, and any meaningless "1;" strings
         const code = (parts[1] || '') +
             (parts[2] || '') +
             (parts[4] || '') +
             (parts[6] || '');
-        // FIX TS2362: Chuyển đổi (parts[...]) sang number bằng parseInt
+        // FIX TS2362: Convert (parts[...]) to number using parseInt
         const modifier = parseInt(parts[3] || parts[5] || '1', 10) - 1;
-        // Phân tích phím bổ trợ
+        // Parse modifier keys
         key.ctrl = !!(modifier & 4);
         key.meta = !!(modifier & 10);
         key.shift = !!(modifier & 1);
         key.code = code;
-        // Phân tích chính phím đó
+        // Parse the key itself
         switch (code) {
             /* xterm/gnome ESC O letter */
             case 'OP':
@@ -414,15 +415,40 @@ function emitKey(stream, s) {
         }
     }
     else if (s.length > 1 && s[0] !== '\x1b') {
-        // Nhận được một chuỗi ký tự dài hơn một.
-        // Có thể là paste, vì nó không phải là control sequence.
+        // Received a string longer than one character.
+        // Could be a paste, since it's not a control sequence.
         for (const c of s) {
             emitKey(stream, c);
         }
         return;
     }
-    // XXX: code phân tích "mouse" đã bị XÓA theo yêu cầu.
-    // Không phát ra key nếu không tìm thấy tên
+    // Mouse handling (SGR 1006)
+    if ((parts = mouseSgrRe.exec(s))) {
+        // SGR Mode: \x1b[< b; x; y M/m
+        // b: button code
+        // x, y: coordinates (1-based)
+        // M/m: Press/Release
+        const b = parseInt(parts[1], 10);
+        const x = parseInt(parts[2], 10);
+        const y = parseInt(parts[3], 10);
+        const type = parts[4]; // M=press, m=release
+        key.name = 'mouse';
+        key.ctrl = false;
+        key.meta = false;
+        key.shift = false;
+        // Check for Scroll (Button 64 = Up, 65 = Down)
+        if (b === 64) {
+            key.name = 'scrollup';
+            key.code = 'scrollup';
+        }
+        else if (b === 65) {
+            key.name = 'scrolldown';
+            key.code = 'scrolldown';
+        }
+        // We can handle click here if needed (b=0 left, b=1 middle, b=2 right)
+        // but for now only scroll is requested.
+    }
+    // Don't emit key if name is not found
     if (key.name === undefined) {
         return; // key = undefined;
     }

package/package.json

@@ -1,8 +1,11 @@
 {
   "name": "cliedit",
-  "version": "0.2.0",
+  "version": "0.3.5",
   "description": "A lightweight, raw-mode terminal editor utility for Node.js CLI applications, with line wrapping and undo/redo support.",
-  "repository": "https://github.com/CodeTease/cliedit",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/CodeTease/cliedit.git"
+  },
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -21,7 +24,7 @@
   "scripts": {
     "build": "tsc",
     "prepublishOnly": "npm run build",
-    "demo": "npm run build && cross-env NODE_ENV=development node dist/demo.js",
+    "demo": "npm run build && cross-env NODE_ENV=development tsx src/demo.ts",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "keywords": [
@@ -35,10 +38,9 @@
   "author": "CodeTease",
   "license": "MIT",
   "devDependencies": {
-    "@types/node": "^20.12.12",
-    "cross-env": "^7.0.3",
-    "typescript": "^5.4.5"
-  },
-  "dependencies": {
+    "@types/node": "^22",
+    "cross-env": "^7",
+    "tsx": "^4",
+    "typescript": "^5"
   }
-}
+}