.github/ISSUE_TEMPLATE/bug_report_v4.md

@@ -34,13 +34,13 @@ The command you ran:
 yq eval-all 'select(fileIndex==0) | .a.b.c' data1.yml data2.yml
 ```
 
-**Actual behaviour**
+**Actual behavior**
 
 ```yaml
 cat: meow
 ```
 
-**Expected behaviour**
+**Expected behavior**
 
 ```yaml
 this: should really work

.github/instructions/instructions.md

@@ -1 +0,0 @@
-When you find a bug - make sure to include a new test that exposes the bug, as well as the fix for the bug itself.

.github/workflows/docker-release.yml

@@ -17,13 +17,13 @@ jobs:
       - uses: actions/checkout@v6
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v4
+        uses: docker/setup-qemu-action@v3
         with:
           platforms: all
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v4
+        uses: docker/setup-buildx-action@v3
         with:
           version: latest
 
@@ -31,13 +31,13 @@ jobs:
         run: echo ${{ steps.buildx.outputs.platforms }} && docker version
 
       - name: Login to Docker Hub
-        uses: docker/login-action@v4
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v4
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}

.github/workflows/go.yml

@@ -11,7 +11,7 @@ jobs:
     steps:
 
     - name: Set up Go
-      uses: actions/setup-go@v6
+      uses: actions/setup-go@v5
       with:
         go-version: '^1.20'
       id: go

.github/workflows/release.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
-      - uses: actions/setup-go@v6
+      - uses: actions/setup-go@v5
         with:
           go-version: '^1.20'
           check-latest: true

.gitignore

@@ -43,11 +43,9 @@ yq*.snap
 
 test.yml
 test*.yml
-test*.tf
 test*.xml
 test*.toml
 test*.yaml
-*.kyaml
 test_dir1/
 test_dir2/
 0.yml
@@ -70,7 +68,3 @@ debian/files
 .vscode
 
 yq3
-
-# Golang
-.gomodcache/
-.gocache/

.golangci.yml

@@ -14,11 +14,6 @@ linters:
     - unconvert
     - unparam
   settings:
-    misspell:
-      locale: UK
-      ignore-rules:
-        - color
-        - colors
     depguard:
       rules:
         prevent_unmaintained_packages:

.goreleaser.yaml

@@ -39,6 +39,7 @@ builds:
       - openbsd_amd64
       - windows_386
       - windows_amd64
+      - windows_arm
       - windows_arm64
 
     no_unique_dist_dir: true

CODE_OF_CONDUCT.md

@@ -11,7 +11,7 @@ appearance, race, religion, or sexual identity and orientation.
 
 ## Our Standards
 
-Examples of behaviour that contributes to creating a positive environment
+Examples of behavior that contributes to creating a positive environment
 include:
 
 * Using welcoming and inclusive language
@@ -20,7 +20,7 @@ include:
 * Focusing on what is best for the community
 * Showing empathy towards other community members
 
-Examples of unacceptable behaviour by participants include:
+Examples of unacceptable behavior by participants include:
 
 * The use of sexualized language or imagery and unwelcome sexual attention or
  advances
@@ -34,13 +34,13 @@ Examples of unacceptable behaviour by participants include:
 ## Our Responsibilities
 
 Project maintainers are responsible for clarifying the standards of acceptable
-behaviour and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behaviour.
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
 
 Project maintainers have the right and responsibility to remove, edit, or
 reject comments, commits, code, wiki edits, issues, and other contributions
 that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviours that they deem inappropriate,
+permanently any contributor for other behaviors that they deem inappropriate,
 threatening, offensive, or harmful.
 
 ## Scope
@@ -54,7 +54,7 @@ further defined and clarified by project maintainers.
 
 ## Enforcement
 
-Instances of abusive, harassing, or otherwise unacceptable behaviour may be
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
 reported by contacting the project team at mikefarah@gmail.com. All
 complaints will be reviewed and investigated and will result in a response that
 is deemed necessary and appropriate to the circumstances. The project team is

CONTRIBUTING.md

@@ -197,21 +197,6 @@ Note: PRs with small changes (e.g. minor typos) may not be merged (see https://j
   make [local] test    # Run in Docker container
   ```
 
-- **Problem**: Tests fail with a VCS error:
-  ```bash
-  error obtaining VCS status: exit status 128
-  Use -buildvcs=false to disable VCS stamping.
-  ```
-- **Solution**:
-  Git security mechanisms prevent Golang from detecting the Git details inside
-  the container; either build with the `local` option, or pass GOFLAGS to
-  disable Golang buildvcs behaviour.
-  ```bash
-  make local test
-  # OR
-  make test GOFLAGS='-buildvcs=true'
-  ```
-
 ### Documentation Generation Issues
 - **Problem**: Generated docs don't update after test changes
 - **Solution**: 

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.26.1 AS builder
+FROM golang:1.25.5 AS builder
 
 WORKDIR /go/src/mikefarah/yq
 

Dockerfile.dev

@@ -1,4 +1,4 @@
-FROM golang:1.26.1
+FROM golang:1.25.5
 
 RUN apt-get update && \
     apt-get install -y npm && \

Makefile

@@ -35,7 +35,6 @@ clean:
 ## prefix before other make targets to run in your local dev environment
 local: | quiet
 	@$(eval ENGINERUN= )
-	@$(eval GOFLAGS="$(GOFLAGS)" )
 	@mkdir -p tmp
 	@touch tmp/dev_image_id
 quiet: # this is silly but shuts up 'Nothing to be done for `local`'

Makefile.variables

@@ -4,7 +4,6 @@ IMPORT_PATH := github.com/mikefarah/${PROJECT}
 export GIT_COMMIT = $(shell git rev-parse --short HEAD)
 export GIT_DIRTY = $(shell test -n "$$(git status --porcelain)" && echo "+CHANGES" || true)
 export GIT_DESCRIBE = $(shell git describe --tags --always)
-GOFLAGS :=
 LDFLAGS :=
 LDFLAGS += -X main.GitCommit=${GIT_COMMIT}${GIT_DIRTY}
 LDFLAGS += -X main.GitDescribe=${GIT_DESCRIBE}
@@ -27,15 +26,13 @@ ifeq ($(CYG_CHECK),1)
 else
 	# all non-windows environments
 	ROOT := $(shell pwd)
-	# Deliberately use `command -v` instead of `which` to be POSIX compliant
-	SELINUX := $(shell command -v getenforce >/dev/null 2>&1 && echo :z)
+	SELINUX := $(shell which getenforce 2>&1 >/dev/null && echo :z)
 endif
 
 DEV_IMAGE := ${PROJECT}_dev
 
 ENGINERUN := ${ENGINE} run --rm \
 	-e LDFLAGS="${LDFLAGS}" \
-	-e GOFLAGS="${GOFLAGS}" \
 	-e GITHUB_TOKEN="${GITHUB_TOKEN}" \
 	-v ${ROOT}/vendor:/go/src${SELINUX} \
 	-v ${ROOT}:/${PROJECT}/src/${IMPORT_PATH}${SELINUX} \

README.md

@@ -3,7 +3,7 @@
 ![Build](https://github.com/mikefarah/yq/workflows/Build/badge.svg)  ![Docker Pulls](https://img.shields.io/docker/pulls/mikefarah/yq.svg) ![Github Releases (by Release)](https://img.shields.io/github/downloads/mikefarah/yq/total.svg) ![Go Report](https://goreportcard.com/badge/github.com/mikefarah/yq) ![CodeQL](https://github.com/mikefarah/yq/workflows/CodeQL/badge.svg)
 
 
-A lightweight and portable command-line YAML, JSON, INI and XML processor. `yq` uses [jq](https://github.com/stedolan/jq) (a popular JSON processor) like syntax but works with yaml files as well as json, kyaml, xml, ini, properties, csv and tsv. It doesn't yet support everything `jq` does - but it does support the most common operations and functions, and more is being added continuously.
+A lightweight and portable command-line YAML, JSON, INI and XML processor. `yq` uses [jq](https://github.com/stedolan/jq) (a popular JSON processor) like syntax but works with yaml files as well as json, xml, ini, properties, csv and tsv. It doesn't yet support everything `jq` does - but it does support the most common operations and functions, and more is being added continuously.
 
 yq is written in Go - so you can download a dependency free binary for your platform and you are good to go! If you prefer there are a variety of package managers that can be used as well as Docker and Podman, all listed below.
 
@@ -363,8 +363,6 @@ gah install yq
 - [Load content from other files](https://mikefarah.gitbook.io/yq/operators/load)
 - [Convert to/from json/ndjson](https://mikefarah.gitbook.io/yq/v/v4.x/usage/convert)
 - [Convert to/from xml](https://mikefarah.gitbook.io/yq/v/v4.x/usage/xml)
-- [Convert to/from hcl (terraform)](https://mikefarah.gitbook.io/yq/v/v4.x/usage/hcl)
-- [Convert to/from toml](https://mikefarah.gitbook.io/yq/v/v4.x/usage/toml)
 - [Convert to/from properties](https://mikefarah.gitbook.io/yq/v/v4.x/usage/properties)
 - [Convert to/from csv/tsv](https://mikefarah.gitbook.io/yq/usage/csv-tsv)
 - [General shell completion scripts (bash/zsh/fish/powershell)](https://mikefarah.gitbook.io/yq/v/v4.x/commands/shell-completion)
@@ -415,7 +413,7 @@ Flags:
   -h, --help                            help for yq
   -I, --indent int                      sets indent level for output (default 2)
   -i, --inplace                         update the file in place of first file given.
-  -p, --input-format string             [auto|a|yaml|y|json|j|kyaml|ky|props|p|csv|c|tsv|t|xml|x|base64|uri|toml|hcl|h|lua|l|ini|i] parse format for input. (default "auto")
+  -p, --input-format string             [auto|a|yaml|y|json|j|props|p|csv|c|tsv|t|xml|x|base64|uri|toml|lua|l|ini|i] parse format for input. (default "auto")
       --lua-globals                     output keys as top-level global variables
       --lua-prefix string               prefix (default "return ")
       --lua-suffix string               suffix (default ";\n")
@@ -424,7 +422,7 @@ Flags:
   -N, --no-doc                          Don't print document separators (---)
   -0, --nul-output                      Use NUL char to separate values. If unwrap scalar is also set, fail if unwrapped scalar contains NUL char.
   -n, --null-input                      Don't read input, simply evaluate the expression given. Useful for creating docs from scratch.
-  -o, --output-format string            [auto|a|yaml|y|json|j|kyaml|ky|props|p|csv|c|tsv|t|xml|x|base64|uri|toml|hcl|h|shell|s|lua|l|ini|i] output format type. (default "auto")
+  -o, --output-format string            [auto|a|yaml|y|json|j|props|p|csv|c|tsv|t|xml|x|base64|uri|toml|shell|s|lua|l|ini|i] output format type. (default "auto")
   -P, --prettyPrint                     pretty print, shorthand for '... style = ""'
       --properties-array-brackets       use [x] in array paths (e.g. for SpringBoot)
       --properties-separator string     separator to use between keys and values (default " = ")

acceptance_tests/inputs-format.sh

@@ -6,7 +6,6 @@ setUp() {
   rm test*.csv 2>/dev/null || true
   rm test*.tsv 2>/dev/null || true
   rm test*.xml 2>/dev/null || true
-  rm test*.tf 2>/dev/null || true
 }
 
 testInputProperties() {
@@ -154,37 +153,6 @@ EOM
   assertEquals "$expected" "$X"
 }
 
-testInputKYaml() {
-  cat >test.kyaml <<'EOL'
-# leading
-{
-  a: 1, # a line
-  # head b
-  b: 2,
-  c: [
-    # head d
-    "d", # d line
-  ],
-}
-EOL
-
-  read -r -d '' expected <<'EOM'
-# leading
-a: 1 # a line
-# head b
-b: 2
-c:
-  # head d
-  - d # d line
-EOM
-
-  X=$(./yq e -p=kyaml -P test.kyaml)
-  assertEquals "$expected" "$X"
-
-  X=$(./yq ea -p=kyaml -P test.kyaml)
-  assertEquals "$expected" "$X"
-}
-
 
 
 
@@ -287,61 +255,4 @@ EOM
   assertEquals "$expected" "$X"
 }
 
-testInputTerraform() {
-  cat >test.tf <<EOL
-resource "aws_s3_bucket" "example" {
-  bucket = "my-bucket"
-  tags = {
-    Environment = "Dev"
-    Project = "Test"
-  }
-}
-EOL
-
-  read -r -d '' expected << EOM
-resource "aws_s3_bucket" "example" {
-  bucket = "my-bucket"
-  tags = {
-    Environment = "Dev"
-    Project = "Test"
-  }
-}
-EOM
-
-  X=$(./yq test.tf)
-  assertEquals "$expected" "$X"
-
-  X=$(./yq ea test.tf)
-  assertEquals "$expected" "$X"
-}
-
-testInputTerraformGithubAction() {
-  cat >test.tf <<EOL
-resource "aws_s3_bucket" "example" {
-  bucket = "my-bucket"
-  
-  tags = {
-    Environment = "Dev"
-    Project = "Test"
-  }
-}
-EOL
-
-  read -r -d '' expected << EOM
-resource "aws_s3_bucket" "example" {
-  bucket = "my-bucket"
-  tags = {
-    Environment = "Dev"
-    Project = "Test"
-  }
-}
-EOM
-
-  X=$(cat /dev/null | ./yq test.tf)
-  assertEquals "$expected" "$X"
-
-  X=$(cat /dev/null | ./yq ea test.tf)
-  assertEquals "$expected" "$X"
-}
-
-source ./scripts/shunit2
+source ./scripts/shunit2

acceptance_tests/output-format.sh

@@ -280,55 +280,6 @@ EOM
   assertEquals "$expected" "$X"
 }
 
-testOutputKYaml() {
-  cat >test.yml <<'EOL'
-# leading
-a: 1 # a line
-# head b
-b: 2
-c:
-  # head d
-  - d # d line
-EOL
-
-  read -r -d '' expected <<'EOM'
-# leading
-{
-  a: 1, # a line
-  # head b
-  b: 2,
-  c: [
-    # head d
-    "d", # d line
-  ],
-}
-EOM
-
-  X=$(./yq e --output-format=kyaml test.yml)
-  assertEquals "$expected" "$X"
-
-  X=$(./yq ea --output-format=kyaml test.yml)
-  assertEquals "$expected" "$X"
-}
-
-testOutputKYamlShort() {
-  cat >test.yml <<EOL
-a: b
-EOL
-
-  read -r -d '' expected <<'EOM'
-{
-  a: "b",
-}
-EOM
-
-  X=$(./yq e -o=ky test.yml)
-  assertEquals "$expected" "$X"
-
-  X=$(./yq ea -o=ky test.yml)
-  assertEquals "$expected" "$X"
-}
-
 testOutputXmComplex() {
   cat >test.yml <<EOL
 a: {b: {c: ["cat", "dog"], +@f: meow}}

agents.md

@@ -1,17 +1,3 @@
-# General rules
-✅ **DO:**
-- You can use ./yq with the `--debug-node-info` flag to get a deeper understanding of the ast.
-- run ./scripts/format.sh to format the code; then ./scripts/check.sh lint and finally ./scripts/spelling.sh to check spelling.
-- Add comprehensive tests to cover the changes
-- Run test suite to ensure there is no regression
-- Use UK english spelling
-
-❌ **DON'T:**
-- Git add or commit
-- Add comments to functions that are self-explanatory
-
-
-
 # Adding a New Encoder/Decoder
 
 This guide explains how to add support for a new format (encoder/decoder) to yq without modifying `candidate_node.go`.
@@ -83,7 +69,6 @@ Create a test file `pkg/yqlib/<format>_test.go` using the `formatScenario` patte
 - `scenarioType` can be `"decode"` (test decoding to YAML) or `"roundtrip"` (encode/decode preservation)
 - Create a helper function `test<Format>Scenario()` that switches on `scenarioType`
 - Create main test function `Test<Format>FormatScenarios()` that iterates over scenarios
-- The main test function should use `documentScenarios` to ensure testcase documentation is generated.
 
 Test coverage must include:
 - Basic data types (scalars, arrays, objects/maps)
@@ -198,6 +183,14 @@ Tests must be implemented in `<format>_test.go` following the `formatScenario` p
 
 ## Common Patterns
 
+### Scalar-Only Formats
+Some formats only work with scalars (like base64, uri):
+```go
+if node.guessTagFromCustomType() != "!!str" {
+    return fmt.Errorf("cannot encode %v as <format>, can only operate on strings", node.Tag)
+}
+```
+
 ### Format with Indentation
 Use preferences to control output formatting:
 ```go
@@ -339,7 +332,6 @@ Create `pkg/yqlib/operator_<type>_test.go` using the `expressionScenario` patter
 - Include `subdescription` for longer test names
 - Set `expectedError` if testing error cases
 - Create main test function that iterates over scenarios
-- The main test function should use `documentScenarios` to ensure testcase documentation is generated.
 
 Test coverage must include:
 - Basic data types and nested structures

cmd/evaluate_all_command.go

@@ -60,7 +60,7 @@ func evaluateAll(cmd *cobra.Command, args []string) (cmdError error) {
 	out := cmd.OutOrStdout()
 
 	if writeInplace {
-		// only use colours if its forced
+		// only use colors if its forced
 		colorsEnabled = forceColor
 		writeInPlaceHandler := yqlib.NewWriteInPlaceHandler(args[0])
 		out, err = writeInPlaceHandler.CreateTempFile()
@@ -101,15 +101,12 @@ func evaluateAll(cmd *cobra.Command, args []string) (cmdError error) {
 	}
 
 	if frontMatter != "" {
-		originalFilename := args[0]
 		frontMatterHandler := yqlib.NewFrontMatterHandler(args[0])
 		err = frontMatterHandler.Split()
 		if err != nil {
 			return err
 		}
 		args[0] = frontMatterHandler.GetYamlFrontMatterFilename()
-		yqlib.SetFilenameAlias(args[0], originalFilename)
-		defer yqlib.ClearFilenameAliases()
 
 		if frontMatter == "process" {
 			reader := frontMatterHandler.GetContentReader()

cmd/evaluate_all_command_test.go

@@ -13,7 +13,6 @@ func TestCreateEvaluateAllCommand(t *testing.T) {
 
 	if cmd == nil {
 		t.Fatal("createEvaluateAllCommand returned nil")
-		return
 	}
 
 	// Test basic command properties

cmd/evaluate_sequence_command.go

@@ -74,7 +74,7 @@ func evaluateSequence(cmd *cobra.Command, args []string) (cmdError error) {
 	}
 
 	if writeInplace {
-		// only use colours if its forced
+		// only use colors if its forced
 		colorsEnabled = forceColor
 		writeInPlaceHandler := yqlib.NewWriteInPlaceHandler(args[0])
 		out, err = writeInPlaceHandler.CreateTempFile()
@@ -122,15 +122,12 @@ func evaluateSequence(cmd *cobra.Command, args []string) (cmdError error) {
 
 	if frontMatter != "" {
 		yqlib.GetLogger().Debug("using front matter handler")
-		originalFilename := args[0]
 		frontMatterHandler := yqlib.NewFrontMatterHandler(args[0])
 		err = frontMatterHandler.Split()
 		if err != nil {
 			return err
 		}
 		args[0] = frontMatterHandler.GetYamlFrontMatterFilename()
-		yqlib.SetFilenameAlias(args[0], originalFilename)
-		defer yqlib.ClearFilenameAliases()
 
 		if frontMatter == "process" {
 			reader := frontMatterHandler.GetContentReader()

cmd/evaluate_sequence_command_test.go

@@ -13,7 +13,6 @@ func TestCreateEvaluateSequenceCommand(t *testing.T) {
 
 	if cmd == nil {
 		t.Fatal("createEvaluateSequenceCommand returned nil")
-		return
 	}
 
 	// Test basic command properties

cmd/root.go

@@ -2,12 +2,12 @@ package cmd
 
 import (
 	"fmt"
-	"log/slog"
 	"os"
 	"strings"
 
 	"github.com/mikefarah/yq/v4/pkg/yqlib"
 	"github.com/spf13/cobra"
+	logging "gopkg.in/op/go-logging.v1"
 )
 
 type runeValue rune
@@ -68,21 +68,30 @@ yq -P -oy sample.json
 		},
 		PersistentPreRunE: func(cmd *cobra.Command, _ []string) error {
 			cmd.SetOut(cmd.OutOrStdout())
+			level := logging.WARNING
+			stringFormat := `[%{level}] %{color}%{time:15:04:05}%{color:reset} %{message}`
 
 			// when NO_COLOR environment variable presents and not an empty string the coloured output should be disabled;
 			// refer to no-color.org
 			forceNoColor = forceNoColor || os.Getenv("NO_COLOR") != ""
 
-			level := slog.LevelWarn
-			if verbose {
-				level = slog.LevelDebug
+			if verbose && forceNoColor {
+				level = logging.DEBUG
+				stringFormat = `[%{level:5.5s}] %{time:15:04:05} %{shortfile:-33s} %{shortfunc:-25s} %{message}`
+			} else if verbose {
+				level = logging.DEBUG
+				stringFormat = `[%{level:5.5s}] %{color}%{time:15:04:05}%{color:bold} %{shortfile:-33s} %{shortfunc:-25s}%{color:reset} %{message}`
+			} else if forceNoColor {
+				stringFormat = `[%{level}] %{time:15:04:05} %{message}`
 			}
 
-			yqlib.GetLogger().SetLevel(level)
-			opts := &slog.HandlerOptions{Level: level, AddSource: verbose}
-			handler := slog.NewTextHandler(os.Stderr, opts)
-			yqlib.GetLogger().SetSlogger(slog.New(handler))
+			var format = logging.MustStringFormatter(stringFormat)
+			var backend = logging.AddModuleLevel(
+				logging.NewBackendFormatter(logging.NewLogBackend(os.Stderr, "", 0), format))
 
+			backend.SetLevel(level, "")
+
+			logging.SetBackend(backend)
 			yqlib.InitExpressionParser()
 
 			return nil
@@ -175,7 +184,7 @@ yq -P -oy sample.json
 	}
 	rootCmd.Flags().BoolVarP(&version, "version", "V", false, "Print version information and quit")
 	rootCmd.PersistentFlags().BoolVarP(&writeInplace, "inplace", "i", false, "update the file in place of first file given.")
-	rootCmd.PersistentFlags().VarP(unwrapScalarFlag, "unwrapScalar", "r", "unwrap scalar, print the value with no quotes, colours or comments. Defaults to true for yaml")
+	rootCmd.PersistentFlags().VarP(unwrapScalarFlag, "unwrapScalar", "r", "unwrap scalar, print the value with no quotes, colors or comments. Defaults to true for yaml")
 	rootCmd.PersistentFlags().Lookup("unwrapScalar").NoOptDefVal = "true"
 	rootCmd.PersistentFlags().BoolVarP(&nulSepOutput, "nul-output", "0", false, "Use NUL char to separate values. If unwrap scalar is also set, fail if unwrapped scalar contains NUL char.")
 
@@ -194,7 +203,6 @@ yq -P -oy sample.json
 	}
 	rootCmd.PersistentFlags().BoolVarP(&yqlib.ConfiguredYamlPreferences.LeadingContentPreProcessing, "header-preprocess", "", true, "Slurp any header comments and separators before processing expression.")
 	rootCmd.PersistentFlags().BoolVarP(&yqlib.ConfiguredYamlPreferences.FixMergeAnchorToSpec, "yaml-fix-merge-anchor-to-spec", "", false, "Fix merge anchor to match YAML spec. Will default to true in late 2025")
-	rootCmd.PersistentFlags().BoolVarP(&yqlib.ConfiguredYamlPreferences.CompactSequenceIndent, "yaml-compact-seq-indent", "c", false, "Use compact sequence indentation where '- ' is considered part of the indentation.")
 
 	rootCmd.PersistentFlags().StringVarP(&splitFileExp, "split-exp", "s", "", "print each result (or doc) into a file named (exp). [exp] argument must return a string. You can use $index in the expression as the result counter. The necessary directories will be created.")
 	if err = rootCmd.RegisterFlagCompletionFunc("split-exp", cobra.NoFileCompletions); err != nil {

cmd/root_test.go

@@ -195,7 +195,6 @@ func TestNew(t *testing.T) {
 
 	if rootCmd == nil {
 		t.Fatal("New() returned nil")
-		return
 	}
 
 	// Test basic command properties

cmd/utils.go

@@ -3,12 +3,12 @@ package cmd
 import (
 	"fmt"
 	"io"
-	"log/slog"
 	"os"
 	"strings"
 
 	"github.com/mikefarah/yq/v4/pkg/yqlib"
 	"github.com/spf13/cobra"
+	"gopkg.in/op/go-logging.v1"
 )
 
 func isAutomaticOutputFormat() bool {
@@ -104,8 +104,8 @@ func configureFormats(args []string) error {
 		return err
 	}
 
-	yqlib.GetLogger().Debugf("Using input format %v", inputFormat)
-	yqlib.GetLogger().Debugf("Using output format %v", outputFormat)
+	yqlib.GetLogger().Debug("Using input format %v", inputFormat)
+	yqlib.GetLogger().Debug("Using output format %v", outputFormat)
 
 	return nil
 }
@@ -117,7 +117,7 @@ func configureInputFormat(inputFilename string) error {
 		_, err := yqlib.FormatFromString(inputFormat)
 		if err != nil {
 			// unknown file type, default to yaml
-			yqlib.GetLogger().Debugf("Unknown file format extension '%v', defaulting to yaml", inputFormat)
+			yqlib.GetLogger().Debug("Unknown file format extension '%v', defaulting to yaml", inputFormat)
 			inputFormat = "yaml"
 			if isAutomaticOutputFormat() {
 				outputFormat = "yaml"
@@ -132,7 +132,7 @@ func configureInputFormat(inputFilename string) error {
 		//
 		outputFormat = yqlib.FormatStringFromFilename(inputFilename)
 		if inputFilename != "-" {
-			yqlib.GetLogger().Warningf("yq default output is now 'auto' (based on the filename extension). Normally yq would output '%v', but for backwards compatibility 'yaml' has been set. Please use -oy to specify yaml, or drop the -p flag.", outputFormat)
+			yqlib.GetLogger().Warning("yq default output is now 'auto' (based on the filename extension). Normally yq would output '%v', but for backwards compatibility 'yaml' has been set. Please use -oy to specify yaml, or drop the -p flag.", outputFormat)
 		}
 		outputFormat = "yaml"
 	}
@@ -166,9 +166,6 @@ func configureDecoder(evaluateTogether bool) (yqlib.Decoder, error) {
 	}
 	yqlib.ConfiguredYamlPreferences.EvaluateTogether = evaluateTogether
 
-	if format.DecoderFactory == nil {
-		return nil, fmt.Errorf("no support for %s input format", inputFormat)
-	}
 	yqlibDecoder := format.DecoderFactory()
 	if yqlibDecoder == nil {
 		return nil, fmt.Errorf("no support for %s input format", inputFormat)
@@ -200,23 +197,17 @@ func configureEncoder() (yqlib.Encoder, error) {
 	}
 	yqlib.ConfiguredXMLPreferences.Indent = indent
 	yqlib.ConfiguredYamlPreferences.Indent = indent
-	yqlib.ConfiguredKYamlPreferences.Indent = indent
 	yqlib.ConfiguredJSONPreferences.Indent = indent
 
 	yqlib.ConfiguredYamlPreferences.UnwrapScalar = unwrapScalar
-	yqlib.ConfiguredKYamlPreferences.UnwrapScalar = unwrapScalar
 	yqlib.ConfiguredPropertiesPreferences.UnwrapScalar = unwrapScalar
 	yqlib.ConfiguredJSONPreferences.UnwrapScalar = unwrapScalar
-	yqlib.ConfiguredShellVariablesPreferences.UnwrapScalar = unwrapScalar
 
 	yqlib.ConfiguredYamlPreferences.ColorsEnabled = colorsEnabled
-	yqlib.ConfiguredKYamlPreferences.ColorsEnabled = colorsEnabled
 	yqlib.ConfiguredJSONPreferences.ColorsEnabled = colorsEnabled
 	yqlib.ConfiguredHclPreferences.ColorsEnabled = colorsEnabled
-	yqlib.ConfiguredTomlPreferences.ColorsEnabled = colorsEnabled
 
 	yqlib.ConfiguredYamlPreferences.PrintDocSeparators = !noDocSeparators
-	yqlib.ConfiguredKYamlPreferences.PrintDocSeparators = !noDocSeparators
 
 	encoder := yqlibOutputFormat.EncoderFactory()
 
@@ -235,7 +226,7 @@ func maybeFile(str string) bool {
 	yqlib.GetLogger().Debugf("checking '%v' is a file", str)
 	stat, err := os.Stat(str) // #nosec
 	result := err == nil && !stat.IsDir()
-	if yqlib.GetLogger().IsEnabledFor(slog.LevelDebug) {
+	if yqlib.GetLogger().IsEnabledFor(logging.DEBUG) {
 		if err != nil {
 			yqlib.GetLogger().Debugf("error: %v", err)
 		} else {
@@ -280,7 +271,7 @@ func processArgs(originalArgs []string) (string, []string, error) {
 
 	if expressionFile == "" && maybeFirstArgIsAFile && strings.HasSuffix(args[0], ".yq") {
 		// lets check if an expression file was given
-		yqlib.GetLogger().Debugf("Assuming arg %v is an expression file", args[0])
+		yqlib.GetLogger().Debug("Assuming arg %v is an expression file", args[0])
 		expressionFile = args[0]
 		args = args[1:]
 	}
@@ -296,7 +287,7 @@ func processArgs(originalArgs []string) (string, []string, error) {
 
 	yqlib.GetLogger().Debugf("processed args: %v", args)
 	if expression == "" && len(args) > 0 && args[0] != "-" && !maybeFile(args[0]) {
-		yqlib.GetLogger().Debugf("assuming expression is '%v'", args[0])
+		yqlib.GetLogger().Debug("assuming expression is '%v'", args[0])
 		expression = args[0]
 		args = args[1:]
 	}

cmd/utils_test.go

@@ -911,7 +911,7 @@ func stringsEqual(a, b []string) bool {
 		return false
 	}
 	for i := range a {
-		if a[i] != b[i] { //nolint:gosec // G602 false positive: b length equality is checked above
+		if a[i] != b[i] {
 			return false
 		}
 	}
@@ -926,13 +926,13 @@ func TestSetupColors(t *testing.T) {
 		expectColors bool
 	}{
 		{
-			name:         "force colour enabled",
+			name:         "force color enabled",
 			forceColor:   true,
 			forceNoColor: false,
 			expectColors: true,
 		},
 		{
-			name:         "force no colour enabled",
+			name:         "force no color enabled",
 			forceColor:   false,
 			forceNoColor: true,
 			expectColors: false,

cmd/version.go

@@ -11,7 +11,7 @@ var (
 	GitDescribe string
 
 	// Version is main version number that is being run at the moment.
-	Version = "v4.52.5"
+	Version = "v4.50.1"
 
 	// VersionPrerelease is a pre-release marker for the version. If this is "" (empty string)
 	// then it means that it is a final release. Otherwise, this is a pre-release

cmd/version_test.go

@@ -1,9 +1,6 @@
 package cmd
 
-import (
-	"strings"
-	"testing"
-)
+import "testing"
 
 func TestGetVersionDisplay(t *testing.T) {
 	var expectedVersion = ProductName + " (https://github.com/mikefarah/yq/) version " + Version
@@ -28,18 +25,6 @@ func TestGetVersionDisplay(t *testing.T) {
 }
 
 func Test_getHumanVersion(t *testing.T) {
-	// Save original values
-	origGitDescribe := GitDescribe
-	origGitCommit := GitCommit
-	origVersionPrerelease := VersionPrerelease
-
-	// Restore after test
-	defer func() {
-		GitDescribe = origGitDescribe
-		GitCommit = origGitCommit
-		VersionPrerelease = origVersionPrerelease
-	}()
-
 	GitDescribe = "e42813d"
 	GitCommit = "e42813d+CHANGES"
 	var wanted string
@@ -64,118 +49,3 @@ func Test_getHumanVersion(t *testing.T) {
 		}
 	}
 }
-
-func Test_getHumanVersion_NoGitDescribe(t *testing.T) {
-	// Save original values
-	origGitDescribe := GitDescribe
-	origGitCommit := GitCommit
-	origVersionPrerelease := VersionPrerelease
-
-	// Restore after test
-	defer func() {
-		GitDescribe = origGitDescribe
-		GitCommit = origGitCommit
-		VersionPrerelease = origVersionPrerelease
-	}()
-
-	GitDescribe = ""
-	GitCommit = ""
-	VersionPrerelease = ""
-
-	got := getHumanVersion()
-	if got != Version {
-		t.Errorf("getHumanVersion() = %v, want %v", got, Version)
-	}
-}
-
-func Test_getHumanVersion_WithPrerelease(t *testing.T) {
-	// Save original values
-	origGitDescribe := GitDescribe
-	origGitCommit := GitCommit
-	origVersionPrerelease := VersionPrerelease
-
-	// Restore after test
-	defer func() {
-		GitDescribe = origGitDescribe
-		GitCommit = origGitCommit
-		VersionPrerelease = origVersionPrerelease
-	}()
-
-	GitDescribe = ""
-	GitCommit = "abc123"
-	VersionPrerelease = "beta"
-
-	got := getHumanVersion()
-	expected := Version + "-beta (abc123)"
-	if got != expected {
-		t.Errorf("getHumanVersion() = %v, want %v", got, expected)
-	}
-}
-
-func Test_getHumanVersion_PrereleaseInVersion(t *testing.T) {
-	// Save original values
-	origGitDescribe := GitDescribe
-	origGitCommit := GitCommit
-	origVersionPrerelease := VersionPrerelease
-
-	// Restore after test
-	defer func() {
-		GitDescribe = origGitDescribe
-		GitCommit = origGitCommit
-		VersionPrerelease = origVersionPrerelease
-	}()
-
-	GitDescribe = "v1.2.3-rc1"
-	GitCommit = "xyz789"
-	VersionPrerelease = "rc1"
-
-	got := getHumanVersion()
-	// Should not duplicate "rc1" since it's already in GitDescribe
-	expected := "v1.2.3-rc1 (xyz789)"
-	if got != expected {
-		t.Errorf("getHumanVersion() = %v, want %v", got, expected)
-	}
-}
-
-func Test_getHumanVersion_StripSingleQuotes(t *testing.T) {
-	// Save original values
-	origGitDescribe := GitDescribe
-	origGitCommit := GitCommit
-	origVersionPrerelease := VersionPrerelease
-
-	// Restore after test
-	defer func() {
-		GitDescribe = origGitDescribe
-		GitCommit = origGitCommit
-		VersionPrerelease = origVersionPrerelease
-	}()
-
-	GitDescribe = "'v1.2.3'"
-	GitCommit = "'commit123'"
-	VersionPrerelease = ""
-
-	got := getHumanVersion()
-	// Should strip single quotes
-	if strings.Contains(got, "'") {
-		t.Errorf("getHumanVersion() = %v, should not contain single quotes", got)
-	}
-	expected := "v1.2.3"
-	if got != expected {
-		t.Errorf("getHumanVersion() = %v, want %v", got, expected)
-	}
-}
-
-func TestProductName(t *testing.T) {
-	if ProductName != "yq" {
-		t.Errorf("ProductName = %v, want yq", ProductName)
-	}
-}
-
-func TestVersionIsSet(t *testing.T) {
-	if Version == "" {
-		t.Error("Version should not be empty")
-	}
-	if !strings.HasPrefix(Version, "v") {
-		t.Errorf("Version %v should start with 'v'", Version)
-	}
-}

examples/kyaml.kyaml

@@ -1,10 +0,0 @@
-# leading
-{
-  a: 1, # a line
-  # head b
-  b: 2,
-  c: [
-    # head d
-    "d", # d line
-  ],
-}

examples/kyaml.yml

@@ -1,7 +0,0 @@
-# leading
-a: 1 # a line
-# head b
-b: 2
-c:
-  # head d
-  - d # d line

examples/sample.tf

@@ -1,27 +0,0 @@
-# main.tf
-
-# Define required providers and minimum Terraform version
-terraform {
-  required_providers {
-    aws = {
-      source  = "hashicorp/aws"
-      version = "~> 5.0"
-    }
-  }
-  required_version = ">= 1.2"
-}
-
-# Configure the AWS provider
-provider "aws" {
-  region = var.aws_region
-}
-
-# Define an S3 bucket resource
-resource "aws_s3_bucket" "example_bucket" {
-  bucket = var.bucket_name
-
-  tags = {
-    Environment = "Development"
-    Project     = "TerraformExample"
-  }
-}

examples/sample.toml

@@ -1,26 +1,6 @@
+[[fruits]]
 
+[animals]
 
-# This is a TOML document
-
-title = "TOML Example"
-
-[owner]
-name = "Tom Preston-Werner"
-dob = 1979-05-27T07:32:00-08:00
-
-[database]
-enabled = true
-ports = [ 8000, 8001, 8002 ]
-data = [ ["delta", "phi"], [3.14] ]
-temp_targets = { cpu = 79.5, case = 72.0 }
-
-[servers]
-
-[servers.alpha]
-ip = "10.0.0.1"
-role = "frontend"
-
-[servers.beta]
-ip = "10.0.0.2"
-role = "backend"
-
+[[fruits.varieties]]  # nested array of tables
+name = "red delicious"

go.mod

@@ -6,23 +6,23 @@ require (
 	github.com/alecthomas/repr v0.5.2
 	github.com/dimchansky/utfbom v1.1.1
 	github.com/elliotchance/orderedmap v1.8.0
-	github.com/fatih/color v1.19.0
+	github.com/fatih/color v1.18.0
 	github.com/go-ini/ini v1.67.0
-	github.com/goccy/go-json v0.10.6
-	github.com/goccy/go-yaml v1.19.2
+	github.com/goccy/go-json v0.10.5
+	github.com/goccy/go-yaml v1.19.0
 	github.com/hashicorp/hcl/v2 v2.24.0
 	github.com/jinzhu/copier v0.4.0
 	github.com/magiconair/properties v1.8.10
-	github.com/pelletier/go-toml/v2 v2.3.0
+	github.com/pelletier/go-toml/v2 v2.2.4
 	github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e
 	github.com/spf13/cobra v1.10.2
 	github.com/spf13/pflag v1.0.10
 	github.com/yuin/gopher-lua v1.1.1
-	github.com/zclconf/go-cty v1.18.0
+	github.com/zclconf/go-cty v1.17.0
 	go.yaml.in/yaml/v4 v4.0.0-rc.3
-	golang.org/x/mod v0.34.0
-	golang.org/x/net v0.52.0
-	golang.org/x/text v0.35.0
+	golang.org/x/net v0.48.0
+	golang.org/x/text v0.32.0
+	gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473
 )
 
 require (
@@ -33,9 +33,12 @@ require (
 	github.com/mattn/go-colorable v0.1.14 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mitchellh/go-wordwrap v1.0.1 // indirect
-	golang.org/x/sync v0.20.0 // indirect
-	golang.org/x/sys v0.42.0 // indirect
-	golang.org/x/tools v0.42.0 // indirect
+	golang.org/x/mod v0.30.0 // indirect
+	golang.org/x/sync v0.19.0 // indirect
+	golang.org/x/sys v0.39.0 // indirect
+	golang.org/x/tools v0.39.0 // indirect
 )
 
-go 1.25.0
+go 1.24.0
+
+toolchain go1.24.1

go.sum

@@ -18,16 +18,16 @@ github.com/dimchansky/utfbom v1.1.1 h1:vV6w1AhK4VMnhBno/TPVCoK9U/LP0PkLCS9tbxHdi
 github.com/dimchansky/utfbom v1.1.1/go.mod h1:SxdoEBH5qIqFocHMyGOXVAybYJdr71b1Q/j0mACtrfE=
 github.com/elliotchance/orderedmap v1.8.0 h1:TrOREecvh3JbS+NCgwposXG5ZTFHtEsQiCGOhPElnMw=
 github.com/elliotchance/orderedmap v1.8.0/go.mod h1:wsDwEaX5jEoyhbs7x93zk2H/qv0zwuhg4inXhDkYqys=
-github.com/fatih/color v1.19.0 h1:Zp3PiM21/9Ld6FzSKyL5c/BULoe/ONr9KlbYVOfG8+w=
-github.com/fatih/color v1.19.0/go.mod h1:zNk67I0ZUT1bEGsSGyCZYZNrHuTkJJB+r6Q9VuMi0LE=
+github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
+github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=
 github.com/go-ini/ini v1.67.0 h1:z6ZrTEZqSWOTyH2FlglNbNgARyHG8oLW9gMELqKr06A=
 github.com/go-ini/ini v1.67.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
 github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68=
 github.com/go-test/deep v1.0.3/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
-github.com/goccy/go-json v0.10.6 h1:p8HrPJzOakx/mn/bQtjgNjdTcN+/S6FcG2CTtQOrHVU=
-github.com/goccy/go-json v0.10.6/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
-github.com/goccy/go-yaml v1.19.2 h1:PmFC1S6h8ljIz6gMRBopkjP1TVT7xuwrButHID66PoM=
-github.com/goccy/go-yaml v1.19.2/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA=
+github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4=
+github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
+github.com/goccy/go-yaml v1.19.0 h1:EmkZ9RIsX+Uq4DYFowegAuJo8+xdX3T/2dwNPXbxEYE=
+github.com/goccy/go-yaml v1.19.0/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/hashicorp/hcl/v2 v2.24.0 h1:2QJdZ454DSsYGoaE6QheQZjtKZSUs9Nh2izTWiwQxvE=
@@ -46,8 +46,8 @@ github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWE
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0=
 github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTSsCt+hzestvNj0=
-github.com/pelletier/go-toml/v2 v2.3.0 h1:k59bC/lIZREW0/iVaQR8nDHxVq8OVlIzYCOJf421CaM=
-github.com/pelletier/go-toml/v2 v2.3.0/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY=
+github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4=
+github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e h1:aoZm08cpOy4WuID//EZDgcC4zIxODThtZNPirFr42+A=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -63,26 +63,28 @@ github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5Cc
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/yuin/gopher-lua v1.1.1 h1:kYKnWBjvbNP4XLT3+bPEwAXJx262OhaHDWDVOPjL46M=
 github.com/yuin/gopher-lua v1.1.1/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw=
-github.com/zclconf/go-cty v1.18.0 h1:pJ8+HNI4gFoyRNqVE37wWbJWVw43BZczFo7KUoRczaA=
-github.com/zclconf/go-cty v1.18.0/go.mod h1:qpnV6EDNgC1sns/AleL1fvatHw72j+S+nS+MJ+T2CSg=
+github.com/zclconf/go-cty v1.17.0 h1:seZvECve6XX4tmnvRzWtJNHdscMtYEx5R7bnnVyd/d0=
+github.com/zclconf/go-cty v1.17.0/go.mod h1:wqFzcImaLTI6A5HfsRwB0nj5n0MRZFwmey8YoFPPs3U=
 github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940 h1:4r45xpDWB6ZMSMNJFMOjqrGHynW3DIBuR2H9j0ug+Mo=
 github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940/go.mod h1:CmBdvvj3nqzfzJ6nTCIwDTPZ56aVGvDrmztiO5g3qrM=
 go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
 go.yaml.in/yaml/v4 v4.0.0-rc.3 h1:3h1fjsh1CTAPjW7q/EMe+C8shx5d8ctzZTrLcs/j8Go=
 go.yaml.in/yaml/v4 v4.0.0-rc.3/go.mod h1:aZqd9kCMsGL7AuUv/m/PvWLdg5sjJsZ4oHDEnfPPfY0=
-golang.org/x/mod v0.34.0 h1:xIHgNUUnW6sYkcM5Jleh05DvLOtwc6RitGHbDk4akRI=
-golang.org/x/mod v0.34.0/go.mod h1:ykgH52iCZe79kzLLMhyCUzhMci+nQj+0XkbXpNYtVjY=
-golang.org/x/net v0.52.0 h1:He/TN1l0e4mmR3QqHMT2Xab3Aj3L9qjbhRm78/6jrW0=
-golang.org/x/net v0.52.0/go.mod h1:R1MAz7uMZxVMualyPXb+VaqGSa3LIaUqk0eEt3w36Sw=
-golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4=
-golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
+golang.org/x/mod v0.30.0 h1:fDEXFVZ/fmCKProc/yAXXUijritrDzahmwwefnjoPFk=
+golang.org/x/mod v0.30.0/go.mod h1:lAsf5O2EvJeSFMiBxXDki7sCgAxEUcZHXoXMKT4GJKc=
+golang.org/x/net v0.48.0 h1:zyQRTTrjc33Lhh0fBgT/H3oZq9WuvRR5gPC70xpDiQU=
+golang.org/x/net v0.48.0/go.mod h1:+ndRgGjkh8FGtu1w1FGbEC31if4VrNVMuKTgcAAnQRY=
+golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=
+golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo=
-golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
-golang.org/x/text v0.35.0 h1:JOVx6vVDFokkpaq1AEptVzLTpDe9KGpj5tR4/X+ybL8=
-golang.org/x/text v0.35.0/go.mod h1:khi/HExzZJ2pGnjenulevKNX1W67CUy0AsXcNubPGCA=
-golang.org/x/tools v0.42.0 h1:uNgphsn75Tdz5Ji2q36v/nsFSfR/9BRFvqhGBaJGd5k=
-golang.org/x/tools v0.42.0/go.mod h1:Ma6lCIwGZvHK6XtgbswSoWroEkhugApmsXyrUmBhfr0=
+golang.org/x/sys v0.39.0 h1:CvCKL8MeisomCi6qNZ+wbb0DN9E5AATixKsvNtMoMFk=
+golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/text v0.32.0 h1:ZD01bjUt1FQ9WJ0ClOL5vxgxOI/sVCNgX1YtKwcY0mU=
+golang.org/x/text v0.32.0/go.mod h1:o/rUWzghvpD5TXrTIBuJU77MTaN0ljMWE47kxGJQ7jY=
+golang.org/x/tools v0.39.0 h1:ik4ho21kwuQln40uelmciQPp9SipgNDdrafrYA4TmQQ=
+golang.org/x/tools v0.39.0/go.mod h1:JnefbkDPyD8UU2kI5fuf8ZX4/yUeh9W877ZeBONxUqQ=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 h1:6D+BvnJ/j6e222UW8s2qTSe3wGBtvo0MbVQG/c5k8RE=
+gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473/go.mod h1:N1eN2tsCx0Ydtgjl4cqmbRCsY4/+z4cYDeqwZTk6zog=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

go_install_test.go

@@ -1,24 +0,0 @@
-package main
-
-import (
-	"io"
-	"testing"
-
-	"golang.org/x/mod/module"
-	"golang.org/x/mod/zip"
-)
-
-// TestGoInstallCompatibility ensures the module can be zipped for go install.
-// This is an integration test that uses the same zip.CreateFromDir function
-// that go install uses internally. If this test fails, go install will fail.
-// See: https://github.com/mikefarah/yq/issues/2587
-func TestGoInstallCompatibility(t *testing.T) {
-	mod := module.Version{
-		Path:    "github.com/mikefarah/yq/v4",
-		Version: "v4.0.0", // the actual version doesn't matter for validation
-	}
-
-	if err := zip.CreateFromDir(io.Discard, mod, "."); err != nil {
-		t.Fatalf("Module cannot be zipped for go install: %v", err)
-	}
-}

pkg/yqlib/all_at_once_evaluator_test.go

@@ -54,25 +54,3 @@ func TestAllAtOnceEvaluateNodes(t *testing.T) {
 		test.AssertResultComplex(t, tt.expected, resultsToString(t, list))
 	}
 }
-
-func TestTomlDecoderCanBeReinitializedAcrossDocuments(t *testing.T) {
-	decoder := NewTomlDecoder()
-
-	firstDocuments, err := ReadDocuments(strings.NewReader("id = \"Foobar\"\n"), decoder)
-	if err != nil {
-		t.Fatalf("failed to read first TOML document: %v", err)
-	}
-	if firstDocuments.Len() != 1 {
-		t.Fatalf("expected first document count to be 1, got %d", firstDocuments.Len())
-	}
-	test.AssertResult(t, "Foobar", firstDocuments.Front().Value.(*CandidateNode).Content[1].Value)
-
-	secondDocuments, err := ReadDocuments(strings.NewReader("id = \"Banana\"\n"), decoder)
-	if err != nil {
-		t.Fatalf("failed to read second TOML document: %v", err)
-	}
-	if secondDocuments.Len() != 1 {
-		t.Fatalf("expected second document count to be 1, got %d", secondDocuments.Len())
-	}
-	test.AssertResult(t, "Banana", secondDocuments.Front().Value.(*CandidateNode).Content[1].Value)
-}

pkg/yqlib/candidate_node.go

@@ -280,7 +280,7 @@ func (n *CandidateNode) AddChild(rawChild *CandidateNode) {
 
 func (n *CandidateNode) AddChildren(children []*CandidateNode) {
 	if n.Kind == MappingNode {
-		for i := 0; i < len(children)-1; i += 2 {
+		for i := 0; i < len(children); i += 2 {
 			key := children[i]
 			value := children[i+1]
 			n.AddKeyValueChild(key, value)
@@ -323,11 +323,11 @@ func (n *CandidateNode) guessTagFromCustomType() string {
 	dataBucket, errorReading := parseSnippet(n.Value)
 
 	if errorReading != nil {
-		log.Debugf("guessTagFromCustomType: could not guess underlying tag type %v", errorReading)
+		log.Debug("guessTagFromCustomType: could not guess underlying tag type %v", errorReading)
 		return n.Tag
 	}
 	guessedTag := dataBucket.Tag
-	log.Infof("im guessing the tag %v is a %v", n.Tag, guessedTag)
+	log.Info("im guessing the tag %v is a %v", n.Tag, guessedTag)
 	return guessedTag
 }
 
@@ -445,7 +445,7 @@ func (n *CandidateNode) UpdateFrom(other *CandidateNode, prefs assignPreferences
 }
 
 func (n *CandidateNode) UpdateAttributesFrom(other *CandidateNode, prefs assignPreferences) {
-	log.Debugf("UpdateAttributesFrom: n: %v other: %v", NodeToString(n), NodeToString(other))
+	log.Debug("UpdateAttributesFrom: n: %v other: %v", NodeToString(n), NodeToString(other))
 	if n.Kind != other.Kind {
 		// clear out the contents when switching to a different type
 		// e.g. map to array
@@ -465,9 +465,6 @@ func (n *CandidateNode) UpdateAttributesFrom(other *CandidateNode, prefs assignP
 		n.Anchor = other.Anchor
 	}
 
-	// Preserve EncodeSeparate flag for format-specific encoding hints
-	n.EncodeSeparate = other.EncodeSeparate
-
 	// merge will pickup the style of the new thing
 	// when autocreating nodes
 

pkg/yqlib/candidate_node_goccy_yaml.go

@@ -36,13 +36,13 @@ func (o *CandidateNode) UnmarshalGoccyYAML(node ast.Node, cm yaml.CommentMap, an
 					switch commentMapComment.Position {
 					case yaml.CommentHeadPosition:
 						o.HeadComment = comment.String()
-						log.Debugf("its a head comment %v", comment.String())
+						log.Debug("its a head comment %v", comment.String())
 					case yaml.CommentLinePosition:
 						o.LineComment = comment.String()
-						log.Debugf("its a line comment %v", comment.String())
+						log.Debug("its a line comment %v", comment.String())
 					case yaml.CommentFootPosition:
 						o.FootComment = comment.String()
-						log.Debugf("its a foot comment %v", comment.String())
+						log.Debug("its a foot comment %v", comment.String())
 					}
 				}
 			}
@@ -93,8 +93,8 @@ func (o *CandidateNode) UnmarshalGoccyYAML(node ast.Node, cm yaml.CommentMap, an
 			log.Debugf("folded Type %v", astLiteral.Start.Type)
 			o.Style = FoldedStyle
 		}
-		log.Debugf("start value: %v ", node.(*ast.LiteralNode).Start.Value)
-		log.Debugf("start value: %v ", node.(*ast.LiteralNode).Start.Type)
+		log.Debug("start value: %v ", node.(*ast.LiteralNode).Start.Value)
+		log.Debug("start value: %v ", node.(*ast.LiteralNode).Start.Type)
 		// TODO: here I could put the original value with line breaks
 		// to solve the multiline > problem
 		o.Value = astLiteral.Value.Value
@@ -187,7 +187,7 @@ func (o *CandidateNode) UnmarshalGoccyYAML(node ast.Node, cm yaml.CommentMap, an
 }
 
 func (o *CandidateNode) goccyProcessMappingValueNode(mappingEntry *ast.MappingValueNode, cm yaml.CommentMap, anchorMap map[string]*CandidateNode) error {
-	log.Debugf("UnmarshalYAML MAP KEY entry %v", mappingEntry.Key)
+	log.Debug("UnmarshalYAML MAP KEY entry %v", mappingEntry.Key)
 
 	// AddKeyValueFirst because it clones the nodes, and we want to have the real refs when Unmarshalling
 	// particularly for the anchorMap
@@ -197,7 +197,7 @@ func (o *CandidateNode) goccyProcessMappingValueNode(mappingEntry *ast.MappingVa
 		return err
 	}
 
-	log.Debugf("UnmarshalYAML MAP VALUE entry %v", mappingEntry.Value)
+	log.Debug("UnmarshalYAML MAP VALUE entry %v", mappingEntry.Value)
 	if err := valueNode.UnmarshalGoccyYAML(mappingEntry.Value, cm, anchorMap); err != nil {
 		return err
 	}

pkg/yqlib/candidate_node_yaml.go

@@ -55,13 +55,13 @@ func (o *CandidateNode) copyFromYamlNode(node *yaml.Node, anchorMap map[string]*
 
 	if o.Anchor != "" {
 		anchorMap[o.Anchor] = o
-		log.Debugf("set anchor %v to %v", o.Anchor, NodeToString(o))
+		log.Debug("set anchor %v to %v", o.Anchor, NodeToString(o))
 	}
 
 	// its a single alias
 	if node.Alias != nil && node.Alias.Anchor != "" {
 		o.Alias = anchorMap[node.Alias.Anchor]
-		log.Debugf("set alias to %v", NodeToString(anchorMap[node.Alias.Anchor]))
+		log.Debug("set alias to %v", NodeToString(anchorMap[node.Alias.Anchor]))
 	}
 	o.HeadComment = node.HeadComment
 	o.LineComment = node.LineComment
@@ -106,7 +106,7 @@ func (o *CandidateNode) UnmarshalYAML(node *yaml.Node, anchorMap map[string]*Can
 	log.Debugf("UnmarshalYAML %v", node.Tag)
 	switch node.Kind {
 	case yaml.AliasNode:
-		log.Debugf("UnmarshalYAML - alias from yaml: %v", o.Tag)
+		log.Debug("UnmarshalYAML - alias from yaml: %v", o.Tag)
 		o.Kind = AliasNode
 		o.copyFromYamlNode(node, anchorMap)
 		return nil
@@ -176,15 +176,15 @@ func (o *CandidateNode) UnmarshalYAML(node *yaml.Node, anchorMap map[string]*Can
 }
 
 func (o *CandidateNode) MarshalYAML() (*yaml.Node, error) {
-	log.Debugf("MarshalYAML to yaml: %v", o.Tag)
+	log.Debug("MarshalYAML to yaml: %v", o.Tag)
 	switch o.Kind {
 	case AliasNode:
-		log.Debugf("MarshalYAML - alias to yaml: %v", o.Tag)
+		log.Debug("MarshalYAML - alias to yaml: %v", o.Tag)
 		target := &yaml.Node{Kind: yaml.AliasNode}
 		o.copyToYamlNode(target)
 		return target, nil
 	case ScalarNode:
-		log.Debugf("MarshalYAML - scalar: %v", o.Value)
+		log.Debug("MarshalYAML - scalar: %v", o.Value)
 		target := &yaml.Node{Kind: yaml.ScalarNode}
 		o.copyToYamlNode(target)
 		return target, nil

pkg/yqlib/candidiate_node_json.go

@@ -120,7 +120,7 @@ func (o *CandidateNode) UnmarshalJSON(data []byte) error {
 	if err != nil {
 		return err
 	}
-	log.Debugf("UnmarshalJSON -  scalar is %v", scalar)
+	log.Debug("UnmarshalJSON -  scalar is %v", scalar)
 
 	return o.setScalarFromJson(scalar)
 

pkg/yqlib/chown_linux.go

@@ -18,7 +18,7 @@ func changeOwner(info fs.FileInfo, file *os.File) error {
 			// this happens with snap confinement
 			// not really a big issue as users can chown
 			// the file themselves if required.
-			log.Infof("Skipping chown: %v", err)
+			log.Info("Skipping chown: %v", err)
 		}
 	}
 	return nil

pkg/yqlib/context.go

@@ -3,8 +3,9 @@ package yqlib
 import (
 	"container/list"
 	"fmt"
-	"log/slog"
 	"time"
+
+	logging "gopkg.in/op/go-logging.v1"
 )
 
 type Context struct {
@@ -74,7 +75,7 @@ func (n *Context) ChildContext(results *list.List) Context {
 }
 
 func (n *Context) ToString() string {
-	if !log.IsEnabledFor(slog.LevelDebug) {
+	if !log.IsEnabledFor(logging.DEBUG) {
 		return ""
 	}
 	result := fmt.Sprintf("Context\nDontAutoCreate: %v\n", n.DontAutoCreate)

pkg/yqlib/context_test.go

@@ -2,11 +2,11 @@ package yqlib
 
 import (
 	"container/list"
-	"log/slog"
 	"strings"
 	"testing"
 
 	"github.com/mikefarah/yq/v4/test"
+	logging "gopkg.in/op/go-logging.v1"
 )
 
 func TestChildContext(t *testing.T) {
@@ -155,8 +155,8 @@ func TestToString(t *testing.T) {
 	test.AssertResultComplex(t, "", result)
 
 	// Test with debug logging enabled
-	GetLogger().SetLevel(slog.LevelDebug)
-	defer GetLogger().SetLevel(slog.LevelWarn) // Reset to default
+	logging.SetLevel(logging.DEBUG, "")
+	defer logging.SetLevel(logging.INFO, "") // Reset to default
 
 	result2 := context.ToString()
 	test.AssertResultComplex(t, true, len(result2) > 0)

pkg/yqlib/data_tree_navigator.go

@@ -2,7 +2,8 @@ package yqlib
 
 import (
 	"fmt"
-	"log/slog"
+
+	logging "gopkg.in/op/go-logging.v1"
 )
 
 type DataTreeNavigator interface {
@@ -54,7 +55,7 @@ func (d *dataTreeNavigator) GetMatchingNodes(context Context, expressionNode *Ex
 		return context, nil
 	}
 	log.Debugf("Processing Op: %v", expressionNode.Operation.toString())
-	if log.IsEnabledFor(slog.LevelDebug) {
+	if log.IsEnabledFor(logging.DEBUG) {
 		for el := context.MatchingNodes.Front(); el != nil; el = el.Next() {
 			log.Debug(NodeToString(el.Value.(*CandidateNode)))
 		}

pkg/yqlib/decoder_ini.go

@@ -16,7 +16,7 @@ type iniDecoder struct {
 
 func NewINIDecoder() Decoder {
 	return &iniDecoder{
-		finished: false, // Initialise the flag as false
+		finished: false, // Initialize the flag as false
 	}
 }
 

pkg/yqlib/decoder_test.go

@@ -68,7 +68,7 @@ func mustProcessFormatScenario(s formatScenario, decoder Decoder, encoder Encode
 
 	result, err := processFormatScenario(s, decoder, encoder)
 	if err != nil {
-		log.Errorf("Bad scenario %v: %v", s.description, err)
+		log.Error("Bad scenario %v: %w", s.description, err)
 		return fmt.Sprintf("Bad scenario %v: %v", s.description, err.Error())
 	}
 	return result

pkg/yqlib/decoder_toml.go

@@ -8,19 +8,16 @@ import (
 	"fmt"
 	"io"
 	"strconv"
-	"strings"
 	"time"
 
 	toml "github.com/pelletier/go-toml/v2/unstable"
 )
 
 type tomlDecoder struct {
-	parser           toml.Parser
-	finished         bool
-	d                DataTreeNavigator
-	rootMap          *CandidateNode
-	pendingComments  []string // Head comments collected from Comment nodes
-	firstContentSeen bool     // Track if we've processed the first non-comment node
+	parser   toml.Parser
+	finished bool
+	d        DataTreeNavigator
+	rootMap  *CandidateNode
 }
 
 func NewTomlDecoder() Decoder {
@@ -31,7 +28,7 @@ func NewTomlDecoder() Decoder {
 }
 
 func (dec *tomlDecoder) Init(reader io.Reader) error {
-	dec.parser = toml.Parser{KeepComments: true}
+	dec.parser = toml.Parser{}
 	buf := new(bytes.Buffer)
 	_, err := buf.ReadFrom(reader)
 	if err != nil {
@@ -42,24 +39,9 @@ func (dec *tomlDecoder) Init(reader io.Reader) error {
 		Kind: MappingNode,
 		Tag:  "!!map",
 	}
-	dec.pendingComments = make([]string, 0)
-	dec.firstContentSeen = false
-	dec.finished = false
 	return nil
 }
 
-func (dec *tomlDecoder) attachOrphanedCommentsToNode(tableNodeValue *CandidateNode) {
-	if len(dec.pendingComments) > 0 {
-		comments := strings.Join(dec.pendingComments, "\n")
-		if tableNodeValue.HeadComment == "" {
-			tableNodeValue.HeadComment = comments
-		} else {
-			tableNodeValue.HeadComment = tableNodeValue.HeadComment + "\n" + comments
-		}
-		dec.pendingComments = make([]string, 0)
-	}
-}
-
 func (dec *tomlDecoder) getFullPath(tomlNode *toml.Node) []interface{} {
 	path := make([]interface{}, 0)
 	for {
@@ -74,24 +56,13 @@ func (dec *tomlDecoder) getFullPath(tomlNode *toml.Node) []interface{} {
 func (dec *tomlDecoder) processKeyValueIntoMap(rootMap *CandidateNode, tomlNode *toml.Node) error {
 	value := tomlNode.Value()
 	path := dec.getFullPath(value.Next())
+	log.Debug("processKeyValueIntoMap: %v", path)
 
 	valueNode, err := dec.decodeNode(value)
 	if err != nil {
 		return err
 	}
 
-	// Attach pending head comments
-	if len(dec.pendingComments) > 0 {
-		valueNode.HeadComment = strings.Join(dec.pendingComments, "\n")
-		dec.pendingComments = make([]string, 0)
-	}
-
-	// Check for inline comment chained to the KeyValue node
-	nextNode := tomlNode.Next()
-	if nextNode != nil && nextNode.Kind == toml.Comment {
-		valueNode.LineComment = string(nextNode.Data)
-	}
-
 	context := Context{}
 	context = context.SingleChildContext(rootMap)
 
@@ -106,19 +77,15 @@ func (dec *tomlDecoder) decodeKeyValuesIntoMap(rootMap *CandidateNode, tomlNode
 
 	for dec.parser.NextExpression() {
 		nextItem := dec.parser.Expression()
-		log.Debugf("decodeKeyValuesIntoMap -- next exp, its a %v", nextItem.Kind)
+		log.Debug("decodeKeyValuesIntoMap -- next exp, its a %v", nextItem.Kind)
 
-		switch nextItem.Kind {
-		case toml.KeyValue:
+		if nextItem.Kind == toml.KeyValue {
 			if err := dec.processKeyValueIntoMap(rootMap, nextItem); err != nil {
 				return false, err
 			}
-		case toml.Comment:
-			// Standalone comment - add to pending for next element
-			dec.pendingComments = append(dec.pendingComments, string(nextItem.Data))
-		default:
+		} else {
 			// run out of key values
-			log.Debugf("done in decodeKeyValuesIntoMap, gota a %v", nextItem.Kind)
+			log.Debug("done in decodeKeyValuesIntoMap, gota a %v", nextItem.Kind)
 			return true, nil
 		}
 	}
@@ -158,30 +125,13 @@ func (dec *tomlDecoder) createInlineTableMap(tomlNode *toml.Node) (*CandidateNod
 
 func (dec *tomlDecoder) createArray(tomlNode *toml.Node) (*CandidateNode, error) {
 	content := make([]*CandidateNode, 0)
-	var pendingArrayComments []string
-
 	iterator := tomlNode.Children()
 	for iterator.Next() {
 		child := iterator.Node()
-
-		// Handle comments within arrays
-		if child.Kind == toml.Comment {
-			// Collect comments to attach to the next array element
-			pendingArrayComments = append(pendingArrayComments, string(child.Data))
-			continue
-		}
-
 		yamlNode, err := dec.decodeNode(child)
 		if err != nil {
 			return nil, err
 		}
-
-		// Attach any pending comments to this array element
-		if len(pendingArrayComments) > 0 {
-			yamlNode.HeadComment = strings.Join(pendingArrayComments, "\n")
-			pendingArrayComments = make([]string, 0)
-		}
-
 		content = append(content, yamlNode)
 	}
 
@@ -271,7 +221,7 @@ func (dec *tomlDecoder) Decode() (*CandidateNode, error) {
 
 		currentNode := dec.parser.Expression()
 
-		log.Debugf("currentNode: %v ", currentNode.Kind)
+		log.Debug("currentNode: %v ", currentNode.Kind)
 		runAgainstCurrentExp, err = dec.processTopLevelNode(currentNode)
 		if err != nil {
 			return dec.rootMap, err
@@ -298,43 +248,24 @@ func (dec *tomlDecoder) Decode() (*CandidateNode, error) {
 func (dec *tomlDecoder) processTopLevelNode(currentNode *toml.Node) (bool, error) {
 	var runAgainstCurrentExp bool
 	var err error
-	log.Debugf("processTopLevelNode: Going to process %v state is current %v", currentNode.Kind, NodeToString(dec.rootMap))
+	log.Debug("processTopLevelNode: Going to process %v state is current %v", currentNode.Kind, NodeToString(dec.rootMap))
 	switch currentNode.Kind {
-	case toml.Comment:
-		// Collect comment to attach to next element
-		commentText := string(currentNode.Data)
-		// If we haven't seen any content yet, accumulate comments for root
-		if !dec.firstContentSeen {
-			if dec.rootMap.HeadComment == "" {
-				dec.rootMap.HeadComment = commentText
-			} else {
-				dec.rootMap.HeadComment = dec.rootMap.HeadComment + "\n" + commentText
-			}
-		} else {
-			// We've seen content, so these comments are for the next element
-			dec.pendingComments = append(dec.pendingComments, commentText)
-		}
-		return false, nil
 	case toml.Table:
-		dec.firstContentSeen = true
 		runAgainstCurrentExp, err = dec.processTable(currentNode)
 	case toml.ArrayTable:
-		dec.firstContentSeen = true
 		runAgainstCurrentExp, err = dec.processArrayTable(currentNode)
 	default:
-		dec.firstContentSeen = true
 		runAgainstCurrentExp, err = dec.decodeKeyValuesIntoMap(dec.rootMap, currentNode)
 	}
 
-	log.Debugf("processTopLevelNode: DONE Processing state is now %v", NodeToString(dec.rootMap))
+	log.Debug("processTopLevelNode: DONE Processing state is now %v", NodeToString(dec.rootMap))
 	return runAgainstCurrentExp, err
 }
 
 func (dec *tomlDecoder) processTable(currentNode *toml.Node) (bool, error) {
 	log.Debug("Enter processTable")
-	child := currentNode.Child()
-	fullPath := dec.getFullPath(child)
-	log.Debugf("fullpath: %v", fullPath)
+	fullPath := dec.getFullPath(currentNode.Child())
+	log.Debug("fullpath: %v", fullPath)
 
 	c := Context{}
 	c = c.SingleChildContext(dec.rootMap)
@@ -345,53 +276,27 @@ func (dec *tomlDecoder) processTable(currentNode *toml.Node) (bool, error) {
 	}
 
 	tableNodeValue := &CandidateNode{
-		Kind:           MappingNode,
-		Tag:            "!!map",
-		Content:        make([]*CandidateNode, 0),
-		EncodeSeparate: true,
-	}
-
-	// Attach pending head comments to the table
-	if len(dec.pendingComments) > 0 {
-		tableNodeValue.HeadComment = strings.Join(dec.pendingComments, "\n")
-		dec.pendingComments = make([]string, 0)
+		Kind:    MappingNode,
+		Tag:     "!!map",
+		Content: make([]*CandidateNode, 0),
 	}
 
 	var tableValue *toml.Node
 	runAgainstCurrentExp := false
-	sawKeyValue := false
-	for dec.parser.NextExpression() {
+	hasValue := dec.parser.NextExpression()
+	// check to see if there is any table data
+	if hasValue {
 		tableValue = dec.parser.Expression()
-		// Allow standalone comments inside the table before the first key-value.
-		// These should be associated with the next element in the table (usually the first key-value),
-		// not treated as "end of table" (which would cause subsequent key-values to be parsed at root).
-		if tableValue.Kind == toml.Comment {
-			dec.pendingComments = append(dec.pendingComments, string(tableValue.Data))
-			continue
-		}
-
-		// next expression is not table data, so we are done (but we need to re-process it at top-level)
+		// next expression is not table data, so we are done
 		if tableValue.Kind != toml.KeyValue {
-			log.Debug("got an empty table (or reached next section)")
-			// If the table had only comments, attach them to the table itself so they don't leak to the next node.
-			if !sawKeyValue {
-				dec.attachOrphanedCommentsToNode(tableNodeValue)
-			}
+			log.Debug("got an empty table")
 			runAgainstCurrentExp = true
-			break
+		} else {
+			runAgainstCurrentExp, err = dec.decodeKeyValuesIntoMap(tableNodeValue, tableValue)
+			if err != nil && !errors.Is(err, io.EOF) {
+				return false, err
+			}
 		}
-
-		sawKeyValue = true
-		runAgainstCurrentExp, err = dec.decodeKeyValuesIntoMap(tableNodeValue, tableValue)
-		if err != nil && !errors.Is(err, io.EOF) {
-			return false, err
-		}
-		break
-	}
-	// If we hit EOF after only seeing comments inside this table, attach them to the table itself
-	// so they don't leak to whatever comes next.
-	if !sawKeyValue {
-		dec.attachOrphanedCommentsToNode(tableNodeValue)
 	}
 
 	err = dec.d.DeeplyAssign(c, fullPath, tableNodeValue)
@@ -402,7 +307,7 @@ func (dec *tomlDecoder) processTable(currentNode *toml.Node) (bool, error) {
 }
 
 func (dec *tomlDecoder) arrayAppend(context Context, path []interface{}, rhsNode *CandidateNode) error {
-	log.Debugf("arrayAppend to path: %v,%v", path, NodeToString(rhsNode))
+	log.Debug("arrayAppend to path: %v,%v", path, NodeToString(rhsNode))
 	rhsCandidateNode := &CandidateNode{
 		Kind:    SequenceNode,
 		Tag:     "!!seq",
@@ -425,9 +330,8 @@ func (dec *tomlDecoder) arrayAppend(context Context, path []interface{}, rhsNode
 
 func (dec *tomlDecoder) processArrayTable(currentNode *toml.Node) (bool, error) {
 	log.Debug("Enter processArrayTable")
-	child := currentNode.Child()
-	fullPath := dec.getFullPath(child)
-	log.Debugf("Fullpath: %v", fullPath)
+	fullPath := dec.getFullPath(currentNode.Child())
+	log.Debug("Fullpath: %v", fullPath)
 
 	c := Context{}
 	c = c.SingleChildContext(dec.rootMap)
@@ -442,64 +346,23 @@ func (dec *tomlDecoder) processArrayTable(currentNode *toml.Node) (bool, error)
 	hasValue := dec.parser.NextExpression()
 
 	tableNodeValue := &CandidateNode{
-		Kind:           MappingNode,
-		Tag:            "!!map",
-		EncodeSeparate: true,
+		Kind: MappingNode,
+		Tag:  "!!map",
 	}
-
-	// Attach pending head comments to the array table
-	if len(dec.pendingComments) > 0 {
-		tableNodeValue.HeadComment = strings.Join(dec.pendingComments, "\n")
-		dec.pendingComments = make([]string, 0)
-	}
-
 	runAgainstCurrentExp := false
-	sawKeyValue := false
-	if hasValue {
-		for {
-			exp := dec.parser.Expression()
-			// Allow standalone comments inside array tables before the first key-value.
-			if exp.Kind == toml.Comment {
-				dec.pendingComments = append(dec.pendingComments, string(exp.Data))
-				hasValue = dec.parser.NextExpression()
-				if !hasValue {
-					break
-				}
-				continue
-			}
-
-			// if the next value is a ArrayTable or Table, then its not part of this declaration (not a key value pair)
-			// so lets leave that expression for the next round of parsing
-			if exp.Kind == toml.ArrayTable || exp.Kind == toml.Table {
-				// If this array-table entry had only comments, attach them to the entry so they don't leak.
-				if !sawKeyValue {
-					dec.attachOrphanedCommentsToNode(tableNodeValue)
-				}
-				runAgainstCurrentExp = true
-				break
-			}
-
-			sawKeyValue = true
-			// otherwise, if there is a value, it must be some key value pairs of the
-			// first object in the array!
-			runAgainstCurrentExp, err = dec.decodeKeyValuesIntoMap(tableNodeValue, exp)
-			if err != nil && !errors.Is(err, io.EOF) {
-				return false, err
-			}
-			break
+	// if the next value is a ArrayTable or Table, then its not part of this declaration (not a key value pair)
+	// so lets leave that expression for the next round of parsing
+	if hasValue && (dec.parser.Expression().Kind == toml.ArrayTable || dec.parser.Expression().Kind == toml.Table) {
+		runAgainstCurrentExp = true
+	} else if hasValue {
+		// otherwise, if there is a value, it must be some key value pairs of the
+		// first object in the array!
+		tableValue := dec.parser.Expression()
+		runAgainstCurrentExp, err = dec.decodeKeyValuesIntoMap(tableNodeValue, tableValue)
+		if err != nil && !errors.Is(err, io.EOF) {
+			return false, err
 		}
 	}
-	// If we hit EOF after only seeing comments inside this array-table entry, attach them to the entry
-	// so they don't leak to whatever comes next.
-	if !sawKeyValue && len(dec.pendingComments) > 0 {
-		comments := strings.Join(dec.pendingComments, "\n")
-		if tableNodeValue.HeadComment == "" {
-			tableNodeValue.HeadComment = comments
-		} else {
-			tableNodeValue.HeadComment = tableNodeValue.HeadComment + "\n" + comments
-		}
-		dec.pendingComments = make([]string, 0)
-	}
 
 	// += function
 	err = dec.arrayAppend(c, fullPath, tableNodeValue)
@@ -512,42 +375,23 @@ func (dec *tomlDecoder) processArrayTable(currentNode *toml.Node) (bool, error)
 // Because TOML. So we'll inject the last index into the path.
 
 func getPathToUse(fullPath []interface{}, dec *tomlDecoder, c Context) ([]interface{}, error) {
-	// We need to check the entire path (except the last element), not just the immediate parent,
-	// because we may have nested array tables like [[array.subarray.subsubarray]]
-	// where both 'array' and 'subarray' are arrays that already exist.
-
-	if len(fullPath) == 0 {
-		return fullPath, nil
+	pathToCheck := fullPath
+	if len(fullPath) >= 1 {
+		pathToCheck = fullPath[:len(fullPath)-1]
 	}
+	readOp := createTraversalTree(pathToCheck, traversePreferences{DontAutoCreate: true}, false)
 
-	resultPath := make([]interface{}, 0, len(fullPath)*2) // preallocate with extra space for indices
-
-	// Process all segments except the last one
-	for i := 0; i < len(fullPath)-1; i++ {
-		resultPath = append(resultPath, fullPath[i])
-
-		// Check if the current path segment points to an array
-		readOp := createTraversalTree(resultPath, traversePreferences{DontAutoCreate: true}, false)
-		resultContext, err := dec.d.GetMatchingNodes(c, readOp)
-		if err != nil {
-			return nil, err
-		}
-
-		if resultContext.MatchingNodes.Len() >= 1 {
-			match := resultContext.MatchingNodes.Front().Value.(*CandidateNode)
-			// If this segment points to an array, we need to add the last index
-			// before continuing with the rest of the path
-			if match.Kind == SequenceNode && len(match.Content) > 0 {
-				lastIndex := len(match.Content) - 1
-				resultPath = append(resultPath, lastIndex)
-				log.Debugf("Path segment %v is an array, injecting index %d", resultPath[:len(resultPath)-1], lastIndex)
-			}
+	resultContext, err := dec.d.GetMatchingNodes(c, readOp)
+	if err != nil {
+		return nil, err
+	}
+	if resultContext.MatchingNodes.Len() >= 1 {
+		match := resultContext.MatchingNodes.Front().Value.(*CandidateNode)
+		// path refers to an array, we need to add this to the last element in the array
+		if match.Kind == SequenceNode {
+			fullPath = append(pathToCheck, len(match.Content)-1, fullPath[len(fullPath)-1])
+			log.Debugf("Adding to end of %v array, using path: %v", pathToCheck, fullPath)
 		}
 	}
-
-	// Add the last segment
-	resultPath = append(resultPath, fullPath[len(fullPath)-1])
-
-	log.Debugf("getPathToUse: original path %v -> result path %v", fullPath, resultPath)
-	return resultPath, nil
+	return fullPath, err
 }

pkg/yqlib/decoder_uri_test.go

@@ -1,160 +0,0 @@
-//go:build !yq_nouri
-
-package yqlib
-
-import (
-	"io"
-	"strings"
-	"testing"
-
-	"github.com/mikefarah/yq/v4/test"
-)
-
-func TestUriDecoder_Init(t *testing.T) {
-	decoder := NewUriDecoder()
-	reader := strings.NewReader("test")
-	err := decoder.Init(reader)
-	test.AssertResult(t, nil, err)
-}
-
-func TestUriDecoder_DecodeSimpleString(t *testing.T) {
-	decoder := NewUriDecoder()
-	reader := strings.NewReader("hello%20world")
-	err := decoder.Init(reader)
-	test.AssertResult(t, nil, err)
-
-	node, err := decoder.Decode()
-	test.AssertResult(t, nil, err)
-	test.AssertResult(t, "!!str", node.Tag)
-	test.AssertResult(t, "hello world", node.Value)
-}
-
-func TestUriDecoder_DecodeSpecialCharacters(t *testing.T) {
-	decoder := NewUriDecoder()
-	reader := strings.NewReader("hello%21%40%23%24%25")
-	err := decoder.Init(reader)
-	test.AssertResult(t, nil, err)
-
-	node, err := decoder.Decode()
-	test.AssertResult(t, nil, err)
-	test.AssertResult(t, "hello!@#$%", node.Value)
-}
-
-func TestUriDecoder_DecodeUTF8(t *testing.T) {
-	decoder := NewUriDecoder()
-	reader := strings.NewReader("%E2%9C%93%20check")
-	err := decoder.Init(reader)
-	test.AssertResult(t, nil, err)
-
-	node, err := decoder.Decode()
-	test.AssertResult(t, nil, err)
-	test.AssertResult(t, "✓ check", node.Value)
-}
-
-func TestUriDecoder_DecodePlusSign(t *testing.T) {
-	decoder := NewUriDecoder()
-	reader := strings.NewReader("a+b")
-	err := decoder.Init(reader)
-	test.AssertResult(t, nil, err)
-
-	node, err := decoder.Decode()
-	test.AssertResult(t, nil, err)
-	// Note: url.QueryUnescape does NOT convert + to space
-	// That's only for form encoding (url.ParseQuery)
-	test.AssertResult(t, "a b", node.Value)
-}
-
-func TestUriDecoder_DecodeEmptyString(t *testing.T) {
-	decoder := NewUriDecoder()
-	reader := strings.NewReader("")
-	err := decoder.Init(reader)
-	test.AssertResult(t, nil, err)
-
-	node, err := decoder.Decode()
-	test.AssertResult(t, nil, err)
-	test.AssertResult(t, "", node.Value)
-
-	// Second decode should return EOF
-	node, err = decoder.Decode()
-	test.AssertResult(t, io.EOF, err)
-	test.AssertResult(t, (*CandidateNode)(nil), node)
-}
-
-func TestUriDecoder_DecodeMultipleCalls(t *testing.T) {
-	decoder := NewUriDecoder()
-	reader := strings.NewReader("test")
-	err := decoder.Init(reader)
-	test.AssertResult(t, nil, err)
-
-	// First decode
-	node, err := decoder.Decode()
-	test.AssertResult(t, nil, err)
-	test.AssertResult(t, "test", node.Value)
-
-	// Second decode should return EOF since we've consumed all input
-	node, err = decoder.Decode()
-	test.AssertResult(t, io.EOF, err)
-	test.AssertResult(t, (*CandidateNode)(nil), node)
-}
-
-func TestUriDecoder_DecodeInvalidEscape(t *testing.T) {
-	decoder := NewUriDecoder()
-	reader := strings.NewReader("test%ZZ")
-	err := decoder.Init(reader)
-	test.AssertResult(t, nil, err)
-
-	_, err = decoder.Decode()
-	// Should return an error for invalid escape sequence
-	if err == nil {
-		t.Error("Expected error for invalid escape sequence, got nil")
-	}
-}
-
-func TestUriDecoder_DecodeSlashAndQuery(t *testing.T) {
-	decoder := NewUriDecoder()
-	reader := strings.NewReader("path%2Fto%2Ffile%3Fquery%3Dvalue")
-	err := decoder.Init(reader)
-	test.AssertResult(t, nil, err)
-
-	node, err := decoder.Decode()
-	test.AssertResult(t, nil, err)
-	test.AssertResult(t, "path/to/file?query=value", node.Value)
-}
-
-func TestUriDecoder_DecodePercent(t *testing.T) {
-	decoder := NewUriDecoder()
-	reader := strings.NewReader("100%25")
-	err := decoder.Init(reader)
-	test.AssertResult(t, nil, err)
-
-	node, err := decoder.Decode()
-	test.AssertResult(t, nil, err)
-	test.AssertResult(t, "100%", node.Value)
-}
-
-func TestUriDecoder_DecodeNoEscaping(t *testing.T) {
-	decoder := NewUriDecoder()
-	reader := strings.NewReader("simple_text-123")
-	err := decoder.Init(reader)
-	test.AssertResult(t, nil, err)
-
-	node, err := decoder.Decode()
-	test.AssertResult(t, nil, err)
-	test.AssertResult(t, "simple_text-123", node.Value)
-}
-
-// Mock reader that returns an error
-type errorReader struct{}
-
-func (e *errorReader) Read(_ []byte) (n int, err error) {
-	return 0, io.ErrUnexpectedEOF
-}
-
-func TestUriDecoder_DecodeReadError(t *testing.T) {
-	decoder := NewUriDecoder()
-	err := decoder.Init(&errorReader{})
-	test.AssertResult(t, nil, err)
-
-	_, err = decoder.Decode()
-	test.AssertResult(t, io.ErrUnexpectedEOF, err)
-}

pkg/yqlib/decoder_xml.go

@@ -64,7 +64,7 @@ func (dec *xmlDecoder) processComment(c string) string {
 }
 
 func (dec *xmlDecoder) createMap(n *xmlNode) (*CandidateNode, error) {
-	log.Debugf("createMap: headC: %v, lineC: %v, footC: %v", n.HeadComment, n.LineComment, n.FootComment)
+	log.Debug("createMap: headC: %v, lineC: %v, footC: %v", n.HeadComment, n.LineComment, n.FootComment)
 	yamlNode := &CandidateNode{Kind: MappingNode, Tag: "!!map"}
 
 	if len(n.Data) > 0 {
@@ -92,7 +92,7 @@ func (dec *xmlDecoder) createMap(n *xmlNode) (*CandidateNode, error) {
 		log.Debugf("label=%v, i=%v, keyValuePair.FootComment: %v", label, i, keyValuePair.FootComment)
 		labelNode.FootComment = dec.processComment(keyValuePair.FootComment)
 
-		log.Debugf("len of children in %v is %v", label, len(children))
+		log.Debug("len of children in %v is %v", label, len(children))
 		if len(children) > 1 {
 			valueNode, err = dec.createSequence(children)
 			if err != nil {
@@ -105,7 +105,7 @@ func (dec *xmlDecoder) createMap(n *xmlNode) (*CandidateNode, error) {
 			if len(children[0].Children) == 0 && children[0].HeadComment != "" {
 				if len(children[0].Data) > 0 {
 
-					log.Debugf("scalar comment hack, currentlabel [%v]", labelNode.HeadComment)
+					log.Debug("scalar comment hack, currentlabel [%v]", labelNode.HeadComment)
 					labelNode.HeadComment = joinComments([]string{labelNode.HeadComment, strings.TrimSpace(children[0].HeadComment)}, "\n")
 					children[0].HeadComment = ""
 				} else {
@@ -151,7 +151,7 @@ func (dec *xmlDecoder) convertToYamlNode(n *xmlNode) (*CandidateNode, error) {
 
 	scalar := dec.createValueNodeFromData(n.Data)
 
-	log.Debugf("scalar (%v), headC: %v, lineC: %v, footC: %v", scalar.Tag, n.HeadComment, n.LineComment, n.FootComment)
+	log.Debug("scalar (%v), headC: %v, lineC: %v, footC: %v", scalar.Tag, n.HeadComment, n.LineComment, n.FootComment)
 	scalar.HeadComment = dec.processComment(n.HeadComment)
 	scalar.LineComment = dec.processComment(n.LineComment)
 	if scalar.Tag == "!!seq" {
@@ -211,17 +211,17 @@ func (n *xmlNode) AddChild(s string, c *xmlNode) {
 	if n.Children == nil {
 		n.Children = make([]*xmlChildrenKv, 0)
 	}
-	log.Debugf("looking for %s", s)
+	log.Debug("looking for %s", s)
 	// see if we can find an existing entry to add to
 	for _, childEntry := range n.Children {
 		if childEntry.K == s {
-			log.Debugf("found it, appending an entry%s", s)
+			log.Debug("found it, appending an entry%s", s)
 			childEntry.V = append(childEntry.V, c)
-			log.Debugf("yay len of children in %v is %v", s, len(childEntry.V))
+			log.Debug("yay len of children in %v is %v", s, len(childEntry.V))
 			return
 		}
 	}
-	log.Debugf("not there, making a new one %s", s)
+	log.Debug("not there, making a new one %s", s)
 	n.Children = append(n.Children, &xmlChildrenKv{K: s, V: []*xmlNode{c}})
 }
 
@@ -267,7 +267,7 @@ func (dec *xmlDecoder) decodeXML(root *xmlNode) error {
 
 		switch se := t.(type) {
 		case xml.StartElement:
-			log.Debugf("start element %v", se.Name.Local)
+			log.Debug("start element %v", se.Name.Local)
 			elem.state = "started"
 			// Build new a new current element and link it to its parent
 			var label = se.Name.Local
@@ -302,14 +302,14 @@ func (dec *xmlDecoder) decodeXML(root *xmlNode) error {
 			if len(newBit) > 0 {
 				elem.n.Data = append(elem.n.Data, newBit)
 				elem.state = "chardata"
-				log.Debugf("chardata [%v] for %v", elem.n.Data, elem.label)
+				log.Debug("chardata [%v] for %v", elem.n.Data, elem.label)
 			}
 		case xml.EndElement:
 			if elem == nil {
 				log.Debug("no element, probably bad xml")
 				continue
 			}
-			log.Debugf("end element %v", elem.label)
+			log.Debug("end element %v", elem.label)
 			elem.state = "finished"
 			// And add it to its parent list
 			if elem.parent != nil {
@@ -326,10 +326,10 @@ func (dec *xmlDecoder) decodeXML(root *xmlNode) error {
 				applyFootComment(elem, commentStr)
 
 			case "chardata":
-				log.Debugf("got a line comment for (%v) %v: [%v]", elem.state, elem.label, commentStr)
+				log.Debug("got a line comment for (%v) %v: [%v]", elem.state, elem.label, commentStr)
 				elem.n.LineComment = joinComments([]string{elem.n.LineComment, commentStr}, " ")
 			default:
-				log.Debugf("got a head comment for (%v) %v: [%v]", elem.state, elem.label, commentStr)
+				log.Debug("got a head comment for (%v) %v: [%v]", elem.state, elem.label, commentStr)
 				elem.n.HeadComment = joinComments([]string{elem.n.HeadComment, commentStr}, " ")
 			}
 
@@ -354,7 +354,7 @@ func applyFootComment(elem *element, commentStr string) {
 	if len(elem.n.Children) > 0 {
 		lastChildIndex := len(elem.n.Children) - 1
 		childKv := elem.n.Children[lastChildIndex]
-		log.Debugf("got a foot comment, putting on last child for %v: [%v]", childKv.K, commentStr)
+		log.Debug("got a foot comment, putting on last child for %v: [%v]", childKv.K, commentStr)
 		// if it's an array of scalars, put the foot comment on the scalar itself
 		if len(childKv.V) > 0 && len(childKv.V[0].Children) == 0 {
 			nodeToUpdate := childKv.V[len(childKv.V)-1]
@@ -363,7 +363,7 @@ func applyFootComment(elem *element, commentStr string) {
 			childKv.FootComment = joinComments([]string{elem.n.FootComment, commentStr}, " ")
 		}
 	} else {
-		log.Debugf("got a foot comment for %v: [%v]", elem.label, commentStr)
+		log.Debug("got a foot comment for %v: [%v]", elem.label, commentStr)
 		elem.n.FootComment = joinComments([]string{elem.n.FootComment, commentStr}, " ")
 	}
 }

pkg/yqlib/decoder_yaml.go

@@ -78,7 +78,7 @@ func (dec *yamlDecoder) processReadStream(reader *bufio.Reader) (io.Reader, stri
 		if separatorPrefixRe.MatchString(line) {
 			match := separatorPrefixRe.FindString(line)
 			remainder := line[len(match):]
-			// normalise separator newline: if original had none, default to LF
+			// normalize separator newline: if original had none, default to LF
 			sepNewline := newline
 			if sepNewline == "" {
 				sepNewline = "\n"

pkg/yqlib/doc/operators/anchor-and-alias-operators.md

@@ -22,7 +22,7 @@ see https://yaml.org/type/merge.html
 
 Given a sample.yml file of:
 ```yaml
-- &CENTRE
+- &CENTER
   x: 1
   y: 2
 - &LEFT
@@ -32,7 +32,7 @@ Given a sample.yml file of:
   r: 10
 - &SMALL
   r: 1
-- !!merge <<: *CENTRE
+- !!merge <<: *CENTER
   r: 10
 ```
 then
@@ -288,7 +288,7 @@ see https://yaml.org/type/merge.html. This has the correct data, but the wrong k
 
 Given a sample.yml file of:
 ```yaml
-- &CENTRE
+- &CENTER
   x: 1
   y: 2
 - &LEFT
@@ -299,7 +299,7 @@ Given a sample.yml file of:
 - &SMALL
   r: 1
 - !!merge <<:
-    - *CENTRE
+    - *CENTER
     - *BIG
 ```
 then
@@ -318,7 +318,7 @@ see https://yaml.org/type/merge.html. This has the correct data, but the wrong k
 
 Given a sample.yml file of:
 ```yaml
-- &CENTRE
+- &CENTER
   x: 1
   y: 2
 - &LEFT
@@ -401,7 +401,7 @@ Taken from https://yaml.org/type/merge.html. Same values as legacy, but with the
 
 Given a sample.yml file of:
 ```yaml
-- &CENTRE
+- &CENTER
   x: 1
   y: 2
 - &LEFT
@@ -412,7 +412,7 @@ Given a sample.yml file of:
 - &SMALL
   r: 1
 - !!merge <<:
-    - *CENTRE
+    - *CENTER
     - *BIG
 ```
 then
@@ -432,7 +432,7 @@ Taken from https://yaml.org/type/merge.html. Same values as legacy, but with the
 
 Given a sample.yml file of:
 ```yaml
-- &CENTRE
+- &CENTER
   x: 1
   y: 2
 - &LEFT

pkg/yqlib/doc/operators/datetime.md

@@ -2,7 +2,7 @@
 
 Various operators for parsing and manipulating dates. 
 
-## Date time formatting
+## Date time formattings
 This uses Golang's built in time library for parsing and formatting date times.
 
 When not specified, the RFC3339 standard is assumed `2006-01-02T15:04:05Z07:00` for parsing.

pkg/yqlib/doc/operators/headers/datetime.md

@@ -2,7 +2,7 @@
 
 Various operators for parsing and manipulating dates. 
 
-## Date time formatting
+## Date time formattings
 This uses Golang's built in time library for parsing and formatting date times.
 
 When not specified, the RFC3339 standard is assumed `2006-01-02T15:04:05Z07:00` for parsing.

pkg/yqlib/doc/operators/parent.md

@@ -79,46 +79,6 @@ will output
       c: cat
 ```
 
-## Get the top (root) parent
-Use negative numbers to get the top parents. You can think of this as indexing into the 'parents' array above
-
-Given a sample.yml file of:
-```yaml
-a:
-  b:
-    c: cat
-```
-then
-```bash
-yq '.a.b.c | parent(-1)' sample.yml
-```
-will output
-```yaml
-a:
-  b:
-    c: cat
-```
-
-## Root
-Alias for parent(-1), returns the top level parent. This is usually the document node.
-
-Given a sample.yml file of:
-```yaml
-a:
-  b:
-    c: cat
-```
-then
-```bash
-yq '.a.b.c | root' sample.yml
-```
-will output
-```yaml
-a:
-  b:
-    c: cat
-```
-
 ## N-th parent
 You can optionally supply the number of levels to go up for the parent, the default being 1.
 
@@ -156,25 +116,6 @@ a:
     c: cat
 ```
 
-## N-th negative
-Similarly, use negative numbers to index backwards from the parents array
-
-Given a sample.yml file of:
-```yaml
-a:
-  b:
-    c: cat
-```
-then
-```bash
-yq '.a.b.c | parent(-2)' sample.yml
-```
-will output
-```yaml
-b:
-  c: cat
-```
-
 ## No parent
 Given a sample.yml file of:
 ```yaml

pkg/yqlib/doc/usage/hcl.md

@@ -7,7 +7,7 @@ HCL is commonly used in HashiCorp tools like Terraform for configuration files.
 - String interpolation and expressions (preserved without quotes)
 - Comments (leading, head, and line comments)
 - Nested structures (maps and lists)
-- Syntax colorisation when enabled
+- Syntax colorization when enabled
 
 
 ## Parse HCL

pkg/yqlib/doc/usage/headers/hcl.md

@@ -7,5 +7,5 @@ HCL is commonly used in HashiCorp tools like Terraform for configuration files.
 - String interpolation and expressions (preserved without quotes)
 - Comments (leading, head, and line comments)
 - Nested structures (maps and lists)
-- Syntax colorisation when enabled
+- Syntax colorization when enabled
 

pkg/yqlib/doc/usage/headers/kyaml.md

@@ -1,9 +0,0 @@
-# KYaml
-
-Encode and decode to and from KYaml (a restricted subset of YAML that uses flow-style collections).
-
-KYaml is useful when you want YAML data rendered in a compact, JSON-like form while still supporting YAML features like comments.
-
-Notes:
-- Strings are always double-quoted in KYaml output.
-- Anchors and aliases are expanded (KYaml output does not emit them).

pkg/yqlib/doc/usage/kyaml.md

@@ -1,253 +0,0 @@
-# KYaml
-
-Encode and decode to and from KYaml (a restricted subset of YAML that uses flow-style collections).
-
-KYaml is useful when you want YAML data rendered in a compact, JSON-like form while still supporting YAML features like comments.
-
-Notes:
-- Strings are always double-quoted in KYaml output.
-- Anchors and aliases are expanded (KYaml output does not emit them).
-
-## Encode kyaml: plain string scalar
-Strings are always double-quoted in KYaml output.
-
-Given a sample.yml file of:
-```yaml
-cat
-
-```
-then
-```bash
-yq -o=kyaml '.' sample.yml
-```
-will output
-```yaml
-"cat"
-```
-
-## encode flow mapping and sequence
-Given a sample.yml file of:
-```yaml
-a: b
-c:
-  - d
-
-```
-then
-```bash
-yq -o=kyaml '.' sample.yml
-```
-will output
-```yaml
-{
-  a: "b",
-  c: [
-    "d",
-  ],
-}
-```
-
-## encode non-string scalars
-Given a sample.yml file of:
-```yaml
-a: 12
-b: true
-c: null
-d: "true"
-
-```
-then
-```bash
-yq -o=kyaml '.' sample.yml
-```
-will output
-```yaml
-{
-  a: 12,
-  b: true,
-  c: null,
-  d: "true",
-}
-```
-
-## quote non-identifier keys
-Given a sample.yml file of:
-```yaml
-"1a": b
-"has space": c
-
-```
-then
-```bash
-yq -o=kyaml '.' sample.yml
-```
-will output
-```yaml
-{
-  "1a": "b",
-  "has space": "c",
-}
-```
-
-## escape quoted strings
-Given a sample.yml file of:
-```yaml
-a: "line1\nline2\t\"q\""
-
-```
-then
-```bash
-yq -o=kyaml '.' sample.yml
-```
-will output
-```yaml
-{
-  a: "line1\nline2\t\"q\"",
-}
-```
-
-## preserve comments when encoding
-Given a sample.yml file of:
-```yaml
-# leading
-a: 1 # a line
-# head b
-b: 2
-c:
-  # head d
-  - d # d line
-  - e
-# trailing
-
-```
-then
-```bash
-yq -o=kyaml '.' sample.yml
-```
-will output
-```yaml
-# leading
-{
-  a: 1, # a line
-  # head b
-  b: 2,
-  c: [
-    # head d
-    "d", # d line
-    "e",
-  ],
-  # trailing
-}
-```
-
-## Encode kyaml: anchors and aliases
-KYaml output does not support anchors/aliases; they are expanded to concrete values.
-
-Given a sample.yml file of:
-```yaml
-base: &base
-  a: b
-copy: *base
-
-```
-then
-```bash
-yq -o=kyaml '.' sample.yml
-```
-will output
-```yaml
-{
-  base: {
-    a: "b",
-  },
-  copy: {
-    a: "b",
-  },
-}
-```
-
-## Encode kyaml: yaml to kyaml shows formatting differences
-KYaml uses flow-style collections (braces/brackets) and explicit commas.
-
-Given a sample.yml file of:
-```yaml
-person:
-  name: John
-  pets:
-    - cat
-    - dog
-
-```
-then
-```bash
-yq -o=kyaml '.' sample.yml
-```
-will output
-```yaml
-{
-  person: {
-    name: "John",
-    pets: [
-      "cat",
-      "dog",
-    ],
-  },
-}
-```
-
-## Encode kyaml: nested lists of objects
-Lists and objects can be nested arbitrarily; KYaml always uses flow-style collections.
-
-Given a sample.yml file of:
-```yaml
-- name: a
-  items:
-    - id: 1
-      tags:
-        - k: x
-          v: y
-        - k: x2
-          v: y2
-    - id: 2
-      tags:
-        - k: z
-          v: w
-
-```
-then
-```bash
-yq -o=kyaml '.' sample.yml
-```
-will output
-```yaml
-[
-  {
-    name: "a",
-    items: [
-      {
-        id: 1,
-        tags: [
-          {
-            k: "x",
-            v: "y",
-          },
-          {
-            k: "x2",
-            v: "y2",
-          },
-        ],
-      },
-      {
-        id: 2,
-        tags: [
-          {
-            k: "z",
-            v: "w",
-          },
-        ],
-      },
-    ],
-  },
-]
-```
-

pkg/yqlib/doc/usage/toml.md

@@ -141,246 +141,3 @@ will output
 dependencies: {}
 ```
 
-## Roundtrip: inline table attribute
-Given a sample.toml file of:
-```toml
-name = { first = "Tom", last = "Preston-Werner" }
-
-```
-then
-```bash
-yq '.' sample.toml
-```
-will output
-```yaml
-name = { first = "Tom", last = "Preston-Werner" }
-```
-
-## Roundtrip: table section
-Given a sample.toml file of:
-```toml
-[owner.contact]
-name = "Tom"
-age = 36
-
-```
-then
-```bash
-yq '.' sample.toml
-```
-will output
-```yaml
-[owner.contact]
-name = "Tom"
-age = 36
-```
-
-## Roundtrip: array of tables
-Given a sample.toml file of:
-```toml
-[[fruits]]
-name = "apple"
-[[fruits.varieties]]
-name = "red delicious"
-
-```
-then
-```bash
-yq '.' sample.toml
-```
-will output
-```yaml
-[[fruits]]
-name = "apple"
-[[fruits.varieties]]
-name = "red delicious"
-```
-
-## Roundtrip: arrays and scalars
-Given a sample.toml file of:
-```toml
-A = ["hello", ["world", "again"]]
-B = 12
-
-```
-then
-```bash
-yq '.' sample.toml
-```
-will output
-```yaml
-A = ["hello", ["world", "again"]]
-B = 12
-```
-
-## Roundtrip: simple
-Given a sample.toml file of:
-```toml
-A = "hello"
-B = 12
-
-```
-then
-```bash
-yq '.' sample.toml
-```
-will output
-```yaml
-A = "hello"
-B = 12
-```
-
-## Roundtrip: deep paths
-Given a sample.toml file of:
-```toml
-[person]
-name = "hello"
-address = "12 cat st"
-
-```
-then
-```bash
-yq '.' sample.toml
-```
-will output
-```yaml
-[person]
-name = "hello"
-address = "12 cat st"
-```
-
-## Roundtrip: empty array
-Given a sample.toml file of:
-```toml
-A = []
-
-```
-then
-```bash
-yq '.' sample.toml
-```
-will output
-```yaml
-A = []
-```
-
-## Roundtrip: sample table
-Given a sample.toml file of:
-```toml
-var = "x"
-
-[owner.contact]
-name = "Tom Preston-Werner"
-age = 36
-
-```
-then
-```bash
-yq '.' sample.toml
-```
-will output
-```yaml
-var = "x"
-
-[owner.contact]
-name = "Tom Preston-Werner"
-age = 36
-```
-
-## Roundtrip: empty table
-Given a sample.toml file of:
-```toml
-[dependencies]
-
-```
-then
-```bash
-yq '.' sample.toml
-```
-will output
-```yaml
-[dependencies]
-```
-
-## Roundtrip: comments
-Given a sample.toml file of:
-```toml
-# This is a comment
-A = "hello"  # inline comment
-B = 12
-
-# Table comment
-[person]
-name = "Tom"  # name comment
-
-```
-then
-```bash
-yq '.' sample.toml
-```
-will output
-```yaml
-# This is a comment
-A = "hello"  # inline comment
-B = 12
-
-# Table comment
-[person]
-name = "Tom"  # name comment
-```
-
-## Roundtrip: sample from web
-Given a sample.toml file of:
-```toml
-# This is a TOML document
-title = "TOML Example"
-
-[owner]
-name = "Tom Preston-Werner"
-dob = 1979-05-27T07:32:00-08:00
-
-[database]
-enabled = true
-ports = [8000, 8001, 8002]
-data = [["delta", "phi"], [3.14]]
-temp_targets = { cpu = 79.5, case = 72.0 }
-
-# [servers] yq can't do this one yet
-[servers.alpha]
-ip = "10.0.0.1"
-role = "frontend"
-
-[servers.beta]
-ip = "10.0.0.2"
-role = "backend"
-
-```
-then
-```bash
-yq '.' sample.toml
-```
-will output
-```yaml
-# This is a TOML document
-title = "TOML Example"
-
-[owner]
-name = "Tom Preston-Werner"
-dob = 1979-05-27T07:32:00-08:00
-
-[database]
-enabled = true
-ports = [8000, 8001, 8002]
-data = [["delta", "phi"], [3.14]]
-temp_targets = { cpu = 79.5, case = 72.0 }
-
-# [servers] yq can't do this one yet
-[servers.alpha]
-ip = "10.0.0.1"
-role = "frontend"
-
-[servers.beta]
-ip = "10.0.0.2"
-role = "backend"
-```
-

pkg/yqlib/encoder.go

@@ -1,12 +1,7 @@
 package yqlib
 
 import (
-	"bufio"
-	"errors"
 	"io"
-	"strings"
-
-	"github.com/fatih/color"
 )
 
 type Encoder interface {
@@ -30,63 +25,3 @@ func mapKeysToStrings(node *CandidateNode) {
 		mapKeysToStrings(child)
 	}
 }
-
-// Some funcs are shared between encoder_yaml and encoder_kyaml
-func PrintYAMLDocumentSeparator(writer io.Writer, PrintDocSeparators bool) error {
-	if PrintDocSeparators {
-		log.Debug("writing doc sep")
-		if err := writeString(writer, "---\n"); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-func PrintYAMLLeadingContent(writer io.Writer, content string, PrintDocSeparators bool, ColorsEnabled bool) error {
-	reader := bufio.NewReader(strings.NewReader(content))
-
-	// reuse precompiled package-level regex
-	// (declared in decoder_yaml.go)
-
-	for {
-
-		readline, errReading := reader.ReadString('\n')
-		if errReading != nil && !errors.Is(errReading, io.EOF) {
-			return errReading
-		}
-		if strings.Contains(readline, "$yqDocSeparator$") {
-			// Preserve the original line ending (CRLF or LF)
-			lineEnding := "\n"
-			if strings.HasSuffix(readline, "\r\n") {
-				lineEnding = "\r\n"
-			}
-			if PrintDocSeparators {
-				if err := writeString(writer, "---"+lineEnding); err != nil {
-					return err
-				}
-			}
-
-		} else {
-			if len(readline) > 0 && readline != "\n" && readline[0] != '%' && !commentLineRe.MatchString(readline) {
-				readline = "# " + readline
-			}
-			if ColorsEnabled && strings.TrimSpace(readline) != "" {
-				readline = format(color.FgHiBlack) + readline + format(color.Reset)
-			}
-			if err := writeString(writer, readline); err != nil {
-				return err
-			}
-		}
-
-		if errors.Is(errReading, io.EOF) {
-			if readline != "" {
-				// the last comment we read didn't have a newline, put one in
-				if err := writeString(writer, "\n"); err != nil {
-					return err
-				}
-			}
-			break
-		}
-	}
-
-	return nil
-}

pkg/yqlib/encoder_hcl.go

@@ -43,9 +43,6 @@ func (he *hclEncoder) PrintLeadingContent(_ io.Writer, _ string) error {
 
 func (he *hclEncoder) Encode(writer io.Writer, node *CandidateNode) error {
 	log.Debugf("I need to encode %v", NodeToString(node))
-	if node.Kind == ScalarNode {
-		return writeString(writer, node.Value+"\n")
-	}
 
 	f := hclwrite.NewEmptyFile()
 	body := f.Body()
@@ -66,8 +63,8 @@ func (he *hclEncoder) Encode(writer io.Writer, node *CandidateNode) error {
 	finalOutput := he.injectComments(compactOutput, commentMap)
 
 	if he.prefs.ColorsEnabled {
-		colourized := he.colorizeHcl(finalOutput)
-		_, err := writer.Write(colourized)
+		colorized := he.colorizeHcl(finalOutput)
+		_, err := writer.Write(colorized)
 		return err
 	}
 
@@ -173,18 +170,19 @@ func (he *hclEncoder) injectComments(output []byte, commentMap map[string]string
 	return []byte(result)
 }
 
+// colorizeHcl applies syntax highlighting to HCL output using fatih/color
 func (he *hclEncoder) colorizeHcl(input []byte) []byte {
 	hcl := string(input)
 	result := strings.Builder{}
 
-	// Create colour functions for different token types
+	// Create color functions for different token types
 	commentColor := color.New(color.FgHiBlack).SprintFunc()
 	stringColor := color.New(color.FgGreen).SprintFunc()
 	numberColor := color.New(color.FgHiMagenta).SprintFunc()
 	keyColor := color.New(color.FgCyan).SprintFunc()
 	boolColor := color.New(color.FgHiMagenta).SprintFunc()
 
-	// Simple tokenization for HCL colouring
+	// Simple tokenization for HCL coloring
 	i := 0
 	for i < len(hcl) {
 		ch := hcl[i]
@@ -475,12 +473,12 @@ func (he *hclEncoder) encodeBlockIfMapping(body *hclwrite.Body, key string, valu
 		}
 	}
 
-	// If all child values are mappings, treat each child key as a labelled instance of this block type
+	// If all child values are mappings, treat each child key as a labeled instance of this block type
 	if handled, _ := he.encodeMappingChildrenAsBlocks(body, key, valueNode); handled {
 		return true
 	}
 
-	// No labels detected, render as unlabelled block
+	// No labels detected, render as unlabeled block
 	block := body.AppendNewBlock(key, nil)
 	if err := he.encodeNodeAttributes(block.Body(), valueNode); err == nil {
 		return true
@@ -492,7 +490,7 @@ func (he *hclEncoder) encodeBlockIfMapping(body *hclwrite.Body, key string, valu
 // encodeNode encodes a CandidateNode directly to HCL, preserving style information
 func (he *hclEncoder) encodeNode(body *hclwrite.Body, node *CandidateNode) error {
 	if node.Kind != MappingNode {
-		return fmt.Errorf("HCL encoder expects a mapping at the root level, got %v", kindToString(node.Kind))
+		return fmt.Errorf("HCL encoder expects a mapping at the root level")
 	}
 
 	for i := 0; i < len(node.Content); i += 2 {

pkg/yqlib/encoder_kyaml.go

@@ -1,318 +0,0 @@
-//go:build !yq_nokyaml
-
-package yqlib
-
-import (
-	"bytes"
-	"io"
-	"regexp"
-	"strconv"
-	"strings"
-)
-
-type kyamlEncoder struct {
-	prefs KYamlPreferences
-}
-
-func NewKYamlEncoder(prefs KYamlPreferences) Encoder {
-	return &kyamlEncoder{prefs: prefs}
-}
-
-func (ke *kyamlEncoder) CanHandleAliases() bool {
-	// KYAML is a restricted subset; avoid emitting anchors/aliases.
-	return false
-}
-
-func (ke *kyamlEncoder) PrintDocumentSeparator(writer io.Writer) error {
-	return PrintYAMLDocumentSeparator(writer, ke.prefs.PrintDocSeparators)
-}
-
-func (ke *kyamlEncoder) PrintLeadingContent(writer io.Writer, content string) error {
-	return PrintYAMLLeadingContent(writer, content, ke.prefs.PrintDocSeparators, ke.prefs.ColorsEnabled)
-}
-
-func (ke *kyamlEncoder) Encode(writer io.Writer, node *CandidateNode) error {
-	log.Debugf("encoderKYaml - going to print %v", NodeToString(node))
-	if node.Kind == ScalarNode && ke.prefs.UnwrapScalar {
-		return writeString(writer, node.Value+"\n")
-	}
-
-	destination := writer
-	tempBuffer := bytes.NewBuffer(nil)
-	if ke.prefs.ColorsEnabled {
-		destination = tempBuffer
-	}
-
-	// Mirror the YAML encoder behaviour: trailing comments on the document root
-	// are stored in FootComment and need to be printed after the document.
-	trailingContent := node.FootComment
-
-	if err := ke.writeCommentBlock(destination, node.HeadComment, 0); err != nil {
-		return err
-	}
-	if err := ke.writeNode(destination, node, 0); err != nil {
-		return err
-	}
-	if err := ke.writeInlineComment(destination, node.LineComment); err != nil {
-		return err
-	}
-	if err := writeString(destination, "\n"); err != nil {
-		return err
-	}
-	if err := ke.PrintLeadingContent(destination, trailingContent); err != nil {
-		return err
-	}
-
-	if ke.prefs.ColorsEnabled {
-		return colorizeAndPrint(tempBuffer.Bytes(), writer)
-	}
-	return nil
-}
-
-func (ke *kyamlEncoder) writeNode(writer io.Writer, node *CandidateNode, indent int) error {
-	switch node.Kind {
-	case MappingNode:
-		return ke.writeMapping(writer, node, indent)
-	case SequenceNode:
-		return ke.writeSequence(writer, node, indent)
-	case ScalarNode:
-		return writeString(writer, ke.formatScalar(node))
-	case AliasNode:
-		// Should have been exploded by the printer, but handle defensively.
-		if node.Alias == nil {
-			return writeString(writer, "null")
-		}
-		return ke.writeNode(writer, node.Alias, indent)
-	default:
-		return writeString(writer, "null")
-	}
-}
-
-func (ke *kyamlEncoder) writeMapping(writer io.Writer, node *CandidateNode, indent int) error {
-	if len(node.Content) == 0 {
-		return writeString(writer, "{}")
-	}
-	if err := writeString(writer, "{\n"); err != nil {
-		return err
-	}
-
-	for i := 0; i+1 < len(node.Content); i += 2 {
-		keyNode := node.Content[i]
-		valueNode := node.Content[i+1]
-
-		entryIndent := indent + ke.prefs.Indent
-		if err := ke.writeCommentBlock(writer, keyNode.HeadComment, entryIndent); err != nil {
-			return err
-		}
-		if valueNode.HeadComment != "" && valueNode.HeadComment != keyNode.HeadComment {
-			if err := ke.writeCommentBlock(writer, valueNode.HeadComment, entryIndent); err != nil {
-				return err
-			}
-		}
-
-		if err := ke.writeIndent(writer, entryIndent); err != nil {
-			return err
-		}
-		if err := writeString(writer, ke.formatKey(keyNode)); err != nil {
-			return err
-		}
-		if err := writeString(writer, ": "); err != nil {
-			return err
-		}
-		if err := ke.writeNode(writer, valueNode, entryIndent); err != nil {
-			return err
-		}
-
-		// Always emit a trailing comma; KYAML encourages explicit separators,
-		// and this ensures all quoted strings have a trailing `",` as requested.
-		if err := writeString(writer, ","); err != nil {
-			return err
-		}
-		inline := valueNode.LineComment
-		if inline == "" {
-			inline = keyNode.LineComment
-		}
-		if err := ke.writeInlineComment(writer, inline); err != nil {
-			return err
-		}
-		if err := writeString(writer, "\n"); err != nil {
-			return err
-		}
-
-		foot := valueNode.FootComment
-		if foot == "" {
-			foot = keyNode.FootComment
-		}
-		if err := ke.writeCommentBlock(writer, foot, entryIndent); err != nil {
-			return err
-		}
-	}
-
-	if err := ke.writeIndent(writer, indent); err != nil {
-		return err
-	}
-	return writeString(writer, "}")
-}
-
-func (ke *kyamlEncoder) writeSequence(writer io.Writer, node *CandidateNode, indent int) error {
-	if len(node.Content) == 0 {
-		return writeString(writer, "[]")
-	}
-	if err := writeString(writer, "[\n"); err != nil {
-		return err
-	}
-
-	for _, child := range node.Content {
-		itemIndent := indent + ke.prefs.Indent
-		if err := ke.writeCommentBlock(writer, child.HeadComment, itemIndent); err != nil {
-			return err
-		}
-		if err := ke.writeIndent(writer, itemIndent); err != nil {
-			return err
-		}
-		if err := ke.writeNode(writer, child, itemIndent); err != nil {
-			return err
-		}
-		if err := writeString(writer, ","); err != nil {
-			return err
-		}
-		if err := ke.writeInlineComment(writer, child.LineComment); err != nil {
-			return err
-		}
-		if err := writeString(writer, "\n"); err != nil {
-			return err
-		}
-		if err := ke.writeCommentBlock(writer, child.FootComment, itemIndent); err != nil {
-			return err
-		}
-	}
-
-	if err := ke.writeIndent(writer, indent); err != nil {
-		return err
-	}
-	return writeString(writer, "]")
-}
-
-func (ke *kyamlEncoder) writeIndent(writer io.Writer, indent int) error {
-	if indent <= 0 {
-		return nil
-	}
-	return writeString(writer, strings.Repeat(" ", indent))
-}
-
-func (ke *kyamlEncoder) formatKey(keyNode *CandidateNode) string {
-	// KYAML examples use bare keys. Quote keys only when needed.
-	key := keyNode.Value
-	if isValidKYamlBareKey(key) {
-		return key
-	}
-	return `"` + escapeDoubleQuotedString(key) + `"`
-}
-
-func (ke *kyamlEncoder) formatScalar(node *CandidateNode) string {
-	switch node.Tag {
-	case "!!null":
-		return "null"
-	case "!!bool":
-		return strings.ToLower(node.Value)
-	case "!!int", "!!float":
-		return node.Value
-	case "!!str":
-		return `"` + escapeDoubleQuotedString(node.Value) + `"`
-	default:
-		// Fall back to a string representation to avoid implicit typing surprises.
-		return `"` + escapeDoubleQuotedString(node.Value) + `"`
-	}
-}
-
-var kyamlBareKeyRe = regexp.MustCompile(`^[A-Za-z_][A-Za-z0-9_-]*$`)
-
-func isValidKYamlBareKey(s string) bool {
-	// Conservative: require an identifier-like key; otherwise quote.
-	if s == "" {
-		return false
-	}
-	return kyamlBareKeyRe.MatchString(s)
-}
-
-func escapeDoubleQuotedString(s string) string {
-	var b strings.Builder
-	b.Grow(len(s) + 2)
-
-	for _, r := range s {
-		switch r {
-		case '\\':
-			b.WriteString(`\\`)
-		case '"':
-			b.WriteString(`\"`)
-		case '\n':
-			b.WriteString(`\n`)
-		case '\r':
-			b.WriteString(`\r`)
-		case '\t':
-			b.WriteString(`\t`)
-		default:
-			if r < 0x20 {
-				// YAML double-quoted strings support \uXXXX escapes.
-				b.WriteString(`\u`)
-				hex := "0000" + strings.ToUpper(strconv.FormatInt(int64(r), 16))
-				b.WriteString(hex[len(hex)-4:])
-			} else {
-				b.WriteRune(r)
-			}
-		}
-	}
-	return b.String()
-}
-
-func (ke *kyamlEncoder) writeCommentBlock(writer io.Writer, comment string, indent int) error {
-	if strings.TrimSpace(comment) == "" {
-		return nil
-	}
-
-	lines := strings.Split(strings.ReplaceAll(comment, "\r\n", "\n"), "\n")
-	for _, line := range lines {
-		trimmed := strings.TrimSpace(line)
-		if trimmed == "" {
-			continue
-		}
-
-		if err := ke.writeIndent(writer, indent); err != nil {
-			return err
-		}
-
-		toWrite := line
-		if !commentLineRe.MatchString(toWrite) {
-			toWrite = "# " + toWrite
-		}
-		if err := writeString(writer, toWrite); err != nil {
-			return err
-		}
-		if err := writeString(writer, "\n"); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (ke *kyamlEncoder) writeInlineComment(writer io.Writer, comment string) error {
-	comment = strings.TrimSpace(strings.ReplaceAll(comment, "\r\n", "\n"))
-	if comment == "" {
-		return nil
-	}
-
-	lines := strings.Split(comment, "\n")
-	first := strings.TrimSpace(lines[0])
-	if first == "" {
-		return nil
-	}
-
-	if !strings.HasPrefix(first, "#") {
-		first = "# " + first
-	}
-
-	if err := writeString(writer, " "); err != nil {
-		return err
-	}
-	return writeString(writer, first)
-}

pkg/yqlib/encoder_shellvariables.go

@@ -57,13 +57,7 @@ func (pe *shellVariablesEncoder) doEncode(w *io.Writer, node *CandidateNode, pat
 			// let's just pick a fallback key to use if we are encoding a single scalar
 			nonemptyPath = "value"
 		}
-		var valueString string
-		if pe.prefs.UnwrapScalar {
-			valueString = node.Value
-		} else {
-			valueString = quoteValue(node.Value)
-		}
-		_, err := io.WriteString(*w, nonemptyPath+"="+valueString+"\n")
+		_, err := io.WriteString(*w, nonemptyPath+"="+quoteValue(node.Value)+"\n")
 		return err
 	case SequenceNode:
 		for index, child := range node.Content {

pkg/yqlib/encoder_shellvariables_test.go

@@ -135,36 +135,3 @@ func TestShellVariablesEncoderCustomSeparatorArray(t *testing.T) {
 func TestShellVariablesEncoderCustomSeparatorSingleChar(t *testing.T) {
 	assertEncodesToWithSeparator(t, "a:\n b: value", "aXb=value", "X")
 }
-
-func assertEncodesToUnwrapped(t *testing.T, yaml string, shellvars string) {
-	var output bytes.Buffer
-	writer := bufio.NewWriter(&output)
-
-	originalUnwrapScalar := ConfiguredShellVariablesPreferences.UnwrapScalar
-	defer func() {
-		ConfiguredShellVariablesPreferences.UnwrapScalar = originalUnwrapScalar
-	}()
-
-	ConfiguredShellVariablesPreferences.UnwrapScalar = true
-
-	var encoder = NewShellVariablesEncoder()
-	inputs, err := readDocuments(strings.NewReader(yaml), "test.yml", 0, NewYamlDecoder(ConfiguredYamlPreferences))
-	if err != nil {
-		panic(err)
-	}
-	node := inputs.Front().Value.(*CandidateNode)
-	err = encoder.Encode(writer, node)
-	if err != nil {
-		panic(err)
-	}
-	writer.Flush()
-
-	test.AssertResult(t, shellvars, strings.TrimSuffix(output.String(), "\n"))
-}
-
-func TestShellVariablesEncoderUnwrapScalar(t *testing.T) {
-	assertEncodesToUnwrapped(t, "a: Lewis Carroll", "a=Lewis Carroll")
-	assertEncodesToUnwrapped(t, "b: 123", "b=123")
-	assertEncodesToUnwrapped(t, "c: true", "c=true")
-	assertEncodesToUnwrapped(t, "d: value with spaces", "d=value with spaces")
-}

pkg/yqlib/encoder_toml.go

@@ -1,58 +1,22 @@
-//go:build !yq_notoml
-
 package yqlib
 
 import (
-	"bytes"
 	"fmt"
 	"io"
-	"strings"
-
-	"github.com/fatih/color"
 )
 
 type tomlEncoder struct {
-	wroteRootAttr bool // Track if we wrote root-level attributes before tables
-	prefs         TomlPreferences
 }
 
 func NewTomlEncoder() Encoder {
-	return NewTomlEncoderWithPrefs(ConfiguredTomlPreferences)
-}
-
-func NewTomlEncoderWithPrefs(prefs TomlPreferences) Encoder {
-	return &tomlEncoder{prefs: prefs}
+	return &tomlEncoder{}
 }
 
 func (te *tomlEncoder) Encode(writer io.Writer, node *CandidateNode) error {
-	if node.Kind != MappingNode {
-		// For standalone selections, TOML tests expect raw value for scalars
-		if node.Kind == ScalarNode {
-			return writeString(writer, node.Value+"\n")
-		}
-		return fmt.Errorf("TOML encoder expects a mapping at the root level")
+	if node.Kind == ScalarNode {
+		return writeString(writer, node.Value+"\n")
 	}
-
-	// Encode to a buffer first if colors are enabled
-	var buf bytes.Buffer
-	var targetWriter io.Writer
-	targetWriter = writer
-	if te.prefs.ColorsEnabled {
-		targetWriter = &buf
-	}
-
-	// Encode a root mapping as a sequence of attributes, tables, and arrays of tables
-	if err := te.encodeRootMapping(targetWriter, node); err != nil {
-		return err
-	}
-
-	if te.prefs.ColorsEnabled {
-		colourised := te.colorizeToml(buf.Bytes())
-		_, err := writer.Write(colourised)
-		return err
-	}
-
-	return nil
+	return fmt.Errorf("only scalars (e.g. strings, numbers, booleans) are supported for TOML output at the moment. Please use yaml output format (-oy) until the encoder has been fully implemented")
 }
 
 func (te *tomlEncoder) PrintDocumentSeparator(_ io.Writer) error {
@@ -66,725 +30,3 @@ func (te *tomlEncoder) PrintLeadingContent(_ io.Writer, _ string) error {
 func (te *tomlEncoder) CanHandleAliases() bool {
 	return false
 }
-
-// ---- helpers ----
-
-func (te *tomlEncoder) writeComment(w io.Writer, comment string) error {
-	if comment == "" {
-		return nil
-	}
-	lines := strings.Split(comment, "\n")
-	for _, line := range lines {
-		line = strings.TrimSpace(line)
-		if !strings.HasPrefix(line, "#") {
-			line = "# " + line
-		}
-		if _, err := w.Write([]byte(line + "\n")); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (te *tomlEncoder) formatScalar(node *CandidateNode) string {
-	switch node.Tag {
-	case "!!str":
-		// Quote strings per TOML spec
-		return fmt.Sprintf("%q", node.Value)
-	case "!!bool", "!!int", "!!float":
-		return node.Value
-	case "!!null":
-		// TOML does not have null; encode as empty string
-		return `""`
-	default:
-		return node.Value
-	}
-}
-
-func (te *tomlEncoder) encodeRootMapping(w io.Writer, node *CandidateNode) error {
-	te.wroteRootAttr = false // Reset state
-
-	// Write root head comment if present (at the very beginning, no leading blank line)
-	if node.HeadComment != "" {
-		if err := te.writeComment(w, node.HeadComment); err != nil {
-			return err
-		}
-	}
-
-	// Preserve existing order by iterating Content
-	for i := 0; i < len(node.Content); i += 2 {
-		keyNode := node.Content[i]
-		valNode := node.Content[i+1]
-		if err := te.encodeTopLevelEntry(w, []string{keyNode.Value}, valNode); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-// encodeTopLevelEntry encodes a key/value at the root, dispatching to attribute, table, or array-of-tables
-func (te *tomlEncoder) encodeTopLevelEntry(w io.Writer, path []string, node *CandidateNode) error {
-	if len(path) == 0 {
-		return fmt.Errorf("cannot encode TOML entry with empty path")
-	}
-
-	switch node.Kind {
-	case ScalarNode:
-		// key = value
-		return te.writeAttribute(w, path[len(path)-1], node)
-	case SequenceNode:
-		// Empty arrays should be encoded as [] attributes
-		if len(node.Content) == 0 {
-			return te.writeArrayAttribute(w, path[len(path)-1], node)
-		}
-
-		// If all items are mappings => array of tables; else => array attribute
-		allMaps := true
-		for _, it := range node.Content {
-			if it.Kind != MappingNode {
-				allMaps = false
-				break
-			}
-		}
-		if allMaps {
-			key := path[len(path)-1]
-			for _, it := range node.Content {
-				// [[key]] then body
-				if _, err := w.Write([]byte("[[" + key + "]]\n")); err != nil {
-					return err
-				}
-				if err := te.encodeMappingBodyWithPath(w, []string{key}, it); err != nil {
-					return err
-				}
-			}
-			return nil
-		}
-		// Regular array attribute
-		return te.writeArrayAttribute(w, path[len(path)-1], node)
-	case MappingNode:
-		// Inline table if not EncodeSeparate, else emit separate tables/arrays of tables for children under this path
-		if !node.EncodeSeparate {
-			// If children contain mappings or arrays of mappings, prefer separate sections
-			if te.hasEncodeSeparateChild(node) || te.hasStructuralChildren(node) {
-				return te.encodeSeparateMapping(w, path, node)
-			}
-			return te.writeInlineTableAttribute(w, path[len(path)-1], node)
-		}
-		return te.encodeSeparateMapping(w, path, node)
-	default:
-		return fmt.Errorf("unsupported node kind for TOML: %v", node.Kind)
-	}
-}
-
-func (te *tomlEncoder) writeAttribute(w io.Writer, key string, value *CandidateNode) error {
-	te.wroteRootAttr = true // Mark that we wrote a root attribute
-
-	// Write head comment before the attribute
-	if err := te.writeComment(w, value.HeadComment); err != nil {
-		return err
-	}
-
-	// Write the attribute
-	line := key + " = " + te.formatScalar(value)
-
-	// Add line comment if present
-	if value.LineComment != "" {
-		lineComment := strings.TrimSpace(value.LineComment)
-		if !strings.HasPrefix(lineComment, "#") {
-			lineComment = "# " + lineComment
-		}
-		line += "  " + lineComment
-	}
-
-	_, err := w.Write([]byte(line + "\n"))
-	return err
-}
-
-func (te *tomlEncoder) writeArrayAttribute(w io.Writer, key string, seq *CandidateNode) error {
-	te.wroteRootAttr = true // Mark that we wrote a root attribute
-
-	// Write head comment before the array
-	if err := te.writeComment(w, seq.HeadComment); err != nil {
-		return err
-	}
-
-	// Handle empty arrays
-	if len(seq.Content) == 0 {
-		line := key + " = []"
-		if seq.LineComment != "" {
-			lineComment := strings.TrimSpace(seq.LineComment)
-			if !strings.HasPrefix(lineComment, "#") {
-				lineComment = "# " + lineComment
-			}
-			line += "  " + lineComment
-		}
-		_, err := w.Write([]byte(line + "\n"))
-		return err
-	}
-
-	// Check if any array elements have head comments - if so, use multiline format
-	hasElementComments := false
-	for _, it := range seq.Content {
-		if it.HeadComment != "" {
-			hasElementComments = true
-			break
-		}
-	}
-
-	if hasElementComments {
-		// Write multiline array format with comments
-		if _, err := w.Write([]byte(key + " = [\n")); err != nil {
-			return err
-		}
-
-		for i, it := range seq.Content {
-			// Write head comment for this element
-			if it.HeadComment != "" {
-				commentLines := strings.Split(it.HeadComment, "\n")
-				for _, commentLine := range commentLines {
-					if strings.TrimSpace(commentLine) != "" {
-						if !strings.HasPrefix(strings.TrimSpace(commentLine), "#") {
-							commentLine = "# " + commentLine
-						}
-						if _, err := w.Write([]byte("  " + commentLine + "\n")); err != nil {
-							return err
-						}
-					}
-				}
-			}
-
-			// Write the element value
-			var itemStr string
-			switch it.Kind {
-			case ScalarNode:
-				itemStr = te.formatScalar(it)
-			case SequenceNode:
-				nested, err := te.sequenceToInlineArray(it)
-				if err != nil {
-					return err
-				}
-				itemStr = nested
-			case MappingNode:
-				inline, err := te.mappingToInlineTable(it)
-				if err != nil {
-					return err
-				}
-				itemStr = inline
-			case AliasNode:
-				return fmt.Errorf("aliases are not supported in TOML")
-			default:
-				return fmt.Errorf("unsupported array item kind: %v", it.Kind)
-			}
-
-			// Always add trailing comma in multiline arrays
-			itemStr += ","
-
-			if _, err := w.Write([]byte("  " + itemStr + "\n")); err != nil {
-				return err
-			}
-
-			// Add blank line between elements (except after the last one)
-			if i < len(seq.Content)-1 {
-				if _, err := w.Write([]byte("\n")); err != nil {
-					return err
-				}
-			}
-		}
-
-		if _, err := w.Write([]byte("]\n")); err != nil {
-			return err
-		}
-		return nil
-	}
-
-	// Join scalars or nested arrays recursively into TOML array syntax
-	items := make([]string, 0, len(seq.Content))
-	for _, it := range seq.Content {
-		switch it.Kind {
-		case ScalarNode:
-			items = append(items, te.formatScalar(it))
-		case SequenceNode:
-			// Nested arrays: encode inline
-			nested, err := te.sequenceToInlineArray(it)
-			if err != nil {
-				return err
-			}
-			items = append(items, nested)
-		case MappingNode:
-			// Inline table inside array
-			inline, err := te.mappingToInlineTable(it)
-			if err != nil {
-				return err
-			}
-			items = append(items, inline)
-		case AliasNode:
-			return fmt.Errorf("aliases are not supported in TOML")
-		default:
-			return fmt.Errorf("unsupported array item kind: %v", it.Kind)
-		}
-	}
-
-	line := key + " = [" + strings.Join(items, ", ") + "]"
-
-	// Add line comment if present
-	if seq.LineComment != "" {
-		lineComment := strings.TrimSpace(seq.LineComment)
-		if !strings.HasPrefix(lineComment, "#") {
-			lineComment = "# " + lineComment
-		}
-		line += "  " + lineComment
-	}
-
-	_, err := w.Write([]byte(line + "\n"))
-	return err
-}
-
-func (te *tomlEncoder) sequenceToInlineArray(seq *CandidateNode) (string, error) {
-	items := make([]string, 0, len(seq.Content))
-	for _, it := range seq.Content {
-		switch it.Kind {
-		case ScalarNode:
-			items = append(items, te.formatScalar(it))
-		case SequenceNode:
-			nested, err := te.sequenceToInlineArray(it)
-			if err != nil {
-				return "", err
-			}
-			items = append(items, nested)
-		case MappingNode:
-			inline, err := te.mappingToInlineTable(it)
-			if err != nil {
-				return "", err
-			}
-			items = append(items, inline)
-		default:
-			return "", fmt.Errorf("unsupported array item kind: %v", it.Kind)
-		}
-	}
-	return "[" + strings.Join(items, ", ") + "]", nil
-}
-
-func (te *tomlEncoder) mappingToInlineTable(m *CandidateNode) (string, error) {
-	// key = { a = 1, b = "x" }
-	parts := make([]string, 0, len(m.Content)/2)
-	for i := 0; i < len(m.Content); i += 2 {
-		k := m.Content[i].Value
-		v := m.Content[i+1]
-		switch v.Kind {
-		case ScalarNode:
-			parts = append(parts, fmt.Sprintf("%s = %s", k, te.formatScalar(v)))
-		case SequenceNode:
-			// inline array in inline table
-			arr, err := te.sequenceToInlineArray(v)
-			if err != nil {
-				return "", err
-			}
-			parts = append(parts, fmt.Sprintf("%s = %s", k, arr))
-		case MappingNode:
-			// nested inline table
-			inline, err := te.mappingToInlineTable(v)
-			if err != nil {
-				return "", err
-			}
-			parts = append(parts, fmt.Sprintf("%s = %s", k, inline))
-		default:
-			return "", fmt.Errorf("unsupported inline table value kind: %v", v.Kind)
-		}
-	}
-	return "{ " + strings.Join(parts, ", ") + " }", nil
-}
-
-func (te *tomlEncoder) writeInlineTableAttribute(w io.Writer, key string, m *CandidateNode) error {
-	inline, err := te.mappingToInlineTable(m)
-	if err != nil {
-		return err
-	}
-	_, err = w.Write([]byte(key + " = " + inline + "\n"))
-	return err
-}
-
-func (te *tomlEncoder) writeTableHeader(w io.Writer, path []string, m *CandidateNode) error {
-	// Add blank line before table header (or before comment if present) if we wrote root attributes
-	needsBlankLine := te.wroteRootAttr
-	if needsBlankLine {
-		if _, err := w.Write([]byte("\n")); err != nil {
-			return err
-		}
-		te.wroteRootAttr = false // Only add once
-	}
-
-	// Write head comment before the table header
-	if m.HeadComment != "" {
-		if err := te.writeComment(w, m.HeadComment); err != nil {
-			return err
-		}
-	}
-
-	// Write table header [a.b.c]
-	header := "[" + strings.Join(path, ".") + "]\n"
-	_, err := w.Write([]byte(header))
-	return err
-}
-
-// encodeSeparateMapping handles a mapping that should be encoded as table sections.
-// It emits the table header for this mapping if it has any content, then processes children.
-func (te *tomlEncoder) encodeSeparateMapping(w io.Writer, path []string, m *CandidateNode) error {
-	// Check if this mapping has any non-mapping, non-array-of-tables children (i.e., attributes)
-	hasAttrs := false
-	for i := 0; i < len(m.Content); i += 2 {
-		v := m.Content[i+1]
-		if v.Kind == ScalarNode {
-			hasAttrs = true
-			break
-		}
-		if v.Kind == SequenceNode {
-			// Check if it's NOT an array of tables
-			allMaps := true
-			for _, it := range v.Content {
-				if it.Kind != MappingNode {
-					allMaps = false
-					break
-				}
-			}
-			if !allMaps {
-				hasAttrs = true
-				break
-			}
-		}
-	}
-
-	// If there are attributes or if the mapping is empty, emit the table header
-	if hasAttrs || len(m.Content) == 0 {
-		if err := te.writeTableHeader(w, path, m); err != nil {
-			return err
-		}
-		if err := te.encodeMappingBodyWithPath(w, path, m); err != nil {
-			return err
-		}
-		return nil
-	}
-
-	// No attributes, just nested structures - process children
-	for i := 0; i < len(m.Content); i += 2 {
-		k := m.Content[i].Value
-		v := m.Content[i+1]
-		switch v.Kind {
-		case MappingNode:
-			// Emit [path.k]
-			newPath := append(append([]string{}, path...), k)
-			if err := te.writeTableHeader(w, newPath, v); err != nil {
-				return err
-			}
-			if err := te.encodeMappingBodyWithPath(w, newPath, v); err != nil {
-				return err
-			}
-		case SequenceNode:
-			// If sequence of maps, emit [[path.k]] per element
-			allMaps := true
-			for _, it := range v.Content {
-				if it.Kind != MappingNode {
-					allMaps = false
-					break
-				}
-			}
-			if allMaps {
-				key := strings.Join(append(append([]string{}, path...), k), ".")
-				for _, it := range v.Content {
-					if _, err := w.Write([]byte("[[" + key + "]]\n")); err != nil {
-						return err
-					}
-					if err := te.encodeMappingBodyWithPath(w, append(append([]string{}, path...), k), it); err != nil {
-						return err
-					}
-				}
-			} else {
-				// Regular array attribute under the current table path
-				if err := te.writeArrayAttribute(w, k, v); err != nil {
-					return err
-				}
-			}
-		case ScalarNode:
-			// Attributes directly under the current table path
-			if err := te.writeAttribute(w, k, v); err != nil {
-				return err
-			}
-		}
-	}
-	return nil
-}
-
-func (te *tomlEncoder) hasEncodeSeparateChild(m *CandidateNode) bool {
-	for i := 0; i < len(m.Content); i += 2 {
-		v := m.Content[i+1]
-		if v.Kind == MappingNode && v.EncodeSeparate {
-			return true
-		}
-	}
-	return false
-}
-
-func (te *tomlEncoder) hasStructuralChildren(m *CandidateNode) bool {
-	for i := 0; i < len(m.Content); i += 2 {
-		v := m.Content[i+1]
-		// Only consider it structural if mapping has EncodeSeparate or is non-empty
-		if v.Kind == MappingNode && v.EncodeSeparate {
-			return true
-		}
-		if v.Kind == SequenceNode {
-			allMaps := true
-			for _, it := range v.Content {
-				if it.Kind != MappingNode {
-					allMaps = false
-					break
-				}
-			}
-			if allMaps {
-				return true
-			}
-		}
-	}
-	return false
-}
-
-// encodeMappingBodyWithPath encodes attributes and nested arrays of tables using full dotted path context
-func (te *tomlEncoder) encodeMappingBodyWithPath(w io.Writer, path []string, m *CandidateNode) error {
-	// First, attributes (scalars and non-map arrays)
-	for i := 0; i < len(m.Content); i += 2 {
-		k := m.Content[i].Value
-		v := m.Content[i+1]
-		switch v.Kind {
-		case ScalarNode:
-			if err := te.writeAttribute(w, k, v); err != nil {
-				return err
-			}
-		case SequenceNode:
-			allMaps := true
-			for _, it := range v.Content {
-				if it.Kind != MappingNode {
-					allMaps = false
-					break
-				}
-			}
-			if !allMaps {
-				if err := te.writeArrayAttribute(w, k, v); err != nil {
-					return err
-				}
-			}
-		}
-	}
-
-	// Then, nested arrays of tables with full path
-	for i := 0; i < len(m.Content); i += 2 {
-		k := m.Content[i].Value
-		v := m.Content[i+1]
-		if v.Kind == SequenceNode {
-			allMaps := true
-			for _, it := range v.Content {
-				if it.Kind != MappingNode {
-					allMaps = false
-					break
-				}
-			}
-			if allMaps {
-				dotted := strings.Join(append(append([]string{}, path...), k), ".")
-				for _, it := range v.Content {
-					if _, err := w.Write([]byte("[[" + dotted + "]]\n")); err != nil {
-						return err
-					}
-					if err := te.encodeMappingBodyWithPath(w, append(append([]string{}, path...), k), it); err != nil {
-						return err
-					}
-				}
-			}
-		}
-	}
-
-	// Finally, child mappings that are not marked EncodeSeparate get inlined as attributes
-	for i := 0; i < len(m.Content); i += 2 {
-		k := m.Content[i].Value
-		v := m.Content[i+1]
-		if v.Kind == MappingNode && !v.EncodeSeparate {
-			if err := te.writeInlineTableAttribute(w, k, v); err != nil {
-				return err
-			}
-		}
-	}
-	return nil
-}
-
-// colorizeToml applies syntax highlighting to TOML output using fatih/color
-func (te *tomlEncoder) colorizeToml(input []byte) []byte {
-	toml := string(input)
-	result := strings.Builder{}
-
-	// Force color output (don't check for TTY)
-	color.NoColor = false
-
-	// Create color functions for different token types
-	// Use EnableColor() to ensure colors work even when NO_COLOR env is set
-	commentColorObj := color.New(color.FgHiBlack)
-	commentColorObj.EnableColor()
-	stringColorObj := color.New(color.FgGreen)
-	stringColorObj.EnableColor()
-	numberColorObj := color.New(color.FgHiMagenta)
-	numberColorObj.EnableColor()
-	keyColorObj := color.New(color.FgCyan)
-	keyColorObj.EnableColor()
-	boolColorObj := color.New(color.FgHiMagenta)
-	boolColorObj.EnableColor()
-	sectionColorObj := color.New(color.FgYellow, color.Bold)
-	sectionColorObj.EnableColor()
-
-	commentColor := commentColorObj.SprintFunc()
-	stringColor := stringColorObj.SprintFunc()
-	numberColor := numberColorObj.SprintFunc()
-	keyColor := keyColorObj.SprintFunc()
-	boolColor := boolColorObj.SprintFunc()
-	sectionColor := sectionColorObj.SprintFunc()
-
-	// Simple tokenization for TOML colouring
-	i := 0
-	for i < len(toml) {
-		ch := toml[i]
-
-		// Comments - from # to end of line
-		if ch == '#' {
-			end := i
-			for end < len(toml) && toml[end] != '\n' {
-				end++
-			}
-			result.WriteString(commentColor(toml[i:end]))
-			i = end
-			continue
-		}
-
-		// Table sections - [section] or [[array]]
-		// Only treat '[' as a table section if it appears at the start of the line
-		// (possibly after whitespace). This avoids mis-colouring inline arrays like
-		// "ports = [8000, 8001]" as table sections.
-		if ch == '[' {
-			isSectionHeader := true
-			if i > 0 {
-				isSectionHeader = false
-				j := i - 1
-				for j >= 0 && toml[j] != '\n' {
-					if toml[j] != ' ' && toml[j] != '\t' && toml[j] != '\r' {
-						// Found a non-whitespace character before this '[' on the same line,
-						// so this is not a table header.
-						break
-					}
-					j--
-				}
-				if j < 0 || toml[j] == '\n' {
-					// Reached the start of the string or a newline without encountering
-					// any non-whitespace, so '[' is at the logical start of the line.
-					isSectionHeader = true
-				}
-			}
-			if isSectionHeader {
-				end := i + 1
-				// Check for [[
-				if end < len(toml) && toml[end] == '[' {
-					end++
-				}
-				// Find closing ]
-				for end < len(toml) && toml[end] != ']' {
-					end++
-				}
-				// Include closing ]
-				if end < len(toml) {
-					end++
-					// Check for ]]
-					if end < len(toml) && toml[end] == ']' {
-						end++
-					}
-				}
-				result.WriteString(sectionColor(toml[i:end]))
-				i = end
-				continue
-			}
-		}
-
-		// Strings - quoted text (double or single quotes)
-		if ch == '"' || ch == '\'' {
-			quote := ch
-			end := i + 1
-			for end < len(toml) {
-				if toml[end] == quote {
-					break
-				}
-				if toml[end] == '\\' && end+1 < len(toml) {
-					// Skip the backslash and the escaped character
-					end += 2
-					continue
-				}
-				end++
-			}
-			if end < len(toml) {
-				end++ // include closing quote
-			}
-			result.WriteString(stringColor(toml[i:end]))
-			i = end
-			continue
-		}
-
-		// Numbers - sequences of digits, possibly with decimal point or minus
-		if (ch >= '0' && ch <= '9') || (ch == '-' && i+1 < len(toml) && toml[i+1] >= '0' && toml[i+1] <= '9') {
-			end := i
-			if ch == '-' {
-				end++
-			}
-			for end < len(toml) {
-				c := toml[end]
-				if (c >= '0' && c <= '9') || c == '.' || c == 'e' || c == 'E' {
-					end++
-				} else if (c == '+' || c == '-') && end > 0 && (toml[end-1] == 'e' || toml[end-1] == 'E') {
-					// Only allow + or - immediately after 'e' or 'E' for scientific notation
-					end++
-				} else {
-					break
-				}
-			}
-			result.WriteString(numberColor(toml[i:end]))
-			i = end
-			continue
-		}
-
-		// Identifiers/keys - alphanumeric + underscore + dash
-		if (ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z') || ch == '_' {
-			end := i
-			for end < len(toml) && ((toml[end] >= 'a' && toml[end] <= 'z') ||
-				(toml[end] >= 'A' && toml[end] <= 'Z') ||
-				(toml[end] >= '0' && toml[end] <= '9') ||
-				toml[end] == '_' || toml[end] == '-') {
-				end++
-			}
-			ident := toml[i:end]
-
-			// Check if this is a boolean/null keyword
-			switch ident {
-			case "true", "false":
-				result.WriteString(boolColor(ident))
-			default:
-				// Check if followed by = or whitespace then = (it's a key)
-				j := end
-				for j < len(toml) && (toml[j] == ' ' || toml[j] == '\t') {
-					j++
-				}
-				if j < len(toml) && toml[j] == '=' {
-					result.WriteString(keyColor(ident))
-				} else {
-					result.WriteString(ident) // plain text for other identifiers
-				}
-			}
-			i = end
-			continue
-		}
-
-		// Everything else (whitespace, operators, brackets) - no color
-		result.WriteByte(ch)
-		i++
-	}
-
-	return []byte(result.String())
-}

pkg/yqlib/encoder_xml.go

@@ -59,7 +59,7 @@ func (e *xmlEncoder) Encode(writer io.Writer, node *CandidateNode) error {
 					return err
 				}
 				if _, err := e.writer.Write([]byte("\n")); err != nil {
-					log.Warningf("Unable to write newline, skipping: %v", err)
+					log.Warning("Unable to write newline, skipping: %w", err)
 				}
 			}
 		}
@@ -131,7 +131,7 @@ func (e *xmlEncoder) encodeTopLevelMap(encoder *xml.Encoder, node *CandidateNode
 				return err
 			}
 			if _, err := e.writer.Write([]byte("\n")); err != nil {
-				log.Warningf("Unable to write newline, skipping: %v", err)
+				log.Warning("Unable to write newline, skipping: %w", err)
 			}
 		} else if key.Value == e.prefs.DirectiveName {
 			var directive xml.Directive = []byte(value.Value)
@@ -139,7 +139,7 @@ func (e *xmlEncoder) encodeTopLevelMap(encoder *xml.Encoder, node *CandidateNode
 				return err
 			}
 			if _, err := e.writer.Write([]byte("\n")); err != nil {
-				log.Warningf("Unable to write newline, skipping: %v", err)
+				log.Warning("Unable to write newline, skipping: %w", err)
 			}
 		} else {
 

pkg/yqlib/encoder_yaml.go

@@ -1,10 +1,13 @@
 package yqlib
 
 import (
+	"bufio"
 	"bytes"
+	"errors"
 	"io"
 	"strings"
 
+	"github.com/fatih/color"
 	"go.yaml.in/yaml/v4"
 )
 
@@ -21,15 +24,67 @@ func (ye *yamlEncoder) CanHandleAliases() bool {
 }
 
 func (ye *yamlEncoder) PrintDocumentSeparator(writer io.Writer) error {
-	return PrintYAMLDocumentSeparator(writer, ye.prefs.PrintDocSeparators)
+	if ye.prefs.PrintDocSeparators {
+		log.Debug("writing doc sep")
+		if err := writeString(writer, "---\n"); err != nil {
+			return err
+		}
+	}
+	return nil
 }
 
 func (ye *yamlEncoder) PrintLeadingContent(writer io.Writer, content string) error {
-	return PrintYAMLLeadingContent(writer, content, ye.prefs.PrintDocSeparators, ye.prefs.ColorsEnabled)
+	reader := bufio.NewReader(strings.NewReader(content))
+
+	// reuse precompiled package-level regex
+	// (declared in decoder_yaml.go)
+
+	for {
+
+		readline, errReading := reader.ReadString('\n')
+		if errReading != nil && !errors.Is(errReading, io.EOF) {
+			return errReading
+		}
+		if strings.Contains(readline, "$yqDocSeparator$") {
+			// Preserve the original line ending (CRLF or LF)
+			lineEnding := "\n"
+			if strings.HasSuffix(readline, "\r\n") {
+				lineEnding = "\r\n"
+			}
+			if ye.prefs.PrintDocSeparators {
+				if err := writeString(writer, "---"+lineEnding); err != nil {
+					return err
+				}
+			}
+
+		} else {
+			if len(readline) > 0 && readline != "\n" && readline[0] != '%' && !commentLineRe.MatchString(readline) {
+				readline = "# " + readline
+			}
+			if ye.prefs.ColorsEnabled && strings.TrimSpace(readline) != "" {
+				readline = format(color.FgHiBlack) + readline + format(color.Reset)
+			}
+			if err := writeString(writer, readline); err != nil {
+				return err
+			}
+		}
+
+		if errors.Is(errReading, io.EOF) {
+			if readline != "" {
+				// the last comment we read didn't have a newline, put one in
+				if err := writeString(writer, "\n"); err != nil {
+					return err
+				}
+			}
+			break
+		}
+	}
+
+	return nil
 }
 
 func (ye *yamlEncoder) Encode(writer io.Writer, node *CandidateNode) error {
-	log.Debugf("encoderYaml - going to print %v", NodeToString(node))
+	log.Debug("encoderYaml - going to print %v", NodeToString(node))
 	// Detect line ending style from LeadingContent
 	lineEnding := "\n"
 	if strings.Contains(node.LeadingContent, "\r\n") {
@@ -52,9 +107,6 @@ func (ye *yamlEncoder) Encode(writer io.Writer, node *CandidateNode) error {
 	var encoder = yaml.NewEncoder(destination)
 
 	encoder.SetIndent(ye.prefs.Indent)
-	if ye.prefs.CompactSequenceIndent {
-		encoder.CompactSeqIndent()
-	}
 
 	target, err := node.MarshalYAML()
 

pkg/yqlib/expression_parser.go

@@ -26,7 +26,7 @@ func newExpressionParser() ExpressionParserInterface {
 }
 
 func (p *expressionParserImpl) ParseExpression(expression string) (*ExpressionNode, error) {
-	log.Debugf("Parsing expression: [%v]", expression)
+	log.Debug("Parsing expression: [%v]", expression)
 	tokens, err := p.pathTokeniser.Tokenise(expression)
 	if err != nil {
 		return nil, err

pkg/yqlib/expression_parser_test.go

@@ -95,7 +95,6 @@ func TestParserSingleOperation(t *testing.T) {
 	test.AssertResultComplex(t, nil, err)
 	if result == nil {
 		t.Fatal("Expected non-nil result for single operation")
-		return
 	}
 	if result.Operation == nil {
 		t.Fatal("Expected operation to be set")

pkg/yqlib/expression_postfix.go

@@ -3,7 +3,8 @@ package yqlib
 import (
 	"errors"
 	"fmt"
-	"log/slog"
+
+	logging "gopkg.in/op/go-logging.v1"
 )
 
 type expressionPostFixer interface {
@@ -133,7 +134,7 @@ func (p *expressionPostFixerImpl) ConvertToPostfix(infixTokens []*token) ([]*Ope
 		return nil, fmt.Errorf("bad expression - probably missing close bracket on %v", opStack[len(opStack)-1].toString(false))
 	}
 
-	if log.IsEnabledFor(slog.LevelDebug) {
+	if log.IsEnabledFor(logging.DEBUG) {
 		log.Debugf("PostFix Result:")
 		for _, currentToken := range result {
 			log.Debugf("> %v", currentToken.toString())

pkg/yqlib/file_utils.go

@@ -7,15 +7,7 @@ import (
 )
 
 func tryRenameFile(from string, to string) error {
-	if info, err := os.Lstat(to); err == nil && info.Mode()&os.ModeSymlink != 0 {
-		log.Debug("Target file is symlink, skipping rename and attempting to copy contents")
-
-		if copyError := copyFileContents(from, to); copyError != nil {
-			return fmt.Errorf("failed copying from %v to %v: %w", from, to, copyError)
-		}
-		tryRemoveTempFile(from)
-		return nil
-	} else if renameError := os.Rename(from, to); renameError != nil {
+	if renameError := os.Rename(from, to); renameError != nil {
 		log.Debugf("Error renaming from %v to %v, attempting to copy contents", from, to)
 		log.Debug(renameError.Error())
 		log.Debug("going to try copying instead")
@@ -30,7 +22,7 @@ func tryRenameFile(from string, to string) error {
 }
 
 func tryRemoveTempFile(filename string) {
-	log.Debugf("Removing temp file: %v", filename)
+	log.Debug("Removing temp file: %v", filename)
 	removeErr := os.Remove(filename)
 	if removeErr != nil {
 		log.Errorf("Failed to remove temp file: %v", filename)
@@ -68,7 +60,8 @@ func SafelyCloseReader(reader io.Reader) {
 func safelyCloseFile(file *os.File) {
 	err := file.Close()
 	if err != nil {
-		log.Errorf("Error closing file %v: %v", file.Name(), err)
+		log.Error("Error closing file!")
+		log.Error(err.Error())
 	}
 }
 

pkg/yqlib/format.go

@@ -22,12 +22,6 @@ var YamlFormat = &Format{"yaml", []string{"y", "yml"},
 	func() Decoder { return NewYamlDecoder(ConfiguredYamlPreferences) },
 }
 
-var KYamlFormat = &Format{"kyaml", []string{"ky"},
-	func() Encoder { return NewKYamlEncoder(ConfiguredKYamlPreferences) },
-	// KYaml is stricter YAML
-	func() Decoder { return NewYamlDecoder(ConfiguredYamlPreferences) },
-}
-
 var JSONFormat = &Format{"json", []string{"j"},
 	func() Encoder { return NewJSONEncoder(ConfiguredJSONPreferences) },
 	func() Decoder { return NewJSONDecoder() },
@@ -69,11 +63,11 @@ var ShFormat = &Format{"", nil,
 }
 
 var TomlFormat = &Format{"toml", []string{},
-	func() Encoder { return NewTomlEncoderWithPrefs(ConfiguredTomlPreferences) },
+	func() Encoder { return NewTomlEncoder() },
 	func() Decoder { return NewTomlDecoder() },
 }
 
-var HclFormat = &Format{"hcl", []string{"h", "tf"},
+var HclFormat = &Format{"hcl", []string{"h"},
 	func() Encoder { return NewHclEncoder(ConfiguredHclPreferences) },
 	func() Decoder { return NewHclDecoder() },
 }
@@ -95,7 +89,6 @@ var INIFormat = &Format{"ini", []string{"i"},
 
 var Formats = []*Format{
 	YamlFormat,
-	KYamlFormat,
 	JSONFormat,
 	PropertiesFormat,
 	CSVFormat,

pkg/yqlib/front_matter.go

@@ -58,7 +58,7 @@ func (f *frontMatterHandlerImpl) Split() error {
 		return err
 	}
 	f.yamlFrontMatterFilename = yamlTempFile.Name()
-	log.Debugf("yamlTempFile: %v", yamlTempFile.Name())
+	log.Debug("yamlTempFile: %v", yamlTempFile.Name())
 
 	lineCount := 0
 

pkg/yqlib/front_matter_test.go

@@ -108,55 +108,6 @@ yaml: doc
 	fmHandler.CleanUp()
 }
 
-func TestFrontMatterFilenamePreserved(t *testing.T) {
-	// Regression test for https://github.com/mikefarah/yq/issues/2538
-	// When using --front-matter, the filename operator should return
-	// the original filename, not the path to the temporary file.
-	file := createTestFile(`---
-name: john
----
-Some content
-`)
-	originalFilename := "/path/to/original/file.md"
-
-	fmHandler := NewFrontMatterHandler(file)
-	err := fmHandler.Split()
-	if err != nil {
-		panic(err)
-	}
-
-	tempFilename := fmHandler.GetYamlFrontMatterFilename()
-
-	// Register the alias (as the command code does)
-	SetFilenameAlias(tempFilename, originalFilename)
-	defer ClearFilenameAliases()
-
-	// Verify resolveFilename returns the original name
-	resolved := resolveFilename(tempFilename)
-	test.AssertResult(t, originalFilename, resolved)
-
-	// Read documents using the temp file, verify they get the original filename
-	reader, err := readStream(tempFilename)
-	if err != nil {
-		panic(err)
-	}
-	decoder := NewYamlDecoder(ConfiguredYamlPreferences)
-	docs, err := readDocuments(reader, tempFilename, 0, decoder)
-	if err != nil {
-		panic(err)
-	}
-
-	if docs.Len() == 0 {
-		t.Fatal("expected at least one document")
-	}
-
-	firstDoc := docs.Front().Value.(*CandidateNode)
-	test.AssertResult(t, originalFilename, firstDoc.filename)
-
-	tryRemoveTempFile(file)
-	fmHandler.CleanUp()
-}
-
 func TestFrontMatterSplitWithArray(t *testing.T) {
 	file := createTestFile(`[1,2,3]
 ---

pkg/yqlib/hcl_test.go

@@ -4,7 +4,6 @@ package yqlib
 
 import (
 	"bufio"
-	"bytes"
 	"fmt"
 	"testing"
 
@@ -326,14 +325,6 @@ var hclFormatScenarios = []formatScenario{
 		expected:     "# Configuration\nport = 8080\n",
 		scenarioType: "roundtrip",
 	},
-	{
-		description:  "Roundtrip:  extraction",
-		skipDoc:      true,
-		input:        simpleSample,
-		expression:   ".shouty_message",
-		expected:     "upper(message)\n",
-		scenarioType: "roundtrip",
-	},
 	{
 		description:  "Roundtrip: With templates, functions and arithmetic",
 		input:        simpleSample,
@@ -544,35 +535,6 @@ func documentHclRoundTripScenario(w *bufio.Writer, s formatScenario) {
 	writeOrPanic(w, fmt.Sprintf("```hcl\n%v```\n\n", mustProcessFormatScenario(s, NewHclDecoder(), NewHclEncoder(ConfiguredHclPreferences))))
 }
 
-func TestHclEncoderPrintDocumentSeparator(t *testing.T) {
-	encoder := NewHclEncoder(ConfiguredHclPreferences)
-	var buf bytes.Buffer
-	writer := bufio.NewWriter(&buf)
-
-	err := encoder.PrintDocumentSeparator(writer)
-	writer.Flush()
-
-	test.AssertResult(t, nil, err)
-	test.AssertResult(t, "", buf.String())
-}
-
-func TestHclEncoderPrintLeadingContent(t *testing.T) {
-	encoder := NewHclEncoder(ConfiguredHclPreferences)
-	var buf bytes.Buffer
-	writer := bufio.NewWriter(&buf)
-
-	err := encoder.PrintLeadingContent(writer, "some content")
-	writer.Flush()
-
-	test.AssertResult(t, nil, err)
-	test.AssertResult(t, "", buf.String())
-}
-
-func TestHclEncoderCanHandleAliases(t *testing.T) {
-	encoder := NewHclEncoder(ConfiguredHclPreferences)
-	test.AssertResult(t, false, encoder.CanHandleAliases())
-}
-
 func TestHclFormatScenarios(t *testing.T) {
 	for _, tt := range hclFormatScenarios {
 		testHclScenario(t, tt)

pkg/yqlib/kyaml.go

@@ -1,30 +0,0 @@
-//go:build !yq_nokyaml
-
-package yqlib
-
-type KYamlPreferences struct {
-	Indent             int
-	ColorsEnabled      bool
-	PrintDocSeparators bool
-	UnwrapScalar       bool
-}
-
-func NewDefaultKYamlPreferences() KYamlPreferences {
-	return KYamlPreferences{
-		Indent:             2,
-		ColorsEnabled:      false,
-		PrintDocSeparators: true,
-		UnwrapScalar:       true,
-	}
-}
-
-func (p *KYamlPreferences) Copy() KYamlPreferences {
-	return KYamlPreferences{
-		Indent:             p.Indent,
-		ColorsEnabled:      p.ColorsEnabled,
-		PrintDocSeparators: p.PrintDocSeparators,
-		UnwrapScalar:       p.UnwrapScalar,
-	}
-}
-
-var ConfiguredKYamlPreferences = NewDefaultKYamlPreferences()

pkg/yqlib/kyaml_test.go

@@ -1,542 +0,0 @@
-//go:build !yq_nokyaml
-
-package yqlib
-
-import (
-	"bufio"
-	"bytes"
-	"fmt"
-	"regexp"
-	"strings"
-	"testing"
-
-	"github.com/mikefarah/yq/v4/test"
-)
-
-var ansiRe = regexp.MustCompile(`\x1b\[[0-9;]*m`)
-
-func stripANSI(s string) string {
-	return ansiRe.ReplaceAllString(s, "")
-}
-
-var kyamlFormatScenarios = []formatScenario{
-	{
-		description:    "Encode kyaml: plain string scalar",
-		subdescription: "Strings are always double-quoted in KYaml output.",
-		scenarioType:   "encode",
-		indent:         2,
-		input:          "cat\n",
-		expected:       "\"cat\"\n",
-	},
-	{
-		description:  "encode plain int scalar",
-		scenarioType: "encode",
-		indent:       2,
-		input:        "12\n",
-		expected:     "12\n",
-		skipDoc:      true,
-	},
-	{
-		description:  "encode plain bool scalar",
-		scenarioType: "encode",
-		indent:       2,
-		input:        "true\n",
-		expected:     "true\n",
-		skipDoc:      true,
-	},
-	{
-		description:  "encode plain null scalar",
-		scenarioType: "encode",
-		indent:       2,
-		input:        "null\n",
-		expected:     "null\n",
-		skipDoc:      true,
-	},
-	{
-		description:  "encode flow mapping and sequence",
-		scenarioType: "encode",
-		indent:       2,
-		input:        "a: b\nc:\n  - d\n",
-		expected: "{\n" +
-			"  a: \"b\",\n" +
-			"  c: [\n" +
-			"    \"d\",\n" +
-			"  ],\n" +
-			"}\n",
-	},
-	{
-		description:  "encode non-string scalars",
-		scenarioType: "encode",
-		indent:       2,
-		input: "a: 12\n" +
-			"b: true\n" +
-			"c: null\n" +
-			"d: \"true\"\n",
-		expected: "{\n" +
-			"  a: 12,\n" +
-			"  b: true,\n" +
-			"  c: null,\n" +
-			"  d: \"true\",\n" +
-			"}\n",
-	},
-	{
-		description:  "quote non-identifier keys",
-		scenarioType: "encode",
-		indent:       2,
-		input:        "\"1a\": b\n\"has space\": c\n",
-		expected: "{\n" +
-			"  \"1a\": \"b\",\n" +
-			"  \"has space\": \"c\",\n" +
-			"}\n",
-	},
-	{
-		description:  "escape quoted strings",
-		scenarioType: "encode",
-		indent:       2,
-		input:        "a: \"line1\\nline2\\t\\\"q\\\"\"\n",
-		expected: "{\n" +
-			"  a: \"line1\\nline2\\t\\\"q\\\"\",\n" +
-			"}\n",
-	},
-	{
-		description:  "preserve comments when encoding",
-		scenarioType: "encode",
-		indent:       2,
-		input: "# leading\n" +
-			"a: 1 # a line\n" +
-			"# head b\n" +
-			"b: 2\n" +
-			"c:\n" +
-			"  # head d\n" +
-			"  - d # d line\n" +
-			"  - e\n" +
-			"# trailing\n",
-		expected: "# leading\n" +
-			"{\n" +
-			"  a: 1, # a line\n" +
-			"  # head b\n" +
-			"  b: 2,\n" +
-			"  c: [\n" +
-			"    # head d\n" +
-			"    \"d\", # d line\n" +
-			"    \"e\",\n" +
-			"  ],\n" +
-			"  # trailing\n" +
-			"}\n",
-	},
-	{
-		description:    "Encode kyaml: anchors and aliases",
-		subdescription: "KYaml output does not support anchors/aliases; they are expanded to concrete values.",
-		scenarioType:   "encode",
-		indent:         2,
-		input: "base: &base\n" +
-			"  a: b\n" +
-			"copy: *base\n",
-		expected: "{\n" +
-			"  base: {\n" +
-			"    a: \"b\",\n" +
-			"  },\n" +
-			"  copy: {\n" +
-			"    a: \"b\",\n" +
-			"  },\n" +
-			"}\n",
-	},
-	{
-		description:    "Encode kyaml: yaml to kyaml shows formatting differences",
-		subdescription: "KYaml uses flow-style collections (braces/brackets) and explicit commas.",
-		scenarioType:   "encode",
-		indent:         2,
-		input: "person:\n" +
-			"  name: John\n" +
-			"  pets:\n" +
-			"    - cat\n" +
-			"    - dog\n",
-		expected: "{\n" +
-			"  person: {\n" +
-			"    name: \"John\",\n" +
-			"    pets: [\n" +
-			"      \"cat\",\n" +
-			"      \"dog\",\n" +
-			"    ],\n" +
-			"  },\n" +
-			"}\n",
-	},
-	{
-		description:    "Encode kyaml: nested lists of objects",
-		subdescription: "Lists and objects can be nested arbitrarily; KYaml always uses flow-style collections.",
-		scenarioType:   "encode",
-		indent:         2,
-		input: "- name: a\n" +
-			"  items:\n" +
-			"    - id: 1\n" +
-			"      tags:\n" +
-			"        - k: x\n" +
-			"          v: y\n" +
-			"        - k: x2\n" +
-			"          v: y2\n" +
-			"    - id: 2\n" +
-			"      tags:\n" +
-			"        - k: z\n" +
-			"          v: w\n",
-		expected: "[\n" +
-			"  {\n" +
-			"    name: \"a\",\n" +
-			"    items: [\n" +
-			"      {\n" +
-			"        id: 1,\n" +
-			"        tags: [\n" +
-			"          {\n" +
-			"            k: \"x\",\n" +
-			"            v: \"y\",\n" +
-			"          },\n" +
-			"          {\n" +
-			"            k: \"x2\",\n" +
-			"            v: \"y2\",\n" +
-			"          },\n" +
-			"        ],\n" +
-			"      },\n" +
-			"      {\n" +
-			"        id: 2,\n" +
-			"        tags: [\n" +
-			"          {\n" +
-			"            k: \"z\",\n" +
-			"            v: \"w\",\n" +
-			"          },\n" +
-			"        ],\n" +
-			"      },\n" +
-			"    ],\n" +
-			"  },\n" +
-			"]\n",
-	},
-}
-
-func testKYamlScenario(t *testing.T, s formatScenario) {
-	prefs := ConfiguredKYamlPreferences.Copy()
-	prefs.Indent = s.indent
-	prefs.UnwrapScalar = false
-
-	switch s.scenarioType {
-	case "encode":
-		test.AssertResultWithContext(
-			t,
-			s.expected,
-			mustProcessFormatScenario(s, NewYamlDecoder(ConfiguredYamlPreferences), NewKYamlEncoder(prefs)),
-			s.description,
-		)
-	default:
-		panic(fmt.Sprintf("unhandled scenario type %q", s.scenarioType))
-	}
-}
-
-func documentKYamlScenario(_ *testing.T, w *bufio.Writer, i interface{}) {
-	s := i.(formatScenario)
-	if s.skipDoc {
-		return
-	}
-
-	switch s.scenarioType {
-	case "encode":
-		documentKYamlEncodeScenario(w, s)
-	default:
-		panic(fmt.Sprintf("unhandled scenario type %q", s.scenarioType))
-	}
-}
-
-func documentKYamlEncodeScenario(w *bufio.Writer, s formatScenario) {
-	writeOrPanic(w, fmt.Sprintf("## %v\n", s.description))
-
-	if s.subdescription != "" {
-		writeOrPanic(w, s.subdescription)
-		writeOrPanic(w, "\n\n")
-	}
-
-	writeOrPanic(w, "Given a sample.yml file of:\n")
-	writeOrPanic(w, fmt.Sprintf("```yaml\n%v\n```\n", s.input))
-
-	writeOrPanic(w, "then\n")
-
-	expression := s.expression
-	if expression == "" {
-		expression = "."
-	}
-
-	if s.indent == 2 {
-		writeOrPanic(w, fmt.Sprintf("```bash\nyq -o=kyaml '%v' sample.yml\n```\n", expression))
-	} else {
-		writeOrPanic(w, fmt.Sprintf("```bash\nyq -o=kyaml -I=%v '%v' sample.yml\n```\n", s.indent, expression))
-	}
-
-	writeOrPanic(w, "will output\n")
-
-	prefs := ConfiguredKYamlPreferences.Copy()
-	prefs.Indent = s.indent
-	prefs.UnwrapScalar = false
-
-	writeOrPanic(w, fmt.Sprintf("```yaml\n%v```\n\n", mustProcessFormatScenario(s, NewYamlDecoder(ConfiguredYamlPreferences), NewKYamlEncoder(prefs))))
-}
-
-func TestKYamlFormatScenarios(t *testing.T) {
-	for _, s := range kyamlFormatScenarios {
-		testKYamlScenario(t, s)
-	}
-
-	genericScenarios := make([]interface{}, len(kyamlFormatScenarios))
-	for i, s := range kyamlFormatScenarios {
-		genericScenarios[i] = s
-	}
-	documentScenarios(t, "usage", "kyaml", genericScenarios, documentKYamlScenario)
-}
-
-func TestKYamlEncoderPrintDocumentSeparator(t *testing.T) {
-	t.Run("enabled", func(t *testing.T) {
-		prefs := NewDefaultKYamlPreferences()
-		prefs.PrintDocSeparators = true
-
-		var buf bytes.Buffer
-		err := NewKYamlEncoder(prefs).PrintDocumentSeparator(&buf)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if buf.String() != "---\n" {
-			t.Fatalf("expected doc separator, got %q", buf.String())
-		}
-	})
-
-	t.Run("disabled", func(t *testing.T) {
-		prefs := NewDefaultKYamlPreferences()
-		prefs.PrintDocSeparators = false
-
-		var buf bytes.Buffer
-		err := NewKYamlEncoder(prefs).PrintDocumentSeparator(&buf)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if buf.String() != "" {
-			t.Fatalf("expected no output, got %q", buf.String())
-		}
-	})
-}
-
-func TestKYamlEncoderEncodeUnwrapScalar(t *testing.T) {
-	prefs := NewDefaultKYamlPreferences()
-	prefs.UnwrapScalar = true
-
-	var buf bytes.Buffer
-	err := NewKYamlEncoder(prefs).Encode(&buf, &CandidateNode{
-		Kind:  ScalarNode,
-		Tag:   "!!str",
-		Value: "cat",
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if buf.String() != "cat\n" {
-		t.Fatalf("expected unwrapped scalar, got %q", buf.String())
-	}
-}
-
-func TestKYamlEncoderEncodeColorsEnabled(t *testing.T) {
-	prefs := NewDefaultKYamlPreferences()
-	prefs.UnwrapScalar = false
-	prefs.ColorsEnabled = true
-
-	var buf bytes.Buffer
-	err := NewKYamlEncoder(prefs).Encode(&buf, &CandidateNode{
-		Kind: MappingNode,
-		Content: []*CandidateNode{
-			{Kind: ScalarNode, Tag: "!!str", Value: "a"},
-			{Kind: ScalarNode, Tag: "!!str", Value: "b"},
-		},
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	out := stripANSI(buf.String())
-	if !strings.Contains(out, "a:") || !strings.Contains(out, "\"b\"") {
-		t.Fatalf("expected colourised output to contain rendered tokens, got %q", out)
-	}
-}
-
-func TestKYamlEncoderWriteNodeAliasAndUnknown(t *testing.T) {
-	ke := NewKYamlEncoder(NewDefaultKYamlPreferences()).(*kyamlEncoder)
-
-	t.Run("alias_nil", func(t *testing.T) {
-		var buf bytes.Buffer
-		err := ke.writeNode(&buf, &CandidateNode{Kind: AliasNode}, 0)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if buf.String() != "null" {
-			t.Fatalf("expected null for nil alias, got %q", buf.String())
-		}
-	})
-
-	t.Run("alias_value", func(t *testing.T) {
-		var buf bytes.Buffer
-		err := ke.writeNode(&buf, &CandidateNode{
-			Kind:  AliasNode,
-			Alias: &CandidateNode{Kind: ScalarNode, Tag: "!!int", Value: "12"},
-		}, 0)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if buf.String() != "12" {
-			t.Fatalf("expected dereferenced alias value, got %q", buf.String())
-		}
-	})
-
-	t.Run("unknown_kind", func(t *testing.T) {
-		var buf bytes.Buffer
-		err := ke.writeNode(&buf, &CandidateNode{Kind: Kind(12345)}, 0)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if buf.String() != "null" {
-			t.Fatalf("expected null for unknown kind, got %q", buf.String())
-		}
-	})
-}
-
-func TestKYamlEncoderEmptyCollections(t *testing.T) {
-	ke := NewKYamlEncoder(NewDefaultKYamlPreferences()).(*kyamlEncoder)
-
-	t.Run("empty_mapping", func(t *testing.T) {
-		var buf bytes.Buffer
-		err := ke.writeNode(&buf, &CandidateNode{Kind: MappingNode}, 0)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if buf.String() != "{}" {
-			t.Fatalf("expected empty mapping, got %q", buf.String())
-		}
-	})
-
-	t.Run("empty_sequence", func(t *testing.T) {
-		var buf bytes.Buffer
-		err := ke.writeNode(&buf, &CandidateNode{Kind: SequenceNode}, 0)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if buf.String() != "[]" {
-			t.Fatalf("expected empty sequence, got %q", buf.String())
-		}
-	})
-}
-
-func TestKYamlEncoderScalarFallbackAndEscaping(t *testing.T) {
-	ke := NewKYamlEncoder(NewDefaultKYamlPreferences()).(*kyamlEncoder)
-
-	t.Run("unknown_tag_falls_back_to_string", func(t *testing.T) {
-		var buf bytes.Buffer
-		err := ke.writeNode(&buf, &CandidateNode{Kind: ScalarNode, Tag: "!!timestamp", Value: "2020-01-01T00:00:00Z"}, 0)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if buf.String() != "\"2020-01-01T00:00:00Z\"" {
-			t.Fatalf("expected quoted fallback, got %q", buf.String())
-		}
-	})
-
-	t.Run("escape_double_quoted", func(t *testing.T) {
-		got := escapeDoubleQuotedString("a\\b\"c\n\r\t" + string(rune(0x01)))
-		want := "a\\\\b\\\"c\\n\\r\\t\\u0001"
-		if got != want {
-			t.Fatalf("expected %q, got %q", want, got)
-		}
-	})
-
-	t.Run("valid_bare_key", func(t *testing.T) {
-		if isValidKYamlBareKey("") {
-			t.Fatalf("expected empty string to be invalid")
-		}
-		if isValidKYamlBareKey("1a") {
-			t.Fatalf("expected leading digit to be invalid")
-		}
-		if !isValidKYamlBareKey("a_b-2") {
-			t.Fatalf("expected identifier-like key to be valid")
-		}
-	})
-}
-
-func TestKYamlEncoderCommentsInMapping(t *testing.T) {
-	prefs := NewDefaultKYamlPreferences()
-	prefs.UnwrapScalar = false
-	ke := NewKYamlEncoder(prefs).(*kyamlEncoder)
-
-	var buf bytes.Buffer
-	err := ke.writeNode(&buf, &CandidateNode{
-		Kind: MappingNode,
-		Content: []*CandidateNode{
-			{
-				Kind:        ScalarNode,
-				Tag:         "!!str",
-				Value:       "a",
-				HeadComment: "key head",
-				LineComment: "key line",
-				FootComment: "key foot",
-			},
-			{
-				Kind:        ScalarNode,
-				Tag:         "!!str",
-				Value:       "b",
-				HeadComment: "value head",
-			},
-		},
-	}, 0)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	out := buf.String()
-	if !strings.Contains(out, "# key head\n") {
-		t.Fatalf("expected key head comment, got %q", out)
-	}
-	if !strings.Contains(out, "# value head\n") {
-		t.Fatalf("expected value head comment, got %q", out)
-	}
-	if !strings.Contains(out, ", # key line\n") {
-		t.Fatalf("expected inline key comment fallback, got %q", out)
-	}
-	if !strings.Contains(out, "# key foot\n") {
-		t.Fatalf("expected foot comment fallback, got %q", out)
-	}
-}
-
-func TestKYamlEncoderCommentBlockAndInlineComment(t *testing.T) {
-	ke := NewKYamlEncoder(NewDefaultKYamlPreferences()).(*kyamlEncoder)
-
-	t.Run("comment_block_prefixing_and_crlf", func(t *testing.T) {
-		var buf bytes.Buffer
-		err := ke.writeCommentBlock(&buf, "line1\r\n\r\n# already\r\nline2", 2)
-		if err != nil {
-			t.Fatal(err)
-		}
-		want := "  # line1\n  # already\n  # line2\n"
-		if buf.String() != want {
-			t.Fatalf("expected %q, got %q", want, buf.String())
-		}
-	})
-
-	t.Run("inline_comment_prefix_and_first_line_only", func(t *testing.T) {
-		var buf bytes.Buffer
-		err := ke.writeInlineComment(&buf, "hello\r\nsecond line")
-		if err != nil {
-			t.Fatal(err)
-		}
-		if buf.String() != " # hello" {
-			t.Fatalf("expected %q, got %q", " # hello", buf.String())
-		}
-	})
-
-	t.Run("inline_comment_already_prefixed", func(t *testing.T) {
-		var buf bytes.Buffer
-		err := ke.writeInlineComment(&buf, "# hello")
-		if err != nil {
-			t.Fatal(err)
-		}
-		if buf.String() != " # hello" {
-			t.Fatalf("expected %q, got %q", " # hello", buf.String())
-		}
-	})
-}

pkg/yqlib/lexer.go

@@ -61,7 +61,7 @@ func unwrap(value string) string {
 }
 
 func extractNumberParameter(value string) (int, error) {
-	parameterParser := regexp.MustCompile(`.*\((-?[0-9]+)\)`)
+	parameterParser := regexp.MustCompile(`.*\(([0-9]+)\)`)
 	matches := parameterParser.FindStringSubmatch(value)
 	var indent, errParsingInt = parseInt(matches[1])
 	if errParsingInt != nil {
@@ -105,7 +105,7 @@ func handleToken(tokens []*token, index int, postProcessedTokens []*token) (toke
 	skipNextToken = false
 	currentToken := tokens[index]
 
-	log.Debugf("processing %v", currentToken.toString(true))
+	log.Debug("processing %v", currentToken.toString(true))
 
 	if currentToken.TokenType == traverseArrayCollect {
 		// `.[exp]`` works by creating a traversal array of [self, exp] and piping that into the traverse array operator

pkg/yqlib/lexer_participle.go

@@ -57,7 +57,7 @@ var participleYqRules = []*participleYqRule{
 	simpleOp("sort_?keys", sortKeysOpType),
 
 	{"ArrayToMap", "array_?to_?map", expressionOpToken(`(.[] | select(. != null) ) as $i ireduce({}; .[$i | key] = $i)`), 0},
-	{"Root", "root", expressionOpToken(`parent(-1)`), 0},
+
 	{"YamlEncodeWithIndent", `to_?yaml\([0-9]+\)`, encodeParseIndent(YamlFormat), 0},
 	{"XMLEncodeWithIndent", `to_?xml\([0-9]+\)`, encodeParseIndent(XMLFormat), 0},
 	{"JSONEncodeWithIndent", `to_?json\([0-9]+\)`, encodeParseIndent(JSONFormat), 0},
@@ -132,7 +132,7 @@ var participleYqRules = []*participleYqRule{
 	simpleOp("split", splitStringOpType),
 
 	simpleOp("parents", getParentsOpType),
-	{"ParentWithLevel", `parent\(-?[0-9]+\)`, parentWithLevel(), 0},
+	{"ParentWithLevel", `parent\([0-9]+\)`, parentWithLevel(), 0},
 	{"ParentWithDefaultLevel", `parent`, parentWithDefaultLevel(), 0},
 
 	simpleOp("keys", keysOpType),
@@ -283,7 +283,7 @@ func pathToken(wrapped bool) yqAction {
 		if wrapped {
 			value = unwrap(value)
 		}
-		log.Debugf("PathToken %v", value)
+		log.Debug("PathToken %v", value)
 		op := &Operation{OperationType: traversePathOpType, Value: value, StringValue: value, Preferences: prefs}
 		return &token{TokenType: operationToken, Operation: op, CheckForPostTraverse: true}, nil
 	}
@@ -336,7 +336,7 @@ func flattenWithDepth() yqAction {
 
 func assignAllCommentsOp(updateAssign bool) yqAction {
 	return func(rawToken lexer.Token) (*token, error) {
-		log.Debugf("assignAllCommentsOp %v", rawToken.Value)
+		log.Debug("assignAllCommentsOp %v", rawToken.Value)
 		value := rawToken.Value
 		op := &Operation{
 			OperationType: assignCommentOpType,
@@ -351,7 +351,7 @@ func assignAllCommentsOp(updateAssign bool) yqAction {
 
 func assignOpToken(updateAssign bool) yqAction {
 	return func(rawToken lexer.Token) (*token, error) {
-		log.Debugf("assignOpToken %v", rawToken.Value)
+		log.Debug("assignOpToken %v", rawToken.Value)
 		value := rawToken.Value
 		prefs := assignPreferences{DontOverWriteAnchor: true}
 		if strings.Contains(value, "c") {
@@ -376,9 +376,9 @@ func nullValue() yqAction {
 
 func stringValue() yqAction {
 	return func(rawToken lexer.Token) (*token, error) {
-		log.Debugf("rawTokenvalue: %v", rawToken.Value)
+		log.Debug("rawTokenvalue: %v", rawToken.Value)
 		value := unwrap(rawToken.Value)
-		log.Debugf("unwrapped: %v", value)
+		log.Debug("unwrapped: %v", value)
 		value = processEscapeCharacters(value)
 		return &token{TokenType: operationToken, Operation: &Operation{
 			OperationType: stringInterpolationOpType,
@@ -451,7 +451,6 @@ func multiplyWithPrefs(op *operationType) yqAction {
 			prefs.AssignPrefs.ClobberCustomTags = true
 		}
 		prefs.TraversePrefs.DontFollowAlias = true
-		prefs.TraversePrefs.ExactKeyMatch = true
 		op := &Operation{OperationType: op, Value: multiplyOpType.Type, StringValue: options, Preferences: prefs}
 		return &token{TokenType: operationToken, Operation: op}, nil
 	}

pkg/yqlib/lib.go

@@ -4,10 +4,11 @@ package yqlib
 import (
 	"container/list"
 	"fmt"
-	"log/slog"
 	"math"
 	"strconv"
 	"strings"
+
+	logging "gopkg.in/op/go-logging.v1"
 )
 
 var ExpressionParser ExpressionParserInterface
@@ -18,17 +19,17 @@ func InitExpressionParser() {
 	}
 }
 
-var log = newLogger()
+var log = logging.MustGetLogger("yq-lib")
 
 var PrettyPrintExp = `(... | (select(tag != "!!str"), select(tag == "!!str") | select(test("(?i)^(y|yes|n|no|on|off)$") | not))  ) style=""`
 
 // GetLogger returns the yq logger instance.
-func GetLogger() *Logger {
+func GetLogger() *logging.Logger {
 	return log
 }
 
 func getContentValueByKey(content []*CandidateNode, key string) *CandidateNode {
-	for index := 0; index < len(content)-1; index = index + 2 {
+	for index := 0; index < len(content); index = index + 2 {
 		keyNode := content[index]
 		valueNode := content[index+1]
 		if keyNode.Value == key {
@@ -250,7 +251,7 @@ func processEscapeCharacters(original string) string {
 
 	value := result.String()
 	if value != original {
-		log.Debugf("processEscapeCharacters from [%v] to [%v]", original, value)
+		log.Debug("processEscapeCharacters from [%v] to [%v]", original, value)
 	}
 	return value
 }
@@ -273,7 +274,7 @@ func footComment(node *CandidateNode) string {
 
 // use for debugging only
 func NodesToString(collection *list.List) string {
-	if !log.IsEnabledFor(slog.LevelDebug) {
+	if !log.IsEnabledFor(logging.DEBUG) {
 		return ""
 	}
 
@@ -285,7 +286,7 @@ func NodesToString(collection *list.List) string {
 }
 
 func NodeToString(node *CandidateNode) string {
-	if !log.IsEnabledFor(slog.LevelDebug) {
+	if !log.IsEnabledFor(logging.DEBUG) {
 		return ""
 	}
 	if node == nil {
@@ -303,7 +304,7 @@ func NodeToString(node *CandidateNode) string {
 }
 
 func NodeContentToString(node *CandidateNode, depth int) string {
-	if !log.IsEnabledFor(slog.LevelDebug) {
+	if !log.IsEnabledFor(logging.DEBUG) {
 		return ""
 	}
 	var sb strings.Builder

pkg/yqlib/logger.go

@@ -1,77 +0,0 @@
-package yqlib
-
-import (
-	"fmt"
-	"log/slog"
-	"os"
-)
-
-// Logger wraps log/slog providing a printf-style interface used throughout yq.
-type Logger struct {
-	levelVar slog.LevelVar
-	slogger  *slog.Logger
-}
-
-func newLogger() *Logger {
-	l := &Logger{}
-	l.levelVar.Set(slog.LevelWarn)
-	handler := slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{Level: &l.levelVar})
-	l.slogger = slog.New(handler)
-	return l
-}
-
-// SetLevel sets the minimum log level.
-func (l *Logger) SetLevel(level slog.Level) {
-	l.levelVar.Set(level)
-}
-
-// GetLevel returns the current log level.
-func (l *Logger) GetLevel() slog.Level {
-	return l.levelVar.Level()
-}
-
-// IsEnabledFor returns true if the given level is enabled.
-func (l *Logger) IsEnabledFor(level slog.Level) bool {
-	return l.levelVar.Level() <= level
-}
-
-// SetSlogger replaces the underlying slog.Logger (e.g. to configure output format).
-func (l *Logger) SetSlogger(logger *slog.Logger) {
-	l.slogger = logger
-}
-
-func (l *Logger) Debug(msg string) {
-	if l.IsEnabledFor(slog.LevelDebug) {
-		l.slogger.Debug(msg)
-	}
-}
-
-func (l *Logger) Debugf(format string, args ...interface{}) {
-	if l.IsEnabledFor(slog.LevelDebug) {
-		l.slogger.Debug(fmt.Sprintf(format, args...))
-	}
-}
-
-func (l *Logger) Info(msg string) {
-	l.slogger.Info(msg)
-}
-
-func (l *Logger) Infof(format string, args ...interface{}) {
-	l.slogger.Info(fmt.Sprintf(format, args...))
-}
-
-func (l *Logger) Warning(msg string) {
-	l.slogger.Warn(msg)
-}
-
-func (l *Logger) Warningf(format string, args ...interface{}) {
-	l.slogger.Warn(fmt.Sprintf(format, args...))
-}
-
-func (l *Logger) Error(msg string) {
-	l.slogger.Error(msg)
-}
-
-func (l *Logger) Errorf(format string, args ...interface{}) {
-	l.slogger.Error(fmt.Sprintf(format, args...))
-}

pkg/yqlib/no_kyaml.go

@@ -1,7 +0,0 @@
-//go:build yq_nokyaml
-
-package yqlib
-
-func NewKYamlEncoder(_ KYamlPreferences) Encoder {
-	return nil
-}

pkg/yqlib/no_toml.go

@@ -5,11 +5,3 @@ package yqlib
 func NewTomlDecoder() Decoder {
 	return nil
 }
-
-func NewTomlEncoder() Encoder {
-	return nil
-}
-
-func NewTomlEncoderWithPrefs(prefs TomlPreferences) Encoder {
-	return nil
-}

pkg/yqlib/operation.go

@@ -25,7 +25,7 @@ var valueToStringFunc = func(p *Operation) string {
 }
 
 func createValueOperation(value interface{}, stringValue string) *Operation {
-	log.Debugf("creating value op for string %v", stringValue)
+	log.Debug("creating value op for string %v", stringValue)
 	var node = createScalarNode(value, stringValue)
 
 	return &Operation{

pkg/yqlib/operator_add.go

@@ -195,9 +195,9 @@ func addMaps(target *CandidateNode, lhsC *CandidateNode, rhsC *CandidateNode) {
 	for index := 0; index < len(rhs.Content); index = index + 2 {
 		key := rhs.Content[index]
 		value := rhs.Content[index+1]
-		log.Debugf("finding %v", key.Value)
+		log.Debug("finding %v", key.Value)
 		indexInLHS := findKeyInMap(target, key)
-		log.Debugf("indexInLhs %v", indexInLHS)
+		log.Debug("indexInLhs %v", indexInLHS)
 		if indexInLHS < 0 {
 			// not in there, append it
 			target.AddKeyValueChild(key, value)

pkg/yqlib/operator_anchors_aliases.go

@@ -256,7 +256,7 @@ func explodeNode(node *CandidateNode, context Context) error {
 			node.Value = node.Alias.Value
 			node.Alias = nil
 		}
-		log.Debugf("now I'm %v", NodeToString(node))
+		log.Debug("now I'm %v", NodeToString(node))
 		return nil
 	case MappingNode:
 		// //check the map has an alias in it
@@ -304,7 +304,7 @@ func applyAlias(node *CandidateNode, alias *CandidateNode, aliasIndex int, newCo
 	if alias == nil {
 		return nil
 	}
-	log.Debugf("alias: %v", NodeToString(alias))
+	log.Debug("alias: %v", NodeToString(alias))
 	if alias.Kind != MappingNode {
 		return fmt.Errorf("can only use merge anchors with maps (!!map) or sequences (!!seq) of maps, but got sequence containing %v", alias.Tag)
 	}

pkg/yqlib/operator_anchors_aliases_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 )
 
-var specDocument = `- &CENTRE { x: 1, y: 2 }
+var specDocument = `- &CENTER { x: 1, y: 2 }
 - &LEFT { x: 0, y: 2 }
 - &BIG { r: 10 }
 - &SMALL { r: 1 }
@@ -139,7 +139,7 @@ var fixedAnchorOperatorScenarios = []expressionScenario{
 	{
 		description:    "FIXED: Merge multiple maps",
 		subdescription: "Taken from https://yaml.org/type/merge.html. Same values as legacy, but with the correct key order.",
-		document:       specDocument + "- << : [ *CENTRE, *BIG ]\n",
+		document:       specDocument + "- << : [ *CENTER, *BIG ]\n",
 		expression:     ".[4] | explode(.)",
 		expected:       []string{"D0, P[4], (!!map)::x: 1\ny: 2\nr: 10\n"},
 	},
@@ -171,7 +171,7 @@ var fixedAnchorOperatorScenarios = []expressionScenario{
 	},
 	{
 		skipDoc:        true,
-		description:    "Exploding merge anchor should not explode neighbours",
+		description:    "Exploding merge anchor should not explode neighbors",
 		subdescription: "b must not be exploded, as `r: *a` will become invalid",
 		document:       `{b: &b {a: &a 42}, r: *a, c: {<<: *b}}`,
 		expression:     `explode(.c)`,
@@ -181,7 +181,7 @@ var fixedAnchorOperatorScenarios = []expressionScenario{
 	},
 	{
 		skipDoc:        true,
-		description:    "Exploding sequence merge anchor should not explode neighbours",
+		description:    "Exploding sequence merge anchor should not explode neighbors",
 		subdescription: "b must not be exploded, as `r: *a` will become invalid",
 		document:       `{b: &b {a: &a 42}, r: *a, c: {<<: [*b]}}`,
 		expression:     `explode(.c)`,
@@ -265,7 +265,7 @@ var badAnchorOperatorScenarios = []expressionScenario{
 	{
 		description:    "LEGACY: Merge multiple maps",
 		subdescription: "see https://yaml.org/type/merge.html. This has the correct data, but the wrong key order; set --yaml-fix-merge-anchor-to-spec=true to fix the key order.",
-		document:       specDocument + "- << : [ *CENTRE, *BIG ]\n",
+		document:       specDocument + "- << : [ *CENTER, *BIG ]\n",
 		expression:     ".[4] | explode(.)",
 		expected:       []string{"D0, P[4], (!!map)::r: 10\nx: 1\ny: 2\n"},
 	},
@@ -297,7 +297,7 @@ var anchorOperatorScenarios = []expressionScenario{
 	{
 		description:    "Merge one map",
 		subdescription: "see https://yaml.org/type/merge.html",
-		document:       specDocument + "- << : *CENTRE\n  r: 10\n",
+		document:       specDocument + "- << : *CENTER\n  r: 10\n",
 		expression:     ".[4] | explode(.)",
 		expected:       []string{expectedSpecResult},
 	},

pkg/yqlib/operator_assign.go

@@ -37,7 +37,7 @@ func assignUpdateOperator(d *dataTreeNavigator, context Context, expressionNode
 
 	prefs := getAssignPreferences(expressionNode.Operation.Preferences)
 
-	log.Debugf("assignUpdateOperator prefs: %v", prefs)
+	log.Debug("assignUpdateOperator prefs: %v", prefs)
 
 	if !expressionNode.Operation.UpdateAssign {
 		// this works because we already ran against LHS with an editable context.

pkg/yqlib/operator_booleans.go

@@ -142,7 +142,7 @@ func notOperator(_ *dataTreeNavigator, context Context, _ *ExpressionNode) (Cont
 
 	for el := context.MatchingNodes.Front(); el != nil; el = el.Next() {
 		candidate := el.Value.(*CandidateNode)
-		log.Debugf("notOperation checking %v", candidate)
+		log.Debug("notOperation checking %v", candidate)
 		truthy := isTruthyNode(candidate)
 		result := createBooleanCandidate(candidate, !truthy)
 		results.PushBack(result)

pkg/yqlib/operator_datetime.go

@@ -80,7 +80,7 @@ func formatDateTime(d *dataTreeNavigator, context Context, expressionNode *Expre
 
 		node, errorReading := parseSnippet(formattedTimeStr)
 		if errorReading != nil {
-			log.Debugf("could not parse %v - lets just leave it as a string: %v", formattedTimeStr, errorReading)
+			log.Debugf("could not parse %v - lets just leave it as a string: %w", formattedTimeStr, errorReading)
 			node = &CandidateNode{
 				Kind:  ScalarNode,
 				Tag:   "!!str",

pkg/yqlib/operator_delete.go

@@ -45,7 +45,7 @@ func removeFromContext(context Context, candidate *CandidateNode) (Context, erro
 		if nodeInContext != candidate {
 			newResults.PushBack(nodeInContext)
 		} else {
-			log.Infof("Need to delete this %v", NodeToString(nodeInContext))
+			log.Info("Need to delete this %v", NodeToString(nodeInContext))
 		}
 	}
 	return context.ChildContext(newResults), nil

pkg/yqlib/operator_encoder_decoder.go

@@ -33,7 +33,7 @@ func configureEncoder(format *Format, indent int) Encoder {
 
 func encodeToString(candidate *CandidateNode, prefs encoderPreferences) (string, error) {
 	var output bytes.Buffer
-	log.Debugf("printing with indent: %v", prefs.indent)
+	log.Debug("printing with indent: %v", prefs.indent)
 
 	encoder := configureEncoder(prefs.format, prefs.indent)
 	if encoder == nil {

pkg/yqlib/operator_entries.go

@@ -157,10 +157,10 @@ func withEntriesOperator(d *dataTreeNavigator, context Context, expressionNode *
 		if err != nil {
 			return Context{}, err
 		}
-		log.Debugf("candidate %v", NodeToString(candidate))
-		log.Debugf("candidate leading content: %v", candidate.LeadingContent)
+		log.Debug("candidate %v", NodeToString(candidate))
+		log.Debug("candidate leading content: %v", candidate.LeadingContent)
 		collected.LeadingContent = candidate.LeadingContent
-		log.Debugf("candidate FootComment: [%v]", candidate.FootComment)
+		log.Debug("candidate FootComment: [%v]", candidate.FootComment)
 
 		collected.HeadComment = candidate.HeadComment
 		collected.FootComment = candidate.FootComment

pkg/yqlib/operator_env.go

@@ -21,7 +21,7 @@ func envOperator(_ *dataTreeNavigator, context Context, expressionNode *Expressi
 		return Context{}, fmt.Errorf("env operations have been disabled")
 	}
 	envName := expressionNode.Operation.CandidateNode.Value
-	log.Debugf("EnvOperator, env name: %v", envName)
+	log.Debug("EnvOperator, env name:", envName)
 
 	rawValue := os.Getenv(envName)
 
@@ -49,9 +49,9 @@ func envOperator(_ *dataTreeNavigator, context Context, expressionNode *Expressi
 		}
 
 	}
-	log.Debugf("ENV tag: %v", node.Tag)
-	log.Debugf("ENV value: %v", node.Value)
-	log.Debugf("ENV Kind: %v", node.Kind)
+	log.Debug("ENV tag", node.Tag)
+	log.Debug("ENV value", node.Value)
+	log.Debug("ENV Kind", node.Kind)
 
 	return context.SingleChildContext(node), nil
 }
@@ -78,7 +78,7 @@ func envsubstOperator(_ *dataTreeNavigator, context Context, expressionNode *Exp
 	for el := context.MatchingNodes.Front(); el != nil; el = el.Next() {
 		node := el.Value.(*CandidateNode)
 		if node.Tag != "!!str" {
-			log.Warningf("EnvSubstOperator, env name: %v %v", node.Tag, node.Value)
+			log.Warning("EnvSubstOperator, env name:", node.Tag, node.Value)
 			return Context{}, fmt.Errorf("cannot substitute with %v, can only substitute strings. Hint: Most often you'll want to use '|=' over '=' for this operation", node.Tag)
 		}
 

pkg/yqlib/operator_map.go

@@ -47,8 +47,8 @@ func mapOperator(d *dataTreeNavigator, context Context, expressionNode *Expressi
 		}
 
 		result, err := d.GetMatchingNodes(splatted, expressionNode.RHS)
-		log.Debugf("expressionNode.Rhs %v", expressionNode.RHS.Operation.OperationType)
-		log.Debugf("result %v", result)
+		log.Debug("expressionNode.Rhs %v", expressionNode.RHS.Operation.OperationType)
+		log.Debug("result %v", result)
 		if err != nil {
 			return Context{}, err
 		}

pkg/yqlib/operator_multiply.go

@@ -30,7 +30,7 @@ func multiplyAssignOperator(d *dataTreeNavigator, context Context, expressionNod
 
 func multiplyOperator(d *dataTreeNavigator, context Context, expressionNode *ExpressionNode) (Context, error) {
 	log.Debugf("MultiplyOperator")
-	return crossFunction(d, context.ReadOnlyClone(), expressionNode, multiply(expressionNode.Operation.Preferences.(multiplyPreferences)), false)
+	return crossFunction(d, context, expressionNode, multiply(expressionNode.Operation.Preferences.(multiplyPreferences)), false)
 }
 
 func getComments(lhs *CandidateNode, rhs *CandidateNode) (leadingContent string, headComment string, footComment string) {
@@ -168,7 +168,7 @@ func mergeObjects(d *dataTreeNavigator, context Context, lhs *CandidateNode, rhs
 
 	// only need to recurse the array if we are doing a deep merge
 	prefs := recursiveDescentPreferences{RecurseArray: preferences.DeepMergeArrays,
-		TraversePreferences: traversePreferences{DontFollowAlias: true, IncludeMapKeys: true, ExactKeyMatch: true}}
+		TraversePreferences: traversePreferences{DontFollowAlias: true, IncludeMapKeys: true}}
 	log.Debugf("merge - preferences.DeepMergeArrays %v", preferences.DeepMergeArrays)
 	log.Debugf("merge - preferences.AppendArrays %v", preferences.AppendArrays)
 	err := recursiveDecent(results, context.SingleChildContext(rhs), prefs)

pkg/yqlib/operator_multiply_test.go

@@ -86,35 +86,7 @@ c:
   <<: *cat
 `
 
-var mergeWithGlobA = `
-"**cat": things,
-"meow**cat": stuff
-`
-
-var mergeWithGlobB = `
-"**cat": newThings,
-`
-
 var multiplyOperatorScenarios = []expressionScenario{
-	{
-		description: "multiple should be readonly",
-		skipDoc:     true,
-		document:    "",
-		expression:  ".x |= (root | (.a * .b))",
-		expected: []string{
-			"D0, P[], ()::x: null\n",
-		},
-	},
-	{
-		description: "glob keys are treated as literals when merging",
-		skipDoc:     true,
-		document:    mergeWithGlobA,
-		document2:   mergeWithGlobB,
-		expression:  `select(fi == 0) * select(fi == 1)`,
-		expected: []string{
-			"D0, P[], (!!map)::\n\"**cat\": newThings,\n\"meow**cat\": stuff\n",
-		},
-	},
 	{
 		skipDoc:    true,
 		document:   mergeArrayWithAnchors,

pkg/yqlib/operator_parent.go

@@ -35,28 +35,9 @@ func getParentOperator(_ *dataTreeNavigator, context Context, expressionNode *Ex
 
 	for el := context.MatchingNodes.Front(); el != nil; el = el.Next() {
 		candidate := el.Value.(*CandidateNode)
-
-		// Handle negative levels: count total parents first
-		levelsToGoUp := prefs.Level
-		if prefs.Level < 0 {
-			// Count all parents
-			totalParents := 0
-			temp := candidate.Parent
-			for temp != nil {
-				totalParents++
-				temp = temp.Parent
-			}
-			// Convert negative index to positive
-			// -1 means last parent (root), -2 means second to last, etc.
-			levelsToGoUp = totalParents + prefs.Level + 1
-			if levelsToGoUp < 0 {
-				levelsToGoUp = 0
-			}
-		}
-
 		currentLevel := 0
-		for currentLevel < levelsToGoUp && candidate != nil {
-			log.Debugf("currentLevel: %v, desired: %v", currentLevel, levelsToGoUp)
+		for currentLevel < prefs.Level && candidate != nil {
+			log.Debugf("currentLevel: %v, desired: %v", currentLevel, prefs.Level)
 			log.Debugf("candidate: %v", NodeToString(candidate))
 			candidate = candidate.Parent
 			currentLevel++

pkg/yqlib/operator_parent_test.go

@@ -38,58 +38,6 @@ var parentOperatorScenarios = []expressionScenario{
 			"D0, P[], (!!seq)::- {c: cat}\n- {b: {c: cat}}\n- {a: {b: {c: cat}}}\n",
 		},
 	},
-	{
-		description:    "Get the top (root) parent",
-		subdescription: "Use negative numbers to get the top parents. You can think of this as indexing into the 'parents' array above",
-		document:       "a:\n  b:\n    c: cat\n",
-		expression:     `.a.b.c | parent(-1)`,
-		expected: []string{
-			"D0, P[], (!!map)::a:\n    b:\n        c: cat\n",
-		},
-	},
-	{
-		description:    "Root",
-		subdescription: "Alias for parent(-1), returns the top level parent. This is usually the document node.",
-		document:       "a:\n  b:\n    c: cat\n",
-		expression:     `.a.b.c | root`,
-		expected: []string{
-			"D0, P[], (!!map)::a:\n    b:\n        c: cat\n",
-		},
-	},
-	{
-		description: "boundary negative",
-		skipDoc:     true,
-		document:    "a:\n  b:\n    c: cat\n",
-		expression:  `.a.b.c | parent(-3)`,
-		expected: []string{
-			"D0, P[a b], (!!map)::c: cat\n",
-		},
-	},
-	{
-		description: "large negative",
-		skipDoc:     true,
-		document:    "a:\n  b:\n    c: cat\n",
-		expression:  `.a.b.c | parent(-10)`,
-		expected: []string{
-			"D0, P[a b c], (!!str)::cat\n",
-		},
-	},
-	{
-		description: "parent zero",
-		skipDoc:     true,
-		document:    "a:\n  b:\n    c: cat\n",
-		expression:  `.a.b.c | parent(0)`,
-		expected: []string{
-			"D0, P[a b c], (!!str)::cat\n",
-		},
-	},
-	{
-		description: "large positive",
-		skipDoc:     true,
-		document:    "a:\n  b:\n    c: cat\n",
-		expression:  `.a.b.c | parent(10)`,
-		expected:    []string{},
-	},
 	{
 		description:    "N-th parent",
 		subdescription: "You can optionally supply the number of levels to go up for the parent, the default being 1.",
@@ -107,15 +55,6 @@ var parentOperatorScenarios = []expressionScenario{
 			"D0, P[], (!!map)::a:\n    b:\n        c: cat\n",
 		},
 	},
-	{
-		description:    "N-th negative",
-		subdescription: "Similarly, use negative numbers to index backwards from the parents array",
-		document:       "a:\n  b:\n    c: cat\n",
-		expression:     `.a.b.c | parent(-2)`,
-		expected: []string{
-			"D0, P[a], (!!map)::b:\n    c: cat\n",
-		},
-	},
 	{
 		description: "No parent",
 		document:    `{}`,

pkg/yqlib/operator_slice.go

@@ -19,8 +19,8 @@ func getSliceNumber(d *dataTreeNavigator, context Context, node *CandidateNode,
 func sliceArrayOperator(d *dataTreeNavigator, context Context, expressionNode *ExpressionNode) (Context, error) {
 
 	log.Debug("slice array operator!")
-	log.Debugf("lhs: %v", expressionNode.LHS.Operation.toString())
-	log.Debugf("rhs: %v", expressionNode.RHS.Operation.toString())
+	log.Debug("lhs: %v", expressionNode.LHS.Operation.toString())
+	log.Debug("rhs: %v", expressionNode.RHS.Operation.toString())
 
 	results := list.New()
 
@@ -49,7 +49,7 @@ func sliceArrayOperator(d *dataTreeNavigator, context Context, expressionNode *E
 			relativeSecondNumber = len(lhsNode.Content)
 		}
 
-		log.Debugf("calculateIndicesToTraverse: slice from %v to %v", relativeFirstNumber, relativeSecondNumber)
+		log.Debug("calculateIndicesToTraverse: slice from %v to %v", relativeFirstNumber, relativeSecondNumber)
 
 		var newResults []*CandidateNode
 		for i := relativeFirstNumber; i < relativeSecondNumber; i++ {