feat: add isValidNextFunc test helper function.

Author: ghosind

async.go

@@ -215,3 +215,38 @@ func makeNonVariadicFuncIn(
 
 	return in
 }
+
+// isValidNextFunc checks the current function's return values and the next function's parameters,
+// and returns a boolean value to indicates whether the functions are match or not
+func isValidNextFunc(cur, next reflect.Type) bool {
+	isTakeContext := isFuncTakesContext(next)
+	numOut := cur.NumOut()
+	numIn := next.NumIn()
+
+	if isTakeContext {
+		numIn--
+	}
+	if numOut < numIn {
+		return false
+	}
+
+	i := 0
+	j := 0
+
+	if isTakeContext {
+		if numOut > 0 && isContextType(cur.Out(0)) {
+			i++
+		}
+		numIn++
+		j++
+	}
+	for i < numOut && j < numIn {
+		if cur.Out(i) != next.In(j) {
+			return false
+		}
+		i++
+		j++
+	}
+
+	return true
+}

seq.go

@@ -66,45 +66,10 @@ func validateSeqFuncs(funcs ...AsyncFn) error {
 	}
 
 	for i := 1; i < len(types); i++ {
-		err := validateSeqFuncParams(types[i-1], types[i])
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-// validateSeqFuncParams checks the previous function's return values and the current function's
-// parameters, and returns an error if they are not match.
-func validateSeqFuncParams(prev, cur reflect.Type) error {
-	isTakeContext := isFuncTakesContext(cur)
-	numIn := cur.NumIn()
-	numOut := prev.NumOut()
-
-	if isTakeContext {
-		numIn--
-	}
-	if numOut < numIn {
-		return ErrInvalidSeqFuncs
-	}
-
-	i := 0
-	j := 0
-
-	if isTakeContext {
-		if numOut > 0 && isContextType(prev.Out(0)) {
-			i++
-		}
-		numIn++
-		j++
-	}
-	for i < numOut && j < numIn {
-		if prev.Out(i) != cur.In(j) {
+		isValid := isValidNextFunc(types[i-1], types[i])
+		if !isValid {
 			return ErrInvalidSeqFuncs
 		}
-		i++
-		j++
 	}
 
 	return nil

until.go

@@ -70,31 +70,14 @@ func validateUntilFuncs(testFn, fn AsyncFn) (isNoParam bool) {
 		panic(ErrInvalidTestFunc)
 	}
 
-	ii := 0 // index of the test function input parameters list
-	oi := 0 // index of the function return values list
 	numIn := tft.NumIn()
-	isTakeContext := isFuncTakesContext(tft)
-	if isTakeContext {
-		numIn--
-		ii++
-	}
-	if numIn != 0 && numIn != ft.NumOut() {
-		panic(ErrInvalidTestFunc)
-	}
-	if numIn == 0 {
+	if numIn == 0 || (numIn == 1 && isFuncTakesContext(tft)) {
 		return true
 	}
 
-	for oi < numIn {
-		it := tft.In(ii) // type of the value in the test function input parameters list
-		ot := ft.Out(oi) // type of the value in the function return values list
-
-		if it != ot && !it.ConvertibleTo(ot) {
-			panic(ErrInvalidTestFunc)
-		}
-
-		ii++
-		oi++
+	isValid := isValidNextFunc(ft, tft)
+	if !isValid {
+		panic(ErrInvalidTestFunc)
 	}
 
 	return false