From a2355fcd56ecf3e065a521111ee09bfff42d27e7 Mon Sep 17 00:00:00 2001 From: "M.V. Hutz" Date: Fri, 6 Feb 2026 23:42:19 -0500 Subject: [PATCH] feat: moved cli to registry --- cmd/lambda/lambda_reduce.go | 4 +- cmd/lambda/registry.go | 9 ++- internal/{cli => registry}/conversion.go | 12 ++-- internal/registry/converter.go | 14 ++--- internal/{cli => registry}/engine.go | 17 ++++-- internal/{cli => registry}/marshaler.go | 11 +++- internal/{cli => registry}/process.go | 2 +- internal/registry/registry.go | 71 +++++------------------- internal/{cli => registry}/repr.go | 2 +- 9 files changed, 53 insertions(+), 89 deletions(-) rename internal/{cli => registry}/conversion.go (81%) rename internal/{cli => registry}/engine.go (53%) rename internal/{cli => registry}/marshaler.go (71%) rename internal/{cli => registry}/process.go (97%) rename internal/{cli => registry}/repr.go (96%) diff --git a/cmd/lambda/lambda_reduce.go b/cmd/lambda/lambda_reduce.go index 29684fa..1c67658 100644 --- a/cmd/lambda/lambda_reduce.go +++ b/cmd/lambda/lambda_reduce.go @@ -5,8 +5,8 @@ import ( "github.com/spf13/cobra" - "git.maximhutz.com/max/lambda/internal/cli" "git.maximhutz.com/max/lambda/internal/config" + "git.maximhutz.com/max/lambda/internal/registry" ) func LambdaReduce() *cobra.Command { @@ -53,7 +53,7 @@ func LambdaReduce() *cobra.Command { } // Find engine. - var engine cli.Engine + var engine registry.Engine if engineFlag == "" { if engine, err = r.GetDefaultEngine(inputRepr); err != nil { return err diff --git a/cmd/lambda/registry.go b/cmd/lambda/registry.go index 5603971..320ca0c 100644 --- a/cmd/lambda/registry.go +++ b/cmd/lambda/registry.go @@ -1,7 +1,6 @@ package main import ( - "git.maximhutz.com/max/lambda/internal/cli" "git.maximhutz.com/max/lambda/internal/registry" "git.maximhutz.com/max/lambda/pkg/convert" "git.maximhutz.com/max/lambda/pkg/engine/normalorder" @@ -13,14 +12,14 @@ func GetRegistry() *registry.Registry { r := registry.New() // Codecs - r.MustAddConversions(cli.ConvertCodec(convert.Saccharine2Lambda{}, "saccharine", "lambda")...) + (registry.RegisterCodec(r, convert.Saccharine2Lambda{}, "saccharine", "lambda")) // Engines - r.MustAddEngine(cli.ConvertEngine(normalorder.Engine{}, "normalorder", "lambda")) + (registry.RegisterEngine(r, normalorder.Engine{}, "normalorder", "lambda")) // Marshalers - r.MustAddMarshaler(cli.ConvertMarshaler(lambda.Marshaler{}, "lambda")) - r.MustAddMarshaler(cli.ConvertMarshaler(saccharine.Marshaler{}, "saccharine")) + (registry.RegisterMarshaler(r, lambda.Marshaler{}, "lambda")) + (registry.RegisterMarshaler(r, saccharine.Marshaler{}, "saccharine")) return r } diff --git a/internal/cli/conversion.go b/internal/registry/conversion.go similarity index 81% rename from internal/cli/conversion.go rename to internal/registry/conversion.go index d198f8e..2cf4fad 100644 --- a/internal/cli/conversion.go +++ b/internal/registry/conversion.go @@ -1,4 +1,4 @@ -package cli +package registry import ( "fmt" @@ -59,9 +59,9 @@ 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}, - } +func RegisterCodec[T, U any](registry *Registry, c codec.Codec[T, U], inType, outType string) error { + registry.converter.Add(forwardCodec[T, U]{c, inType, outType}) + registry.converter.Add(backwardCodec[T, U]{c, inType, outType}) + + return nil } diff --git a/internal/registry/converter.go b/internal/registry/converter.go index 3c29199..5ae74bf 100644 --- a/internal/registry/converter.go +++ b/internal/registry/converter.go @@ -1,27 +1,23 @@ package registry -import ( - "git.maximhutz.com/max/lambda/internal/cli" -) - type Converter struct { - data map[string][]cli.Conversion + data map[string][]Conversion } func NewConverter() *Converter { - return &Converter{data: map[string][]cli.Conversion{}} + return &Converter{data: map[string][]Conversion{}} } -func (g *Converter) Add(c cli.Conversion) { +func (g *Converter) Add(c Conversion) { conversionsFromIn, ok := g.data[c.InType()] if !ok { - conversionsFromIn = []cli.Conversion{} + conversionsFromIn = []Conversion{} } conversionsFromIn = append(conversionsFromIn, c) g.data[c.InType()] = conversionsFromIn } -func (g *Converter) ConversionsFrom(t string) []cli.Conversion { +func (g *Converter) ConversionsFrom(t string) []Conversion { return g.data[t] } diff --git a/internal/cli/engine.go b/internal/registry/engine.go similarity index 53% rename from internal/cli/engine.go rename to internal/registry/engine.go index 15f1618..22de088 100644 --- a/internal/cli/engine.go +++ b/internal/registry/engine.go @@ -1,6 +1,10 @@ -package cli +package registry -import "git.maximhutz.com/max/lambda/pkg/engine" +import ( + "fmt" + + "git.maximhutz.com/max/lambda/pkg/engine" +) type Engine interface { Load() Process @@ -22,6 +26,11 @@ func (e convertedEngine[T]) Load() Process { return convertedProcess[T]{e.engine.Load(), e.inType} } -func ConvertEngine[T any](e engine.Engine[T], name, inType string) Engine { - return &convertedEngine[T]{e, name, inType} +func RegisterEngine[T any](registry *Registry, e engine.Engine[T], name, inType string) error { + if _, ok := registry.engines[name]; ok { + return fmt.Errorf("engine '%s' already registered", name) + } + + registry.engines[name] = &convertedEngine[T]{e, name, inType} + return nil } diff --git a/internal/cli/marshaler.go b/internal/registry/marshaler.go similarity index 71% rename from internal/cli/marshaler.go rename to internal/registry/marshaler.go index a212417..d7a104b 100644 --- a/internal/cli/marshaler.go +++ b/internal/registry/marshaler.go @@ -1,4 +1,4 @@ -package cli +package registry import ( "fmt" @@ -40,6 +40,11 @@ func (c convertedMarshaler[T]) Encode(r Repr) (string, error) { func (c convertedMarshaler[T]) InType() string { return c.inType } -func ConvertMarshaler[T any](e codec.Marshaler[T], inType string) Marshaler { - return convertedMarshaler[T]{e, inType} +func RegisterMarshaler[T any](registry *Registry, m codec.Marshaler[T], inType string) error { + if _, ok := registry.marshalers[inType]; ok { + return fmt.Errorf("marshaler for '%s' already registered", inType) + } + + registry.marshalers[inType] = convertedMarshaler[T]{m, inType} + return nil } diff --git a/internal/cli/process.go b/internal/registry/process.go similarity index 97% rename from internal/cli/process.go rename to internal/registry/process.go index f3445f7..72d29d1 100644 --- a/internal/cli/process.go +++ b/internal/registry/process.go @@ -1,4 +1,4 @@ -package cli +package registry import ( "fmt" diff --git a/internal/registry/registry.go b/internal/registry/registry.go index 705b405..6fce6bf 100644 --- a/internal/registry/registry.go +++ b/internal/registry/registry.go @@ -4,68 +4,23 @@ import ( "fmt" "iter" "maps" - - "git.maximhutz.com/max/lambda/internal/cli" ) type Registry struct { - marshalers map[string]cli.Marshaler + marshalers map[string]Marshaler converter *Converter - engines map[string]cli.Engine + engines map[string]Engine } func New() *Registry { return &Registry{ - marshalers: map[string]cli.Marshaler{}, + marshalers: map[string]Marshaler{}, converter: NewConverter(), - engines: map[string]cli.Engine{}, + engines: map[string]Engine{}, } } -func (r *Registry) AddConversions(conversions ...cli.Conversion) error { - for _, conversion := range conversions { - r.converter.Add(conversion) - } - - return nil -} -func (r *Registry) MustAddConversions(conversions ...cli.Conversion) { - if err := r.AddConversions(conversions...); err != nil { - panic(err) - } -} - -func (r *Registry) AddMarshaler(c cli.Marshaler) error { - if _, ok := r.marshalers[c.InType()]; ok { - return fmt.Errorf("marshaler for '%s' already registered", c.InType()) - } - - r.marshalers[c.InType()] = c - return nil -} - -func (r *Registry) MustAddMarshaler(c cli.Marshaler) { - if err := r.AddMarshaler(c); err != nil { - panic(err) - } -} - -func (r *Registry) AddEngine(e cli.Engine) error { - if _, ok := r.engines[e.Name()]; ok { - return fmt.Errorf("engine '%s' already registered", e.Name()) - } - - r.engines[e.Name()] = e - return nil -} - -func (r *Registry) MustAddEngine(e cli.Engine) { - if err := r.AddEngine(e); err != nil { - panic(err) - } -} - -func (r Registry) GetEngine(name string) (cli.Engine, error) { +func (r Registry) GetEngine(name string) (Engine, error) { e, ok := r.engines[name] if !ok { return nil, fmt.Errorf("engine '%s' not found", name) @@ -74,11 +29,11 @@ func (r Registry) GetEngine(name string) (cli.Engine, error) { return e, nil } -func (r Registry) ListEngines() iter.Seq[cli.Engine] { +func (r Registry) ListEngines() iter.Seq[Engine] { return maps.Values(r.engines) } -func (r *Registry) GetDefaultEngine(id string) (cli.Engine, error) { +func (r *Registry) GetDefaultEngine(id string) (Engine, error) { for _, engine := range r.engines { if engine.InType() == id { return engine, nil @@ -88,7 +43,7 @@ func (r *Registry) GetDefaultEngine(id string) (cli.Engine, error) { return nil, fmt.Errorf("no engine for '%s'", id) } -func (r *Registry) ConvertTo(repr cli.Repr, outType string) (cli.Repr, error) { +func (r *Registry) ConvertTo(repr Repr, outType string) (Repr, error) { path, err := r.ConversionPath(repr.Id(), outType) if err != nil { return nil, err @@ -105,7 +60,7 @@ func (r *Registry) ConvertTo(repr cli.Repr, outType string) (cli.Repr, error) { return result, err } -func (r *Registry) Marshal(repr cli.Repr) (string, error) { +func (r *Registry) Marshal(repr Repr) (string, error) { m, ok := r.marshalers[repr.Id()] if !ok { return "", fmt.Errorf("no marshaler for '%s'", repr.Id()) @@ -114,7 +69,7 @@ func (r *Registry) Marshal(repr cli.Repr) (string, error) { return m.Encode(repr) } -func (r *Registry) Unmarshal(s string, outType string) (cli.Repr, error) { +func (r *Registry) Unmarshal(s string, outType string) (Repr, error) { m, ok := r.marshalers[outType] if !ok { return nil, fmt.Errorf("no marshaler for '%s'", outType) @@ -137,8 +92,8 @@ func reverse[T any](list []T) []T { return reversed } -func (r *Registry) ConversionPath(from, to string) ([]cli.Conversion, error) { - backtrack := map[string]cli.Conversion{} +func (r *Registry) ConversionPath(from, to string) ([]Conversion, error) { + backtrack := map[string]Conversion{} iteration := []string{from} for len(iteration) > 0 { nextIteration := []string{} @@ -157,7 +112,7 @@ func (r *Registry) ConversionPath(from, to string) ([]cli.Conversion, error) { iteration = nextIteration } - reversedPath := []cli.Conversion{} + reversedPath := []Conversion{} current := to for current != from { conversion, ok := backtrack[current] diff --git a/internal/cli/repr.go b/internal/registry/repr.go similarity index 96% rename from internal/cli/repr.go rename to internal/registry/repr.go index c684639..a8dd19b 100644 --- a/internal/cli/repr.go +++ b/internal/registry/repr.go @@ -1,4 +1,4 @@ -package cli +package registry type Repr interface { // Id returns to name of the objects underlying representation. If is