M.V. Hutz
bbe027e9f4
## Description The `internal/cli` package had grown to contain both CLI utilities (source/destination I/O) and registry-level abstractions (repr, conversion, engine, marshaler). This PR separates concerns by moving registry types into `internal/registry` and keeping only CLI I/O types in `internal/cli`. It also simplifies several core abstractions and aligns naming conventions. - Move `Source`, `Destination` from `internal/config` to `internal/cli`. - Move `Repr`, `Conversion`, `Engine`, `Process`, `Codec` from `internal/cli` to `internal/registry`. - Rename "marshalers" to "codecs" throughout the codebase. - Simplify `codec.Codec[T, U]` to `codec.Codec[T]` (string-based marshaling only). - Add `codec.Conversion[T, U]` as a function type alias. - Change `engine.Engine[T]` from an interface to a function type. - Merge `Engine.Load()` + `Process.Set()` into a single `Engine.Load(Repr)` call. - Convert `Saccharine2Lambda` from a struct to standalone conversion functions. - Replace registry methods (`MustAddMarshaler`, `MustAddEngine`, `MustAddConversions`) with generic free functions (`RegisterCodec`, `RegisterEngine`, `RegisterConversion`). - Remove unused `internal/config` package (`Config`, `GetLogger`, `ParseFromArgs`). - Remove unused `pkg/emitter` package. - Rename `Id()` to `ID()` per Go conventions. - Add documentation comments and enable `checkPublicInterface` lint rule. - Rename `reduce_one.go` to `reduce_once.go`. ### Decisions - `Engine[T]` is now a function type (`func(T) (Process[T], error)`) rather than an interface, since the only method was `Load`. - `Codec[T, U]` was split into `Codec[T]` (string marshaling) and `Conversion[T, U]` (type-to-type conversion function), which better reflects how they are actually used. - Registration uses free generic functions (`RegisterCodec`, `RegisterEngine`, `RegisterConversion`) instead of methods on `Registry`, enabling type inference at the call site. ## Benefits - Clearer separation of concerns between CLI I/O and the registry's internal type system. - Simpler abstractions: fewer interfaces, fewer wrapper types, fewer indirections. - Removing unused packages (`config`, `emitter`) reduces maintenance burden. - Naming conventions (`ID`, codecs, `reduce_once`) are more idiomatic. ## Checklist - [x] Code follows conventional commit format. - [x] Branch follows naming convention (`<type>/<description>`). - [x] Tests pass (if applicable). - [x] Documentation updated (if applicable). Reviewed-on: #43 Co-authored-by: M.V. Hutz <git@maximhutz.me> Co-committed-by: M.V. Hutz <git@maximhutz.me>
51 lines
1015 B
Go
51 lines
1015 B
Go
package registry
|
|
|
|
import (
|
|
"fmt"
|
|
"reflect"
|
|
|
|
"git.maximhutz.com/max/lambda/pkg/codec"
|
|
)
|
|
|
|
type Codec interface {
|
|
codec.Codec[Repr]
|
|
|
|
InType() string
|
|
}
|
|
|
|
type convertedCodec[T any] struct {
|
|
codec codec.Codec[T]
|
|
inType string
|
|
}
|
|
|
|
func (c convertedCodec[T]) Decode(s string) (Repr, error) {
|
|
t, err := c.codec.Decode(s)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return NewRepr(c.inType, t), nil
|
|
}
|
|
|
|
func (c convertedCodec[T]) Encode(r Repr) (string, error) {
|
|
t, ok := r.Data().(T)
|
|
if !ok {
|
|
dataType := reflect.TypeOf(r.Data())
|
|
allowedType := reflect.TypeFor[T]()
|
|
return "", fmt.Errorf("Codec for '%s' cannot parse '%s'", allowedType, dataType)
|
|
}
|
|
|
|
return c.codec.Encode(t)
|
|
}
|
|
|
|
func (c convertedCodec[T]) InType() string { return c.inType }
|
|
|
|
func RegisterCodec[T any](registry *Registry, m codec.Codec[T], inType string) error {
|
|
if _, ok := registry.codecs[inType]; ok {
|
|
return fmt.Errorf("Codec for '%s' already registered", inType)
|
|
}
|
|
|
|
registry.codecs[inType] = convertedCodec[T]{m, inType}
|
|
return nil
|
|
}
|