Merge pull request #3 from morikuni/failure-support

Support using with failure v2

go.mod

@@ -3,3 +3,5 @@ module github.com/morikuni/go-mlang
 go 1.20
 
 require golang.org/x/text v0.9.0
+
+require github.com/morikuni/failure/v2 v2.0.0-20230512003104-6bb497ead261 // indirect

go.sum

@@ -1,2 +1,4 @@
+github.com/morikuni/failure/v2 v2.0.0-20230512003104-6bb497ead261 h1:Rqq1Kh/HMFt8YZFeW5jopA+l2wjV2+tMcouxbwuMxqs=
+github.com/morikuni/failure/v2 v2.0.0-20230512003104-6bb497ead261/go.mod h1:tHod902kOvu2+09OAbzPMrE4B8fIc+M/2kl/UI3mDQI=
 golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
 golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=

internal/internal.go

@@ -0,0 +1,8 @@
+package internal
+
+type failureKey bool
+
+const (
+	_key       failureKey = true
+	FailureKey            = _key
+)

mlang.go

@@ -2,13 +2,18 @@ package mlang
 
 import (
 	"fmt"
+
+	"github.com/morikuni/failure/v2"
+
+	"github.com/morikuni/go-mlang/internal"
 )
 
 // Language can be any comparable types.
 // Basically, golang.org/x/text/language.Tag is used, but you can use any your original types as well.
 type Language = any
 
 type Message interface {
+	failure.Field
 	isMessage()
 	Get(lang Language) (string, bool)
 	MustGet(lang Language) string
@@ -42,6 +47,10 @@ func (d Dict[M]) MustGet(lang Language) string {
 	panic("empty set")
 }
 
+func (d Dict[M]) SetErrorField(field failure.FieldSetter) {
+	field.Set(internal.FailureKey, Message(d))
+}
+
 func eval(msg any, lang Language) (string, bool) {
 	switch m := msg.(type) {
 	case Template:

mlangfailure/mlangfailure.go

@@ -0,0 +1,17 @@
+package mlangfailure
+
+import (
+	"github.com/morikuni/failure/v2"
+
+	"github.com/morikuni/go-mlang"
+	"github.com/morikuni/go-mlang/internal"
+)
+
+const (
+	Key = internal.FailureKey
+)
+
+func MessageOf(err error) mlang.Message {
+	m, _ := failure.ValueAs[mlang.Message](err, Key)
+	return m
+}

mlangfailure/mlangfailure_test.go

@@ -0,0 +1,20 @@
+package mlangfailure
+
+import (
+	"testing"
+
+	"github.com/morikuni/failure/v2"
+
+	"github.com/morikuni/go-mlang"
+)
+
+func TestMessageOf(t *testing.T) {
+	err := failure.Unexpected("unexpected", mlang.Dict[string]{1: "one"})
+	m := MessageOf(err)
+	if m == nil {
+		t.Fatal("m is nil")
+	}
+	if m.MustGet(1) != "one" {
+		t.Errorf("got %v, want %v", m.MustGet(1), "one")
+	}
+}