Merge pull request #11 from m-mizutani/fix/copy-time

fix(clone): Copy scalar (not CanAddr) values properly

clone.go

@@ -45,12 +45,26 @@ func (x *masq) clone(fieldName string, src reflect.Value, tag string) reflect.Va
 			dstValue := dst.Elem().Field(i)
 
 			if !srcValue.CanInterface() {
+				dstValue = reflect.NewAt(dstValue.Type(), unsafe.Pointer(dstValue.UnsafeAddr())).Elem()
+
 				if !srcValue.CanAddr() {
+					switch {
+					case srcValue.CanInt():
+						dstValue.SetInt(srcValue.Int())
+					case srcValue.CanUint():
+						dstValue.SetUint(srcValue.Uint())
+					case srcValue.CanFloat():
+						dstValue.SetFloat(srcValue.Float())
+					case srcValue.CanComplex():
+						dstValue.SetComplex(srcValue.Complex())
+					case srcValue.Kind() == reflect.Bool:
+						dstValue.SetBool(srcValue.Bool())
+					}
+
 					continue
 				}
 
 				srcValue = reflect.NewAt(srcValue.Type(), unsafe.Pointer(srcValue.UnsafeAddr())).Elem()
-				dstValue = reflect.NewAt(dstValue.Type(), unsafe.Pointer(dstValue.UnsafeAddr())).Elem()
 			}
 
 			tagValue := f.Tag.Get("masq")

clone_test.go

@@ -1,6 +1,10 @@
 package masq_test
 
 import (
+	"bytes"
+	"encoding/json"
+	"log/slog"
+	"strings"
 	"testing"
 	"time"
 
@@ -280,3 +284,20 @@ func TestDoublePointer(t *testing.T) {
 	copied := gt.MustCast[*myStruct](t, c.Redact(data)).NotNil()
 	gt.V(t, (*copied.c).Name).Equal("orange")
 }
+
+func TestTime(t *testing.T) {
+	ts := time.Now()
+	buf := &bytes.Buffer{}
+	logger := slog.New(slog.NewJSONHandler(buf, &slog.HandlerOptions{
+		AddSource:   true,
+		ReplaceAttr: masq.New(),
+	}))
+	logger.Info("hello")
+
+	var out map[string]any
+	gt.Error(t, json.Unmarshal(buf.Bytes(), &out)).Pass()
+
+	tv, ok := out["time"].(string)
+	gt.B(t, ok).True()
+	gt.B(t, strings.Contains(tv, ts.Format("2006-01-02"))).True()
+}