Merge pull request #519 from essentialkaos/develop

Version 13.10.1

CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Changelog
 
+### [13.10.1](https://kaos.sh/ek/13.10.1)
+
+* `[mathutil]` Added shorthand helper `B`
+
 ### [13.10.0](https://kaos.sh/ek/13.10.0)
 
 > [!IMPORTANT]

go.mod

@@ -6,8 +6,8 @@ require (
 	github.com/essentialkaos/check v1.4.1
 	github.com/essentialkaos/depsy v1.3.1
 	github.com/essentialkaos/go-linenoise/v3 v3.6.1
-	golang.org/x/crypto v0.28.0
-	golang.org/x/sys v0.26.0
+	golang.org/x/crypto v0.29.0
+	golang.org/x/sys v0.27.0
 )
 
 require (

go.sum

@@ -13,7 +13,7 @@ github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsK
 github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
 github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
-golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw=
-golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U=
-golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
-golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/crypto v0.29.0 h1:L5SG1JTTXupVV3n6sUqMTeWbjAyfPwoda2DLX8J8FrQ=
+golang.org/x/crypto v0.29.0/go.mod h1:+F4F4N5hv6v38hfeYwTdx20oUvLLc+QfrE9Ax9HtgRg=
+golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s=
+golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=

mathutil/example_test.go

@@ -13,6 +13,16 @@ import (
 
 // ////////////////////////////////////////////////////////////////////////////////// //
 
+func ExampleB() {
+	isRoot := true
+
+	fmt.Println(B(isRoot, 0, 1000))
+	fmt.Println(B(!isRoot, 0, 1000))
+	// Output:
+	// 0
+	// 1000
+}
+
 func ExampleIsNumber() {
 	fmt.Println(IsNumber("test"))
 	fmt.Println(IsNumber("746131"))

mathutil/mathutil.go

@@ -31,6 +31,17 @@ type NumericNeg interface {
 
 // ////////////////////////////////////////////////////////////////////////////////// //
 
+// B is shorthand for choosing value by condition
+func B[N Numeric](cond bool, positive, negative N) N {
+	if cond {
+		return positive
+	}
+
+	return negative
+}
+
+// ////////////////////////////////////////////////////////////////////////////////// //
+
 // IsInt returns true if given string contains int symbols.
 //
 // Note that this method does not validate the given value.

mathutil/mathutil_test.go

@@ -76,3 +76,8 @@ func (s *MathUtilSuite) TestFromPerc(c *C) {
 	c.Assert(FromPerc(250, 100), Equals, 250.0)
 	c.Assert(FromPerc(25.55, -100), Equals, -25.55)
 }
+
+func (s *MathUtilSuite) TestB(c *C) {
+	c.Assert(B(true, 2.3, 3.7), Equals, 2.3)
+	c.Assert(B(false, 2.3, 3.7), Equals, 3.7)
+}

terminal/input/input_validators.go

@@ -82,7 +82,7 @@ func (v isNumberValidator) Validate(input string) (string, error) {
 	input = strings.TrimSpace(input)
 
 	if input == "" {
-		return input, nil // Empty imput is okay
+		return input, nil // Empty input is okay
 	}
 
 	_, err := strconv.ParseInt(input, 10, 64)
@@ -99,7 +99,7 @@ func (v isFloatValidator) Validate(input string) (string, error) {
 	input = strings.TrimSpace(input)
 
 	if input == "" {
-		return input, nil // Empty imput is okay
+		return input, nil // Empty input is okay
 	}
 
 	_, err := strconv.ParseFloat(input, 64)
@@ -116,7 +116,7 @@ func (v isEmailValidator) Validate(input string) (string, error) {
 	input = strings.TrimSpace(input)
 
 	if input == "" {
-		return input, nil // Empty imput is okay
+		return input, nil // Empty input is okay
 	}
 
 	name, domain, ok := strings.Cut(input, "@")
@@ -134,7 +134,7 @@ func (v isURLValidator) Validate(input string) (string, error) {
 	input = strings.TrimSpace(input)
 
 	if input == "" {
-		return input, nil // Empty imput is okay
+		return input, nil // Empty input is okay
 	}
 
 	switch {

version.go

@@ -8,4 +8,4 @@ package ek
 // ////////////////////////////////////////////////////////////////////////////////// //
 
 // VERSION is current ek package version
-const VERSION = "13.10.0"
+const VERSION = "13.10.1"