diff --git a/config-serializer/config-items/DualRoleKeystrokeAction.ts b/config-serializer/config-items/DualRoleKeystrokeAction.ts index 5579785f..93aaeae1 100644 --- a/config-serializer/config-items/DualRoleKeystrokeAction.ts +++ b/config-serializer/config-items/DualRoleKeystrokeAction.ts @@ -36,7 +36,7 @@ class DualRoleKeystrokeAction extends KeyAction implements SerializablejsObject.longPressAction]; return this; } @@ -51,7 +51,7 @@ class DualRoleKeystrokeAction extends KeyAction implements Serializable { fromJsObject(jsObject: any): MouseAction { this.assertKeyActionType(jsObject, KeyActionType.MouseAction, 'MouseAction'); - console.log(jsObject.mouseAction) this.mouseAction = MouseActionParam[jsObject.mouseAction]; return this; } diff --git a/config-serializer/config-items/NoneAction.ts b/config-serializer/config-items/NoneAction.ts index 56164317..d190d635 100644 --- a/config-serializer/config-items/NoneAction.ts +++ b/config-serializer/config-items/NoneAction.ts @@ -12,7 +12,7 @@ class NoneAction extends KeyAction implements Serializable { toJsObject(): any { return { - keyActionType: KeyActionId.NoneAction + keyActionType: KeyActionType.NoneAction }; } diff --git a/config-serializer/test-serializer.ts b/config-serializer/test-serializer.ts index bb6c607a..7ca5e83b 100644 --- a/config-serializer/test-serializer.ts +++ b/config-serializer/test-serializer.ts @@ -4,13 +4,20 @@ /// /// +let assert = require('assert'); let fs = require('fs'); + let buffer = new UhkBuffer(); let uhkConfig = JSON.parse(fs.readFileSync('uhk-config.json')); let keyActions = uhkConfig.keymaps[0].layers[0].modules[0].keyActions; let keyActionObjects: KeyActions = new KeyActions().fromJsObject(keyActions); + keyActionObjects.toBinary(buffer); fs.writeFileSync('uhk-config.bin', buffer.getBufferContent()); + buffer.offset = 0; -let serializedKeyActions = JSON.stringify(new KeyActions().fromBinary(buffer).toJsObject(), undefined, 4); -fs.writeFileSync('uhk-config-serialized.json', serializedKeyActions); +let serializedKeyActions = new KeyActions().fromBinary(buffer).toJsObject(); +fs.writeFileSync('uhk-config-serialized.json', JSON.stringify(serializedKeyActions, undefined, 4)); + +assert.deepEqual(keyActions, serializedKeyActions); +console.log('JSON configurations are identical.');