Replace templating engine

cmd/disable/disable.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 
 	"github.com/jippi/dottie/pkg"
+	"github.com/jippi/dottie/pkg/ast"
 	"github.com/jippi/dottie/pkg/cli/shared"
-	"github.com/jippi/dottie/pkg/render"
 	"github.com/jippi/dottie/pkg/tui"
 	"github.com/spf13/cobra"
 )
@@ -16,7 +16,7 @@ func NewCommand() *cobra.Command {
 		Short:             "Disable (comment out) a KEY if it exists",
 		GroupID:           "manipulate",
 		Args:              cobra.ExactArgs(1),
-		ValidArgsFunction: shared.NewCompleter().WithHandlers(render.ExcludeDisabledAssignments).Get(),
+		ValidArgsFunction: shared.NewCompleter().WithHandlers(ast.ExcludeDisabledAssignments).Get(),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			key := cmd.Flags().Arg(0)
 

cmd/disable/tests/disable-a-key-already-disabled/stderr.golden

@@ -1,2 +1,2 @@
----- exec command line 0: [disable KEY_B]
+---- exec command line 1: [disable KEY_B]
 WARNING: The key [ KEY_B ] is already disabled

cmd/disable/tests/disable-a-key-already-disabled/stdout.golden

@@ -1,2 +1,2 @@
----- exec command line 0: [disable KEY_B]
+---- exec command line 1: [disable KEY_B]
 (no output to stdout)

cmd/disable/tests/disable-key-b/stderr.golden

@@ -1,2 +1,2 @@
----- exec command line 0: [disable KEY_B]
+---- exec command line 1: [disable KEY_B]
 (no output to stderr)

cmd/disable/tests/disable-key-b/stdout.golden

@@ -1,2 +1,2 @@
----- exec command line 0: [disable KEY_B]
+---- exec command line 1: [disable KEY_B]
 Key [ KEY_B ] was successfully disabled

cmd/disable/tests/invalid-key/stderr.golden

@@ -1,3 +1,3 @@
----- exec command line 0: [disable NONEXISTING_KEY]
+---- exec command line 1: [disable NONEXISTING_KEY]
 Error: Could not find KEY [ NONEXISTING_KEY ]
 Run 'dottie disable --help' for usage.

cmd/disable/tests/invalid-key/stdout.golden

@@ -1,2 +1,2 @@
----- exec command line 0: [disable NONEXISTING_KEY]
+---- exec command line 1: [disable NONEXISTING_KEY]
 (no output to stdout)

cmd/disable/tests/missing-key/stderr.golden

@@ -1,3 +1,3 @@
----- exec command line 0: [disable]
+---- exec command line 1: [disable]
 Error: accepts 1 arg(s), received 0
 Run 'dottie disable --help' for usage.

cmd/disable/tests/missing-key/stdout.golden

@@ -1,2 +1,2 @@
----- exec command line 0: [disable]
+---- exec command line 1: [disable]
 (no output to stdout)

cmd/enable/enable.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 
 	"github.com/jippi/dottie/pkg"
+	"github.com/jippi/dottie/pkg/ast"
 	"github.com/jippi/dottie/pkg/cli/shared"
-	"github.com/jippi/dottie/pkg/render"
 	"github.com/jippi/dottie/pkg/tui"
 	"github.com/spf13/cobra"
 )
@@ -16,7 +16,7 @@ func NewCommand() *cobra.Command {
 		Short:             "Enable (uncomment) a KEY if it exists",
 		Args:              cobra.ExactArgs(1),
 		GroupID:           "manipulate",
-		ValidArgsFunction: shared.NewCompleter().WithHandlers(render.ExcludeActiveAssignments).Get(),
+		ValidArgsFunction: shared.NewCompleter().WithHandlers(ast.ExcludeActiveAssignments).Get(),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			filename := cmd.Flag("file").Value.String()
 

cmd/enable/tests/enable-a-key-already-enabled/stderr.golden

@@ -1,2 +1,2 @@
----- exec command line 0: [enable KEY_B]
+---- exec command line 1: [enable KEY_B]
 WARNING: The key [ KEY_B ] is already enabled

cmd/enable/tests/enable-a-key-already-enabled/stdout.golden

@@ -1,2 +1,2 @@
----- exec command line 0: [enable KEY_B]
+---- exec command line 1: [enable KEY_B]
 Key [ KEY_B ] was successfully enabled

cmd/enable/tests/enable-a-key/stderr.golden

@@ -1,2 +1,2 @@
----- exec command line 0: [enable KEY_B]
+---- exec command line 1: [enable KEY_B]
 (no output to stderr)

cmd/enable/tests/enable-a-key/stdout.golden

@@ -1,2 +1,2 @@
----- exec command line 0: [enable KEY_B]
+---- exec command line 1: [enable KEY_B]
 Key [ KEY_B ] was successfully enabled

cmd/enable/tests/invalid-key/stderr.golden

@@ -1,3 +1,3 @@
----- exec command line 0: [enable NONEXISTING_KEY]
+---- exec command line 1: [enable NONEXISTING_KEY]
 Error: Could not find KEY [ NONEXISTING_KEY ]
 Run 'dottie enable --help' for usage.

cmd/enable/tests/invalid-key/stdout.golden

@@ -1,2 +1,2 @@
----- exec command line 0: [enable NONEXISTING_KEY]
+---- exec command line 1: [enable NONEXISTING_KEY]
 (no output to stdout)

cmd/enable/tests/missing-key/stderr.golden

@@ -1,3 +1,3 @@
----- exec command line 0: [enable]
+---- exec command line 1: [enable]
 Error: accepts 1 arg(s), received 0
 Run 'dottie enable --help' for usage.

cmd/enable/tests/missing-key/stdout.golden

@@ -1,2 +1,2 @@
----- exec command line 0: [enable]
+---- exec command line 1: [enable]
 (no output to stdout)

cmd/groups/tests/multiple-groups/stderr.golden

@@ -1,2 +1,2 @@
----- exec command line 0: [groups]
+---- exec command line 1: [groups]
 (no output to stderr)

cmd/groups/tests/multiple-groups/stdout.golden

@@ -1,4 +1,4 @@
----- exec command line 0: [groups]
+---- exec command line 1: [groups]
 ┌──────────────────────────────────────────────────────────────────────────────┐
 │                                                                              │
 │                     Groups in tests/multiple-groups.env                      │

cmd/groups/tests/no-groups/stderr.golden

@@ -1,3 +1,3 @@
----- exec command line 0: [groups]
+---- exec command line 1: [groups]
 Error: No groups found
 Run 'dottie groups --help' for usage.

cmd/groups/tests/no-groups/stdout.golden

@@ -1,2 +1,2 @@
----- exec command line 0: [groups]
+---- exec command line 1: [groups]
 (no output to stdout)

cmd/groups/tests/single-group/stderr.golden

@@ -1,2 +1,2 @@
----- exec command line 0: [groups]
+---- exec command line 1: [groups]
 (no output to stderr)

cmd/groups/tests/single-group/stdout.golden

@@ -1,4 +1,4 @@
----- exec command line 0: [groups]
+---- exec command line 1: [groups]
 ┌──────────────────────────────────────────────────────────────────────────────┐
 │                                                                              │
 │                       Groups in tests/single-group.env                       │

cmd/print/tests/empty/stderr.golden

@@ -1,2 +1,2 @@
----- exec command line 0: [print --no-color]
+---- exec command line 1: [print --no-color]
 (no output to stderr)

cmd/print/tests/empty/stdout.golden

@@ -1,3 +1,3 @@
----- exec command line 0: [print --no-color]
+---- exec command line 1: [print --no-color]
 
 

cmd/print/tests/full/stderr.golden

@@ -1,2 +1,2 @@
----- exec command line 0: [print --no-color --pretty]
+---- exec command line 1: [print --no-color --pretty]
 (no output to stderr)

cmd/print/tests/full/stdout.golden

@@ -1,4 +1,4 @@
----- exec command line 0: [print --no-color --pretty]
+---- exec command line 1: [print --no-color --pretty]
 ################################################################################
 # My first group
 ################################################################################

cmd/print/tests/simple-pretty/stderr.golden

@@ -1,2 +1,2 @@
----- exec command line 0: [print --no-color --pretty]
+---- exec command line 1: [print --no-color --pretty]
 (no output to stderr)

cmd/print/tests/simple-pretty/stdout.golden

@@ -1,4 +1,4 @@
----- exec command line 0: [print --no-color --pretty]
+---- exec command line 1: [print --no-color --pretty]
 KEY_A="I'm key A"
 
 # Comment for KEY_B

cmd/print/tests/simple/stderr.golden

@@ -1,2 +1,2 @@
----- exec command line 0: [print --no-color]
+---- exec command line 1: [print --no-color]
 (no output to stderr)

cmd/print/tests/simple/stdout.golden

@@ -1,4 +1,4 @@
----- exec command line 0: [print --no-color]
+---- exec command line 1: [print --no-color]
 KEY_A="I'm key A"
 KEY_B="I'm key B"
 KEY_C="I'm key C"

cmd/print/tests/specific-group/stderr.golden

@@ -1,2 +1,2 @@
----- exec command line 0: [print --no-color --group my-first-group]
+---- exec command line 1: [print --no-color --group my-first-group]
 (no output to stderr)

cmd/print/tests/specific-group/stdout.golden

@@ -1,4 +1,4 @@
----- exec command line 0: [print --no-color --group my-first-group]
+---- exec command line 1: [print --no-color --group my-first-group]
 KEY_A="I'm key A"
 KEY_B="I'm key B"
 KEY_C="I'm key C"

cmd/root.go

@@ -38,7 +38,7 @@ GLOBAL OPTIONS:{{template "visibleFlagTemplate" .}}{{end}}{{if .Copyright}}
 
 func init() {
 	spew.Config.DisablePointerMethods = true
-	spew.Config.DisableMethods = true
+	spew.Config.DisableMethods = false
 	cobra.EnableCommandSorting = false
 }
 

cmd/set/set.go

@@ -8,7 +8,6 @@ import (
 	"github.com/jippi/dottie/pkg/ast"
 	"github.com/jippi/dottie/pkg/ast/upsert"
 	"github.com/jippi/dottie/pkg/cli/shared"
-	"github.com/jippi/dottie/pkg/render"
 	"github.com/jippi/dottie/pkg/token"
 	"github.com/jippi/dottie/pkg/tui"
 	"github.com/jippi/dottie/pkg/validation"
@@ -24,7 +23,7 @@ func NewCommand() *cobra.Command {
 		Args:    cobra.MinimumNArgs(1),
 		ValidArgsFunction: shared.NewCompleter().
 			WithSuffixIsLiteral(true).
-			WithHandlers(render.ExcludeDisabledAssignments).
+			WithHandlers(ast.ExcludeDisabledAssignments).
 			Get(),
 		RunE: runE,
 	}
@@ -62,10 +61,10 @@ func runE(cmd *cobra.Command, args []string) error {
 	upserter, err := upsert.New(
 		document,
 		upsert.WithGroup(shared.StringFlag(cmd.Flags(), "group")),
-		upsert.WithSettingIf(upsert.ErrorIfMissing, shared.BoolFlag(cmd.Flags(), "error-if-missing")),
-		upsert.WithSettingIf(upsert.SkipIfExists, shared.BoolFlag(cmd.Flags(), "skip-if-exists")),
-		upsert.WithSettingIf(upsert.SkipIfSame, shared.BoolFlag(cmd.Flags(), "skip-if-same")),
-		upsert.WithSettingIf(upsert.UpdateComments, cmd.Flag("comment").Changed),
+		upsert.EnableSettingIf(upsert.ErrorIfMissing, shared.BoolFlag(cmd.Flags(), "error-if-missing")),
+		upsert.EnableSettingIf(upsert.SkipIfExists, shared.BoolFlag(cmd.Flags(), "skip-if-exists")),
+		upsert.EnableSettingIf(upsert.SkipIfSame, shared.BoolFlag(cmd.Flags(), "skip-if-same")),
+		upsert.EnableSettingIf(upsert.UpdateComments, cmd.Flag("comment").Changed),
 	)
 	if err != nil {
 		return fmt.Errorf("error setting up upserter: %w", err)
@@ -79,7 +78,7 @@ func runE(cmd *cobra.Command, args []string) error {
 		return fmt.Errorf("error in processing [--after] flag: %w", err)
 	}
 
-	if err := upserter.ApplyOptions(upsert.WithSettingIf(upsert.Validate, shared.BoolWithInverseValue(cmd.Flags(), "validate"))); err != nil {
+	if err := upserter.ApplyOptions(upsert.EnableSettingIf(upsert.Validate, shared.BoolWithInverseValue(cmd.Flags(), "validate"))); err != nil {
 		return fmt.Errorf("error configuring [--validate] flag: %w", err)
 	}
 
@@ -120,8 +119,8 @@ func runE(cmd *cobra.Command, args []string) error {
 		tui.MaybePrintWarnings(cmd.Context(), warnings)
 
 		if err != nil {
-			z := validation.NewError(assignment, err)
-			stderr.NoColor().Println(validation.Explain(cmd.Context(), document, z, z, false, true))
+			z := ast.NewError(assignment, err)
+			stderr.NoColor().Println(validation.Explain(cmd.Context(), document, z, assignment, false, true))
 
 			if shared.BoolWithInverseValue(cmd.Flags(), "validate") {
 				allErrors = multierr.Append(allErrors, err)

cmd/set/tests/error-if-missing/stderr.golden

@@ -1,7 +1,7 @@
----- exec command line 0: [set --error-if-missing MISSING_KEY=THIS MUST FAIL]
+---- exec command line 1: [set --error-if-missing MISSING_KEY=THIS MUST FAIL]
 (error *errors.errorString) key [MISSING_KEY] does not exists in the document
 
 Error: validation error: key [MISSING_KEY] does not exists in the document
 Run 'dottie set --help' for usage.
----- exec command line 1: [set --error-if-missing SOME_KEY=SUCCESS]
+---- exec command line 2: [set --error-if-missing SOME_KEY=SUCCESS]
 (no output to stderr)

cmd/set/tests/error-if-missing/stdout.golden

@@ -1,5 +1,5 @@
----- exec command line 0: [set --error-if-missing MISSING_KEY=THIS MUST FAIL]
+---- exec command line 1: [set --error-if-missing MISSING_KEY=THIS MUST FAIL]
 (no output to stdout)
----- exec command line 1: [set --error-if-missing SOME_KEY=SUCCESS]
+---- exec command line 2: [set --error-if-missing SOME_KEY=SUCCESS]
 Key [ SOME_KEY ] was successfully upserted
 File was successfully saved

cmd/set/tests/manipulate-empty/stderr.golden

@@ -1,22 +1,22 @@
----- exec command line 0: [set SOME_KEY=SOME_VALUE]
+---- exec command line 1: [set SOME_KEY=SOME_VALUE]
 (no output to stderr)
----- exec command line 1: [set ANOTHER_KEY=ANOTHER_VALUE --quote-style single]
+---- exec command line 2: [set ANOTHER_KEY=ANOTHER_VALUE --quote-style single]
 (no output to stderr)
----- exec command line 2: [set SECOND_KEY=should be before ANOTHER_KEY --before ANOTHER_KEY]
+---- exec command line 3: [set SECOND_KEY=should be before ANOTHER_KEY --before ANOTHER_KEY]
 (no output to stderr)
----- exec command line 3: [set TRUE_SECOND_KEY=HA, I'm after SOME_KEY, so I'm before ANOTHER_KEY now --after SOME_KEY]
+---- exec command line 4: [set TRUE_SECOND_KEY=HA, I'm after SOME_KEY, so I'm before ANOTHER_KEY now --after SOME_KEY]
 (no output to stderr)
----- exec command line 4: [set SECOND_KEY=damn, I'm the third key now]
+---- exec command line 5: [set SECOND_KEY=damn, I'm the third key now]
 (no output to stderr)
----- exec command line 5: [set SOME_KEY=ANOTHER_VALUE --comment I'm a comment --comment I'm another comment]
+---- exec command line 6: [set SOME_KEY=ANOTHER_VALUE --comment I'm a comment --comment I'm another comment]
 (no output to stderr)
----- exec command line 6: [set A_NUMBER=1 --comment @dottie/validate number]
+---- exec command line 7: [set A_NUMBER=1 --comment @dottie/validate number]
 (no output to stderr)
----- exec command line 7: [set NOT_A_NUMBER=abc --comment @dottie/validate number]
-NOT_A_NUMBER (-:2)
-  * (number) The value [abc] is not a valid number.
+---- exec command line 8: [set NOT_A_NUMBER=abc --comment @dottie/validate number]
+  NOT_A_NUMBER ( memory://tmp:13 )
+    * (number) The value [abc] is not a valid number.
 
 Error: validation error: Key: 'NOT_A_NUMBER' Error:Field validation for 'NOT_A_NUMBER' failed on the 'number' tag
 Run 'dottie set --help' for usage.
----- exec command line 8: [set A_NUMBER=2]
+---- exec command line 9: [set A_NUMBER=2]
 (no output to stderr)

cmd/set/tests/manipulate-empty/stdout.golden

@@ -1,26 +1,26 @@
----- exec command line 0: [set SOME_KEY=SOME_VALUE]
+---- exec command line 1: [set SOME_KEY=SOME_VALUE]
 Key [ SOME_KEY ] was successfully upserted
 File was successfully saved
----- exec command line 1: [set ANOTHER_KEY=ANOTHER_VALUE --quote-style single]
+---- exec command line 2: [set ANOTHER_KEY=ANOTHER_VALUE --quote-style single]
 Key [ ANOTHER_KEY ] was successfully upserted
 File was successfully saved
----- exec command line 2: [set SECOND_KEY=should be before ANOTHER_KEY --before ANOTHER_KEY]
+---- exec command line 3: [set SECOND_KEY=should be before ANOTHER_KEY --before ANOTHER_KEY]
 Key [ SECOND_KEY ] was successfully upserted
 File was successfully saved
----- exec command line 3: [set TRUE_SECOND_KEY=HA, I'm after SOME_KEY, so I'm before ANOTHER_KEY now --after SOME_KEY]
+---- exec command line 4: [set TRUE_SECOND_KEY=HA, I'm after SOME_KEY, so I'm before ANOTHER_KEY now --after SOME_KEY]
 Key [ TRUE_SECOND_KEY ] was successfully upserted
 File was successfully saved
----- exec command line 4: [set SECOND_KEY=damn, I'm the third key now]
+---- exec command line 5: [set SECOND_KEY=damn, I'm the third key now]
 Key [ SECOND_KEY ] was successfully upserted
 File was successfully saved
----- exec command line 5: [set SOME_KEY=ANOTHER_VALUE --comment I'm a comment --comment I'm another comment]
+---- exec command line 6: [set SOME_KEY=ANOTHER_VALUE --comment I'm a comment --comment I'm another comment]
 Key [ SOME_KEY ] was successfully upserted
 File was successfully saved
----- exec command line 6: [set A_NUMBER=1 --comment @dottie/validate number]
+---- exec command line 7: [set A_NUMBER=1 --comment @dottie/validate number]
 Key [ A_NUMBER ] was successfully upserted
 File was successfully saved
----- exec command line 7: [set NOT_A_NUMBER=abc --comment @dottie/validate number]
+---- exec command line 8: [set NOT_A_NUMBER=abc --comment @dottie/validate number]
 (no output to stdout)
----- exec command line 8: [set A_NUMBER=2]
+---- exec command line 9: [set A_NUMBER=2]
 Key [ A_NUMBER ] was successfully upserted
 File was successfully saved

cmd/set/tests/skip-if-exists/stderr.golden

@@ -1,4 +1,4 @@
----- exec command line 0: [set --skip-if-exists SOME_KEY=SUCCESS]
+---- exec command line 1: [set --skip-if-exists SOME_KEY=SUCCESS]
 (no output to stderr)
----- exec command line 1: [set --skip-if-exists SOME_KEY=ERROR; THE VALUE MUST NOT CHANGE]
+---- exec command line 2: [set --skip-if-exists SOME_KEY=ERROR; THE VALUE MUST NOT CHANGE]
 (no output to stderr)

cmd/set/tests/skip-if-exists/stdout.golden

@@ -1,6 +1,6 @@
----- exec command line 0: [set --skip-if-exists SOME_KEY=SUCCESS]
+---- exec command line 1: [set --skip-if-exists SOME_KEY=SUCCESS]
 Key [ SOME_KEY ] was successfully upserted
 File was successfully saved
----- exec command line 1: [set --skip-if-exists SOME_KEY=ERROR; THE VALUE MUST NOT CHANGE]
+---- exec command line 2: [set --skip-if-exists SOME_KEY=ERROR; THE VALUE MUST NOT CHANGE]
 Key [ SOME_KEY ] was successfully upserted
 File was successfully saved

cmd/set/tests/skip-if-same/stderr.golden

@@ -1,4 +1,4 @@
----- exec command line 0: [set --skip-if-same SOME_KEY=ERROR THIS SHOULD BE CHANGED BY NEXT LINE]
+---- exec command line 1: [set --skip-if-same SOME_KEY=ERROR THIS SHOULD BE CHANGED BY NEXT LINE]
 (no output to stderr)
----- exec command line 1: [set --skip-if-same SOME_KEY=SUCCESS]
+---- exec command line 2: [set --skip-if-same SOME_KEY=SUCCESS]
 (no output to stderr)

cmd/set/tests/skip-if-same/stdout.golden

@@ -1,6 +1,6 @@
----- exec command line 0: [set --skip-if-same SOME_KEY=ERROR THIS SHOULD BE CHANGED BY NEXT LINE]
+---- exec command line 1: [set --skip-if-same SOME_KEY=ERROR THIS SHOULD BE CHANGED BY NEXT LINE]
 Key [ SOME_KEY ] was successfully upserted
 File was successfully saved
----- exec command line 1: [set --skip-if-same SOME_KEY=SUCCESS]
+---- exec command line 2: [set --skip-if-same SOME_KEY=SUCCESS]
 Key [ SOME_KEY ] was successfully upserted
 File was successfully saved