Daniel ImmsandCursor
17ad33dc3d
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 <cursoragent@cursor.com>
264 lines
10 KiB
TypeScript
264 lines
10 KiB
TypeScript
/**
|
|
* Copyright (c) 2016 The xterm.js authors. All rights reserved.
|
|
* @license MIT
|
|
*/
|
|
|
|
import { assert } from 'chai';
|
|
import { CompositionHelper } from './CompositionHelper';
|
|
import { MockRenderService } from '../TestUtils.test';
|
|
import { MockCoreService, MockBufferService, MockOptionsService } from '../../common/TestUtils.test';
|
|
|
|
describe('CompositionHelper', () => {
|
|
let compositionHelper: CompositionHelper;
|
|
let compositionView: HTMLElement;
|
|
let textarea: HTMLTextAreaElement;
|
|
let handledText: string;
|
|
|
|
beforeEach(() => {
|
|
compositionView = {
|
|
classList: {
|
|
add: () => {},
|
|
remove: () => {}
|
|
},
|
|
getBoundingClientRect: () => {
|
|
return { width: 0 };
|
|
},
|
|
style: {
|
|
left: 0,
|
|
top: 0
|
|
},
|
|
textContent: ''
|
|
} as any;
|
|
textarea = {
|
|
value: '',
|
|
style: {
|
|
left: 0,
|
|
top: 0
|
|
}
|
|
} as any;
|
|
const coreService = new MockCoreService();
|
|
coreService.triggerDataEvent = (text: string) => {
|
|
handledText += text;
|
|
};
|
|
handledText = '';
|
|
const bufferService = new MockBufferService(10, 5);
|
|
compositionHelper = new CompositionHelper(textarea, compositionView, bufferService, new MockOptionsService(), coreService, new MockRenderService());
|
|
});
|
|
|
|
describe('Input', () => {
|
|
it('Should insert simple characters', (done) => {
|
|
// First character 'ㅇ'
|
|
compositionHelper.compositionstart();
|
|
compositionHelper.compositionupdate({ data: 'ㅇ' });
|
|
textarea.value = 'ㅇ';
|
|
setTimeout(() => { // wait for any textarea updates
|
|
compositionHelper.compositionend();
|
|
setTimeout(() => { // wait for any textarea updates
|
|
assert.equal(handledText, 'ㅇ');
|
|
// Second character 'ㅇ'
|
|
compositionHelper.compositionstart();
|
|
compositionHelper.compositionupdate({ data: 'ㅇ' });
|
|
textarea.value = 'ㅇㅇ';
|
|
setTimeout(() => { // wait for any textarea updates
|
|
compositionHelper.compositionend();
|
|
setTimeout(() => { // wait for any textarea updates
|
|
assert.equal(handledText, 'ㅇㅇ');
|
|
done();
|
|
}, 0);
|
|
}, 0);
|
|
}, 0);
|
|
}, 0);
|
|
});
|
|
|
|
it('Should insert complex characters', (done) => {
|
|
// First character '앙'
|
|
compositionHelper.compositionstart();
|
|
compositionHelper.compositionupdate({ data: 'ㅇ' });
|
|
textarea.value = 'ㅇ';
|
|
setTimeout(() => { // wait for any textarea updates
|
|
compositionHelper.compositionupdate({ data: '아' });
|
|
textarea.value = '아';
|
|
setTimeout(() => { // wait for any textarea updates
|
|
compositionHelper.compositionupdate({ data: '앙' });
|
|
textarea.value = '앙';
|
|
setTimeout(() => { // wait for any textarea updates
|
|
compositionHelper.compositionend();
|
|
setTimeout(() => { // wait for any textarea updates
|
|
assert.equal(handledText, '앙');
|
|
// Second character '앙'
|
|
compositionHelper.compositionstart();
|
|
compositionHelper.compositionupdate({ data: 'ㅇ' });
|
|
textarea.value = '앙ㅇ';
|
|
setTimeout(() => { // wait for any textarea updates
|
|
compositionHelper.compositionupdate({ data: '아' });
|
|
textarea.value = '앙아';
|
|
setTimeout(() => { // wait for any textarea updates
|
|
compositionHelper.compositionupdate({ data: '앙' });
|
|
textarea.value = '앙앙';
|
|
setTimeout(() => { // wait for any textarea updates
|
|
compositionHelper.compositionend();
|
|
setTimeout(() => { // wait for any textarea updates
|
|
assert.equal(handledText, '앙앙');
|
|
done();
|
|
}, 0);
|
|
}, 0);
|
|
}, 0);
|
|
}, 0);
|
|
}, 0);
|
|
}, 0);
|
|
}, 0);
|
|
}, 0);
|
|
});
|
|
|
|
it('Should insert complex characters that change with following character', (done) => {
|
|
// First character '아'
|
|
compositionHelper.compositionstart();
|
|
compositionHelper.compositionupdate({ data: 'ㅇ' });
|
|
textarea.value = 'ㅇ';
|
|
setTimeout(() => { // wait for any textarea updates
|
|
compositionHelper.compositionupdate({ data: '아' });
|
|
textarea.value = '아';
|
|
setTimeout(() => { // wait for any textarea updates
|
|
// Start second character '아' in first character
|
|
compositionHelper.compositionupdate({ data: '앙' });
|
|
textarea.value = '앙';
|
|
setTimeout(() => { // wait for any textarea updates
|
|
compositionHelper.compositionend();
|
|
compositionHelper.compositionstart();
|
|
compositionHelper.compositionupdate({ data: '아' });
|
|
textarea.value = '아아';
|
|
setTimeout(() => { // wait for any textarea updates
|
|
compositionHelper.compositionend();
|
|
setTimeout(() => { // wait for any textarea updates
|
|
assert.equal(handledText, '아아');
|
|
done();
|
|
}, 0);
|
|
}, 0);
|
|
}, 0);
|
|
}, 0);
|
|
}, 0);
|
|
});
|
|
|
|
it('Should insert multi-characters compositions', (done) => {
|
|
// First character 'だ'
|
|
compositionHelper.compositionstart();
|
|
compositionHelper.compositionupdate({ data: 'd' });
|
|
textarea.value = 'd';
|
|
setTimeout(() => { // wait for any textarea updates
|
|
compositionHelper.compositionupdate({ data: 'だ' });
|
|
textarea.value = 'だ';
|
|
setTimeout(() => { // wait for any textarea updates
|
|
// Second character 'あ'
|
|
compositionHelper.compositionupdate({ data: 'だあ' });
|
|
textarea.value = 'だあ';
|
|
setTimeout(() => { // wait for any textarea updates
|
|
compositionHelper.compositionend();
|
|
setTimeout(() => { // wait for any textarea updates
|
|
assert.equal(handledText, 'だあ');
|
|
done();
|
|
}, 0);
|
|
}, 0);
|
|
}, 0);
|
|
}, 0);
|
|
});
|
|
|
|
it('Should insert multi-character compositions that are converted to other characters with the same length', (done) => {
|
|
// First character 'だ'
|
|
compositionHelper.compositionstart();
|
|
compositionHelper.compositionupdate({ data: 'd' });
|
|
textarea.value = 'd';
|
|
setTimeout(() => { // wait for any textarea updates
|
|
compositionHelper.compositionupdate({ data: 'だ' });
|
|
textarea.value = 'だ';
|
|
setTimeout(() => { // wait for any textarea updates
|
|
// Second character 'ー'
|
|
compositionHelper.compositionupdate({ data: 'だー' });
|
|
textarea.value = 'だー';
|
|
setTimeout(() => { // wait for any textarea updates
|
|
// Convert to katakana 'ダー'
|
|
compositionHelper.compositionupdate({ data: 'ダー' });
|
|
textarea.value = 'ダー';
|
|
setTimeout(() => { // wait for any textarea updates
|
|
compositionHelper.compositionend();
|
|
setTimeout(() => { // wait for any textarea updates
|
|
assert.equal(handledText, 'ダー');
|
|
done();
|
|
}, 0);
|
|
}, 0);
|
|
}, 0);
|
|
}, 0);
|
|
}, 0);
|
|
});
|
|
|
|
it('Should insert multi-character compositions that are converted to other characters with different lengths', (done) => {
|
|
// First character 'い'
|
|
compositionHelper.compositionstart();
|
|
compositionHelper.compositionupdate({ data: 'い' });
|
|
textarea.value = 'い';
|
|
setTimeout(() => { // wait for any textarea updates
|
|
// Second character 'ま'
|
|
compositionHelper.compositionupdate({ data: 'いm' });
|
|
textarea.value = 'いm';
|
|
setTimeout(() => { // wait for any textarea updates
|
|
compositionHelper.compositionupdate({ data: 'いま' });
|
|
textarea.value = 'いま';
|
|
setTimeout(() => { // wait for any textarea updates
|
|
// Convert to kanji '今'
|
|
compositionHelper.compositionupdate({ data: '今' });
|
|
textarea.value = '今';
|
|
setTimeout(() => { // wait for any textarea updates
|
|
compositionHelper.compositionend();
|
|
setTimeout(() => { // wait for any textarea updates
|
|
assert.equal(handledText, '今');
|
|
done();
|
|
}, 0);
|
|
}, 0);
|
|
}, 0);
|
|
}, 0);
|
|
}, 0);
|
|
});
|
|
|
|
it('Should insert non-composition characters input immediately after composition characters', (done) => {
|
|
// First character 'ㅇ'
|
|
compositionHelper.compositionstart();
|
|
compositionHelper.compositionupdate({ data: 'ㅇ' });
|
|
textarea.value = 'ㅇ';
|
|
setTimeout(() => { // wait for any textarea updates
|
|
compositionHelper.compositionend();
|
|
// Second character '1' (a non-composition character)
|
|
textarea.value = 'ㅇ1';
|
|
setTimeout(() => { // wait for any textarea updates
|
|
assert.equal(handledText, 'ㅇ1');
|
|
done();
|
|
}, 0);
|
|
}, 0);
|
|
});
|
|
|
|
it('Should insert middle composition and subsequent input without appending existing trailing text', (done) => {
|
|
textarea.value = '一二';
|
|
// screenReaderMode keeps textarea content/selection for assistive technologies (eg. screen
|
|
// readers), so the caret can be moved within the textarea (eg. via arrow keys) before
|
|
// starting composition.
|
|
textarea.selectionStart = 1;
|
|
textarea.selectionEnd = 1;
|
|
|
|
compositionHelper.compositionstart();
|
|
compositionHelper.compositionupdate({ data: '一' });
|
|
textarea.value = '一一二';
|
|
// After the composed text is inserted, the caret typically moves to after it.
|
|
textarea.selectionStart = 2;
|
|
textarea.selectionEnd = 2;
|
|
|
|
setTimeout(() => { // wait for any textarea updates
|
|
compositionHelper.compositionend();
|
|
// Second character '1' (a non-composition character)
|
|
textarea.value = '一一1二';
|
|
setTimeout(() => { // wait for any textarea updates
|
|
assert.equal(handledText, '一1');
|
|
done();
|
|
}, 0);
|
|
}, 0);
|
|
});
|
|
});
|
|
});
|