From 3cb91ad478b3a5a64835bc4517c7ef5685d00aff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Monda?= <laci@monda.hu>
Date: Thu, 31 Mar 2016 10:12:41 +0200
Subject: [PATCH] Add assert decorator functions.

---
 config-serializer/config-items/KeyAction.ts   |  1 +
 .../config-items/SwitchKeymapAction.ts        | 49 +++++++++++++++++--
 config-serializer/serializeConfig.ts          |  5 ++
 config-serializer/tsconfig.json               |  3 +-
 4 files changed, 53 insertions(+), 5 deletions(-)

diff --git a/config-serializer/config-items/KeyAction.ts b/config-serializer/config-items/KeyAction.ts
index df937ebf..01b7429d 100644
--- a/config-serializer/config-items/KeyAction.ts
+++ b/config-serializer/config-items/KeyAction.ts
@@ -45,6 +45,7 @@ class KeyAction {
 
     assertKeyActionType(jsObject: any, keyActionTypeString: string, classname: string) {
         if (jsObject.keyActionType !== keyActionTypeString) {
+            console.log(arguments.callee.prototype.name);
             throw `Invalid ${classname}.keyActionType: ${jsObject.keyActionType}`;
         }
     }
diff --git a/config-serializer/config-items/SwitchKeymapAction.ts b/config-serializer/config-items/SwitchKeymapAction.ts
index e1e3b1b2..66f2e632 100644
--- a/config-serializer/config-items/SwitchKeymapAction.ts
+++ b/config-serializer/config-items/SwitchKeymapAction.ts
@@ -1,3 +1,43 @@
+function assertUInt8(target: any, key: string) {
+    let val = this[key];
+    if (delete this[key]) {
+        Object.defineProperty(target, key, {
+            get: function () {
+                return val;
+            },
+            set: function (newVal) {
+                if (newVal < 0 || newVal > 255) {
+                    throw `Invalid ${target.constructor.name}.${key}: ${newVal} is not uint8`;
+                }
+                val = newVal;
+            },
+            enumerable: true,
+            configurable: true
+        });
+    }
+}
+
+function assertEnum<E>(enumerated: E) {
+    return function(target: any, key: string) {
+        let val = this[key];
+        if (delete this[key]) {
+            Object.defineProperty(target, key, {
+                get: function () {
+                    return val;
+                },
+                set: function (newVal) {
+                    if (enumerated[newVal] === undefined) {
+                        throw `Invalid ${target.constructor.name}.${key}: ${newVal} is not enum`;
+                    }
+                    val = newVal;
+                },
+                enumerable: true,
+                configurable: true
+            });
+        }
+    }
+}
+
 enum Layer {
     mod,
     fn,
@@ -11,8 +51,9 @@ class SwitchLayerAction extends KeyAction implements Serializable<SwitchLayerAct
 
     isLayerToggleable: boolean;
 
-    private _layer: Layer;
-
+    @assertEnum(Layer)
+    private layer: Layer;
+/*
     get layer(): number {
         return this._layer;
     }
@@ -23,14 +64,14 @@ class SwitchLayerAction extends KeyAction implements Serializable<SwitchLayerAct
         }
         this._layer = value;
     }
-
+*/
     getToggleFlag() {
         return this.isLayerToggleable ? SwitchLayerAction.toggleFlag : 0;
     }
 
     fromJsObject(jsObject: any): SwitchLayerAction {
         this.assertKeyActionType(jsObject, SwitchLayerAction.keyActionTypeString, 'SwitchLayerAction');
-        this.layer = jsObject.keymapId;
+        this.layer = jsObject.layerId;
         this.isLayerToggleable = jsObject.toggle;
         return this;
     }
diff --git a/config-serializer/serializeConfig.ts b/config-serializer/serializeConfig.ts
index 8097e6e2..b75a47bc 100644
--- a/config-serializer/serializeConfig.ts
+++ b/config-serializer/serializeConfig.ts
@@ -9,4 +9,9 @@ let writer = new UhkBuffer();
 let uhkConfig = JSON.parse(fs.readFileSync('uhk-config.json'));
 let keyActions = uhkConfig.keymaps[0].layers[0].modules[0].keyActions;
 
+new SwitchLayerAction().fromJsObject({
+    keyActionType: 'switchLayer',
+    layerId: 10022
+});
+
 fs.writeFileSync('uhk-config.bin', writer.buffer);
diff --git a/config-serializer/tsconfig.json b/config-serializer/tsconfig.json
index d7bd2173..46ba139e 100644
--- a/config-serializer/tsconfig.json
+++ b/config-serializer/tsconfig.json
@@ -1,7 +1,8 @@
 {
     "compilerOptions": {
         "out": "serializeConfig.js",
-        "target": "es5"
+        "target": "es5",
+        "experimentalDecorators": true
     },
     "files": [
         "typings/main.d.ts",