From e83102070ba0a40e066e74b6f881ac5e0a607118 Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Sat, 30 May 2026 18:12:34 +0000 Subject: [PATCH] Merge common/encoding and common/data into common/base Move TextDecoder, Charsets, and EscapeSequences into the base layer. Remove separate encoding and data composite projects; update imports and explicit project references across common subprojects. Co-authored-by: Daniel Imms --- .../benchmark/SerializeAddon.benchmark.ts | 2 +- .../UnicodeGraphemeAddon.benchmark.ts | 2 +- src/browser/CoreBrowserTerminal.ts | 2 +- src/browser/TestUtils.test.ts | 2 +- src/browser/input/CompositionHelper.ts | 2 +- src/browser/input/MoveToCell.ts | 2 +- src/browser/services/MouseService.ts | 2 +- src/common/REARCHITECTURE.md | 13 ++---- src/common/{data => base}/Charsets.ts | 0 src/common/{data => base}/EscapeSequences.ts | 0 .../{encoding => base}/TextDecoder.test.ts | 2 +- src/common/{encoding => base}/TextDecoder.ts | 0 src/common/base/tsconfig.json | 2 - src/common/buffer/Buffer.ts | 4 +- src/common/buffer/BufferLine.ts | 2 +- src/common/buffer/CellData.ts | 2 +- src/common/buffer/Types.ts | 2 +- src/common/buffer/tsconfig.json | 6 +-- src/common/data/tsconfig.json | 40 ------------------- src/common/encoding/tsconfig.json | 40 ------------------- src/common/input/Keyboard.ts | 2 +- src/common/input/KittyKeyboard.ts | 2 +- src/common/input/Win32InputMode.ts | 2 +- src/common/input/tsconfig.json | 4 -- src/common/parser/ApcParser.test.ts | 2 +- src/common/parser/ApcParser.ts | 2 +- src/common/parser/DcsParser.test.ts | 2 +- src/common/parser/DcsParser.ts | 2 +- .../parser/EscapeSequenceParser.test.ts | 2 +- src/common/parser/OscParser.test.ts | 2 +- src/common/parser/OscParser.ts | 2 +- src/common/parser/tsconfig.json | 4 -- src/common/public/tsconfig.json | 4 -- src/common/services/CharsetService.ts | 2 +- src/common/services/Services.ts | 2 +- src/common/services/tsconfig.json | 4 -- src/common/terminal/InputHandler.ts | 6 +-- src/common/terminal/TestUtils.test.ts | 2 +- src/common/terminal/tsconfig.json | 4 -- src/common/tsconfig.json | 2 - .../EscapeSequenceParser.benchmark.ts | 2 +- test/benchmark/Terminal.benchmark.ts | 2 +- 42 files changed, 35 insertions(+), 150 deletions(-) rename src/common/{data => base}/Charsets.ts (100%) rename src/common/{data => base}/EscapeSequences.ts (100%) rename src/common/{encoding => base}/TextDecoder.test.ts (99%) rename src/common/{encoding => base}/TextDecoder.ts (100%) delete mode 100644 src/common/data/tsconfig.json delete mode 100644 src/common/encoding/tsconfig.json diff --git a/addons/addon-serialize/benchmark/SerializeAddon.benchmark.ts b/addons/addon-serialize/benchmark/SerializeAddon.benchmark.ts index 57b3ffd76..e8ef0a4b0 100644 --- a/addons/addon-serialize/benchmark/SerializeAddon.benchmark.ts +++ b/addons/addon-serialize/benchmark/SerializeAddon.benchmark.ts @@ -6,7 +6,7 @@ import { perfContext, before, ThroughputRuntimeCase } from 'xterm-benchmark'; import { spawn } from 'node-pty'; -import { Utf8ToUtf32, stringFromCodePoint } from 'common/encoding/TextDecoder'; +import { Utf8ToUtf32, stringFromCodePoint } from 'common/base/TextDecoder'; import { Terminal } from 'browser/public/Terminal'; import { SerializeAddon } from 'SerializeAddon'; diff --git a/addons/addon-unicode-graphemes/benchmark/UnicodeGraphemeAddon.benchmark.ts b/addons/addon-unicode-graphemes/benchmark/UnicodeGraphemeAddon.benchmark.ts index 91e6bf1d9..18b247c70 100644 --- a/addons/addon-unicode-graphemes/benchmark/UnicodeGraphemeAddon.benchmark.ts +++ b/addons/addon-unicode-graphemes/benchmark/UnicodeGraphemeAddon.benchmark.ts @@ -6,7 +6,7 @@ import { perfContext, before, ThroughputRuntimeCase } from 'xterm-benchmark'; import { spawn } from 'node-pty'; -import { Utf8ToUtf32, stringFromCodePoint } from 'common/encoding/TextDecoder'; +import { Utf8ToUtf32, stringFromCodePoint } from 'common/base/TextDecoder'; import { CoreBrowserTerminal } from 'browser/CoreBrowserTerminal'; import { UnicodeGraphemeProvider } from 'UnicodeGraphemeProvider'; diff --git a/src/browser/CoreBrowserTerminal.ts b/src/browser/CoreBrowserTerminal.ts index baf574241..52209e7a7 100644 --- a/src/browser/CoreBrowserTerminal.ts +++ b/src/browser/CoreBrowserTerminal.ts @@ -51,7 +51,7 @@ import { ColorRequestType, IColorEvent, SpecialColorIndex } from 'common/termina import { KeyboardResultType } from 'common/input/KeyboardTypes'; import { DEFAULT_ATTR_DATA } from 'common/buffer/BufferLine'; import { IBuffer } from 'common/buffer/Types'; -import { C0, C1ESCAPED } from 'common/data/EscapeSequences'; +import { C0, C1ESCAPED } from 'common/base/EscapeSequences'; import { toRgbString } from 'common/input/XParseColor'; import { DecorationService } from 'common/services/DecorationService'; import { IDecorationService } from 'common/services/Services'; diff --git a/src/browser/TestUtils.test.ts b/src/browser/TestUtils.test.ts index 8427bbcef..3c9326e80 100644 --- a/src/browser/TestUtils.test.ts +++ b/src/browser/TestUtils.test.ts @@ -10,7 +10,7 @@ import { IColorSet, ITerminal, ILinkifier2, IBrowser, IViewport, ICompositionHel import { IBuffer, IBufferSet } from 'common/buffer/Types'; import type { ICircularList } from 'common/base/CircularList'; import type { IBufferLine, ICellData, IAttributeData } from 'common/buffer/CellTypes'; -import type { ICharset } from 'common/data/Charsets'; +import type { ICharset } from 'common/base/Charsets'; import type { ITerminalOptions } from 'common/services/Services'; import type { XtermListener } from 'common/terminal/CoreTerminalTypes'; import { ColorIndex } from 'common/terminal/InputHandlerTypes'; diff --git a/src/browser/input/CompositionHelper.ts b/src/browser/input/CompositionHelper.ts index 283874139..5a42a616c 100644 --- a/src/browser/input/CompositionHelper.ts +++ b/src/browser/input/CompositionHelper.ts @@ -5,7 +5,7 @@ import { IRenderService } from 'browser/services/Services'; import { IBufferService, ICoreService, IOptionsService } from 'common/services/Services'; -import { C0 } from 'common/data/EscapeSequences'; +import { C0 } from 'common/base/EscapeSequences'; interface IPosition { start: number; diff --git a/src/browser/input/MoveToCell.ts b/src/browser/input/MoveToCell.ts index ce4c59224..e634ca213 100644 --- a/src/browser/input/MoveToCell.ts +++ b/src/browser/input/MoveToCell.ts @@ -3,7 +3,7 @@ * @license MIT */ -import { C0 } from 'common/data/EscapeSequences'; +import { C0 } from 'common/base/EscapeSequences'; import { IBufferService } from 'common/services/Services'; const enum Direction { diff --git a/src/browser/services/MouseService.ts b/src/browser/services/MouseService.ts index 7b37bc080..59b37dd2a 100644 --- a/src/browser/services/MouseService.ts +++ b/src/browser/services/MouseService.ts @@ -7,7 +7,7 @@ import { addDisposableListener } from 'browser/Dom'; import { IBufferService, IMouseStateService, ICoreService, ILogService, IOptionsService } from 'common/services/Services'; import type { IDisposable } from 'common/base/Lifecycle'; import { CoreMouseAction, CoreMouseButton, CoreMouseEventType, ICoreMouseEvent } from 'common/services/Types'; -import { C0 } from 'common/data/EscapeSequences'; +import { C0 } from 'common/base/EscapeSequences'; import { DisposableStore, MutableDisposable, toDisposable } from 'common/base/Lifecycle'; import { ICoreBrowserService, IMouseCoordsService, IMouseService, IMouseServiceTarget, IRenderService, ISelectionService } from './Services'; import { Gesture, EventType as GestureEventType, IGestureEvent } from 'browser/scrollable/touch'; diff --git a/src/common/REARCHITECTURE.md b/src/common/REARCHITECTURE.md index c53cefe44..8c5bb73b9 100644 --- a/src/common/REARCHITECTURE.md +++ b/src/common/REARCHITECTURE.md @@ -9,16 +9,11 @@ flowchart BT subgraph platform["Platform layer"] direction LR base["common/base"] - encoding["common/encoding"] - data["common/data"] buffer["common/buffer"] parser["common/parser"] input["common/input"] - encoding --> base - data --> base - buffer --> encoding - buffer --> data + buffer --> base parser --> buffer input --> parser end @@ -42,14 +37,12 @@ flowchart BT | Project | Role | Notable sources | | --- | --- | --- | -| `common/base` | Core utilities (lifecycle, events, platform) | `Async`, `Event`, `Lifecycle`, `Platform`, `StringBuilder`, `Version`, `CircularList`, `Color`, `ColorTypes` | -| `common/encoding` | UTF conversion | `TextDecoder` (moved from `input/`) | -| `common/data` | Static terminal data | `Charsets`, `EscapeSequences` | +| `common/base` | Core utilities, UTF conversion, static terminal data | `Async`, `Event`, `Lifecycle`, `Color`, `TextDecoder`, `Charsets`, `EscapeSequences`, … | | `common/buffer` | Screen buffer | `Buffer`, `BufferLine`, … | | `common/parser` | Escape sequence parser | `EscapeSequenceParser`, … | | `common/input` | Keyboard / write path helpers | `Keyboard`, `WriteBuffer`, … | | `common/services` | DI service implementations | `Services`, `Types` (modes, mouse, osc link), … | -| `common/terminal` | Core terminal + input handler | `CoreTerminal`, `CoreTerminalTypes`, `InputHandler`, `InputHandlerTypes`, `WindowsMode` | +| `common/terminal` | Core terminal + input handler | `CoreTerminal`, `CoreTerminalTypes`, `InputHandler`, … | | `common/public` | Public API adapters | `AddonManager`, buffer API views | ## TypeScript projects diff --git a/src/common/data/Charsets.ts b/src/common/base/Charsets.ts similarity index 100% rename from src/common/data/Charsets.ts rename to src/common/base/Charsets.ts diff --git a/src/common/data/EscapeSequences.ts b/src/common/base/EscapeSequences.ts similarity index 100% rename from src/common/data/EscapeSequences.ts rename to src/common/base/EscapeSequences.ts diff --git a/src/common/encoding/TextDecoder.test.ts b/src/common/base/TextDecoder.test.ts similarity index 99% rename from src/common/encoding/TextDecoder.test.ts rename to src/common/base/TextDecoder.test.ts index bb8af52e7..ab2d00573 100644 --- a/src/common/encoding/TextDecoder.test.ts +++ b/src/common/base/TextDecoder.test.ts @@ -4,7 +4,7 @@ */ import { assert } from 'chai'; -import { StringToUtf32, stringFromCodePoint, Utf8ToUtf32, utf32ToString } from 'common/encoding/TextDecoder'; +import { StringToUtf32, stringFromCodePoint, Utf8ToUtf32, utf32ToString } from 'common/base/TextDecoder'; // convert UTF32 codepoints to string diff --git a/src/common/encoding/TextDecoder.ts b/src/common/base/TextDecoder.ts similarity index 100% rename from src/common/encoding/TextDecoder.ts rename to src/common/base/TextDecoder.ts diff --git a/src/common/base/tsconfig.json b/src/common/base/tsconfig.json index ba2c5c6df..b1d96a32a 100644 --- a/src/common/base/tsconfig.json +++ b/src/common/base/tsconfig.json @@ -14,8 +14,6 @@ "paths": { "@xterm/xterm": ["../../../typings/xterm.d.ts"], "common/base/*": ["./*"], - "common/encoding/*": ["../encoding/*"], - "common/data/*": ["../data/*"], "common/buffer/*": ["../buffer/*"], "common/parser/*": ["../parser/*"], "common/input/*": ["../input/*"], diff --git a/src/common/buffer/Buffer.ts b/src/common/buffer/Buffer.ts index 67082f96f..f2ba636fd 100644 --- a/src/common/buffer/Buffer.ts +++ b/src/common/buffer/Buffer.ts @@ -7,7 +7,7 @@ import { CircularList, IInsertEvent } from 'common/base/CircularList'; import { Disposable, toDisposable } from 'common/base/Lifecycle'; import { IdleTaskQueue } from 'common/base/TaskQueue'; import type { IAttributeData, IBufferLine, ICellData } from 'common/buffer/CellTypes'; -import type { ICharset } from 'common/data/Charsets'; +import type { ICharset } from 'common/base/Charsets'; import type { IBufferService } from 'common/buffer/BufferService'; import type { IBufferOptionsService } from 'common/buffer/BufferOptions'; import type { IBufferLogService } from 'common/buffer/BufferLog'; @@ -19,7 +19,7 @@ import { CellData } from 'common/buffer/CellData'; import { NULL_CELL_CHAR, NULL_CELL_CODE, NULL_CELL_WIDTH, WHITESPACE_CELL_CHAR, WHITESPACE_CELL_CODE, WHITESPACE_CELL_WIDTH } from 'common/buffer/Constants'; import { Marker } from 'common/buffer/Marker'; import { IBuffer } from 'common/buffer/Types'; -import { DEFAULT_CHARSET } from 'common/data/Charsets'; +import { DEFAULT_CHARSET } from 'common/base/Charsets'; export const MAX_BUFFER_SIZE = 4294967295; // 2^32 - 1 diff --git a/src/common/buffer/BufferLine.ts b/src/common/buffer/BufferLine.ts index 0de3dbe20..dad23ae20 100644 --- a/src/common/buffer/BufferLine.ts +++ b/src/common/buffer/BufferLine.ts @@ -7,7 +7,7 @@ import { CharData, IAttributeData, IBufferLine, ICellData, IExtendedAttrs } from import { AttributeData } from 'common/buffer/AttributeData'; import { CellData } from 'common/buffer/CellData'; import { Attributes, BgFlags, CHAR_DATA_ATTR_INDEX, CHAR_DATA_CHAR_INDEX, CHAR_DATA_WIDTH_INDEX, Content, NULL_CELL_CHAR, NULL_CELL_CODE, NULL_CELL_WIDTH, WHITESPACE_CELL_CHAR } from 'common/buffer/Constants'; -import { stringFromCodePoint } from 'common/encoding/TextDecoder'; +import { stringFromCodePoint } from 'common/base/TextDecoder'; import { StringBuilder } from 'common/base/StringBuilder'; // Buffer memory layout: diff --git a/src/common/buffer/CellData.ts b/src/common/buffer/CellData.ts index d311b2b26..fd5d3fdc4 100644 --- a/src/common/buffer/CellData.ts +++ b/src/common/buffer/CellData.ts @@ -4,7 +4,7 @@ */ import { CharData, ICellData, IExtendedAttrs } from 'common/buffer/CellTypes'; -import { stringFromCodePoint } from 'common/encoding/TextDecoder'; +import { stringFromCodePoint } from 'common/base/TextDecoder'; import { CHAR_DATA_CHAR_INDEX, CHAR_DATA_WIDTH_INDEX, CHAR_DATA_ATTR_INDEX, Content } from 'common/buffer/Constants'; import { AttributeData, ExtendedAttrs } from 'common/buffer/AttributeData'; import type { IBufferCell as IBufferCellApi } from '@xterm/xterm'; diff --git a/src/common/buffer/Types.ts b/src/common/buffer/Types.ts index 2defa114d..6d6d6b29a 100644 --- a/src/common/buffer/Types.ts +++ b/src/common/buffer/Types.ts @@ -7,7 +7,7 @@ import type { ICircularList } from 'common/base/CircularList'; import type { IDisposable } from 'common/base/Lifecycle'; import type { IEvent } from 'common/base/Event'; import type { IAttributeData, IBufferLine, ICellData, IMarker } from 'common/buffer/CellTypes'; -import type { ICharset } from 'common/data/Charsets'; +import type { ICharset } from 'common/base/Charsets'; // BufferIndex denotes a position in the buffer: [rowIndex, colIndex] export type BufferIndex = [number, number]; diff --git a/src/common/buffer/tsconfig.json b/src/common/buffer/tsconfig.json index 447680400..e1cc93555 100644 --- a/src/common/buffer/tsconfig.json +++ b/src/common/buffer/tsconfig.json @@ -14,8 +14,6 @@ "paths": { "@xterm/xterm": ["../../../typings/xterm.d.ts"], "common/base/*": ["../base/*"], - "common/encoding/*": ["../encoding/*"], - "common/data/*": ["../data/*"], "common/buffer/*": ["./*"], "common/parser/*": ["../parser/*"], "common/input/*": ["../input/*"], @@ -36,8 +34,6 @@ "**/*.test.ts" ], "references": [ - { "path": "../base" }, - { "path": "../encoding" }, - { "path": "../data" } + { "path": "../base" } ] } diff --git a/src/common/data/tsconfig.json b/src/common/data/tsconfig.json deleted file mode 100644 index c2e859649..000000000 --- a/src/common/data/tsconfig.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "extends": "../../tsconfig-library-base", - "compilerOptions": { - "lib": [ - "es2015", - "es2016.Array.Include", - "es2019.string", - "es2021.weakref", - "dom" - ], - "types": [ - "../../../node_modules/@types/mocha" - ], - "paths": { - "@xterm/xterm": ["../../../typings/xterm.d.ts"], - "common/base/*": ["../base/*"], - "common/encoding/*": ["../encoding/*"], - "common/data/*": ["./*"], - "common/buffer/*": ["../buffer/*"], - "common/parser/*": ["../parser/*"], - "common/input/*": ["../input/*"], - "common/services/*": ["../services/*"], - "common/terminal/*": ["../terminal/*"], - "common/public/*": ["../public/*"], - "common/*": ["../*"], - "*": ["../../*"] - }, - "outDir": "../../../out/common/data", - "rootDir": "." - }, - "include": [ - "./**/*" - ], - "exclude": [ - "**/*.test.ts" - ], - "references": [ - { "path": "../base" } - ] -} diff --git a/src/common/encoding/tsconfig.json b/src/common/encoding/tsconfig.json deleted file mode 100644 index 09a0e059f..000000000 --- a/src/common/encoding/tsconfig.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "extends": "../../tsconfig-library-base", - "compilerOptions": { - "lib": [ - "es2015", - "es2016.Array.Include", - "es2019.string", - "es2021.weakref", - "dom" - ], - "types": [ - "../../../node_modules/@types/mocha" - ], - "paths": { - "@xterm/xterm": ["../../../typings/xterm.d.ts"], - "common/base/*": ["../base/*"], - "common/encoding/*": ["./*"], - "common/data/*": ["../data/*"], - "common/buffer/*": ["../buffer/*"], - "common/parser/*": ["../parser/*"], - "common/input/*": ["../input/*"], - "common/services/*": ["../services/*"], - "common/terminal/*": ["../terminal/*"], - "common/public/*": ["../public/*"], - "common/*": ["../*"], - "*": ["../../*"] - }, - "outDir": "../../../out/common/encoding", - "rootDir": "." - }, - "include": [ - "./**/*" - ], - "exclude": [ - "**/*.test.ts" - ], - "references": [ - { "path": "../base" } - ] -} diff --git a/src/common/input/Keyboard.ts b/src/common/input/Keyboard.ts index 32e85f3fc..604e0a93a 100644 --- a/src/common/input/Keyboard.ts +++ b/src/common/input/Keyboard.ts @@ -5,7 +5,7 @@ */ import { IKeyboardEvent, IKeyboardResult, KeyboardResultType } from 'common/input/KeyboardTypes'; -import { C0 } from 'common/data/EscapeSequences'; +import { C0 } from 'common/base/EscapeSequences'; // reg + shift key mappings for digits and special chars const KEYCODE_KEY_MAPPINGS: { [key: number]: [string, string]} = { diff --git a/src/common/input/KittyKeyboard.ts b/src/common/input/KittyKeyboard.ts index 9e178ea38..6d6fcf82a 100644 --- a/src/common/input/KittyKeyboard.ts +++ b/src/common/input/KittyKeyboard.ts @@ -7,7 +7,7 @@ */ import { IKeyboardEvent, IKeyboardResult, KeyboardResultType } from 'common/input/KeyboardTypes'; -import { C0 } from 'common/data/EscapeSequences'; +import { C0 } from 'common/base/EscapeSequences'; /** * Kitty keyboard protocol enhancement flags (bitfield). diff --git a/src/common/input/Win32InputMode.ts b/src/common/input/Win32InputMode.ts index 56df70e88..0c2166991 100644 --- a/src/common/input/Win32InputMode.ts +++ b/src/common/input/Win32InputMode.ts @@ -15,7 +15,7 @@ */ import { IKeyboardEvent, IKeyboardResult, KeyboardResultType } from 'common/input/KeyboardTypes'; -import { C0 } from 'common/data/EscapeSequences'; +import { C0 } from 'common/base/EscapeSequences'; /** * Win32 control key state flags (from Windows API). diff --git a/src/common/input/tsconfig.json b/src/common/input/tsconfig.json index d20c7e1a7..bb56edee1 100644 --- a/src/common/input/tsconfig.json +++ b/src/common/input/tsconfig.json @@ -14,8 +14,6 @@ "paths": { "@xterm/xterm": ["../../../typings/xterm.d.ts"], "common/base/*": ["../base/*"], - "common/encoding/*": ["../encoding/*"], - "common/data/*": ["../data/*"], "common/buffer/*": ["../buffer/*"], "common/parser/*": ["../parser/*"], "common/input/*": ["./*"], @@ -36,8 +34,6 @@ ], "references": [ { "path": "../base" }, - { "path": "../encoding" }, - { "path": "../data" }, { "path": "../buffer" }, { "path": "../parser" } ] diff --git a/src/common/parser/ApcParser.test.ts b/src/common/parser/ApcParser.test.ts index 8482d1e9c..7c9968f58 100644 --- a/src/common/parser/ApcParser.test.ts +++ b/src/common/parser/ApcParser.test.ts @@ -4,7 +4,7 @@ */ import { assert } from 'chai'; import { ApcParser, ApcHandler } from 'common/parser/ApcParser'; -import { StringToUtf32, utf32ToString } from 'common/encoding/TextDecoder'; +import { StringToUtf32, utf32ToString } from 'common/base/TextDecoder'; import { IApcHandler, IFunctionIdentifier } from 'common/parser/Types'; function toUtf32(s: string): Uint32Array { diff --git a/src/common/parser/ApcParser.ts b/src/common/parser/ApcParser.ts index d92da4372..a41585e61 100644 --- a/src/common/parser/ApcParser.ts +++ b/src/common/parser/ApcParser.ts @@ -5,7 +5,7 @@ import { IApcHandler, IHandlerCollection, ApcFallbackHandlerType, IApcParser, ISubParserStackState } from 'common/parser/Types'; import { ParserConstants } from 'common/parser/Constants'; -import { utf32ToString } from 'common/encoding/TextDecoder'; +import { utf32ToString } from 'common/base/TextDecoder'; import { IDisposable } from 'common/base/Lifecycle'; import { LimitedStringBuilder } from 'common/base/StringBuilder'; diff --git a/src/common/parser/DcsParser.test.ts b/src/common/parser/DcsParser.test.ts index 3bcdea109..42e2e4260 100644 --- a/src/common/parser/DcsParser.test.ts +++ b/src/common/parser/DcsParser.test.ts @@ -5,7 +5,7 @@ import { assert } from 'chai'; import { DcsParser, DcsHandler } from 'common/parser/DcsParser'; import { IDcsHandler, IParams, IFunctionIdentifier } from 'common/parser/Types'; -import { utf32ToString, StringToUtf32 } from 'common/encoding/TextDecoder'; +import { utf32ToString, StringToUtf32 } from 'common/base/TextDecoder'; import { Params } from 'common/parser/Params'; function toUtf32(s: string): Uint32Array { diff --git a/src/common/parser/DcsParser.ts b/src/common/parser/DcsParser.ts index eca2ca07f..39d72ab17 100644 --- a/src/common/parser/DcsParser.ts +++ b/src/common/parser/DcsParser.ts @@ -5,7 +5,7 @@ import { IDisposable } from 'common/base/Lifecycle'; import { IDcsHandler, IParams, IHandlerCollection, IDcsParser, DcsFallbackHandlerType, ISubParserStackState } from 'common/parser/Types'; -import { utf32ToString } from 'common/encoding/TextDecoder'; +import { utf32ToString } from 'common/base/TextDecoder'; import { Params } from 'common/parser/Params'; import { ParserConstants } from 'common/parser/Constants'; import { LimitedStringBuilder } from 'common/base/StringBuilder'; diff --git a/src/common/parser/EscapeSequenceParser.test.ts b/src/common/parser/EscapeSequenceParser.test.ts index f754074c3..04bf9f40e 100644 --- a/src/common/parser/EscapeSequenceParser.test.ts +++ b/src/common/parser/EscapeSequenceParser.test.ts @@ -6,7 +6,7 @@ import { IParsingState, IParams, ParamsArray, IOscParser, IOscHandler, OscFallbackHandlerType, IFunctionIdentifier, IParserStackState, ParserStackType } from 'common/parser/Types'; import { EscapeSequenceParser, TransitionTable, VT500_TRANSITION_TABLE } from 'common/parser/EscapeSequenceParser'; import { assert } from 'chai'; -import { StringToUtf32, stringFromCodePoint, utf32ToString } from 'common/encoding/TextDecoder'; +import { StringToUtf32, stringFromCodePoint, utf32ToString } from 'common/base/TextDecoder'; import { ParserState } from 'common/parser/Constants'; import { Params } from 'common/parser/Params'; import { OscHandler } from 'common/parser/OscParser'; diff --git a/src/common/parser/OscParser.test.ts b/src/common/parser/OscParser.test.ts index cf3de6c5a..dd7e3af3d 100644 --- a/src/common/parser/OscParser.test.ts +++ b/src/common/parser/OscParser.test.ts @@ -4,7 +4,7 @@ */ import { assert } from 'chai'; import { OscParser, OscHandler } from 'common/parser/OscParser'; -import { StringToUtf32, utf32ToString } from 'common/encoding/TextDecoder'; +import { StringToUtf32, utf32ToString } from 'common/base/TextDecoder'; import { IOscHandler } from 'common/parser/Types'; function toUtf32(s: string): Uint32Array { diff --git a/src/common/parser/OscParser.ts b/src/common/parser/OscParser.ts index f9b453a4d..8005fb768 100644 --- a/src/common/parser/OscParser.ts +++ b/src/common/parser/OscParser.ts @@ -5,7 +5,7 @@ import { IOscHandler, IHandlerCollection, OscFallbackHandlerType, IOscParser, ISubParserStackState } from 'common/parser/Types'; import { OscState, ParserConstants } from 'common/parser/Constants'; -import { utf32ToString } from 'common/encoding/TextDecoder'; +import { utf32ToString } from 'common/base/TextDecoder'; import { IDisposable } from 'common/base/Lifecycle'; import { LimitedStringBuilder } from 'common/base/StringBuilder'; diff --git a/src/common/parser/tsconfig.json b/src/common/parser/tsconfig.json index cd16ee7fe..d575bd329 100644 --- a/src/common/parser/tsconfig.json +++ b/src/common/parser/tsconfig.json @@ -14,8 +14,6 @@ "paths": { "@xterm/xterm": ["../../../typings/xterm.d.ts"], "common/base/*": ["../base/*"], - "common/encoding/*": ["../encoding/*"], - "common/data/*": ["../data/*"], "common/buffer/*": ["../buffer/*"], "common/parser/*": ["./*"], "common/input/*": ["../input/*"], @@ -36,8 +34,6 @@ ], "references": [ { "path": "../base" }, - { "path": "../encoding" }, - { "path": "../data" }, { "path": "../buffer" } ] } diff --git a/src/common/public/tsconfig.json b/src/common/public/tsconfig.json index 2614ecafd..63d6c21d1 100644 --- a/src/common/public/tsconfig.json +++ b/src/common/public/tsconfig.json @@ -14,8 +14,6 @@ "paths": { "@xterm/xterm": ["../../../typings/xterm.d.ts"], "common/base/*": ["../base/*"], - "common/encoding/*": ["../encoding/*"], - "common/data/*": ["../data/*"], "common/buffer/*": ["../buffer/*"], "common/parser/*": ["../parser/*"], "common/input/*": ["../input/*"], @@ -37,8 +35,6 @@ ], "references": [ { "path": "../base" }, - { "path": "../encoding" }, - { "path": "../data" }, { "path": "../buffer" }, { "path": "../parser" }, { "path": "../input" }, diff --git a/src/common/services/CharsetService.ts b/src/common/services/CharsetService.ts index 9f65b8b3c..756edc0ca 100644 --- a/src/common/services/CharsetService.ts +++ b/src/common/services/CharsetService.ts @@ -4,7 +4,7 @@ */ import { ICharsetService } from 'common/services/Services'; -import type { ICharset } from 'common/data/Charsets'; +import type { ICharset } from 'common/base/Charsets'; export class CharsetService implements ICharsetService { public serviceBrand: any; diff --git a/src/common/services/Services.ts b/src/common/services/Services.ts index 7dcf4a728..6a3147901 100644 --- a/src/common/services/Services.ts +++ b/src/common/services/Services.ts @@ -5,7 +5,7 @@ import type { IDecoration, IDecorationOptions, ILinkHandler, ILogger, IWindowsPty, IOverviewRulerOptions } from '@xterm/xterm'; import type { IAttributeData } from 'common/buffer/CellTypes'; -import type { ICharset } from 'common/data/Charsets'; +import type { ICharset } from 'common/base/Charsets'; import type { IColor } from 'common/base/ColorTypes'; import type { IDisposable } from 'common/base/Lifecycle'; import type { IWindowOptions } from 'common/input/WindowOptions'; diff --git a/src/common/services/tsconfig.json b/src/common/services/tsconfig.json index 6ef9f1e7f..a8db0f1ef 100644 --- a/src/common/services/tsconfig.json +++ b/src/common/services/tsconfig.json @@ -14,8 +14,6 @@ "paths": { "@xterm/xterm": ["../../../typings/xterm.d.ts"], "common/base/*": ["../base/*"], - "common/encoding/*": ["../encoding/*"], - "common/data/*": ["../data/*"], "common/buffer/*": ["../buffer/*"], "common/parser/*": ["../parser/*"], "common/input/*": ["../input/*"], @@ -37,8 +35,6 @@ ], "references": [ { "path": "../base" }, - { "path": "../encoding" }, - { "path": "../data" }, { "path": "../buffer" }, { "path": "../parser" }, { "path": "../input" } diff --git a/src/common/terminal/InputHandler.ts b/src/common/terminal/InputHandler.ts index 4d9c47ada..e1af9d6a0 100644 --- a/src/common/terminal/InputHandler.ts +++ b/src/common/terminal/InputHandler.ts @@ -8,10 +8,10 @@ import type { IAttributeData } from 'common/buffer/CellTypes'; import { Disposable, type IDisposable } from 'common/base/Lifecycle'; import type { IWindowOptions } from 'common/input/WindowOptions'; import { IInputHandler, IColorEvent, IParseStack, ColorIndex, ColorRequestType, SpecialColorIndex } from 'common/terminal/InputHandlerTypes'; -import { C0, C1 } from 'common/data/EscapeSequences'; -import { CHARSETS, DEFAULT_CHARSET } from 'common/data/Charsets'; +import { C0, C1 } from 'common/base/EscapeSequences'; +import { CHARSETS, DEFAULT_CHARSET } from 'common/base/Charsets'; import { EscapeSequenceParser } from 'common/parser/EscapeSequenceParser'; -import { StringToUtf32, stringFromCodePoint, Utf8ToUtf32 } from 'common/encoding/TextDecoder'; +import { StringToUtf32, stringFromCodePoint, Utf8ToUtf32 } from 'common/base/TextDecoder'; import { BufferLine, DEFAULT_ATTR_DATA } from 'common/buffer/BufferLine'; import { IParsingState, IEscapeSequenceParser, IParams, IFunctionIdentifier } from 'common/parser/Types'; import { NULL_CELL_CODE, NULL_CELL_WIDTH, Attributes, FgFlags, BgFlags, Content, UnderlineStyle } from 'common/buffer/Constants'; diff --git a/src/common/terminal/TestUtils.test.ts b/src/common/terminal/TestUtils.test.ts index 198993d87..a7f7c0bd4 100644 --- a/src/common/terminal/TestUtils.test.ts +++ b/src/common/terminal/TestUtils.test.ts @@ -9,7 +9,7 @@ import { DEFAULT_OPTIONS } from 'common/services/OptionsService'; import { IBufferSet, IBuffer } from 'common/buffer/Types'; import { BufferSet } from 'common/buffer/BufferSet'; import type { IAttributeData, IBufferLine, IExtendedAttrs } from 'common/buffer/CellTypes'; -import type { ICharset } from 'common/data/Charsets'; +import type { ICharset } from 'common/base/Charsets'; import type { IDisposable } from 'common/base/Lifecycle'; import { CoreMouseEventType, ICoreMouseEvent, IDecPrivateModes, IKittyKeyboardState, IModes, IOscLinkData } from 'common/services/Types'; import { UnicodeV6 } from 'common/input/UnicodeV6'; diff --git a/src/common/terminal/tsconfig.json b/src/common/terminal/tsconfig.json index 598b4c8ad..29dc18487 100644 --- a/src/common/terminal/tsconfig.json +++ b/src/common/terminal/tsconfig.json @@ -14,8 +14,6 @@ "paths": { "@xterm/xterm": ["../../../typings/xterm.d.ts"], "common/base/*": ["../base/*"], - "common/encoding/*": ["../encoding/*"], - "common/data/*": ["../data/*"], "common/buffer/*": ["../buffer/*"], "common/parser/*": ["../parser/*"], "common/input/*": ["../input/*"], @@ -37,8 +35,6 @@ ], "references": [ { "path": "../base" }, - { "path": "../encoding" }, - { "path": "../data" }, { "path": "../buffer" }, { "path": "../parser" }, { "path": "../input" }, diff --git a/src/common/tsconfig.json b/src/common/tsconfig.json index 73690d79a..d60a99aa3 100644 --- a/src/common/tsconfig.json +++ b/src/common/tsconfig.json @@ -3,8 +3,6 @@ "files": [], "references": [ { "path": "./base" }, - { "path": "./encoding" }, - { "path": "./data" }, { "path": "./buffer" }, { "path": "./parser" }, { "path": "./input" }, diff --git a/test/benchmark/EscapeSequenceParser.benchmark.ts b/test/benchmark/EscapeSequenceParser.benchmark.ts index 5c9f372fb..7b659d031 100644 --- a/test/benchmark/EscapeSequenceParser.benchmark.ts +++ b/test/benchmark/EscapeSequenceParser.benchmark.ts @@ -5,7 +5,7 @@ import { perfContext, before, beforeEach, ThroughputRuntimeCase } from 'xterm-benchmark'; import { EscapeSequenceParser } from 'common/parser/EscapeSequenceParser'; -import { C0, C1 } from 'common/data/EscapeSequences'; +import { C0, C1 } from 'common/base/EscapeSequences'; import { IDcsHandler, IOscHandler, IApcHandler, IParams } from 'common/parser/Types'; import { OscHandler } from 'common/parser/OscParser'; import { DcsHandler } from 'common/parser/DcsParser'; diff --git a/test/benchmark/Terminal.benchmark.ts b/test/benchmark/Terminal.benchmark.ts index bee8139f1..e397b2efa 100644 --- a/test/benchmark/Terminal.benchmark.ts +++ b/test/benchmark/Terminal.benchmark.ts @@ -6,7 +6,7 @@ import { perfContext, before, ThroughputRuntimeCase } from 'xterm-benchmark'; import { spawn } from 'node-pty'; -import { Utf8ToUtf32, stringFromCodePoint } from 'common/encoding/TextDecoder'; +import { Utf8ToUtf32, stringFromCodePoint } from 'common/base/TextDecoder'; import { CoreBrowserTerminal } from 'browser/CoreBrowserTerminal'; perfContext('Terminal: ls -lR /usr/lib', () => {