Add new tslint rules (class-name, ordered-imports) and fix errors

src/app.module.ts

@@ -3,15 +3,27 @@ import { BrowserModule } from '@angular/platform-browser';
 
 import { Select2Component } from 'ng2-select2/ng2-select2';
 
-import { DataProviderService } from './services/data-provider.service';
-import { MapperService } from './services/mapper.service';
-import {UhkConfigurationService} from './services/uhk-configuration.service';
-
 import { MainAppComponent, appRoutingProviders, routing }  from './main-app';
-import { KeymapComponent } from './components/keymap';
+
-import { MacroComponent } from './components/macro';
+import { KeymapAddComponent, KeymapComponent } from './components/keymap';
+import { LayersComponent } from './components/layers';
 import { LegacyLoaderComponent } from './components/legacy-loader';
+import { MacroComponent } from './components/macro';
 import { NotificationComponent } from './components/notification';
+import { PopoverComponent } from './components/popover';
+import {
+    KeymapTabComponent,
+    KeypressTabComponent,
+    LayerTabComponent,
+    MacroTabComponent,
+    MouseTabComponent,
+    NoneTabComponent
+} from './components/popover/tab';
+import { MacroItemComponent } from './components/popover/tab/macro';
+import { CaptureKeystrokeButtonComponent } from './components/popover/widgets/capture-keystroke';
+import { IconComponent } from './components/popover/widgets/icon';
+import { SideMenuComponent } from './components/side-menu';
+import { SvgKeyboardComponent } from './components/svg/keyboard';
 import {
     SvgIconTextKeyComponent,
     SvgKeyboardKeyComponent,
@@ -22,24 +34,12 @@ import {
     SvgTextIconKeyComponent,
     SvgTwoLineTextKeyComponent
 } from './components/svg/keys';
-import { SvgKeyboardWrapComponent } from './components/svg/wrap';
-import { LayersComponent } from './components/layers';
-import { SvgKeyboardComponent } from './components/svg/keyboard';
 import { SvgModuleComponent } from './components/svg/module';
-import { PopoverComponent } from './components/popover';
+import { SvgKeyboardWrapComponent } from './components/svg/wrap';
-import { KeymapAddComponent } from './components/keymap';
+
-import { MacroItemComponent } from './components/popover/tab/macro';
+import { DataProviderService } from './services/data-provider.service';
-import { SideMenuComponent } from './components/side-menu';
+import { MapperService } from './services/mapper.service';
-import {
+import {UhkConfigurationService} from './services/uhk-configuration.service';
-    KeypressTabComponent,
-    KeymapTabComponent,
-    LayerTabComponent,
-    MacroTabComponent,
-    MouseTabComponent,
-    NoneTabComponent
-} from './components/popover/tab';
-import { CaptureKeystrokeButtonComponent } from './components/popover/widgets/capture-keystroke';
-import { IconComponent } from './components/popover/widgets/icon';
 
 @NgModule({
     declarations: [

src/boot.ts

@@ -1,4 +1,5 @@
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+
 import { AppModule } from './app.module';
 
 process.stdout = require('browser-stdout')();

src/components/keymap/add/keymap-add.component.ts

@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { Keymap } from '../../../config-serializer/config-items/Keymap';
 import { Keymaps } from '../../../config-serializer/config-items/Keymaps';
 import {DataProviderService} from '../../../services/data-provider.service';

src/components/keymap/keymap.component.ts

@@ -1,10 +1,10 @@
 import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
+import { Subscription } from 'rxjs/Subscription';
 
+import { Keymap } from '../../config-serializer/config-items/Keymap';
 import { Layers } from '../../config-serializer/config-items/Layers';
 import { UhkConfigurationService } from '../../services/uhk-configuration.service';
-import { Keymap } from '../../config-serializer/config-items/Keymap';
-import { Subscription } from 'rxjs/Subscription';
 
 @Component({
     selector: 'keymap',

src/components/keymap/keymap.routes.ts

@@ -1,6 +1,7 @@
 import { Routes } from '@angular/router';
-import { KeymapComponent } from './keymap.component';
+
 import { KeymapAddComponent } from './add/keymap-add.component';
+import { KeymapComponent } from './keymap.component';
 
 export const keymapRoutes: Routes = [
     {

src/components/layers/layers.component.ts

@@ -1,4 +1,4 @@
-import { Component, Input, Output, EventEmitter } from '@angular/core';
+import { Component, EventEmitter, Input, Output } from '@angular/core';
 
 @Component({
     selector: 'layers',

src/components/legacy-loader/legacy-loader.routes.ts

@@ -1,4 +1,5 @@
 import { Routes } from '@angular/router';
+
 import {LegacyLoaderComponent} from './legacy-loader.component';
 
 export const legacyRoutes: Routes = [

src/components/macro/macro.routes.ts

@@ -1,4 +1,5 @@
 import { Routes } from '@angular/router';
+
 import { MacroComponent } from './macro.component';
 
 export const macroRoutes: Routes = [

src/components/popover/popover.component.ts

@@ -1,13 +1,12 @@
-import {Component, OnInit, Input, Output, EventEmitter, ViewChild} from '@angular/core';
+import {Component, EventEmitter, Input, OnInit, Output, ViewChild} from '@angular/core';
 
 import {KeyAction} from '../../config-serializer/config-items/KeyAction';
-
-import {Tab} from './tab/tab';
 import {KeystrokeAction} from '../../config-serializer/config-items/KeystrokeAction';
-import {SwitchLayerAction} from '../../config-serializer/config-items/SwitchLayerAction';
 import {MouseAction} from '../../config-serializer/config-items/MouseAction';
 import {PlayMacroAction} from '../../config-serializer/config-items/PlayMacroAction';
 import {SwitchKeymapAction} from '../../config-serializer/config-items/SwitchKeymapAction';
+import {SwitchLayerAction} from '../../config-serializer/config-items/SwitchLayerAction';
+import {Tab} from './tab/tab';
 
 enum TabName {
     Keypress,

src/components/popover/tab/keymap/keymap-tab.component.ts

@@ -1,13 +1,14 @@
-import {Component, OnInit, Input} from '@angular/core';
+import {Component, Input, OnInit } from '@angular/core';
-
-import {UhkConfigurationService} from '../../../../services/uhk-configuration.service';
-import {Keymap} from '../../../../config-serializer/config-items/Keymap';
-import {KeyAction} from '../../../../config-serializer/config-items/KeyAction';
-import {Tab} from '../tab';
-import {SwitchKeymapAction} from '../../../../config-serializer/config-items/SwitchKeymapAction';
 
 import {Select2OptionData} from 'ng2-select2/ng2-select2';
 
+import {KeyAction} from '../../../../config-serializer/config-items/KeyAction';
+import {Keymap} from '../../../../config-serializer/config-items/Keymap';
+import {SwitchKeymapAction} from '../../../../config-serializer/config-items/SwitchKeymapAction';
+import {Tab} from '../tab';
+
+import {UhkConfigurationService} from '../../../../services/uhk-configuration.service';
+
 @Component({
     selector: 'keymap-tab',
     template: require('./keymap-tab.component.html'),

src/components/popover/tab/keypress/keypress-tab.component.ts

@@ -1,4 +1,4 @@
-import {Component, OnInit, Input} from '@angular/core';
+import {Component, Input, OnInit} from '@angular/core';
 
 import {Select2OptionData} from 'ng2-select2/ng2-select2';
 

src/components/popover/tab/layer/layer-tab.component.ts

@@ -1,7 +1,7 @@
-import {Component, OnInit, Input, ViewChild} from '@angular/core';
+import {Component, Input,  OnInit, ViewChild} from '@angular/core';
 
-import {LayerName, SwitchLayerAction} from '../../../../config-serializer/config-items/SwitchLayerAction';
 import {KeyAction} from '../../../../config-serializer/config-items/KeyAction';
+import {LayerName, SwitchLayerAction} from '../../../../config-serializer/config-items/SwitchLayerAction';
 
 import {Select2Component, Select2OptionData} from 'ng2-select2/ng2-select2';
 

src/components/popover/tab/macro/macro-item.component.ts

@@ -1,8 +1,8 @@
-import { Component, OnInit, OnChanges, Input } from '@angular/core';
+import { Component, Input, OnChanges, OnInit } from '@angular/core';
 
-import {MacroAction} from '../../../../config-serializer/config-items/MacroAction';
 import {DelayMacroAction} from '../../../../config-serializer/config-items/DelayMacroAction';
 import {HoldModifiersMacroAction} from '../../../../config-serializer/config-items/HoldModifiersMacroAction';
+import {MacroAction} from '../../../../config-serializer/config-items/MacroAction';
 import {MoveMouseMacroAction} from '../../../../config-serializer/config-items/MoveMouseMacroAction';
 import {PressModifiersMacroAction} from '../../../../config-serializer/config-items/PressModifiersMacroAction';
 import {ReleaseModifiersMacroAction} from '../../../../config-serializer/config-items/ReleaseModifiersMacroAction';

src/components/popover/tab/macro/macro-tab.component.ts

@@ -1,13 +1,14 @@
-import {Component, OnInit, Input} from '@angular/core';
+import {Component, Input, OnInit} from '@angular/core';
+
+import {Select2OptionData} from 'ng2-select2/ng2-select2';
 
-import {UhkConfigurationService} from '../../../../services/uhk-configuration.service';
-import {Macro} from '../../../../config-serializer/config-items/Macro';
 import {KeyAction} from '../../../../config-serializer/config-items/KeyAction';
+import {Macro} from '../../../../config-serializer/config-items/Macro';
 import {PlayMacroAction} from '../../../../config-serializer/config-items/PlayMacroAction';
 
 import {Tab} from '../tab';
 
-import {Select2OptionData} from 'ng2-select2/ng2-select2';
+import {UhkConfigurationService} from '../../../../services/uhk-configuration.service';
 
 @Component({
     selector: 'macro-tab',

src/components/popover/tab/mouse/mouse-tab.component.ts

@@ -1,9 +1,10 @@
-import {Component, OnInit, Input} from '@angular/core';
+import {Component, Input, OnInit} from '@angular/core';
 
-import {Tab} from '../tab';
 import {KeyAction} from '../../../../config-serializer/config-items/KeyAction';
 import {MouseAction, MouseActionParam} from '../../../../config-serializer/config-items/MouseAction';
 
+import {Tab} from '../tab';
+
 @Component({
     selector: 'mouse-tab',
     template: require('./mouse-tab.component.html'),

src/components/popover/tab/none/none-tab.component.ts

@@ -1,7 +1,7 @@
 import {Component, OnInit } from '@angular/core';
 
-import {Tab} from '../tab';
 import {NoneAction} from '../../../../config-serializer/config-items/NoneAction';
+import {Tab} from '../tab';
 
 @Component({
     selector: 'none-tab',

src/components/popover/widgets/icon/icon.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit, Input } from '@angular/core';
+import { Component, Input, OnInit } from '@angular/core';
 
 @Component({
     selector: 'icon',

src/components/side-menu/side-menu.component.ts

@@ -1,9 +1,10 @@
 import { Component, OnInit } from '@angular/core';
 
 import { Keymap } from '../../config-serializer/config-items/Keymap';
-import { UhkConfigurationService } from '../../services/uhk-configuration.service';
 import { Macro } from '../../config-serializer/config-items/Macro';
 
+import { UhkConfigurationService } from '../../services/uhk-configuration.service';
+
 @Component({
     selector: 'side-menu',
     template: require('./side-menu.component.html'),

src/components/svg/keyboard/svg-keyboard.component.ts

@@ -1,7 +1,8 @@
-import { Component, OnInit, Input, Output, EventEmitter} from '@angular/core';
+import { Component, EventEmitter, Input, OnInit, Output} from '@angular/core';
 
 import {Module} from '../../../config-serializer/config-items/Module';
 import {SvgModule} from '../module';
+
 import {DataProviderService} from '../../../services/data-provider.service';
 
 @Component({

src/components/svg/keys/svg-icon-text-key/svg-icon-text-key.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit, Input } from '@angular/core';
+import { Component, Input, OnInit } from '@angular/core';
 
 @Component({
     selector: 'g[svg-icon-text-key]',

src/components/svg/keys/svg-keyboard-key/svg-keyboard-key.component.ts

@@ -1,14 +1,15 @@
-import { Component, OnInit, Input, OnChanges, SimpleChange } from '@angular/core';
+import { Component, Input, OnChanges, OnInit, SimpleChange } from '@angular/core';
 
 import {KeyAction} from '../../../../config-serializer/config-items/KeyAction';
-import {KeystrokeAction} from '../../../../config-serializer/config-items/KeystrokeAction';
 import {KeyModifiers} from '../../../../config-serializer/config-items/KeyModifiers';
+import {KeystrokeAction} from '../../../../config-serializer/config-items/KeystrokeAction';
 import {PlayMacroAction} from '../../../../config-serializer/config-items/PlayMacroAction';
-import {SwitchLayerAction, LayerName}  from '../../../../config-serializer/config-items/SwitchLayerAction';
 import {SwitchKeymapAction} from '../../../../config-serializer/config-items/SwitchKeymapAction';
+import {LayerName, SwitchLayerAction}  from '../../../../config-serializer/config-items/SwitchLayerAction';
 import {UhkConfiguration} from '../../../../config-serializer/config-items/UhkConfiguration';
-import {UhkConfigurationService} from '../../../../services/uhk-configuration.service';
+
 import {MapperService} from '../../../../services/mapper.service';
+import {UhkConfigurationService} from '../../../../services/uhk-configuration.service';
 
 enum LabelTypes {
     KeystrokeKey,

src/components/svg/keys/svg-keystroke-key/svg-keystroke-key.component.ts

@@ -1,7 +1,7 @@
-import { Component, OnInit, OnChanges, Input } from '@angular/core';
+import { Component, Input, OnChanges, OnInit } from '@angular/core';
 
-import { KeystrokeAction } from '../../../../config-serializer/config-items/KeystrokeAction';
 import { KeyModifiers } from '../../../../config-serializer/config-items/KeyModifiers';
+import { KeystrokeAction } from '../../../../config-serializer/config-items/KeystrokeAction';
 import { MapperService } from '../../../../services/mapper.service';
 
 class SvgAttributes {

src/components/svg/keys/svg-one-line-text-key/svg-one-line-text-key.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit, Input } from '@angular/core';
+import { Component, Input, OnInit } from '@angular/core';
 
 @Component({
     selector: 'g[svg-one-line-text-key]',

src/components/svg/keys/svg-single-icon-key/svg-single-icon-key.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit, Input } from '@angular/core';
+import { Component, Input, OnInit } from '@angular/core';
 
 @Component({
     selector: 'g[svg-single-icon-key]',

src/components/svg/keys/svg-switch-keymap-key/svg-switch-keymap-key.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit, Input } from '@angular/core';
+import { Component, Input, OnInit } from '@angular/core';
 
 import {MapperService} from '../../../../services/mapper.service';
 

src/components/svg/keys/svg-text-icon-key/svg-text-icon-key.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit, Input } from '@angular/core';
+import { Component, Input, OnInit } from '@angular/core';
 
 @Component({
     selector: 'g[svg-text-icon-key]',

src/components/svg/keys/svg-two-line-text-key/svg-two-line-text-key.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit, Input } from '@angular/core';
+import { Component, Input, OnInit } from '@angular/core';
 
 @Component({
     selector: 'g[svg-two-line-text-key]',

src/components/svg/module/svg-module.component.ts

@@ -1,7 +1,8 @@
-import { Component, Input, Output, EventEmitter } from '@angular/core';
+import { Component, EventEmitter, Input, Output } from '@angular/core';
+
+import {KeyAction} from '../../../config-serializer/config-items/KeyAction';
 
 import { SvgKeyboardKey } from '../keys';
-import {KeyAction} from '../../../config-serializer/config-items/KeyAction';
 
 @Component({
     selector: 'g[svg-module]',

src/components/svg/wrap/svg-keyboard-wrap.component.ts

@@ -1,6 +1,6 @@
 import {
-    Component, Input, OnInit, style,
+    Component, Input, OnChanges, OnInit, animate,
-    state, animate, transition, trigger, OnChanges
+    state, style, transition, trigger
 } from '@angular/core';
 
 import { KeyAction } from '../../../config-serializer/config-items/KeyAction';

src/config-serializer/config-items/DelayMacroAction.ts

@@ -1,6 +1,6 @@
-import {UhkBuffer} from '../UhkBuffer';
-import {MacroAction, macroActionType, MacroActionId} from './MacroAction';
 import {assertUInt16} from '../assert';
+import {UhkBuffer} from '../UhkBuffer';
+import {MacroAction, MacroActionId, macroActionType} from './MacroAction';
 
 export class DelayMacroAction extends MacroAction {
 

src/config-serializer/config-items/HoldKeyMacroAction.ts

@@ -1,6 +1,6 @@
+import {assertUInt8} from '../assert';
 import {UhkBuffer} from '../UhkBuffer';
 import {MacroAction, MacroActionId, macroActionType} from './MacroAction';
-import {assertUInt8} from '../assert';
 
 export class HoldKeyMacroAction extends MacroAction {
 

src/config-serializer/config-items/HoldModifiersMacroAction.ts

@@ -1,7 +1,7 @@
-import {MacroAction, MacroActionId, macroActionType} from './MacroAction';
-import {KeyModifiers} from './KeyModifiers';
-import {UhkBuffer} from '../UhkBuffer';
 import {assertUInt8} from '../assert';
+import {UhkBuffer} from '../UhkBuffer';
+import {KeyModifiers} from './KeyModifiers';
+import {MacroAction, MacroActionId, macroActionType} from './MacroAction';
 
 export class HoldModifiersMacroAction extends MacroAction {
 

src/config-serializer/config-items/HoldMouseButtonsMacroAction.ts

@@ -1,6 +1,6 @@
+import {assertUInt8} from '../assert';
 import {UhkBuffer} from '../UhkBuffer';
 import {MacroAction, MacroActionId, macroActionType} from './MacroAction';
-import {assertUInt8} from '../assert';
 
 export class HoldMouseButtonsMacroAction extends MacroAction {
 

src/config-serializer/config-items/KeyActions.ts

@@ -1,12 +1,12 @@
 import {ClassArray} from '../ClassArray';
 import {UhkBuffer} from '../UhkBuffer';
-import {NoneAction} from './NoneAction';
+import {KeyAction, KeyActionId, keyActionType} from './KeyAction';
 import {KeystrokeAction} from './KeystrokeAction';
-import {keyActionType, KeyActionId, KeyAction} from './KeyAction';
-import {SwitchLayerAction} from './SwitchLayerAction';
-import {SwitchKeymapAction} from './SwitchKeymapAction';
 import {MouseAction} from './MouseAction';
+import {NoneAction} from './NoneAction';
 import {PlayMacroAction} from './PlayMacroAction';
+import {SwitchKeymapAction} from './SwitchKeymapAction';
+import {SwitchLayerAction} from './SwitchLayerAction';
 
 export class KeyActions extends ClassArray<KeyAction> {
 

src/config-serializer/config-items/Keymap.ts

@@ -1,7 +1,7 @@
+import {assertUInt8} from '../assert';
 import {Serializable} from '../Serializable';
 import {UhkBuffer} from '../UhkBuffer';
 import {Layers} from './Layers';
-import {assertUInt8} from '../assert';
 
 export class Keymap extends Serializable<Keymap> {
 

src/config-serializer/config-items/KeystrokeAction.ts

@@ -1,7 +1,7 @@
+import {assertEnum, assertUInt8} from '../assert';
 import {UhkBuffer} from '../UhkBuffer';
-import {keyActionType, KeyActionId, KeyAction} from './KeyAction';
+import {KeyAction, KeyActionId, keyActionType} from './KeyAction';
 import {KeyModifiers} from './KeyModifiers';
-import {assertUInt8, assertEnum} from '../assert';
 import {LongPressAction} from './LongPressAction';
 
 export enum KeystrokeActionFlag {

src/config-serializer/config-items/Layer.ts

@@ -1,7 +1,7 @@
-import { Serializable } from '../Serializable';
-import { Modules } from './Modules';
-import { UhkBuffer } from '../UhkBuffer';
 import { AnimationKeyboard } from '../../components/svg/wrap';
+import { Serializable } from '../Serializable';
+import { UhkBuffer } from '../UhkBuffer';
+import { Modules } from './Modules';
 
 export class Layer extends Serializable<Layer> {
 

src/config-serializer/config-items/Macro.ts

@@ -1,7 +1,7 @@
+import {assertUInt8} from '../assert';
 import {Serializable} from '../Serializable';
 import {UhkBuffer} from '../UhkBuffer';
 import {MacroActions} from './MacroActions';
-import {assertUInt8} from '../assert';
 
 export class Macro extends Serializable<Macro> {
 

src/config-serializer/config-items/MacroActions.ts

@@ -1,10 +1,10 @@
 import {ClassArray} from '../ClassArray';
 import {UhkBuffer} from '../UhkBuffer';
 import {DelayMacroAction} from './DelayMacroAction';
-import {MacroAction, macroActionType, MacroActionId} from './MacroAction';
 import {HoldKeyMacroAction} from './HoldKeyMacroAction';
 import {HoldModifiersMacroAction} from './HoldModifiersMacroAction';
 import {HoldMouseButtonsMacroAction} from './HoldMouseButtonsMacroAction';
+import {MacroAction, MacroActionId, macroActionType} from './MacroAction';
 import {MoveMouseMacroAction} from './MoveMouseMacroAction';
 import {PressKeyMacroAction} from './PressKeyMacroAction';
 import {PressModifiersMacroAction} from './PressModifiersMacroAction';

src/config-serializer/config-items/Macros.ts

@@ -1,6 +1,6 @@
 import {ClassArray} from '../ClassArray';
-import {Macro} from './Macro';
 import {UhkBuffer} from '../UhkBuffer';
+import {Macro} from './Macro';
 
 export class Macros extends ClassArray<Macro> {
 

src/config-serializer/config-items/Module.ts

@@ -1,7 +1,7 @@
+import {assertEnum, assertUInt8} from '../assert';
 import {Serializable} from '../Serializable';
-import {KeyActions} from './KeyActions';
 import {UhkBuffer} from '../UhkBuffer';
-import {assertUInt8, assertEnum} from '../assert';
+import {KeyActions} from './KeyActions';
 
 enum PointerRole {
     none,

src/config-serializer/config-items/ModuleConfiguration.ts

@@ -1,6 +1,6 @@
+import {assertUInt8} from '../assert';
 import {Serializable} from '../Serializable';
 import {UhkBuffer} from '../UhkBuffer';
-import {assertUInt8} from '../assert';
 
 export class ModuleConfiguration extends Serializable<ModuleConfiguration> {
 

src/config-serializer/config-items/ModuleConfigurations.ts

@@ -1,6 +1,6 @@
 import {ClassArray} from '../ClassArray';
-import {ModuleConfiguration} from './ModuleConfiguration';
 import {UhkBuffer} from '../UhkBuffer';
+import {ModuleConfiguration} from './ModuleConfiguration';
 
 export class ModuleConfigurations extends ClassArray<ModuleConfiguration> {
 

src/config-serializer/config-items/Modules.ts

@@ -1,6 +1,6 @@
 import {ClassArray} from '../ClassArray';
-import {Module} from './Module';
 import {UhkBuffer} from '../UhkBuffer';
+import {Module} from './Module';
 
 export class Modules extends ClassArray<Module> {
 

src/config-serializer/config-items/MouseAction.ts

@@ -1,6 +1,6 @@
-import {keyActionType, KeyActionId, KeyAction} from './KeyAction';
-import {UhkBuffer} from '../UhkBuffer';
 import {assertEnum} from '../assert';
+import {UhkBuffer} from '../UhkBuffer';
+import {KeyAction, KeyActionId, keyActionType} from './KeyAction';
 
 export enum MouseActionParam {
     leftClick,

src/config-serializer/config-items/MoveMouseMacroAction.ts

@@ -1,6 +1,6 @@
-import {MacroAction, macroActionType, MacroActionId} from './MacroAction';
-import {UhkBuffer} from '../UhkBuffer';
 import {assertInt16} from '../assert';
+import {UhkBuffer} from '../UhkBuffer';
+import {MacroAction, MacroActionId,  macroActionType} from './MacroAction';
 
 export class MoveMouseMacroAction extends MacroAction {
 

src/config-serializer/config-items/NoneAction.ts

@@ -1,5 +1,5 @@
-import {keyActionType, KeyActionId, KeyAction} from './KeyAction';
 import {UhkBuffer} from '../UhkBuffer';
+import {KeyAction, KeyActionId, keyActionType} from './KeyAction';
 
 export class NoneAction extends KeyAction {
 

src/config-serializer/config-items/PlayMacroAction.ts

@@ -1,6 +1,6 @@
-import {keyActionType, KeyActionId, KeyAction} from './KeyAction';
-import {UhkBuffer} from '../UhkBuffer';
 import {assertUInt8} from '../assert';
+import {UhkBuffer} from '../UhkBuffer';
+import {KeyAction, KeyActionId, keyActionType} from './KeyAction';
 
 export class PlayMacroAction extends KeyAction {
 

src/config-serializer/config-items/PressKeyMacroAction.ts

@@ -1,6 +1,6 @@
-import {MacroAction, MacroActionId, macroActionType} from './MacroAction';
-import {UhkBuffer} from '../UhkBuffer';
 import {assertUInt8} from '../assert';
+import {UhkBuffer} from '../UhkBuffer';
+import {MacroAction, MacroActionId, macroActionType} from './MacroAction';
 
 export class PressKeyMacroAction extends MacroAction {
 

src/config-serializer/config-items/PressModifiersMacroAction.ts

@@ -1,7 +1,7 @@
-import {MacroAction, MacroActionId, macroActionType} from './MacroAction';
-import {KeyModifiers} from './KeyModifiers';
-import {UhkBuffer} from '../UhkBuffer';
 import {assertUInt8} from '../assert';
+import {UhkBuffer} from '../UhkBuffer';
+import {KeyModifiers} from './KeyModifiers';
+import {MacroAction, MacroActionId, macroActionType} from './MacroAction';
 
 export class PressModifiersMacroAction extends MacroAction {
 

src/config-serializer/config-items/PressMouseButtonsMacroAction.ts

@@ -1,6 +1,6 @@
-import {MacroAction, MacroActionId, macroActionType} from './MacroAction';
-import {UhkBuffer} from '../UhkBuffer';
 import {assertUInt8} from '../assert';
+import {UhkBuffer} from '../UhkBuffer';
+import {MacroAction, MacroActionId, macroActionType} from './MacroAction';
 
 export class PressMouseButtonsMacroAction extends MacroAction {
 

src/config-serializer/config-items/ReleaseKeyMacroAction.ts

@@ -1,6 +1,6 @@
-import {MacroAction, MacroActionId, macroActionType} from './MacroAction';
-import {UhkBuffer} from '../UhkBuffer';
 import {assertUInt8} from '../assert';
+import {UhkBuffer} from '../UhkBuffer';
+import {MacroAction, MacroActionId, macroActionType} from './MacroAction';
 
 export class ReleaseKeyMacroAction extends MacroAction {
 

src/config-serializer/config-items/ReleaseModifiersMacroAction.ts

@@ -1,7 +1,7 @@
-import {MacroAction, MacroActionId, macroActionType} from './MacroAction';
-import {KeyModifiers} from './KeyModifiers';
-import {UhkBuffer} from '../UhkBuffer';
 import {assertUInt8} from '../assert';
+import {UhkBuffer} from '../UhkBuffer';
+import {KeyModifiers} from './KeyModifiers';
+import {MacroAction, MacroActionId, macroActionType} from './MacroAction';
 
 export class ReleaseModifiersMacroAction extends MacroAction {
 

src/config-serializer/config-items/ReleaseMouseButtonsMacroAction.ts

@@ -1,6 +1,6 @@
-import {MacroAction, MacroActionId, macroActionType} from './MacroAction';
-import {UhkBuffer} from '../UhkBuffer';
 import {assertUInt8} from '../assert';
+import {UhkBuffer} from '../UhkBuffer';
+import {MacroAction, MacroActionId, macroActionType} from './MacroAction';
 
 export class ReleaseMouseButtonsMacroAction extends MacroAction {
 

src/config-serializer/config-items/ScrollMouseMacroAction.ts

@@ -1,6 +1,6 @@
-import {MacroAction, MacroActionId, macroActionType} from './MacroAction';
-import {UhkBuffer} from '../UhkBuffer';
 import {assertInt16} from '../assert';
+import {UhkBuffer} from '../UhkBuffer';
+import {MacroAction, MacroActionId, macroActionType} from './MacroAction';
 
 export class ScrollMouseMacroAction extends MacroAction {
 

src/config-serializer/config-items/SwitchKeymapAction.ts

@@ -1,6 +1,6 @@
-import {keyActionType, KeyActionId, KeyAction} from './KeyAction';
-import {UhkBuffer} from '../UhkBuffer';
 import {assertUInt8} from '../assert';
+import {UhkBuffer} from '../UhkBuffer';
+import {KeyAction, KeyActionId, keyActionType} from './KeyAction';
 
 export class SwitchKeymapAction extends KeyAction {
 

src/config-serializer/config-items/SwitchLayerAction.ts

@@ -1,6 +1,6 @@
-import {keyActionType, KeyActionId, KeyAction} from './KeyAction';
-import {UhkBuffer} from '../UhkBuffer';
 import {assertEnum} from '../assert';
+import {UhkBuffer} from '../UhkBuffer';
+import {KeyAction, KeyActionId, keyActionType} from './KeyAction';
 
 export enum LayerName {
     mod,

src/config-serializer/config-items/TextMacroAction.ts

@@ -1,5 +1,5 @@
-import {MacroAction, MacroActionId, macroActionType} from './MacroAction';
 import {UhkBuffer} from '../UhkBuffer';
+import {MacroAction, MacroActionId, macroActionType} from './MacroAction';
 
 export class TextMacroAction extends MacroAction {
 

src/config-serializer/config-items/UhkConfiguration.ts

@@ -1,11 +1,11 @@
+import {assertUInt32, assertUInt8} from '../assert';
 import {Serializable} from '../Serializable';
-import {ModuleConfigurations} from './ModuleConfigurations';
+import {UhkBuffer} from '../UhkBuffer';
 import {Keymap} from './Keymap';
 import {Keymaps} from './Keymaps';
 import {Macro} from './Macro';
 import {Macros} from './Macros';
-import {UhkBuffer} from '../UhkBuffer';
+import {ModuleConfigurations} from './ModuleConfigurations';
-import {assertUInt8, assertUInt32} from '../assert';
 
 export class UhkConfiguration extends Serializable<UhkConfiguration> {
 

src/main-app/main-app.routes.ts

@@ -1,13 +1,14 @@
 import { ModuleWithProviders } from '@angular/core';
-import { Routes, RouterModule }  from '@angular/router';
+import { RouterModule, Routes }  from '@angular/router';
+
 import { keymapRoutes } from '../components/keymap';
-import { macroRoutes } from '../components/macro';
 import { legacyRoutes } from '../components/legacy-loader';
+import { macroRoutes } from '../components/macro';
 
 const appRoutes: Routes = [
     ...keymapRoutes,
-    ...macroRoutes,
+    ...legacyRoutes,
-    ...legacyRoutes
+    ...macroRoutes
 ];
 
 export const appRoutingProviders: any[] = [ ];

src/services/uhk-configuration.service.ts

@@ -1,8 +1,9 @@
 import { Injectable } from '@angular/core';
-import {DataProviderService} from './data-provider.service';
 
 import {UhkConfiguration} from '../config-serializer/config-items/UhkConfiguration';
 
+import {DataProviderService} from './data-provider.service';
+
 @Injectable()
 export class UhkConfigurationService {
 

test-serializer/test-serializer.ts

@@ -1,6 +1,6 @@
+import {UhkConfiguration} from '../src/config-serializer/config-items/UhkConfiguration';
 import {Serializable} from '../src/config-serializer/Serializable';
 import {UhkBuffer} from '../src/config-serializer/UhkBuffer';
-import {UhkConfiguration} from '../src/config-serializer/config-items/UhkConfiguration';
 
 let assert = require('assert');
 let fs = require('fs');

tslint.json

@@ -8,6 +8,7 @@
         ],
         "no-inferrable-types": true,
         "no-internal-module": true,
+        "class-name": true,
         "curly": true,
         "no-construct": true,
         "no-duplicate-key": true,
@@ -22,7 +23,9 @@
         "no-unused-variable": [
             true,
             "check-parameters",
-            {"ignore-pattern": "assert.*|keyActionType"}
+            {
+                "ignore-pattern": "assert.*|keyActionType"
+            }
         ],
         "no-use-before-declare": true,
         "no-var-keyword": true,
@@ -40,7 +43,8 @@
         ],
         "no-trailing-whitespace": true,
         "trailing-comma": [
-            true, {
+            true,
+            {
                 "multiline": "never",
                 "singleline": "never"
             }
@@ -62,7 +66,12 @@
             "check-open-brace",
             "check-whitespace"
         ],
-
+        "ordered-imports": [
+            true,
+            {
+                "named-imports-order": "lowercase-last"
+            }
+        ],
         "quotemark": [
             true,
             "single"