Use copier lib fork

go-goyave · Oct 9, 2023 · 5aa1f46 · 5aa1f46
1 parent 9b4288e
commit 5aa1f46
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 9 deletions.
diff --git a/database/factory.go b/database/factory.go
@@ -1,8 +1,8 @@
 package database
 
 import (
-	"github.com/jinzhu/copier"
 	"gorm.io/gorm"
+	"goyave.dev/copier"
 	"goyave.dev/goyave/v5/util/errors"
 )
 

diff --git a/go.mod b/go.mod
@@ -6,7 +6,6 @@ require (
 	github.com/Code-Hex/uniseg v0.2.0
 	github.com/golang-jwt/jwt v3.2.2+incompatible
 	github.com/google/uuid v1.3.1
-	github.com/jinzhu/copier v0.4.0
 	github.com/samber/lo v1.38.1
 	github.com/stretchr/testify v1.8.4
 	golang.org/x/crypto v0.13.0
@@ -16,6 +15,7 @@ require (
 	gorm.io/driver/sqlite v1.5.3
 	gorm.io/driver/sqlserver v1.5.1
 	gorm.io/gorm v1.25.4
+	goyave.dev/copier v0.4.1
 )
 
 require (
@@ -36,5 +36,3 @@ require (
 	golang.org/x/text v0.13.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
-
-replace github.com/jinzhu/copier v0.4.0 => github.com/System-Glitch/copier v0.0.0-20230810143212-ca7f7fa385a2
diff --git a/go.sum b/go.sum
@@ -14,8 +14,6 @@ github.com/AzureAD/microsoft-authentication-library-for-go v1.1.0 h1:HCc0+LpPfpC
 github.com/AzureAD/microsoft-authentication-library-for-go v1.1.0/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI=
 github.com/Code-Hex/uniseg v0.2.0 h1:QB/2UJFvEuRLSZqe+Sb1XQBTWjqGVbZoC6oSWzQRKws=
 github.com/Code-Hex/uniseg v0.2.0/go.mod h1:/ndS2tP+X1lk2HUOcXWGtVTxVq0lWilwgMa4CbzdRsg=
-github.com/System-Glitch/copier v0.0.0-20230810143212-ca7f7fa385a2 h1:qaU97IJo03X1LjJN9e+yRWzqpCoNwYT54SO7BvV7M6A=
-github.com/System-Glitch/copier v0.0.0-20230810143212-ca7f7fa385a2/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
@@ -166,3 +164,5 @@ gorm.io/driver/sqlserver v1.5.1/go.mod h1:AYHzzte2msKTmYBYsSIq8ZUsznLJwBdkB2wpI+
 gorm.io/gorm v1.25.1/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k=
 gorm.io/gorm v1.25.4 h1:iyNd8fNAe8W9dvtlgeRI5zSVZPsq3OpcTu37cYcpCmw=
 gorm.io/gorm v1.25.4/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k=
+goyave.dev/copier v0.4.1 h1:wTBQ+PF5WvcOejG/C5I0cmSWG4hf+hw9KQLIhyGhF5k=
+goyave.dev/copier v0.4.1/go.mod h1:WJu0Ex81v29f5U0eMWzSNsMTGmuGY6lQ/q5yGlyLDsU=
diff --git a/slog/slog.go b/slog/slog.go
@@ -20,7 +20,7 @@ type unwrapper interface {
 // functions so they take an error as parameter and handle `*errors.Error` gracefully.
 type Logger struct {
 	*slog.Logger
-	// TODO split outputs: errors to stderr, rest to stdout
+	// TODO split outputs: level >= warning prints to stderr, rest to stdout, make it configurable
 }
 
 // New creates a new Logger with the given non-nil Handler and a nil context.

diff --git a/util/typeutil/typeutil.go b/util/typeutil/typeutil.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"encoding/json"
 
-	"github.com/jinzhu/copier"
+	"goyave.dev/copier"
 	"goyave.dev/goyave/v5/util/errors"
 )
 

diff --git a/util/typeutil/typeutil_test.go b/util/typeutil/typeutil_test.go
@@ -299,6 +299,7 @@ func TestCopy(t *testing.T) {
 				Ptr: nil,
 			},
 		},
+		// TODO copy undefined to undefined (copier.Valuer interface problem). Undefined should probably implement Scan
 	}
 
 	for _, c := range cases {

diff --git a/util/typeutil/undefined.go b/util/typeutil/undefined.go
@@ -6,7 +6,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/jinzhu/copier"
+	"goyave.dev/copier"
 	"goyave.dev/goyave/v5/util/errors"
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -299,6 +299,7 @@ func TestCopy(t *testing.T) { @@
     				Ptr: nil,
     			},
     		},
+    		// TODO copy undefined to undefined (copier.Valuer interface problem). Undefined should probably implement Scan
     	}
     	for _, c := range cases {
@@ Expand Down @@