release v2.1.8

README.md

@@ -4,7 +4,7 @@
 <br/>
 
 ![Go version](https://img.shields.io/badge/go-%3E%3Dv1.18-9cf)
-[![Release](https://img.shields.io/badge/release-2.1.7-green.svg)](https://github.com/duke-git/lancet/releases)
+[![Release](https://img.shields.io/badge/release-2.1.8-green.svg)](https://github.com/duke-git/lancet/releases)
 [![GoDoc](https://godoc.org/github.com/duke-git/lancet/v2?status.svg)](https://pkg.go.dev/github.com/duke-git/lancet/v2)
 [![Go Report Card](https://goreportcard.com/badge/github.com/duke-git/lancet/v2)](https://goreportcard.com/report/github.com/duke-git/lancet/v2)
 [![test](https://github.com/duke-git/lancet/actions/workflows/codecov.yml/badge.svg?branch=main&event=push)](https://github.com/duke-git/lancet/actions/workflows/codecov.yml)
@@ -294,6 +294,7 @@ import "github.com/duke-git/lancet/v2/function"
 - [Compose](https://github.com/duke-git/lancet/blob/main/docs/function.md#Compose)
 - [Debounced](https://github.com/duke-git/lancet/blob/main/docs/function.md#Debounced)
 - [Delay](https://github.com/duke-git/lancet/blob/main/docs/function.md#Delay)
+- [Pipeline](https://github.com/duke-git/lancet/blob/main/docs/function.md#Pipeline)
 - [Watcher](https://github.com/duke-git/lancet/blob/main/docs/function.md#Watcher)
 
 
@@ -428,6 +429,8 @@ import "github.com/duke-git/lancet/v2/slice"
 - [Map](https://github.com/duke-git/lancet/blob/main/docs/slice.md#Map)
 - [Reverse](https://github.com/duke-git/lancet/blob/main/docs/slice.md#Reverse)
 - [Reduce](https://github.com/duke-git/lancet/blob/main/docs/slice.md#Reduce)
+- [Replace](https://github.com/duke-git/lancet/blob/main/docs/slice.md#Replace)
+- [ReplaceAll](https://github.com/duke-git/lancet/blob/main/docs/slice.md#ReplaceAll)
 - [Shuffle](https://github.com/duke-git/lancet/blob/main/docs/slice.md#Shuffle)
 - [SortByField](https://github.com/duke-git/lancet/blob/main/docs/slice.md#SortByField)
 - [Some](https://github.com/duke-git/lancet/blob/main/docs/slice.md#Some)

README_zh-CN.md

@@ -4,7 +4,7 @@
 <br/>
 
 ![Go version](https://img.shields.io/badge/go-%3E%3Dv1.18-9cf)
-[![Release](https://img.shields.io/badge/release-2.1.7-green.svg)](https://github.com/duke-git/lancet/releases)
+[![Release](https://img.shields.io/badge/release-2.1.8-green.svg)](https://github.com/duke-git/lancet/releases)
 [![GoDoc](https://godoc.org/github.com/duke-git/lancet/v2?status.svg)](https://pkg.go.dev/github.com/duke-git/lancet/v2)
 [![Go Report Card](https://goreportcard.com/badge/github.com/duke-git/lancet/v2)](https://goreportcard.com/report/github.com/duke-git/lancet/v2)
 [![test](https://github.com/duke-git/lancet/actions/workflows/codecov.yml/badge.svg?branch=main&event=push)](https://github.com/duke-git/lancet/actions/workflows/codecov.yml)
@@ -293,6 +293,7 @@ import "github.com/duke-git/lancet/v2/function"
 - [Compose](https://github.com/duke-git/lancet/blob/main/docs/function_zh-CN.md#Compose)
 - [Debounced](https://github.com/duke-git/lancet/blob/main/docs/function_zh-CN.md#Debounced)
 - [Delay](https://github.com/duke-git/lancet/blob/main/docs/function_zh-CN.md#Delay)
+- [Pipeline](https://github.com/duke-git/lancet/blob/main/docs/function_zh-CN.md#Pipeline)
 - [Watcher](https://github.com/duke-git/lancet/blob/main/docs/function_zh-CN.md#Watcher)
 
 
@@ -423,6 +424,8 @@ import "github.com/duke-git/lancet/v2/slice"
 - [Map](https://github.com/duke-git/lancet/blob/main/docs/slice_zh-CN.md#Map)
 - [Reverse](https://github.com/duke-git/lancet/blob/main/docs/slice_zh-CN.md#Reverse)
 - [Reduce](https://github.com/duke-git/lancet/blob/main/docs/slice_zh-CN.md#Reduce)
+- [Replace](https://github.com/duke-git/lancet/blob/main/docs/slice_zh-CN.md#Replace)
+- [ReplaceAll](https://github.com/duke-git/lancet/blob/main/docs/slice_zh-CN.md#ReplaceAll)
 - [Shuffle](https://github.com/duke-git/lancet/blob/main/docs/slice_zh-CN.md#Shuffle)
 - [SortByField](https://github.com/duke-git/lancet/blob/main/docs/slice_zh-CN.md#SortByField)
 - [Some](https://github.com/duke-git/lancet/blob/main/docs/slice_zh-CN.md#Some)

docs/datetime.md

@@ -251,7 +251,7 @@ func main() {
 <b>Signature:</b>
 
 ```go
-func BeginOfWeek(t time.Time) time.Time
+func BeginOfWeek(t time.Time, beginFrom ...time.Weekday) time.Time
 ```
 <b>Example:</b>
 
@@ -414,7 +414,7 @@ func main() {
 <b>Signature:</b>
 
 ```go
-func EndOfWeek(t time.Time) time.Time
+func EndOfWeek(t time.Time, endWith ...time.Weekday) time.Time
 ```
 <b>Example:</b>
 

docs/datetime_zh-CN.md

@@ -243,12 +243,12 @@ func main() {
 
 
 ### <span id="BeginOfWeek">BeginOfWeek</span>
-<p>返回指定时间的星期开始时间</p>
+<p>返回指定时间的每周开始时间,默认开始时间星期日</p>
 
 <b>函数签名:</b>
 
 ```go
-func BeginOfWeek(t time.Time) time.Time
+func BeginOfWeek(t time.Time, beginFrom ...time.Weekday) time.Time
 ```
 <b>例子:</b>
 
@@ -406,12 +406,12 @@ func main() {
 
 
 ### <span id="EndOfWeek">EndOfWeek</span>
-<p>返回指定时间的星期结束时间</p>
+<p>返回指定时间的星期结束时间,默认结束时间星期六</p>
 
 <b>函数签名:</b>
 
 ```go
-func EndOfWeek(t time.Time) time.Time
+func EndOfWeek(t time.Time, endWith ...time.Weekday) time.Time
 ```
 <b>例子:</b>
 

docs/function.md

@@ -26,6 +26,7 @@ import (
 - [Compose](#Compose)
 - [Debounced](#Debounced)
 - [Delay](#Delay)
+- [Pipeline](#Pipeline)
 - [Watcher](#Watcher)
 
 <div STYLE="page-break-after: always;"></div>
@@ -300,6 +301,43 @@ func main() {
 ```
 
 
+### <span id="Pipeline">Pipeline</span>
+
+<p>Pipeline takes a list of functions and returns a function whose param will be passed into
+the functions one by one.</p>
+
+<b>Signature:</b>
+
+```go
+func Pipeline[T any](funcs ...func(T) T) func(T) T
+```
+<b>Example:</b>
+
+```go
+package main
+
+import (
+    "fmt"
+    "github.com/duke-git/lancet/v2/function"
+)
+
+func main() {
+    addOne := func(x int) int {
+		return x + 1
+	}
+	double := func(x int) int {
+		return 2 * x
+	}
+	square := func(x int) int {
+		return x * x
+	}
+
+	f := Pipeline(addOne, double, square)
+
+	fmt.Println(f(2)) //36
+}
+```
+
 
 ### <span id="Watcher">Watcher</span>
 

docs/function_zh-CN.md

@@ -26,6 +26,7 @@ import (
 - [Compose](#Compose)
 - [Debounced](#Debounced)
 - [Delay](#Delay)
+- [Pipeline](#Pipeline)
 - [Watcher](#Watcher)
 
 <div STYLE="page-break-after: always;"></div>
@@ -300,6 +301,44 @@ func main() {
 
 
 
+### <span id="Pipeline">Pipeline</span>
+
+<p>执行函数pipeline.</p>
+
+<b>函数签名:</b>
+
+```go
+func Pipeline[T any](funcs ...func(T) T) func(T) T
+```
+<b>例子:</b>
+
+```go
+package main
+
+import (
+    "fmt"
+    "github.com/duke-git/lancet/v2/function"
+)
+
+func main() {
+    addOne := func(x int) int {
+		return x + 1
+	}
+	double := func(x int) int {
+		return 2 * x
+	}
+	square := func(x int) int {
+		return x * x
+	}
+
+	f := Pipeline(addOne, double, square)
+
+	fmt.Println(f(2)) //36
+}
+```
+
+
+
 ### <span id="Watcher">Watcher</span>
 
 <p>Watcher 用于记录代码执行时间。可以启动/停止/重置手表定时器。获取函数执行的时间。 </p>

docs/slice.md

@@ -53,6 +53,8 @@ import (
 - [Map](#Map)
 - [Reverse](#Reverse)
 - [Reduce](#Reduce)
+- [Replace](#Replace)
+- [ReplaceAll](#ReplaceAll)
 - [Shuffle](#Shuffle)
 - [SortByField](#SortByField)
 - [Some](#Some)
@@ -966,6 +968,60 @@ func main() {
 
 
 
+### <span id="Replace">Replace</span>
+<p>Returns a copy of the slice with the first n non-overlapping instances of old replaced by new.</p>
+
+<b>Signature:</b>
+
+```go
+func Replace[T comparable](slice []T, old T, new T, n int) []T
+```
+<b>Example:</b>
+
+```go
+import (
+	"fmt"
+	"github.com/duke-git/lancet/v2/slice"
+)
+
+func main() {
+	strs := []string{"a", "b", "a", "c", "d", "a"}
+
+	fmt.Println(slice.Replace(strs, "a", "x", 0)) //{"a", "b", "a", "c", "d", "a"}
+
+	fmt.Println(slice.Replace(strs, "a", "x", 1)) //{"x", "b", "a", "c", "d", "a"}
+
+	fmt.Println(slice.Replace(strs, "a", "x", -1)) //{"x", "b", "x", "c", "d", "x"}
+}
+```
+
+
+
+### <span id="ReplaceAll">ReplaceAll</span>
+<p>Returns a copy of the slice with the first n non-overlapping instances of old replaced by new.</p>
+
+<b>Signature:</b>
+
+```go
+func ReplaceAll[T comparable](slice []T, old T, new T) []T
+```
+<b>Example:</b>
+
+```go
+import (
+	"fmt"
+	"github.com/duke-git/lancet/v2/slice"
+)
+
+func main() {
+	strs := []string{"a", "b", "a", "c", "d", "a"}
+
+	fmt.Println(slice.ReplaceAll(strs, "a", "x")) //{"x", "b", "x", "c", "d", "x"}
+
+	fmt.Println(slice.Replace(strs, "e", "x")) //{"a", "b", "a", "c", "d", "a"}
+}
+```
+
 
 ### <span id="Shuffle">Shuffle</span>
 <p>Creates an slice of shuffled values.</p>

docs/slice_zh-CN.md

@@ -53,6 +53,8 @@ import (
 - [Map](#Map)
 - [Reverse](#Reverse)
 - [Reduce](#Reduce)
+- [Replace](#Replace)
+- [ReplaceAll](#ReplaceAll)
 - [Shuffle](#Shuffle)
 - [SortByField](#SortByField)
 - [Some](#Some)
@@ -966,6 +968,61 @@ func main() {
 
 
 
+### <span id="Replace">Replace</span>
+<p>返回切片的副本，其中前n个不重叠的old替换为new</p>
+
+<b>函数签名:</b>
+
+```go
+func Replace[T comparable](slice []T, old T, new T, n int) []T
+```
+<b>例子:</b>
+
+```go
+import (
+	"fmt"
+	"github.com/duke-git/lancet/v2/slice"
+)
+
+func main() {
+	strs := []string{"a", "b", "a", "c", "d", "a"}
+
+	fmt.Println(slice.Replace(strs, "a", "x", 0)) //{"a", "b", "a", "c", "d", "a"}
+
+	fmt.Println(slice.Replace(strs, "a", "x", 1)) //{"x", "b", "a", "c", "d", "a"}
+
+	fmt.Println(slice.Replace(strs, "a", "x", -1)) //{"x", "b", "x", "c", "d", "x"}
+}
+```
+
+
+
+### <span id="ReplaceAll">ReplaceAll</span>
+<p>返回切片的副本，将其中old全部替换为new</p>
+
+<b>函数签名:</b>
+
+```go
+func ReplaceAll[T comparable](slice []T, old T, new T) []T
+```
+<b>例子:</b>
+
+```go
+import (
+	"fmt"
+	"github.com/duke-git/lancet/v2/slice"
+)
+
+func main() {
+	strs := []string{"a", "b", "a", "c", "d", "a"}
+
+	fmt.Println(slice.ReplaceAll(strs, "a", "x")) //{"x", "b", "x", "c", "d", "x"}
+
+	fmt.Println(slice.Replace(strs, "e", "x")) //{"a", "b", "a", "c", "d", "a"}
+}
+```
+
+
 
 ### <span id="Shuffle">Shuffle</span>
 <p>随机打乱切片中的元素顺序</p>

function/function.go

@@ -113,3 +113,15 @@ func Schedule(d time.Duration, fn any, args ...any) chan bool {
 
 	return quit
 }
+
+// Pipeline takes a list of functions and returns a function whose param will be passed into
+// the functions one by one.
+func Pipeline[T any](funcs ...func(T) T) func(T) T {
+	return func(arg T) (result T) {
+		result = arg
+		for _, fn := range funcs {
+			result = fn(result)
+		}
+		return
+	}
+}

function/function_test.go

@@ -134,3 +134,21 @@ func TestSchedule(t *testing.T) {
 	// expected := []string{"*", "*", "*", "*", "*"}
 	// assert.Equal(expected, res)
 }
+
+func TestPipeline(t *testing.T) {
+	assert := internal.NewAssert(t, "TestPipeline")
+
+	addOne := func(x int) int {
+		return x + 1
+	}
+	double := func(x int) int {
+		return 2 * x
+	}
+	square := func(x int) int {
+		return x * x
+	}
+
+	f := Pipeline(addOne, double, square)
+
+	assert.Equal(36, f(2))
+}

function/watcher_test.go

@@ -29,9 +29,10 @@ func TestWatcher(t *testing.T) {
 	assert.Equal(int64(0), w.stopTime)
 }
 
-func longRunningTask() {
-	var slice []int64
+func longRunningTask() []int64 {
+	var data []int64
 	for i := 0; i < 10000000; i++ {
-		slice = append(slice, int64(i))
+		data = append(data, int64(i))
 	}
+	return data
 }

lancetconstraints/constraints.go

@@ -14,5 +14,5 @@ type Comparator interface {
 
 // Number contains all types of number and uintptr, used for generics constraint
 type Number interface {
-	int | int8 | int16 | int32 | int64 | uint | uint8 | uint16 | uint32 | uint64 | uintptr | float32 | float64
+	~int | ~int8 | ~int16 | ~int32 | ~int64 | ~uint | ~uint8 | ~uint16 | ~uint32 | ~uint64 | ~uintptr | ~float32 | ~float64
 }

mathutil/mathutil_test.go

@@ -87,6 +87,9 @@ func TestMax(t *testing.T) {
 	assert.Equal(Max(0, 0), 0)
 	assert.Equal(Max(1, 2, 3), 3)
 	assert.Equal(Max(1.2, 1.4, 1.1, 1.4), 1.4)
+
+	type Integer int
+	assert.Equal(Max(Integer(1), Integer(0)), Integer(1))
 }
 
 func TestMaxBy(t *testing.T) {

slice/slice.go

@@ -69,7 +69,7 @@ func Chunk[T any](slice []T, size int) [][]T {
 
 // Compact creates an slice with all falsey values removed. The values false, nil, 0, and "" are falsey
 func Compact[T any](slice []T) []T {
-	result := make([]T, 0, 0)
+	result := make([]T, 0)
 	for _, v := range slice {
 		if !reflect.DeepEqual(v, nil) &&
 			!reflect.DeepEqual(v, false) &&
@@ -112,7 +112,7 @@ func DifferenceBy[T comparable](slice []T, comparedSlice []T, iteratee func(inde
 	orginSliceAfterMap := Map(slice, iteratee)
 	comparedSliceAfterMap := Map(comparedSlice, iteratee)
 
-	result := make([]T, 0, 0)
+	result := make([]T, 0)
 	for i, v := range orginSliceAfterMap {
 		if !Contain(comparedSliceAfterMap, v) {
 			result = append(result, slice[i])
@@ -124,7 +124,7 @@ func DifferenceBy[T comparable](slice []T, comparedSlice []T, iteratee func(inde
 
 //DifferenceWith accepts comparator which is invoked to compare elements of slice to values. The order and references of result values are determined by the first slice. The comparator is invoked with two arguments: (arrVal, othVal).
 func DifferenceWith[T any](slice []T, comparedSlice []T, comparator func(value, otherValue T) bool) []T {
-	result := make([]T, 0, 0)
+	result := make([]T, 0)
 
 	getIndex := func(arr []T, item T, comparison func(v1, v2 T) bool) int {
 		index := -1
@@ -230,7 +230,7 @@ func Filter[T any](slice []T, predicate func(index int, item T) bool) []T {
 		panic("predicate func is missing")
 	}
 
-	result := make([]T, 0, 0)
+	result := make([]T, 0)
 	for i, v := range slice {
 		if predicate(i, v) {
 			result = append(result, v)
@@ -443,7 +443,7 @@ func Reduce[T any](slice []T, iteratee func(index int, item1, item2 T) T, initia
 
 	result := iteratee(0, initial, slice[0])
 
-	tmp := make([]T, 2, 2)
+	tmp := make([]T, 2)
 	for i := 1; i < len(slice); i++ {
 		tmp[0] = result
 		tmp[1] = slice[i]
@@ -453,6 +453,26 @@ func Reduce[T any](slice []T, iteratee func(index int, item1, item2 T) T, initia
 	return result
 }
 
+// Replace returns a copy of the slice with the first n non-overlapping instances of old replaced by new
+func Replace[T comparable](slice []T, old T, new T, n int) []T {
+	result := make([]T, len(slice))
+	copy(result, slice)
+
+	for i := range result {
+		if result[i] == old && n != 0 {
+			result[i] = new
+			n--
+		}
+	}
+
+	return result
+}
+
+// ReplaceAll returns a copy of the slice with all non-overlapping instances of old replaced by new.
+func ReplaceAll[T comparable](slice []T, old T, new T) []T {
+	return Replace(slice, old, new, -1)
+}
+
 // InterfaceSlice convert param to slice of interface.
 func InterfaceSlice(slice any) []any {
 	sv := sliceValue(slice)
@@ -522,7 +542,7 @@ func DeleteAt[T any](slice []T, start int, end ...int) []T {
 	}
 
 	if start == size-1 {
-		slice = append(slice[:start])
+		slice = slice[:start]
 	} else {
 		slice = append(slice[:start], slice[start+1:]...)
 	}
@@ -632,9 +652,7 @@ func Union[T comparable](slices ...[]T) []T {
 	var allElements []T
 
 	for _, slice := range slices {
-		for _, v := range slice {
-			allElements = append(allElements, v)
-		}
+		allElements = append(allElements, slice...)
 	}
 
 	return Unique(allElements)
@@ -669,7 +687,7 @@ func Intersection[T comparable](slices ...[]T) []T {
 
 	result = reducer(slices[0], slices[1])
 
-	reduceSlice := make([][]T, 2, 2)
+	reduceSlice := make([][]T, 2)
 	for i := 2; i < len(slices); i++ {
 		reduceSlice[0] = result
 		reduceSlice[1] = slices[i]
@@ -846,9 +864,7 @@ func ToSlicePointer[T any](value ...T) []*T {
 // ToSlice returns a slices of a variable parameter transformation
 func ToSlice[T any](value ...T) []T {
 	out := make([]T, len(value))
-	for i := range value {
-		out[i] = value[i]
-	}
+	copy(out, value)
 	return out
 }
 

slice/slice_internal.go

@@ -14,45 +14,6 @@ func sliceValue(slice any) reflect.Value {
 	return v
 }
 
-// functionValue return the reflect value of a function
-func functionValue(function any) reflect.Value {
-	v := reflect.ValueOf(function)
-	if v.Kind() != reflect.Func {
-		panic(fmt.Sprintf("Invalid function type, value of type %T", function))
-	}
-	return v
-}
-
-// checkSliceCallbackFuncSignature Check func sign :  s :[]type1{} -> func(i int, data type1) type2
-// see https://coolshell.cn/articles/21164.html#%E6%B3%9B%E5%9E%8BMap-Reduce
-func checkSliceCallbackFuncSignature(fn reflect.Value, types ...reflect.Type) bool {
-	//Check it is a function
-	if fn.Kind() != reflect.Func {
-		return false
-	}
-	// NumIn() - returns a function type's input parameter count.
-	// NumOut() - returns a function type's output parameter count.
-	if (fn.Type().NumIn() != len(types)-1) || (fn.Type().NumOut() != 1) {
-		return false
-	}
-	// In() - returns the type of a function type's i'th input parameter.
-	// first input param type should be int
-	if fn.Type().In(0) != reflect.TypeOf(1) {
-		return false
-	}
-	for i := 0; i < len(types)-1; i++ {
-		if fn.Type().In(i) != types[i] {
-			return false
-		}
-	}
-	// Out() - returns the type of a function type's i'th output parameter.
-	outType := types[len(types)-1]
-	if outType != nil && fn.Type().Out(0) != outType {
-		return false
-	}
-	return true
-}
-
 // sliceElemType get slice element type
 func sliceElemType(reflectType reflect.Type) reflect.Type {
 	for {

slice/slice_test.go

@@ -617,3 +617,30 @@ func TestAppendIfAbsent(t *testing.T) {
 	assert.Equal([]string{"a", "b"}, AppendIfAbsent(str1, "a"))
 	assert.Equal([]string{"a", "b", "c"}, AppendIfAbsent(str1, "c"))
 }
+
+func TestReplace(t *testing.T) {
+	assert := internal.NewAssert(t, "TestReplace")
+
+	strs := []string{"a", "b", "a", "c", "d", "a"}
+
+	assert.Equal([]string{"a", "b", "a", "c", "d", "a"}, Replace(strs, "a", "x", 0))
+	assert.Equal([]string{"x", "b", "a", "c", "d", "a"}, Replace(strs, "a", "x", 1))
+	assert.Equal([]string{"x", "b", "x", "c", "d", "a"}, Replace(strs, "a", "x", 2))
+	assert.Equal([]string{"x", "b", "x", "c", "d", "x"}, Replace(strs, "a", "x", 3))
+	assert.Equal([]string{"x", "b", "x", "c", "d", "x"}, Replace(strs, "a", "x", 4))
+
+	assert.Equal([]string{"x", "b", "x", "c", "d", "x"}, Replace(strs, "a", "x", -1))
+	assert.Equal([]string{"x", "b", "x", "c", "d", "x"}, Replace(strs, "a", "x", -2))
+
+	assert.Equal([]string{"a", "b", "a", "c", "d", "a"}, Replace(strs, "x", "y", 1))
+	assert.Equal([]string{"a", "b", "a", "c", "d", "a"}, Replace(strs, "x", "y", -1))
+}
+
+func TestReplaceAll(t *testing.T) {
+	assert := internal.NewAssert(t, "TestReplaceAll")
+
+	strs := []string{"a", "b", "a", "c", "d", "a"}
+
+	assert.Equal([]string{"x", "b", "x", "c", "d", "x"}, ReplaceAll(strs, "a", "x"))
+	assert.Equal([]string{"a", "b", "a", "c", "d", "a"}, ReplaceAll(strs, "e", "x"))
+}