✨ Stream関連に型を付与

Author: hi2ma-bu4

dist/JavaLibraryScript.js

@@ -1,6 +1,6 @@
 {
   "name": "javalibraryscript",
-  "version": "v1.0.4.5",
+  "version": "v1.0.4.6",
   "description": "Javaの機能をJavaScriptに適当に再現",
   "main": "index.js",
   "scripts": {

dist/JavaLibraryScript.js.map

@@ -123,11 +123,13 @@ class Interface extends JavaLibraryScriptCore {
 	static convert(TargetClass, newDefs = {}, { inherit = true, abstract = true } = {}) {
 		this.applyTo(TargetClass, newDefs, { inherit });
 
+		const this_ = this;
+
 		const interfaceClass = class extends TargetClass {
 			constructor(...args) {
 				if (abstract) {
 					if (new.target === interfaceClass) {
-						this._handleError(TypeError, `Cannot instantiate abstract class ${TargetClass.name}`);
+						new TypeError(`Cannot instantiate abstract class ${TargetClass.name}`);
 					}
 				}
 				super(...args);
@@ -154,7 +156,7 @@ class Interface extends JavaLibraryScriptCore {
 							const expectedArgs = def.args || [];
 							for (let i = 0; i < expectedArgs.length; i++) {
 								if (!TypeChecker.matchType(args[i], expectedArgs[i])) {
-									this._handleError(TypeError, `"${this.constructor.name}.${methodName}" 第${i + 1}引数: ${TypeChecker.typeNames(expectedArgs[i])} を期待 → 実際: ${TypeChecker.stringify(args[i])}`);
+									this_._handleError(TypeError, `"${this.constructor.name}.${methodName}" 第${i + 1}引数: ${TypeChecker.typeNames(expectedArgs[i])} を期待 → 実際: ${TypeChecker.stringify(args[i])}`);
 								}
 							}
 
@@ -164,9 +166,9 @@ class Interface extends JavaLibraryScriptCore {
 							const validate = (val) => {
 								if (!TypeChecker.matchType(val, expectedReturn)) {
 									if (expectedReturn === TypeChecker.NoReturn) {
-										this._handleError(TypeError, `"${this.constructor.name}.${methodName}" は戻り値を返してはいけません → 実際: ${TypeChecker.stringify(val)}`);
+										this_._handleError(TypeError, `"${this.constructor.name}.${methodName}" は戻り値を返してはいけません → 実際: ${TypeChecker.stringify(val)}`);
 									} else {
-										this._handleError(TypeError, `"${this.constructor.name}.${methodName}" の戻り値: ${TypeChecker.typeNames(expectedReturn)} を期待 → 実際: ${TypeChecker.stringify(val)}`);
+										this_._handleError(TypeError, `"${this.constructor.name}.${methodName}" の戻り値: ${TypeChecker.typeNames(expectedReturn)} を期待 → 実際: ${TypeChecker.stringify(val)}`);
 									}
 								}
 								return val;

dist/JavaLibraryScript.min.js

@@ -1,3 +1,4 @@
+const { TypeChecker } = require("../libs");
 const MapInterface = require("./MapInterface");
 const EntryStream = require("./stream/EntryStream.js");
 
@@ -151,7 +152,7 @@ class HashMap extends MapInterface {
 	 * @returns {boolean}
 	 */
 	equals(otherMap) {
-		if (this.size !== otherMap.size) return false;
+		if (!(otherMap instanceof Map) || this.size !== otherMap.size) return false;
 		for (const [k, v] of this.entries()) {
 			if (!otherMap.has(k) || otherMap.get(k) !== v) return false;
 		}
@@ -190,18 +191,15 @@ class HashMap extends MapInterface {
 	 * @returns {string}
 	 */
 	toString() {
-		const data = Array.from(this.entries())
-			.map(([k, v]) => `${k}=${v}`)
-			.join(", ");
-		return `{ ${data} }`;
+		return `${this.constructor.name}<${TypeChecker.typeNames(this._KeyType)}, ${TypeChecker.typeNames(this._ValueType)}>(size=${this.size})`;
 	}
 
 	/**
 	 * イテレータを返却する
 	 * @returns {Iterator<V>}
 	 */
 	[Symbol.iterator]() {
-		return this.entries()[Symbol.iterator]();
+		return this.entries();
 	}
 }
 

dist/JavaLibraryScript.min.js.map

@@ -0,0 +1,210 @@
+const SetInterface = require("./SetInterface");
+const TypeChecker = require("../libs/TypeChecker");
+const StreamChecker = require("./stream/StreamChecker");
+const Stream = require("./stream/Stream.js");
+
+/**
+ * 型チェック機能のついたMap
+ * @template V
+ * @extends {SetInterface<V>}
+ * @class
+ */
+class HashSet extends SetInterface {
+	/**
+	 * @param {Function} ValueType
+	 */
+	constructor(ValueType) {
+		super(ValueType);
+	}
+
+	// ==================================================
+	// 基本操作(override)
+	// ==================================================
+
+	/**
+	 * 値を追加する
+	 * @param {V} value
+	 * @returns {this}
+	 * @throws {TypeError}
+	 */
+	add(value) {
+		this._checkValue(value);
+		return super.add(value);
+	}
+
+	/**
+	 * 値を一括で追加する
+	 * @param {Iterable<V>} collection
+	 * @returns {this}
+	 * @throws {TypeError}
+	 */
+	addAll(collection) {
+		for (const item of collection) {
+			this.add(item);
+		}
+		return this;
+	}
+
+	/**
+	 * 値の存在を確認
+	 * @param {V} value
+	 * @returns {boolean}
+	 * @throws {TypeError}
+	 */
+	has(value) {
+		this._checkValue(value);
+		return super.has(value);
+	}
+	/**
+	 * 値の存在を確認
+	 * @param {V} value
+	 * @returns {boolean}
+	 * @throws {TypeError}
+	 */
+	contains(value) {
+		return this.has(value);
+	}
+
+	/**
+	 * 全ての値の存在を確認
+	 * @param {Iterable<V>} collection
+	 * @returns {boolean}
+	 * @throws {TypeError}
+	 */
+	containsAll(collection) {
+		for (const item of collection) {
+			if (!this.has(item)) return false;
+		}
+		return true;
+	}
+
+	/**
+	 * 値を削除する
+	 * @param {V} value
+	 * @returns {boolean}
+	 * @throws {TypeError}
+	 */
+	delete(value) {
+		this._checkValue(value);
+		return super.delete(value);
+	}
+	/**
+	 * 値を削除する
+	 * @param {V} value
+	 * @returns {boolean}
+	 * @throws {TypeError}
+	 */
+	remove(value) {
+		return this.delete(value);
+	}
+
+	/**
+	 * 全ての値を削除する
+	 * @param {Iterable<V>} collection
+	 * @returns {boolean}
+	 * @throws {TypeError}
+	 */
+	removeAll(collection) {
+		let modified = false;
+		for (const item of collection) {
+			modified = this.delete(item) || modified;
+		}
+		return modified;
+	}
+
+	/**
+	 * 空かどうかを返却する
+	 * @returns {boolean}
+	 */
+	isEmpty() {
+		return this.size === 0;
+	}
+
+	/**
+	 * 含まれない要素を全削除する
+	 * @param {Iterable<V>} collection
+	 * @returns {boolean}
+	 * @throws {TypeError}
+	 */
+	retainAll(collection) {
+		const otherSet = new Set(collection);
+		let modified = false;
+		for (const item of this) {
+			if (!otherSet.has(item)) {
+				this.delete(item);
+				modified = true;
+			}
+		}
+		return modified;
+	}
+
+	// ==================================================
+	// 追加機能
+	// ==================================================
+
+	/**
+	 * 等価判定を行う
+	 * @param {this} otherSet
+	 * @returns {boolean}
+	 */
+	equals(otherSet) {
+		if (!(otherSet instanceof Set) || this.size !== otherSet.size) return false;
+		for (const item of this) {
+			if (!otherSet.has(item)) return false;
+		}
+		return true;
+	}
+
+	/**
+	 * 全てのデータを呼び出す
+	 * @param {Function} callback
+	 * @param {any} [thisArg]
+	 */
+	forEach(callback, thisArg) {
+		for (const item of this) {
+			callback.call(thisArg, item, item, this);
+		}
+	}
+
+	// ==================================================
+	// Stream
+	// ==================================================
+
+	/**
+	 * Streamを返却する
+	 * @returns {Stream<V>}
+	 */
+	stream() {
+		return StreamChecker.typeToStream(this._ValueType).from(this.values(), this._ValueType);
+	}
+
+	// ==================================================
+	// 基本操作(システム)
+	// ==================================================
+
+	/**
+	 * 配列に変換する
+	 * @returns {V[]}
+	 */
+	toArray() {
+		return Array.from(this);
+	}
+
+	/**
+	 * 文字列に変換する
+	 * @returns {string}
+	 */
+	toString() {
+		return `${this.constructor.name}<${TypeChecker.typeNames(this._ValueType)}>(size=${this.size})`;
+	}
+
+	/**
+	 * イテレータを返却する
+	 * @returns {Iterator<V>}
+	 */
+	[Symbol.iterator]() {
+		return this.values();
+	}
+}
+
+module.exports = HashSet;

package.json

@@ -23,8 +23,8 @@ class MapInterface extends Map {
 	 */
 	constructor(KeyType, ValueType) {
 		super();
-		this._KeyType = KeyType;
-		this._ValueType = ValueType;
+		this._KeyType = KeyType || Any;
+		this._ValueType = ValueType || Any;
 	}
 
 	/**

src/base/Interface.js

@@ -22,7 +22,7 @@ class SetInterface extends Set {
 	 */
 	constructor(ValueType) {
 		super();
-		this._ValueType = ValueType;
+		this._ValueType = ValueType || Any;
 	}
 
 	/**
@@ -38,12 +38,11 @@ class SetInterface extends Set {
 }
 
 module.exports = Interface.convert(SetInterface, {
-	set: { args: [NotEmpty, NotEmpty], returns: Any },
-	put: { args: [NotEmpty, NotEmpty], returns: Any },
+	add: { args: [NotEmpty], returns: Any },
 	delete: { args: [NotEmpty], returns: Boolean },
 	remove: { args: [NotEmpty], returns: Boolean },
 	isEmpty: { returns: Boolean },
 	clear: { returns: NoReturn },
 	has: { args: [NotEmpty], returns: Boolean },
-	containsValue: { args: [NotEmpty], returns: Boolean },
+	contains: { args: [NotEmpty], returns: Boolean },
 });