♻️ Make Base#callOrNext(name, args, next) handle methods without ca…

…llbacks
11ways · Oct 19, 2023 · a6ff810 · a6ff810
1 parent 2bfc8d5
commit a6ff810
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.3.20 (WIP)
+
+* Make `Base#callOrNext(name, args, next)` handle methods without callbacks
+
 ## 1.3.19 (2023-10-18)
 
 * Fix `Conduit#parseUrl()` not being able to parse the host & protocol of http2 requests

diff --git a/lib/core/base.js b/lib/core/base.js
@@ -471,7 +471,11 @@ Base.setMethod(function getClassPathAfter(after) {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.0
- * @version  1.2.2
+ * @version  1.3.20
+ *
+ * @param    {String}   name   The name of the method to call
+ * @param    {Array}    args   The arguments to pass
+ * @param    {Function} next   The callback to call afterwards
  */
 Base.setMethod(function callOrNext(name, args, next) {
 
@@ -480,14 +484,25 @@ Base.setMethod(function callOrNext(name, args, next) {
 		args = [];
 	}
 
-	if (typeof this[name] == 'function') {
+	const fnc = this[name];
+
+	if (typeof fnc == 'function') {
+
+		let has_callback = false,
+		    promise;
 
-		if (next) {
+		if (next && fnc.length > args.length) {
+			has_callback = true;
 			args.push(next);
 		}
 
 		try {
-			this[name].apply(this, args);
+			promise = this[name].apply(this, args);
+
+			if (!has_callback) {
+				Pledge.done(promise, next);
+			}
+
 		} catch (err) {
 			next(err);
 		}