From 17ad33dc3df129d62657933bf3279abc44b1419d Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Sun, 31 May 2026 09:16:10 -0700 Subject: [PATCH] Remove TypeScript path mappings in favor of relative imports Fixes https://github.com/xtermjs/xterm.js/issues/5896 TypeScript path mappings for common/*, browser/*, and headless/* were not rewritten in emitted JavaScript, which forced webpack resolve aliases and NODE_PATH workarounds so runtime could resolve modules. That added build complexity and broke tooling such as ESLint import/no-cycle. Changes: - Convert ~750 imports across src/, addons/, and test/ to relative paths - Remove common/browser/headless paths and src catch-all mappings from tsconfigs (keep @xterm/addon-* demo and addon typings paths) - Remove webpack resolve.alias for common, browser, headless, and vs - Drop NODE_PATH from unit tests, benchmarks, and VS Code launch config - Fix addon-image IIPImageStorage to import ./Types after removing catch-all * Verified: npm run build, esbuild, package, package-headless Co-authored-by: Cursor --- .vscode/launch.json | 3 - addons/addon-attach/test/tsconfig.json | 6 -- addons/addon-clipboard/src/tsconfig.json | 3 - addons/addon-clipboard/test/tsconfig.json | 6 -- addons/addon-fit/src/FitAddon.ts | 2 +- addons/addon-fit/src/tsconfig.json | 3 - addons/addon-fit/test/tsconfig.json | 6 -- addons/addon-image/src/IIPImageStorage.ts | 2 +- addons/addon-image/src/ImageAddon.ts | 2 +- addons/addon-image/src/ImageRenderer.ts | 2 +- addons/addon-image/src/Types.ts | 14 ++-- addons/addon-image/src/tsconfig.json | 15 ++-- addons/addon-image/test/tsconfig.json | 6 -- addons/addon-image/webpack.config.js | 5 -- addons/addon-ligatures/test/tsconfig.json | 5 -- addons/addon-progress/src/ProgressAddon.ts | 2 +- addons/addon-progress/src/tsconfig.json | 6 -- addons/addon-progress/test/tsconfig.json | 6 -- addons/addon-progress/webpack.config.js | 5 -- addons/addon-search/src/DecorationManager.ts | 2 +- addons/addon-search/src/SearchAddon.ts | 6 +- addons/addon-search/src/SearchEngine.test.ts | 4 +- .../addon-search/src/SearchLineCache.test.ts | 4 +- addons/addon-search/src/SearchLineCache.ts | 4 +- .../addon-search/src/SearchResultTracker.ts | 4 +- addons/addon-search/src/tsconfig.json | 6 -- addons/addon-search/test/tsconfig.json | 6 -- addons/addon-search/webpack.config.js | 4 -- .../benchmark/SerializeAddon.benchmark.ts | 4 +- .../addon-serialize/benchmark/tsconfig.json | 28 +++++--- addons/addon-serialize/package.json | 6 +- .../src/SerializeAddon.test.ts | 8 +-- addons/addon-serialize/src/SerializeAddon.ts | 6 +- addons/addon-serialize/src/tsconfig.json | 6 -- addons/addon-serialize/test/tsconfig.json | 8 --- addons/addon-serialize/webpack.config.js | 4 -- .../UnicodeGraphemeAddon.benchmark.ts | 4 +- .../benchmark/tsconfig.json | 33 ++++++--- addons/addon-unicode-graphemes/package.json | 6 +- .../src/UnicodeGraphemeProvider.ts | 4 +- .../addon-unicode-graphemes/src/tsconfig.json | 3 - .../test/tsconfig.json | 8 --- .../addon-unicode-graphemes/webpack.config.js | 4 -- addons/addon-unicode11/src/UnicodeV11.ts | 4 +- addons/addon-unicode11/src/tsconfig.json | 6 -- addons/addon-unicode11/test/tsconfig.json | 6 -- addons/addon-unicode11/webpack.config.js | 4 -- addons/addon-web-fonts/test/tsconfig.json | 6 -- addons/addon-web-links/test/tsconfig.json | 6 -- addons/addon-webgl/src/CellColorResolver.ts | 16 ++--- addons/addon-webgl/src/CharAtlasCache.ts | 4 +- addons/addon-webgl/src/CharAtlasUtils.test.ts | 4 +- addons/addon-webgl/src/CharAtlasUtils.ts | 6 +- addons/addon-webgl/src/Constants.ts | 2 +- .../src/CursorBlinkStateManager.ts | 4 +- addons/addon-webgl/src/DevicePixelObserver.ts | 2 +- addons/addon-webgl/src/GlyphRenderer.ts | 10 +-- addons/addon-webgl/src/RectangleRenderer.ts | 16 ++--- addons/addon-webgl/src/RenderModel.ts | 4 +- addons/addon-webgl/src/TextureAtlas.ts | 20 +++--- addons/addon-webgl/src/Types.ts | 8 +-- addons/addon-webgl/src/WebglAddon.ts | 12 ++-- addons/addon-webgl/src/WebglRenderer.ts | 26 +++---- addons/addon-webgl/src/WebglUtils.ts | 4 +- .../src/customGlyphs/CustomGlyphRasterizer.ts | 4 +- .../src/renderLayer/BaseRenderLayer.ts | 14 ++-- .../src/renderLayer/LinkRenderLayer.ts | 10 +-- addons/addon-webgl/src/renderLayer/Types.ts | 2 +- addons/addon-webgl/src/tsconfig.json | 9 --- addons/addon-webgl/test/tsconfig.json | 6 -- addons/addon-webgl/webpack.config.js | 5 -- bin/test_unit.js | 8 +-- demo/client/tsconfig.json | 56 +++++++++++---- package.json | 6 +- src/browser/AccessibilityManager.ts | 16 ++--- src/browser/Clipboard.test.ts | 2 +- src/browser/Clipboard.ts | 4 +- src/browser/ColorContrastCache.test.ts | 2 +- src/browser/ColorContrastCache.ts | 6 +- src/browser/CoreBrowserTerminal.ts | 68 +++++++++---------- src/browser/Dom.ts | 4 +- src/browser/Linkifier.test.ts | 8 +-- src/browser/Linkifier.ts | 12 ++-- src/browser/OscLinkProvider.test.ts | 10 +-- src/browser/OscLinkProvider.ts | 10 +-- src/browser/RenderDebouncer.ts | 4 +- src/browser/Terminal.test.ts | 12 ++-- src/browser/Terminal2.test.ts | 2 +- src/browser/TestUtils.test.ts | 30 ++++---- src/browser/TimeBasedDebouncer.ts | 2 +- src/browser/Types.ts | 8 +-- src/browser/Viewport.ts | 20 +++--- .../decorations/BufferDecorationRenderer.ts | 6 +- .../decorations/ColorZoneStore.test.ts | 2 +- src/browser/decorations/ColorZoneStore.ts | 2 +- .../decorations/OverviewRulerRenderer.ts | 8 +-- src/browser/input/CompositionHelper.test.ts | 6 +- src/browser/input/CompositionHelper.ts | 6 +- src/browser/input/Mouse.test.ts | 2 +- src/browser/input/MoveToCell.test.ts | 4 +- src/browser/input/MoveToCell.ts | 4 +- src/browser/public/Terminal.ts | 20 +++--- src/browser/renderer/dom/DomRenderer.ts | 28 ++++---- .../dom/DomRendererRowFactory.test.ts | 18 ++--- .../renderer/dom/DomRendererRowFactory.ts | 24 +++---- src/browser/renderer/dom/WidthCache.test.ts | 2 +- src/browser/renderer/dom/WidthCache.ts | 6 +- .../renderer/shared/RendererUtils.test.ts | 2 +- src/browser/renderer/shared/RendererUtils.ts | 2 +- .../renderer/shared/SelectionRenderModel.ts | 4 +- .../shared/TextBlinkStateManager.test.ts | 8 +-- .../renderer/shared/TextBlinkStateManager.ts | 6 +- src/browser/renderer/shared/Types.ts | 6 +- src/browser/scrollable/abstractScrollbar.ts | 2 +- .../scrollable/globalPointerMoveMonitor.ts | 2 +- src/browser/scrollable/mouseEvent.ts | 2 +- src/browser/scrollable/scrollable.ts | 4 +- src/browser/scrollable/scrollableElement.ts | 8 +-- src/browser/scrollable/scrollbarArrow.ts | 2 +- .../scrollbarVisibilityController.ts | 4 +- src/browser/scrollable/touch.ts | 2 +- src/browser/scrollable/widget.ts | 2 +- src/browser/selection/SelectionModel.test.ts | 2 +- src/browser/selection/SelectionModel.ts | 2 +- src/browser/services/CharSizeService.ts | 8 +-- .../services/CharacterJoinerService.test.ts | 14 ++-- .../services/CharacterJoinerService.ts | 14 ++-- src/browser/services/CoreBrowserService.ts | 6 +- src/browser/services/KeyboardService.ts | 14 ++-- src/browser/services/LinkProviderService.ts | 6 +- src/browser/services/MouseCoordsService.ts | 6 +- src/browser/services/MouseService.test.ts | 12 ++-- src/browser/services/MouseService.ts | 12 ++-- src/browser/services/RenderService.ts | 16 ++--- src/browser/services/SelectionService.test.ts | 20 +++--- src/browser/services/SelectionService.ts | 28 ++++---- src/browser/services/Services.ts | 12 ++-- src/browser/services/ThemeService.test.ts | 6 +- src/browser/services/ThemeService.ts | 16 ++--- src/browser/tsconfig.json | 10 ++- src/common/Async.ts | 2 +- src/common/CircularList.test.ts | 2 +- src/common/CircularList.ts | 6 +- src/common/Color.test.ts | 2 +- src/common/Color.ts | 2 +- src/common/CoreTerminal.ts | 36 +++++----- src/common/Event.test.ts | 2 +- src/common/Event.ts | 2 +- src/common/InputHandler.test.ts | 26 +++---- src/common/InputHandler.ts | 40 +++++------ src/common/MultiKeyMap.test.ts | 2 +- src/common/SortedList.test.ts | 4 +- src/common/SortedList.ts | 4 +- src/common/StringBuilder.test.ts | 2 +- src/common/TaskQueue.ts | 2 +- src/common/TestUtils.test.ts | 20 +++--- src/common/Types.ts | 12 ++-- src/common/WindowsMode.ts | 4 +- src/common/buffer/AttributeData.ts | 4 +- src/common/buffer/Buffer.test.ts | 14 ++-- src/common/buffer/Buffer.ts | 28 ++++---- src/common/buffer/BufferLine.test.ts | 12 ++-- src/common/buffer/BufferLine.ts | 12 ++-- src/common/buffer/BufferLineStringCache.ts | 6 +- src/common/buffer/BufferRange.test.ts | 2 +- src/common/buffer/BufferReflow.test.ts | 8 +-- src/common/buffer/BufferReflow.ts | 6 +- src/common/buffer/BufferSet.test.ts | 6 +- src/common/buffer/BufferSet.ts | 12 ++-- src/common/buffer/CellData.test.ts | 4 +- src/common/buffer/CellData.ts | 8 +-- src/common/buffer/Marker.ts | 6 +- src/common/buffer/Types.ts | 4 +- src/common/data/Charsets.ts | 2 +- src/common/input/Keyboard.test.ts | 4 +- src/common/input/Keyboard.ts | 4 +- src/common/input/KittyKeyboard.test.ts | 4 +- src/common/input/KittyKeyboard.ts | 4 +- src/common/input/TextDecoder.test.ts | 2 +- src/common/input/UnicodeV6.test.ts | 2 +- src/common/input/UnicodeV6.ts | 4 +- src/common/input/Win32InputMode.test.ts | 4 +- src/common/input/Win32InputMode.ts | 4 +- src/common/input/WriteBuffer.ts | 6 +- src/common/input/XParseColor.test.ts | 2 +- src/common/parser/ApcParser.test.ts | 6 +- src/common/parser/ApcParser.ts | 10 +-- src/common/parser/DcsParser.test.ts | 8 +-- src/common/parser/DcsParser.ts | 12 ++-- .../parser/EscapeSequenceParser.test.ts | 18 ++--- src/common/parser/EscapeSequenceParser.ts | 16 ++--- src/common/parser/OscParser.test.ts | 6 +- src/common/parser/OscParser.ts | 10 +-- src/common/parser/Params.test.ts | 4 +- src/common/parser/Params.ts | 2 +- src/common/parser/Types.ts | 4 +- src/common/public/BufferApiView.ts | 6 +- src/common/public/BufferLineApiView.ts | 4 +- src/common/public/BufferNamespaceApi.ts | 8 +-- src/common/public/ParserApi.ts | 4 +- src/common/public/UnicodeApi.ts | 2 +- src/common/services/BufferService.ts | 12 ++-- src/common/services/CharsetService.ts | 4 +- src/common/services/CoreService.test.ts | 6 +- src/common/services/CoreService.ts | 8 +-- src/common/services/DecorationService.test.ts | 12 ++-- src/common/services/DecorationService.ts | 16 ++--- src/common/services/InstantiationService.ts | 4 +- src/common/services/LogService.ts | 4 +- src/common/services/MouseStateService.test.ts | 4 +- src/common/services/MouseStateService.ts | 8 +-- src/common/services/OptionsService.test.ts | 4 +- src/common/services/OptionsService.ts | 10 +-- src/common/services/OscLinkService.test.ts | 12 ++-- src/common/services/OscLinkService.ts | 4 +- src/common/services/ServiceRegistry.ts | 2 +- src/common/services/Services.ts | 8 +-- src/common/services/UnicodeService.test.ts | 4 +- src/common/services/UnicodeService.ts | 6 +- src/common/tsconfig.json | 6 +- src/headless/Terminal.ts | 10 +-- src/headless/public/Terminal.test.ts | 2 +- src/headless/public/Terminal.ts | 16 ++--- src/headless/tsconfig.json | 6 +- test/benchmark/DecorationService.benchmark.ts | 4 +- .../EscapeSequenceParser.benchmark.ts | 12 ++-- test/benchmark/Event.benchmark.ts | 2 +- test/benchmark/Terminal.benchmark.ts | 4 +- test/benchmark/tsconfig.json | 7 +- test/playwright/Terminal.test.ts | 2 +- test/playwright/TestUtils.ts | 6 +- test/playwright/tsconfig.json | 8 --- webpack.config.headless.js | 8 +-- webpack.config.js | 8 +-- 234 files changed, 867 insertions(+), 1005 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 07c424e5d..facfa4f4d 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -15,9 +15,6 @@ "--recursive", "${workspaceRoot}/out/**/*.test.js" ], - "env": { - "NODE_PATH": "${workspaceRoot}/out" - }, "sourceMaps": true, "outFiles": [ "${workspaceRoot}/out/**/*.js" ], "internalConsoleOptions": "openOnSessionStart" diff --git a/addons/addon-attach/test/tsconfig.json b/addons/addon-attach/test/tsconfig.json index 900a727ed..73f17c2a5 100644 --- a/addons/addon-attach/test/tsconfig.json +++ b/addons/addon-attach/test/tsconfig.json @@ -10,12 +10,6 @@ "sourceMap": true, "removeComments": true, "paths": { - "common/*": [ - "../../../src/common/*" - ], - "browser/*": [ - "../../../src/browser/*" - ], "*": [ "./*" ] diff --git a/addons/addon-clipboard/src/tsconfig.json b/addons/addon-clipboard/src/tsconfig.json index b61072808..b1192735c 100644 --- a/addons/addon-clipboard/src/tsconfig.json +++ b/addons/addon-clipboard/src/tsconfig.json @@ -15,9 +15,6 @@ "../../../node_modules/@types/mocha" ], "paths": { - "browser/*": [ - "../../../src/browser/*" - ], "@xterm/addon-clipboard": [ "../typings/addon-clipboard.d.ts" ] diff --git a/addons/addon-clipboard/test/tsconfig.json b/addons/addon-clipboard/test/tsconfig.json index 900a727ed..73f17c2a5 100644 --- a/addons/addon-clipboard/test/tsconfig.json +++ b/addons/addon-clipboard/test/tsconfig.json @@ -10,12 +10,6 @@ "sourceMap": true, "removeComments": true, "paths": { - "common/*": [ - "../../../src/common/*" - ], - "browser/*": [ - "../../../src/browser/*" - ], "*": [ "./*" ] diff --git a/addons/addon-fit/src/FitAddon.ts b/addons/addon-fit/src/FitAddon.ts index 3db988acd..812d31d3f 100644 --- a/addons/addon-fit/src/FitAddon.ts +++ b/addons/addon-fit/src/FitAddon.ts @@ -5,7 +5,7 @@ import type { Terminal, ITerminalAddon, IRenderDimensions } from '@xterm/xterm'; import type { FitAddon as IFitApi } from '@xterm/addon-fit'; -import { ViewportConstants } from 'browser/shared/Constants'; +import { ViewportConstants } from '../../../src/browser/shared/Constants'; interface ITerminalDimensions { /** diff --git a/addons/addon-fit/src/tsconfig.json b/addons/addon-fit/src/tsconfig.json index 068b43370..98bf0cf98 100644 --- a/addons/addon-fit/src/tsconfig.json +++ b/addons/addon-fit/src/tsconfig.json @@ -15,9 +15,6 @@ "../../../node_modules/@types/mocha" ], "paths": { - "browser/*": [ - "../../../src/browser/*" - ], "@xterm/addon-fit": [ "../typings/addon-fit.d.ts" ] diff --git a/addons/addon-fit/test/tsconfig.json b/addons/addon-fit/test/tsconfig.json index 900a727ed..73f17c2a5 100644 --- a/addons/addon-fit/test/tsconfig.json +++ b/addons/addon-fit/test/tsconfig.json @@ -10,12 +10,6 @@ "sourceMap": true, "removeComments": true, "paths": { - "common/*": [ - "../../../src/common/*" - ], - "browser/*": [ - "../../../src/browser/*" - ], "*": [ "./*" ] diff --git a/addons/addon-image/src/IIPImageStorage.ts b/addons/addon-image/src/IIPImageStorage.ts index 282fea9f0..28037a897 100644 --- a/addons/addon-image/src/IIPImageStorage.ts +++ b/addons/addon-image/src/IIPImageStorage.ts @@ -3,7 +3,7 @@ * @license MIT */ -import { IAddImageOpts } from 'Types'; +import { IAddImageOpts } from './Types'; import { ImageStorage } from './ImageStorage'; /** diff --git a/addons/addon-image/src/ImageAddon.ts b/addons/addon-image/src/ImageAddon.ts index 8fd395431..07aea05c5 100644 --- a/addons/addon-image/src/ImageAddon.ts +++ b/addons/addon-image/src/ImageAddon.ts @@ -5,7 +5,7 @@ import type { ITerminalAddon, IDisposable } from '@xterm/xterm'; import type { ImageAddon as IImageApi } from '@xterm/addon-image'; -import { Emitter, type IEvent } from 'common/Event'; +import { Emitter, type IEvent } from '../../../src/common/Event'; import { IIPHandler } from './IIPHandler'; import { ImageRenderer } from './ImageRenderer'; import { ImageStorage, CELL_SIZE_DEFAULT } from './ImageStorage'; diff --git a/addons/addon-image/src/ImageRenderer.ts b/addons/addon-image/src/ImageRenderer.ts index 5854efaec..285f13724 100644 --- a/addons/addon-image/src/ImageRenderer.ts +++ b/addons/addon-image/src/ImageRenderer.ts @@ -6,7 +6,7 @@ import { toRGBA8888 } from 'sixel/lib/Colors'; import { IDisposable } from '@xterm/xterm'; import { ICellSize, ImageLayer, ITerminalExt, IImageSpec, IRenderDimensions, IRenderService } from './Types'; -import { Disposable, MutableDisposable, toDisposable } from 'common/Lifecycle'; +import { Disposable, MutableDisposable, toDisposable } from '../../../src/common/Lifecycle'; const enum Constants { PLACEHOLDER_LENGTH = 4096, diff --git a/addons/addon-image/src/Types.ts b/addons/addon-image/src/Types.ts index 19a1acca1..9a70f4399 100644 --- a/addons/addon-image/src/Types.ts +++ b/addons/addon-image/src/Types.ts @@ -6,13 +6,13 @@ import { IDisposable, IMarker, Terminal } from '@xterm/xterm'; // private imports from base repo we build against -import { Attributes, BgFlags, Content, ExtFlags, UnderlineStyle } from 'common/buffer/Constants'; -import type { AttributeData } from 'common/buffer/AttributeData'; -import type { IParams, IDcsHandler, IOscHandler, IApcHandler, IEscapeSequenceParser } from 'common/parser/Types'; -import type { IBufferLine, IExtendedAttrs, IInputHandler } from 'common/Types'; -import type { ITerminal, ReadonlyColorSet } from 'browser/Types'; -import type { IRenderDimensions } from 'browser/renderer/shared/Types'; -import type { ICoreBrowserService, IRenderService, IThemeService } from 'browser/services/Services'; +import { Attributes, BgFlags, Content, ExtFlags, UnderlineStyle } from '../../../src/common/buffer/Constants'; +import type { AttributeData } from '../../../src/common/buffer/AttributeData'; +import type { IParams, IDcsHandler, IOscHandler, IApcHandler, IEscapeSequenceParser } from '../../../src/common/parser/Types'; +import type { IBufferLine, IExtendedAttrs, IInputHandler } from '../../../src/common/Types'; +import type { ITerminal, ReadonlyColorSet } from '../../../src/browser/Types'; +import type { IRenderDimensions } from '../../../src/browser/renderer/shared/Types'; +import type { ICoreBrowserService, IRenderService, IThemeService } from '../../../src/browser/services/Services'; export const enum Cell { CONTENT = 0, // codepoint and wcwidth information (enum Content) diff --git a/addons/addon-image/src/tsconfig.json b/addons/addon-image/src/tsconfig.json index 9a5d24c1f..18e276a35 100644 --- a/addons/addon-image/src/tsconfig.json +++ b/addons/addon-image/src/tsconfig.json @@ -12,10 +12,9 @@ "../../../node_modules/@types/mocha" ], "paths": { - "browser/*": [ "../../../src/browser/*" ], - "common/*": [ "../../../src/common/*" ], - "@xterm/addon-image": [ "../typings/addon-image.d.ts" ], - "*": [ "./*" ] + "@xterm/addon-image": [ + "../typings/addon-image.d.ts" + ] } }, "include": [ @@ -23,7 +22,11 @@ "../../../typings/xterm.d.ts" ], "references": [ - { "path": "../../../src/browser" }, - { "path": "../../../src/common" } + { + "path": "../../../src/browser" + }, + { + "path": "../../../src/common" + } ] } diff --git a/addons/addon-image/test/tsconfig.json b/addons/addon-image/test/tsconfig.json index 900a727ed..73f17c2a5 100644 --- a/addons/addon-image/test/tsconfig.json +++ b/addons/addon-image/test/tsconfig.json @@ -10,12 +10,6 @@ "sourceMap": true, "removeComments": true, "paths": { - "common/*": [ - "../../../src/common/*" - ], - "browser/*": [ - "../../../src/browser/*" - ], "*": [ "./*" ] diff --git a/addons/addon-image/webpack.config.js b/addons/addon-image/webpack.config.js index 01147d7e7..ba2fa35a4 100644 --- a/addons/addon-image/webpack.config.js +++ b/addons/addon-image/webpack.config.js @@ -24,11 +24,6 @@ const addon = { resolve: { modules: ['./node_modules'], extensions: [ '.js' ], - alias: { - common: path.resolve('../../out/common'), - browser: path.resolve('../../out/browser'), - vs: path.resolve('../../out/vs') - } }, output: { filename: mainFile, diff --git a/addons/addon-ligatures/test/tsconfig.json b/addons/addon-ligatures/test/tsconfig.json index 6986e2b46..25a92c8e4 100644 --- a/addons/addon-ligatures/test/tsconfig.json +++ b/addons/addon-ligatures/test/tsconfig.json @@ -10,11 +10,6 @@ "sourceMap": true, "removeComments": true, "strict": true, - "paths": { - "*": [ - "./*" - ] - }, "types": [ "../../../node_modules/@types/mocha", "../../../node_modules/@types/node" diff --git a/addons/addon-progress/src/ProgressAddon.ts b/addons/addon-progress/src/ProgressAddon.ts index 9d71179e1..e474edca3 100644 --- a/addons/addon-progress/src/ProgressAddon.ts +++ b/addons/addon-progress/src/ProgressAddon.ts @@ -5,7 +5,7 @@ import type { Terminal, ITerminalAddon, IDisposable } from '@xterm/xterm'; import type { ProgressAddon as IProgressApi, IProgressState } from '@xterm/addon-progress'; -import type { Emitter, IEvent } from 'common/Event'; +import type { Emitter, IEvent } from '../../../src/common/Event'; const enum ProgressType { diff --git a/addons/addon-progress/src/tsconfig.json b/addons/addon-progress/src/tsconfig.json index bd437f5b6..3d64b7791 100644 --- a/addons/addon-progress/src/tsconfig.json +++ b/addons/addon-progress/src/tsconfig.json @@ -15,12 +15,6 @@ "../../../node_modules/@types/mocha" ], "paths": { - "common/*": [ - "../../../src/common/*" - ], - "browser/*": [ - "../../../src/browser/*" - ], "@xterm/addon-progress": [ "../typings/addon-progress.d.ts" ] diff --git a/addons/addon-progress/test/tsconfig.json b/addons/addon-progress/test/tsconfig.json index 900a727ed..73f17c2a5 100644 --- a/addons/addon-progress/test/tsconfig.json +++ b/addons/addon-progress/test/tsconfig.json @@ -10,12 +10,6 @@ "sourceMap": true, "removeComments": true, "paths": { - "common/*": [ - "../../../src/common/*" - ], - "browser/*": [ - "../../../src/browser/*" - ], "*": [ "./*" ] diff --git a/addons/addon-progress/webpack.config.js b/addons/addon-progress/webpack.config.js index 1bf29bfd2..250b04a49 100644 --- a/addons/addon-progress/webpack.config.js +++ b/addons/addon-progress/webpack.config.js @@ -24,11 +24,6 @@ module.exports = { resolve: { modules: ['./node_modules'], extensions: [ '.js' ], - alias: { - common: path.resolve('../../out/common'), - browser: path.resolve('../../out/browser'), - vs: path.resolve('../../out/vs') - } }, output: { filename: mainFile, diff --git a/addons/addon-search/src/DecorationManager.ts b/addons/addon-search/src/DecorationManager.ts index a8ec12017..1675ef10f 100644 --- a/addons/addon-search/src/DecorationManager.ts +++ b/addons/addon-search/src/DecorationManager.ts @@ -5,7 +5,7 @@ import type { Terminal, IDisposable, IDecoration } from '@xterm/xterm'; import type { ISearchDecorationOptions } from '@xterm/addon-search'; -import { dispose, Disposable, toDisposable } from 'common/Lifecycle'; +import { dispose, Disposable, toDisposable } from '../../../src/common/Lifecycle'; import type { ISearchResult } from './SearchEngine'; /** diff --git a/addons/addon-search/src/SearchAddon.ts b/addons/addon-search/src/SearchAddon.ts index cb4094743..720ed26f0 100644 --- a/addons/addon-search/src/SearchAddon.ts +++ b/addons/addon-search/src/SearchAddon.ts @@ -5,9 +5,9 @@ import type { Terminal, IDisposable, ITerminalAddon } from '@xterm/xterm'; import type { SearchAddon as ISearchApi, ISearchOptions, ISearchAddonOptions, ISearchResultChangeEvent, ISearchDecorationOptions } from '@xterm/addon-search'; -import { Emitter, type IEvent } from 'common/Event'; -import { Disposable, MutableDisposable, toDisposable } from 'common/Lifecycle'; -import { disposableTimeout } from 'common/Async'; +import { Emitter, type IEvent } from '../../../src/common/Event'; +import { Disposable, MutableDisposable, toDisposable } from '../../../src/common/Lifecycle'; +import { disposableTimeout } from '../../../src/common/Async'; import { SearchLineCache } from './SearchLineCache'; import { SearchState } from './SearchState'; import { SearchEngine, type ISearchResult } from './SearchEngine'; diff --git a/addons/addon-search/src/SearchEngine.test.ts b/addons/addon-search/src/SearchEngine.test.ts index b3cea8f54..e2ab9939b 100644 --- a/addons/addon-search/src/SearchEngine.test.ts +++ b/addons/addon-search/src/SearchEngine.test.ts @@ -5,9 +5,9 @@ import { assert } from 'chai'; import { SearchEngine } from './SearchEngine'; import { SearchLineCache } from './SearchLineCache'; -import { Terminal } from 'browser/public/Terminal'; +import { Terminal } from '../../../src/browser/public/Terminal'; import type { ISearchOptions } from '@xterm/addon-search'; -import { DisposableStore } from 'common/Lifecycle'; +import { DisposableStore } from '../../../src/common/Lifecycle'; function writeP(terminal: Terminal, data: string): Promise { return new Promise(r => terminal.write(data, r)); diff --git a/addons/addon-search/src/SearchLineCache.test.ts b/addons/addon-search/src/SearchLineCache.test.ts index 77f64c81e..1a465858c 100644 --- a/addons/addon-search/src/SearchLineCache.test.ts +++ b/addons/addon-search/src/SearchLineCache.test.ts @@ -4,8 +4,8 @@ */ import { assert } from 'chai'; import { SearchLineCache, LineCacheEntry } from './SearchLineCache'; -import { Terminal } from 'browser/public/Terminal'; -import { timeout } from 'common/Async'; +import { Terminal } from '../../../src/browser/public/Terminal'; +import { timeout } from '../../../src/common/Async'; function writeP(terminal: Terminal, data: string): Promise { return new Promise(r => terminal.write(data, r)); diff --git a/addons/addon-search/src/SearchLineCache.ts b/addons/addon-search/src/SearchLineCache.ts index 526f4bfcc..1b590ec74 100644 --- a/addons/addon-search/src/SearchLineCache.ts +++ b/addons/addon-search/src/SearchLineCache.ts @@ -4,8 +4,8 @@ */ import type { Terminal } from '@xterm/xterm'; -import { combinedDisposable, Disposable, MutableDisposable, toDisposable } from 'common/Lifecycle'; -import { disposableTimeout } from 'common/Async'; +import { combinedDisposable, Disposable, MutableDisposable, toDisposable } from '../../../src/common/Lifecycle'; +import { disposableTimeout } from '../../../src/common/Async'; export type LineCacheEntry = [ /** diff --git a/addons/addon-search/src/SearchResultTracker.ts b/addons/addon-search/src/SearchResultTracker.ts index 285345b7a..9c7997741 100644 --- a/addons/addon-search/src/SearchResultTracker.ts +++ b/addons/addon-search/src/SearchResultTracker.ts @@ -5,8 +5,8 @@ import type { ISearchResultChangeEvent } from '@xterm/addon-search'; import type { IDisposable } from '@xterm/xterm'; -import { Emitter, type IEvent } from 'common/Event'; -import { Disposable } from 'common/Lifecycle'; +import { Emitter, type IEvent } from '../../../src/common/Event'; +import { Disposable } from '../../../src/common/Lifecycle'; import type { ISearchResult } from './SearchEngine'; /** diff --git a/addons/addon-search/src/tsconfig.json b/addons/addon-search/src/tsconfig.json index 9817710fa..7e05af738 100644 --- a/addons/addon-search/src/tsconfig.json +++ b/addons/addon-search/src/tsconfig.json @@ -15,12 +15,6 @@ "../../../node_modules/@types/mocha" ], "paths": { - "common/*": [ - "../../../src/common/*" - ], - "browser/*": [ - "../../../src/browser/*" - ], "@xterm/addon-search" : [ "../typings/addon-search.d.ts" ] diff --git a/addons/addon-search/test/tsconfig.json b/addons/addon-search/test/tsconfig.json index 900a727ed..73f17c2a5 100644 --- a/addons/addon-search/test/tsconfig.json +++ b/addons/addon-search/test/tsconfig.json @@ -10,12 +10,6 @@ "sourceMap": true, "removeComments": true, "paths": { - "common/*": [ - "../../../src/common/*" - ], - "browser/*": [ - "../../../src/browser/*" - ], "*": [ "./*" ] diff --git a/addons/addon-search/webpack.config.js b/addons/addon-search/webpack.config.js index adc3d4bdb..9410c84d0 100644 --- a/addons/addon-search/webpack.config.js +++ b/addons/addon-search/webpack.config.js @@ -24,10 +24,6 @@ module.exports = { resolve: { modules: ['./node_modules'], extensions: [ '.js' ], - alias: { - common: path.resolve('../../out/common'), - vs: path.resolve('../../out/vs') - } }, output: { filename: mainFile, diff --git a/addons/addon-serialize/benchmark/SerializeAddon.benchmark.ts b/addons/addon-serialize/benchmark/SerializeAddon.benchmark.ts index b60dba1dd..0b0130cca 100644 --- a/addons/addon-serialize/benchmark/SerializeAddon.benchmark.ts +++ b/addons/addon-serialize/benchmark/SerializeAddon.benchmark.ts @@ -6,8 +6,8 @@ import { perfContext, before, ThroughputRuntimeCase } from 'xterm-benchmark'; import { spawn } from 'node-pty'; -import { Utf8ToUtf32, stringFromCodePoint } from 'common/input/TextDecoder'; -import { Terminal } from 'browser/public/Terminal'; +import { Utf8ToUtf32, stringFromCodePoint } from '../../../src/common/input/TextDecoder'; +import { Terminal } from '../../../src/browser/public/Terminal'; import { SerializeAddon } from 'SerializeAddon'; class TestTerminal extends Terminal { diff --git a/addons/addon-serialize/benchmark/tsconfig.json b/addons/addon-serialize/benchmark/tsconfig.json index ad7ee6d04..f187b3c8f 100644 --- a/addons/addon-serialize/benchmark/tsconfig.json +++ b/addons/addon-serialize/benchmark/tsconfig.json @@ -6,24 +6,36 @@ ], "rootDir": "..", "outDir": "../out-benchmark", - "types": ["../../../node_modules/@types/node"], + "types": [ + "../../../node_modules/@types/node" + ], "moduleResolution": "nodenext", "strict": false, "target": "es2021", "module": "nodenext", "paths": { - "common/*": ["../../../src/common/*"], - "browser/*": ["../../../src/browser/*"], - "SerializeAddon": ["../src/SerializeAddon"], + "SerializeAddon": [ + "../src/SerializeAddon" + ], "@xterm/addon-serialize": [ "../typings/addon-serialize.d.ts" ] } }, - "include": ["../**/*", "../../../typings/xterm.d.ts"], - "exclude": ["../../../**/*test.ts", "../../**/*api.ts"], + "include": [ + "../**/*", + "../../../typings/xterm.d.ts" + ], + "exclude": [ + "../../../**/*test.ts", + "../../**/*api.ts" + ], "references": [ - { "path": "../../../src/common" }, - { "path": "../../../src/browser" } + { + "path": "../../../src/common" + }, + { + "path": "../../../src/browser" + } ] } diff --git a/addons/addon-serialize/package.json b/addons/addon-serialize/package.json index 6fa91ffee..3258043ef 100644 --- a/addons/addon-serialize/package.json +++ b/addons/addon-serialize/package.json @@ -21,8 +21,8 @@ "package": "../../node_modules/.bin/webpack", "prepublishOnly": "npm run package", "start": "node ../../demo/start", - "benchmark": "NODE_PATH=../../out:./out:./out-benchmark/ ../../node_modules/.bin/xterm-benchmark -r 5 -c benchmark/benchmark.json", - "benchmark-baseline": "NODE_PATH=../../out:./out:./out-benchmark/ ../../node_modules/.bin/xterm-benchmark -r 5 -c benchmark/benchmark.json --baseline out-benchmark/benchmark/*benchmark.js", - "benchmark-eval": "NODE_PATH=../../out:./out:./out-benchmark/ ../../node_modules/.bin/xterm-benchmark -r 5 -c benchmark/benchmark.json --eval out-benchmark/benchmark/*benchmark.js" + "benchmark": "../../node_modules/.bin/xterm-benchmark -r 5 -c benchmark/benchmark.json", + "benchmark-baseline": "../../node_modules/.bin/xterm-benchmark -r 5 -c benchmark/benchmark.json --baseline out-benchmark/benchmark/*benchmark.js", + "benchmark-eval": "../../node_modules/.bin/xterm-benchmark -r 5 -c benchmark/benchmark.json --eval out-benchmark/benchmark/*benchmark.js" } } diff --git a/addons/addon-serialize/src/SerializeAddon.test.ts b/addons/addon-serialize/src/SerializeAddon.test.ts index 4f4fd5461..0cfc83258 100644 --- a/addons/addon-serialize/src/SerializeAddon.test.ts +++ b/addons/addon-serialize/src/SerializeAddon.test.ts @@ -6,10 +6,10 @@ import jsdom = require('jsdom'); import { assert } from 'chai'; import { SerializeAddon } from './SerializeAddon'; -import { Terminal } from 'browser/public/Terminal'; -import { SelectionModel } from 'browser/selection/SelectionModel'; -import { IBufferService } from 'common/services/Services'; -import { ThemeService } from 'browser/services/ThemeService'; +import { Terminal } from '../../../src/browser/public/Terminal'; +import { SelectionModel } from '../../../src/browser/selection/SelectionModel'; +import { IBufferService } from '../../../src/common/services/Services'; +import { ThemeService } from '../../../src/browser/services/ThemeService'; function sgr(...seq: string[]): string { return `\x1b[${seq.join(';')}m`; diff --git a/addons/addon-serialize/src/SerializeAddon.ts b/addons/addon-serialize/src/SerializeAddon.ts index 4980c8eda..fbcc65cfa 100644 --- a/addons/addon-serialize/src/SerializeAddon.ts +++ b/addons/addon-serialize/src/SerializeAddon.ts @@ -7,9 +7,9 @@ import type { IBuffer, IBufferCell, IBufferRange, ITerminalAddon, Terminal } from '@xterm/xterm'; import type { IHTMLSerializeOptions, SerializeAddon as ISerializeApi, ISerializeOptions, ISerializeRange } from '@xterm/addon-serialize'; -import { IAttributeData, IColor } from 'common/Types'; -import { DEFAULT_ANSI_COLORS } from 'browser/Types'; -import { UnderlineStyle } from 'common/buffer/Constants'; +import { IAttributeData, IColor } from '../../../src/common/Types'; +import { DEFAULT_ANSI_COLORS } from '../../../src/browser/Types'; +import { UnderlineStyle } from '../../../src/common/buffer/Constants'; function constrain(value: number, low: number, high: number): number { return Math.max(low, Math.min(value, high)); diff --git a/addons/addon-serialize/src/tsconfig.json b/addons/addon-serialize/src/tsconfig.json index 725647366..8176e660e 100644 --- a/addons/addon-serialize/src/tsconfig.json +++ b/addons/addon-serialize/src/tsconfig.json @@ -11,12 +11,6 @@ "sourceMap": true, "removeComments": true, "paths": { - "common/*": [ - "../../../src/common/*" - ], - "browser/*": [ - "../../../src/browser/*" - ], "@xterm/addon-serialize": [ "../typings/addon-serialize.d.ts" ] diff --git a/addons/addon-serialize/test/tsconfig.json b/addons/addon-serialize/test/tsconfig.json index 769909b19..9d3f4722c 100644 --- a/addons/addon-serialize/test/tsconfig.json +++ b/addons/addon-serialize/test/tsconfig.json @@ -9,14 +9,6 @@ "outDir": "../out-test", "sourceMap": true, "removeComments": true, - "paths": { - "common/*": [ - "../../../src/common/*" - ], - "browser/*": [ - "../../../src/browser/*" - ] - }, "strict": true, "types": [ "../../../node_modules/@types/node" diff --git a/addons/addon-serialize/webpack.config.js b/addons/addon-serialize/webpack.config.js index 837a73a38..c38ab9f2b 100644 --- a/addons/addon-serialize/webpack.config.js +++ b/addons/addon-serialize/webpack.config.js @@ -24,10 +24,6 @@ module.exports = { resolve: { modules: ['./node_modules'], extensions: [ '.js' ], - alias: { - common: path.resolve('../../out/common'), - browser: path.resolve('../../out/browser') - } }, output: { filename: mainFile, diff --git a/addons/addon-unicode-graphemes/benchmark/UnicodeGraphemeAddon.benchmark.ts b/addons/addon-unicode-graphemes/benchmark/UnicodeGraphemeAddon.benchmark.ts index 7538b9344..74b434814 100644 --- a/addons/addon-unicode-graphemes/benchmark/UnicodeGraphemeAddon.benchmark.ts +++ b/addons/addon-unicode-graphemes/benchmark/UnicodeGraphemeAddon.benchmark.ts @@ -6,8 +6,8 @@ import { perfContext, before, ThroughputRuntimeCase } from 'xterm-benchmark'; import { spawn } from 'node-pty'; -import { Utf8ToUtf32, stringFromCodePoint } from 'common/input/TextDecoder'; -import { CoreBrowserTerminal } from 'browser/CoreBrowserTerminal'; +import { Utf8ToUtf32, stringFromCodePoint } from '../../../src/common/input/TextDecoder'; +import { CoreBrowserTerminal } from '../../../src/browser/CoreBrowserTerminal'; import { UnicodeGraphemeProvider } from 'UnicodeGraphemeProvider'; diff --git a/addons/addon-unicode-graphemes/benchmark/tsconfig.json b/addons/addon-unicode-graphemes/benchmark/tsconfig.json index 1781ca318..75fda6d08 100644 --- a/addons/addon-unicode-graphemes/benchmark/tsconfig.json +++ b/addons/addon-unicode-graphemes/benchmark/tsconfig.json @@ -1,26 +1,41 @@ { "compilerOptions": { - "lib": ["dom", "es6"], + "lib": [ + "dom", + "es6" + ], "rootDir": "..", "outDir": "../out-benchmark", - "types": ["../../../node_modules/@types/node"], + "types": [ + "../../../node_modules/@types/node" + ], "moduleResolution": "nodenext", "strict": false, "target": "es2015", "module": "nodenext", "paths": { - "common/*": ["../../../src/common/*"], - "browser/*": ["../../../src/browser/*"], - "UnicodeGraphemeProvider": ["../src/UnicodeGraphemeProvider"], + "UnicodeGraphemeProvider": [ + "../src/UnicodeGraphemeProvider" + ], "@xterm/addon-unicode-graphemes": [ "../typings/addon-unicode-graphemes.d.ts" ] } }, - "include": ["../**/*", "../../../typings/xterm.d.ts"], - "exclude": ["../../../**/*test.ts", "../../**/*api.ts"], + "include": [ + "../**/*", + "../../../typings/xterm.d.ts" + ], + "exclude": [ + "../../../**/*test.ts", + "../../**/*api.ts" + ], "references": [ - { "path": "../../../src/common" }, - { "path": "../../../src/browser" } + { + "path": "../../../src/common" + }, + { + "path": "../../../src/browser" + } ] } diff --git a/addons/addon-unicode-graphemes/package.json b/addons/addon-unicode-graphemes/package.json index 640a61a7d..1848bebfc 100644 --- a/addons/addon-unicode-graphemes/package.json +++ b/addons/addon-unicode-graphemes/package.json @@ -21,8 +21,8 @@ "package": "../../node_modules/.bin/webpack", "prepublishOnly": "npm run package", "start": "node ../../demo/start", - "benchmark": "NODE_PATH=../../out:./out:./out-benchmark/ ../../node_modules/.bin/xterm-benchmark -r 5 -c benchmark/benchmark.json out-benchmark/benchmark/*benchmark.js", - "benchmark-baseline": "NODE_PATH=../../out:./out:./out-benchmark/ ../../node_modules/.bin/xterm-benchmark -r 5 -c benchmark/benchmark.json --baseline out-benchmark/benchmark/*benchmark.js", - "benchmark-eval": "NODE_PATH=../../out:./out:./out-benchmark/ ../../node_modules/.bin/xterm-benchmark -r 5 -c benchmark/benchmark.json --eval out-benchmark/benchmark/*benchmark.js" + "benchmark": "../../node_modules/.bin/xterm-benchmark -r 5 -c benchmark/benchmark.json out-benchmark/benchmark/*benchmark.js", + "benchmark-baseline": "../../node_modules/.bin/xterm-benchmark -r 5 -c benchmark/benchmark.json --baseline out-benchmark/benchmark/*benchmark.js", + "benchmark-eval": "../../node_modules/.bin/xterm-benchmark -r 5 -c benchmark/benchmark.json --eval out-benchmark/benchmark/*benchmark.js" } } diff --git a/addons/addon-unicode-graphemes/src/UnicodeGraphemeProvider.ts b/addons/addon-unicode-graphemes/src/UnicodeGraphemeProvider.ts index 3d5717a0f..ed258805d 100644 --- a/addons/addon-unicode-graphemes/src/UnicodeGraphemeProvider.ts +++ b/addons/addon-unicode-graphemes/src/UnicodeGraphemeProvider.ts @@ -4,8 +4,8 @@ */ import { IUnicodeVersionProvider } from '@xterm/xterm'; -import { UnicodeCharProperties, UnicodeCharWidth } from 'common/services/Services'; -import { UnicodeService } from 'common/services/UnicodeService'; +import { UnicodeCharProperties, UnicodeCharWidth } from '../../../src/common/services/Services'; +import { UnicodeService } from '../../../src/common/services/UnicodeService'; import * as UC from './third-party/UnicodeProperties'; export class UnicodeGraphemeProvider implements IUnicodeVersionProvider { diff --git a/addons/addon-unicode-graphemes/src/tsconfig.json b/addons/addon-unicode-graphemes/src/tsconfig.json index 824909dbd..de62f95cb 100644 --- a/addons/addon-unicode-graphemes/src/tsconfig.json +++ b/addons/addon-unicode-graphemes/src/tsconfig.json @@ -12,9 +12,6 @@ "removeComments": true, "strict": true, "paths": { - "common/*": [ - "../../../src/common/*" - ], "@xterm/addon-unicode-graphemes": [ "../typings/addon-unicode-graphemes.d.ts" ] diff --git a/addons/addon-unicode-graphemes/test/tsconfig.json b/addons/addon-unicode-graphemes/test/tsconfig.json index 769909b19..9d3f4722c 100644 --- a/addons/addon-unicode-graphemes/test/tsconfig.json +++ b/addons/addon-unicode-graphemes/test/tsconfig.json @@ -9,14 +9,6 @@ "outDir": "../out-test", "sourceMap": true, "removeComments": true, - "paths": { - "common/*": [ - "../../../src/common/*" - ], - "browser/*": [ - "../../../src/browser/*" - ] - }, "strict": true, "types": [ "../../../node_modules/@types/node" diff --git a/addons/addon-unicode-graphemes/webpack.config.js b/addons/addon-unicode-graphemes/webpack.config.js index 35e111d53..b3934006e 100644 --- a/addons/addon-unicode-graphemes/webpack.config.js +++ b/addons/addon-unicode-graphemes/webpack.config.js @@ -24,10 +24,6 @@ module.exports = { resolve: { modules: ['./node_modules'], extensions: [ '.js' ], - alias: { - common: path.resolve('../../out/common'), - vs: path.resolve('../../out/vs') - } }, output: { filename: mainFile, diff --git a/addons/addon-unicode11/src/UnicodeV11.ts b/addons/addon-unicode11/src/UnicodeV11.ts index 79568960a..d80b60b80 100644 --- a/addons/addon-unicode11/src/UnicodeV11.ts +++ b/addons/addon-unicode11/src/UnicodeV11.ts @@ -4,8 +4,8 @@ */ import { IUnicodeVersionProvider } from '@xterm/xterm'; -import { UnicodeCharProperties, UnicodeCharWidth } from 'common/services/Services'; -import { UnicodeService } from 'common/services/UnicodeService'; +import { UnicodeCharProperties, UnicodeCharWidth } from '../../../src/common/services/Services'; +import { UnicodeService } from '../../../src/common/services/UnicodeService'; const BMP_COMBINING = [ [0x0300, 0x036F], [0x0483, 0x0489], [0x0591, 0x05BD], diff --git a/addons/addon-unicode11/src/tsconfig.json b/addons/addon-unicode11/src/tsconfig.json index 31286fb0f..a5b97d43e 100644 --- a/addons/addon-unicode11/src/tsconfig.json +++ b/addons/addon-unicode11/src/tsconfig.json @@ -12,14 +12,8 @@ "removeComments": true, "strict": true, "paths": { - "common/*": [ - "../../../src/common/*" - ], "@xterm/addon-unicode11": [ "../typings/addon-unicode11.d.ts" - ], - "*": [ - "./*" ] }, "types": [ diff --git a/addons/addon-unicode11/test/tsconfig.json b/addons/addon-unicode11/test/tsconfig.json index 900a727ed..73f17c2a5 100644 --- a/addons/addon-unicode11/test/tsconfig.json +++ b/addons/addon-unicode11/test/tsconfig.json @@ -10,12 +10,6 @@ "sourceMap": true, "removeComments": true, "paths": { - "common/*": [ - "../../../src/common/*" - ], - "browser/*": [ - "../../../src/browser/*" - ], "*": [ "./*" ] diff --git a/addons/addon-unicode11/webpack.config.js b/addons/addon-unicode11/webpack.config.js index 9b66049fd..f3ae10eef 100644 --- a/addons/addon-unicode11/webpack.config.js +++ b/addons/addon-unicode11/webpack.config.js @@ -24,10 +24,6 @@ module.exports = { resolve: { modules: ['./node_modules'], extensions: [ '.js' ], - alias: { - common: path.resolve('../../out/common'), - vs: path.resolve('../../out/vs') - } }, output: { filename: mainFile, diff --git a/addons/addon-web-fonts/test/tsconfig.json b/addons/addon-web-fonts/test/tsconfig.json index 59664e32b..66097910d 100644 --- a/addons/addon-web-fonts/test/tsconfig.json +++ b/addons/addon-web-fonts/test/tsconfig.json @@ -10,12 +10,6 @@ "sourceMap": true, "removeComments": true, "paths": { - "common/*": [ - "../../../src/common/*" - ], - "browser/*": [ - "../../../src/browser/*" - ], "*": [ "./*" ] diff --git a/addons/addon-web-links/test/tsconfig.json b/addons/addon-web-links/test/tsconfig.json index 59664e32b..66097910d 100644 --- a/addons/addon-web-links/test/tsconfig.json +++ b/addons/addon-web-links/test/tsconfig.json @@ -10,12 +10,6 @@ "sourceMap": true, "removeComments": true, "paths": { - "common/*": [ - "../../../src/common/*" - ], - "browser/*": [ - "../../../src/browser/*" - ], "*": [ "./*" ] diff --git a/addons/addon-webgl/src/CellColorResolver.ts b/addons/addon-webgl/src/CellColorResolver.ts index 3a4661cc3..52e19a823 100644 --- a/addons/addon-webgl/src/CellColorResolver.ts +++ b/addons/addon-webgl/src/CellColorResolver.ts @@ -1,12 +1,12 @@ -import { ISelectionRenderModel } from 'browser/renderer/shared/Types'; -import { ICoreBrowserService, IThemeService } from 'browser/services/Services'; -import { ReadonlyColorSet } from 'browser/Types'; -import { Attributes, BgFlags, ExtFlags, FgFlags, NULL_CELL_CODE, UnderlineStyle } from 'common/buffer/Constants'; -import { IDecorationService, IOptionsService } from 'common/services/Services'; -import { ICellData } from 'common/Types'; +import { ISelectionRenderModel } from '../../../src/browser/renderer/shared/Types'; +import { ICoreBrowserService, IThemeService } from '../../../src/browser/services/Services'; +import { ReadonlyColorSet } from '../../../src/browser/Types'; +import { Attributes, BgFlags, ExtFlags, FgFlags, NULL_CELL_CODE, UnderlineStyle } from '../../../src/common/buffer/Constants'; +import { IDecorationService, IOptionsService } from '../../../src/common/services/Services'; +import { ICellData } from '../../../src/common/Types'; import { Terminal } from '@xterm/xterm'; -import { rgba } from 'common/Color'; -import { treatGlyphAsBackgroundColor } from 'browser/renderer/shared/RendererUtils'; +import { rgba } from '../../../src/common/Color'; +import { treatGlyphAsBackgroundColor } from '../../../src/browser/renderer/shared/RendererUtils'; import { blockPatternCodepoints } from './customGlyphs/CustomGlyphDefinitions'; // Work variables to avoid garbage collection diff --git a/addons/addon-webgl/src/CharAtlasCache.ts b/addons/addon-webgl/src/CharAtlasCache.ts index 823a74cc6..9aa165f12 100644 --- a/addons/addon-webgl/src/CharAtlasCache.ts +++ b/addons/addon-webgl/src/CharAtlasCache.ts @@ -5,10 +5,10 @@ import { TextureAtlas } from './TextureAtlas'; import { ITerminalOptions, Terminal } from '@xterm/xterm'; -import { ITerminal, ReadonlyColorSet } from 'browser/Types'; +import { ITerminal, ReadonlyColorSet } from '../../../src/browser/Types'; import { ICharAtlasConfig, ITextureAtlas } from './Types'; import { generateConfig, configEquals } from './CharAtlasUtils'; -import type { ILogService } from 'common/services/Services'; +import type { ILogService } from '../../../src/common/services/Services'; interface ITextureAtlasCacheEntry { atlas: ITextureAtlas; diff --git a/addons/addon-webgl/src/CharAtlasUtils.test.ts b/addons/addon-webgl/src/CharAtlasUtils.test.ts index 0a135746e..572989410 100644 --- a/addons/addon-webgl/src/CharAtlasUtils.test.ts +++ b/addons/addon-webgl/src/CharAtlasUtils.test.ts @@ -6,8 +6,8 @@ import { assert } from 'chai'; import { configEquals } from './CharAtlasUtils'; import { ICharAtlasConfig } from './Types'; -import { NULL_COLOR } from 'common/Color'; -import { IColor } from 'common/Types'; +import { NULL_COLOR } from '../../../src/common/Color'; +import { IColor } from '../../../src/common/Types'; function createTestConfig(overrides: Partial = {}): ICharAtlasConfig { const color: IColor = { css: '#ffffff', rgba: 0xffffffff }; diff --git a/addons/addon-webgl/src/CharAtlasUtils.ts b/addons/addon-webgl/src/CharAtlasUtils.ts index d9ca69b39..6a98c9a8d 100644 --- a/addons/addon-webgl/src/CharAtlasUtils.ts +++ b/addons/addon-webgl/src/CharAtlasUtils.ts @@ -4,10 +4,10 @@ */ import { ICharAtlasConfig } from './Types'; -import { Attributes } from 'common/buffer/Constants'; +import { Attributes } from '../../../src/common/buffer/Constants'; import { ITerminalOptions } from '@xterm/xterm'; -import { IColorSet, ReadonlyColorSet } from 'browser/Types'; -import { NULL_COLOR } from 'common/Color'; +import { IColorSet, ReadonlyColorSet } from '../../../src/browser/Types'; +import { NULL_COLOR } from '../../../src/common/Color'; export function generateConfig(deviceCellWidth: number, deviceCellHeight: number, deviceCharWidth: number, deviceCharHeight: number, options: Required, colors: ReadonlyColorSet, devicePixelRatio: number, deviceMaxTextureSize: number, customGlyphs: boolean = true): ICharAtlasConfig { // null out some fields that don't matter diff --git a/addons/addon-webgl/src/Constants.ts b/addons/addon-webgl/src/Constants.ts index a00434d61..e37aecdb4 100644 --- a/addons/addon-webgl/src/Constants.ts +++ b/addons/addon-webgl/src/Constants.ts @@ -3,7 +3,7 @@ * @license MIT */ -import { isFirefox, isLegacyEdge } from 'common/Platform'; +import { isFirefox, isLegacyEdge } from '../../../src/common/Platform'; export const DIM_OPACITY = 0.5; // The text baseline is set conditionally by browser. Using 'ideographic' for Firefox or Legacy Edge diff --git a/addons/addon-webgl/src/CursorBlinkStateManager.ts b/addons/addon-webgl/src/CursorBlinkStateManager.ts index 688aee7b7..1339dae03 100644 --- a/addons/addon-webgl/src/CursorBlinkStateManager.ts +++ b/addons/addon-webgl/src/CursorBlinkStateManager.ts @@ -3,8 +3,8 @@ * @license MIT */ -import { RendererConstants } from 'browser/renderer/shared/Constants'; -import { ICoreBrowserService } from 'browser/services/Services'; +import { RendererConstants } from '../../../src/browser/renderer/shared/Constants'; +import { ICoreBrowserService } from '../../../src/browser/services/Services'; const enum Constants { /** diff --git a/addons/addon-webgl/src/DevicePixelObserver.ts b/addons/addon-webgl/src/DevicePixelObserver.ts index dcd8de0a6..50ed09941 100644 --- a/addons/addon-webgl/src/DevicePixelObserver.ts +++ b/addons/addon-webgl/src/DevicePixelObserver.ts @@ -3,7 +3,7 @@ * @license MIT */ -import { toDisposable, IDisposable } from 'common/Lifecycle'; +import { toDisposable, IDisposable } from '../../../src/common/Lifecycle'; export function observeDevicePixelDimensions(element: HTMLElement, parentWindow: Window & typeof globalThis, callback: (deviceWidth: number, deviceHeight: number) => void): IDisposable { // Observe any resizes to the element and extract the actual pixel size of the element if the diff --git a/addons/addon-webgl/src/GlyphRenderer.ts b/addons/addon-webgl/src/GlyphRenderer.ts index 650fc451a..915979206 100644 --- a/addons/addon-webgl/src/GlyphRenderer.ts +++ b/addons/addon-webgl/src/GlyphRenderer.ts @@ -3,14 +3,14 @@ * @license MIT */ import { TextureAtlas } from './TextureAtlas'; -import { IRenderDimensions } from 'browser/renderer/shared/Types'; -import { NULL_CELL_CODE } from 'common/buffer/Constants'; -import { Disposable, toDisposable } from 'common/Lifecycle'; +import { IRenderDimensions } from '../../../src/browser/renderer/shared/Types'; +import { NULL_CELL_CODE } from '../../../src/common/buffer/Constants'; +import { Disposable, toDisposable } from '../../../src/common/Lifecycle'; import { Terminal } from '@xterm/xterm'; import { IRenderModel, IWebGL2RenderingContext, IWebGLVertexArrayObject, type IRasterizedGlyph, type ITextureAtlas } from './Types'; import { createProgram, GLTexture, PROJECTION_MATRIX } from './WebglUtils'; -import type { ILogService, IOptionsService } from 'common/services/Services'; -import { allowRescaling, throwIfFalsy } from 'browser/renderer/shared/RendererUtils'; +import type { ILogService, IOptionsService } from '../../../src/common/services/Services'; +import { allowRescaling, throwIfFalsy } from '../../../src/browser/renderer/shared/RendererUtils'; interface IVertices { attributes: Float32Array; diff --git a/addons/addon-webgl/src/RectangleRenderer.ts b/addons/addon-webgl/src/RectangleRenderer.ts index eebfda3b3..0eb45a11c 100644 --- a/addons/addon-webgl/src/RectangleRenderer.ts +++ b/addons/addon-webgl/src/RectangleRenderer.ts @@ -3,18 +3,18 @@ * @license MIT */ -import { IRenderDimensions } from 'browser/renderer/shared/Types'; -import { IThemeService } from 'browser/services/Services'; -import { ReadonlyColorSet } from 'browser/Types'; -import { Attributes, FgFlags } from 'common/buffer/Constants'; -import { Disposable, toDisposable } from 'common/Lifecycle'; -import { IColor } from 'common/Types'; +import { IRenderDimensions } from '../../../src/browser/renderer/shared/Types'; +import { IThemeService } from '../../../src/browser/services/Services'; +import { ReadonlyColorSet } from '../../../src/browser/Types'; +import { Attributes, FgFlags } from '../../../src/common/buffer/Constants'; +import { Disposable, toDisposable } from '../../../src/common/Lifecycle'; +import { IColor } from '../../../src/common/Types'; import { Terminal } from '@xterm/xterm'; import { RenderModelConstants } from './RenderModel'; import { IRenderModel, IWebGL2RenderingContext, IWebGLVertexArrayObject } from './Types'; import { createProgram, expandFloat32Array, PROJECTION_MATRIX } from './WebglUtils'; -import { throwIfFalsy } from 'browser/renderer/shared/RendererUtils'; -import type { ILogService } from 'common/services/Services'; +import { throwIfFalsy } from '../../../src/browser/renderer/shared/RendererUtils'; +import type { ILogService } from '../../../src/common/services/Services'; const enum VertexAttribLocations { POSITION = 0, diff --git a/addons/addon-webgl/src/RenderModel.ts b/addons/addon-webgl/src/RenderModel.ts index 6113a9bdc..e1fe54628 100644 --- a/addons/addon-webgl/src/RenderModel.ts +++ b/addons/addon-webgl/src/RenderModel.ts @@ -4,8 +4,8 @@ */ import { ICursorRenderModel, IRenderModel } from './Types'; -import { ISelectionRenderModel } from 'browser/renderer/shared/Types'; -import { createSelectionRenderModel } from 'browser/renderer/shared/SelectionRenderModel'; +import { ISelectionRenderModel } from '../../../src/browser/renderer/shared/Types'; +import { createSelectionRenderModel } from '../../../src/browser/renderer/shared/SelectionRenderModel'; export const enum RenderModelConstants { INDICIES_PER_CELL = 4, diff --git a/addons/addon-webgl/src/TextureAtlas.ts b/addons/addon-webgl/src/TextureAtlas.ts index dab0b1c85..a6dda7b71 100644 --- a/addons/addon-webgl/src/TextureAtlas.ts +++ b/addons/addon-webgl/src/TextureAtlas.ts @@ -3,19 +3,19 @@ * @license MIT */ -import { IColorContrastCache } from 'browser/Types'; +import { IColorContrastCache } from '../../../src/browser/Types'; import { DIM_OPACITY, TEXT_BASELINE } from './Constants'; import { tryDrawCustomGlyph } from './customGlyphs/CustomGlyphRasterizer'; -import { computeNextVariantOffset, treatGlyphAsBackgroundColor, isPowerlineGlyph, isRestrictedPowerlineGlyph, throwIfFalsy } from 'browser/renderer/shared/RendererUtils'; +import { computeNextVariantOffset, treatGlyphAsBackgroundColor, isPowerlineGlyph, isRestrictedPowerlineGlyph, throwIfFalsy } from '../../../src/browser/renderer/shared/RendererUtils'; import { IBoundingBox, ICharAtlasConfig, IRasterizedGlyph, ITextureAtlas } from './Types'; -import { NULL_COLOR, channels, color, rgba } from 'common/Color'; -import { FourKeyMap } from 'common/MultiKeyMap'; -import { IdleTaskQueue } from 'common/TaskQueue'; -import { IColor } from 'common/Types'; -import { AttributeData } from 'common/buffer/AttributeData'; -import { Attributes, DEFAULT_COLOR, DEFAULT_EXT, UnderlineStyle } from 'common/buffer/Constants'; -import { ILogService, IUnicodeService } from 'common/services/Services'; -import { Emitter } from 'common/Event'; +import { NULL_COLOR, channels, color, rgba } from '../../../src/common/Color'; +import { FourKeyMap } from '../../../src/common/MultiKeyMap'; +import { IdleTaskQueue } from '../../../src/common/TaskQueue'; +import { IColor } from '../../../src/common/Types'; +import { AttributeData } from '../../../src/common/buffer/AttributeData'; +import { Attributes, DEFAULT_COLOR, DEFAULT_EXT, UnderlineStyle } from '../../../src/common/buffer/Constants'; +import { ILogService, IUnicodeService } from '../../../src/common/services/Services'; +import { Emitter } from '../../../src/common/Event'; /** * A shared object which is used to draw nothing for a particular cell. diff --git a/addons/addon-webgl/src/Types.ts b/addons/addon-webgl/src/Types.ts index 294582e37..913d9c8ab 100644 --- a/addons/addon-webgl/src/Types.ts +++ b/addons/addon-webgl/src/Types.ts @@ -4,10 +4,10 @@ */ import { FontWeight } from '@xterm/xterm'; -import { IColorSet } from 'browser/Types'; -import { ISelectionRenderModel } from 'browser/renderer/shared/Types'; -import { CursorInactiveStyle, CursorStyle, type IDisposable } from 'common/Types'; -import type { IEvent } from 'common/Event'; +import { IColorSet } from '../../../src/browser/Types'; +import { ISelectionRenderModel } from '../../../src/browser/renderer/shared/Types'; +import { CursorInactiveStyle, CursorStyle, type IDisposable } from '../../../src/common/Types'; +import type { IEvent } from '../../../src/common/Event'; export interface IRenderModel { cells: Uint32Array; diff --git a/addons/addon-webgl/src/WebglAddon.ts b/addons/addon-webgl/src/WebglAddon.ts index 624c9ea38..b370d2955 100644 --- a/addons/addon-webgl/src/WebglAddon.ts +++ b/addons/addon-webgl/src/WebglAddon.ts @@ -5,14 +5,14 @@ import type { ITerminalAddon, Terminal } from '@xterm/xterm'; import type { IWebglAddonOptions, WebglAddon as IWebglApi } from '@xterm/addon-webgl'; -import { ICharacterJoinerService, ICharSizeService, ICoreBrowserService, IRenderService, IThemeService } from 'browser/services/Services'; -import { ITerminal } from 'browser/Types'; -import { Disposable, toDisposable } from 'common/Lifecycle'; -import { getSafariVersion, isSafari } from 'common/Platform'; -import { ICoreService, IDecorationService, ILogService, IOptionsService } from 'common/services/Services'; +import { ICharacterJoinerService, ICharSizeService, ICoreBrowserService, IRenderService, IThemeService } from '../../../src/browser/services/Services'; +import { ITerminal } from '../../../src/browser/Types'; +import { Disposable, toDisposable } from '../../../src/common/Lifecycle'; +import { getSafariVersion, isSafari } from '../../../src/common/Platform'; +import { ICoreService, IDecorationService, ILogService, IOptionsService } from '../../../src/common/services/Services'; import { IWebGL2RenderingContext } from './Types'; import { WebglRenderer } from './WebglRenderer'; -import { Emitter, EventUtils } from 'common/Event'; +import { Emitter, EventUtils } from '../../../src/common/Event'; export class WebglAddon extends Disposable implements ITerminalAddon, IWebglApi { private _terminal?: Terminal; diff --git a/addons/addon-webgl/src/WebglRenderer.ts b/addons/addon-webgl/src/WebglRenderer.ts index 9c2f459df..1302d6be2 100644 --- a/addons/addon-webgl/src/WebglRenderer.ts +++ b/addons/addon-webgl/src/WebglRenderer.ts @@ -3,19 +3,19 @@ * @license MIT */ -import { ITerminal } from 'browser/Types'; +import { ITerminal } from '../../../src/browser/Types'; import { CellColorResolver } from './CellColorResolver'; import { acquireTextureAtlas, removeTerminalFromCache } from './CharAtlasCache'; import { CursorBlinkStateManager } from './CursorBlinkStateManager'; import { observeDevicePixelDimensions } from './DevicePixelObserver'; -import { IRenderDimensions, IRenderer, IRequestRedrawEvent } from 'browser/renderer/shared/Types'; -import { ICharSizeService, ICharacterJoinerService, ICoreBrowserService, IThemeService } from 'browser/services/Services'; -import { CharData, IBufferLine, ICellData } from 'common/Types'; -import { AttributeData } from 'common/buffer/AttributeData'; -import { CellData } from 'common/buffer/CellData'; -import { Attributes, Content, FgFlags, NULL_CELL_CHAR, NULL_CELL_CODE } from 'common/buffer/Constants'; -import { TextBlinkStateManager } from 'browser/renderer/shared/TextBlinkStateManager'; -import { ICoreService, IDecorationService, ILogService, IOptionsService } from 'common/services/Services'; +import { IRenderDimensions, IRenderer, IRequestRedrawEvent } from '../../../src/browser/renderer/shared/Types'; +import { ICharSizeService, ICharacterJoinerService, ICoreBrowserService, IThemeService } from '../../../src/browser/services/Services'; +import { CharData, IBufferLine, ICellData } from '../../../src/common/Types'; +import { AttributeData } from '../../../src/common/buffer/AttributeData'; +import { CellData } from '../../../src/common/buffer/CellData'; +import { Attributes, Content, FgFlags, NULL_CELL_CHAR, NULL_CELL_CODE } from '../../../src/common/buffer/Constants'; +import { TextBlinkStateManager } from '../../../src/browser/renderer/shared/TextBlinkStateManager'; +import { ICoreService, IDecorationService, ILogService, IOptionsService } from '../../../src/common/services/Services'; import { Terminal } from '@xterm/xterm'; import { GlyphRenderer } from './GlyphRenderer'; import { RectangleRenderer } from './RectangleRenderer'; @@ -23,10 +23,10 @@ import { COMBINED_CHAR_BIT_MASK, RenderModel, RenderModelConstants } from './Ren import { IWebGL2RenderingContext, type ITextureAtlas } from './Types'; import { LinkRenderLayer } from './renderLayer/LinkRenderLayer'; import { IRenderLayer } from './renderLayer/Types'; -import { Emitter, EventUtils } from 'common/Event'; -import { addDisposableListener } from 'browser/Dom'; -import { combinedDisposable, Disposable, MutableDisposable, toDisposable } from 'common/Lifecycle'; -import { createRenderDimensions } from 'browser/renderer/shared/RendererUtils'; +import { Emitter, EventUtils } from '../../../src/common/Event'; +import { addDisposableListener } from '../../../src/browser/Dom'; +import { combinedDisposable, Disposable, MutableDisposable, toDisposable } from '../../../src/common/Lifecycle'; +import { createRenderDimensions } from '../../../src/browser/renderer/shared/RendererUtils'; const enum Constants { MERGE_RETRY_LIMIT = 32 diff --git a/addons/addon-webgl/src/WebglUtils.ts b/addons/addon-webgl/src/WebglUtils.ts index 9944c6bd3..b106f7d56 100644 --- a/addons/addon-webgl/src/WebglUtils.ts +++ b/addons/addon-webgl/src/WebglUtils.ts @@ -3,8 +3,8 @@ * @license MIT */ -import { throwIfFalsy } from 'browser/renderer/shared/RendererUtils'; -import type { ILogService } from 'common/services/Services'; +import { throwIfFalsy } from '../../../src/browser/renderer/shared/RendererUtils'; +import type { ILogService } from '../../../src/common/services/Services'; /** * A matrix that when multiplies will translate 0-1 coordinates (left to right, diff --git a/addons/addon-webgl/src/customGlyphs/CustomGlyphRasterizer.ts b/addons/addon-webgl/src/customGlyphs/CustomGlyphRasterizer.ts index 357d512d2..d1c9fd83c 100644 --- a/addons/addon-webgl/src/customGlyphs/CustomGlyphRasterizer.ts +++ b/addons/addon-webgl/src/customGlyphs/CustomGlyphRasterizer.ts @@ -3,8 +3,8 @@ * @license MIT */ -import { throwIfFalsy } from 'browser/renderer/shared/RendererUtils'; -import type { ILogService } from 'common/services/Services'; +import { throwIfFalsy } from '../../../../src/browser/renderer/shared/RendererUtils'; +import type { ILogService } from '../../../../src/common/services/Services'; import { customGlyphDefinitions } from './CustomGlyphDefinitions'; import { CustomGlyphDefinitionType, CustomGlyphScaleType, CustomGlyphVectorType, type CustomGlyphDefinitionPart, type CustomGlyphPathDrawFunctionDefinition, type CustomGlyphPatternDefinition, type ICustomGlyphSolidOctantBlockVector, type ICustomGlyphVectorShape } from './Types'; diff --git a/addons/addon-webgl/src/renderLayer/BaseRenderLayer.ts b/addons/addon-webgl/src/renderLayer/BaseRenderLayer.ts index 5b1161532..4c286284d 100644 --- a/addons/addon-webgl/src/renderLayer/BaseRenderLayer.ts +++ b/addons/addon-webgl/src/renderLayer/BaseRenderLayer.ts @@ -3,16 +3,16 @@ * @license MIT */ -import { ReadonlyColorSet } from 'browser/Types'; +import { ReadonlyColorSet } from '../../../../src/browser/Types'; import { acquireTextureAtlas } from '../CharAtlasCache'; -import { IRenderDimensions } from 'browser/renderer/shared/Types'; -import { ICoreBrowserService, IThemeService } from 'browser/services/Services'; -import { Disposable, toDisposable } from 'common/Lifecycle'; -import { CellData } from 'common/buffer/CellData'; -import { IOptionsService } from 'common/services/Services'; +import { IRenderDimensions } from '../../../../src/browser/renderer/shared/Types'; +import { ICoreBrowserService, IThemeService } from '../../../../src/browser/services/Services'; +import { Disposable, toDisposable } from '../../../../src/common/Lifecycle'; +import { CellData } from '../../../../src/common/buffer/CellData'; +import { IOptionsService } from '../../../../src/common/services/Services'; import { Terminal } from '@xterm/xterm'; import { IRenderLayer } from './Types'; -import { throwIfFalsy } from 'browser/renderer/shared/RendererUtils'; +import { throwIfFalsy } from '../../../../src/browser/renderer/shared/RendererUtils'; import { TEXT_BASELINE } from '../Constants'; import type { ITextureAtlas } from '../Types'; diff --git a/addons/addon-webgl/src/renderLayer/LinkRenderLayer.ts b/addons/addon-webgl/src/renderLayer/LinkRenderLayer.ts index faceac44f..e076b9bd7 100644 --- a/addons/addon-webgl/src/renderLayer/LinkRenderLayer.ts +++ b/addons/addon-webgl/src/renderLayer/LinkRenderLayer.ts @@ -4,11 +4,11 @@ */ import { is256Color } from '../CharAtlasUtils'; -import { INVERTED_DEFAULT_COLOR } from 'browser/renderer/shared/Constants'; -import { IRenderDimensions } from 'browser/renderer/shared/Types'; -import { ICoreBrowserService, IThemeService } from 'browser/services/Services'; -import { ILinkifier2, ILinkifierEvent } from 'browser/Types'; -import { IOptionsService } from 'common/services/Services'; +import { INVERTED_DEFAULT_COLOR } from '../../../../src/browser/renderer/shared/Constants'; +import { IRenderDimensions } from '../../../../src/browser/renderer/shared/Types'; +import { ICoreBrowserService, IThemeService } from '../../../../src/browser/services/Services'; +import { ILinkifier2, ILinkifierEvent } from '../../../../src/browser/Types'; +import { IOptionsService } from '../../../../src/common/services/Services'; import { Terminal } from '@xterm/xterm'; import { BaseRenderLayer } from './BaseRenderLayer'; diff --git a/addons/addon-webgl/src/renderLayer/Types.ts b/addons/addon-webgl/src/renderLayer/Types.ts index feeceb145..74cd5e27b 100644 --- a/addons/addon-webgl/src/renderLayer/Types.ts +++ b/addons/addon-webgl/src/renderLayer/Types.ts @@ -4,7 +4,7 @@ */ import { IDisposable, Terminal } from '@xterm/xterm'; -import { IRenderDimensions } from 'browser/renderer/shared/Types'; +import { IRenderDimensions } from '../../../../src/browser/renderer/shared/Types'; export interface IRenderLayer extends IDisposable { /** diff --git a/addons/addon-webgl/src/tsconfig.json b/addons/addon-webgl/src/tsconfig.json index 7035daa86..99154a1ab 100644 --- a/addons/addon-webgl/src/tsconfig.json +++ b/addons/addon-webgl/src/tsconfig.json @@ -11,17 +11,8 @@ "sourceMap": true, "removeComments": true, "paths": { - "common/*": [ - "../../../src/common/*" - ], - "browser/*": [ - "../../../src/browser/*" - ], "@xterm/addon-webgl": [ "../typings/addon-webgl.d.ts" - ], - "*": [ - "./*" ] }, "strict": true, diff --git a/addons/addon-webgl/test/tsconfig.json b/addons/addon-webgl/test/tsconfig.json index 73439ddc1..3f3ca3dbc 100644 --- a/addons/addon-webgl/test/tsconfig.json +++ b/addons/addon-webgl/test/tsconfig.json @@ -10,12 +10,6 @@ "sourceMap": true, "removeComments": true, "paths": { - "common/*": [ - "../../../src/common/*" - ], - "browser/*": [ - "../../../src/browser/*" - ], "*": [ "./*" ] diff --git a/addons/addon-webgl/webpack.config.js b/addons/addon-webgl/webpack.config.js index 2eab992e7..81e2dc3a8 100644 --- a/addons/addon-webgl/webpack.config.js +++ b/addons/addon-webgl/webpack.config.js @@ -24,11 +24,6 @@ module.exports = { resolve: { modules: ['./node_modules'], extensions: [ '.js' ], - alias: { - common: path.resolve('../../out/common'), - browser: path.resolve('../../out/browser'), - vs: path.resolve('../../out/vs') - } }, output: { filename: mainFile, diff --git a/bin/test_unit.js b/bin/test_unit.js index 7ec61a814..e7270e6b1 100644 --- a/bin/test_unit.js +++ b/bin/test_unit.js @@ -8,10 +8,6 @@ const path = require('path'); const COVERAGE_LINES_THRESHOLD = 40; -// Add `out` to the NODE_PATH so absolute paths can be resolved. -const env = { ...process.env }; -env.NODE_PATH = path.resolve(__dirname, '../out-esbuild'); - let testFiles = ['**/out-esbuild/**/*.test.js']; let flagArgs = []; @@ -46,7 +42,7 @@ if (checkCoverage) { args, { cwd: path.resolve(__dirname, '..'), - env, + env: process.env, shell: true, stdio: 'inherit' } @@ -59,7 +55,7 @@ const run = cp.spawnSync( [...testFiles, ...flagArgs], { cwd: path.resolve(__dirname, '..'), - env, + env: process.env, shell: true, stdio: 'inherit' } diff --git a/demo/client/tsconfig.json b/demo/client/tsconfig.json index 8490ceb3f..de1ba6eb9 100644 --- a/demo/client/tsconfig.json +++ b/demo/client/tsconfig.json @@ -2,26 +2,54 @@ "compilerOptions": { "module": "commonjs", "target": "es2021", - "types": ["node"], + "types": [ + "node" + ], "outDir": "../out-demo/client", "rootDir": ".", "sourceMap": true, "strict": true, "skipLibCheck": true, "paths": { - "@xterm/addon-attach": ["../../addons/addon-attach"], - "@xterm/addon-clipboard": ["../../addons/addon-clipboard"], - "@xterm/addon-fit": ["../../addons/addon-fit"], - "@xterm/addon-image": ["../../addons/addon-image"], - "@xterm/addon-progress": ["../../addons/addon-progress"], - "@xterm/addon-search": ["../../addons/addon-search"], - "@xterm/addon-serialize": ["../../addons/addon-serialize"], - "@xterm/addon-web-fonts": ["../../addons/addon-web-fonts"], - "@xterm/addon-web-links": ["../../addons/addon-web-links"], - "@xterm/addon-webgl": ["../../addons/addon-webgl"], - "@xterm/addon-unicode11": ["../../addons/addon-unicode11"], - "@xterm/addon-unicode-graphemes": ["../../addons/addon-unicode-graphemes"], - "@xterm/addon-ligatures": ["../../addons/addon-ligatures"], + "@xterm/addon-attach": [ + "../../addons/addon-attach" + ], + "@xterm/addon-clipboard": [ + "../../addons/addon-clipboard" + ], + "@xterm/addon-fit": [ + "../../addons/addon-fit" + ], + "@xterm/addon-image": [ + "../../addons/addon-image" + ], + "@xterm/addon-progress": [ + "../../addons/addon-progress" + ], + "@xterm/addon-search": [ + "../../addons/addon-search" + ], + "@xterm/addon-serialize": [ + "../../addons/addon-serialize" + ], + "@xterm/addon-web-fonts": [ + "../../addons/addon-web-fonts" + ], + "@xterm/addon-web-links": [ + "../../addons/addon-web-links" + ], + "@xterm/addon-webgl": [ + "../../addons/addon-webgl" + ], + "@xterm/addon-unicode11": [ + "../../addons/addon-unicode11" + ], + "@xterm/addon-unicode-graphemes": [ + "../../addons/addon-unicode-graphemes" + ], + "@xterm/addon-ligatures": [ + "../../addons/addon-ligatures" + ], "*": ["./*"] } }, diff --git a/package.json b/package.json index 66600b5cd..ae4e9fb87 100644 --- a/package.json +++ b/package.json @@ -61,9 +61,9 @@ "test-integration-firefox": "node ./bin/test_integration.js --workers=75% \"--project=FirefoxStable\"", "test-integration-webkit": "node ./bin/test_integration.js --workers=75% \"--project=WebKit\"", "test-integration-debug": "node ./bin/test_integration.js --workers=1 --headed --timeout=30000", - "benchmark": "NODE_PATH=./out xterm-benchmark -r 5 -c test/benchmark/benchmark.json", - "benchmark-baseline": "NODE_PATH=./out xterm-benchmark -r 5 -c test/benchmark/benchmark.json --baseline out-test/benchmark/*benchmark.js", - "benchmark-eval": "NODE_PATH=./out xterm-benchmark -r 5 -c test/benchmark/benchmark.json --eval out-test/benchmark/*benchmark.js", + "benchmark": "xterm-benchmark -r 5 -c test/benchmark/benchmark.json", + "benchmark-baseline": "xterm-benchmark -r 5 -c test/benchmark/benchmark.json --baseline out-test/benchmark/*benchmark.js", + "benchmark-eval": "xterm-benchmark -r 5 -c test/benchmark/benchmark.json --eval out-test/benchmark/*benchmark.js", "clean": "rm -rf lib out addons/*/lib addons/*/out", "vtfeatures": "node bin/extract_vtfeatures.js src/*/*.ts src/*/*/*.ts src/*.ts addons/**/src/*.ts", "prepackage": "npm run build", diff --git a/src/browser/AccessibilityManager.ts b/src/browser/AccessibilityManager.ts index 6fc421337..04b969afe 100644 --- a/src/browser/AccessibilityManager.ts +++ b/src/browser/AccessibilityManager.ts @@ -3,14 +3,14 @@ * @license MIT */ -import * as Strings from 'browser/LocalizableStrings'; -import { ITerminal, IRenderDebouncer } from 'browser/Types'; -import { TimeBasedDebouncer } from 'browser/TimeBasedDebouncer'; -import { Disposable, toDisposable } from 'common/Lifecycle'; -import { ICoreBrowserService, IRenderService } from 'browser/services/Services'; -import { IBuffer } from 'common/buffer/Types'; -import { IInstantiationService } from 'common/services/Services'; -import { addDisposableListener } from 'browser/Dom'; +import * as Strings from './LocalizableStrings'; +import { ITerminal, IRenderDebouncer } from './Types'; +import { TimeBasedDebouncer } from './TimeBasedDebouncer'; +import { Disposable, toDisposable } from '../common/Lifecycle'; +import { ICoreBrowserService, IRenderService } from './services/Services'; +import { IBuffer } from '../common/buffer/Types'; +import { IInstantiationService } from '../common/services/Services'; +import { addDisposableListener } from './Dom'; const enum Constants { MAX_ROWS_TO_READ = 20 diff --git a/src/browser/Clipboard.test.ts b/src/browser/Clipboard.test.ts index 2028504ec..cd61e4b8d 100644 --- a/src/browser/Clipboard.test.ts +++ b/src/browser/Clipboard.test.ts @@ -4,7 +4,7 @@ */ import { assert } from 'chai'; -import * as Clipboard from 'browser/Clipboard'; +import * as Clipboard from './Clipboard'; describe('evaluatePastedTextProcessing', () => { it('should replace carriage return and/or line feed with carriage return', () => { diff --git a/src/browser/Clipboard.ts b/src/browser/Clipboard.ts index aaf8a48e4..3a7ae14ab 100644 --- a/src/browser/Clipboard.ts +++ b/src/browser/Clipboard.ts @@ -3,8 +3,8 @@ * @license MIT */ -import { ISelectionService } from 'browser/services/Services'; -import { ICoreService, IOptionsService } from 'common/services/Services'; +import { ISelectionService } from './services/Services'; +import { ICoreService, IOptionsService } from '../common/services/Services'; /** * Prepares text to be pasted into the terminal by normalizing the line endings diff --git a/src/browser/ColorContrastCache.test.ts b/src/browser/ColorContrastCache.test.ts index 17e5df383..f3d437ee8 100644 --- a/src/browser/ColorContrastCache.test.ts +++ b/src/browser/ColorContrastCache.test.ts @@ -4,7 +4,7 @@ */ import { assert } from 'chai'; -import { ColorContrastCache } from 'browser/ColorContrastCache'; +import { ColorContrastCache } from './ColorContrastCache'; describe('ColorContrastCache', () => { let cache: ColorContrastCache; diff --git a/src/browser/ColorContrastCache.ts b/src/browser/ColorContrastCache.ts index 0c60e8db4..fdcd9d133 100644 --- a/src/browser/ColorContrastCache.ts +++ b/src/browser/ColorContrastCache.ts @@ -3,9 +3,9 @@ * @license MIT */ -import { IColorContrastCache } from 'browser/Types'; -import { IColor } from 'common/Types'; -import { TwoKeyMap } from 'common/MultiKeyMap'; +import { IColorContrastCache } from './Types'; +import { IColor } from '../common/Types'; +import { TwoKeyMap } from '../common/MultiKeyMap'; export class ColorContrastCache implements IColorContrastCache { private _color: TwoKeyMap = new TwoKeyMap(); diff --git a/src/browser/CoreBrowserTerminal.ts b/src/browser/CoreBrowserTerminal.ts index a9461581e..f7e20b914 100644 --- a/src/browser/CoreBrowserTerminal.ts +++ b/src/browser/CoreBrowserTerminal.ts @@ -22,43 +22,43 @@ */ import { IDecoration, IDecorationOptions, IDisposable, ILinkProvider, IMarker, IRenderDimensions as IRenderDimensionsApi } from '@xterm/xterm'; -import { copyHandler, handlePasteEvent, moveTextAreaUnderMouseCursor, paste, rightClickHandler } from 'browser/Clipboard'; -import * as Strings from 'browser/LocalizableStrings'; -import { OscLinkProvider } from 'browser/OscLinkProvider'; -import { CharacterJoinerHandler, CustomKeyEventHandler, CustomWheelEventHandler, IBrowser, IBufferRange, ICompositionHelper, ILinkifier2, ITerminal } from 'browser/Types'; -import { Viewport } from 'browser/Viewport'; -import { BufferDecorationRenderer } from 'browser/decorations/BufferDecorationRenderer'; -import { OverviewRulerRenderer } from 'browser/decorations/OverviewRulerRenderer'; -import { CompositionHelper } from 'browser/input/CompositionHelper'; -import { DomRenderer } from 'browser/renderer/dom/DomRenderer'; -import { IRenderer } from 'browser/renderer/shared/Types'; -import { CharSizeService } from 'browser/services/CharSizeService'; -import { CharacterJoinerService } from 'browser/services/CharacterJoinerService'; -import { CoreBrowserService } from 'browser/services/CoreBrowserService'; -import { LinkProviderService } from 'browser/services/LinkProviderService'; -import { MouseCoordsService } from 'browser/services/MouseCoordsService'; -import { MouseEventCssClasses, MouseService } from 'browser/services/MouseService'; -import { RenderService } from 'browser/services/RenderService'; -import { SelectionService } from 'browser/services/SelectionService'; -import { ICharSizeService, ICharacterJoinerService, ICoreBrowserService, IKeyboardService, ILinkProviderService, IMouseCoordsService, IMouseService, IRenderService, ISelectionService, IThemeService } from 'browser/services/Services'; -import { ThemeService } from 'browser/services/ThemeService'; -import { KeyboardService } from 'browser/services/KeyboardService'; -import { channels, color, rgb } from 'common/Color'; -import { CoreTerminal } from 'common/CoreTerminal'; -import * as Browser from 'common/Platform'; -import { ColorRequestType, IColorEvent, ITerminalOptions, KeyboardResultType, SpecialColorIndex } from 'common/Types'; -import { DEFAULT_ATTR_DATA } from 'common/buffer/BufferLine'; -import { IBuffer } from 'common/buffer/Types'; -import { C0, C1ESCAPED } from 'common/data/EscapeSequences'; -import { toRgbString } from 'common/input/XParseColor'; -import { DecorationService } from 'common/services/DecorationService'; -import { IDecorationService } from 'common/services/Services'; +import { copyHandler, handlePasteEvent, moveTextAreaUnderMouseCursor, paste, rightClickHandler } from './Clipboard'; +import * as Strings from './LocalizableStrings'; +import { OscLinkProvider } from './OscLinkProvider'; +import { CharacterJoinerHandler, CustomKeyEventHandler, CustomWheelEventHandler, IBrowser, IBufferRange, ICompositionHelper, ILinkifier2, ITerminal } from './Types'; +import { Viewport } from './Viewport'; +import { BufferDecorationRenderer } from './decorations/BufferDecorationRenderer'; +import { OverviewRulerRenderer } from './decorations/OverviewRulerRenderer'; +import { CompositionHelper } from './input/CompositionHelper'; +import { DomRenderer } from './renderer/dom/DomRenderer'; +import { IRenderer } from './renderer/shared/Types'; +import { CharSizeService } from './services/CharSizeService'; +import { CharacterJoinerService } from './services/CharacterJoinerService'; +import { CoreBrowserService } from './services/CoreBrowserService'; +import { LinkProviderService } from './services/LinkProviderService'; +import { MouseCoordsService } from './services/MouseCoordsService'; +import { MouseEventCssClasses, MouseService } from './services/MouseService'; +import { RenderService } from './services/RenderService'; +import { SelectionService } from './services/SelectionService'; +import { ICharSizeService, ICharacterJoinerService, ICoreBrowserService, IKeyboardService, ILinkProviderService, IMouseCoordsService, IMouseService, IRenderService, ISelectionService, IThemeService } from './services/Services'; +import { ThemeService } from './services/ThemeService'; +import { KeyboardService } from './services/KeyboardService'; +import { channels, color, rgb } from '../common/Color'; +import { CoreTerminal } from '../common/CoreTerminal'; +import * as Browser from '../common/Platform'; +import { ColorRequestType, IColorEvent, ITerminalOptions, KeyboardResultType, SpecialColorIndex } from '../common/Types'; +import { DEFAULT_ATTR_DATA } from '../common/buffer/BufferLine'; +import { IBuffer } from '../common/buffer/Types'; +import { C0, C1ESCAPED } from '../common/data/EscapeSequences'; +import { toRgbString } from '../common/input/XParseColor'; +import { DecorationService } from '../common/services/DecorationService'; +import { IDecorationService } from '../common/services/Services'; import { WindowsOptionsReportType } from '../common/InputHandler'; import { AccessibilityManager } from './AccessibilityManager'; import { Linkifier } from './Linkifier'; -import { Emitter, EventUtils, type IEvent } from 'common/Event'; -import { addDisposableListener } from 'browser/Dom'; -import { MutableDisposable, toDisposable } from 'common/Lifecycle'; +import { Emitter, EventUtils, type IEvent } from '../common/Event'; +import { addDisposableListener } from './Dom'; +import { MutableDisposable, toDisposable } from '../common/Lifecycle'; export class CoreBrowserTerminal extends CoreTerminal implements ITerminal { public textarea: HTMLTextAreaElement | undefined; diff --git a/src/browser/Dom.ts b/src/browser/Dom.ts index 56e7c0417..4d174270b 100644 --- a/src/browser/Dom.ts +++ b/src/browser/Dom.ts @@ -5,8 +5,8 @@ * Minimal DOM helpers for xterm.js browser code. */ -import { IntervalTimer } from 'common/Async'; -import { IDisposable } from 'common/Lifecycle'; +import { IntervalTimer } from '../common/Async'; +import { IDisposable } from '../common/Lifecycle'; export function getWindow(e: Node | UIEvent | undefined | null): Window { const candidateNode = e as Node | undefined | null; diff --git a/src/browser/Linkifier.test.ts b/src/browser/Linkifier.test.ts index 685c404f4..5f8b07531 100644 --- a/src/browser/Linkifier.test.ts +++ b/src/browser/Linkifier.test.ts @@ -4,11 +4,11 @@ */ import { assert } from 'chai'; -import { IBufferService } from 'common/services/Services'; +import { IBufferService } from '../common/services/Services'; import { Linkifier } from './Linkifier'; -import { MockBufferService } from 'common/TestUtils.test'; -import { ILink } from 'browser/Types'; -import { LinkProviderService } from 'browser/services/LinkProviderService'; +import { MockBufferService } from '../common/TestUtils.test'; +import { ILink } from './Types'; +import { LinkProviderService } from './services/LinkProviderService'; import jsdom = require('jsdom'); class TestLinkifier2 extends Linkifier { diff --git a/src/browser/Linkifier.ts b/src/browser/Linkifier.ts index 31c91daee..9581fb299 100644 --- a/src/browser/Linkifier.ts +++ b/src/browser/Linkifier.ts @@ -3,13 +3,13 @@ * @license MIT */ -import { IBufferCellPosition, ILink, ILinkDecorations, ILinkWithState, ILinkifier2, ILinkifierEvent } from 'browser/Types'; -import { Disposable, dispose, toDisposable } from 'common/Lifecycle'; -import { IDisposable } from 'common/Types'; -import { IBufferService } from 'common/services/Services'; +import { IBufferCellPosition, ILink, ILinkDecorations, ILinkWithState, ILinkifier2, ILinkifierEvent } from './Types'; +import { Disposable, dispose, toDisposable } from '../common/Lifecycle'; +import { IDisposable } from '../common/Types'; +import { IBufferService } from '../common/services/Services'; import { ILinkProviderService, IMouseCoordsService, IRenderService } from './services/Services'; -import { Emitter } from 'common/Event'; -import { addDisposableListener } from 'browser/Dom'; +import { Emitter } from '../common/Event'; +import { addDisposableListener } from './Dom'; export class Linkifier extends Disposable implements ILinkifier2 { public get currentLink(): ILinkWithState | undefined { return this._currentLink; } diff --git a/src/browser/OscLinkProvider.test.ts b/src/browser/OscLinkProvider.test.ts index 9e844cd16..2693f9ddd 100644 --- a/src/browser/OscLinkProvider.test.ts +++ b/src/browser/OscLinkProvider.test.ts @@ -4,11 +4,11 @@ */ import { assert } from 'chai'; -import { OscLinkProvider } from 'browser/OscLinkProvider'; -import { ILink } from 'browser/Types'; -import { createCellData, MockBufferService, MockOptionsService } from 'common/TestUtils.test'; -import { IBufferService, IOscLinkService } from 'common/services/Services'; -import { IBufferLine, IOscLinkData } from 'common/Types'; +import { OscLinkProvider } from './OscLinkProvider'; +import { ILink } from './Types'; +import { createCellData, MockBufferService, MockOptionsService } from '../common/TestUtils.test'; +import { IBufferService, IOscLinkService } from '../common/services/Services'; +import { IBufferLine, IOscLinkData } from '../common/Types'; class TestOscLinkService implements IOscLinkService { public serviceBrand: any; diff --git a/src/browser/OscLinkProvider.ts b/src/browser/OscLinkProvider.ts index d01a20b35..d52d68c08 100644 --- a/src/browser/OscLinkProvider.ts +++ b/src/browser/OscLinkProvider.ts @@ -3,11 +3,11 @@ * @license MIT */ -import { IBufferRange, ILink } from 'browser/Types'; -import { ILinkProvider } from 'browser/services/Services'; -import { CellData } from 'common/buffer/CellData'; -import { IBufferLine } from 'common/Types'; -import { IBufferService, IOptionsService, IOscLinkService } from 'common/services/Services'; +import { IBufferRange, ILink } from './Types'; +import { ILinkProvider } from './services/Services'; +import { CellData } from '../common/buffer/CellData'; +import { IBufferLine } from '../common/Types'; +import { IBufferService, IOptionsService, IOscLinkService } from '../common/services/Services'; export class OscLinkProvider implements ILinkProvider { private readonly _workCell = new CellData(); diff --git a/src/browser/RenderDebouncer.ts b/src/browser/RenderDebouncer.ts index c7ddb6cec..f6ea59bf6 100644 --- a/src/browser/RenderDebouncer.ts +++ b/src/browser/RenderDebouncer.ts @@ -3,8 +3,8 @@ * @license MIT */ -import { IRenderDebouncerWithCallback } from 'browser/Types'; -import { ICoreBrowserService } from 'browser/services/Services'; +import { IRenderDebouncerWithCallback } from './Types'; +import { ICoreBrowserService } from './services/Services'; /** * Debounces calls to render terminal rows using animation frames. diff --git a/src/browser/Terminal.test.ts b/src/browser/Terminal.test.ts index d359fa28c..38165b84f 100644 --- a/src/browser/Terminal.test.ts +++ b/src/browser/Terminal.test.ts @@ -3,13 +3,13 @@ * @license MIT */ -import { MockCompositionHelper, MockRenderer, MockViewport, TestTerminal } from 'browser/TestUtils.test'; -import type { IBrowser } from 'browser/Types'; +import { MockCompositionHelper, MockRenderer, MockViewport, TestTerminal } from './TestUtils.test'; +import type { IBrowser } from './Types'; import { assert } from 'chai'; -import { DEFAULT_ATTR_DATA } from 'common/buffer/BufferLine'; -import { CellData } from 'common/buffer/CellData'; -import { MockUnicodeService, createCellData } from 'common/TestUtils.test'; -import { IMarker } from 'common/Types'; +import { DEFAULT_ATTR_DATA } from '../common/buffer/BufferLine'; +import { CellData } from '../common/buffer/CellData'; +import { MockUnicodeService, createCellData } from '../common/TestUtils.test'; +import { IMarker } from '../common/Types'; const INIT_COLS = 80; const INIT_ROWS = 24; diff --git a/src/browser/Terminal2.test.ts b/src/browser/Terminal2.test.ts index 270b2e871..8274a47e5 100644 --- a/src/browser/Terminal2.test.ts +++ b/src/browser/Terminal2.test.ts @@ -7,7 +7,7 @@ import * as path from 'path'; import * as os from 'os'; import * as fs from 'fs'; import * as pty from 'node-pty'; -import { CoreBrowserTerminal } from 'browser/CoreBrowserTerminal'; +import { CoreBrowserTerminal } from './CoreBrowserTerminal'; import { IDisposable } from '@xterm/xterm'; // all test files expect terminal in 80x25 diff --git a/src/browser/TestUtils.test.ts b/src/browser/TestUtils.test.ts index 65a18da72..ee5423eea 100644 --- a/src/browser/TestUtils.test.ts +++ b/src/browser/TestUtils.test.ts @@ -4,21 +4,21 @@ */ import { IDisposable, IMarker, ILinkProvider, IDecorationOptions, IDecoration, IRenderDimensions as IRenderDimensionsApi } from '@xterm/xterm'; -import { ICharacterJoinerService, ICharSizeService, ICoreBrowserService, IMouseService, IRenderService, ISelectionService, IThemeService } from 'browser/services/Services'; -import { IRenderDimensions, IRenderer, IRequestRedrawEvent } from 'browser/renderer/shared/Types'; -import { IColorSet, ITerminal, ILinkifier2, IBrowser, IViewport, ICompositionHelper, CharacterJoinerHandler, IBufferRange, ReadonlyColorSet, IBufferElementProvider } from 'browser/Types'; -import { IBuffer, IBufferSet } from 'common/buffer/Types'; -import { IBufferLine, ICellData, IAttributeData, ICircularList, XtermListener, ICharset, ITerminalOptions, ColorIndex } from 'common/Types'; -import { Buffer } from 'common/buffer/Buffer'; -import * as Browser from 'common/Platform'; -import { CoreBrowserTerminal } from 'browser/CoreBrowserTerminal'; -import { IUnicodeService, IOptionsService, ICoreService, IMouseStateService } from 'common/services/Services'; -import { IFunctionIdentifier, IParams } from 'common/parser/Types'; -import { AttributeData } from 'common/buffer/AttributeData'; -import { ISelectionRedrawRequestEvent, ISelectionRequestScrollLinesEvent } from 'browser/selection/Types'; -import { css } from 'common/Color'; -import { createRenderDimensions } from 'browser/renderer/shared/RendererUtils'; -import { Emitter, type IEvent } from 'common/Event'; +import { ICharacterJoinerService, ICharSizeService, ICoreBrowserService, IMouseService, IRenderService, ISelectionService, IThemeService } from './services/Services'; +import { IRenderDimensions, IRenderer, IRequestRedrawEvent } from './renderer/shared/Types'; +import { IColorSet, ITerminal, ILinkifier2, IBrowser, IViewport, ICompositionHelper, CharacterJoinerHandler, IBufferRange, ReadonlyColorSet, IBufferElementProvider } from './Types'; +import { IBuffer, IBufferSet } from '../common/buffer/Types'; +import { IBufferLine, ICellData, IAttributeData, ICircularList, XtermListener, ICharset, ITerminalOptions, ColorIndex } from '../common/Types'; +import { Buffer } from '../common/buffer/Buffer'; +import * as Browser from '../common/Platform'; +import { CoreBrowserTerminal } from './CoreBrowserTerminal'; +import { IUnicodeService, IOptionsService, ICoreService, IMouseStateService } from '../common/services/Services'; +import { IFunctionIdentifier, IParams } from '../common/parser/Types'; +import { AttributeData } from '../common/buffer/AttributeData'; +import { ISelectionRedrawRequestEvent, ISelectionRequestScrollLinesEvent } from './selection/Types'; +import { css } from '../common/Color'; +import { createRenderDimensions } from './renderer/shared/RendererUtils'; +import { Emitter, type IEvent } from '../common/Event'; export class TestTerminal extends CoreBrowserTerminal { public get curAttrData(): IAttributeData { return (this as any)._inputHandler._curAttrData; } diff --git a/src/browser/TimeBasedDebouncer.ts b/src/browser/TimeBasedDebouncer.ts index 997312901..0860e7927 100644 --- a/src/browser/TimeBasedDebouncer.ts +++ b/src/browser/TimeBasedDebouncer.ts @@ -5,7 +5,7 @@ const RENDER_DEBOUNCE_THRESHOLD_MS = 1000; // 1 Second -import { IRenderDebouncer } from 'browser/Types'; +import { IRenderDebouncer } from './Types'; /** * Debounces calls to update screen readers to update at most once configurable interval of time. diff --git a/src/browser/Types.ts b/src/browser/Types.ts index fa08de2e3..126857e17 100644 --- a/src/browser/Types.ts +++ b/src/browser/Types.ts @@ -3,11 +3,11 @@ * @license MIT */ -import { CharData, IColor, ICoreTerminal, ITerminalOptions } from 'common/Types'; -import { IBuffer } from 'common/buffer/Types'; +import { CharData, IColor, ICoreTerminal, ITerminalOptions } from '../common/Types'; +import { IBuffer } from '../common/buffer/Types'; import { IDisposable, IRenderDimensions as IRenderDimensionsApi, Terminal as ITerminalApi } from '@xterm/xterm'; -import { channels, css } from 'common/Color'; -import type { IEvent } from 'common/Event'; +import { channels, css } from '../common/Color'; +import type { IEvent } from '../common/Event'; /** * A portion of the public API that are implemented identially internally and simply passed through. diff --git a/src/browser/Viewport.ts b/src/browser/Viewport.ts index 3b6ae8301..18c275ccb 100644 --- a/src/browser/Viewport.ts +++ b/src/browser/Viewport.ts @@ -3,16 +3,16 @@ * @license MIT */ -import { ICoreBrowserService, IRenderService, IThemeService } from 'browser/services/Services'; -import { ViewportConstants } from 'browser/shared/Constants'; -import { Disposable, toDisposable } from 'common/Lifecycle'; -import { IBufferService, ICoreService, IMouseStateService, IOptionsService } from 'common/services/Services'; -import { CoreMouseEventType } from 'common/Types'; -import { scheduleAtNextAnimationFrame } from 'browser/Dom'; -import { SmoothScrollableElement } from 'browser/scrollable/scrollableElement'; -import type { IScrollableElementChangeOptions } from 'browser/scrollable/scrollableElementOptions'; -import { Emitter, EventUtils } from 'common/Event'; -import { Scrollable, ScrollbarVisibility, type IScrollEvent } from 'browser/scrollable/scrollable'; +import { ICoreBrowserService, IRenderService, IThemeService } from './services/Services'; +import { ViewportConstants } from './shared/Constants'; +import { Disposable, toDisposable } from '../common/Lifecycle'; +import { IBufferService, ICoreService, IMouseStateService, IOptionsService } from '../common/services/Services'; +import { CoreMouseEventType } from '../common/Types'; +import { scheduleAtNextAnimationFrame } from './Dom'; +import { SmoothScrollableElement } from './scrollable/scrollableElement'; +import type { IScrollableElementChangeOptions } from './scrollable/scrollableElementOptions'; +import { Emitter, EventUtils } from '../common/Event'; +import { Scrollable, ScrollbarVisibility, type IScrollEvent } from './scrollable/scrollable'; export class Viewport extends Disposable { diff --git a/src/browser/decorations/BufferDecorationRenderer.ts b/src/browser/decorations/BufferDecorationRenderer.ts index e374af260..fd356808e 100644 --- a/src/browser/decorations/BufferDecorationRenderer.ts +++ b/src/browser/decorations/BufferDecorationRenderer.ts @@ -3,9 +3,9 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { ICoreBrowserService, IRenderService } from 'browser/services/Services'; -import { Disposable, toDisposable } from 'common/Lifecycle'; -import { IBufferService, IDecorationService, IInternalDecoration } from 'common/services/Services'; +import { ICoreBrowserService, IRenderService } from '../services/Services'; +import { Disposable, toDisposable } from '../../common/Lifecycle'; +import { IBufferService, IDecorationService, IInternalDecoration } from '../../common/services/Services'; export class BufferDecorationRenderer extends Disposable { private readonly _container: HTMLElement; diff --git a/src/browser/decorations/ColorZoneStore.test.ts b/src/browser/decorations/ColorZoneStore.test.ts index 4759e3c8b..360ad6570 100644 --- a/src/browser/decorations/ColorZoneStore.test.ts +++ b/src/browser/decorations/ColorZoneStore.test.ts @@ -4,7 +4,7 @@ */ import { assert } from 'chai'; -import { ColorZoneStore } from 'browser/decorations/ColorZoneStore'; +import { ColorZoneStore } from './ColorZoneStore'; const optionsRedFull = { overviewRulerOptions: { diff --git a/src/browser/decorations/ColorZoneStore.ts b/src/browser/decorations/ColorZoneStore.ts index d066bedb8..b63c865f8 100644 --- a/src/browser/decorations/ColorZoneStore.ts +++ b/src/browser/decorations/ColorZoneStore.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { IInternalDecoration } from 'common/services/Services'; +import { IInternalDecoration } from '../../common/services/Services'; export interface IColorZoneStore { readonly zones: IColorZone[]; diff --git a/src/browser/decorations/OverviewRulerRenderer.ts b/src/browser/decorations/OverviewRulerRenderer.ts index b28b25965..2ec441bad 100644 --- a/src/browser/decorations/OverviewRulerRenderer.ts +++ b/src/browser/decorations/OverviewRulerRenderer.ts @@ -3,10 +3,10 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { ColorZoneStore, IColorZone, IColorZoneStore } from 'browser/decorations/ColorZoneStore'; -import { ICoreBrowserService, IRenderService, IThemeService } from 'browser/services/Services'; -import { Disposable, toDisposable } from 'common/Lifecycle'; -import { IBufferService, IDecorationService, IOptionsService } from 'common/services/Services'; +import { ColorZoneStore, IColorZone, IColorZoneStore } from './ColorZoneStore'; +import { ICoreBrowserService, IRenderService, IThemeService } from '../services/Services'; +import { Disposable, toDisposable } from '../../common/Lifecycle'; +import { IBufferService, IDecorationService, IOptionsService } from '../../common/services/Services'; const enum Constants { OVERVIEW_RULER_BORDER_WIDTH = 1 diff --git a/src/browser/input/CompositionHelper.test.ts b/src/browser/input/CompositionHelper.test.ts index 94b5841af..5a1e6c38c 100644 --- a/src/browser/input/CompositionHelper.test.ts +++ b/src/browser/input/CompositionHelper.test.ts @@ -4,9 +4,9 @@ */ import { assert } from 'chai'; -import { CompositionHelper } from 'browser/input/CompositionHelper'; -import { MockRenderService } from 'browser/TestUtils.test'; -import { MockCoreService, MockBufferService, MockOptionsService } from 'common/TestUtils.test'; +import { CompositionHelper } from './CompositionHelper'; +import { MockRenderService } from '../TestUtils.test'; +import { MockCoreService, MockBufferService, MockOptionsService } from '../../common/TestUtils.test'; describe('CompositionHelper', () => { let compositionHelper: CompositionHelper; diff --git a/src/browser/input/CompositionHelper.ts b/src/browser/input/CompositionHelper.ts index 283874139..c9ec396ab 100644 --- a/src/browser/input/CompositionHelper.ts +++ b/src/browser/input/CompositionHelper.ts @@ -3,9 +3,9 @@ * @license MIT */ -import { IRenderService } from 'browser/services/Services'; -import { IBufferService, ICoreService, IOptionsService } from 'common/services/Services'; -import { C0 } from 'common/data/EscapeSequences'; +import { IRenderService } from '../services/Services'; +import { IBufferService, ICoreService, IOptionsService } from '../../common/services/Services'; +import { C0 } from '../../common/data/EscapeSequences'; interface IPosition { start: number; diff --git a/src/browser/input/Mouse.test.ts b/src/browser/input/Mouse.test.ts index 002603612..8333d13f8 100644 --- a/src/browser/input/Mouse.test.ts +++ b/src/browser/input/Mouse.test.ts @@ -5,7 +5,7 @@ import jsdom = require('jsdom'); import { assert } from 'chai'; -import { getCoords } from 'browser/input/Mouse'; +import { getCoords } from './Mouse'; const CHAR_WIDTH = 10; const CHAR_HEIGHT = 20; diff --git a/src/browser/input/MoveToCell.test.ts b/src/browser/input/MoveToCell.test.ts index 61e5f90b9..8200fa24e 100644 --- a/src/browser/input/MoveToCell.test.ts +++ b/src/browser/input/MoveToCell.test.ts @@ -4,8 +4,8 @@ */ import { assert } from 'chai'; -import { IBufferService } from 'common/services/Services'; -import { MockBufferService } from 'common/TestUtils.test'; +import { IBufferService } from '../../common/services/Services'; +import { MockBufferService } from '../../common/TestUtils.test'; import { moveToCellSequence } from './MoveToCell'; describe('MoveToCell', () => { diff --git a/src/browser/input/MoveToCell.ts b/src/browser/input/MoveToCell.ts index ce4c59224..b5ddc7ca2 100644 --- a/src/browser/input/MoveToCell.ts +++ b/src/browser/input/MoveToCell.ts @@ -3,8 +3,8 @@ * @license MIT */ -import { C0 } from 'common/data/EscapeSequences'; -import { IBufferService } from 'common/services/Services'; +import { C0 } from '../../common/data/EscapeSequences'; +import { IBufferService } from '../../common/services/Services'; const enum Direction { UP = 'A', diff --git a/src/browser/public/Terminal.ts b/src/browser/public/Terminal.ts index 75aada048..69ab09bf1 100644 --- a/src/browser/public/Terminal.ts +++ b/src/browser/public/Terminal.ts @@ -3,17 +3,17 @@ * @license MIT */ -import * as Strings from 'browser/LocalizableStrings'; -import { CoreBrowserTerminal as TerminalCore } from 'browser/CoreBrowserTerminal'; -import { IBufferRange, ITerminal } from 'browser/Types'; -import { Disposable } from 'common/Lifecycle'; -import { ITerminalOptions } from 'common/Types'; -import { AddonManager } from 'common/public/AddonManager'; -import { BufferNamespaceApi } from 'common/public/BufferNamespaceApi'; -import { ParserApi } from 'common/public/ParserApi'; -import { UnicodeApi } from 'common/public/UnicodeApi'; +import * as Strings from '../LocalizableStrings'; +import { CoreBrowserTerminal as TerminalCore } from '../CoreBrowserTerminal'; +import { IBufferRange, ITerminal } from '../Types'; +import { Disposable } from '../../common/Lifecycle'; +import { ITerminalOptions } from '../../common/Types'; +import { AddonManager } from '../../common/public/AddonManager'; +import { BufferNamespaceApi } from '../../common/public/BufferNamespaceApi'; +import { ParserApi } from '../../common/public/ParserApi'; +import { UnicodeApi } from '../../common/public/UnicodeApi'; import { IBufferNamespace as IBufferNamespaceApi, IDecoration, IDecorationOptions, IDisposable, ILinkProvider, ILocalizableStrings, IMarker, IModes, IParser, IRenderDimensions, ITerminalAddon, Terminal as ITerminalApi, ITerminalInitOnlyOptions, IUnicodeHandling } from '@xterm/xterm'; -import type { IEvent } from 'common/Event'; +import type { IEvent } from '../../common/Event'; /** * The set of options that only have an effect when set in the Terminal constructor. diff --git a/src/browser/renderer/dom/DomRenderer.ts b/src/browser/renderer/dom/DomRenderer.ts index 6f873af7b..de08ac0ac 100644 --- a/src/browser/renderer/dom/DomRenderer.ts +++ b/src/browser/renderer/dom/DomRenderer.ts @@ -3,20 +3,20 @@ * @license MIT */ -import { DomRendererRowFactory, RowCss } from 'browser/renderer/dom/DomRendererRowFactory'; -import { WidthCache } from 'browser/renderer/dom/WidthCache'; -import { INVERTED_DEFAULT_COLOR, RendererConstants } from 'browser/renderer/shared/Constants'; -import { createRenderDimensions } from 'browser/renderer/shared/RendererUtils'; -import { createSelectionRenderModel } from 'browser/renderer/shared/SelectionRenderModel'; -import { TextBlinkStateManager } from 'browser/renderer/shared/TextBlinkStateManager'; -import { IRenderDimensions, IRenderer, IRequestRedrawEvent, ISelectionRenderModel } from 'browser/renderer/shared/Types'; -import { ICharSizeService, ICoreBrowserService, IThemeService } from 'browser/services/Services'; -import { ILinkifier2, ILinkifierEvent, ITerminal, ReadonlyColorSet } from 'browser/Types'; -import { color } from 'common/Color'; -import { Disposable, toDisposable } from 'common/Lifecycle'; -import { IBufferService, ICoreService, IInstantiationService, IOptionsService } from 'common/services/Services'; -import { Emitter } from 'common/Event'; -import { addDisposableListener } from 'browser/Dom'; +import { DomRendererRowFactory, RowCss } from './DomRendererRowFactory'; +import { WidthCache } from './WidthCache'; +import { INVERTED_DEFAULT_COLOR, RendererConstants } from '../shared/Constants'; +import { createRenderDimensions } from '../shared/RendererUtils'; +import { createSelectionRenderModel } from '../shared/SelectionRenderModel'; +import { TextBlinkStateManager } from '../shared/TextBlinkStateManager'; +import { IRenderDimensions, IRenderer, IRequestRedrawEvent, ISelectionRenderModel } from '../shared/Types'; +import { ICharSizeService, ICoreBrowserService, IThemeService } from '../../services/Services'; +import { ILinkifier2, ILinkifierEvent, ITerminal, ReadonlyColorSet } from '../../Types'; +import { color } from '../../../common/Color'; +import { Disposable, toDisposable } from '../../../common/Lifecycle'; +import { IBufferService, ICoreService, IInstantiationService, IOptionsService } from '../../../common/services/Services'; +import { Emitter } from '../../../common/Event'; +import { addDisposableListener } from '../../Dom'; const enum Constants { diff --git a/src/browser/renderer/dom/DomRendererRowFactory.test.ts b/src/browser/renderer/dom/DomRendererRowFactory.test.ts index 6ca84569a..732766ccc 100644 --- a/src/browser/renderer/dom/DomRendererRowFactory.test.ts +++ b/src/browser/renderer/dom/DomRendererRowFactory.test.ts @@ -5,15 +5,15 @@ import jsdom = require('jsdom'); import { assert } from 'chai'; -import { DomRendererRowFactory } from 'browser/renderer/dom/DomRendererRowFactory'; -import { NULL_CELL_CODE, NULL_CELL_WIDTH, NULL_CELL_CHAR, DEFAULT_ATTR, FgFlags, BgFlags, Attributes, UnderlineStyle } from 'common/buffer/Constants'; -import { BufferLine, DEFAULT_ATTR_DATA } from 'common/buffer/BufferLine'; -import { BufferLineStringCache } from 'common/buffer/BufferLineStringCache'; -import { IBufferLine } from 'common/Types'; -import { CellData } from 'common/buffer/CellData'; -import { MockCoreService, MockDecorationService, MockOptionsService, createCellData, NULL_CELL_DATA } from 'common/TestUtils.test'; -import { MockCharacterJoinerService, MockCoreBrowserService, MockThemeService } from 'browser/TestUtils.test'; -import { TestWidthCache } from 'browser/renderer/dom/WidthCache.test'; +import { DomRendererRowFactory } from './DomRendererRowFactory'; +import { NULL_CELL_CODE, NULL_CELL_WIDTH, NULL_CELL_CHAR, DEFAULT_ATTR, FgFlags, BgFlags, Attributes, UnderlineStyle } from '../../../common/buffer/Constants'; +import { BufferLine, DEFAULT_ATTR_DATA } from '../../../common/buffer/BufferLine'; +import { BufferLineStringCache } from '../../../common/buffer/BufferLineStringCache'; +import { IBufferLine } from '../../../common/Types'; +import { CellData } from '../../../common/buffer/CellData'; +import { MockCoreService, MockDecorationService, MockOptionsService, createCellData, NULL_CELL_DATA } from '../../../common/TestUtils.test'; +import { MockCharacterJoinerService, MockCoreBrowserService, MockThemeService } from '../../TestUtils.test'; +import { TestWidthCache } from './WidthCache.test'; const TEST_STRING_CACHE = new BufferLineStringCache(); diff --git a/src/browser/renderer/dom/DomRendererRowFactory.ts b/src/browser/renderer/dom/DomRendererRowFactory.ts index e5bf31139..7d2e8ed9b 100644 --- a/src/browser/renderer/dom/DomRendererRowFactory.ts +++ b/src/browser/renderer/dom/DomRendererRowFactory.ts @@ -3,18 +3,18 @@ * @license MIT */ -import { IBufferLine, ICellData, IColor } from 'common/Types'; -import { INVERTED_DEFAULT_COLOR } from 'browser/renderer/shared/Constants'; -import { WHITESPACE_CELL_CHAR, Attributes } from 'common/buffer/Constants'; -import { CellData } from 'common/buffer/CellData'; -import { ICoreService, IDecorationService, IOptionsService } from 'common/services/Services'; -import { channels, color } from 'common/Color'; -import { ICharacterJoinerService, ICoreBrowserService, IThemeService } from 'browser/services/Services'; -import { JoinedCellData } from 'browser/services/CharacterJoinerService'; -import { treatGlyphAsBackgroundColor } from 'browser/renderer/shared/RendererUtils'; -import { AttributeData } from 'common/buffer/AttributeData'; -import { WidthCache } from 'browser/renderer/dom/WidthCache'; -import { IColorContrastCache } from 'browser/Types'; +import { IBufferLine, ICellData, IColor } from '../../../common/Types'; +import { INVERTED_DEFAULT_COLOR } from '../shared/Constants'; +import { WHITESPACE_CELL_CHAR, Attributes } from '../../../common/buffer/Constants'; +import { CellData } from '../../../common/buffer/CellData'; +import { ICoreService, IDecorationService, IOptionsService } from '../../../common/services/Services'; +import { channels, color } from '../../../common/Color'; +import { ICharacterJoinerService, ICoreBrowserService, IThemeService } from '../../services/Services'; +import { JoinedCellData } from '../../services/CharacterJoinerService'; +import { treatGlyphAsBackgroundColor } from '../shared/RendererUtils'; +import { AttributeData } from '../../../common/buffer/AttributeData'; +import { WidthCache } from './WidthCache'; +import { IColorContrastCache } from '../../Types'; export const enum RowCss { diff --git a/src/browser/renderer/dom/WidthCache.test.ts b/src/browser/renderer/dom/WidthCache.test.ts index c1e511c94..f8bc5961a 100644 --- a/src/browser/renderer/dom/WidthCache.test.ts +++ b/src/browser/renderer/dom/WidthCache.test.ts @@ -4,7 +4,7 @@ */ import * as assert from 'assert'; -import { IWidthCacheFontVariantCanvas, WidthCache, WidthCacheSettings } from 'browser/renderer/dom/WidthCache'; +import { IWidthCacheFontVariantCanvas, WidthCache, WidthCacheSettings } from './WidthCache'; class MockWidthCacheFontVariantCanvas implements IWidthCacheFontVariantCanvas { diff --git a/src/browser/renderer/dom/WidthCache.ts b/src/browser/renderer/dom/WidthCache.ts index ddacfd6a6..d45938515 100644 --- a/src/browser/renderer/dom/WidthCache.ts +++ b/src/browser/renderer/dom/WidthCache.ts @@ -3,9 +3,9 @@ * @license MIT */ -import { throwIfFalsy } from 'browser/renderer/shared/RendererUtils'; -import { IDisposable } from 'common/Types'; -import { FontWeight } from 'common/services/Services'; +import { throwIfFalsy } from '../shared/RendererUtils'; +import { IDisposable } from '../../../common/Types'; +import { FontWeight } from '../../../common/services/Services'; export const enum WidthCacheSettings { diff --git a/src/browser/renderer/shared/RendererUtils.test.ts b/src/browser/renderer/shared/RendererUtils.test.ts index 4512cb6d9..4f4e843af 100644 --- a/src/browser/renderer/shared/RendererUtils.test.ts +++ b/src/browser/renderer/shared/RendererUtils.test.ts @@ -3,7 +3,7 @@ * @license MIT */ -import { computeNextVariantOffset } from 'browser/renderer/shared/RendererUtils'; +import { computeNextVariantOffset } from './RendererUtils'; import { assert } from 'chai'; describe('RendererUtils', () => { diff --git a/src/browser/renderer/shared/RendererUtils.ts b/src/browser/renderer/shared/RendererUtils.ts index 010643648..da8914abe 100644 --- a/src/browser/renderer/shared/RendererUtils.ts +++ b/src/browser/renderer/shared/RendererUtils.ts @@ -3,7 +3,7 @@ * @license MIT */ -import { IDimensions, IRenderDimensions } from 'browser/renderer/shared/Types'; +import { IDimensions, IRenderDimensions } from './Types'; export function throwIfFalsy(value: T | undefined | null): T { if (!value) { diff --git a/src/browser/renderer/shared/SelectionRenderModel.ts b/src/browser/renderer/shared/SelectionRenderModel.ts index d3b7a99c4..1df166c28 100644 --- a/src/browser/renderer/shared/SelectionRenderModel.ts +++ b/src/browser/renderer/shared/SelectionRenderModel.ts @@ -3,8 +3,8 @@ * @license MIT */ -import { ITerminal } from 'browser/Types'; -import { ISelectionRenderModel } from 'browser/renderer/shared/Types'; +import { ITerminal } from '../../Types'; +import { ISelectionRenderModel } from './Types'; import { Terminal } from '@xterm/xterm'; class SelectionRenderModel implements ISelectionRenderModel { diff --git a/src/browser/renderer/shared/TextBlinkStateManager.test.ts b/src/browser/renderer/shared/TextBlinkStateManager.test.ts index 5c8ce448a..3af39cac8 100644 --- a/src/browser/renderer/shared/TextBlinkStateManager.test.ts +++ b/src/browser/renderer/shared/TextBlinkStateManager.test.ts @@ -4,10 +4,10 @@ */ import { assert } from 'chai'; -import { TextBlinkStateManager } from 'browser/renderer/shared/TextBlinkStateManager'; -import { MockOptionsService } from 'common/TestUtils.test'; -import type { ICoreBrowserService } from 'browser/services/Services'; -import { Emitter } from 'common/Event'; +import { TextBlinkStateManager } from './TextBlinkStateManager'; +import { MockOptionsService } from '../../../common/TestUtils.test'; +import type { ICoreBrowserService } from '../../services/Services'; +import { Emitter } from '../../../common/Event'; class FakeWindow { public nextId = 1; diff --git a/src/browser/renderer/shared/TextBlinkStateManager.ts b/src/browser/renderer/shared/TextBlinkStateManager.ts index 028cde898..058abf73b 100644 --- a/src/browser/renderer/shared/TextBlinkStateManager.ts +++ b/src/browser/renderer/shared/TextBlinkStateManager.ts @@ -3,9 +3,9 @@ * @license MIT */ -import { ICoreBrowserService } from 'browser/services/Services'; -import { Disposable, toDisposable } from 'common/Lifecycle'; -import { IOptionsService } from 'common/services/Services'; +import { ICoreBrowserService } from '../../services/Services'; +import { Disposable, toDisposable } from '../../../common/Lifecycle'; +import { IOptionsService } from '../../../common/services/Services'; export class TextBlinkStateManager extends Disposable { private _intervalDuration: number = 0; diff --git a/src/browser/renderer/shared/Types.ts b/src/browser/renderer/shared/Types.ts index c78e7794f..d664d1611 100644 --- a/src/browser/renderer/shared/Types.ts +++ b/src/browser/renderer/shared/Types.ts @@ -4,9 +4,9 @@ */ import { Terminal } from '@xterm/xterm'; -import { ITerminal } from 'browser/Types'; -import { IDisposable } from 'common/Types'; -import type { IEvent } from 'common/Event'; +import { ITerminal } from '../../Types'; +import { IDisposable } from '../../../common/Types'; +import type { IEvent } from '../../../common/Event'; export interface IDimensions { width: number; diff --git a/src/browser/scrollable/abstractScrollbar.ts b/src/browser/scrollable/abstractScrollbar.ts index 64c25d9d8..906190f76 100644 --- a/src/browser/scrollable/abstractScrollbar.ts +++ b/src/browser/scrollable/abstractScrollbar.ts @@ -11,7 +11,7 @@ import { ScrollbarArrow, IScrollbarArrowOptions } from './scrollbarArrow'; import { ScrollbarState } from './scrollbarState'; import { ScrollbarVisibilityController } from './scrollbarVisibilityController'; import { Widget } from './widget'; -import * as platform from 'common/Platform'; +import * as platform from '../../common/Platform'; import { INewScrollPosition, Scrollable, ScrollbarVisibility } from './scrollable'; /** diff --git a/src/browser/scrollable/globalPointerMoveMonitor.ts b/src/browser/scrollable/globalPointerMoveMonitor.ts index a80e0507f..56ad16699 100644 --- a/src/browser/scrollable/globalPointerMoveMonitor.ts +++ b/src/browser/scrollable/globalPointerMoveMonitor.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as dom from '../Dom'; -import { DisposableStore, IDisposable, toDisposable } from 'common/Lifecycle'; +import { DisposableStore, IDisposable, toDisposable } from '../../common/Lifecycle'; type PointerMoveCallback = (event: PointerEvent) => void; type OnStopCallback = () => void; diff --git a/src/browser/scrollable/mouseEvent.ts b/src/browser/scrollable/mouseEvent.ts index a12b63d52..6be8963e2 100644 --- a/src/browser/scrollable/mouseEvent.ts +++ b/src/browser/scrollable/mouseEvent.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import * as platform from 'common/Platform'; +import * as platform from '../../common/Platform'; interface IWindowChainElement { readonly window: WeakRef; diff --git a/src/browser/scrollable/scrollable.ts b/src/browser/scrollable/scrollable.ts index 18275ffe5..29435ad8f 100644 --- a/src/browser/scrollable/scrollable.ts +++ b/src/browser/scrollable/scrollable.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { Emitter, IEvent } from 'common/Event'; -import { Disposable, IDisposable } from 'common/Lifecycle'; +import { Emitter, IEvent } from '../../common/Event'; +import { Disposable, IDisposable } from '../../common/Lifecycle'; export const enum ScrollbarVisibility { AUTO = 1, diff --git a/src/browser/scrollable/scrollableElement.ts b/src/browser/scrollable/scrollableElement.ts index 4039d0c4e..df3628e10 100644 --- a/src/browser/scrollable/scrollableElement.ts +++ b/src/browser/scrollable/scrollableElement.ts @@ -11,10 +11,10 @@ import { HorizontalScrollbar } from './horizontalScrollbar'; import { IScrollableElementChangeOptions, IScrollableElementCreationOptions, IScrollableElementResolvedOptions } from './scrollableElementOptions'; import { VerticalScrollbar } from './verticalScrollbar'; import { Widget } from './widget'; -import { TimeoutTimer } from 'common/Async'; -import { Emitter, IEvent } from 'common/Event'; -import { IDisposable, dispose } from 'common/Lifecycle'; -import * as platform from 'common/Platform'; +import { TimeoutTimer } from '../../common/Async'; +import { Emitter, IEvent } from '../../common/Event'; +import { IDisposable, dispose } from '../../common/Lifecycle'; +import * as platform from '../../common/Platform'; import { INewScrollDimensions, INewScrollPosition, IScrollDimensions, IScrollPosition, IScrollEvent, Scrollable, ScrollbarVisibility } from './scrollable'; // import 'vs/css!./media/scrollbars'; diff --git a/src/browser/scrollable/scrollbarArrow.ts b/src/browser/scrollable/scrollbarArrow.ts index d543669c1..2f1f9e9fe 100644 --- a/src/browser/scrollable/scrollbarArrow.ts +++ b/src/browser/scrollable/scrollbarArrow.ts @@ -5,7 +5,7 @@ import { GlobalPointerMoveMonitor } from './globalPointerMoveMonitor'; import { Widget } from './widget'; -import { TimeoutTimer } from 'common/Async'; +import { TimeoutTimer } from '../../common/Async'; import * as dom from '../Dom'; export interface IScrollbarArrowOptions { diff --git a/src/browser/scrollable/scrollbarVisibilityController.ts b/src/browser/scrollable/scrollbarVisibilityController.ts index 59d172bce..84a8b460f 100644 --- a/src/browser/scrollable/scrollbarVisibilityController.ts +++ b/src/browser/scrollable/scrollbarVisibilityController.ts @@ -4,8 +4,8 @@ *--------------------------------------------------------------------------------------------*/ import { FastDomNode } from './fastDomNode'; -import { TimeoutTimer } from 'common/Async'; -import { Disposable } from 'common/Lifecycle'; +import { TimeoutTimer } from '../../common/Async'; +import { Disposable } from '../../common/Lifecycle'; import { ScrollbarVisibility } from './scrollable'; export class ScrollbarVisibilityController extends Disposable { diff --git a/src/browser/scrollable/touch.ts b/src/browser/scrollable/touch.ts index 475784cf6..5c58eac3b 100644 --- a/src/browser/scrollable/touch.ts +++ b/src/browser/scrollable/touch.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as DomUtils from '../Dom'; -import { Disposable, IDisposable, toDisposable } from 'common/Lifecycle'; +import { Disposable, IDisposable, toDisposable } from '../../common/Lifecycle'; const mainWindow = (typeof window === 'object' ? window : globalThis) as Window & typeof globalThis; diff --git a/src/browser/scrollable/widget.ts b/src/browser/scrollable/widget.ts index 80220c9b1..578492853 100644 --- a/src/browser/scrollable/widget.ts +++ b/src/browser/scrollable/widget.ts @@ -5,7 +5,7 @@ import * as dom from '../Dom'; import { IMouseEvent, StandardMouseEvent } from './mouseEvent'; -import { Disposable } from 'common/Lifecycle'; +import { Disposable } from '../../common/Lifecycle'; export abstract class Widget extends Disposable { diff --git a/src/browser/selection/SelectionModel.test.ts b/src/browser/selection/SelectionModel.test.ts index 79ff372b3..5f813d7ee 100644 --- a/src/browser/selection/SelectionModel.test.ts +++ b/src/browser/selection/SelectionModel.test.ts @@ -5,7 +5,7 @@ import { assert } from 'chai'; import { SelectionModel } from './SelectionModel'; -import { MockBufferService } from 'common/TestUtils.test'; +import { MockBufferService } from '../../common/TestUtils.test'; describe('SelectionModel', () => { let model: SelectionModel; diff --git a/src/browser/selection/SelectionModel.ts b/src/browser/selection/SelectionModel.ts index b26cf944f..7b62b230b 100644 --- a/src/browser/selection/SelectionModel.ts +++ b/src/browser/selection/SelectionModel.ts @@ -3,7 +3,7 @@ * @license MIT */ -import { IBufferService } from 'common/services/Services'; +import { IBufferService } from '../../common/services/Services'; /** * Represents a selection within the buffer. This model only cares about column diff --git a/src/browser/services/CharSizeService.ts b/src/browser/services/CharSizeService.ts index 6baf9b50a..002ca5c18 100644 --- a/src/browser/services/CharSizeService.ts +++ b/src/browser/services/CharSizeService.ts @@ -3,10 +3,10 @@ * @license MIT */ -import { IOptionsService } from 'common/services/Services'; -import { ICharSizeService } from 'browser/services/Services'; -import { Disposable } from 'common/Lifecycle'; -import { Emitter } from 'common/Event'; +import { IOptionsService } from '../../common/services/Services'; +import { ICharSizeService } from './Services'; +import { Disposable } from '../../common/Lifecycle'; +import { Emitter } from '../../common/Event'; export class CharSizeService extends Disposable implements ICharSizeService { public serviceBrand: undefined; diff --git a/src/browser/services/CharacterJoinerService.test.ts b/src/browser/services/CharacterJoinerService.test.ts index 42301015c..1dc3db334 100644 --- a/src/browser/services/CharacterJoinerService.test.ts +++ b/src/browser/services/CharacterJoinerService.test.ts @@ -4,13 +4,13 @@ */ import { assert } from 'chai'; -import { ICharacterJoinerService } from 'browser/services/Services'; -import { CharacterJoinerService } from 'browser/services/CharacterJoinerService'; -import { BufferLine } from 'common/buffer/BufferLine'; -import { BufferLineStringCache } from 'common/buffer/BufferLineStringCache'; -import { IBufferLine } from 'common/Types'; -import { CellData } from 'common/buffer/CellData'; -import { MockBufferService, createCellData } from 'common/TestUtils.test'; +import { ICharacterJoinerService } from './Services'; +import { CharacterJoinerService } from './CharacterJoinerService'; +import { BufferLine } from '../../common/buffer/BufferLine'; +import { BufferLineStringCache } from '../../common/buffer/BufferLineStringCache'; +import { IBufferLine } from '../../common/Types'; +import { CellData } from '../../common/buffer/CellData'; +import { MockBufferService, createCellData } from '../../common/TestUtils.test'; const TEST_STRING_CACHE = new BufferLineStringCache(); diff --git a/src/browser/services/CharacterJoinerService.ts b/src/browser/services/CharacterJoinerService.ts index ca4f1984e..67ee70748 100644 --- a/src/browser/services/CharacterJoinerService.ts +++ b/src/browser/services/CharacterJoinerService.ts @@ -3,13 +3,13 @@ * @license MIT */ -import { IBufferLine, ICellData, CharData } from 'common/Types'; -import { ICharacterJoiner } from 'browser/Types'; -import { AttributeData } from 'common/buffer/AttributeData'; -import { WHITESPACE_CELL_CHAR, Content } from 'common/buffer/Constants'; -import { CellData } from 'common/buffer/CellData'; -import { IBufferService } from 'common/services/Services'; -import { ICharacterJoinerService } from 'browser/services/Services'; +import { IBufferLine, ICellData, CharData } from '../../common/Types'; +import { ICharacterJoiner } from '../Types'; +import { AttributeData } from '../../common/buffer/AttributeData'; +import { WHITESPACE_CELL_CHAR, Content } from '../../common/buffer/Constants'; +import { CellData } from '../../common/buffer/CellData'; +import { IBufferService } from '../../common/services/Services'; +import { ICharacterJoinerService } from './Services'; export class JoinedCellData extends AttributeData implements ICellData { private _width: number; diff --git a/src/browser/services/CoreBrowserService.ts b/src/browser/services/CoreBrowserService.ts index 658caaeb1..bcc39544e 100644 --- a/src/browser/services/CoreBrowserService.ts +++ b/src/browser/services/CoreBrowserService.ts @@ -4,9 +4,9 @@ */ import { ICoreBrowserService } from './Services'; -import { Emitter, EventUtils } from 'common/Event'; -import { addDisposableListener } from 'browser/Dom'; -import { Disposable, MutableDisposable, toDisposable } from 'common/Lifecycle'; +import { Emitter, EventUtils } from '../../common/Event'; +import { addDisposableListener } from '../Dom'; +import { Disposable, MutableDisposable, toDisposable } from '../../common/Lifecycle'; export class CoreBrowserService extends Disposable implements ICoreBrowserService { public serviceBrand: undefined; diff --git a/src/browser/services/KeyboardService.ts b/src/browser/services/KeyboardService.ts index 493f30653..a85eb2339 100644 --- a/src/browser/services/KeyboardService.ts +++ b/src/browser/services/KeyboardService.ts @@ -3,13 +3,13 @@ * @license MIT */ -import { IKeyboardService } from 'browser/services/Services'; -import { evaluateKeyboardEvent } from 'common/input/Keyboard'; -import { KittyKeyboard, KittyKeyboardEventType, KittyKeyboardFlags } from 'common/input/KittyKeyboard'; -import { Win32InputMode } from 'common/input/Win32InputMode'; -import { isMac } from 'common/Platform'; -import { ICoreService, IOptionsService } from 'common/services/Services'; -import { IKeyboardResult } from 'common/Types'; +import { IKeyboardService } from './Services'; +import { evaluateKeyboardEvent } from '../../common/input/Keyboard'; +import { KittyKeyboard, KittyKeyboardEventType, KittyKeyboardFlags } from '../../common/input/KittyKeyboard'; +import { Win32InputMode } from '../../common/input/Win32InputMode'; +import { isMac } from '../../common/Platform'; +import { ICoreService, IOptionsService } from '../../common/services/Services'; +import { IKeyboardResult } from '../../common/Types'; export class KeyboardService implements IKeyboardService { public serviceBrand: undefined; diff --git a/src/browser/services/LinkProviderService.ts b/src/browser/services/LinkProviderService.ts index 7a7b530d0..fe4b564a2 100644 --- a/src/browser/services/LinkProviderService.ts +++ b/src/browser/services/LinkProviderService.ts @@ -1,6 +1,6 @@ -import { ILinkProvider, ILinkProviderService } from 'browser/services/Services'; -import { Disposable, toDisposable } from 'common/Lifecycle'; -import { IDisposable } from 'common/Types'; +import { ILinkProvider, ILinkProviderService } from './Services'; +import { Disposable, toDisposable } from '../../common/Lifecycle'; +import { IDisposable } from '../../common/Types'; export class LinkProviderService extends Disposable implements ILinkProviderService { declare public serviceBrand: undefined; diff --git a/src/browser/services/MouseCoordsService.ts b/src/browser/services/MouseCoordsService.ts index 60f0a6ab9..7e110ea98 100644 --- a/src/browser/services/MouseCoordsService.ts +++ b/src/browser/services/MouseCoordsService.ts @@ -3,9 +3,9 @@ * @license MIT */ -import { getWindow } from 'browser/Dom'; -import { getCoords, getCoordsRelativeToElement } from 'browser/input/Mouse'; -import { ICharSizeService, IMouseCoordsService, IRenderService } from 'browser/services/Services'; +import { getWindow } from '../Dom'; +import { getCoords, getCoordsRelativeToElement } from '../input/Mouse'; +import { ICharSizeService, IMouseCoordsService, IRenderService } from './Services'; export class MouseCoordsService implements IMouseCoordsService { public serviceBrand: undefined; diff --git a/src/browser/services/MouseService.test.ts b/src/browser/services/MouseService.test.ts index d7aa7308f..6d760ff0a 100644 --- a/src/browser/services/MouseService.test.ts +++ b/src/browser/services/MouseService.test.ts @@ -3,12 +3,12 @@ * @license MIT */ import { assert } from 'chai'; -import { AltMouseCursorController, MouseEventCssClasses, MouseService } from 'browser/services/MouseService'; -import { MouseStateService } from 'common/services/MouseStateService'; -import { CoreMouseAction, CoreMouseButton } from 'common/Types'; -import { IBufferService, ICoreService, ILogService, IOptionsService } from 'common/services/Services'; -import { OptionsService } from 'common/services/OptionsService'; -import { MockCoreBrowserService, MockRenderService, MockSelectionService } from 'browser/TestUtils.test'; +import { AltMouseCursorController, MouseEventCssClasses, MouseService } from './MouseService'; +import { MouseStateService } from '../../common/services/MouseStateService'; +import { CoreMouseAction, CoreMouseButton } from '../../common/Types'; +import { IBufferService, ICoreService, ILogService, IOptionsService } from '../../common/services/Services'; +import { OptionsService } from '../../common/services/OptionsService'; +import { MockCoreBrowserService, MockRenderService, MockSelectionService } from '../TestUtils.test'; function toBytes(s: string | undefined): number[] { if (!s) { diff --git a/src/browser/services/MouseService.ts b/src/browser/services/MouseService.ts index f9d68f42e..61cbfa86c 100644 --- a/src/browser/services/MouseService.ts +++ b/src/browser/services/MouseService.ts @@ -3,13 +3,13 @@ * @license MIT */ -import { addDisposableListener } from 'browser/Dom'; -import { IBufferService, IMouseStateService, ICoreService, ILogService, IOptionsService } from 'common/services/Services'; -import { CoreMouseAction, CoreMouseButton, CoreMouseEventType, ICoreMouseEvent, IDisposable } from 'common/Types'; -import { C0 } from 'common/data/EscapeSequences'; -import { DisposableStore, MutableDisposable, toDisposable } from 'common/Lifecycle'; +import { addDisposableListener } from '../Dom'; +import { IBufferService, IMouseStateService, ICoreService, ILogService, IOptionsService } from '../../common/services/Services'; +import { CoreMouseAction, CoreMouseButton, CoreMouseEventType, ICoreMouseEvent, IDisposable } from '../../common/Types'; +import { C0 } from '../../common/data/EscapeSequences'; +import { DisposableStore, MutableDisposable, toDisposable } from '../../common/Lifecycle'; import { ICoreBrowserService, IMouseCoordsService, IMouseService, IMouseServiceTarget, IRenderService, ISelectionService } from './Services'; -import { Gesture, EventType as GestureEventType, IGestureEvent } from 'browser/scrollable/touch'; +import { Gesture, EventType as GestureEventType, IGestureEvent } from '../scrollable/touch'; type RequestedMouseEvents = Record<'mouseup' | 'wheel' | 'mousedrag' | 'mousemove', EventListener | null>; diff --git a/src/browser/services/RenderService.ts b/src/browser/services/RenderService.ts index e999b7eac..75cd55418 100644 --- a/src/browser/services/RenderService.ts +++ b/src/browser/services/RenderService.ts @@ -3,14 +3,14 @@ * @license MIT */ -import { RenderDebouncer } from 'browser/RenderDebouncer'; -import { IRenderDebouncerWithCallback } from 'browser/Types'; -import { IRenderDimensions, IRenderer } from 'browser/renderer/shared/Types'; -import { ICharSizeService, ICoreBrowserService, IRenderService, IThemeService } from 'browser/services/Services'; -import { Disposable, MutableDisposable, toDisposable } from 'common/Lifecycle'; -import { DebouncedIdleTask } from 'common/TaskQueue'; -import { IBufferService, ICoreService, IDecorationService, ILogService, IOptionsService } from 'common/services/Services'; -import { Emitter } from 'common/Event'; +import { RenderDebouncer } from '../RenderDebouncer'; +import { IRenderDebouncerWithCallback } from '../Types'; +import { IRenderDimensions, IRenderer } from '../renderer/shared/Types'; +import { ICharSizeService, ICoreBrowserService, IRenderService, IThemeService } from './Services'; +import { Disposable, MutableDisposable, toDisposable } from '../../common/Lifecycle'; +import { DebouncedIdleTask } from '../../common/TaskQueue'; +import { IBufferService, ICoreService, IDecorationService, ILogService, IOptionsService } from '../../common/services/Services'; +import { Emitter } from '../../common/Event'; interface ISelectionState { start: [number, number] | undefined; diff --git a/src/browser/services/SelectionService.test.ts b/src/browser/services/SelectionService.test.ts index 04d691d40..b48a4ee38 100644 --- a/src/browser/services/SelectionService.test.ts +++ b/src/browser/services/SelectionService.test.ts @@ -5,16 +5,16 @@ import { assert } from 'chai'; import { SelectionService, SelectionMode } from './SelectionService'; -import { SelectionModel } from 'browser/selection/SelectionModel'; -import { IBufferLine } from 'common/Types'; -import { MockBufferService, MockOptionsService, MockCoreService, MockMouseStateService, createCellData } from 'common/TestUtils.test'; -import { BufferLine } from 'common/buffer/BufferLine'; -import { BufferLineStringCache } from 'common/buffer/BufferLineStringCache'; -import { IBufferService, IOptionsService } from 'common/services/Services'; -import { MockCoreBrowserService, MockMouseService, MockRenderService } from 'browser/TestUtils.test'; -import { CellData } from 'common/buffer/CellData'; -import { IBuffer } from 'common/buffer/Types'; -import { IRenderService } from 'browser/services/Services'; +import { SelectionModel } from '../selection/SelectionModel'; +import { IBufferLine } from '../../common/Types'; +import { MockBufferService, MockOptionsService, MockCoreService, MockMouseStateService, createCellData } from '../../common/TestUtils.test'; +import { BufferLine } from '../../common/buffer/BufferLine'; +import { BufferLineStringCache } from '../../common/buffer/BufferLineStringCache'; +import { IBufferService, IOptionsService } from '../../common/services/Services'; +import { MockCoreBrowserService, MockMouseService, MockRenderService } from '../TestUtils.test'; +import { CellData } from '../../common/buffer/CellData'; +import { IBuffer } from '../../common/buffer/Types'; +import { IRenderService } from './Services'; const TEST_STRING_CACHE = new BufferLineStringCache(); diff --git a/src/browser/services/SelectionService.ts b/src/browser/services/SelectionService.ts index 6516e5154..d6b015b61 100644 --- a/src/browser/services/SelectionService.ts +++ b/src/browser/services/SelectionService.ts @@ -3,20 +3,20 @@ * @license MIT */ -import { IBufferRange, ILinkifier2 } from 'browser/Types'; -import { getCoordsRelativeToElement } from 'browser/input/Mouse'; -import { moveToCellSequence } from 'browser/input/MoveToCell'; -import { SelectionModel } from 'browser/selection/SelectionModel'; -import { ISelectionRedrawRequestEvent, ISelectionRequestScrollLinesEvent } from 'browser/selection/Types'; -import { ICoreBrowserService, IMouseCoordsService, IRenderService, ISelectionService } from 'browser/services/Services'; -import { Disposable, MutableDisposable, toDisposable } from 'common/Lifecycle'; -import * as Browser from 'common/Platform'; -import { IBufferLine, ICellData, IDisposable } from 'common/Types'; -import { getRangeLength } from 'common/buffer/BufferRange'; -import { CellData } from 'common/buffer/CellData'; -import { IBuffer } from 'common/buffer/Types'; -import { IBufferService, ICoreService, IMouseStateService, IOptionsService } from 'common/services/Services'; -import { Emitter } from 'common/Event'; +import { IBufferRange, ILinkifier2 } from '../Types'; +import { getCoordsRelativeToElement } from '../input/Mouse'; +import { moveToCellSequence } from '../input/MoveToCell'; +import { SelectionModel } from '../selection/SelectionModel'; +import { ISelectionRedrawRequestEvent, ISelectionRequestScrollLinesEvent } from '../selection/Types'; +import { ICoreBrowserService, IMouseCoordsService, IRenderService, ISelectionService } from './Services'; +import { Disposable, MutableDisposable, toDisposable } from '../../common/Lifecycle'; +import * as Browser from '../../common/Platform'; +import { IBufferLine, ICellData, IDisposable } from '../../common/Types'; +import { getRangeLength } from '../../common/buffer/BufferRange'; +import { CellData } from '../../common/buffer/CellData'; +import { IBuffer } from '../../common/buffer/Types'; +import { IBufferService, ICoreService, IMouseStateService, IOptionsService } from '../../common/services/Services'; +import { Emitter } from '../../common/Event'; const enum Constants { /** diff --git a/src/browser/services/Services.ts b/src/browser/services/Services.ts index 72659cafe..2b8e06b7d 100644 --- a/src/browser/services/Services.ts +++ b/src/browser/services/Services.ts @@ -3,12 +3,12 @@ * @license MIT */ -import { IRenderDimensions, IRenderer } from 'browser/renderer/shared/Types'; -import { IColorSet, ILink, ReadonlyColorSet } from 'browser/Types'; -import { ISelectionRedrawRequestEvent as ISelectionRequestRedrawEvent, ISelectionRequestScrollLinesEvent } from 'browser/selection/Types'; -import { createDecorator } from 'common/services/ServiceRegistry'; -import { AllColorIndex, IDisposable, IKeyboardResult } from 'common/Types'; -import type { IEvent } from 'common/Event'; +import { IRenderDimensions, IRenderer } from '../renderer/shared/Types'; +import { IColorSet, ILink, ReadonlyColorSet } from '../Types'; +import { ISelectionRedrawRequestEvent as ISelectionRequestRedrawEvent, ISelectionRequestScrollLinesEvent } from '../selection/Types'; +import { createDecorator } from '../../common/services/ServiceRegistry'; +import { AllColorIndex, IDisposable, IKeyboardResult } from '../../common/Types'; +import type { IEvent } from '../../common/Event'; export const ICharSizeService = createDecorator('CharSizeService'); export interface ICharSizeService { diff --git a/src/browser/services/ThemeService.test.ts b/src/browser/services/ThemeService.test.ts index a36dea31c..08a319ef5 100644 --- a/src/browser/services/ThemeService.test.ts +++ b/src/browser/services/ThemeService.test.ts @@ -5,9 +5,9 @@ import jsdom = require('jsdom'); import { assert } from 'chai'; -import { ThemeService } from 'browser/services/ThemeService'; -import { OptionsService } from 'common/services/OptionsService'; -import { DEFAULT_ANSI_COLORS } from 'browser/Types'; +import { ThemeService } from './ThemeService'; +import { OptionsService } from '../../common/services/OptionsService'; +import { DEFAULT_ANSI_COLORS } from '../Types'; describe('ThemeService', () => { let themeService: ThemeService; diff --git a/src/browser/services/ThemeService.ts b/src/browser/services/ThemeService.ts index f2b23f3ce..9b39b99ad 100644 --- a/src/browser/services/ThemeService.ts +++ b/src/browser/services/ThemeService.ts @@ -3,14 +3,14 @@ * @license MIT */ -import { ColorContrastCache } from 'browser/ColorContrastCache'; -import { IThemeService } from 'browser/services/Services'; -import { DEFAULT_ANSI_COLORS, IColorContrastCache, IColorSet, ReadonlyColorSet } from 'browser/Types'; -import { color, css, NULL_COLOR } from 'common/Color'; -import { Disposable } from 'common/Lifecycle'; -import { IOptionsService, ITheme } from 'common/services/Services'; -import { AllColorIndex, IColor, SpecialColorIndex } from 'common/Types'; -import { Emitter } from 'common/Event'; +import { ColorContrastCache } from '../ColorContrastCache'; +import { IThemeService } from './Services'; +import { DEFAULT_ANSI_COLORS, IColorContrastCache, IColorSet, ReadonlyColorSet } from '../Types'; +import { color, css, NULL_COLOR } from '../../common/Color'; +import { Disposable } from '../../common/Lifecycle'; +import { IOptionsService, ITheme } from '../../common/services/Services'; +import { AllColorIndex, IColor, SpecialColorIndex } from '../../common/Types'; +import { Emitter } from '../../common/Event'; interface IRestoreColorSet { foreground: IColor; diff --git a/src/browser/tsconfig.json b/src/browser/tsconfig.json index ff5bf6ad7..52c2051ab 100644 --- a/src/browser/tsconfig.json +++ b/src/browser/tsconfig.json @@ -9,17 +9,15 @@ "types": [ "../../node_modules/@types/mocha" ], - "skipLibCheck": true, - "paths": { - "common/*": [ "./../common/*" ], - "*": [ "./../*" ] - } + "skipLibCheck": true }, "include": [ "./**/*", "../../typings/xterm.d.ts" ], "references": [ - { "path": "../common" } + { + "path": "../common" + } ] } diff --git a/src/common/Async.ts b/src/common/Async.ts index 276532fb8..3189d6293 100644 --- a/src/common/Async.ts +++ b/src/common/Async.ts @@ -5,7 +5,7 @@ * Minimal async helpers for xterm.js core. */ -import { DisposableStore, IDisposable, toDisposable } from 'common/Lifecycle'; +import { DisposableStore, IDisposable, toDisposable } from './Lifecycle'; export function timeout(millis: number): Promise { return new Promise(resolve => setTimeout(resolve, millis)); diff --git a/src/common/CircularList.test.ts b/src/common/CircularList.test.ts index 7a578a8cc..4c07b16c3 100644 --- a/src/common/CircularList.test.ts +++ b/src/common/CircularList.test.ts @@ -4,7 +4,7 @@ */ import { assert } from 'chai'; -import { CircularList } from 'common/CircularList'; +import { CircularList } from './CircularList'; describe('CircularList', () => { describe('push', () => { diff --git a/src/common/CircularList.ts b/src/common/CircularList.ts index 3663bfc17..f0b12d6a2 100644 --- a/src/common/CircularList.ts +++ b/src/common/CircularList.ts @@ -3,9 +3,9 @@ * @license MIT */ -import { ICircularList } from 'common/Types'; -import { Disposable } from 'common/Lifecycle'; -import { Emitter } from 'common/Event'; +import { ICircularList } from './Types'; +import { Disposable } from './Lifecycle'; +import { Emitter } from './Event'; export interface IInsertEvent { index: number; diff --git a/src/common/Color.test.ts b/src/common/Color.test.ts index dbe759b4f..5f4140d9e 100644 --- a/src/common/Color.test.ts +++ b/src/common/Color.test.ts @@ -4,7 +4,7 @@ */ import { assert } from 'chai'; -import { channels, color, css, rgb, rgba, toPaddedHex, contrastRatio } from 'common/Color'; +import { channels, color, css, rgb, rgba, toPaddedHex, contrastRatio } from './Color'; describe('Color', () => { diff --git a/src/common/Color.ts b/src/common/Color.ts index b3d13fc99..aa3ca00ab 100644 --- a/src/common/Color.ts +++ b/src/common/Color.ts @@ -3,7 +3,7 @@ * @license MIT */ -import { IColor, IColorRGB } from 'common/Types'; +import { IColor, IColorRGB } from './Types'; let $r = 0; let $g = 0; diff --git a/src/common/CoreTerminal.ts b/src/common/CoreTerminal.ts index 80168aa65..2cc48b03a 100644 --- a/src/common/CoreTerminal.ts +++ b/src/common/CoreTerminal.ts @@ -21,24 +21,24 @@ * http://linux.die.net/man/7/urxvt */ -import { IInstantiationService, IOptionsService, IBufferService, ILogService, ICharsetService, ICoreService, IMouseStateService, IUnicodeService, LogLevelEnum, ITerminalOptions, IOscLinkService } from 'common/services/Services'; -import { InstantiationService } from 'common/services/InstantiationService'; -import { LogService } from 'common/services/LogService'; -import { BufferService, BufferServiceConstants } from 'common/services/BufferService'; -import { OptionsService } from 'common/services/OptionsService'; -import { IDisposable, IAttributeData, ICoreTerminal, IScrollEvent } from 'common/Types'; -import { CoreService } from 'common/services/CoreService'; -import { MouseStateService } from 'common/services/MouseStateService'; -import { UnicodeService } from 'common/services/UnicodeService'; -import { CharsetService } from 'common/services/CharsetService'; -import { updateWindowsModeWrappedState } from 'common/WindowsMode'; -import { IFunctionIdentifier, IParams } from 'common/parser/Types'; -import { IBufferSet } from 'common/buffer/Types'; -import { InputHandler } from 'common/InputHandler'; -import { WriteBuffer } from 'common/input/WriteBuffer'; -import { OscLinkService } from 'common/services/OscLinkService'; -import { Emitter, EventUtils, type IEvent } from 'common/Event'; -import { Disposable, MutableDisposable, toDisposable } from 'common/Lifecycle'; +import { IInstantiationService, IOptionsService, IBufferService, ILogService, ICharsetService, ICoreService, IMouseStateService, IUnicodeService, LogLevelEnum, ITerminalOptions, IOscLinkService } from './services/Services'; +import { InstantiationService } from './services/InstantiationService'; +import { LogService } from './services/LogService'; +import { BufferService, BufferServiceConstants } from './services/BufferService'; +import { OptionsService } from './services/OptionsService'; +import { IDisposable, IAttributeData, ICoreTerminal, IScrollEvent } from './Types'; +import { CoreService } from './services/CoreService'; +import { MouseStateService } from './services/MouseStateService'; +import { UnicodeService } from './services/UnicodeService'; +import { CharsetService } from './services/CharsetService'; +import { updateWindowsModeWrappedState } from './WindowsMode'; +import { IFunctionIdentifier, IParams } from './parser/Types'; +import { IBufferSet } from './buffer/Types'; +import { InputHandler } from './InputHandler'; +import { WriteBuffer } from './input/WriteBuffer'; +import { OscLinkService } from './services/OscLinkService'; +import { Emitter, EventUtils, type IEvent } from './Event'; +import { Disposable, MutableDisposable, toDisposable } from './Lifecycle'; // Only trigger this warning a single time per session let hasWriteSyncWarnHappened = false; diff --git a/src/common/Event.test.ts b/src/common/Event.test.ts index 8d1cfadd5..a8d09c5ce 100644 --- a/src/common/Event.test.ts +++ b/src/common/Event.test.ts @@ -4,7 +4,7 @@ */ import { assert } from 'chai'; -import { Emitter } from 'common/Event'; +import { Emitter } from './Event'; describe('Emitter', () => { it('should fire with 0 listeners without error', () => { diff --git a/src/common/Event.ts b/src/common/Event.ts index f92ab2ac1..88417fc83 100644 --- a/src/common/Event.ts +++ b/src/common/Event.ts @@ -6,7 +6,7 @@ * Simplified from VS Code's event.ts - no leak detection/profiling. */ -import { IDisposable, DisposableStore, toDisposable } from 'common/Lifecycle'; +import { IDisposable, DisposableStore, toDisposable } from './Lifecycle'; export interface IEvent { (listener: (e: T) => any, thisArgs?: any, disposables?: IDisposable[] | DisposableStore): IDisposable; diff --git a/src/common/InputHandler.test.ts b/src/common/InputHandler.test.ts index 5c59b062b..20d685e91 100644 --- a/src/common/InputHandler.test.ts +++ b/src/common/InputHandler.test.ts @@ -4,19 +4,19 @@ */ import { assert } from 'chai'; -import { InputHandler } from 'common/InputHandler'; -import { IBufferLine, IAttributeData, IColorEvent, ColorRequestType, SpecialColorIndex } from 'common/Types'; -import { DEFAULT_ATTR_DATA } from 'common/buffer/BufferLine'; -import { CellData } from 'common/buffer/CellData'; -import { Attributes, BgFlags, UnderlineStyle } from 'common/buffer/Constants'; -import { AttributeData, ExtendedAttrs } from 'common/buffer/AttributeData'; -import { Params } from 'common/parser/Params'; -import { MockCoreService, MockBufferService, MockOptionsService, MockLogService, MockMouseStateService, MockCharsetService, MockUnicodeService, MockOscLinkService, extendedAttributes } from 'common/TestUtils.test'; -import { IBufferService, ICoreService, type IOscLinkService } from 'common/services/Services'; -import { DEFAULT_OPTIONS } from 'common/services/OptionsService'; -import { BufferService } from 'common/services/BufferService'; -import { CoreService } from 'common/services/CoreService'; -import { OscLinkService } from 'common/services/OscLinkService'; +import { InputHandler } from './InputHandler'; +import { IBufferLine, IAttributeData, IColorEvent, ColorRequestType, SpecialColorIndex } from './Types'; +import { DEFAULT_ATTR_DATA } from './buffer/BufferLine'; +import { CellData } from './buffer/CellData'; +import { Attributes, BgFlags, UnderlineStyle } from './buffer/Constants'; +import { AttributeData, ExtendedAttrs } from './buffer/AttributeData'; +import { Params } from './parser/Params'; +import { MockCoreService, MockBufferService, MockOptionsService, MockLogService, MockMouseStateService, MockCharsetService, MockUnicodeService, MockOscLinkService, extendedAttributes } from './TestUtils.test'; +import { IBufferService, ICoreService, type IOscLinkService } from './services/Services'; +import { DEFAULT_OPTIONS } from './services/OptionsService'; +import { BufferService } from './services/BufferService'; +import { CoreService } from './services/CoreService'; +import { OscLinkService } from './services/OscLinkService'; function getCursor(bufferService: IBufferService): number[] { diff --git a/src/common/InputHandler.ts b/src/common/InputHandler.ts index fd1fdb8a1..f7ab9c435 100644 --- a/src/common/InputHandler.ts +++ b/src/common/InputHandler.ts @@ -4,26 +4,26 @@ * @license MIT */ -import { IInputHandler, IAttributeData, IDisposable, IWindowOptions, IColorEvent, IParseStack, ColorIndex, ColorRequestType, SpecialColorIndex } from 'common/Types'; -import { C0, C1 } from 'common/data/EscapeSequences'; -import { CHARSETS, DEFAULT_CHARSET } from 'common/data/Charsets'; -import { EscapeSequenceParser } from 'common/parser/EscapeSequenceParser'; -import { Disposable } from 'common/Lifecycle'; -import { StringToUtf32, stringFromCodePoint, Utf8ToUtf32 } from 'common/input/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'; -import { CellData } from 'common/buffer/CellData'; -import { AttributeData } from 'common/buffer/AttributeData'; -import { ICoreService, IBufferService, IOptionsService, ILogService, IMouseStateService, ICharsetService, IUnicodeService, LogLevelEnum, IOscLinkService } from 'common/services/Services'; -import { UnicodeService } from 'common/services/UnicodeService'; -import { OscHandler } from 'common/parser/OscParser'; -import { DcsHandler } from 'common/parser/DcsParser'; -import { ApcHandler } from 'common/parser/ApcParser'; -import { IBuffer } from 'common/buffer/Types'; -import { parseColor } from 'common/input/XParseColor'; -import { Emitter } from 'common/Event'; -import { XTERM_VERSION } from 'common/Version'; +import { IInputHandler, IAttributeData, IDisposable, IWindowOptions, IColorEvent, IParseStack, ColorIndex, ColorRequestType, SpecialColorIndex } from './Types'; +import { C0, C1 } from './data/EscapeSequences'; +import { CHARSETS, DEFAULT_CHARSET } from './data/Charsets'; +import { EscapeSequenceParser } from './parser/EscapeSequenceParser'; +import { Disposable } from './Lifecycle'; +import { StringToUtf32, stringFromCodePoint, Utf8ToUtf32 } from './input/TextDecoder'; +import { BufferLine, DEFAULT_ATTR_DATA } from './buffer/BufferLine'; +import { IParsingState, IEscapeSequenceParser, IParams, IFunctionIdentifier } from './parser/Types'; +import { NULL_CELL_CODE, NULL_CELL_WIDTH, Attributes, FgFlags, BgFlags, Content, UnderlineStyle } from './buffer/Constants'; +import { CellData } from './buffer/CellData'; +import { AttributeData } from './buffer/AttributeData'; +import { ICoreService, IBufferService, IOptionsService, ILogService, IMouseStateService, ICharsetService, IUnicodeService, LogLevelEnum, IOscLinkService } from './services/Services'; +import { UnicodeService } from './services/UnicodeService'; +import { OscHandler } from './parser/OscParser'; +import { DcsHandler } from './parser/DcsParser'; +import { ApcHandler } from './parser/ApcParser'; +import { IBuffer } from './buffer/Types'; +import { parseColor } from './input/XParseColor'; +import { Emitter } from './Event'; +import { XTERM_VERSION } from './Version'; /** * Map collect to glevel. Used in `selectCharset`. diff --git a/src/common/MultiKeyMap.test.ts b/src/common/MultiKeyMap.test.ts index b908321c3..255cec1a1 100644 --- a/src/common/MultiKeyMap.test.ts +++ b/src/common/MultiKeyMap.test.ts @@ -4,7 +4,7 @@ */ import { assert } from 'chai'; -import { FourKeyMap, TwoKeyMap } from 'common/MultiKeyMap'; +import { FourKeyMap, TwoKeyMap } from './MultiKeyMap'; const strictEqual = assert.strictEqual; diff --git a/src/common/SortedList.test.ts b/src/common/SortedList.test.ts index 4718cf971..a446b7874 100644 --- a/src/common/SortedList.test.ts +++ b/src/common/SortedList.test.ts @@ -4,8 +4,8 @@ */ import { assert } from 'chai'; -import { SortedList } from 'common/SortedList'; -import { MockLogService } from 'common/TestUtils.test'; +import { SortedList } from './SortedList'; +import { MockLogService } from './TestUtils.test'; const deepStrictEqual = assert.deepStrictEqual; diff --git a/src/common/SortedList.ts b/src/common/SortedList.ts index c6dc62085..8a10076e3 100644 --- a/src/common/SortedList.ts +++ b/src/common/SortedList.ts @@ -3,8 +3,8 @@ * @license MIT */ -import { IdleTaskQueue } from 'common/TaskQueue'; -import type { ILogService } from 'common/services/Services'; +import { IdleTaskQueue } from './TaskQueue'; +import type { ILogService } from './services/Services'; // Work variables to avoid garbage collection. let i = 0; diff --git a/src/common/StringBuilder.test.ts b/src/common/StringBuilder.test.ts index 1794de0f7..da56c79c2 100644 --- a/src/common/StringBuilder.test.ts +++ b/src/common/StringBuilder.test.ts @@ -4,7 +4,7 @@ */ import { assert } from 'chai'; -import { LimitedStringBuilder, StringBuilder } from 'common/StringBuilder'; +import { LimitedStringBuilder, StringBuilder } from './StringBuilder'; describe('StringBuilder', () => { it('should start empty', () => { diff --git a/src/common/TaskQueue.ts b/src/common/TaskQueue.ts index 77f9aea55..9e15c823a 100644 --- a/src/common/TaskQueue.ts +++ b/src/common/TaskQueue.ts @@ -3,7 +3,7 @@ * @license MIT */ -import type { ILogService } from 'common/services/Services'; +import type { ILogService } from './services/Services'; interface ITaskQueue { /** diff --git a/src/common/TestUtils.test.ts b/src/common/TestUtils.test.ts index 69c2d499d..3ae6db77d 100644 --- a/src/common/TestUtils.test.ts +++ b/src/common/TestUtils.test.ts @@ -3,17 +3,17 @@ * @license MIT */ -import { IBufferService, ICoreService, ILogService, IOptionsService, ITerminalOptions, IMouseStateService, ICharsetService, UnicodeCharProperties, UnicodeCharWidth, IUnicodeService, IUnicodeVersionProvider, LogLevelEnum, IDecorationService, IInternalDecoration, IOscLinkService, type IBufferResizeEvent } from 'common/services/Services'; -import { UnicodeService } from 'common/services/UnicodeService'; -import { DEFAULT_OPTIONS } from 'common/services/OptionsService'; -import { IBufferSet, IBuffer } from 'common/buffer/Types'; -import { BufferSet } from 'common/buffer/BufferSet'; -import { IDecPrivateModes, ICoreMouseEvent, CoreMouseEventType, ICharset, IModes, IAttributeData, IOscLinkData, IDisposable, IBufferLine, IExtendedAttrs } from 'common/Types'; -import { UnicodeV6 } from 'common/input/UnicodeV6'; +import { IBufferService, ICoreService, ILogService, IOptionsService, ITerminalOptions, IMouseStateService, ICharsetService, UnicodeCharProperties, UnicodeCharWidth, IUnicodeService, IUnicodeVersionProvider, LogLevelEnum, IDecorationService, IInternalDecoration, IOscLinkService, type IBufferResizeEvent } from './services/Services'; +import { UnicodeService } from './services/UnicodeService'; +import { DEFAULT_OPTIONS } from './services/OptionsService'; +import { IBufferSet, IBuffer } from './buffer/Types'; +import { BufferSet } from './buffer/BufferSet'; +import { IDecPrivateModes, ICoreMouseEvent, CoreMouseEventType, ICharset, IModes, IAttributeData, IOscLinkData, IDisposable, IBufferLine, IExtendedAttrs } from './Types'; +import { UnicodeV6 } from './input/UnicodeV6'; import { IDecorationOptions, IDecoration } from '@xterm/xterm'; -import { Emitter, type IEvent } from 'common/Event'; -import { CellData } from 'common/buffer/CellData'; -import { DEFAULT_ATTR, NULL_CELL_CHAR, NULL_CELL_WIDTH } from 'common/buffer/Constants'; +import { Emitter, type IEvent } from './Event'; +import { CellData } from './buffer/CellData'; +import { DEFAULT_ATTR, NULL_CELL_CHAR, NULL_CELL_WIDTH } from './buffer/Constants'; export function createCellData(attr: number, char: string, width: number): CellData { return CellData.fromCharData([attr, char, width, char.length === 0 ? 0 : char.charCodeAt(0)]); diff --git a/src/common/Types.ts b/src/common/Types.ts index 07aebbe8f..11c590b12 100644 --- a/src/common/Types.ts +++ b/src/common/Types.ts @@ -3,13 +3,13 @@ * @license MIT */ -import { IDeleteEvent, IInsertEvent } from 'common/CircularList'; -import { UnderlineStyle } from 'common/buffer/Constants'; -import { IBufferSet } from 'common/buffer/Types'; -import { IParams } from 'common/parser/Types'; -import { IMouseStateService, ICoreService, IOptionsService, IUnicodeService } from 'common/services/Services'; +import { IDeleteEvent, IInsertEvent } from './CircularList'; +import { UnderlineStyle } from './buffer/Constants'; +import { IBufferSet } from './buffer/Types'; +import { IParams } from './parser/Types'; +import { IMouseStateService, ICoreService, IOptionsService, IUnicodeService } from './services/Services'; import { IFunctionIdentifier, ITerminalOptions as IPublicTerminalOptions } from '@xterm/xterm'; -import type { Emitter, IEvent } from 'common/Event'; +import type { Emitter, IEvent } from './Event'; export interface ICoreTerminal { mouseStateService: IMouseStateService; diff --git a/src/common/WindowsMode.ts b/src/common/WindowsMode.ts index 7cff094b2..d4862e00e 100644 --- a/src/common/WindowsMode.ts +++ b/src/common/WindowsMode.ts @@ -3,8 +3,8 @@ * @license MIT */ -import { CHAR_DATA_CODE_INDEX, NULL_CELL_CODE, WHITESPACE_CELL_CODE } from 'common/buffer/Constants'; -import { IBufferService } from 'common/services/Services'; +import { CHAR_DATA_CODE_INDEX, NULL_CELL_CODE, WHITESPACE_CELL_CODE } from './buffer/Constants'; +import { IBufferService } from './services/Services'; export function updateWindowsModeWrappedState(bufferService: IBufferService): void { // Winpty does not support wraparound mode which means that lines will never diff --git a/src/common/buffer/AttributeData.ts b/src/common/buffer/AttributeData.ts index 6221fb81d..c9c940f93 100644 --- a/src/common/buffer/AttributeData.ts +++ b/src/common/buffer/AttributeData.ts @@ -3,8 +3,8 @@ * @license MIT */ -import { IAttributeData, IColorRGB, IExtendedAttrs } from 'common/Types'; -import { Attributes, FgFlags, BgFlags, UnderlineStyle, ExtFlags } from 'common/buffer/Constants'; +import { IAttributeData, IColorRGB, IExtendedAttrs } from '../Types'; +import { Attributes, FgFlags, BgFlags, UnderlineStyle, ExtFlags } from './Constants'; export class AttributeData implements IAttributeData { public static toColorRGB(value: number): IColorRGB { diff --git a/src/common/buffer/Buffer.test.ts b/src/common/buffer/Buffer.test.ts index abfea7b06..8116c28c4 100644 --- a/src/common/buffer/Buffer.test.ts +++ b/src/common/buffer/Buffer.test.ts @@ -4,13 +4,13 @@ */ import { assert } from 'chai'; -import { Buffer } from 'common/buffer/Buffer'; -import { CircularList } from 'common/CircularList'; -import { MockOptionsService, MockBufferService, MockLogService, createCellData } from 'common/TestUtils.test'; -import { BufferLine, DEFAULT_ATTR_DATA } from 'common/buffer/BufferLine'; -import { BufferLineStringCache } from 'common/buffer/BufferLineStringCache'; -import { CellData } from 'common/buffer/CellData'; -import { ExtendedAttrs } from 'common/buffer/AttributeData'; +import { Buffer } from './Buffer'; +import { CircularList } from '../CircularList'; +import { MockOptionsService, MockBufferService, MockLogService, createCellData } from '../TestUtils.test'; +import { BufferLine, DEFAULT_ATTR_DATA } from './BufferLine'; +import { BufferLineStringCache } from './BufferLineStringCache'; +import { CellData } from './CellData'; +import { ExtendedAttrs } from './AttributeData'; const INIT_COLS = 80; const INIT_ROWS = 24; diff --git a/src/common/buffer/Buffer.ts b/src/common/buffer/Buffer.ts index 34ef02f6a..83479f422 100644 --- a/src/common/buffer/Buffer.ts +++ b/src/common/buffer/Buffer.ts @@ -3,20 +3,20 @@ * @license MIT */ -import { CircularList, IInsertEvent } from 'common/CircularList'; -import { Disposable, toDisposable } from 'common/Lifecycle'; -import { IdleTaskQueue } from 'common/TaskQueue'; -import { IAttributeData, IBufferLine, ICellData, ICharset } from 'common/Types'; -import { ExtendedAttrs } from 'common/buffer/AttributeData'; -import { BufferLine, DEFAULT_ATTR_DATA } from 'common/buffer/BufferLine'; -import { BufferLineStringCache } from 'common/buffer/BufferLineStringCache'; -import { getWrappedLineTrimmedLength, reflowLargerApplyNewLayout, reflowLargerCreateNewLayout, reflowLargerGetLinesToRemove, reflowSmallerGetNewLineLengths } from 'common/buffer/BufferReflow'; -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 { IBufferService, ILogService, IOptionsService } from 'common/services/Services'; +import { CircularList, IInsertEvent } from '../CircularList'; +import { Disposable, toDisposable } from '../Lifecycle'; +import { IdleTaskQueue } from '../TaskQueue'; +import { IAttributeData, IBufferLine, ICellData, ICharset } from '../Types'; +import { ExtendedAttrs } from './AttributeData'; +import { BufferLine, DEFAULT_ATTR_DATA } from './BufferLine'; +import { BufferLineStringCache } from './BufferLineStringCache'; +import { getWrappedLineTrimmedLength, reflowLargerApplyNewLayout, reflowLargerCreateNewLayout, reflowLargerGetLinesToRemove, reflowSmallerGetNewLineLengths } from './BufferReflow'; +import { CellData } from './CellData'; +import { NULL_CELL_CHAR, NULL_CELL_CODE, NULL_CELL_WIDTH, WHITESPACE_CELL_CHAR, WHITESPACE_CELL_CODE, WHITESPACE_CELL_WIDTH } from './Constants'; +import { Marker } from './Marker'; +import { IBuffer } from './Types'; +import { DEFAULT_CHARSET } from '../data/Charsets'; +import { IBufferService, ILogService, IOptionsService } from '../services/Services'; export const MAX_BUFFER_SIZE = 4294967295; // 2^32 - 1 diff --git a/src/common/buffer/BufferLine.test.ts b/src/common/buffer/BufferLine.test.ts index 3aec28872..3658611cb 100644 --- a/src/common/buffer/BufferLine.test.ts +++ b/src/common/buffer/BufferLine.test.ts @@ -2,14 +2,14 @@ * Copyright (c) 2018 The xterm.js authors. All rights reserved. * @license MIT */ -import { NULL_CELL_CHAR, NULL_CELL_WIDTH, NULL_CELL_CODE, DEFAULT_ATTR, Content, UnderlineStyle, BgFlags, Attributes, FgFlags } from 'common/buffer/Constants'; -import { BufferLine } from 'common/buffer//BufferLine'; -import { BufferLineStringCache } from 'common/buffer/BufferLineStringCache'; -import { CellData } from 'common/buffer/CellData'; +import { NULL_CELL_CHAR, NULL_CELL_WIDTH, NULL_CELL_CODE, DEFAULT_ATTR, Content, UnderlineStyle, BgFlags, Attributes, FgFlags } from './Constants'; +import { BufferLine } from './BufferLine'; +import { BufferLineStringCache } from './BufferLineStringCache'; +import { CellData } from './CellData'; import { CharData, IBufferLine, ICellData } from '../Types'; import { assert } from 'chai'; -import { AttributeData } from 'common/buffer/AttributeData'; -import { createCellData, NULL_CELL_DATA, extendedAttributes } from 'common/TestUtils.test'; +import { AttributeData } from './AttributeData'; +import { createCellData, NULL_CELL_DATA, extendedAttributes } from '../TestUtils.test'; const TEST_STRING_CACHE = new BufferLineStringCache(); diff --git a/src/common/buffer/BufferLine.ts b/src/common/buffer/BufferLine.ts index e24a000c9..f927f76fc 100644 --- a/src/common/buffer/BufferLine.ts +++ b/src/common/buffer/BufferLine.ts @@ -3,12 +3,12 @@ * @license MIT */ -import { CharData, IAttributeData, IBufferLine, ICellData, IExtendedAttrs } from 'common/Types'; -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/input/TextDecoder'; -import { StringBuilder } from 'common/StringBuilder'; +import { CharData, IAttributeData, IBufferLine, ICellData, IExtendedAttrs } from '../Types'; +import { AttributeData } from './AttributeData'; +import { CellData } from './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 './Constants'; +import { stringFromCodePoint } from '../input/TextDecoder'; +import { StringBuilder } from '../StringBuilder'; // Buffer memory layout: // diff --git a/src/common/buffer/BufferLineStringCache.ts b/src/common/buffer/BufferLineStringCache.ts index b365eef70..54c97423a 100644 --- a/src/common/buffer/BufferLineStringCache.ts +++ b/src/common/buffer/BufferLineStringCache.ts @@ -3,9 +3,9 @@ * @license MIT */ -import type { IBufferLineStringCache, IBufferLineStringCacheEntry } from 'common/buffer/BufferLine'; -import { disposableTimeout } from 'common/Async'; -import { Disposable, MutableDisposable, toDisposable, type IDisposable } from 'common/Lifecycle'; +import type { IBufferLineStringCache, IBufferLineStringCacheEntry } from './BufferLine'; +import { disposableTimeout } from '../Async'; +import { Disposable, MutableDisposable, toDisposable, type IDisposable } from '../Lifecycle'; const enum Constants { CACHE_TTL_MS = 15000 diff --git a/src/common/buffer/BufferRange.test.ts b/src/common/buffer/BufferRange.test.ts index 15d1b8317..056e9c85a 100644 --- a/src/common/buffer/BufferRange.test.ts +++ b/src/common/buffer/BufferRange.test.ts @@ -4,7 +4,7 @@ */ import { assert } from 'chai'; -import { getRangeLength } from 'common/buffer/BufferRange'; +import { getRangeLength } from './BufferRange'; import { IBufferRange } from '@xterm/xterm'; describe('BufferRange', () => { diff --git a/src/common/buffer/BufferReflow.test.ts b/src/common/buffer/BufferReflow.test.ts index d71186ddd..c799fee19 100644 --- a/src/common/buffer/BufferReflow.test.ts +++ b/src/common/buffer/BufferReflow.test.ts @@ -3,10 +3,10 @@ * @license MIT */ import { assert } from 'chai'; -import { BufferLine } from 'common/buffer/BufferLine'; -import { BufferLineStringCache } from 'common/buffer/BufferLineStringCache'; -import { NULL_CELL_CHAR, NULL_CELL_WIDTH, NULL_CELL_CODE } from 'common/buffer/Constants'; -import { reflowSmallerGetNewLineLengths } from 'common/buffer/BufferReflow'; +import { BufferLine } from './BufferLine'; +import { BufferLineStringCache } from './BufferLineStringCache'; +import { NULL_CELL_CHAR, NULL_CELL_WIDTH, NULL_CELL_CODE } from './Constants'; +import { reflowSmallerGetNewLineLengths } from './BufferReflow'; const TEST_STRING_CACHE = new BufferLineStringCache(); diff --git a/src/common/buffer/BufferReflow.ts b/src/common/buffer/BufferReflow.ts index 45a194711..d94739c30 100644 --- a/src/common/buffer/BufferReflow.ts +++ b/src/common/buffer/BufferReflow.ts @@ -3,9 +3,9 @@ * @license MIT */ -import { BufferLine } from 'common/buffer/BufferLine'; -import { CircularList } from 'common/CircularList'; -import { IBufferLine, ICellData } from 'common/Types'; +import { BufferLine } from './BufferLine'; +import { CircularList } from '../CircularList'; +import { IBufferLine, ICellData } from '../Types'; export interface INewLayoutResult { layout: number[]; diff --git a/src/common/buffer/BufferSet.test.ts b/src/common/buffer/BufferSet.test.ts index 8809a3cb6..71a1026dc 100644 --- a/src/common/buffer/BufferSet.test.ts +++ b/src/common/buffer/BufferSet.test.ts @@ -4,9 +4,9 @@ */ import { assert } from 'chai'; -import { BufferSet } from 'common/buffer/BufferSet'; -import { Buffer } from 'common/buffer/Buffer'; -import { MockOptionsService, MockBufferService, MockLogService, createCellData } from 'common/TestUtils.test'; +import { BufferSet } from './BufferSet'; +import { Buffer } from './Buffer'; +import { MockOptionsService, MockBufferService, MockLogService, createCellData } from '../TestUtils.test'; describe('BufferSet', () => { let bufferSet: BufferSet; diff --git a/src/common/buffer/BufferSet.ts b/src/common/buffer/BufferSet.ts index 32a4bf3b4..87b123386 100644 --- a/src/common/buffer/BufferSet.ts +++ b/src/common/buffer/BufferSet.ts @@ -3,12 +3,12 @@ * @license MIT */ -import { Disposable, MutableDisposable } from 'common/Lifecycle'; -import { IAttributeData } from 'common/Types'; -import { Buffer } from 'common/buffer/Buffer'; -import { IBuffer, IBufferSet } from 'common/buffer/Types'; -import { IBufferService, ILogService, IOptionsService } from 'common/services/Services'; -import { Emitter } from 'common/Event'; +import { Disposable, MutableDisposable } from '../Lifecycle'; +import { IAttributeData } from '../Types'; +import { Buffer } from './Buffer'; +import { IBuffer, IBufferSet } from './Types'; +import { IBufferService, ILogService, IOptionsService } from '../services/Services'; +import { Emitter } from '../Event'; /** * The BufferSet represents the set of two buffers used by xterm terminals (normal and alt) and diff --git a/src/common/buffer/CellData.test.ts b/src/common/buffer/CellData.test.ts index 77d1ef9ed..f611f418b 100644 --- a/src/common/buffer/CellData.test.ts +++ b/src/common/buffer/CellData.test.ts @@ -2,8 +2,8 @@ * Copyright (c) 2026 The xterm.js authors. All rights reserved. * @license MIT */ -import { Attributes, BgFlags, FgFlags, UnderlineStyle } from 'common/buffer/Constants'; -import { CellData } from 'common/buffer/CellData'; +import { Attributes, BgFlags, FgFlags, UnderlineStyle } from './Constants'; +import { CellData } from './CellData'; import { assert } from 'chai'; function createStyledCell(char: string, underlineStyle: UnderlineStyle, underlineColor: number): CellData { diff --git a/src/common/buffer/CellData.ts b/src/common/buffer/CellData.ts index 43c4c594b..18f04a30e 100644 --- a/src/common/buffer/CellData.ts +++ b/src/common/buffer/CellData.ts @@ -3,10 +3,10 @@ * @license MIT */ -import { CharData, ICellData, IExtendedAttrs } from 'common/Types'; -import { stringFromCodePoint } from 'common/input/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 { CharData, ICellData, IExtendedAttrs } from '../Types'; +import { stringFromCodePoint } from '../input/TextDecoder'; +import { CHAR_DATA_CHAR_INDEX, CHAR_DATA_WIDTH_INDEX, CHAR_DATA_ATTR_INDEX, Content } from './Constants'; +import { AttributeData, ExtendedAttrs } from './AttributeData'; import type { IBufferCell as IBufferCellApi } from '@xterm/xterm'; /** diff --git a/src/common/buffer/Marker.ts b/src/common/buffer/Marker.ts index 59ad049b0..e69699c1b 100644 --- a/src/common/buffer/Marker.ts +++ b/src/common/buffer/Marker.ts @@ -3,9 +3,9 @@ * @license MIT */ -import { IDisposable, IMarker } from 'common/Types'; -import { Emitter } from 'common/Event'; -import { dispose } from 'common/Lifecycle'; +import { IDisposable, IMarker } from '../Types'; +import { Emitter } from '../Event'; +import { dispose } from '../Lifecycle'; export class Marker implements IMarker { private static _nextId = 1; diff --git a/src/common/buffer/Types.ts b/src/common/buffer/Types.ts index 85dd68eec..0cf448fcb 100644 --- a/src/common/buffer/Types.ts +++ b/src/common/buffer/Types.ts @@ -3,8 +3,8 @@ * @license MIT */ -import { IAttributeData, ICircularList, IBufferLine, ICellData, IMarker, ICharset, IDisposable } from 'common/Types'; -import type { IEvent } from 'common/Event'; +import { IAttributeData, ICircularList, IBufferLine, ICellData, IMarker, ICharset, IDisposable } from '../Types'; +import type { IEvent } from '../Event'; // BufferIndex denotes a position in the buffer: [rowIndex, colIndex] export type BufferIndex = [number, number]; diff --git a/src/common/data/Charsets.ts b/src/common/data/Charsets.ts index 06c1f4b84..9680f4c05 100644 --- a/src/common/data/Charsets.ts +++ b/src/common/data/Charsets.ts @@ -3,7 +3,7 @@ * @license MIT */ -import { ICharset } from 'common/Types'; +import { ICharset } from '../Types'; /** * The character sets supported by the terminal. These enable several languages diff --git a/src/common/input/Keyboard.test.ts b/src/common/input/Keyboard.test.ts index 47f516f0f..02c2c4380 100644 --- a/src/common/input/Keyboard.test.ts +++ b/src/common/input/Keyboard.test.ts @@ -1,7 +1,7 @@ import { assert } from 'chai'; -import { evaluateKeyboardEvent } from 'common/input/Keyboard'; -import { IKeyboardResult, IKeyboardEvent } from 'common/Types'; +import { evaluateKeyboardEvent } from './Keyboard'; +import { IKeyboardResult, IKeyboardEvent } from '../Types'; /** * A helper function for testing which allows passing in a partial event and defaults will be filled diff --git a/src/common/input/Keyboard.ts b/src/common/input/Keyboard.ts index 545b436c8..2c3ca28cd 100644 --- a/src/common/input/Keyboard.ts +++ b/src/common/input/Keyboard.ts @@ -4,8 +4,8 @@ * @license MIT */ -import { IKeyboardEvent, IKeyboardResult, KeyboardResultType } from 'common/Types'; -import { C0 } from 'common/data/EscapeSequences'; +import { IKeyboardEvent, IKeyboardResult, KeyboardResultType } from '../Types'; +import { C0 } from '../data/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.test.ts b/src/common/input/KittyKeyboard.test.ts index 2a832d75f..fe1bc30e2 100644 --- a/src/common/input/KittyKeyboard.test.ts +++ b/src/common/input/KittyKeyboard.test.ts @@ -1,7 +1,7 @@ import { assert } from 'chai'; -import { KittyKeyboard, KittyKeyboardEventType, KittyKeyboardFlags } from 'common/input/KittyKeyboard'; -import { IKeyboardEvent } from 'common/Types'; +import { KittyKeyboard, KittyKeyboardEventType, KittyKeyboardFlags } from './KittyKeyboard'; +import { IKeyboardEvent } from '../Types'; function createEvent(partialEvent: Partial = {}): IKeyboardEvent { return { diff --git a/src/common/input/KittyKeyboard.ts b/src/common/input/KittyKeyboard.ts index ff57b4f89..ec813e5b2 100644 --- a/src/common/input/KittyKeyboard.ts +++ b/src/common/input/KittyKeyboard.ts @@ -6,8 +6,8 @@ * @see https://sw.kovidgoyal.net/kitty/keyboard-protocol/ */ -import { IKeyboardEvent, IKeyboardResult, KeyboardResultType } from 'common/Types'; -import { C0 } from 'common/data/EscapeSequences'; +import { IKeyboardEvent, IKeyboardResult, KeyboardResultType } from '../Types'; +import { C0 } from '../data/EscapeSequences'; /** * Kitty keyboard protocol enhancement flags (bitfield). diff --git a/src/common/input/TextDecoder.test.ts b/src/common/input/TextDecoder.test.ts index 1959e1591..b32d8a721 100644 --- a/src/common/input/TextDecoder.test.ts +++ b/src/common/input/TextDecoder.test.ts @@ -4,7 +4,7 @@ */ import { assert } from 'chai'; -import { StringToUtf32, stringFromCodePoint, Utf8ToUtf32, utf32ToString } from 'common/input/TextDecoder'; +import { StringToUtf32, stringFromCodePoint, Utf8ToUtf32, utf32ToString } from './TextDecoder'; // convert UTF32 codepoints to string diff --git a/src/common/input/UnicodeV6.test.ts b/src/common/input/UnicodeV6.test.ts index 98dc97dc2..a009ee5eb 100644 --- a/src/common/input/UnicodeV6.test.ts +++ b/src/common/input/UnicodeV6.test.ts @@ -4,7 +4,7 @@ */ import { assert } from 'chai'; -import { UnicodeV6 } from 'common/input/UnicodeV6'; +import { UnicodeV6 } from './UnicodeV6'; it('wcwidth should match all values from the old implementation', function(): void { // new implementation diff --git a/src/common/input/UnicodeV6.ts b/src/common/input/UnicodeV6.ts index 83265f705..c872bc441 100644 --- a/src/common/input/UnicodeV6.ts +++ b/src/common/input/UnicodeV6.ts @@ -2,8 +2,8 @@ * Copyright (c) 2019 The xterm.js authors. All rights reserved. * @license MIT */ -import { IUnicodeVersionProvider, UnicodeCharProperties, UnicodeCharWidth } from 'common/services/Services'; -import { UnicodeService } from 'common/services/UnicodeService'; +import { IUnicodeVersionProvider, UnicodeCharProperties, UnicodeCharWidth } from '../services/Services'; +import { UnicodeService } from '../services/UnicodeService'; const BMP_COMBINING = [ [0x0300, 0x036F], [0x0483, 0x0486], [0x0488, 0x0489], diff --git a/src/common/input/Win32InputMode.test.ts b/src/common/input/Win32InputMode.test.ts index d0f333591..fdcc7459d 100644 --- a/src/common/input/Win32InputMode.test.ts +++ b/src/common/input/Win32InputMode.test.ts @@ -4,8 +4,8 @@ */ import { assert } from 'chai'; -import { Win32InputMode, Win32ControlKeyState } from 'common/input/Win32InputMode'; -import { IKeyboardEvent, KeyboardResultType } from 'common/Types'; +import { Win32InputMode, Win32ControlKeyState } from './Win32InputMode'; +import { IKeyboardEvent, KeyboardResultType } from '../Types'; type EventOpts = Partial; const ev = (opts: EventOpts): IKeyboardEvent => ({ diff --git a/src/common/input/Win32InputMode.ts b/src/common/input/Win32InputMode.ts index 72907836d..9f73440d5 100644 --- a/src/common/input/Win32InputMode.ts +++ b/src/common/input/Win32InputMode.ts @@ -14,8 +14,8 @@ * Rc: Repeat count (usually 1) */ -import { IKeyboardEvent, IKeyboardResult, KeyboardResultType } from 'common/Types'; -import { C0 } from 'common/data/EscapeSequences'; +import { IKeyboardEvent, IKeyboardResult, KeyboardResultType } from '../Types'; +import { C0 } from '../data/EscapeSequences'; /** * Win32 control key state flags (from Windows API). diff --git a/src/common/input/WriteBuffer.ts b/src/common/input/WriteBuffer.ts index 7ecab58ad..85774363b 100644 --- a/src/common/input/WriteBuffer.ts +++ b/src/common/input/WriteBuffer.ts @@ -4,9 +4,9 @@ * @license MIT */ -import { TimeoutTimer } from 'common/Async'; -import { Disposable, toDisposable } from 'common/Lifecycle'; -import { Emitter } from 'common/Event'; +import { TimeoutTimer } from '../Async'; +import { Disposable, toDisposable } from '../Lifecycle'; +import { Emitter } from '../Event'; const enum Constants { /** diff --git a/src/common/input/XParseColor.test.ts b/src/common/input/XParseColor.test.ts index 4a73cdbbf..9e7b03abe 100644 --- a/src/common/input/XParseColor.test.ts +++ b/src/common/input/XParseColor.test.ts @@ -4,7 +4,7 @@ */ import { assert } from 'chai'; -import { parseColor, toRgbString } from 'common/input/XParseColor'; +import { parseColor, toRgbString } from './XParseColor'; describe('XParseColor', () => { describe('parseColor', () => { diff --git a/src/common/parser/ApcParser.test.ts b/src/common/parser/ApcParser.test.ts index c2200d918..b27b40039 100644 --- a/src/common/parser/ApcParser.test.ts +++ b/src/common/parser/ApcParser.test.ts @@ -3,9 +3,9 @@ * @license MIT */ import { assert } from 'chai'; -import { ApcParser, ApcHandler } from 'common/parser/ApcParser'; -import { StringToUtf32, utf32ToString } from 'common/input/TextDecoder'; -import { IApcHandler, IFunctionIdentifier } from 'common/parser/Types'; +import { ApcParser, ApcHandler } from './ApcParser'; +import { StringToUtf32, utf32ToString } from '../input/TextDecoder'; +import { IApcHandler, IFunctionIdentifier } from './Types'; function toUtf32(s: string): Uint32Array { const utf32 = new Uint32Array(s.length); diff --git a/src/common/parser/ApcParser.ts b/src/common/parser/ApcParser.ts index 4e647d037..f0d465efc 100644 --- a/src/common/parser/ApcParser.ts +++ b/src/common/parser/ApcParser.ts @@ -3,11 +3,11 @@ * @license MIT */ -import { IApcHandler, IHandlerCollection, ApcFallbackHandlerType, IApcParser, ISubParserStackState } from 'common/parser/Types'; -import { ParserConstants } from 'common/parser/Constants'; -import { utf32ToString } from 'common/input/TextDecoder'; -import { IDisposable } from 'common/Types'; -import { LimitedStringBuilder } from 'common/StringBuilder'; +import { IApcHandler, IHandlerCollection, ApcFallbackHandlerType, IApcParser, ISubParserStackState } from './Types'; +import { ParserConstants } from './Constants'; +import { utf32ToString } from '../input/TextDecoder'; +import { IDisposable } from '../Types'; +import { LimitedStringBuilder } from '../StringBuilder'; const EMPTY_HANDLERS: IApcHandler[] = []; diff --git a/src/common/parser/DcsParser.test.ts b/src/common/parser/DcsParser.test.ts index 0296fa88e..459bc8961 100644 --- a/src/common/parser/DcsParser.test.ts +++ b/src/common/parser/DcsParser.test.ts @@ -3,10 +3,10 @@ * @license MIT */ import { assert } from 'chai'; -import { DcsParser, DcsHandler } from 'common/parser/DcsParser'; -import { IDcsHandler, IParams, IFunctionIdentifier } from 'common/parser/Types'; -import { utf32ToString, StringToUtf32 } from 'common/input/TextDecoder'; -import { Params } from 'common/parser/Params'; +import { DcsParser, DcsHandler } from './DcsParser'; +import { IDcsHandler, IParams, IFunctionIdentifier } from './Types'; +import { utf32ToString, StringToUtf32 } from '../input/TextDecoder'; +import { Params } from './Params'; function toUtf32(s: string): Uint32Array { const utf32 = new Uint32Array(s.length); diff --git a/src/common/parser/DcsParser.ts b/src/common/parser/DcsParser.ts index 25c22b8dd..1b2d34835 100644 --- a/src/common/parser/DcsParser.ts +++ b/src/common/parser/DcsParser.ts @@ -3,12 +3,12 @@ * @license MIT */ -import { IDisposable } from 'common/Types'; -import { IDcsHandler, IParams, IHandlerCollection, IDcsParser, DcsFallbackHandlerType, ISubParserStackState } from 'common/parser/Types'; -import { utf32ToString } from 'common/input/TextDecoder'; -import { Params } from 'common/parser/Params'; -import { ParserConstants } from 'common/parser/Constants'; -import { LimitedStringBuilder } from 'common/StringBuilder'; +import { IDisposable } from '../Types'; +import { IDcsHandler, IParams, IHandlerCollection, IDcsParser, DcsFallbackHandlerType, ISubParserStackState } from './Types'; +import { utf32ToString } from '../input/TextDecoder'; +import { Params } from './Params'; +import { ParserConstants } from './Constants'; +import { LimitedStringBuilder } from '../StringBuilder'; const EMPTY_HANDLERS: IDcsHandler[] = []; diff --git a/src/common/parser/EscapeSequenceParser.test.ts b/src/common/parser/EscapeSequenceParser.test.ts index 2d5a04df7..f684da2c8 100644 --- a/src/common/parser/EscapeSequenceParser.test.ts +++ b/src/common/parser/EscapeSequenceParser.test.ts @@ -3,16 +3,16 @@ * @license MIT */ -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 { IParsingState, IParams, ParamsArray, IOscParser, IOscHandler, OscFallbackHandlerType, IFunctionIdentifier, IParserStackState, ParserStackType } from './Types'; +import { EscapeSequenceParser, TransitionTable, VT500_TRANSITION_TABLE } from './EscapeSequenceParser'; import { assert } from 'chai'; -import { StringToUtf32, stringFromCodePoint, utf32ToString } from 'common/input/TextDecoder'; -import { ParserState } from 'common/parser/Constants'; -import { Params } from 'common/parser/Params'; -import { OscHandler } from 'common/parser/OscParser'; -import { IDisposable } from 'common/Types'; -import { DcsHandler } from 'common/parser/DcsParser'; -import { ApcHandler } from 'common/parser/ApcParser'; +import { StringToUtf32, stringFromCodePoint, utf32ToString } from '../input/TextDecoder'; +import { ParserState } from './Constants'; +import { Params } from './Params'; +import { OscHandler } from './OscParser'; +import { IDisposable } from '../Types'; +import { DcsHandler } from './DcsParser'; +import { ApcHandler } from './ApcParser'; function r(a: number, b: number): string[] { diff --git a/src/common/parser/EscapeSequenceParser.ts b/src/common/parser/EscapeSequenceParser.ts index 2780d8916..a0c97b610 100644 --- a/src/common/parser/EscapeSequenceParser.ts +++ b/src/common/parser/EscapeSequenceParser.ts @@ -3,14 +3,14 @@ * @license MIT */ -import { IParsingState, IDcsHandler, IEscapeSequenceParser, IParams, IOscHandler, IHandlerCollection, CsiHandlerType, OscFallbackHandlerType, IOscParser, EscHandlerType, IDcsParser, DcsFallbackHandlerType, IFunctionIdentifier, ExecuteFallbackHandlerType, CsiFallbackHandlerType, EscFallbackHandlerType, PrintHandlerType, PrintFallbackHandlerType, ExecuteHandlerType, IParserStackState, ParserStackType, ResumableHandlersType, IApcHandler, IApcParser, ApcFallbackHandlerType } from 'common/parser/Types'; -import { ParserState, ParserAction } from 'common/parser/Constants'; -import { Disposable, toDisposable } from 'common/Lifecycle'; -import { IDisposable } from 'common/Types'; -import { Params } from 'common/parser/Params'; -import { OscParser } from 'common/parser/OscParser'; -import { DcsParser } from 'common/parser/DcsParser'; -import { ApcParser } from 'common/parser/ApcParser'; +import { IParsingState, IDcsHandler, IEscapeSequenceParser, IParams, IOscHandler, IHandlerCollection, CsiHandlerType, OscFallbackHandlerType, IOscParser, EscHandlerType, IDcsParser, DcsFallbackHandlerType, IFunctionIdentifier, ExecuteFallbackHandlerType, CsiFallbackHandlerType, EscFallbackHandlerType, PrintHandlerType, PrintFallbackHandlerType, ExecuteHandlerType, IParserStackState, ParserStackType, ResumableHandlersType, IApcHandler, IApcParser, ApcFallbackHandlerType } from './Types'; +import { ParserState, ParserAction } from './Constants'; +import { Disposable, toDisposable } from '../Lifecycle'; +import { IDisposable } from '../Types'; +import { Params } from './Params'; +import { OscParser } from './OscParser'; +import { DcsParser } from './DcsParser'; +import { ApcParser } from './ApcParser'; /** * VT commands done by the parser diff --git a/src/common/parser/OscParser.test.ts b/src/common/parser/OscParser.test.ts index b6b96cbad..b97a7617a 100644 --- a/src/common/parser/OscParser.test.ts +++ b/src/common/parser/OscParser.test.ts @@ -3,9 +3,9 @@ * @license MIT */ import { assert } from 'chai'; -import { OscParser, OscHandler } from 'common/parser/OscParser'; -import { StringToUtf32, utf32ToString } from 'common/input/TextDecoder'; -import { IOscHandler } from 'common/parser/Types'; +import { OscParser, OscHandler } from './OscParser'; +import { StringToUtf32, utf32ToString } from '../input/TextDecoder'; +import { IOscHandler } from './Types'; function toUtf32(s: string): Uint32Array { const utf32 = new Uint32Array(s.length); diff --git a/src/common/parser/OscParser.ts b/src/common/parser/OscParser.ts index 3e05f2298..0d2a06534 100644 --- a/src/common/parser/OscParser.ts +++ b/src/common/parser/OscParser.ts @@ -3,11 +3,11 @@ * @license MIT */ -import { IOscHandler, IHandlerCollection, OscFallbackHandlerType, IOscParser, ISubParserStackState } from 'common/parser/Types'; -import { OscState, ParserConstants } from 'common/parser/Constants'; -import { utf32ToString } from 'common/input/TextDecoder'; -import { IDisposable } from 'common/Types'; -import { LimitedStringBuilder } from 'common/StringBuilder'; +import { IOscHandler, IHandlerCollection, OscFallbackHandlerType, IOscParser, ISubParserStackState } from './Types'; +import { OscState, ParserConstants } from './Constants'; +import { utf32ToString } from '../input/TextDecoder'; +import { IDisposable } from '../Types'; +import { LimitedStringBuilder } from '../StringBuilder'; const EMPTY_HANDLERS: IOscHandler[] = []; diff --git a/src/common/parser/Params.test.ts b/src/common/parser/Params.test.ts index 2418fa452..3bd67d397 100644 --- a/src/common/parser/Params.test.ts +++ b/src/common/parser/Params.test.ts @@ -3,8 +3,8 @@ * @license MIT */ import { assert } from 'chai'; -import { Params } from 'common/parser/Params'; -import { ParamsArray } from 'common/parser/Types'; +import { Params } from './Params'; +import { ParamsArray } from './Types'; class TestParams extends Params { public get subParams(): Int32Array { diff --git a/src/common/parser/Params.ts b/src/common/parser/Params.ts index 8a77c78a4..6986a48ba 100644 --- a/src/common/parser/Params.ts +++ b/src/common/parser/Params.ts @@ -2,7 +2,7 @@ * Copyright (c) 2019 The xterm.js authors. All rights reserved. * @license MIT */ -import { IParams, ParamsArray } from 'common/parser/Types'; +import { IParams, ParamsArray } from './Types'; const enum Constants { /** diff --git a/src/common/parser/Types.ts b/src/common/parser/Types.ts index c04788f7e..2e148c4d1 100644 --- a/src/common/parser/Types.ts +++ b/src/common/parser/Types.ts @@ -3,8 +3,8 @@ * @license MIT */ -import { IDisposable } from 'common/Types'; -import { ParserState } from 'common/parser/Constants'; +import { IDisposable } from '../Types'; +import { ParserState } from './Constants'; /** sequence params serialized to js arrays */ diff --git a/src/common/public/BufferApiView.ts b/src/common/public/BufferApiView.ts index 834cedbee..a2f838ccb 100644 --- a/src/common/public/BufferApiView.ts +++ b/src/common/public/BufferApiView.ts @@ -4,9 +4,9 @@ */ import { IBuffer as IBufferApi, IBufferLine as IBufferLineApi, IBufferCell as IBufferCellApi } from '@xterm/xterm'; -import { IBuffer } from 'common/buffer/Types'; -import { BufferLineApiView } from 'common/public/BufferLineApiView'; -import { CellData } from 'common/buffer/CellData'; +import { IBuffer } from '../buffer/Types'; +import { BufferLineApiView } from './BufferLineApiView'; +import { CellData } from '../buffer/CellData'; export class BufferApiView implements IBufferApi { constructor( diff --git a/src/common/public/BufferLineApiView.ts b/src/common/public/BufferLineApiView.ts index 0a747fa41..ecffd1fbb 100644 --- a/src/common/public/BufferLineApiView.ts +++ b/src/common/public/BufferLineApiView.ts @@ -3,8 +3,8 @@ * @license MIT */ -import { CellData } from 'common/buffer/CellData'; -import { IBufferLine, ICellData } from 'common/Types'; +import { CellData } from '../buffer/CellData'; +import { IBufferLine, ICellData } from '../Types'; import { IBufferCell as IBufferCellApi, IBufferLine as IBufferLineApi } from '@xterm/xterm'; export class BufferLineApiView implements IBufferLineApi { diff --git a/src/common/public/BufferNamespaceApi.ts b/src/common/public/BufferNamespaceApi.ts index b9744f943..9d56587f8 100644 --- a/src/common/public/BufferNamespaceApi.ts +++ b/src/common/public/BufferNamespaceApi.ts @@ -4,10 +4,10 @@ */ import { IBuffer as IBufferApi, IBufferNamespace as IBufferNamespaceApi } from '@xterm/xterm'; -import { BufferApiView } from 'common/public/BufferApiView'; -import { ICoreTerminal } from 'common/Types'; -import { Disposable } from 'common/Lifecycle'; -import { Emitter } from 'common/Event'; +import { BufferApiView } from './BufferApiView'; +import { ICoreTerminal } from '../Types'; +import { Disposable } from '../Lifecycle'; +import { Emitter } from '../Event'; export class BufferNamespaceApi extends Disposable implements IBufferNamespaceApi { private _normal: BufferApiView; diff --git a/src/common/public/ParserApi.ts b/src/common/public/ParserApi.ts index 4c482d7ca..02dcc44c9 100644 --- a/src/common/public/ParserApi.ts +++ b/src/common/public/ParserApi.ts @@ -3,9 +3,9 @@ * @license MIT */ -import { IParams } from 'common/parser/Types'; +import { IParams } from '../parser/Types'; import { IDisposable, IFunctionIdentifier, IParser } from '@xterm/xterm'; -import { ICoreTerminal } from 'common/Types'; +import { ICoreTerminal } from '../Types'; export class ParserApi implements IParser { constructor(private _core: ICoreTerminal) { } diff --git a/src/common/public/UnicodeApi.ts b/src/common/public/UnicodeApi.ts index ec9bd1f77..fff2665e1 100644 --- a/src/common/public/UnicodeApi.ts +++ b/src/common/public/UnicodeApi.ts @@ -3,7 +3,7 @@ * @license MIT */ -import { ICoreTerminal } from 'common/Types'; +import { ICoreTerminal } from '../Types'; import { IUnicodeHandling, IUnicodeVersionProvider } from '@xterm/xterm'; export class UnicodeApi implements IUnicodeHandling { diff --git a/src/common/services/BufferService.ts b/src/common/services/BufferService.ts index 06ac6b10a..5135e7786 100644 --- a/src/common/services/BufferService.ts +++ b/src/common/services/BufferService.ts @@ -3,12 +3,12 @@ * @license MIT */ -import { Disposable } from 'common/Lifecycle'; -import { IAttributeData, IBufferLine } from 'common/Types'; -import { BufferSet } from 'common/buffer/BufferSet'; -import { IBuffer, IBufferSet } from 'common/buffer/Types'; -import { IBufferService, ILogService, IOptionsService, type IBufferResizeEvent } from 'common/services/Services'; -import { Emitter } from 'common/Event'; +import { Disposable } from '../Lifecycle'; +import { IAttributeData, IBufferLine } from '../Types'; +import { BufferSet } from '../buffer/BufferSet'; +import { IBuffer, IBufferSet } from '../buffer/Types'; +import { IBufferService, ILogService, IOptionsService, type IBufferResizeEvent } from './Services'; +import { Emitter } from '../Event'; export const enum BufferServiceConstants { MINIMUM_COLS = 2, // Less than 2 can mess with wide chars diff --git a/src/common/services/CharsetService.ts b/src/common/services/CharsetService.ts index bcd027a64..ffc68514e 100644 --- a/src/common/services/CharsetService.ts +++ b/src/common/services/CharsetService.ts @@ -3,8 +3,8 @@ * @license MIT */ -import { ICharsetService } from 'common/services/Services'; -import { ICharset } from 'common/Types'; +import { ICharsetService } from './Services'; +import { ICharset } from '../Types'; export class CharsetService implements ICharsetService { public serviceBrand: any; diff --git a/src/common/services/CoreService.test.ts b/src/common/services/CoreService.test.ts index 7ae8bf185..c71d627d9 100644 --- a/src/common/services/CoreService.test.ts +++ b/src/common/services/CoreService.test.ts @@ -3,9 +3,9 @@ * @license MIT */ -import { ICoreService } from 'common/services/Services'; -import { CoreService } from 'common/services/CoreService'; -import { MockBufferService, MockLogService, MockOptionsService } from 'common/TestUtils.test'; +import { ICoreService } from './Services'; +import { CoreService } from './CoreService'; +import { MockBufferService, MockLogService, MockOptionsService } from '../TestUtils.test'; import { assert } from 'chai'; describe('CoreService', () => { diff --git a/src/common/services/CoreService.ts b/src/common/services/CoreService.ts index f5094f5a9..b3e04ebe6 100644 --- a/src/common/services/CoreService.ts +++ b/src/common/services/CoreService.ts @@ -3,10 +3,10 @@ * @license MIT */ -import { Disposable } from 'common/Lifecycle'; -import { IDecPrivateModes, IKittyKeyboardState, IModes } from 'common/Types'; -import { IBufferService, ICoreService, ILogService, IOptionsService } from 'common/services/Services'; -import { Emitter } from 'common/Event'; +import { Disposable } from '../Lifecycle'; +import { IDecPrivateModes, IKittyKeyboardState, IModes } from '../Types'; +import { IBufferService, ICoreService, ILogService, IOptionsService } from './Services'; +import { Emitter } from '../Event'; const DEFAULT_MODES: IModes = Object.freeze({ insertMode: false diff --git a/src/common/services/DecorationService.test.ts b/src/common/services/DecorationService.test.ts index e3a6c2f04..71299d330 100644 --- a/src/common/services/DecorationService.test.ts +++ b/src/common/services/DecorationService.test.ts @@ -5,12 +5,12 @@ import { assert } from 'chai'; import { DecorationLineCache, DecorationService } from './DecorationService'; -import { IMarker } from 'common/Types'; -import { Disposable } from 'common/Lifecycle'; -import { Emitter } from 'common/Event'; -import { MockLogService, MockBufferService, MockOptionsService } from 'common/TestUtils.test'; -import { Buffer } from 'common/buffer/Buffer'; -import { DEFAULT_ATTR_DATA } from 'common/buffer/BufferLine'; +import { IMarker } from '../Types'; +import { Disposable } from '../Lifecycle'; +import { Emitter } from '../Event'; +import { MockLogService, MockBufferService, MockOptionsService } from '../TestUtils.test'; +import { Buffer } from '../buffer/Buffer'; +import { DEFAULT_ATTR_DATA } from '../buffer/BufferLine'; function createFakeMarker(line: number): IMarker { return Object.freeze(new class extends Disposable { diff --git a/src/common/services/DecorationService.ts b/src/common/services/DecorationService.ts index 6db9bcf78..5c2a1d33a 100644 --- a/src/common/services/DecorationService.ts +++ b/src/common/services/DecorationService.ts @@ -3,15 +3,15 @@ * @license MIT */ -import type { IDeleteEvent, IInsertEvent } from 'common/CircularList'; -import { MicrotaskTimer } from 'common/Async'; -import { css } from 'common/Color'; -import { Disposable, DisposableStore, MutableDisposable, toDisposable } from 'common/Lifecycle'; -import { IBufferService, IDecorationService, IInternalDecoration, ILogService } from 'common/services/Services'; -import { SortedList } from 'common/SortedList'; -import { IColor, ICircularList } from 'common/Types'; +import type { IDeleteEvent, IInsertEvent } from '../CircularList'; +import { MicrotaskTimer } from '../Async'; +import { css } from '../Color'; +import { Disposable, DisposableStore, MutableDisposable, toDisposable } from '../Lifecycle'; +import { IBufferService, IDecorationService, IInternalDecoration, ILogService } from './Services'; +import { SortedList } from '../SortedList'; +import { IColor, ICircularList } from '../Types'; import { IDecoration, IDecorationOptions, IMarker } from '@xterm/xterm'; -import { Emitter } from 'common/Event'; +import { Emitter } from '../Event'; // Work variables to avoid garbage collection let $xmin = 0; diff --git a/src/common/services/InstantiationService.ts b/src/common/services/InstantiationService.ts index 7e7695485..f4dbf53c1 100644 --- a/src/common/services/InstantiationService.ts +++ b/src/common/services/InstantiationService.ts @@ -9,8 +9,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { IInstantiationService, IServiceIdentifier } from 'common/services/Services'; -import { getServiceDependencies } from 'common/services/ServiceRegistry'; +import { IInstantiationService, IServiceIdentifier } from './Services'; +import { getServiceDependencies } from './ServiceRegistry'; export class ServiceCollection { diff --git a/src/common/services/LogService.ts b/src/common/services/LogService.ts index 8bc1e0aaa..75ff68e29 100644 --- a/src/common/services/LogService.ts +++ b/src/common/services/LogService.ts @@ -3,8 +3,8 @@ * @license MIT */ -import { Disposable } from 'common/Lifecycle'; -import { ILogService, IOptionsService, LogLevelEnum } from 'common/services/Services'; +import { Disposable } from '../Lifecycle'; +import { ILogService, IOptionsService, LogLevelEnum } from './Services'; type LogType = (message?: any, ...optionalParams: any[]) => void; diff --git a/src/common/services/MouseStateService.test.ts b/src/common/services/MouseStateService.test.ts index 0f2cd489a..7daf7d1e8 100644 --- a/src/common/services/MouseStateService.test.ts +++ b/src/common/services/MouseStateService.test.ts @@ -2,9 +2,9 @@ * Copyright (c) 2019 The xterm.js authors. All rights reserved. * @license MIT */ -import { MouseStateService } from 'common/services/MouseStateService'; +import { MouseStateService } from './MouseStateService'; import { assert } from 'chai'; -import { ICoreMouseEvent, CoreMouseEventType } from 'common/Types'; +import { ICoreMouseEvent, CoreMouseEventType } from '../Types'; function toBytes(s: string | undefined): number[] { if (!s) { diff --git a/src/common/services/MouseStateService.ts b/src/common/services/MouseStateService.ts index 21420460a..40a448f57 100644 --- a/src/common/services/MouseStateService.ts +++ b/src/common/services/MouseStateService.ts @@ -2,10 +2,10 @@ * Copyright (c) 2019 The xterm.js authors. All rights reserved. * @license MIT */ -import { IMouseStateService } from 'common/services/Services'; -import { ICoreMouseProtocol, ICoreMouseEvent, CoreMouseEncoding, CoreMouseEventType, CoreMouseButton, CoreMouseAction } from 'common/Types'; -import { Disposable } from 'common/Lifecycle'; -import { Emitter } from 'common/Event'; +import { IMouseStateService } from './Services'; +import { ICoreMouseProtocol, ICoreMouseEvent, CoreMouseEncoding, CoreMouseEventType, CoreMouseButton, CoreMouseAction } from '../Types'; +import { Disposable } from '../Lifecycle'; +import { Emitter } from '../Event'; /** * Supported default protocols. diff --git a/src/common/services/OptionsService.test.ts b/src/common/services/OptionsService.test.ts index 004f73168..95e2058e9 100644 --- a/src/common/services/OptionsService.test.ts +++ b/src/common/services/OptionsService.test.ts @@ -4,8 +4,8 @@ */ import { assert } from 'chai'; -import { OptionsService, DEFAULT_OPTIONS } from 'common/services/OptionsService'; -import { IDisposable } from 'common/Types'; +import { OptionsService, DEFAULT_OPTIONS } from './OptionsService'; +import { IDisposable } from '../Types'; describe('OptionsService', () => { describe('constructor', () => { diff --git a/src/common/services/OptionsService.ts b/src/common/services/OptionsService.ts index 8527d2ea0..d14982e3f 100644 --- a/src/common/services/OptionsService.ts +++ b/src/common/services/OptionsService.ts @@ -3,11 +3,11 @@ * @license MIT */ -import { Disposable, toDisposable } from 'common/Lifecycle'; -import { isMac } from 'common/Platform'; -import { CursorStyle, IDisposable } from 'common/Types'; -import { FontWeight, IOptionsService, ITerminalOptions } from 'common/services/Services'; -import { Emitter } from 'common/Event'; +import { Disposable, toDisposable } from '../Lifecycle'; +import { isMac } from '../Platform'; +import { CursorStyle, IDisposable } from '../Types'; +import { FontWeight, IOptionsService, ITerminalOptions } from './Services'; +import { Emitter } from '../Event'; export const DEFAULT_OPTIONS: Readonly> = { cols: 80, diff --git a/src/common/services/OscLinkService.test.ts b/src/common/services/OscLinkService.test.ts index cc6c2228a..c49928b51 100644 --- a/src/common/services/OscLinkService.test.ts +++ b/src/common/services/OscLinkService.test.ts @@ -4,12 +4,12 @@ */ import { assert } from 'chai'; -import { AttributeData } from 'common/buffer/AttributeData'; -import { BufferService } from 'common/services/BufferService'; -import { OptionsService } from 'common/services/OptionsService'; -import { OscLinkService } from 'common/services/OscLinkService'; -import { IBufferService, IOptionsService, IOscLinkService } from 'common/services/Services'; -import { MockLogService } from 'common/TestUtils.test'; +import { AttributeData } from '../buffer/AttributeData'; +import { BufferService } from './BufferService'; +import { OptionsService } from './OptionsService'; +import { OscLinkService } from './OscLinkService'; +import { IBufferService, IOptionsService, IOscLinkService } from './Services'; +import { MockLogService } from '../TestUtils.test'; describe('OscLinkService', () => { describe('constructor', () => { diff --git a/src/common/services/OscLinkService.ts b/src/common/services/OscLinkService.ts index 13bd8aa4b..e28f4cfc8 100644 --- a/src/common/services/OscLinkService.ts +++ b/src/common/services/OscLinkService.ts @@ -2,8 +2,8 @@ * Copyright (c) 2022 The xterm.js authors. All rights reserved. * @license MIT */ -import { IBufferService, IOscLinkService } from 'common/services/Services'; -import { IMarker, IOscLinkData } from 'common/Types'; +import { IBufferService, IOscLinkService } from './Services'; +import { IMarker, IOscLinkData } from '../Types'; export class OscLinkService implements IOscLinkService { public serviceBrand: any; diff --git a/src/common/services/ServiceRegistry.ts b/src/common/services/ServiceRegistry.ts index af51d1641..f4565b166 100644 --- a/src/common/services/ServiceRegistry.ts +++ b/src/common/services/ServiceRegistry.ts @@ -9,7 +9,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { IServiceIdentifier } from 'common/services/Services'; +import { IServiceIdentifier } from './Services'; const enum Constants { DI_TARGET = 'di$target', diff --git a/src/common/services/Services.ts b/src/common/services/Services.ts index fa1c4412f..0df3786f6 100644 --- a/src/common/services/Services.ts +++ b/src/common/services/Services.ts @@ -4,10 +4,10 @@ */ import type { IDecoration, IDecorationOptions, ILinkHandler, ILogger, IWindowsPty, IOverviewRulerOptions } from '@xterm/xterm'; -import { CoreMouseEncoding, CoreMouseEventType, CursorInactiveStyle, CursorStyle, IAttributeData, ICharset, IColor, ICoreMouseEvent, ICoreMouseProtocol, IDecPrivateModes, IDisposable, IKittyKeyboardState, IModes, IOscLinkData, IWindowOptions } from 'common/Types'; -import { IBuffer, IBufferSet } from 'common/buffer/Types'; -import { createDecorator } from 'common/services/ServiceRegistry'; -import type { Emitter, IEvent } from 'common/Event'; +import { CoreMouseEncoding, CoreMouseEventType, CursorInactiveStyle, CursorStyle, IAttributeData, ICharset, IColor, ICoreMouseEvent, ICoreMouseProtocol, IDecPrivateModes, IDisposable, IKittyKeyboardState, IModes, IOscLinkData, IWindowOptions } from '../Types'; +import { IBuffer, IBufferSet } from '../buffer/Types'; +import { createDecorator } from './ServiceRegistry'; +import type { Emitter, IEvent } from '../Event'; export const IBufferService = createDecorator('BufferService'); export interface IBufferService { diff --git a/src/common/services/UnicodeService.test.ts b/src/common/services/UnicodeService.test.ts index 01e3c0862..d43605542 100644 --- a/src/common/services/UnicodeService.test.ts +++ b/src/common/services/UnicodeService.test.ts @@ -4,8 +4,8 @@ */ import { assert } from 'chai'; -import { UnicodeService } from 'common/services/UnicodeService'; -import { IUnicodeVersionProvider } from 'common/services/Services'; +import { UnicodeService } from './UnicodeService'; +import { IUnicodeVersionProvider } from './Services'; class DummyProvider implements IUnicodeVersionProvider { public version = '123'; diff --git a/src/common/services/UnicodeService.ts b/src/common/services/UnicodeService.ts index d0dd8584d..1d4d6cc8f 100644 --- a/src/common/services/UnicodeService.ts +++ b/src/common/services/UnicodeService.ts @@ -3,9 +3,9 @@ * @license MIT */ -import { UnicodeV6 } from 'common/input/UnicodeV6'; -import { IUnicodeService, IUnicodeVersionProvider, UnicodeCharProperties, UnicodeCharWidth } from 'common/services/Services'; -import { Emitter } from 'common/Event'; +import { UnicodeV6 } from '../input/UnicodeV6'; +import { IUnicodeService, IUnicodeVersionProvider, UnicodeCharProperties, UnicodeCharWidth } from './Services'; +import { Emitter } from '../Event'; export class UnicodeService implements IUnicodeService { public serviceBrand: any; diff --git a/src/common/tsconfig.json b/src/common/tsconfig.json index 31a893756..c7488a89e 100644 --- a/src/common/tsconfig.json +++ b/src/common/tsconfig.json @@ -10,11 +10,7 @@ "outDir": "../../out", "types": [ "../../node_modules/@types/mocha" - ], - "paths": { - "common/*": [ "./../common/*" ], - "*": [ "./../*" ] - } + ] }, "include": [ "./**/*", diff --git a/src/headless/Terminal.ts b/src/headless/Terminal.ts index a348ae824..4d4266d19 100644 --- a/src/headless/Terminal.ts +++ b/src/headless/Terminal.ts @@ -21,11 +21,11 @@ * http://linux.die.net/man/7/urxvt */ -import { DEFAULT_ATTR_DATA } from 'common/buffer/BufferLine'; -import { IBuffer } from 'common/buffer/Types'; -import { CoreTerminal } from 'common/CoreTerminal'; -import { IMarker, ITerminalOptions } from 'common/Types'; -import { Emitter, EventUtils } from 'common/Event'; +import { DEFAULT_ATTR_DATA } from '../common/buffer/BufferLine'; +import { IBuffer } from '../common/buffer/Types'; +import { CoreTerminal } from '../common/CoreTerminal'; +import { IMarker, ITerminalOptions } from '../common/Types'; +import { Emitter, EventUtils } from '../common/Event'; export class Terminal extends CoreTerminal { private readonly _onBell = this._register(new Emitter()); diff --git a/src/headless/public/Terminal.test.ts b/src/headless/public/Terminal.test.ts index 73e2f4865..6fa9d32e1 100644 --- a/src/headless/public/Terminal.test.ts +++ b/src/headless/public/Terminal.test.ts @@ -4,7 +4,7 @@ */ import { deepStrictEqual, strictEqual, throws } from 'assert'; -import { Terminal } from 'headless/public/Terminal'; +import { Terminal } from './Terminal'; import { ITerminalOptions } from '@xterm/headless'; let term: Terminal; diff --git a/src/headless/public/Terminal.ts b/src/headless/public/Terminal.ts index d593dea15..22dabb02a 100644 --- a/src/headless/public/Terminal.ts +++ b/src/headless/public/Terminal.ts @@ -3,15 +3,15 @@ * @license MIT */ -import { BufferNamespaceApi } from 'common/public/BufferNamespaceApi'; -import { ParserApi } from 'common/public/ParserApi'; -import { UnicodeApi } from 'common/public/UnicodeApi'; +import { BufferNamespaceApi } from '../../common/public/BufferNamespaceApi'; +import { ParserApi } from '../../common/public/ParserApi'; +import { UnicodeApi } from '../../common/public/UnicodeApi'; import { IBufferNamespace as IBufferNamespaceApi, IMarker, IModes, IParser, ITerminalAddon, ITerminalInitOnlyOptions, IUnicodeHandling, Terminal as ITerminalApi } from '@xterm/headless'; -import { Terminal as TerminalCore } from 'headless/Terminal'; -import { AddonManager } from 'common/public/AddonManager'; -import { ITerminalOptions } from 'common/Types'; -import { Disposable } from 'common/Lifecycle'; -import type { IEvent } from 'common/Event'; +import { Terminal as TerminalCore } from '../Terminal'; +import { AddonManager } from '../../common/public/AddonManager'; +import { ITerminalOptions } from '../../common/Types'; +import { Disposable } from '../../common/Lifecycle'; +import type { IEvent } from '../../common/Event'; /** * The set of options that only have an effect when set in the Terminal constructor. */ diff --git a/src/headless/tsconfig.json b/src/headless/tsconfig.json index 0c445bcfc..96b0cc39b 100644 --- a/src/headless/tsconfig.json +++ b/src/headless/tsconfig.json @@ -10,11 +10,7 @@ "types": [ "../../node_modules/@types/mocha", "../../node_modules/@types/node" - ], - "paths": { - "common/*": [ "./../common/*" ], - "*": [ "./../*" ] - } + ] }, "include": [ "./**/*", diff --git a/test/benchmark/DecorationService.benchmark.ts b/test/benchmark/DecorationService.benchmark.ts index 1a2033de1..534a1fa30 100644 --- a/test/benchmark/DecorationService.benchmark.ts +++ b/test/benchmark/DecorationService.benchmark.ts @@ -4,8 +4,8 @@ */ import { perfContext, before, RuntimeCase } from 'xterm-benchmark'; -import { DecorationService } from 'common/services/DecorationService'; -import { MockLogService, MockBufferService, MockOptionsService } from 'common/TestUtils.test'; +import { DecorationService } from '../../src/common/services/DecorationService'; +import { MockLogService, MockBufferService, MockOptionsService } from '../../src/common/TestUtils.test'; const enum Constants { COLS = 80, ROWS = 30, diff --git a/test/benchmark/EscapeSequenceParser.benchmark.ts b/test/benchmark/EscapeSequenceParser.benchmark.ts index 5c9f372fb..c2cecfdbb 100644 --- a/test/benchmark/EscapeSequenceParser.benchmark.ts +++ b/test/benchmark/EscapeSequenceParser.benchmark.ts @@ -4,12 +4,12 @@ */ import { perfContext, before, beforeEach, ThroughputRuntimeCase } from 'xterm-benchmark'; -import { EscapeSequenceParser } from 'common/parser/EscapeSequenceParser'; -import { C0, C1 } from 'common/data/EscapeSequences'; -import { IDcsHandler, IOscHandler, IApcHandler, IParams } from 'common/parser/Types'; -import { OscHandler } from 'common/parser/OscParser'; -import { DcsHandler } from 'common/parser/DcsParser'; -import { ApcHandler } from 'common/parser/ApcParser'; +import { EscapeSequenceParser } from '../../src/common/parser/EscapeSequenceParser'; +import { C0, C1 } from '../../src/common/data/EscapeSequences'; +import { IDcsHandler, IOscHandler, IApcHandler, IParams } from '../../src/common/parser/Types'; +import { OscHandler } from '../../src/common/parser/OscParser'; +import { DcsHandler } from '../../src/common/parser/DcsParser'; +import { ApcHandler } from '../../src/common/parser/ApcParser'; const SIZE = 5000000; diff --git a/test/benchmark/Event.benchmark.ts b/test/benchmark/Event.benchmark.ts index 9cd8216dc..ba3f8de9c 100644 --- a/test/benchmark/Event.benchmark.ts +++ b/test/benchmark/Event.benchmark.ts @@ -4,7 +4,7 @@ */ import { perfContext, before, RuntimeCase } from 'xterm-benchmark'; -import { Emitter } from 'common/Event'; +import { Emitter } from '../../src/common/Event'; const ITERATIONS = 1_000_000; diff --git a/test/benchmark/Terminal.benchmark.ts b/test/benchmark/Terminal.benchmark.ts index fb06b429e..97579cb30 100644 --- a/test/benchmark/Terminal.benchmark.ts +++ b/test/benchmark/Terminal.benchmark.ts @@ -6,8 +6,8 @@ import { perfContext, before, ThroughputRuntimeCase } from 'xterm-benchmark'; import { spawn } from 'node-pty'; -import { Utf8ToUtf32, stringFromCodePoint } from 'common/input/TextDecoder'; -import { CoreBrowserTerminal } from 'browser/CoreBrowserTerminal'; +import { Utf8ToUtf32, stringFromCodePoint } from '../../src/common/input/TextDecoder'; +import { CoreBrowserTerminal } from '../../src/browser/CoreBrowserTerminal'; perfContext('Terminal: ls -lR /usr/lib', () => { let content = ''; diff --git a/test/benchmark/tsconfig.json b/test/benchmark/tsconfig.json index 2ddb57e32..fe2af282c 100644 --- a/test/benchmark/tsconfig.json +++ b/test/benchmark/tsconfig.json @@ -11,12 +11,7 @@ "moduleResolution": "nodenext", "strict": false, "target": "es2021", - "module": "nodenext", - "paths": { - "common/*": [ "../../src/common/*" ], - "browser/*": [ "../../src/browser/*" ], - "Terminal": ["../../src/Terminal"] - }, + "module": "nodenext" }, "include": [ "./**/*", diff --git a/test/playwright/Terminal.test.ts b/test/playwright/Terminal.test.ts index 2d1133cce..c6c93359e 100644 --- a/test/playwright/Terminal.test.ts +++ b/test/playwright/Terminal.test.ts @@ -5,7 +5,7 @@ import { test } from '@playwright/test'; import { deepStrictEqual, notStrictEqual, strictEqual } from 'assert'; import { ITestContext, createTestContext, openTerminal, pollFor, timeout } from './TestUtils'; -import { IRenderDimensions } from 'browser/renderer/shared/Types'; +import { IRenderDimensions } from '../../src/browser/renderer/shared/Types'; let ctx: ITestContext; test.beforeAll(async ({ browser }) => { diff --git a/test/playwright/TestUtils.ts b/test/playwright/TestUtils.ts index 8a76c8820..a27d2d20d 100644 --- a/test/playwright/TestUtils.ts +++ b/test/playwright/TestUtils.ts @@ -5,9 +5,9 @@ import { Browser, JSHandle, Page } from '@playwright/test'; import { deepStrictEqual, strictEqual } from 'assert'; -import type { IRenderDimensions as IRenderDimensionsInternal } from 'browser/renderer/shared/Types'; -import type { IRenderService } from 'browser/services/Services'; -import type { ICoreTerminal, IDisposable, IMarker } from 'common/Types'; +import type { IRenderDimensions as IRenderDimensionsInternal } from '../../src/browser/renderer/shared/Types'; +import type { IRenderService } from '../../src/browser/services/Services'; +import type { ICoreTerminal, IDisposable, IMarker } from '../../src/common/Types'; import * as playwright from '@playwright/test'; import { IBuffer, IBufferCell, IBufferLine, IBufferNamespace, IBufferRange, IDecoration, IDecorationOptions, IModes, IRenderDimensions, ITerminalInitOnlyOptions, ITerminalOptions, Terminal } from '@xterm/xterm'; diff --git a/test/playwright/tsconfig.json b/test/playwright/tsconfig.json index 7fea8d812..0339896bc 100644 --- a/test/playwright/tsconfig.json +++ b/test/playwright/tsconfig.json @@ -17,14 +17,6 @@ "noImplicitAny": false, "declaration": true, "moduleResolution": "nodenext", - "paths": { - "browser/*": [ - "../../src/browser/*" - ], - "common/*": [ - "../../src/common/*" - ] - }, "target": "ESNext", "module": "nodenext", "composite": true diff --git a/webpack.config.headless.js b/webpack.config.headless.js index ed2856bd0..6f9f26d22 100644 --- a/webpack.config.headless.js +++ b/webpack.config.headless.js @@ -8,8 +8,7 @@ const path = require('path'); /** * This webpack config does a production build for xterm.js headless. It works by taking the output * from tsc (via `npm run watch` or `npm run prebuild`) which are put into `out/` and webpacks them - * into a production mode umd library module in `lib-headless/`. The aliases are used fix up the - * absolute paths output by tsc (because of `baseUrl` and `paths` in `tsconfig.json`. + * into a production mode umd library module in `lib-headless/`. * * @type {import('webpack').Configuration} */ @@ -29,11 +28,6 @@ const config = { resolve: { modules: ['./node_modules'], extensions: [ '.js' ], - alias: { - common: path.resolve('./out/common'), - headless: path.resolve('./out/headless'), - vs: path.resolve('./out/vs') - } }, output: { filename: 'xterm-headless.js', diff --git a/webpack.config.js b/webpack.config.js index 74acb30f8..22a41e3ca 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -10,8 +10,7 @@ const path = require('path'); /** * This webpack config does a production build for xterm.js. It works by taking the output from tsc * (via `npm run watch` or `npm run prebuild`) which are put into `out/` and webpacks them into a - * production mode umd library module in `lib/`. The aliases are used fix up the absolute paths - * output by tsc (because of `baseUrl` and `paths` in `tsconfig.json`. + * production mode umd library module in `lib/`. * * @type {import('webpack').Configuration} */ @@ -31,11 +30,6 @@ const config = { resolve: { modules: ['./node_modules'], extensions: [ '.js' ], - alias: { - common: path.resolve('./out/common'), - browser: path.resolve('./out/browser'), - vs: path.resolve('./out/vs'), - } }, output: { filename: 'xterm.js',