Adjust formatting of legacy errors

go-json-experiment · Dec 30, 2024 · cc4ebba · cc4ebba
1 parent 0240acd
commit cc4ebba
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/arshal_funcs.go b/arshal_funcs.go
@@ -185,6 +185,9 @@ func MarshalFuncV1[T any](fn func(T) ([]byte, error)) *Marshalers {
 				return collapseSemanticErrors(err)
 			}
 			if err := enc.WriteValue(val); err != nil {
+				if mo.Flags.Get(jsonflags.ReportLegacyErrorValues) {
+					return internal.NewMarshalerError(va.Addr().Interface(), err, "MarshalFuncV1") // unlike unmarshal, always wrapped
+				}
 				if isSyntacticError(err) {
 					err = newMarshalErrorBefore(enc, t, err)
 				}

diff --git a/arshal_methods.go b/arshal_methods.go
@@ -196,6 +196,9 @@ func makeMethodArshaler(fncs *arshaler, t reflect.Type) *arshaler {
 				return collapseSemanticErrors(err)
 			}
 			if err := enc.WriteValue(val); err != nil {
+				if mo.Flags.Get(jsonflags.ReportLegacyErrorValues) {
+					return internal.NewMarshalerError(va.Addr().Interface(), err, "MarshalJSON") // unlike unmarshal, always wrapped
+				}
 				if isSyntacticError(err) {
 					err = newMarshalErrorBefore(enc, t, err)
 				}

diff --git a/v1/inject.go b/v1/inject.go
@@ -46,7 +46,8 @@ func transformMarshalError(root any, err error) error {
 			if err.Err == internal.ErrCycle && err.GoType != nil {
 				errStr += " via " + err.GoType.String()
 			}
-			return &UnsupportedValueError{Str: err.Err.Error()}
+			errStr = strings.TrimPrefix(errStr, "unsupported value: ")
+			return &UnsupportedValueError{Str: errStr}
 		}
 	} else if ok {
 		return (*UnsupportedValueError)(nil)