✨ LinkedHashMap追加

Author: hi2ma-bu4

README.md

@@ -43,3 +43,16 @@ Mapが予約語だったので変更
 #### HashMap
 
 JavaのHashMapをJavaScriptにそれっぽく似せて作ったやつ
+
+使い道なし
+
+#### TreeMap
+
+JavaのTreeMapをJavaScriptにそれっぽく似せて作ったやつ
+
+使い道なし
+
+#### LinkedHashMap
+
+JavaのLinkedHashMapをJavaScriptにそれっぽく似せて作ったやつ
+

dist/JavaLibraryScript.js

@@ -18,7 +18,7 @@ class BaseMap extends Interface {
 		clear: { returns: NoReturn },
 		containsKey: { args: [NotEmpty], returns: Boolean },
 		containsValue: { args: [NotEmpty], returns: Boolean },
-		keySet: { returns: Array },
+		keys: { returns: Array },
 		values: { returns: Array },
 		entrySet: { returns: Array },
 	};

dist/JavaLibraryScript.js.map

@@ -20,6 +20,7 @@ class HashMap extends BaseMap {
 
 	get(key) {
 		this._checkKey(key);
+		if (!this._map.has(key)) return undefined;
 		return this._data.get(key);
 	}
 
@@ -64,7 +65,7 @@ class HashMap extends BaseMap {
 		return false;
 	}
 
-	keySet() {
+	keys() {
 		return Array.from(this._data.keys());
 	}
 
@@ -84,12 +85,22 @@ class HashMap extends BaseMap {
 		return true;
 	}
 
+	forEach(callback, thisArg) {
+		for (const [key, value] of this._data.entries()) {
+			callback.call(thisArg, value, key, this);
+		}
+	}
+
 	toString() {
 		const data = Array.from(this.entries())
 			.map(([k, v]) => `${k}=${v}`)
 			.join(", ");
 		return `{ ${data} }`;
 	}
+
+	[Symbol.iterator]() {
+		return this.entries()[Symbol.iterator]();
+	}
 }
 
 module.exports = HashMap;

dist/JavaLibraryScript.min.js

@@ -0,0 +1,29 @@
+const HashMap = require("./HashMap");
+
+class LinkedHashMap extends HashMap {
+	constructor(KeyType, ValueType, { accessOrder = false } = {}) {
+		super(KeyType, ValueType);
+		this._accessOrder = accessOrder;
+	}
+
+	put(key, value) {
+		this._checkKey(key);
+		this._checkValue(value);
+
+		if (this._accessOrder && this._data.has(key)) {
+			this._data.delete(key); // 移動のため一度削除
+		}
+		super.put(key, value);
+	}
+
+	get(key) {
+		const value = super.get(key);
+		if (this._accessOrder && value !== undefined) {
+			this._data.delete(key); // 移動のため一度削除
+			this._data.set(key, value);
+		}
+		return value;
+	}
+}
+
+module.exports = LinkedHashMap;

dist/JavaLibraryScript.min.js.map

@@ -1,4 +1,3 @@
-const BaseMap = require("./BaseMap");
 const HashMap = require("./HashMap");
 
 class TreeMap extends HashMap {
@@ -48,6 +47,18 @@ class TreeMap extends HashMap {
 		this._invalidateSortedKeys();
 	}
 
+	keys() {
+		return this._getSortedKeys().slice();
+	}
+
+	values() {
+		return this._getSortedKeys().map((k) => this._data.get(k));
+	}
+
+	entrySet() {
+		return this._getSortedKeys().map((k) => [k, this._data.get(k)]);
+	}
+
 	firstKey() {
 		const keys = this._getSortedKeys();
 		return keys.length > 0 ? keys[0] : undefined;
@@ -95,6 +106,12 @@ class TreeMap extends HashMap {
 		}
 		return map;
 	}
+
+	forEach(callback, thisArg) {
+		for (const key of this._getSortedKeys()) {
+			callback.call(thisArg, this._map.get(key), key, this);
+		}
+	}
 }
 
 module.exports = TreeMap;

src/util/BaseMap.js

@@ -1,5 +1,6 @@
 module.exports = {
   BaseMap: require("./BaseMap.js"),
   HashMap: require("./HashMap.js"),
+  LinkedHashMap: require("./LinkedHashMap.js"),
   TreeMap: require("./TreeMap.js")
 };