perf: replace some slice utils with built-in utils

backend/services/browser_service.go

@@ -98,9 +98,9 @@ func (b *browserService) OpenConnection(name string) (resp types.JSResp) {
 	selConn := Connection().getConnection(name)
 	// correct last database index
 	lastDB := selConn.LastDB
-	if selConn.DBFilterType == "show" && !sliceutil.Contains(selConn.DBFilterList, lastDB) {
+	if selConn.DBFilterType == "show" && !slices.Contains(selConn.DBFilterList, lastDB) {
 		lastDB = selConn.DBFilterList[0]
-	} else if selConn.DBFilterType == "hide" && sliceutil.Contains(selConn.DBFilterList, lastDB) {
+	} else if selConn.DBFilterType == "hide" && slices.Contains(selConn.DBFilterList, lastDB) {
 		lastDB = selConn.DBFilterList[0]
 	}
 	if lastDB != selConn.LastDB {

backend/storage/connections.go

@@ -3,10 +3,10 @@ package storage
 import (
 	"errors"
 	"gopkg.in/yaml.v3"
+	"slices"
 	"sync"
 	"tinyrdm/backend/consts"
 	"tinyrdm/backend/types"
-	sliceutil "tinyrdm/backend/utils/slice"
 )
 
 type ConnectionsStorage struct {
@@ -256,10 +256,10 @@ func (c *ConnectionsStorage) SaveSortedConnection(sortedConns types.Connections)
 
 	conns := c.GetConnectionsFlat()
 	takeConn := func(name string) (types.Connection, bool) {
-		idx, ok := sliceutil.Find(conns, func(i int) bool {
+		idx := slices.IndexFunc(conns, func(connection types.Connection) bool {
-			return conns[i].Name == name
+			return connection.Name == name
 		})
-		if ok {
+		if idx >= 0 {
 			ret := conns[idx]
 			conns = append(conns[:idx], conns[idx+1:]...)
 			return ret, true

backend/utils/slice/slice_util.go

@@ -1,137 +1,11 @@
 package sliceutil
 
 import (
-	"sort"
-	"strconv"
 	"strings"
 	. "tinyrdm/backend/utils"
 )
 
-// Get 获取指定索引的值, 如果不存在则返回默认值
+// Map map items to new array
-func Get[S ~[]T, T any](arr S, index int, defaultVal T) T {
-	if index < 0 || index >= len(arr) {
-		return defaultVal
-	}
-	return arr[index]
-}
-
-// Remove 删除指定索引的元素
-func Remove[S ~[]T, T any](arr S, index int) S {
-	return append(arr[:index], arr[index+1:]...)
-}
-
-// RemoveIf 移除指定条件的元素
-func RemoveIf[S ~[]T, T any](arr S, cond func(T) bool) S {
-	l := len(arr)
-	if l <= 0 {
-		return arr
-	}
-	for i := l - 1; i >= 0; i-- {
-		if cond(arr[i]) {
-			arr = append(arr[:i], arr[i+1:]...)
-		}
-	}
-	return arr
-}
-
-// RemoveRange 删除从[from, to]部分元素
-func RemoveRange[S ~[]T, T any](arr S, from, to int) S {
-	return append(arr[:from], arr[to:]...)
-}
-
-// Find 查找指定条件的元素第一个出现位置
-func Find[S ~[]T, T any](arr S, matchFunc func(int) bool) (int, bool) {
-	total := len(arr)
-	for i := 0; i < total; i++ {
-		if matchFunc(i) {
-			return i, true
-		}
-	}
-	return -1, false
-}
-
-// AnyMatch 判断是否有任意元素符合条件
-func AnyMatch[S ~[]T, T any](arr S, matchFunc func(int) bool) bool {
-	total := len(arr)
-	if total > 0 {
-		for i := 0; i < total; i++ {
-			if matchFunc(i) {
-				return true
-			}
-		}
-	}
-	return false
-}
-
-// AllMatch 判断是否所有元素都符合条件
-func AllMatch[S ~[]T, T any](arr S, matchFunc func(int) bool) bool {
-	total := len(arr)
-	for i := 0; i < total; i++ {
-		if !matchFunc(i) {
-			return false
-		}
-	}
-	return true
-}
-
-// Equals 比较两个切片内容是否完全一致
-func Equals[S ~[]T, T comparable](arr1, arr2 S) bool {
-	if &arr1 == &arr2 {
-		return true
-	}
-
-	len1, len2 := len(arr1), len(arr2)
-	if len1 != len2 {
-		return false
-	}
-	for i := 0; i < len1; i++ {
-		if arr1[i] != arr2[i] {
-			return false
-		}
-	}
-	return true
-}
-
-// Contains 判断数组是否包含指定元素
-func Contains[S ~[]T, T Hashable](arr S, elem T) bool {
-	return AnyMatch(arr, func(idx int) bool {
-		return arr[idx] == elem
-	})
-}
-
-// ContainsAny 判断数组是否包含任意指定元素
-func ContainsAny[S ~[]T, T Hashable](arr S, elems ...T) bool {
-	for _, elem := range elems {
-		if Contains(arr, elem) {
-			return true
-		}
-	}
-	return false
-}
-
-// ContainsAll 判断数组是否包含所有指定元素
-func ContainsAll[S ~[]T, T Hashable](arr S, elems ...T) bool {
-	for _, elem := range elems {
-		if !Contains(arr, elem) {
-			return false
-		}
-	}
-	return true
-}
-
-// Filter 筛选出符合指定条件的所有元素
-func Filter[S ~[]T, T any](arr S, filterFunc func(int) bool) []T {
-	total := len(arr)
-	var result []T
-	for i := 0; i < total; i++ {
-		if filterFunc(i) {
-			result = append(result, arr[i])
-		}
-	}
-	return result
-}
-
-// Map 数组映射转换
 func Map[S ~[]T, T any, R any](arr S, mappingFunc func(int) R) []R {
 	total := len(arr)
 	result := make([]R, total)
@@ -141,7 +15,7 @@ func Map[S ~[]T, T any, R any](arr S, mappingFunc func(int) R) []R {
 	return result
 }
 
-// FilterMap 数组过滤和映射转换
+// FilterMap filter and map items to new array
 func FilterMap[S ~[]T, T any, R any](arr S, mappingFunc func(int) (R, bool)) []R {
 	total := len(arr)
 	result := make([]R, 0, total)
@@ -155,68 +29,7 @@ func FilterMap[S ~[]T, T any, R any](arr S, mappingFunc func(int) (R, bool)) []R
 	return result
 }
 
-// ToMap 数组转键值对
+// Join join any array to a single string by custom function
-func ToMap[S ~[]T, T any, K Hashable, V any](arr S, mappingFunc func(int) (K, V)) map[K]V {
-	total := len(arr)
-	result := map[K]V{}
-	for i := 0; i < total; i++ {
-		key, val := mappingFunc(i)
-		result[key] = val
-	}
-	return result
-}
-
-// Flat 二维数组扁平化
-func Flat[T any](arr [][]T) []T {
-	total := len(arr)
-	var result []T
-	for i := 0; i < total; i++ {
-		subTotal := len(arr[i])
-		for j := 0; j < subTotal; j++ {
-			result = append(result, arr[i][j])
-		}
-	}
-	return result
-}
-
-// FlatMap 二维数组扁平化映射
-func FlatMap[T any, R any](arr [][]T, mappingFunc func(int, int) R) []R {
-	total := len(arr)
-	var result []R
-	for i := 0; i < total; i++ {
-		subTotal := len(arr[i])
-		for j := 0; j < subTotal; j++ {
-			result = append(result, mappingFunc(i, j))
-		}
-	}
-	return result
-}
-
-func FlatValueMap[T Hashable](arr [][]T) []T {
-	return FlatMap(arr, func(i, j int) T {
-		return arr[i][j]
-	})
-}
-
-// Reduce 数组累计
-func Reduce[S ~[]T, T any, R any](arr S, init R, reduceFunc func(R, T) R) R {
-	result := init
-	for _, item := range arr {
-		result = reduceFunc(result, item)
-	}
-	return result
-}
-
-// Reverse 反转数组(会修改原数组)
-func Reverse[S ~[]T, T any](arr S) S {
-	total := len(arr)
-	for i := 0; i < total/2; i++ {
-		arr[i], arr[total-i-1] = arr[total-i-1], arr[i]
-	}
-	return arr
-}
-
-// Join 数组拼接转字符串
 func Join[S ~[]T, T any](arr S, sep string, toStringFunc func(int) string) string {
 	total := len(arr)
 	if total <= 0 {
@@ -236,21 +49,14 @@ func Join[S ~[]T, T any](arr S, sep string, toStringFunc func(int) string) strin
 	return sb.String()
 }
 
-// JoinString 字符串数组拼接成字符串
+// JoinString join string array to a single string
 func JoinString(arr []string, sep string) string {
 	return Join(arr, sep, func(idx int) string {
 		return arr[idx]
 	})
 }
 
-// JoinInt 整形数组拼接转字符串
+// Unique filter unique item
-func JoinInt(arr []int, sep string) string {
-	return Join(arr, sep, func(idx int) string {
-		return strconv.Itoa(arr[idx])
-	})
-}
-
-// Unique 数组去重
 func Unique[S ~[]T, T Hashable](arr S) S {
 	result := make(S, 0, len(arr))
 	uniKeys := map[T]struct{}{}
@@ -263,136 +69,3 @@ func Unique[S ~[]T, T Hashable](arr S) S {
 	}
 	return result
 }
-
-// UniqueEx 数组去重(任意类型)
-// @param toKeyFunc 数组元素转为唯一标识字符串函数, 如转为哈希值等
-func UniqueEx[S ~[]T, T any](arr S, toKeyFunc func(i int) string) S {
-	result := make(S, 0, len(arr))
-	keyArr := Map(arr, toKeyFunc)
-	uniKeys := map[string]struct{}{}
-	var exists bool
-	for i, item := range arr {
-		if _, exists = uniKeys[keyArr[i]]; !exists {
-			uniKeys[keyArr[i]] = struct{}{}
-			result = append(result, item)
-		}
-	}
-	return result
-}
-
-// Sort 顺序排序(会修改原数组)
-func Sort[S ~[]T, T Hashable](arr S) S {
-	sort.Slice(arr, func(i, j int) bool {
-		return arr[i] <= arr[j]
-	})
-	return arr
-}
-
-// SortDesc 倒序排序(会修改原数组)
-func SortDesc[S ~[]T, T Hashable](arr S) S {
-	sort.Slice(arr, func(i, j int) bool {
-		return arr[i] > arr[j]
-	})
-	return arr
-}
-
-// Union 返回两个切片共同拥有的元素
-func Union[S ~[]T, T Hashable](arr1 S, arr2 S) S {
-	hashArr, compArr := arr1, arr2
-	if len(arr1) < len(arr2) {
-		hashArr, compArr = compArr, hashArr
-	}
-	hash := map[T]struct{}{}
-	for _, item := range hashArr {
-		hash[item] = struct{}{}
-	}
-
-	uniq := map[T]struct{}{}
-	ret := make(S, 0, len(compArr))
-	exists := false
-	for _, item := range compArr {
-		if _, exists = hash[item]; exists {
-			if _, exists = uniq[item]; !exists {
-				ret = append(ret, item)
-				uniq[item] = struct{}{}
-			}
-		}
-	}
-	return ret
-}
-
-// Exclude 返回不包含的元素
-func Exclude[S ~[]T, T Hashable](arr1 S, arr2 S) S {
-	diff := make([]T, 0, len(arr1))
-	hash := map[T]struct{}{}
-	for _, item := range arr2 {
-		hash[item] = struct{}{}
-	}
-
-	for _, item := range arr1 {
-		if _, exists := hash[item]; !exists {
-			diff = append(diff, item)
-		}
-	}
-	return diff
-}
-
-// PadLeft 左边填充指定数量
-func PadLeft[S ~[]T, T any](arr S, val T, count int) S {
-	prefix := make(S, count)
-	for i := 0; i < count; i++ {
-		prefix[i] = val
-	}
-	arr = append(prefix, arr...)
-	return arr
-}
-
-// PadRight 右边填充指定数量
-func PadRight[S ~[]T, T any](arr S, val T, count int) S {
-	for i := 0; i < count; i++ {
-		arr = append(arr, val)
-	}
-	return arr
-}
-
-// RemoveLeft 移除左侧相同元素
-func RemoveLeft[S ~[]T, T comparable](arr S, val T) S {
-	for len(arr) > 0 && arr[0] == val {
-		arr = arr[1:]
-	}
-	return arr
-}
-
-// RemoveRight 移除右侧相同元素
-func RemoveRight[S ~[]T, T comparable](arr S, val T) S {
-	for {
-		length := len(arr)
-		if length > 0 && arr[length-1] == val {
-			arr = arr[:length]
-		} else {
-			break
-		}
-	}
-	return arr
-}
-
-// Count 统计制定条件元素数量
-func Count[S ~[]T, T any](arr S, filter func(int) bool) int {
-	count := 0
-	for i := range arr {
-		if filter(i) {
-			count += 1
-		}
-	}
-	return count
-}
-
-// Group 根据分组函数对数组进行分组汇总
-func Group[S ~[]T, T any, K Hashable, R any](arr S, groupFunc func(int) (K, R)) map[K][]R {
-	ret := map[K][]R{}
-	for i := range arr {
-		key, val := groupFunc(i)
-		ret[key] = append(ret[key], val)
-	}
-	return ret
-}