M.V. Hutz
a3ee34732e
## Description The old architecture used a monolithic `main()` with a custom arg parser, an event-emitter-based runtime, and a plugin system for optional features. This PR rewrites the CLI and internal architecture to be modular, extensible, and built around a registry of interchangeable components. - Replace custom CLI arg parsing with Cobra subcommands (`convert`, `reduce`, `engine list`). - Introduce a registry system (`internal/registry`) for marshalers, codecs, and engines, with BFS-based conversion path resolution. - Add type-erased adapter layer (`internal/cli`) with `Repr`, `Engine`, `Process`, `Marshaler`, and `Conversion` interfaces wrapping generic `pkg/` types. - Replace the event-emitter-based `Runtime` with a simpler `Engine`/`Process` model (`pkg/engine`). - Add generic `Codec[T, U]` and `Marshaler[T]` interfaces (`pkg/codec`). - Merge `saccharine/token` sub-package into `saccharine` and rename scanner functions from `parse*` to `scan*`. - Make saccharine-to-lambda conversion bidirectional (encode and decode). - Add `lambda.Marshaler` and `saccharine.Marshaler` implementing `codec.Marshaler`. - Remove old infrastructure: `pkg/runtime`, `pkg/expr`, `internal/plugins`, `internal/statistics`. - Add `make lint` target and update golangci-lint config. ### Decisions - Cobra was chosen for the CLI framework to support nested subcommands and standard flag handling. - The registry uses BFS to find conversion paths between representations, allowing multi-hop conversions without hardcoding routes. - Type erasure via `cli.Repr` (wrapping `any`) enables the registry to work with heterogeneous types while keeping `pkg/` generics type-safe. - The old plugin/event system was removed entirely rather than adapted, since the new `Process` model can support hooks differently in the future. ## Benefits - Subcommands make the CLI self-documenting and easier to extend with new functionality. - The registry pattern decouples representations, conversions, and engines, making it trivial to add new ones. - BFS conversion routing means adding a single codec automatically enables transitive conversions. - Simpler `Engine`/`Process` model reduces complexity compared to the event-emitter runtime. - Consolidating the `token` sub-package reduces import depth and package sprawl. ## Checklist - [x] Code follows conventional commit format. - [x] Branch follows naming convention (`<type>/<description>`). Always use underscores. - [ ] Tests pass (if applicable). - [ ] Documentation updated (if applicable). Reviewed-on: #41 Co-authored-by: M.V. Hutz <git@maximhutz.me> Co-committed-by: M.V. Hutz <git@maximhutz.me>
68 lines
1.3 KiB
Go
68 lines
1.3 KiB
Go
package cli
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"git.maximhutz.com/max/lambda/pkg/codec"
|
|
)
|
|
|
|
type Conversion interface {
|
|
InType() string
|
|
OutType() string
|
|
|
|
Run(Repr) (Repr, error)
|
|
}
|
|
|
|
type forwardCodec[T, U any] struct {
|
|
codec codec.Codec[T, U]
|
|
inType, outType string
|
|
}
|
|
|
|
func (c forwardCodec[T, U]) Run(r Repr) (Repr, error) {
|
|
t, ok := r.Data().(T)
|
|
if !ok {
|
|
return nil, fmt.Errorf("could not parse '%v' as '%s'", t, c.inType)
|
|
}
|
|
|
|
u, err := c.codec.Encode(t)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return NewRepr(c.outType, u), nil
|
|
}
|
|
|
|
func (c forwardCodec[T, U]) InType() string { return c.inType }
|
|
|
|
func (c forwardCodec[T, U]) OutType() string { return c.outType }
|
|
|
|
type backwardCodec[T, U any] struct {
|
|
codec codec.Codec[T, U]
|
|
inType, outType string
|
|
}
|
|
|
|
func (c backwardCodec[T, U]) Run(r Repr) (Repr, error) {
|
|
u, ok := r.Data().(U)
|
|
if !ok {
|
|
return nil, fmt.Errorf("could not parse '%v' as '%s'", r, c.outType)
|
|
}
|
|
|
|
t, err := c.codec.Decode(u)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return NewRepr(c.inType, t), nil
|
|
}
|
|
|
|
func (c backwardCodec[T, U]) InType() string { return c.outType }
|
|
|
|
func (c backwardCodec[T, U]) OutType() string { return c.inType }
|
|
|
|
func ConvertCodec[T, U any](e codec.Codec[T, U], inType, outType string) []Conversion {
|
|
return []Conversion{
|
|
forwardCodec[T, U]{e, inType, outType},
|
|
backwardCodec[T, U]{e, inType, outType},
|
|
}
|
|
}
|