README.md

@@ -2,45 +2,25 @@
 package main
 
 import (
-	// External
+    // External
-	werr "git.gibonuddevalla.se/go/wrappederror"
+    werr "git.gibonuddevalla.se/go/wrappederror"
 
-	// Standard
+    // Standard
-	"encoding/json"
+    "errors"
-	"errors"
+    "fmt"
-	"fmt"
-	"os"
 )
 
 func errorHandler(err werr.Error) {
-	// For example print or log error to file
+    // For example print or log error to file
-	fmt.Printf("\x1b[31;1m%s\x1b[0m\n", err)
+    fmt.Printf("ERROR - %s\n", err)
-	fmt.Printf("\x1b[33;1m%s\x1b[0m\n", err.NoTrace())
-
-	j, _ := json.MarshalIndent(err, "", "    ")
-	fmt.Printf("%s\n\n", j)
 }
 
-func main() {
+func foo() {
-	// Make file paths relative to this file.
+    werr.SetLogCallback(errorHandler)
-	werr.Init()
 
-	// Handler to call when using Log().
+    err := errors.New("foobar 1")
-	werr.SetLogCallback(errorHandler)
+    err1 := werr.Wrap(err)
 
-	// Wrap an existing error.
+    err2 := werr.New("foobar 2")
-	err := errors.New("foobar 1")
-	err1 := werr.Wrap(err)
-
-	// Create a new error with extra information.
-	err2 := werr.New("foobar 2").WithCode("FOO-100").WithData(137)
-
-	// The os error contains more information.
-	_, errOS := os.ReadFile("/tmp/does_not_exist")
-	werr.Wrap(errOS).Log()
-
-	// Log the previously wrapped errors.
-	werr.Wrap(err1).Log()
-	werr.Wrap(err2).Log()
 }
 ```

pkg.go

@@ -1,58 +1,9 @@
-/*
-wrappederror provides traceable errors:
-
-	package main
-
-	import (
-		// External
-		werr "git.gibonuddevalla.se/go/wrappederror"
-
-		// Standard
-		"encoding/json"
-		"errors"
-		"fmt"
-		"os"
-	)
-
-	func errorHandler(err werr.Error) {
-		// For example print or log error to file
-		fmt.Printf("\x1b[31;1m%s\x1b[0m\n", err)
-		fmt.Printf("\x1b[33;1m%s\x1b[0m\n", err.NoTrace())
-
-		j, _ := json.MarshalIndent(err, "", "    ")
-		fmt.Printf("%s\n\n", j)
-	}
-
-	func main() {
-		// Make file paths relative to this file.
-		werr.Init()
-
-		// Handler to call when using Log().
-		werr.SetLogCallback(errorHandler)
-
-		// Wrap an existing error.
-		err := errors.New("foobar 1")
-		err1 := werr.Wrap(err)
-
-		// Create a new error with extra information.
-		err2 := werr.New("foobar 2").WithCode("FOO-100").WithData(137)
-
-		// The os error contains more information.
-		_, errOS := os.ReadFile("/tmp/does_not_exist")
-		werr.Wrap(errOS).Log()
-
-		// Log the previously wrapped errors.
-		werr.Wrap(err1).Log()
-		werr.Wrap(err2).Log()
-	}
-*/
 package WrappedError
 
 import (
 	// Standard
 	"fmt"
 	"path"
-	"regexp"
 	"runtime"
 )
 
@@ -136,6 +87,10 @@ func Wrap(err error) *Error {
 	return create(err, nil)
 }
 
+func WrapData(err error, data interface{}) *Error {
+	return create(err, data)
+}
+
 // New creates a new wrapped error with file and line.
 func New(msg string, params ...any) *Error {
 	err := fmt.Errorf(msg, params...)
@@ -143,31 +98,24 @@ func New(msg string, params ...any) *Error {
 	return wrapped
 }
 
-// WithCode associates a string code with the error.
+// NewData creates a new WrappedError with associated data.
+func NewData(msg string, data interface{}, params ...any) *Error {
+	err := fmt.Errorf(msg, params...)
+	wrapped := create(err, data)
+	return wrapped
+}
+
 func (e *Error) WithCode(code string) CodableError {
 	e.Code = code
 	return e
 }
 
-// WithData associates any data with the error to make troubleshooting easier.
 func (e *Error) WithData(data any) CodableError {
 	e.Data = data
 	return e
 }
 
-// Log calls the log callback.
 func (e *Error) Log() CodableError {
 	callback(*e)
 	return e
 }
-
-// NoTrace returns the Error() string without the trace.
-func (e *Error) NoTrace() string {
-	rxp := regexp.MustCompile(`^(\[[^\]]+\.go:\d+\]\s*)*`)
-	return string(
-		rxp.ReplaceAll(
-			[]byte(e.Error()),
-			[]byte(""),
-		),
-	)
-}