refactor: mega refactoring in progress

Author: nxtcoder17

Runfile.yml

@@ -16,8 +16,7 @@ tasks:
   example:
     dir: ./examples
     cmd: 
-      - |+
-        run cook clean
+      - echo "hello world"
 
   test:old:
     cmd:

cmd/run/completions.go

@@ -1,25 +1,26 @@
 package main
 
-import (
-	"context"
-	"fmt"
-	"io"
-	"log/slog"
+//
+// import (
+// 	"context"
+// 	"fmt"
+// 	"io"
+// 	"log/slog"
+//
+// 	"github.com/nxtcoder17/fastlog"
+// 	"github.com/nxtcoder17/runfile/pkg/runfile"
+// )
 
-	"github.com/nxtcoder17/fastlog"
-	"github.com/nxtcoder17/runfile/pkg/runfile"
-)
-
-func generateShellCompletion(ctx context.Context, writer io.Writer, rfpath string) error {
-	runfile, err := runfile.ParseFromFile(runfile.NewContext(ctx, fastlog.New()), rfpath)
-	if err != nil {
-		slog.Error("parsing, got", "err", err)
-		panic(err)
-	}
-
-	for k := range runfile.Tasks {
-		fmt.Fprintf(writer, "%s\n", k)
-	}
-
-	return nil
-}
+// func generateShellCompletion(ctx context.Context, writer io.Writer, rfpath string) error {
+// 	runfile, err := runfile.ParseFromFile(runfile.NewContext(ctx, fastlog.New()), rfpath)
+// 	if err != nil {
+// 		slog.Error("parsing, got", "err", err)
+// 		panic(err)
+// 	}
+//
+// 	for k := range runfile.Tasks {
+// 		fmt.Fprintf(writer, "%s\n", k)
+// 	}
+//
+// 	return nil
+// }

cmd/run/completions/run.fish

@@ -1,15 +1,31 @@
-# args: (1)
-# run fish shell completion
-set PROGNAME run
-
-# list_targets fetches all targets, with all flags provided on the cli
-function list_targets
-  # eval $PROGNAME --list
-  eval (commandline -b) --list
+# # args: (1)
+# # run fish shell completion
+# set PROGNAME run
+#
+# # list_targets fetches all targets, with all flags provided on the cli
+# function list_targets
+#   # eval $PROGNAME --list
+#   eval (commandline -b) --list
+#   echo "shell:completion"
+# end
+#
+# complete -c $PROGNAME -d "runs named task" -xa '(list_targets)'
+# complete -c $PROGNAME -d "runs named task" -xa '(list_targets)'
+# complete -c $PROGNAME -l help -s h -d 'show help'
+# complete -c $PROGNAME -l list -s l -d 'list all tasks'
+# complete -c $PROGNAME -rF -l file -s f -d 'runs targets from this runfile' 
+
+# completion fish shell completion
+
+function __fish_completion_no_subcommand --description 'Test if there has been any subcommand yet'
+    for i in (commandline -opc)
+        if contains -- $i
+            return 1
+        end
+    end
+    return 0
 end
 
-complete -c $PROGNAME -d "runs named task" -xa '(list_targets)'
-complete -c $PROGNAME -l help -s h -d 'show help'
-complete -c $PROGNAME -l list -s l -d 'list all tasks'
-complete -c $PROGNAME -rF -l file -s f -d 'runs targets from this runfile' 
+complete -c completion -n '__fish_completion_no_subcommand' -f -l help -s h -d 'show help'
+complete -c completion -n '__fish_completion_no_subcommand' -f -l help -s h -d 'show help'
 

cmd/run/main.go

@@ -95,24 +95,26 @@ func main() {
 				return
 			}
 
-			runfilePath, err := locateRunfile(c)
-			if err != nil {
-				slog.Error("locating runfile", "err", err)
-				panic(err)
-			}
+			// runfilePath, err := locateRunfile(c)
+			// if err != nil {
+			// 	slog.Error("locating runfile", "err", err)
+			// 	panic(err)
+			// }
 
-			generateShellCompletion(ctx, c.Root().Writer, runfilePath)
+			// generateShellCompletion(ctx, c.Root().Writer, runfilePath)
 		},
 
 		Commands: []*cli.Command{
 			{
-				Name:    "shell:completion",
-				Usage:   "<bash|zsh|fish|ps>",
-				Suggest: true,
+				Name:                  "shell:completion",
+				Usage:                 "[shell]",
+				EnableShellCompletion: false,
 				Action: func(ctx context.Context, c *cli.Command) error {
-					fmt.Printf("args: (%d)\n", c.NArg())
-					if c.NArg() != 1 {
-						return fmt.Errorf("needs argument one of [bash,zsh,fish,ps]")
+					if c.NArg() == 0 {
+						for _, shell := range []string{"fish", "bash", "zsh", "powershell"} {
+							fmt.Fprintf(c.Writer, "%s\n", shell)
+						}
+						return nil
 					}
 
 					switch c.Args().First() {
@@ -139,12 +141,12 @@ func main() {
 
 			showList := c.Bool("list")
 			if showList {
-				runfilePath, err := locateRunfile(c)
-				if err != nil {
-					slog.Error("locating runfile, got", "err", err)
-					return err
-				}
-				return generateShellCompletion(ctx, c.Root().Writer, runfilePath)
+				// runfilePath, err := locateRunfile(c)
+				// if err != nil {
+				// 	slog.Error("locating runfile, got", "err", err)
+				// 	return err
+				// }
+				// return generateShellCompletion(ctx, c.Root().Writer, runfilePath)
 			}
 
 			if c.NArg() == 0 {
@@ -185,37 +187,20 @@ func main() {
 				return fmt.Errorf("parallel and watch can't be set together")
 			}
 
-			logger := fastlog.New(fastlog.Options{
-				Format:        fastlog.ConsoleFormat,
-				EnableColors:  true,
-				ShowCaller:    debug,
-				ShowTimestamp: false,
-				ShowDebugLogs: debug,
-			})
+			logger := fastlog.New(fastlog.Console(), fastlog.ShowDebugLogs(debug), fastlog.WithoutTimestamp())
 
 			runfilePath, err := locateRunfile(c)
 			if err != nil {
 				slog.Error("locating runfile, got", "err", err)
 				return err
 			}
 
-			rctx := runfile.NewContext(ctx, logger)
-
-			rf, err := runfile.ParseFromFile(rctx, runfilePath)
-			if err != nil {
-				slog.Error("parsing runfile, got", "err", err)
-				panic(err)
-			}
-
-			if err := rf.Run(rctx, args, runfile.RunOption{
-				ExecuteInParallel: parallel,
-				Watch:             watch,
-				Debug:             debug,
-				KVs:               kv,
-			}); err != nil {
+			if err := runfile.RunTask(ctx, runfilePath, args[0]); err != nil {
+				logger.Error("ERRORED", "err", err)
 				if err2, ok := err.(*errors.Error); ok {
 					logger.Error(err2.Error(), err2.SlogAttrs()...)
 				}
+				return err
 			}
 
 			return nil

go.mod

@@ -9,8 +9,9 @@ require (
 	github.com/charmbracelet/lipgloss v1.0.0
 	github.com/joho/godotenv v1.5.1
 	github.com/muesli/termenv v0.15.2
-	github.com/nxtcoder17/fastlog v0.0.0-20250702035423-1739653a5c24
+	github.com/nxtcoder17/fastlog v0.0.0-20251112144402-5324a708e570
 	github.com/nxtcoder17/fwatcher v1.2.2-0.20250804201159-543ad31be162
+	github.com/stretchr/testify v1.9.0
 	github.com/urfave/cli/v3 v3.0.0-beta1
 	golang.org/x/sync v0.10.0
 	golang.org/x/term v0.32.0
@@ -20,6 +21,7 @@ require (
 require (
 	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
 	github.com/charmbracelet/x/ansi v0.4.2 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dlclark/regexp2 v1.11.4 // indirect
 	github.com/fsnotify/fsnotify v1.8.0 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
@@ -28,11 +30,13 @@ require (
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mattn/go-runewidth v0.0.16 // indirect
 	github.com/nxtcoder17/go.pkgs v0.0.0-20250216034729-39e2d2cd48da // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/rs/zerolog v1.33.0 // indirect
 	github.com/samber/lo v1.47.0 // indirect
 	github.com/samber/slog-common v0.18.1 // indirect
 	github.com/samber/slog-zerolog/v2 v2.7.3 // indirect
 	golang.org/x/sys v0.33.0 // indirect
 	golang.org/x/text v0.16.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -39,6 +39,8 @@ github.com/muesli/termenv v0.15.2 h1:GohcuySI0QmI3wN8Ok9PtKGkgkFIk7y6Vpb5PvrY+Wo
 github.com/muesli/termenv v0.15.2/go.mod h1:Epx+iuz8sNs7mNKhxzH4fWXGNpZwUaJKRS1noLXviQ8=
 github.com/nxtcoder17/fastlog v0.0.0-20250702035423-1739653a5c24 h1:oLLpFv1p7jRRrrsZzyf77pECLAMKrTxzHRSoHNRoELw=
 github.com/nxtcoder17/fastlog v0.0.0-20250702035423-1739653a5c24/go.mod h1:x6o+8WEHRGaWu9XEhSdTrjmDjKhVnKNXd/XZ56bNN/o=
+github.com/nxtcoder17/fastlog v0.0.0-20251112144402-5324a708e570 h1:uiafpAq+4R/W7QcDJ8GiM7feWHBuojrekKNxiX+POis=
+github.com/nxtcoder17/fastlog v0.0.0-20251112144402-5324a708e570/go.mod h1:x6o+8WEHRGaWu9XEhSdTrjmDjKhVnKNXd/XZ56bNN/o=
 github.com/nxtcoder17/fwatcher v1.2.2-0.20250804201159-543ad31be162 h1:7EHTiBm6MVUMzT8pdeavpXcxwzzIbDC0QJwre6OvGAk=
 github.com/nxtcoder17/fwatcher v1.2.2-0.20250804201159-543ad31be162/go.mod h1:SMwIdCpyi5fBygrkCX8hIIUeILzgoxJFaDSlhFBOWWQ=
 github.com/nxtcoder17/go.pkgs v0.0.0-20250216034729-39e2d2cd48da h1:Y6GILHFlrihVfDqDPQ98y2kdUeI0SQc8tnoXh2NbEIA=

nixy.yml

@@ -1,5 +1,6 @@
 nixpkgs:
-    default: 554be6495561ff07b6c724047bdd7e0716aa7b46
+  default: 554be6495561ff07b6c724047bdd7e0716aa7b46
+
 packages:
   - go
   - pre-commit

pkg/errors/constants.go

@@ -67,3 +67,7 @@ func ErrTaskInvalidCommand(command any, err error) *Error {
 func ErrInvalidShellAlias(alias string) *Error {
 	return WrapStr("invalid shell alias").KV("alias", alias)
 }
+
+func ErrCircularDependency(taskName string) *Error {
+	return WrapStr("circular dependency detected").KV("task", taskName)
+}

pkg/errors/errors.go

@@ -75,6 +75,11 @@ func (e *Error) SlogAttrs() []any {
 	return result
 }
 
+func (e *Error) Wrap(err error) *Error {
+	e.err = errors.Join(e.err, err)
+	return e
+}
+
 func WrapErr(err error) *Error {
 	return &Error{
 		err: err,
@@ -96,3 +101,7 @@ func WrapStr(v string) *Error {
 func New(msg string) *Error {
 	return WrapStr(msg)
 }
+
+// func Wrap(msg string, err ...error) *Error {
+// 	return errors.Join(errors.New(msg), errors.Join(err...))
+// }