From 1780b1ebf3e3d6b2da2cbc03e6e73df7b6b9d09d Mon Sep 17 00:00:00 2001
From: "Steven R. Loomis" <srl295@gmail.com>
Date: Fri, 27 Sep 2024 18:53:54 -0500
Subject: [PATCH] feat(developer,common): use unified xml  writer

Fixes: #12208
---
 .../utils/src/types/kvks/kvks-file-writer.ts  | 20 +++----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/developer/src/common/web/utils/src/types/kvks/kvks-file-writer.ts b/developer/src/common/web/utils/src/types/kvks/kvks-file-writer.ts
index dd4962a8fa..6138403f6e 100644
--- a/developer/src/common/web/utils/src/types/kvks/kvks-file-writer.ts
+++ b/developer/src/common/web/utils/src/types/kvks/kvks-file-writer.ts
@@ -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 '';
   }
-}
\ No newline at end of file
+}