♻️ Refactor some Base class methods

11ways · Jan 18, 2024 · 0abd8e1 · 0abd8e1
1 parent f019ad1
commit 0abd8e1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/lib/core/base.js b/lib/core/base.js
@@ -233,20 +233,18 @@ Base.setStatic(function startNewGroup(value) {
  *
  * @author   Jelle De Loecker <[email protected]>
  * @since    1.0.0
- * @version  1.0.0
+ * @version  1.4.0
  */
 Base.setStatic(function getAllChildren() {
 
-	var result = [],
-	    i;
+	let result = [];
 
 	if (!this.children) {
 		return result;
 	}
 
-	for (i = 0; i < this.children.length; i++) {
-		result.push(this.children[i]);
-		result.include(this.children[i].getAllChildren());
+	for (let child of this.children) {
+		result.push(child, ...child.getAllChildren());
 	}
 
 	return result;
@@ -585,7 +583,7 @@ Base.setMethod(function getModel(name, init, options) {
 	}
 
 	if (!init) {
-		return Model.get(name, false);
+		return Model.get(name, false, options);
 	}
 
 	if (!options) {

diff --git a/lib/core/client_base.js b/lib/core/client_base.js
@@ -200,7 +200,7 @@ ClientBase.setStatic(function setMethod(key, method, on_server) {
  */
 ClientBase.setStatic(function mapEventToMethod(event_name, method_name) {
 
-	function doMap() {
+	function addEventMap() {
 
 		if (!this.event_to_method_map) {
 			this.setStatic('event_to_method_map', new Map(), false);
@@ -219,11 +219,11 @@ ClientBase.setStatic(function mapEventToMethod(event_name, method_name) {
 		}
 	}
 
-	this.constitute(doMap);
+	this.constitute(addEventMap);
 
 	if (Blast.isNode) {
 		this.callbackWithServerClass(function gotClass(ServerClass) {
-			ServerClass.constitute(doMap);
+			ServerClass.constitute(addEventMap);
 		});
 	}
 });