erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-09-22 07:37:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

feat(developer,common): use unified xml writer

Browse source 
Fixes: #12208
This commit is contained in:
Steven R. Loomis 2024-09-27 18:53:54 -05:00
parent d540e4cda0
commit 1780b1ebf3
1 changed files with 3 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
developer/src/common/web/utils/src/types/kvks/kvks-file-writer.ts
View file

@ -1,6 +1,6 @@
import { VisualKeyboard as VK, Constants } from '@keymanapp/common-types';
import KVKSourceFile, { KVKSEncoding, KVKSFlags, KVKSKey, KVKSLayer } from './kvks-file.js';
import { xml2js } from '../../index.js';
import { KeymanXMLWriter } from '../../index.js';
import USVirtualKeyCodes = Constants.USVirtualKeyCodes;
import VisualKeyboard = VK.VisualKeyboard;
@ -11,18 +11,6 @@ import VisualKeyboardShiftState = VK.VisualKeyboardShiftState;
export default class KVKSFileWriter {
public write(vk: VisualKeyboard): string {
const builder = new xml2js.Builder({
allowSurrogateChars: true,
attrkey: '$',
charkey: '_',
xmldec: {
version: '1.0',
encoding: 'UTF-8',
standalone: true
}
})
const flags: KVKSFlags = {};
if(vk.header.flags & VisualKeyboardHeaderFlags.kvkhDisplayUnderlying) {
flags.displayunderlying = '';
@ -37,8 +25,6 @@ export default class KVKSFileWriter {
flags.useunderlying = '';
}
const kvks: KVKSourceFile = {
visualkeyboard: {
header: {
@ -105,7 +91,7 @@ export default class KVKSFileWriter {
l.key.push(k);
}
const result = builder.buildObject(kvks);
const result = new KeymanXMLWriter({type: 'kvks'}).write(kvks);
return result; //Uint8Array.from(result);
}
@ -124,4 +110,4 @@ export default class KVKSFileWriter {
}
return '';
}
}
}