Implement fmt

Author: raphaelvigee

bootstrap/config.go

@@ -25,6 +25,7 @@ func BuildConfig(root *hroot.State, profiles []string) (*config.Config, error) {
 		},
 	}
 	cfg.Watch.Ignore = append(cfg.Watch.Ignore, root.Home.Join("**/*").Abs())
+	cfg.Fmt.IndentSize = 4
 
 	err := config.ParseAndApply("/etc/.hephconfig", &cfg)
 	if err != nil && !errors.Is(err, os.ErrNotExist) {

cmd/heph/init.go

@@ -91,6 +91,15 @@ func schedulerInit(ctx context.Context, postBoot func(bootstrap.BaseBootstrap) e
 	return bs, nil
 }
 
+func bootstrapBase(ctx context.Context) (bootstrap.BaseBootstrap, error) {
+	opts, err := bootstrapOptions()
+	if err != nil {
+		return bootstrap.BaseBootstrap{}, err
+	}
+
+	return bootstrap.BootBase(ctx, opts)
+}
+
 func bootstrapInit(ctx context.Context) (bootstrap.Bootstrap, error) {
 	opts, err := bootstrapOptions()
 	if err != nil {

cmd/heph/query.go

@@ -212,7 +212,7 @@ var configCmd = &cobra.Command{
 	RunE: func(cmd *cobra.Command, args []string) error {
 		ctx := cmd.Context()
 
-		bs, err := bootstrapInit(ctx)
+		bs, err := bootstrapBase(ctx)
 		if err != nil {
 			return err
 		}
@@ -758,7 +758,7 @@ var outRootCmd = &cobra.Command{
 	RunE: func(cmd *cobra.Command, args []string) error {
 		ctx := cmd.Context()
 
-		bs, err := bootstrapInit(ctx)
+		bs, err := bootstrapBase(ctx)
 		if err != nil {
 			return err
 		}

cmd/heph/root.go

@@ -3,12 +3,17 @@ package main
 import (
 	"fmt"
 	"github.com/hephbuild/heph/bootstrap"
+	"github.com/hephbuild/heph/buildfiles"
 	"github.com/hephbuild/heph/config"
 	"github.com/hephbuild/heph/log/log"
+	"github.com/hephbuild/heph/packages"
 	"github.com/hephbuild/heph/targetrun"
 	"github.com/hephbuild/heph/utils"
+	"github.com/hephbuild/heph/utils/ads"
 	"github.com/hephbuild/heph/utils/finalizers"
+	"github.com/hephbuild/heph/utils/xstarlark"
 	"github.com/spf13/cobra"
+	"go.uber.org/multierr"
 	"os"
 	"runtime"
 	"runtime/pprof"
@@ -34,6 +39,7 @@ var params *[]string
 var summary *bool
 var summaryGen *bool
 var jaegerEndpoint *string
+var check *bool
 
 func getRunOpts() bootstrap.RunOpts {
 	return bootstrap.RunOpts{
@@ -70,6 +76,8 @@ func init() {
 	runCmd.Flags().AddFlag(NewBoolStrFlag(&catOutput, "cat-out", "", "Print target output content, --cat-out=<name> to filter output"))
 	alwaysOut = runCmd.Flags().Bool("always-out", false, "Ensure output will be present in cache")
 
+	check = fmtCmd.Flags().Bool("check", false, "Only check formatting")
+
 	rootCmd.AddCommand(runCmd)
 	rootCmd.AddCommand(cleanCmd)
 	rootCmd.AddCommand(queryCmd)
@@ -78,6 +86,7 @@ func init() {
 	rootCmd.AddCommand(validateCmd)
 	rootCmd.AddCommand(setupCmd)
 	rootCmd.AddCommand(searchCmd)
+	rootCmd.AddCommand(fmtCmd)
 
 	cpuprofile = rootCmd.PersistentFlags().String("cpuprofile", "", "CPU Profile file")
 	memprofile = rootCmd.PersistentFlags().String("memprofile", "", "Mem Profile file")
@@ -299,3 +308,54 @@ var setupCmd = &cobra.Command{
 		return nil
 	},
 }
+
+var fmtCmd = &cobra.Command{
+	Use:   "fmt",
+	Short: "Format build files",
+	Args:  cobra.ArbitraryArgs,
+	RunE: func(cmd *cobra.Command, args []string) error {
+		ctx := cmd.Context()
+
+		bs, err := bootstrapBase(ctx)
+		if err != nil {
+			return err
+		}
+
+		buildfilesState := buildfiles.NewState(buildfiles.State{
+			Ignore: bs.Config.BuildFiles.Ignore,
+		})
+
+		var files []string
+		if len(args) == 0 {
+			cfiles, err := buildfilesState.CollectFiles(ctx, bs.Root.Root.Abs())
+			if err != nil {
+				return err
+			}
+
+			files = ads.Map(cfiles, func(f *packages.SourceFile) string {
+				return f.Path
+			})
+		} else {
+			files = args
+		}
+
+		cfg := xstarlark.FmtConfig{
+			IndentSize: bs.Config.Fmt.IndentSize,
+		}
+
+		var errs error
+		for _, file := range files {
+			f := xstarlark.FmtFix
+			if *check {
+				f = xstarlark.FmtCheck
+			}
+
+			err := f(file, cfg)
+			if err != nil {
+				errs = multierr.Append(errs, fmt.Errorf("%v: %w", file, err))
+			}
+		}
+
+		return errs
+	},
+}

config/config.go

@@ -5,12 +5,10 @@ import (
 	"github.com/hephbuild/heph/log/log"
 	"github.com/hephbuild/heph/utils/mds"
 	"golang.org/x/exp/slices"
+	"gopkg.in/yaml.v3"
 	"os"
 	"path/filepath"
 )
-import (
-	"gopkg.in/yaml.v3"
-)
 
 type BaseConfig struct {
 	Version  Version
@@ -48,6 +46,9 @@ type Config struct {
 	Watch struct {
 		Ignore []string `yaml:"ignore"`
 	} `yaml:"watch"`
+	Fmt struct {
+		IndentSize int `yaml:"indent_size,omitempty"`
+	} `yaml:"fmt"`
 	Params map[string]string `yaml:"params"`
 
 	Extras `yaml:",inline"`

config/file_config.go

@@ -28,6 +28,9 @@ type FileConfig struct {
 	Watch struct {
 		Ignore []string `yaml:"ignore,omitempty"`
 	} `yaml:"watch"`
+	Fmt struct {
+		IndentSize int `yaml:"indent_size,omitempty"`
+	} `yaml:"fmt"`
 	Params map[string]string `yaml:"params"`
 	Extras `yaml:",inline"`
 }
@@ -108,6 +111,10 @@ func (fc FileConfig) ApplyTo(c Config) Config {
 	c.BuildFiles.Glob.Exclude = append(c.BuildFiles.Glob.Exclude, fc.BuildFiles.Glob.Exclude...)
 	c.Watch.Ignore = append(c.Watch.Ignore, fc.Watch.Ignore...)
 
+	if fc.Fmt.IndentSize != 0 {
+		c.Fmt.IndentSize = fc.Fmt.IndentSize
+	}
+
 	if c.Extras == nil {
 		c.Extras = map[string]interface{}{}
 	}

go.mod

@@ -4,6 +4,8 @@ go 1.20
 
 replace github.com/spf13/cobra v1.7.0 => github.com/raphaelvigee/cobra v0.0.0-20221020122344-217ca52feee0
 
+replace go.starlark.net => github.com/raphaelvigee/starlark-go v0.0.0-20230906105503-b71494f27e4a
+
 require (
 	github.com/Khan/genqlient v0.6.0
 	github.com/aarondl/json v0.0.0-20221020222930-8b0db17ef1bf

go.sum

@@ -248,6 +248,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/raphaelvigee/cobra v0.0.0-20221020122344-217ca52feee0 h1:M4TK6Jyh2wDKpJcK0JLEYxC+EFiGLk/OQsSFi7cALUw=
 github.com/raphaelvigee/cobra v0.0.0-20221020122344-217ca52feee0/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY=
+github.com/raphaelvigee/starlark-go v0.0.0-20230906105503-b71494f27e4a h1:04b1y8M6+U7kjw11X/zcZ0VCzgz7JIcIGcrVGeBRXFM=
+github.com/raphaelvigee/starlark-go v0.0.0-20230906105503-b71494f27e4a/go.mod h1:jxU+3+j+71eXOW14274+SmmuW82qJzl6iZSeqEtTGds=
 github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.4.3 h1:utMvzDsuh3suAEnhH0RdHmoPbU648o6CvXxTx4SBMOw=
@@ -303,8 +305,6 @@ go.opentelemetry.io/otel/sdk v1.11.1/go.mod h1:/l3FE4SupHJ12TduVjUkZtlfFqDCQJlOl
 go.opentelemetry.io/otel/trace v1.11.1 h1:ofxdnzsNrGBYXbP7t7zpUK281+go5rF7dvdIZXF8gdQ=
 go.opentelemetry.io/otel/trace v1.11.1/go.mod h1:f/Q9G7vzk5u91PhbmKbg1Qn0rzH1LJ4vbPHFGkTPtOk=
 go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
-go.starlark.net v0.0.0-20230302034142-4b1e35fe2254 h1:Ss6D3hLXTM0KobyBYEAygXzFfGcjnmfEJOBgSbemCtg=
-go.starlark.net v0.0.0-20230302034142-4b1e35fe2254/go.mod h1:jxU+3+j+71eXOW14274+SmmuW82qJzl6iZSeqEtTGds=
 go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ=
 go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
 go.uber.org/multierr v1.9.0 h1:7fIwc/ZtS0q++VgcfqFDxSBZVv/Xo49/SYnDFupUwlI=

targetrun/prepare.go

@@ -129,7 +129,7 @@ func (e *Runner) toolAbsPath(tt graph.TargetTool) string {
 	return tt.File.WithRoot(e.LocalCache.Metas.Find(tt.Target).OutExpansionRoot().Abs()).Abs()
 }
 
-func (e *Runner) runPrepare(ctx context.Context, target *graph.Target, mode string) (_ *Target, rerr error) {
+func (e *Runner) runPrepare(ctx context.Context, target *graph.Target, rr Request) (_ *Target, rerr error) {
 	ctx, span := e.Observability.SpanRunPrepare(ctx, target)
 	defer span.EndError(rerr)
 
@@ -243,7 +243,7 @@ func (e *Runner) runPrepare(ctx context.Context, target *graph.Target, mode stri
 
 			if dep.Mode == specs.DepModeLink {
 				outDir := e.LocalCache.Metas.Find(dept).OutExpansionRoot().Abs()
-				for _, file := range dept.ActualOutFiles().WithRoot(outDir).Name(dep.Output) {
+				for _, file := range dept.ActualOutFiles().Name(dep.Output).WithRoot(outDir) {
 					linkSrcRec.Add("", file.Abs(), file.RelRoot(), "")
 				}
 			} else {
@@ -366,7 +366,7 @@ func (e *Runner) runPrepare(ctx context.Context, target *graph.Target, mode stri
 	env["ROOT"] = rtarget.WorkdirRoot.Abs()
 	env["SANDBOX"] = rtarget.SandboxRoot.Abs()
 	if !target.Cache.Enabled {
-		mode := mode
+		mode := rr.Mode
 		if mode == "" {
 			mode = "run"
 		}
@@ -396,7 +396,7 @@ func (e *Runner) runPrepare(ctx context.Context, target *graph.Target, mode stri
 		env[hephprovider.EnvDistRoot] = hephDistRoot
 	}
 
-	if !(target.SrcEnv.Default == specs.FileEnvIgnore && len(target.SrcEnv.Named) == 0) {
+	if target.SrcEnv.Default != specs.FileEnvIgnore && len(envSrcRec.Named()) > 0 {
 		for name, paths := range envSrcRec.Named() {
 			if strings.HasPrefix(name, "_") {
 				continue

targetrun/run.go

@@ -69,7 +69,7 @@ func (e *Runner) Run(ctx context.Context, rr Request, iocfg sandbox.IOConfig) (*
 		log.Tracef("Target DONE %v", target.Addr)
 	}()
 
-	rtarget, err := e.runPrepare(ctx, target, rr.Mode)
+	rtarget, err := e.runPrepare(ctx, target, rr)
 	if err != nil {
 		return nil, fmt.Errorf("prepare: %w", err)
 	}