adyxax/gonf
1
0
Fork 0
Code Issues Activity

feat(variables): allow variable promises to be used directly where template values are

Browse source
This commit is contained in:
Julien Dessaux 2024-02-13 08:09:43 +01:00
parent 0726c6811b
commit e4eccafed7
Signed by: adyxax
GPG key ID: F92E51B86E07177E
2 changed files with 26 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
gonf/values.go
View file

@ -1,6 +1,9 @@
package gonf
import "log/slog"
import (
"fmt"
"log/slog"
)
type Value interface {
Bytes() []byte
@ -14,8 +17,11 @@ func interfaceToValue(v any) Value {
if vv, ok := v.([]byte); ok {
return &BytesValue{vv}
}
slog.Error("interfaceToTemplateValue", "value", v, "error", "Not Implemented")
return nil
if vv, ok := v.(*VariablePromise); ok {
return vv
}
slog.Error("interfaceToValue", "value", v, "error", "Not Implemented")
panic(fmt.Sprintf("interfaceToValue cannot take type %T as argument. Value was %#v.", v, v))
}
func interfaceToTemplateValue(v any) Value {
@ -25,8 +31,11 @@ func interfaceToTemplateValue(v any) Value {
if vv, ok := v.([]byte); ok {
return &TemplateValue{data: string(vv)}
}
if vv, ok := v.(*VariablePromise); ok {
return vv
}
slog.Error("interfaceToTemplateValue", "value", v, "error", "Not Implemented")
return nil
panic(fmt.Sprintf("interfaceToTemplateValue cannot take type %T as argument. Value was %#v.", v, v))
}
// ----- BytesValue -----------------------------------------------------------------

15
gonf/variables.go
View file

@ -1,6 +1,9 @@
package gonf
import "log/slog"
import (
"fmt"
"log/slog"
)
// ----- Globals ---------------------------------------------------------------
var variables map[string]*VariablePromise
@ -47,12 +50,20 @@ type VariablePromise struct {
value Value
}
// We want VariablePromise to satisfy the Value interface
func (s VariablePromise) Bytes() []byte {
return s.value.Bytes()
}
func (s VariablePromise) String() string {
return s.value.String()
}
// ----- Internal --------------------------------------------------------------
func getVariable(name string) string {
if v, ok := variables[name]; ok {
return v.value.String()
} else {
slog.Error("undefined variable or default", "name", name)
return ""
panic(fmt.Sprintf("undefined variable or default %s", name))
}
}