v0.0.22

dataext/merge.go

@@ -0,0 +1,35 @@
+package dataext
+
+import (
+	"reflect"
+)
+
+func ObjectMerge[T1 any, T2 any](base T1, override T2) T1 {
+
+	reflBase := reflect.ValueOf(&base).Elem()
+	reflOvrd := reflect.ValueOf(&override).Elem()
+
+	for i := 0; i < reflBase.NumField(); i++ {
+
+		fieldBase := reflBase.Field(i)
+		fieldOvrd := reflOvrd.Field(i)
+
+		if fieldBase.Kind() != reflect.Ptr || fieldOvrd.Kind() != reflect.Ptr {
+			continue
+		}
+
+		kindBase := fieldBase.Type().Elem().Kind()
+		kindOvrd := fieldOvrd.Type().Elem().Kind()
+
+		if kindBase != kindOvrd {
+			continue
+		}
+
+		if !fieldOvrd.IsNil() {
+			fieldBase.Set(fieldOvrd.Elem().Addr())
+		}
+
+	}
+
+	return base
+}

dataext/merge_test.go

@@ -0,0 +1,70 @@
+package dataext
+
+import (
+	"gogs.mikescher.com/BlackForestBytes/goext/langext"
+	"testing"
+)
+
+func TestObjectMerge(t *testing.T) {
+	type A struct {
+		Field1   *int
+		Field2   *string
+		Field3   *float64
+		Field4   *bool
+		OnlyA    int64
+		DiffType int
+	}
+	type B struct {
+		Field1   *int
+		Field2   *string
+		Field3   *float64
+		Field4   *bool
+		OnlyB    int64
+		DiffType string
+	}
+
+	valueA := A{
+		Field1:   nil,
+		Field2:   langext.Ptr("99"),
+		Field3:   langext.Ptr(12.2),
+		Field4:   nil,
+		OnlyA:    1,
+		DiffType: 2,
+	}
+
+	valueB := B{
+		Field1:   langext.Ptr(12),
+		Field2:   nil,
+		Field3:   langext.Ptr(13.2),
+		Field4:   nil,
+		OnlyB:    1,
+		DiffType: "X",
+	}
+
+	valueMerge := ObjectMerge(valueA, valueB)
+
+	assertPtrEqual(t, "Field1", valueMerge.Field1, valueB.Field1)
+	assertPtrEqual(t, "Field2", valueMerge.Field2, valueA.Field2)
+	assertPtrEqual(t, "Field3", valueMerge.Field3, valueB.Field3)
+	assertPtrEqual(t, "Field4", valueMerge.Field4, nil)
+
+}
+
+func assertPtrEqual[T1 comparable](t *testing.T, ident string, actual *T1, expected *T1) {
+	if actual == nil && expected == nil {
+		return
+	}
+	if actual != nil && expected != nil {
+		if *actual != *expected {
+			t.Errorf("[%s] values differ: Actual: '%v', Expected: '%v'", ident, *actual, *expected)
+		} else {
+			return
+		}
+	}
+	if actual == nil && expected != nil {
+		t.Errorf("[%s] values differ: Actual: nil, Expected: not-nil", ident)
+	}
+	if actual != nil && expected == nil {
+		t.Errorf("[%s] values differ: Actual: not-nil, Expected: nil", ident)
+	}
+}

langext/bool.go

@@ -7,3 +7,11 @@ func FormatBool(v bool, strTrue string, strFalse string) string {
 		return strFalse
 	}
 }
+
+func Conditional[T any](v bool, resTrue T, resFalse T) T {
+	if v {
+		return resTrue
+	} else {
+		return resFalse
+	}
+}

timeext/duration.go

@@ -2,59 +2,36 @@ package timeext
 
 import (
 	"fmt"
+	"gogs.mikescher.com/BlackForestBytes/goext/langext"
 	"time"
 )
 
-func FromSeconds(v int) time.Duration {
+func FromNanoseconds[T langext.NumberConstraint](v T) time.Duration {
-	return time.Duration(int64(v) * int64(time.Second))
+	return time.Duration(int64(float64(v) * float64(time.Nanosecond)))
 }
 
-func FromSecondsInt32(v int32) time.Duration {
+func FromMicroseconds[T langext.NumberConstraint](v T) time.Duration {
-	return time.Duration(int64(v) * int64(time.Second))
+	return time.Duration(int64(float64(v) * float64(time.Microsecond)))
 }
 
-func FromSecondsInt64(v int64) time.Duration {
+func FromMilliseconds[T langext.NumberConstraint](v T) time.Duration {
-	return time.Duration(v * int64(time.Second))
+	return time.Duration(int64(float64(v) * float64(time.Millisecond)))
 }
 
-func FromSecondsFloat32(v float32) time.Duration {
+func FromSeconds[T langext.NumberConstraint](v T) time.Duration {
-	return time.Duration(int64(v * float32(time.Second)))
+	return time.Duration(int64(float64(v) * float64(time.Second)))
 }
 
-func FromSecondsFloat64(v float64) time.Duration {
+func FromMinutes[T langext.NumberConstraint](v T) time.Duration {
-	return time.Duration(int64(v * float64(time.Second)))
+	return time.Duration(int64(float64(v) * float64(time.Minute)))
 }
 
-func FromSecondsFloat(v float64) time.Duration {
+func FromHours[T langext.NumberConstraint](v T) time.Duration {
-	return time.Duration(int64(v * float64(time.Second)))
+	return time.Duration(int64(float64(v) * float64(time.Hour)))
 }
 
-func FromMinutes(v int) time.Duration {
+func FromDays[T langext.NumberConstraint](v T) time.Duration {
-	return time.Duration(int64(v) * int64(time.Minute))
+	return time.Duration(int64(float64(v) * float64(24) * float64(time.Hour)))
-}
-
-func FromMinutesFloat(v float64) time.Duration {
-	return time.Duration(int64(v * float64(time.Minute)))
-}
-
-func FromMinutesFloat64(v float64) time.Duration {
-	return time.Duration(int64(v * float64(time.Minute)))
-}
-
-func FromHoursFloat64(v float64) time.Duration {
-	return time.Duration(int64(v * float64(time.Hour)))
-}
-
-func FromDays(v int) time.Duration {
-	return time.Duration(int64(v) * int64(24) * int64(time.Hour))
-}
-
-func FromMilliseconds(v int) time.Duration {
-	return time.Duration(int64(v) * int64(time.Millisecond))
-}
-
-func FromMillisecondsFloat(v float64) time.Duration {
-	return time.Duration(int64(v * float64(time.Millisecond)))
 }
 
 func FormatNaturalDurationEnglish(iv time.Duration) string {