Merge 5758900c6e into f73c862cc5

Bumps [github.com/goccy/go-yaml](https://github.com/goccy/go-yaml) from 1.13.0 to 1.15.13.
- [Release notes](https://github.com/goccy/go-yaml/releases)
- [Changelog](https://github.com/goccy/go-yaml/blob/master/CHANGELOG.md)
- [Commits](https://github.com/goccy/go-yaml/compare/v1.13.0...v1.15.13)

---
updated-dependencies:
- dependency-name: github.com/goccy/go-yaml
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

.gitignore

@@ -44,8 +44,6 @@ test*.yml
 test*.xml
 test*.toml
 test*.yaml
-test_dir1/
-test_dir2/
 0.yml
 1.yml
 2.yml

acceptance_tests/split-printer.sh

@@ -207,21 +207,21 @@ EOM
 
 testSplitWithDirectories() {
   cat >test.yml <<EOL
-f: test_dir1/test_file1
+f: test_dir1/file1
 ---
-f: test_dir2/dir22/test_file2
+f: test_dir2/dir22/file2
 ---
-f: test_file3
+f: file3
 EOL
 
   ./yq e --no-doc -s ".f" test.yml
 
-  doc1=$(cat test_dir1/test_file1.yml)
-  assertEquals "f: test_dir1/test_file1" "$doc1"
-  doc2=$(cat test_dir2/dir22/test_file2.yml)
-  assertEquals "f: test_dir2/dir22/test_file2" "$doc2"
-  doc3=$(cat test_file3.yml)
-  assertEquals "f: test_file3" "$doc3"
+  doc1=$(cat test_dir1/file1.yml)
+  assertEquals "f: test_dir1/file1" "$doc1"
+  doc2=$(cat test_dir2/dir22/file2.yml)
+  assertEquals "f: test_dir2/dir22/file2" "$doc2"
+  doc3=$(cat file3.yml)
+  assertEquals "f: file3" "$doc3"
 }
 
 source ./scripts/shunit2

go.mod

@@ -5,18 +5,18 @@ require (
 	github.com/alecthomas/participle/v2 v2.1.1
 	github.com/alecthomas/repr v0.4.0
 	github.com/dimchansky/utfbom v1.1.1
-	github.com/elliotchance/orderedmap v1.7.1
+	github.com/elliotchance/orderedmap v1.7.0
 	github.com/fatih/color v1.18.0
-	github.com/goccy/go-json v0.10.4
+	github.com/goccy/go-json v0.10.3
 	github.com/goccy/go-yaml v1.15.13
 	github.com/jinzhu/copier v0.4.0
-	github.com/magiconair/properties v1.8.9
+	github.com/magiconair/properties v1.8.7
 	github.com/pelletier/go-toml/v2 v2.2.3
 	github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e
 	github.com/spf13/cobra v1.8.1
 	github.com/spf13/pflag v1.0.5
 	github.com/yuin/gopher-lua v1.1.1
-	golang.org/x/net v0.33.0
+	golang.org/x/net v0.32.0
 	golang.org/x/text v0.21.0
 	gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473
 	gopkg.in/yaml.v3 v3.0.1

go.sum

@@ -12,12 +12,12 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dimchansky/utfbom v1.1.1 h1:vV6w1AhK4VMnhBno/TPVCoK9U/LP0PkLCS9tbxHdi/U=
 github.com/dimchansky/utfbom v1.1.1/go.mod h1:SxdoEBH5qIqFocHMyGOXVAybYJdr71b1Q/j0mACtrfE=
-github.com/elliotchance/orderedmap v1.7.1 h1:8SR2DB391dw0HVI9572ElrY+KU0Q89OCXYwWZx7aAZc=
-github.com/elliotchance/orderedmap v1.7.1/go.mod h1:wsDwEaX5jEoyhbs7x93zk2H/qv0zwuhg4inXhDkYqys=
+github.com/elliotchance/orderedmap v1.7.0 h1:FirjcM/NbcyudJhaIF9MG/RjIh5XHm2xb1SFquZ8k0g=
+github.com/elliotchance/orderedmap v1.7.0/go.mod h1:wsDwEaX5jEoyhbs7x93zk2H/qv0zwuhg4inXhDkYqys=
 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/goccy/go-json v0.10.4 h1:JSwxQzIqKfmFX1swYPpUThQZp/Ka4wzJdK0LWVytLPM=
-github.com/goccy/go-json v0.10.4/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
+github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA=
+github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
 github.com/goccy/go-yaml v1.15.13 h1:Xd87Yddmr2rC1SLLTm2MNDcTjeO/GYo0JGiww6gSTDg=
 github.com/goccy/go-yaml v1.15.13/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA=
 github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=
@@ -26,8 +26,8 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/jinzhu/copier v0.4.0 h1:w3ciUoD19shMCRargcpm0cm91ytaBhDvuRpz1ODO/U8=
 github.com/jinzhu/copier v0.4.0/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg=
-github.com/magiconair/properties v1.8.9 h1:nWcCbLq1N2v/cpNsy5WvQ37Fb+YElfq20WJ/a8RkpQM=
-github.com/magiconair/properties v1.8.9/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
+github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
+github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
@@ -50,8 +50,8 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/yuin/gopher-lua v1.1.1 h1:kYKnWBjvbNP4XLT3+bPEwAXJx262OhaHDWDVOPjL46M=
 github.com/yuin/gopher-lua v1.1.1/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw=
-golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
-golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
+golang.org/x/net v0.32.0 h1:ZqPmj8Kzc+Y6e0+skZsuACbx+wzMgo5MQsJh9Qd6aYI=
+golang.org/x/net v0.32.0/go.mod h1:CwU0IoeOlnQQWJ6ioyFrfRuomB8GKF6KbYXZVyeXNfs=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=

pkg/yqlib/goccy_yaml_test.go

@@ -20,11 +20,17 @@ var goccyYamlFormatScenarios = []formatScenario{
 		expected:    "3.1\n",
 	},
 	{
-		description: "basic - mike",
+		description: "basic - 3.1",
 		skipDoc:     true,
 		input:       "mike: 3",
 		expected:    "mike: 3\n",
 	},
+	{
+		description: "basic - 3.1",
+		skipDoc:     true,
+		input:       "{mike: 3}",
+		expected:    "{mike: 3}\n",
+	},
 	{
 		description: "basic - map multiple entries",
 		skipDoc:     true,
@@ -34,23 +40,23 @@ var goccyYamlFormatScenarios = []formatScenario{
 	{
 		description: "basic - 3.1",
 		skipDoc:     true,
-		input:       "{\n mike: 3\n}",
+		input:       "{\nmike: 3\n}",
 		expected:    "{mike: 3}\n",
 	},
 	{
-		description: "basic - tag with number",
+		description: "basic - 3.1",
 		skipDoc:     true,
 		input:       "mike: !!cat 3",
 		expected:    "mike: !!cat 3\n",
 	},
 	{
-		description: "basic - array of numbers",
+		description: "basic - 3.1",
 		skipDoc:     true,
 		input:       "- 3",
 		expected:    "- 3\n",
 	},
 	{
-		description: "basic - single line array",
+		description: "basic - 3.1",
 		skipDoc:     true,
 		input:       "[3]",
 		expected:    "[3]\n",