Merge branch 'main' into win10

hpklio · Oct 31, 2024 · f2fa063 · f2fa063
2 parents 2afdc46 + d82cd3d
commit f2fa063
Show file tree

Hide file tree

Showing 8 changed files with 77 additions and 478 deletions.
diff --git a/cmd/eval.go b/cmd/eval.go
@@ -38,7 +38,7 @@ func NewEvalCmd(appConfig *app.AppConfig) *cobra.Command {
 					cmd.Context(),
 					projectFunc,
 					pkl.PreconfiguredOptions,
-					pklutils.WithVals(),
+					pklutils.WithVals(appConfig.Logger),
 					func(opts *pkl.EvaluatorOptions) {
 						opts.CacheDir = appConfig.CacheDir
 						if appConfig.RootDir != "" {

diff --git a/pkg/app/app.go b/pkg/app/app.go
@@ -10,10 +10,11 @@ import (
 
 	"github.com/apple/pkl-go/pkl"
 	"hpkl.io/hpkl/pkg/hpkl"
+	"hpkl.io/hpkl/pkg/logger"
 )
 
 type AppConfig struct {
-	Logger          *Logger
+	Logger          *logger.Logger
 	project         *pkl.Project
 	ctx             context.Context
 	PlainHttp       bool
@@ -65,7 +66,7 @@ func (a *AppConfig) Reset() {
 
 func NewAppConfig(ctx context.Context, outWriter io.Writer, errWriter io.Writer) (*AppConfig, error) {
 
-	logger := NewLogger(outWriter, errWriter)
+	logger := logger.New(outWriter, errWriter)
 
 	return &AppConfig{
 		Logger: logger,

diff --git a/pkg/app/resolver_test.go b/pkg/app/resolver_test.go
@@ -6,14 +6,15 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
+	"hpkl.io/hpkl/pkg/logger"
 )
 
 func TestDeduplicate(t *testing.T) {
 	stdWriter := new(bytes.Buffer)
 	errWriter := new(bytes.Buffer)
 
 	r, err := NewResolver(&AppConfig{
-		Logger:    NewLogger(stdWriter, errWriter),
+		Logger:    logger.New(stdWriter, errWriter),
 		project:   nil,
 		ctx:       context.Background(),
 		PlainHttp: true,

diff --git a/pkg/app/logger.go → pkg/logger/logger.go b/pkg/app/logger.go → pkg/logger/logger.go
@@ -1,4 +1,4 @@
-package app
+package logger
 
 import (
 	"fmt"
@@ -11,7 +11,7 @@ type Logger struct {
 	err io.Writer
 }
 
-func NewLogger(outWriter io.Writer, errWriter io.Writer) *Logger {
+func New(outWriter io.Writer, errWriter io.Writer) *Logger {
 	return &Logger{
 		out: outWriter,
 		err: errWriter,

diff --git a/pkg/pklutils/vals.go b/pkg/pklutils/vals.go
@@ -2,11 +2,12 @@ package pklutils
 
 import (
 	"github.com/apple/pkl-go/pkl"
+	"hpkl.io/hpkl/pkg/logger"
 	"hpkl.io/hpkl/pkg/vals"
 )
 
-func WithVals() func(options *pkl.EvaluatorOptions) {
-	valsReader, err := vals.NewValsReader()
+func WithVals(logger *logger.Logger) func(options *pkl.EvaluatorOptions) {
+	valsReader, err := vals.NewValsReader(logger)
 
 	if err != nil {
 		panic(err)

diff --git a/pkg/vals/reader.go b/pkg/vals/reader.go
@@ -2,12 +2,28 @@ package vals
 
 import (
 	"net/url"
+	"strings"
 
 	"github.com/apple/pkl-go/pkl"
-	"github.com/helmfile/vals"
+	"hpkl.io/hpkl/pkg/logger"
 )
 
-func NewValsReader() (*ValsReader, error) {
+const key_eparator = "!"
+
+type MapElement struct {
+	name        string
+	isDirectory bool
+}
+
+func (m *MapElement) Name() string {
+	return m.name
+}
+
+func (m *MapElement) IsDirectory() bool {
+	return m.isDirectory
+}
+
+func NewValsReader(logger *logger.Logger) (*ValsReader, error) {
 	runtime, err := ValsInstance()
 
 	if err != nil {
@@ -16,36 +32,65 @@ func NewValsReader() (*ValsReader, error) {
 
 	return &ValsReader{
 		Runtime: runtime,
+		Logger:  logger,
 	}, nil
 }
 
 type ValsReader struct {
-	Runtime *vals.Runtime
+	Runtime *KeysRuntime
+	Logger  *logger.Logger
 }
 
-func (r *ValsReader) Read(url url.URL) ([]byte, error) {
+func (r *ValsReader) IsGlobbable() bool {
+	return true
+}
+
+func (r *ValsReader) HasHierarchicalUris() bool {
+	return false
+}
+
+func (r *ValsReader) ListElements(url url.URL) ([]pkl.PathElement, error) {
 	url.Scheme = ""
-	code, err := r.Runtime.Get(url.String())
+	basePart := strings.TrimSuffix(url.String(), "/**")
+	key := strings.Replace(basePart, key_eparator, "#", 1)
+
+	res, err := r.Runtime.GetMap(key)
 
 	if err != nil {
-		return []byte{}, err
+		return nil, err
 	}
 
-	return []byte(code), nil
-}
+	result := make([]pkl.PathElement, len(res))
 
-func (r *ValsReader) Scheme() string {
-	return "vals"
-}
+	i := 0
+	for k, v := range res {
+		path := basePart + "/" + k
+		switch v.(type) {
+		case string:
+			result[i] = &MapElement{path, false}
+		default:
+			result[i] = &MapElement{path, true}
+		}
+		i++
+	}
 
-func (r *ValsReader) IsGlobbable() bool {
-	return false
+	return result, nil
 }
 
-func (r *ValsReader) HasHierarchicalUris() bool {
-	return false
+func (r *ValsReader) Read(url url.URL) ([]byte, error) {
+
+	url.Scheme = ""
+	key := strings.Replace(url.String(), key_eparator, "#", 1)
+
+	res, err := r.Runtime.GetString(key)
+
+	if err != nil {
+		return nil, err
+	} else {
+		return []byte(res), nil
+	}
 }
 
-func (r *ValsReader) ListElements(url url.URL) ([]pkl.PathElement, error) {
-	return make([]pkl.PathElement, 0), nil
+func (r *ValsReader) Scheme() string {
+	return "vals"
 }