refactor: package layout changes and remove types from snapshots

__snapshots__/test_map.snap.new __snapshots__/test_map.snap

···
 test_name: TestMap
 ---
 map[string]interface{}{
- string("foo"): string("bar"),
+ "foo": "bar",
 }

__snapshots__/test_snap_custom_type.snap.new __snapshots__/test_snap_custom_type.snap

···
 test_name: TestSnapCustomType
 ---
 freeze_test.CustomStruct{
- Name: string("Alice"),
- Age: int(30),
+ Name: "Alice",
+ Age: 30,
 }

__snapshots__/test_snap_multiple.snap

···
+---
+version: 0.1.0
+test_name: TestSnapMultiple
+---
+"value1"
+"value2"
+42
+"foo"
+"bar"
+"baz"
+"wibble"
+"wobble"
+"tock"
+interface{}(nil)

__snapshots__/test_snap_multiple.snap.new

···
----
-version: 0.1.0
-test_name: TestSnapMultiple
----
-string("value1")
-
-string("value2")
-
-int(42)
-
-string("foo")
-
-string("bar")
-
-string("baz")
-
-string("wibble")
-
-string("wobble")
-
-string("tock")

api.go

···
 package freeze
 
 import (
-	"github.com/ptdewey/freeze/internal/diff"
-	"github.com/ptdewey/freeze/internal/files"
-	"github.com/ptdewey/freeze/internal/pretty"
+	"github.com/ptdewey/freeze/internal/api"
 )
 
-type Snapshot = files.Snapshot
+type Snapshot = api.Snapshot
 
-type DiffLine = diff.DiffLine
+type DiffLine = api.DiffLine
 
 const (
-	DiffShared = diff.DiffShared
-	DiffOld    = diff.DiffOld
-	DiffNew    = diff.DiffNew
+	DiffShared = api.DiffShared
+	DiffOld    = api.DiffOld
+	DiffNew    = api.DiffNew
 )
 
 func Deserialize(raw string) (*Snapshot, error) {
-	return files.Deserialize(raw)
+	return api.Deserialize(raw)
 }
 
 func SaveSnapshot(snap *Snapshot, state string) error {
-	return files.SaveSnapshot(snap, state)
+	return api.SaveSnapshot(snap, state)
 }
 
 func ReadSnapshot(testName string, state string) (*Snapshot, error) {
-	return files.ReadSnapshot(testName, state)
+	return api.ReadSnapshot(testName, state)
 }
 
 func SnapshotFileName(testName string) string {
-	return files.SnapshotFileName(testName)
+	return api.SnapshotFileName(testName)
 }
 
 func Histogram(old, new string) []DiffLine {
-	return diff.Histogram(old, new)
+	return api.Histogram(old, new)
 }
 
 func NewSnapshotBox(snap *Snapshot) string {
-	return pretty.NewSnapshotBox(snap)
+	return api.NewSnapshotBox(snap)
 }
 
 func DiffSnapshotBox(old, new *Snapshot) string {
-	diffLines := convertDiffLines(diff.Histogram(old.Content, new.Content))
-	return pretty.DiffSnapshotBox(old, new, diffLines)
+	return api.DiffSnapshotBox(old, new)
 }
 
 func Red(s string) string {
-	return pretty.Red(s)
+	return api.Red(s)
 }
 
 func Green(s string) string {
-	return pretty.Green(s)
+	return api.Green(s)
 }
 
 func Yellow(s string) string {
-	return pretty.Yellow(s)
+	return api.Yellow(s)
 }
 
 func Blue(s string) string {
-	return pretty.Blue(s)
+	return api.Blue(s)
 }
 
 func Gray(s string) string {
-	return pretty.Gray(s)
+	return api.Gray(s)
 }
 
 func Bold(s string) string {
-	return pretty.Bold(s)
+	return api.Bold(s)
 }
 
 func TerminalWidth() int {
-	return pretty.TerminalWidth()
+	return api.TerminalWidth()
 }
 
 func ClearScreen() {
-	pretty.ClearScreen()
+	api.ClearScreen()
 }
 
 func ClearLine() {
-	pretty.ClearLine()
+	api.ClearLine()
 }

freeze.go

···
 
 const version = "0.1.0"
 
+// TODO: probably make this (and other things) configurable
+func init() {
+	utter.Config.ElideType = true
+}
+
 func SnapString(t testingT, content string) {
 	t.Helper()
 	snap(t, content)
···
 }
 
 func formatValues(values ...any) string {
-	if len(values) == 0 {
-		return ""
-	}
-
-	if len(values) == 1 {
-		return formatValue(values[0])
-	}
-
 	var result string
-	for i, v := range values {
-		if i > 0 {
-			result += "\n"
-		}
+	for _, v := range values {
 		result += formatValue(v)
 	}
 	return result
 }
 
-// TODO: improve this
 func formatValue(v any) string {
-	if v == nil {
-		return "<nil>"
-	}
-
-	// if formattable, ok := v.(interface{ Format() string }); ok {
-	// 	return formattable.Format()
+	// if v == nil {
+	// 	return "<nil>"
 	// }
-	//
-	// if stringer, ok := v.(interface{ String() string }); ok {
-	// 	return stringer.String()
-	// }
-	//
-	// val := reflect.ValueOf(v)
-	// switch val.Kind() {
-	// case reflect.String:
-	// 	return v.(string)
-	// case reflect.Struct, reflect.Slice, reflect.Array, reflect.Map:
-	// 	// TODO: make this better probably (utter?)
-	// 	return fmt.Sprintf("%#v", v)
-	// default:
-	// 	return fmt.Sprint(v)
-	// }
+
 	return utter.Sdump(v)
 }
 
···
 func RejectAll() error {
 	return review.RejectAll()
 }
+
+type testingT interface {
+	Helper()
+	Skip(...any)
+	Skipf(string, ...any)
+	SkipNow()
+	Name() string
+	Error(...any)
+	Log(...any)
+	Cleanup(func())
+}

freeze_test.go

···
 }
 
 func TestSnapMultiple(t *testing.T) {
-	freeze.Snap(t, "value1", "value2", 42, "foo", "bar", "baz", "wibble", "wobble", "tock")
+	freeze.Snap(t, "value1", "value2", 42, "foo", "bar", "baz", "wibble", "wobble", "tock", nil)
 }
 
 type CustomStruct struct {

internal/api/api.go

···
+package api
+
+import (
+	"github.com/ptdewey/freeze/internal/diff"
+	"github.com/ptdewey/freeze/internal/files"
+	"github.com/ptdewey/freeze/internal/pretty"
+)
+
+type Snapshot = files.Snapshot
+
+type DiffLine = diff.DiffLine
+
+const (
+	DiffShared = diff.DiffShared
+	DiffOld    = diff.DiffOld
+	DiffNew    = diff.DiffNew
+)
+
+func Deserialize(raw string) (*Snapshot, error) {
+	return files.Deserialize(raw)
+}
+
+func SaveSnapshot(snap *Snapshot, state string) error {
+	return files.SaveSnapshot(snap, state)
+}
+
+func ReadSnapshot(testName string, state string) (*Snapshot, error) {
+	return files.ReadSnapshot(testName, state)
+}
+
+func SnapshotFileName(testName string) string {
+	return files.SnapshotFileName(testName)
+}
+
+func Histogram(old, new string) []DiffLine {
+	return diff.Histogram(old, new)
+}
+
+func NewSnapshotBox(snap *Snapshot) string {
+	return pretty.NewSnapshotBox(snap)
+}
+
+func DiffSnapshotBox(old, new *Snapshot) string {
+	diffLines := convertDiffLines(diff.Histogram(old.Content, new.Content))
+	return pretty.DiffSnapshotBox(old, new, diffLines)
+}
+
+func convertDiffLines(diffLines []diff.DiffLine) []pretty.DiffLine {
+	result := make([]pretty.DiffLine, len(diffLines))
+	for i, dl := range diffLines {
+		result[i] = pretty.DiffLine{
+			Number: dl.Number,
+			Line:   dl.Line,
+			Kind:   pretty.DiffKind(dl.Kind),
+		}
+	}
+	return result
+}
+
+func Red(s string) string {
+	return pretty.Red(s)
+}
+
+func Green(s string) string {
+	return pretty.Green(s)
+}
+
+func Yellow(s string) string {
+	return pretty.Yellow(s)
+}
+
+func Blue(s string) string {
+	return pretty.Blue(s)
+}
+
+func Gray(s string) string {
+	return pretty.Gray(s)
+}
+
+func Bold(s string) string {
+	return pretty.Bold(s)
+}
+
+func TerminalWidth() int {
+	return pretty.TerminalWidth()
+}
+
+func ClearScreen() {
+	pretty.ClearScreen()
+}
+
+func ClearLine() {
+	pretty.ClearLine()
+}

utils.go

···
 package freeze
-
-type testingT interface {
-	Helper()
-	Skip(...any)
-	Skipf(string, ...any)
-	SkipNow()
-	Name() string
-	Error(...any)
-	Log(...any)
-	Cleanup(func())
-}