use Map instead of Object for gameEventList

Makefile

@@ -13,7 +13,6 @@ watch: node_modules
 .PHONY: build
 build: node_modules
 	node $(tsc)
-	node $(tsc) -p tsconfig.es6.json
 
 .PHONY: test
 test: node_modules

src/Data/GameEvent.ts

@@ -63,7 +63,3 @@ export type GameEventValues = GameEventValueMap |
 	RoundWinEventValues |
 	PlayerSpawnEventValues |
 	ObjectDestroyedValues;
-
-export interface GameEventDefinitionMap {
-	[id: number]: GameEventDefinition;
-}

src/Data/Match.ts

@@ -7,7 +7,7 @@ import {handleSayText2} from '../PacketHandler/SayText2';
 import {handleStringTable, handleStringTables, handleStringTableUpdate} from '../PacketHandler/StringTable';
 import {Building} from './Building';
 import {Death} from './Death';
-import {GameEventDefinitionMap} from './GameEvent';
+import {GameEventDefinition} from './GameEvent';
 import {PacketEntity} from './PacketEntity';
 import {Player} from './Player';
 import {PlayerResource} from './PlayerResource';
@@ -28,7 +28,7 @@ export class Match {
 	public startTick: number;
 	public intervalPerTick: number;
 	public staticBaseLines: BitStream[];
-	public eventDefinitions: GameEventDefinitionMap;
+	public eventDefinitions: Map<number, GameEventDefinition>;
 	public world: World;
 	public players: Player[];
 	public playerMap: { [entityId: number]: Player };
@@ -58,7 +58,7 @@ export class Match {
 		this.sendTables = [];
 		this.serverClasses = [];
 		this.staticBaseLines = [];
-		this.eventDefinitions = {};
+		this.eventDefinitions = new Map();
 		this.players = [];
 		this.playerMap = {};
 		this.world = {

src/Data/Packet.ts

@@ -1,5 +1,5 @@
 import {BitStream} from 'bit-buffer';
-import {GameEvent, GameEventDefinitionMap} from './GameEvent';
+import {GameEvent, GameEventDefinition} from './GameEvent';
 import {PacketEntity} from './PacketEntity';
 import {SendTable} from './SendTable';
 import {ServerClass} from './ServerClass';
@@ -70,7 +70,7 @@ export interface GameEventPacket extends BasePacket {
 
 export interface GameEventListPacket extends BasePacket {
 	packetType: 'gameEventList';
-	eventList: GameEventDefinitionMap;
+	eventList: Map<number, GameEventDefinition>;
 }
 
 export interface PacketEntitiesPacket extends BasePacket {

src/Parser/Packet/GameEvent.ts

@@ -1,16 +1,16 @@
 import {BitStream} from 'bit-buffer';
 import {
-	GameEvent as IGameEvent, GameEventDefinition, GameEventDefinitionMap, GameEventEntry, GameEventType,
+	GameEvent as IGameEvent, GameEventDefinition, GameEventEntry, GameEventType,
 	GameEventValue, GameEventValueMap,
 } from '../../Data/GameEvent';
 import {Match} from '../../Data/Match';
 import {GameEventPacket} from '../../Data/Packet';
 
-function parseGameEvent(eventId: number, stream: BitStream, events: GameEventDefinitionMap): IGameEvent {
+function parseGameEvent(eventId: number, stream: BitStream, events: Map<number, GameEventDefinition>): IGameEvent {
-	if (!events[eventId]) {
+	const eventDescription = events.get(eventId);
+	if (!eventDescription) {
 		throw new Error('unknown event type');
 	}
-	const eventDescription: GameEventDefinition = events[eventId];
 	const values: GameEventValueMap = {};
 	for (const entry of eventDescription.entries) {
 		const value = getGameEventValue(stream, entry);

src/Parser/Packet/GameEventList.ts

@@ -1,5 +1,5 @@
 import {BitStream} from 'bit-buffer';
-import {GameEventDefinition, GameEventDefinitionMap, GameEventEntry} from '../../Data/GameEvent';
+import {GameEventDefinition, GameEventEntry} from '../../Data/GameEvent';
 import {GameEventListPacket} from '../../Data/Packet';
 
 export function ParseGameEventList(stream: BitStream): GameEventListPacket { // 30: gameEventList
@@ -8,7 +8,7 @@ export function ParseGameEventList(stream: BitStream): GameEventListPacket { //
 	// list of game events and parameters
 	const numEvents = stream.readBits(9);
 	const length = stream.readBits(20);
-	const eventList: GameEventDefinitionMap = {};
+	const eventList: Map<number, GameEventDefinition> = new Map();
 	for (let i = 0; i < numEvents; i++) {
 		const id = stream.readBits(9);
 		const name = stream.readASCIIString();
@@ -21,11 +21,11 @@ export function ParseGameEventList(stream: BitStream): GameEventListPacket { //
 			});
 			type = stream.readBits(3);
 		}
-		eventList[id] = {
+		eventList.set(id, {
 			id,
 			name,
 			entries,
-		};
+		});
 	}
 	return {
 		packetType: 'gameEventList',
@@ -34,13 +34,13 @@ export function ParseGameEventList(stream: BitStream): GameEventListPacket { //
 }
 
 export function EncodeGameEventList(packet: GameEventListPacket, stream: BitStream) {
-	stream.writeBits(Object.keys(packet.eventList).length, 9);
+	const definitions = Array.from(packet.eventList.values());
+	stream.writeBits(definitions.length, 9);
 
-	const eventListBitLength = getEventListLength(Object.values(packet.eventList));
+	const eventListBitLength = getEventListLength(definitions);
 	const eventListStream = new BitStream(new ArrayBuffer(Math.ceil(eventListBitLength / 8)));
 
-	for (const id in packet.eventList) {
+	for (const definition of definitions) {
-		const definition = packet.eventList[id] as GameEventDefinition;
 		eventListStream.writeBits(definition.id, 9);
 		eventListStream.writeASCIIString(definition.name);
 		for (const entry of definition.entries) {

src/tests/unit/Parser/Packet/GameEventListTest.ts

@@ -2,14 +2,20 @@ import {BitStream} from 'bit-buffer';
 import {assertEncoder, assertParser, getStream} from './PacketTest';
 import {readFileSync} from 'fs';
 import {EncodeGameEventList, ParseGameEventList} from '../../../../Parser/Packet/GameEventList';
+import {GameEventListPacket} from '../../../../Data/Packet';
 
 const data = JSON.parse(readFileSync(__dirname + '/../../../data/gameEventListData.json', 'utf8'));
-const expected = JSON.parse(readFileSync(__dirname + '/../../../data/gameEventList.json', 'utf8'));
+const expectedSource = JSON.parse(readFileSync(__dirname + '/../../../data/gameEventList.json', 'utf8'));
 
-const eventList = {
+const expected = {
+	packetType: 'gameEventList',
+	eventList: new Map(Object.entries(expectedSource.eventList))
+};
+
+const eventList: GameEventListPacket = {
 	'packetType': 'gameEventList',
-	'eventList': {
+	'eventList': new Map([
-		'0': {
+		[0, {
 			'id': 0,
 			'name': 'server_spawn',
 			'entries': [
@@ -54,8 +60,8 @@ const eventList = {
 					'name': 'password'
 				}
 			]
-		},
+		}],
-		'1': {
+		[1, {
 			'id': 1,
 			'name': 'server_changelevel_failed',
 			'entries': [
@@ -64,8 +70,8 @@ const eventList = {
 					'name': 'levelname'
 				}
 			]
-		},
+		}],
-		'2': {
+		[2, {
 			'id': 2,
 			'name': 'server_shutdown',
 			'entries': [
@@ -74,8 +80,8 @@ const eventList = {
 					'name': 'reason'
 				}
 			]
-		}
+		}]
-	}
+	])
 };
 
 suite('GameEventList', () => {

tsconfig.es6.json

@@ -7,8 +7,8 @@
       "ES2017"
     ],
     "module": "ES6",
-		"target": "ES5",
+    "target": "ES6",
-		"outDir": "build/es6",
+    "outDir": "build",
     "rootDir": "src",
     "declaration": true,
     "strictNullChecks": true,

tsconfig.json

@@ -7,7 +7,7 @@
       "ES2017"
     ],
     "module": "commonjs",
-    "target": "ES5",
+    "target": "ES6",
     "outDir": "build",
     "rootDir": "src",
     "declaration": true,