g

internal/mx/mx.go

@@ -5,6 +5,7 @@ package mx
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"net/http"
 	"net/url"
@@ -145,13 +146,19 @@ func (m Muxer) AddRoute(rt Route) error {
 	return nil
 }
 
-// Merge combines mxs into m. The resulting muxer uses the opts & notFoundHandler of m.
-func (m Muxer) Merge(mxs ...Muxer) (Muxer, error) {
-	if len(mxs) < 1 {
-		return m, nil
+// Merge combines mxs into one. The resulting muxer uses the opts & notFoundHandler of muxer at index 0.
+func Merge(mxs ...Muxer) (Muxer, error) {
+	_len := len(mxs)
+
+	if _len <= 0 {
+		return Muxer{}, errors.New("ong/mux: no muxer")
+	}
+	if _len == 1 {
+		return mxs[0], nil
 	}
 
-	for _, v := range mxs {
+	m := mxs[0]
+	for _, v := range mxs[1:] {
 		m.router.routes = append(m.router.routes, v.router.routes...)
 	}
 

internal/mx/mx_test.go

@@ -429,7 +429,7 @@ func TestMux(t *testing.T) {
 			mux2, err := New(config.WithOpts(domain, httpsPort, tst.SecretKey(), config.DirectIpStrategy, l), nil, rt2, rt3)
 			attest.Ok(t, err)
 
-			m, err := mux1.Merge(mux2)
+			m, err := Merge(mux1, mux2)
 			attest.Ok(t, err)
 
 			attest.Equal(t, m.opt, mux1.opt)
@@ -452,7 +452,7 @@ func TestMux(t *testing.T) {
 			mux2, err := New(config.WithOpts(domain, httpsPort, tst.SecretKey(), config.DirectIpStrategy, l), nil, rt2, rt3)
 			attest.Ok(t, err)
 
-			_, errM := mux1.Merge(mux2)
+			_, errM := Merge(mux1, mux2)
 			attest.Error(t, errM)
 			rStr := errM.Error()
 			attest.Subsequence(t, rStr, "would conflict")

mux/mux.go

@@ -90,14 +90,14 @@ func (m Muxer) Unwrap() mx.Muxer {
 	return m.internalMux
 }
 
-// Merge combines mxs into m. The resulting muxer uses the opts & notFoundHandler of m.
-func (m Muxer) Merge(mxs ...Muxer) (Muxer, error) {
+// Merge combines mxs into one. The resulting muxer uses the opts & notFoundHandler of muxer at index 0.
+func Merge(mxs ...Muxer) (Muxer, error) {
 	mi := []mx.Muxer{}
 	for _, v := range mxs {
 		mi = append(mi, v.internalMux)
 	}
 
-	mm, err := m.internalMux.Merge(mi...)
+	mm, err := mx.Merge(mi...)
 	if err != nil {
 		return Muxer{}, err
 	}

mux/mux_test.go

@@ -72,7 +72,7 @@ func TestMerge(t *testing.T) {
 		mx1 := New(config.DevOpts(l, "secretKey12@34String"), nil, rt1...)
 		mx2 := New(config.DevOpts(l, "secretKey12@34String"), nil, rt2...)
 
-		_, err := mx1.Merge(mx2)
+		_, err := Merge(mx1, mx2)
 		attest.Ok(t, err)
 	})
 
@@ -92,7 +92,7 @@ func TestMerge(t *testing.T) {
 		mx1 := New(config.DevOpts(l, "secretKey12@34String"), nil, rt1...)
 		mx2 := New(config.DevOpts(l, "secretKey12@34String"), nil, rt2...)
 
-		_, err := mx1.Merge(mx2)
+		_, err := Merge(mx1, mx2)
 		attest.Error(t, err)
 		attest.Subsequence(t, err.Error(), "would conflict")
 	})