Fixed variable operator to work like jq

.github/workflows/go.yml

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

.github/workflows/release.yml

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

CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # Development
 
-1. Install (Golang)[https://golang.org/]
+1. Install (golang)[https://golang.org/]
 1. Run  `scripts/devtools.sh` to install the required devtools
 2. Run `make [local] vendor` to install the vendor dependencies
 2. Run `make [local] test` to ensure you can run the existing tests

Dockerfile

@@ -1,10 +1,10 @@
-FROM golang:1.20.2 as builder
+FROM golang:1.20.1 as builder
 
 WORKDIR /go/src/mikefarah/yq
 
 COPY . .
 
-RUN CGO_ENABLED=0 go build -ldflags "-s -w" .
+RUN CGO_ENABLED=0 go build .
 # RUN ./scripts/test.sh -- this too often times out in the github pipeline.
 RUN ./scripts/acceptance.sh
 

Dockerfile.dev

@@ -1,4 +1,4 @@
-FROM golang:1.20.2
+FROM golang:1.20.1
 
 COPY scripts/devtools.sh /opt/devtools.sh
 

Makefile.variables

@@ -7,7 +7,6 @@ export GIT_DESCRIBE = $(shell git describe --tags --always)
 LDFLAGS :=
 LDFLAGS += -X main.GitCommit=${GIT_COMMIT}${GIT_DIRTY}
 LDFLAGS += -X main.GitDescribe=${GIT_DESCRIBE}
-LDFLAGS += -w -s
 
 GITHUB_TOKEN ?=
 

README.md

@@ -229,8 +229,6 @@ go install github.com/mikefarah/yq/v4@latest
 ## Community Supported Installation methods
 As these are supported by the community :heart: - however, they may be out of date with the officially supported releases.
 
-_Please note that the Debian package (previously supported by @rmescandon) is no longer maintained. Please use an alternative installation method._
-
 
 ### Nix
 
@@ -288,6 +286,15 @@ Supported by Tuan Hoang
 https://pkgs.alpinelinux.org/package/edge/community/x86/yq
 
 
+### On Ubuntu 16.04 or higher from Debian package:
+```sh
+sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CC86BB64
+sudo add-apt-repository ppa:rmescandon/yq
+sudo apt update
+sudo apt install yq -y
+```
+Supported by @rmescandon (https://launchpad.net/~rmescandon/+archive/ubuntu/yq)
+
 ## Features
 - [Detailed documentation with many examples](https://mikefarah.gitbook.io/yq/)
 - Written in portable go, so you can download a lovely dependency free binary

acceptance_tests/inputs-format-auto.sh

@@ -1,211 +0,0 @@
-#!/bin/bash
-
-setUp() {
-  rm test*.yml 2>/dev/null || true
-  rm test*.json 2>/dev/null || true
-  rm test*.properties 2>/dev/null || true
-  rm test*.csv 2>/dev/null || true
-  rm test*.tsv 2>/dev/null || true
-  rm test*.xml 2>/dev/null || true
-}
-
-testInputJson() {
-  cat >test.json <<EOL
-{ "mike" : { "things": "cool" } }
-EOL
-
-  read -r -d '' expected << EOM
-{
-  "mike": {
-    "things": "cool"
-  }
-}
-EOM
-
-  X=$(./yq test.json)
-  assertEquals "$expected" "$X"
-
-  X=$(./yq ea test.json)
-  assertEquals "$expected" "$X"
-}
-
-testInputJsonOutputYaml() {
-  cat >test.json <<EOL
-{ "mike" : { "things": "cool" } }
-EOL
-
-  read -r -d '' expected << EOM
-mike:
-  things: cool
-EOM
-
-  X=$(./yq test.json -oy)
-  assertEquals "$expected" "$X"
-
-  X=$(./yq ea test.json -oy)
-  assertEquals "$expected" "$X"
-}
-
-testInputProperties() {
-  cat >test.properties <<EOL
-mike.things = hello
-EOL
-
-  read -r -d '' expected << EOM
-mike.things = hello
-EOM
-
-  X=$(./yq e test.properties)
-  assertEquals "$expected" "$X"
-
-  X=$(./yq test.properties)
-  assertEquals "$expected" "$X"
-
-  X=$(./yq ea test.properties)
-  assertEquals "$expected" "$X"
-}
-
-testInputPropertiesGitHubAction() {
-  cat >test.properties <<EOL
-mike.things = hello
-EOL
-
-  read -r -d '' expected << EOM
-mike.things = hello
-EOM
-
-  X=$(cat /dev/null | ./yq e test.properties)
-  assertEquals "$expected" "$X"
-
-  X=$(cat /dev/null | ./yq ea test.properties)
-  assertEquals "$expected" "$X"
-}
-
-testInputCSV() {
-  cat >test.csv <<EOL
-fruit,yumLevel
-apple,5
-banana,4
-EOL
-
-  read -r -d '' expected << EOM
-fruit,yumLevel
-apple,5
-banana,4
-EOM
-
-  X=$(./yq e test.csv)
-  assertEquals "$expected" "$X"
-
-  X=$(./yq ea test.csv)
-  assertEquals "$expected" "$X"
-}
-
-testInputCSVUTF8() {
-  read -r -d '' expected << EOM
-id,first,last
-1,john,smith
-1,jane,smith
-EOM
-
-  X=$(./yq utf8.csv)
-  assertEquals "$expected" "$X"
-}
-
-testInputTSV() {
-  cat >test.tsv <<EOL
-fruit	yumLevel
-apple	5
-banana	4
-EOL
-
-  read -r -d '' expected << EOM
-fruit	yumLevel
-apple	5
-banana	4
-EOM
-
-  X=$(./yq e test.tsv)
-  assertEquals "$expected" "$X"
-
-  X=$(./yq ea test.tsv)
-  assertEquals "$expected" "$X"
-}
-
-
-
-
-testInputXml() {
-  cat >test.xml <<EOL
-<cat legs="4">BiBi</cat>
-EOL
-
-  read -r -d '' expected << EOM
-<cat legs="4">BiBi</cat>
-EOM
-
-  X=$(./yq e test.xml)
-  assertEquals "$expected" "$X"
-
-  X=$(./yq ea test.xml)
-  assertEquals "$expected" "$X"
-}
-
-testInputXmlNamespaces() {
-  cat >test.xml <<EOL
-<?xml version="1.0"?>
-<map xmlns="some-namespace" xmlns:xsi="some-instance" xsi:schemaLocation="some-url">
-</map>
-EOL
-
-  read -r -d '' expected << EOM
-<?xml version="1.0"?>
-<map xmlns="some-namespace" xmlns:xsi="some-instance" xsi:schemaLocation="some-url"></map>
-EOM
-
-  X=$(./yq e test.xml)
-  assertEquals "$expected" "$X"
-
-  X=$(./yq ea test.xml)
-  assertEquals "$expected" "$X"
-}
-
-
-
-testInputXmlStrict() {
-  cat >test.xml <<EOL
-<?xml version="1.0"?>
-<!DOCTYPE root [
-<!ENTITY writer "Catherine.">
-<!ENTITY copyright "(r) Great">
-]>
-<root>
-    <item>&writer;&copyright;</item>
-</root>
-EOL
-
-  X=$(./yq --xml-strict-mode test.xml  2>&1)
-  assertEquals 1 $?
-  assertEquals "Error: bad file 'test.xml': XML syntax error on line 7: invalid character entity &writer;" "$X"
-
-  X=$(./yq ea --xml-strict-mode test.xml  2>&1)
-  assertEquals "Error: bad file 'test.xml': XML syntax error on line 7: invalid character entity &writer;" "$X"
-}
-
-testInputXmlGithubAction() {
-  cat >test.xml <<EOL
-<cat legs="4">BiBi</cat>
-EOL
-
-  read -r -d '' expected << EOM
-<cat legs="4">BiBi</cat>
-EOM
-
-  X=$(cat /dev/null | ./yq e test.xml)
-  assertEquals "$expected" "$X"
-
-  X=$(cat /dev/null | ./yq ea test.xml)
-  assertEquals "$expected" "$X"
-}
-
-source ./scripts/shunit2

acceptance_tests/inputs-format.sh

@@ -120,7 +120,7 @@ EOM
 }
 
 testInputXmlNamespaces() {
-  cat >test.xml <<EOL
+  cat >test.yml <<EOL
 <?xml version="1.0"?>
 <map xmlns="some-namespace" xmlns:xsi="some-instance" xsi:schemaLocation="some-url">
 </map>
@@ -134,10 +134,10 @@ map:
   +@xsi:schemaLocation: some-url
 EOM
 
-  X=$(./yq e -p=xml test.xml)
+  X=$(./yq e -p=xml test.yml)
   assertEquals "$expected" "$X"
 
-  X=$(./yq ea -p=xml test.xml)
+  X=$(./yq ea -p=xml test.yml)
   assertEquals "$expected" "$X"
 }
 

cmd/constant.go

@@ -6,10 +6,8 @@ var unwrapScalar = false
 
 var writeInplace = false
 var outputToJSON = false
-
-var outputFormat = ""
-
-var inputFormat = ""
+var outputFormat = "yaml"
+var inputFormat = "yaml"
 
 var exitStatus = false
 var forceColor = false

cmd/evaluate_all_command.go

@@ -84,10 +84,7 @@ func evaluateAll(cmd *cobra.Command, args []string) (cmdError error) {
 	if err != nil {
 		return err
 	}
-	encoder, err := configureEncoder()
-	if err != nil {
-		return err
-	}
+	encoder := configureEncoder(format)
 
 	printer := yqlib.NewPrinter(encoder, printerWriter)
 

cmd/evalute_sequence_command.go

@@ -93,10 +93,7 @@ func evaluateSequence(cmd *cobra.Command, args []string) (cmdError error) {
 	if err != nil {
 		return err
 	}
-	encoder, err := configureEncoder()
-	if err != nil {
-		return err
-	}
+	encoder := configureEncoder(format)
 
 	printer := yqlib.NewPrinter(encoder, printerWriter)
 

cmd/root.go

@@ -53,6 +53,25 @@ yq -P sample.json
 			logging.SetBackend(backend)
 			yqlib.InitExpressionParser()
 
+			outputFormatType, err := yqlib.OutputFormatFromString(outputFormat)
+
+			if err != nil {
+				return err
+			}
+
+			if outputFormatType == yqlib.YamlOutputFormat ||
+				outputFormatType == yqlib.PropsOutputFormat {
+				unwrapScalar = true
+			}
+			if unwrapScalarFlag.IsExplicitySet() {
+				unwrapScalar = unwrapScalarFlag.IsSet()
+			}
+
+			//copy preference form global setting
+			yqlib.ConfiguredYamlPreferences.UnwrapScalar = unwrapScalar
+
+			yqlib.ConfiguredYamlPreferences.PrintDocSeparators = !noDocSeparators
+
 			return nil
 		},
 	}
@@ -65,8 +84,8 @@ yq -P sample.json
 		panic(err)
 	}
 
-	rootCmd.PersistentFlags().StringVarP(&outputFormat, "output-format", "o", "auto", "[auto|a|yaml|y|json|j|props|p|xml|x] output format type.")
-	rootCmd.PersistentFlags().StringVarP(&inputFormat, "input-format", "p", "auto", "[auto|a|yaml|y|props|p|xml|x] parse format for input. Note that json is a subset of yaml.")
+	rootCmd.PersistentFlags().StringVarP(&outputFormat, "output-format", "o", "yaml", "[yaml|y|json|j|props|p|xml|x] output format type.")
+	rootCmd.PersistentFlags().StringVarP(&inputFormat, "input-format", "p", "yaml", "[yaml|y|props|p|xml|x] parse format for input. Note that json is a subset of yaml.")
 
 	rootCmd.PersistentFlags().StringVar(&yqlib.ConfiguredXMLPreferences.AttributePrefix, "xml-attribute-prefix", yqlib.ConfiguredXMLPreferences.AttributePrefix, "prefix for xml attributes")
 	rootCmd.PersistentFlags().StringVar(&yqlib.ConfiguredXMLPreferences.ContentName, "xml-content-name", yqlib.ConfiguredXMLPreferences.ContentName, "name for xml content (if no attribute name is present).")

cmd/utils.go

@@ -53,48 +53,6 @@ func initCommand(cmd *cobra.Command, args []string) (string, []string, error) {
 		return "", nil, fmt.Errorf("cannot pass files in when using null-input flag")
 	}
 
-	inputFilename := ""
-	if len(args) > 0 {
-		inputFilename = args[0]
-	}
-	if inputFormat == "" || inputFormat == "auto" || inputFormat == "a" {
-
-		inputFormat = yqlib.FormatFromFilename(inputFilename)
-		if outputFormat == "" || outputFormat == "auto" || outputFormat == "a" {
-			outputFormat = yqlib.FormatFromFilename(inputFilename)
-		}
-	} else if outputFormat == "" || outputFormat == "auto" || outputFormat == "a" {
-		// backwards compatibility -
-		// before this was introduced, `yq -pcsv things.csv`
-		// would produce *yaml* output.
-		//
-		outputFormat = yqlib.FormatFromFilename(inputFilename)
-		if inputFilename != "-" {
-			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"
-	}
-
-	outputFormatType, err := yqlib.OutputFormatFromString(outputFormat)
-
-	if err != nil {
-		return "", nil, err
-	}
-	yqlib.GetLogger().Debug("Using outputformat %v", outputFormat)
-
-	if outputFormatType == yqlib.YamlOutputFormat ||
-		outputFormatType == yqlib.PropsOutputFormat {
-		unwrapScalar = true
-	}
-	if unwrapScalarFlag.IsExplicitySet() {
-		unwrapScalar = unwrapScalarFlag.IsSet()
-	}
-
-	//copy preference form global setting
-	yqlib.ConfiguredYamlPreferences.UnwrapScalar = unwrapScalar
-
-	yqlib.ConfiguredYamlPreferences.PrintDocSeparators = !noDocSeparators
-
 	return expression, args, nil
 }
 
@@ -103,15 +61,7 @@ func configureDecoder(evaluateTogether bool) (yqlib.Decoder, error) {
 	if err != nil {
 		return nil, err
 	}
-	yqlibDecoder, err := createDecoder(yqlibInputFormat, evaluateTogether)
-	if yqlibDecoder == nil {
-		return nil, fmt.Errorf("no support for %s input format", inputFormat)
-	}
-	return yqlibDecoder, err
-}
-
-func createDecoder(format yqlib.InputFormat, evaluateTogether bool) (yqlib.Decoder, error) {
-	switch format {
+	switch yqlibInputFormat {
 	case yqlib.XMLInputFormat:
 		return yqlib.NewXMLDecoder(yqlib.ConfiguredXMLPreferences), nil
 	case yqlib.PropertiesInputFormat:
@@ -122,12 +72,10 @@ func createDecoder(format yqlib.InputFormat, evaluateTogether bool) (yqlib.Decod
 		return yqlib.NewCSVObjectDecoder(','), nil
 	case yqlib.TSVObjectInputFormat:
 		return yqlib.NewCSVObjectDecoder('\t'), nil
-	case yqlib.YamlInputFormat:
-		prefs := yqlib.ConfiguredYamlPreferences
-		prefs.EvaluateTogether = evaluateTogether
-		return yqlib.NewYamlDecoder(prefs), nil
 	}
-	return nil, fmt.Errorf("invalid decoder: %v", format)
+	prefs := yqlib.ConfiguredYamlPreferences
+	prefs.EvaluateTogether = evaluateTogether
+	return yqlib.NewYamlDecoder(prefs), nil
 }
 
 func configurePrinterWriter(format yqlib.PrinterOutputFormat, out io.Writer) (yqlib.PrinterWriter, error) {
@@ -147,34 +95,22 @@ func configurePrinterWriter(format yqlib.PrinterOutputFormat, out io.Writer) (yq
 	return printerWriter, nil
 }
 
-func configureEncoder() (yqlib.Encoder, error) {
-	yqlibOutputFormat, err := yqlib.OutputFormatFromString(outputFormat)
-	if err != nil {
-		return nil, err
-	}
-	yqlibEncoder, err := createEncoder(yqlibOutputFormat)
-	if yqlibEncoder == nil {
-		return nil, fmt.Errorf("no support for %s output format", outputFormat)
-	}
-	return yqlibEncoder, err
-}
-
-func createEncoder(format yqlib.PrinterOutputFormat) (yqlib.Encoder, error) {
+func configureEncoder(format yqlib.PrinterOutputFormat) yqlib.Encoder {
 	switch format {
 	case yqlib.JSONOutputFormat:
-		return yqlib.NewJSONEncoder(indent, colorsEnabled, unwrapScalar), nil
+		return yqlib.NewJSONEncoder(indent, colorsEnabled, unwrapScalar)
 	case yqlib.PropsOutputFormat:
-		return yqlib.NewPropertiesEncoder(unwrapScalar), nil
+		return yqlib.NewPropertiesEncoder(unwrapScalar)
 	case yqlib.CSVOutputFormat:
-		return yqlib.NewCsvEncoder(','), nil
+		return yqlib.NewCsvEncoder(',')
 	case yqlib.TSVOutputFormat:
-		return yqlib.NewCsvEncoder('\t'), nil
+		return yqlib.NewCsvEncoder('\t')
 	case yqlib.YamlOutputFormat:
-		return yqlib.NewYamlEncoder(indent, colorsEnabled, yqlib.ConfiguredYamlPreferences), nil
+		return yqlib.NewYamlEncoder(indent, colorsEnabled, yqlib.ConfiguredYamlPreferences)
 	case yqlib.XMLOutputFormat:
-		return yqlib.NewXMLEncoder(indent, yqlib.ConfiguredXMLPreferences), nil
+		return yqlib.NewXMLEncoder(indent, yqlib.ConfiguredXMLPreferences)
 	}
-	return nil, fmt.Errorf("invalid encoder: %v", format)
+	panic("invalid encoder")
 }
 
 // this is a hack to enable backwards compatibility with githubactions (which pipe /dev/null into everything)

cmd/version.go

@@ -11,7 +11,7 @@ var (
 	GitDescribe string
 
 	// Version is main version number that is being run at the moment.
-	Version = "v4.32.1"
+	Version = "v4.31.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

debian/changelog

@@ -103,7 +103,7 @@ yq (4.16.2) focal; urgency=medium
   * Improved extract-checksum.sh
   * Bump github.com/spf13/cobra from 1.2.1 to 1.3.0 (#1039)
   * enable more linters (#1043)
-  * Bump Golang compiler #1037
+  * Bump golang compiler #1037
 
  -- Roberto Mier Escandon <rmescandon@gmail.com>  Tue, 21 Dec 2021 09:41:44 +0000
 

examples/mike.xml

@@ -1 +1,5 @@
-<cat>3</cat>
+date: "2022-11-25"
+raw:
+  id: 1
+  XML: text_outside_1<Tag1 />text_outside_2<Tag2Kling Klong</Tag2>text_outside_3
+  time: 09:19:00

go.mod

@@ -1,20 +1,20 @@
 module github.com/mikefarah/yq/v4
 
 require (
-	github.com/a8m/envsubst v1.4.2
+	github.com/a8m/envsubst v1.4.1
 	github.com/alecthomas/participle/v2 v2.0.0-beta.5
 	github.com/alecthomas/repr v0.2.0
 	github.com/dimchansky/utfbom v1.1.1
 	github.com/elliotchance/orderedmap v1.5.0
-	github.com/fatih/color v1.15.0
-	github.com/goccy/go-json v0.10.1
-	github.com/goccy/go-yaml v1.10.0
+	github.com/fatih/color v1.14.1
+	github.com/goccy/go-json v0.10.0
+	github.com/goccy/go-yaml v1.9.8
 	github.com/jinzhu/copier v0.3.5
 	github.com/magiconair/properties v1.8.7
 	github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e
 	github.com/spf13/cobra v1.6.1
 	github.com/spf13/pflag v1.0.5
-	golang.org/x/net v0.8.0
+	golang.org/x/net v0.1.1-0.20221104162952-702349b0e862
 	gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473
 	gopkg.in/yaml.v3 v3.0.1
 )
@@ -23,8 +23,8 @@ require (
 	github.com/inconshreveable/mousetrap v1.0.1 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.17 // indirect
-	golang.org/x/sys v0.6.0 // indirect
-	golang.org/x/text v0.8.0 // indirect
+	golang.org/x/sys v0.3.0 // indirect
+	golang.org/x/text v0.4.0 // indirect
 	golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect
 )
 

go.sum

@@ -1,5 +1,5 @@
-github.com/a8m/envsubst v1.4.2 h1:4yWIHXOLEJHQEFd4UjrWDrYeYlV7ncFWJOCBRLOZHQg=
-github.com/a8m/envsubst v1.4.2/go.mod h1:MVUTQNGQ3tsjOOtKCNd+fl8RzhsXcDvvAEzkhGtlsbY=
+github.com/a8m/envsubst v1.4.1 h1:RShc2OKbQpIIp5qR2glVsBOJCImTVHFrDkJvmGh0Qi0=
+github.com/a8m/envsubst v1.4.1/go.mod h1:MVUTQNGQ3tsjOOtKCNd+fl8RzhsXcDvvAEzkhGtlsbY=
 github.com/alecthomas/assert/v2 v2.0.3 h1:WKqJODfOiQG0nEJKFKzDIG3E29CN2/4zR9XGJzKIkbg=
 github.com/alecthomas/participle/v2 v2.0.0-beta.5 h1:y6dsSYVb1G5eK6mgmy+BgI3Mw35a3WghArZ/Hbebrjo=
 github.com/alecthomas/participle/v2 v2.0.0-beta.5/go.mod h1:RC764t6n4L8D8ITAJv0qdokritYSNR3wV5cVwmIEaMM=
@@ -13,17 +13,16 @@ github.com/dimchansky/utfbom v1.1.1/go.mod h1:SxdoEBH5qIqFocHMyGOXVAybYJdr71b1Q/
 github.com/elliotchance/orderedmap v1.5.0 h1:1IsExUsjv5XNBD3ZdC7jkAAqLWOOKdbPTmkHx63OsBg=
 github.com/elliotchance/orderedmap v1.5.0/go.mod h1:wsDwEaX5jEoyhbs7x93zk2H/qv0zwuhg4inXhDkYqys=
 github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM=
-github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs=
-github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw=
+github.com/fatih/color v1.14.1 h1:qfhVLaG5s+nCROl1zJsZRxFeYrHLqWroPOQ8BWiNb4w=
+github.com/fatih/color v1.14.1/go.mod h1:2oHN61fhTpgcxD3TSWCgKDiH1+x4OiDVVGH8WlgGZGg=
 github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
 github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
 github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
-github.com/goccy/go-json v0.10.1 h1:lEs5Ob+oOG/Ze199njvzHbhn6p9T+h64F5hRj69iTTo=
-github.com/goccy/go-json v0.10.1/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
-github.com/goccy/go-yaml v1.10.0 h1:rBi+5HGuznOxx0JZ+60LDY85gc0dyIJCIMvsMJTKSKQ=
-github.com/goccy/go-yaml v1.10.0/go.mod h1:h/18Lr6oSQ3mvmqFoWmQ47KChOgpfHpTyIHl3yVmpiY=
-github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/goccy/go-json v0.10.0 h1:mXKd9Qw4NuzShiRlOXKews24ufknHO7gx30lsDyokKA=
+github.com/goccy/go-json v0.10.0/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
+github.com/goccy/go-yaml v1.9.8 h1:5gMyLUeU1/6zl+WFfR1hN7D2kf+1/eRGa7DFtToiBvQ=
+github.com/goccy/go-yaml v1.9.8/go.mod h1:JubOolP3gh0HpiBc4BLRD4YmjEjHAmIIB2aaXKkTfoE=
 github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=
 github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc=
 github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
@@ -55,20 +54,20 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ=
-golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
+golang.org/x/net v0.1.1-0.20221104162952-702349b0e862 h1:KrLJ+iz8J6j6VVr/OCfULAcK+xozUmWE43fKpMR4MlI=
+golang.org/x/net v0.1.1-0.20221104162952-702349b0e862/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20220406163625-3f8b81556e12/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
-golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=
+golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
-golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68=
-golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg=
+golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f h1:uF6paiQQebLeSXkrTqHqz0MXhXXS1KgF41eUdBNvxK0=

pkg/yqlib/decoder.go

@@ -3,7 +3,6 @@ package yqlib
 import (
 	"fmt"
 	"io"
-	"strings"
 )
 
 type InputFormat uint
@@ -26,11 +25,11 @@ type Decoder interface {
 
 func InputFormatFromString(format string) (InputFormat, error) {
 	switch format {
-	case "yaml", "yml", "y":
+	case "yaml", "y":
 		return YamlInputFormat, nil
 	case "xml", "x":
 		return XMLInputFormat, nil
-	case "properties", "props", "p":
+	case "props", "p":
 		return PropertiesInputFormat, nil
 	case "json", "ndjson", "j":
 		return JsonInputFormat, nil
@@ -39,22 +38,6 @@ func InputFormatFromString(format string) (InputFormat, error) {
 	case "tsv", "t":
 		return TSVObjectInputFormat, nil
 	default:
-		return 0, fmt.Errorf("unknown format '%v' please use [yaml|json|props|csv|tsv|xml]", format)
+		return 0, fmt.Errorf("unknown format '%v' please use [yaml|xml|props]", format)
 	}
 }
-
-func FormatFromFilename(filename string) string {
-
-	if filename != "" {
-		GetLogger().Debugf("checking file extension '%s' for auto format detection", filename)
-		nPos := strings.LastIndex(filename, ".")
-		if nPos > -1 {
-			format := filename[nPos+1:]
-			GetLogger().Debugf("detected format '%s'", format)
-			return format
-		}
-	}
-
-	GetLogger().Debugf("using default inputFormat 'yaml'")
-	return "yaml"
-}

pkg/yqlib/decoder_base64.go

@@ -4,33 +4,10 @@ import (
 	"bytes"
 	"encoding/base64"
 	"io"
-	"strings"
 
 	yaml "gopkg.in/yaml.v3"
 )
 
-type base64Padder struct {
-	count uint64
-	io.Reader
-}
-
-func (c *base64Padder) pad(buf []byte) (int, error) {
-	pad := strings.Repeat("=", int(4-c.count%4))
-	n, err := strings.NewReader(pad).Read(buf)
-	c.count += uint64(n)
-	return n, err
-}
-
-func (c *base64Padder) Read(buf []byte) (int, error) {
-	n, err := c.Reader.Read(buf)
-	c.count += uint64(n)
-
-	if err == io.EOF && c.count%4 != 0 {
-		return c.pad(buf)
-	}
-	return n, err
-}
-
 type base64Decoder struct {
 	reader       io.Reader
 	finished     bool
@@ -43,7 +20,7 @@ func NewBase64Decoder() Decoder {
 }
 
 func (dec *base64Decoder) Init(reader io.Reader) error {
-	dec.reader = &base64Padder{Reader: reader}
+	dec.reader = reader
 	dec.readAnything = false
 	dec.finished = false
 	return nil

pkg/yqlib/decoder_json.go

@@ -1,5 +1,3 @@
-//go:build !yq_nojson
-
 package yqlib
 
 import (

pkg/yqlib/decoder_xml.go

@@ -1,5 +1,3 @@
-//go:build !yq_noxml
-
 package yqlib
 
 import (
@@ -7,7 +5,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"regexp"
 	"strings"
 	"unicode"
 
@@ -49,19 +46,11 @@ func (dec *xmlDecoder) createSequence(nodes []*xmlNode) (*yaml.Node, error) {
 	return yamlNode, nil
 }
 
-var decoderCommentPrefix = regexp.MustCompile(`(^|\n)([[:alpha:]])`)
-
 func (dec *xmlDecoder) processComment(c string) string {
 	if c == "" {
 		return ""
 	}
-	//need to replace "cat " with "# cat"
-	// "\ncat\n" with "\n cat\n"
-	// ensure non-empty comments starting with newline have a space in front
-
-	replacement := decoderCommentPrefix.ReplaceAllString(c, "$1 $2")
-	replacement = "#" + strings.ReplaceAll(strings.TrimRight(replacement, " "), "\n", "\n#")
-	return replacement
+	return "#" + strings.TrimRight(c, " ")
 }
 
 func (dec *xmlDecoder) createMap(n *xmlNode) (*yaml.Node, error) {
@@ -86,7 +75,6 @@ func (dec *xmlDecoder) createMap(n *xmlNode) (*yaml.Node, error) {
 		var err error
 
 		if i == 0 {
-			log.Debugf("head comment here")
 			labelNode.HeadComment = dec.processComment(n.HeadComment)
 
 		}

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

@@ -302,7 +302,7 @@ foobar:
 ```
 
 ## Dereference and update a field
-Use explode with multiply to dereference an object
+`Use explode with multiply to dereference an object
 
 Given a sample.yml file of:
 ```yaml

pkg/yqlib/doc/operators/assign-update.md

@@ -3,10 +3,10 @@
 This operator is used to update node values. It can be used in either the:
 
 ### plain form: `=`
-Which will set the LHS node values equal to the RHS node values. The RHS expression is run against the matching nodes in the pipeline.
+Which will assign the LHS node values to the RHS node values. The RHS expression is run against the matching nodes in the pipeline.
 
 ### relative form: `|=`
-This will do a similar thing to the plain form, but the RHS expression is run with _each LHS node as context_. This is useful for updating values based on old values, e.g. increment.
+This will do a similar thing to the plain form, however, the RHS expression is run against _the LHS nodes_. This is useful for updating values based on old values, e.g. increment.
 
 
 ### Flags
@@ -203,7 +203,7 @@ a:
 ```
 
 ## Update node value that has an anchor
-Anchor will remain
+Anchor will remaple
 
 Given a sample.yml file of:
 ```yaml
@@ -250,7 +250,7 @@ a: !cat woof
 b: !dog woof
 ```
 
-## Custom types: clobber
+## Custom types: clovver
 Use the `c` option to clobber custom tags
 
 Given a sample.yml file of:

pkg/yqlib/doc/operators/comment-operators.md

@@ -5,10 +5,10 @@ Use these comment operators to set or retrieve comments. Note that line comments
 Like the `=` and `|=` assign operators, the same syntax applies when updating comments:
 
 ### plain form: `=`
-This will set the LHS nodes' comments equal to the expression on the RHS. The RHS is run against the matching nodes in the pipeline
+This will assign the LHS nodes comments to the expression on the RHS. The RHS is run against the matching nodes in the pipeline
 
 ### relative form: `|=` 
-This is similar to the plain form, but it evaluates the RHS with _each matching LHS node as context_. This is useful if you want to set the comments as a relative expression of the node, for instance its value or path.
+Similar to the plain form, however the RHS evaluates against each matching LHS node! This is useful if you want to set the comments as a relative expression of the node, for instance its value or path.
 
 ## Set line comment
 Set the comment on the key node for more reliability (see below).

pkg/yqlib/doc/operators/contains.md

@@ -4,7 +4,7 @@ This returns `true` if the context contains the passed in parameter, and false o
 
 {% hint style="warning" %}
 
-_Note_ that, just like jq, when checking if an array of strings `contains` another, this will use `contains` and _not_ equals to check each string. This means an expression like `contains(["cat"])` will return true for an array `["cats"]`.
+_Note_ that, just like jq, when checking if an array of strings `contains` another, this will use `contains` and _not_ equals to check each string. This means an array like `contains(["cat"])` will return true for an array `["cats"]`.
 
 See the "Array has a subset array" example below on how to check for a subset.
 

pkg/yqlib/doc/operators/datetime.md

@@ -3,7 +3,7 @@
 Various operators for parsing and manipulating dates. 
 
 ## Date time formattings
-This uses Golang's built in time library for parsing and formatting date times.
+This uses the golangs 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.
 
@@ -17,13 +17,13 @@ See the [library docs](https://pkg.go.dev/time#pkg-constants) for examples of fo
 
 
 ## Timezones
-This uses Golang's built in LoadLocation function to parse timezones strings. See the [library docs](https://pkg.go.dev/time#LoadLocation) for more details.
+This uses golangs built in LoadLocation function to parse timezones strings. See the [library docs](https://pkg.go.dev/time#LoadLocation) for more details.
 
 
 ## Durations
-Durations are parsed using Golang's built in [ParseDuration](https://pkg.go.dev/time#ParseDuration) function.
+Durations are parsed using golangs built in [ParseDuration](https://pkg.go.dev/time#ParseDuration) function.
 
-You can add durations to time using the `+` operator.
+You can durations to time using the `+` operator.
 
 ## Format: from standard RFC3339 format
 Providing a single parameter assumes a standard RFC3339 datetime format. If the target format is not a valid yaml datetime format, the result will be a string tagged node.

pkg/yqlib/doc/operators/divide.md

@@ -1,61 +0,0 @@
-# Divide
-
-Divide behaves differently according to the type of the LHS:
-* strings: split by the divider
-* number: arithmetic division
-
-## String split
-Given a sample.yml file of:
-```yaml
-a: cat_meow
-b: _
-```
-then
-```bash
-yq '.c = .a / .b' sample.yml
-```
-will output
-```yaml
-a: cat_meow
-b: _
-c:
-  - cat
-  - meow
-```
-
-## Number division
-The result during division is calculated as a float
-
-Given a sample.yml file of:
-```yaml
-a: 12
-b: 2.5
-```
-then
-```bash
-yq '.a = .a / .b' sample.yml
-```
-will output
-```yaml
-a: 4.8
-b: 2.5
-```
-
-## Number division by zero
-Dividing by zero results in +Inf or -Inf
-
-Given a sample.yml file of:
-```yaml
-a: 1
-b: -1
-```
-then
-```bash
-yq '.a = .a / 0 | .b = .b / 0' sample.yml
-```
-will output
-```yaml
-a: !!float +Inf
-b: !!float -Inf
-```
-

pkg/yqlib/doc/operators/encode-decode.md

@@ -309,7 +309,7 @@ cat,"thing1,thing2",true,3.40
 dog,thing3,false,12
 ```
 
-## Encode array of arrays as tsv string
+## Encode array of array scalars as tsv string
 Scalars are strings, numbers and booleans.
 
 Given a sample.yml file of:

pkg/yqlib/doc/operators/entries.md

@@ -67,7 +67,7 @@ a: 1
 b: 2
 ```
 
-## from_entries with numeric key indices
+## from_entries with numeric key indexes
 from_entries always creates a map, even for numeric keys
 
 Given a sample.yml file of:

pkg/yqlib/doc/operators/eval.md

@@ -2,9 +2,9 @@
 
 Use `eval` to dynamically process an expression - for instance from an environment variable.
 
-`eval` takes a single argument, and evaluates that as a `yq` expression. Any valid expression can be used, be it a path `.a.b.c | select(. == "cat")`, or an update `.a.b.c = "gogo"`.
+`eval` takes a single argument, and evaluates that as a `yq` expression. Any valid expression can be used, beit a path `.a.b.c | select(. == "cat")`, or an update `.a.b.c = "gogo"`.
 
-Tip: This can be a useful way to parameterise complex scripts.
+Tip: This can be useful way parameterise complex scripts.
 
 ## Dynamically evaluate a path
 Given a sample.yml file of:

pkg/yqlib/doc/operators/filter.md

@@ -1,42 +0,0 @@
-# Filter
-
-Filters an array (or map values) by the expression given. Equivalent to doing `map(select(exp))`.
-
-
-## Filter array
-Given a sample.yml file of:
-```yaml
-- 1
-- 2
-- 3
-```
-then
-```bash
-yq 'filter(. < 3)' sample.yml
-```
-will output
-```yaml
-- 1
-- 2
-```
-
-## Filter map values
-Given a sample.yml file of:
-```yaml
-c:
-  things: cool
-  frog: yes
-d:
-  things: hot
-  frog: false
-```
-then
-```bash
-yq 'filter(.things == "cool")' sample.yml
-```
-will output
-```yaml
-- things: cool
-  frog: yes
-```
-

pkg/yqlib/doc/operators/has.md

@@ -1,6 +1,6 @@
 # Has
 
-This operation returns true if the key exists in a map (or index in an array), false otherwise.
+This is operation that returns true if the key exists in a map (or index in an array), false otherwise.
 
 ## Has map key
 Given a sample.yml file of:

pkg/yqlib/doc/operators/headers/assign-update.md

@@ -3,10 +3,10 @@
 This operator is used to update node values. It can be used in either the:
 
 ### plain form: `=`
-Which will set the LHS node values equal to the RHS node values. The RHS expression is run against the matching nodes in the pipeline.
+Which will assign the LHS node values to the RHS node values. The RHS expression is run against the matching nodes in the pipeline.
 
 ### relative form: `|=`
-This will do a similar thing to the plain form, but the RHS expression is run with _each LHS node as context_. This is useful for updating values based on old values, e.g. increment.
+This will do a similar thing to the plain form, however, the RHS expression is run against _the LHS nodes_. This is useful for updating values based on old values, e.g. increment.
 
 
 ### Flags

pkg/yqlib/doc/operators/headers/comment-operators.md

@@ -5,7 +5,7 @@ Use these comment operators to set or retrieve comments. Note that line comments
 Like the `=` and `|=` assign operators, the same syntax applies when updating comments:
 
 ### plain form: `=`
-This will set the LHS nodes' comments equal to the expression on the RHS. The RHS is run against the matching nodes in the pipeline
+This will assign the LHS nodes comments to the expression on the RHS. The RHS is run against the matching nodes in the pipeline
 
 ### relative form: `|=` 
-This is similar to the plain form, but it evaluates the RHS with _each matching LHS node as context_. This is useful if you want to set the comments as a relative expression of the node, for instance its value or path.
+Similar to the plain form, however the RHS evaluates against each matching LHS node! This is useful if you want to set the comments as a relative expression of the node, for instance its value or path.

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

@@ -4,7 +4,7 @@ This returns `true` if the context contains the passed in parameter, and false o
 
 {% hint style="warning" %}
 
-_Note_ that, just like jq, when checking if an array of strings `contains` another, this will use `contains` and _not_ equals to check each string. This means an expression like `contains(["cat"])` will return true for an array `["cats"]`.
+_Note_ that, just like jq, when checking if an array of strings `contains` another, this will use `contains` and _not_ equals to check each string. This means an array like `contains(["cat"])` will return true for an array `["cats"]`.
 
 See the "Array has a subset array" example below on how to check for a subset.
 

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

@@ -3,7 +3,7 @@
 Various operators for parsing and manipulating dates. 
 
 ## Date time formattings
-This uses Golang's built in time library for parsing and formatting date times.
+This uses the golangs 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.
 
@@ -17,10 +17,10 @@ See the [library docs](https://pkg.go.dev/time#pkg-constants) for examples of fo
 
 
 ## Timezones
-This uses Golang's built in LoadLocation function to parse timezones strings. See the [library docs](https://pkg.go.dev/time#LoadLocation) for more details.
+This uses golangs built in LoadLocation function to parse timezones strings. See the [library docs](https://pkg.go.dev/time#LoadLocation) for more details.
 
 
 ## Durations
-Durations are parsed using Golang's built in [ParseDuration](https://pkg.go.dev/time#ParseDuration) function.
+Durations are parsed using golangs built in [ParseDuration](https://pkg.go.dev/time#ParseDuration) function.
 
-You can add durations to time using the `+` operator.
+You can durations to time using the `+` operator.

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

@@ -1,5 +0,0 @@
-# Divide
-
-Divide behaves differently according to the type of the LHS:
-* strings: split by the divider
-* number: arithmetic division

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

@@ -2,6 +2,6 @@
 
 Use `eval` to dynamically process an expression - for instance from an environment variable.
 
-`eval` takes a single argument, and evaluates that as a `yq` expression. Any valid expression can be used, be it a path `.a.b.c | select(. == "cat")`, or an update `.a.b.c = "gogo"`.
+`eval` takes a single argument, and evaluates that as a `yq` expression. Any valid expression can be used, beit a path `.a.b.c | select(. == "cat")`, or an update `.a.b.c = "gogo"`.
 
-Tip: This can be a useful way to parameterise complex scripts.
+Tip: This can be useful way parameterise complex scripts.

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

@@ -1,4 +0,0 @@
-# Filter
-
-Filters an array (or map values) by the expression given. Equivalent to doing `map(select(exp))`.
-

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

@@ -1,3 +1,3 @@
 # Has
 
-This operation returns true if the key exists in a map (or index in an array), false otherwise.
+This is operation that returns true if the key exists in a map (or index in an array), false otherwise.

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

@@ -1,3 +0,0 @@
-# Modulo
-
-Arithmetic modulo operator, returns the remainder from dividing two numbers.

pkg/yqlib/doc/operators/headers/recursive-descent-glob.md

@@ -1,6 +1,6 @@
 # Recursive Descent (Glob)
 
-This operator recursively matches (or globs) all children nodes given of a particular element, including that node itself. This is most often used to apply a filter recursively against all matches.
+This operator recursively matches (or globs) all children nodes given of a particular element, including that node itself. This is most often used to apply a filter recursively against all matches. It can be used in either the 
 
 ## match values form `..`
 This will, like the `jq` equivalent, recursively match all _value_ nodes. Use it to find/manipulate particular values.
@@ -12,7 +12,7 @@ yq '.. style= "flow"' file.yaml
 ```
 
 ## match values and map keys form `...`
-The also includes map keys in the results set. This is particularly useful in YAML as unlike JSON, map keys can have their own styling and tags and also use anchors and aliases.
+The also includes map keys in the results set. This is particularly useful in YAML as unlike JSON, map keys can have their own styling, tags and use anchors and aliases.
 
 For instance to set the `style` of all nodes in a yaml doc, including the map keys:
 

pkg/yqlib/doc/operators/headers/sort-keys.md

@@ -10,7 +10,7 @@ yq -i -P 'sort_keys(..)' file2.yml
 diff file1.yml file2.yml
 ```
 
-Note that `yq` does not yet consider anchors when sorting by keys - this may result in invalid yaml documents if you are using merge anchors.
+Note that `yq` does not yet consider anchors when sorting by keys - this may result in invalid yaml documents if your are using merge anchors.
 
 For more advanced sorting, using `to_entries` to convert the map to an array, then sort/process the array as you like (e.g. using `sort_by`) and convert back to a map using `from_entries`.
 See [here](https://mikefarah.gitbook.io/yq/operators/entries#custom-sort-map-keys) for an example. 

pkg/yqlib/doc/operators/headers/string-operators.md

@@ -1,7 +1,7 @@
 # String Operators
 
 ## RegEx
-This uses Golang's native regex functions under the hood - See their [docs](https://github.com/google/re2/wiki/Syntax) for the supported syntax.
+This uses golangs native regex functions under the hood - See their [docs](https://github.com/google/re2/wiki/Syntax) for the supported syntax.
 
 Case insensitive tip: prefix the regex with `(?i)` - e.g. `test("(?i)cats)"`.
 
@@ -15,7 +15,7 @@ Capture returns named RegEx capture groups in a map. Can be more convenient than
 Returns true if the string matches the RegEx, false otherwise.
 
 ## sub(regEx, replacement)
-Substitutes matched substrings. The first parameter is the regEx to match substrings within the original string. The second parameter specifies what to replace those matches with. This can refer to capture groups from the first RegEx.
+Substitutes matched substrings. The first parameter is the regEx to match substrings within the original string. The second is a what to replace those matches with. This can refer to capture groups from the first RegEx.
 
 ## String blocks, bash and newlines
 Bash is notorious for chomping on precious trailing newline characters, making it tricky to set strings with newlines properly. In particular, the `$( exp )` _will trim trailing newlines_.
@@ -27,7 +27,7 @@ a: |
   cat
 ```
 
-Using `$( exp )` wont work, as it will trim the trailing newline.
+Using `$( exp )` wont work, as it will trim the trailing new line.
 
 ```
 m=$(echo "cat\n") yq -n '.a = strenv(m)'
@@ -49,7 +49,7 @@ a: |
   cat
 ```
 
-Similarly, if you're trying to set the content from a file, and want a trailing newline:
+Similarly, if you're trying to set the content from a file, and want a trailing new line:
 
 ```
 IFS= read -rd '' output < <(cat my_file)

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

@@ -1,3 +1,3 @@
 # Subtract
 
-You can use subtract to subtract numbers as well as remove elements from an array.
+You can use subtract to subtract numbers, as well as removing elements from an array.

pkg/yqlib/doc/operators/headers/traverse-read.md

@@ -1,3 +1,3 @@
 # Traverse (Read)
 
-This is the simplest (and perhaps most used) operator. It is used to navigate deeply into yaml structures.
+This is the simplest (and perhaps most used) operator, it is used to navigate deeply into yaml structures.

pkg/yqlib/doc/operators/line.md

@@ -29,7 +29,7 @@ b:
 ```
 then
 ```bash
-yq '.b | key | line' sample.yml
+yq '.b | key| line' sample.yml
 ```
 will output
 ```yaml

pkg/yqlib/doc/operators/modulo.md

@@ -1,75 +0,0 @@
-# Modulo
-
-Arithmetic modulo operator, returns the remainder from dividing two numbers.
-
-## Number modulo - int
-If the lhs and rhs are ints then the expression will be calculated with ints.
-
-Given a sample.yml file of:
-```yaml
-a: 13
-b: 2
-```
-then
-```bash
-yq '.a = .a % .b' sample.yml
-```
-will output
-```yaml
-a: 1
-b: 2
-```
-
-## Number modulo - float
-If the lhs or rhs are floats then the expression will be calculated with floats.
-
-Given a sample.yml file of:
-```yaml
-a: 12
-b: 2.5
-```
-then
-```bash
-yq '.a = .a % .b' sample.yml
-```
-will output
-```yaml
-a: !!float 2
-b: 2.5
-```
-
-## Number modulo - int by zero
-If the lhs is an int and rhs is a 0 the result is an error.
-
-Given a sample.yml file of:
-```yaml
-a: 1
-b: 0
-```
-then
-```bash
-yq '.a = .a % .b' sample.yml
-```
-will output
-```bash
-Error: cannot modulo by 0
-```
-
-## Number modulo - float by zero
-If the lhs is a float and rhs is a 0 the result is NaN.
-
-Given a sample.yml file of:
-```yaml
-a: 1.1
-b: 0
-```
-then
-```bash
-yq '.a = .a % .b' sample.yml
-```
-will output
-```yaml
-a: !!float NaN
-b: 0
-```
-

pkg/yqlib/doc/operators/multiply-merge.md

@@ -250,7 +250,7 @@ thing:
 ```
 
 ## Merge, deeply merging arrays
-Merging arrays deeply means arrays are merged like objects, with indices as their key. In this case, we merge the first item in the array and do nothing with the second.
+Merging arrays deeply means arrays are merge like objects, with indexes as their key. In this case, we merge the first item in the array, and do nothing with the second.
 
 Given a sample.yml file of:
 ```yaml
@@ -477,7 +477,7 @@ b: !goat
 ```
 
 ## Custom types: clobber tags
-Use the `c` option to clobber custom tags. Note that the second tag is now used.
+Use the `c` option to clobber custom tags. Note that the second tag is now used
 
 Given a sample.yml file of:
 ```yaml

pkg/yqlib/doc/operators/path.md

@@ -123,7 +123,7 @@ a:
 ```
 
 ## Set path to prune deep paths
-Like pick but recursive. This uses `ireduce` to deeply set the selected paths into an empty object.
+Like pick but recursive. This uses `ireduce` to deeply set the selected paths into an empty object,
 
 Given a sample.yml file of:
 ```yaml

pkg/yqlib/doc/operators/pick.md

@@ -27,7 +27,7 @@ myMap:
 ```
 
 ## Pick indices from array
-Note that the order of the indices matches the pick order and non existent indices are skipped.
+Note that the order of the indexes matches the pick order and non existent indexes are skipped.
 
 Given a sample.yml file of:
 ```yaml

pkg/yqlib/doc/operators/recursive-descent-glob.md

@@ -1,6 +1,6 @@
 # Recursive Descent (Glob)
 
-This operator recursively matches (or globs) all children nodes given of a particular element, including that node itself. This is most often used to apply a filter recursively against all matches.
+This operator recursively matches (or globs) all children nodes given of a particular element, including that node itself. This is most often used to apply a filter recursively against all matches. It can be used in either the 
 
 ## match values form `..`
 This will, like the `jq` equivalent, recursively match all _value_ nodes. Use it to find/manipulate particular values.
@@ -12,7 +12,7 @@ yq '.. style= "flow"' file.yaml
 ```
 
 ## match values and map keys form `...`
-The also includes map keys in the results set. This is particularly useful in YAML as unlike JSON, map keys can have their own styling and tags and also use anchors and aliases.
+The also includes map keys in the results set. This is particularly useful in YAML as unlike JSON, map keys can have their own styling, tags and use anchors and aliases.
 
 For instance to set the `style` of all nodes in a yaml doc, including the map keys:
 

pkg/yqlib/doc/operators/select.md

@@ -62,7 +62,7 @@ going
 ```
 
 ## Select elements from array with regular expression
-See more regular expression examples under the [`string` operator docs](https://mikefarah.gitbook.io/yq/operators/string-operators).
+See more regular expression examples under the `string` operator docs.
 
 Given a sample.yml file of:
 ```yaml

pkg/yqlib/doc/operators/sort-keys.md

@@ -10,7 +10,7 @@ yq -i -P 'sort_keys(..)' file2.yml
 diff file1.yml file2.yml
 ```
 
-Note that `yq` does not yet consider anchors when sorting by keys - this may result in invalid yaml documents if you are using merge anchors.
+Note that `yq` does not yet consider anchors when sorting by keys - this may result in invalid yaml documents if your are using merge anchors.
 
 For more advanced sorting, using `to_entries` to convert the map to an array, then sort/process the array as you like (e.g. using `sort_by`) and convert back to a map using `from_entries`.
 See [here](https://mikefarah.gitbook.io/yq/operators/entries#custom-sort-map-keys) for an example. 

pkg/yqlib/doc/operators/string-operators.md

@@ -1,7 +1,7 @@
 # String Operators
 
 ## RegEx
-This uses Golang's native regex functions under the hood - See their [docs](https://github.com/google/re2/wiki/Syntax) for the supported syntax.
+This uses golangs native regex functions under the hood - See their [docs](https://github.com/google/re2/wiki/Syntax) for the supported syntax.
 
 Case insensitive tip: prefix the regex with `(?i)` - e.g. `test("(?i)cats)"`.
 
@@ -15,7 +15,7 @@ Capture returns named RegEx capture groups in a map. Can be more convenient than
 Returns true if the string matches the RegEx, false otherwise.
 
 ## sub(regEx, replacement)
-Substitutes matched substrings. The first parameter is the regEx to match substrings within the original string. The second parameter specifies what to replace those matches with. This can refer to capture groups from the first RegEx.
+Substitutes matched substrings. The first parameter is the regEx to match substrings within the original string. The second is a what to replace those matches with. This can refer to capture groups from the first RegEx.
 
 ## String blocks, bash and newlines
 Bash is notorious for chomping on precious trailing newline characters, making it tricky to set strings with newlines properly. In particular, the `$( exp )` _will trim trailing newlines_.
@@ -27,7 +27,7 @@ a: |
   cat
 ```
 
-Using `$( exp )` wont work, as it will trim the trailing newline.
+Using `$( exp )` wont work, as it will trim the trailing new line.
 
 ```
 m=$(echo "cat\n") yq -n '.a = strenv(m)'
@@ -49,7 +49,7 @@ a: |
   cat
 ```
 
-Similarly, if you're trying to set the content from a file, and want a trailing newline:
+Similarly, if you're trying to set the content from a file, and want a trailing new line:
 
 ```
 IFS= read -rd '' output < <(cat my_file)
@@ -298,7 +298,7 @@ false
 ```
 
 ## Substitute / Replace string
-This uses Golang's regex, described [here](https://github.com/google/re2/wiki/Syntax).
+This uses golang regex, described [here](https://github.com/google/re2/wiki/Syntax)
 Note the use of `|=` to run in context of the current string value.
 
 Given a sample.yml file of:
@@ -315,7 +315,7 @@ a: cats are great
 ```
 
 ## Substitute / Replace string with regex
-This uses Golang's regex, described [here](https://github.com/google/re2/wiki/Syntax).
+This uses golang regex, described [here](https://github.com/google/re2/wiki/Syntax)
 Note the use of `|=` to run in context of the current string value.
 
 Given a sample.yml file of:

pkg/yqlib/doc/operators/subtract.md

@@ -1,6 +1,6 @@
 # Subtract
 
-You can use subtract to subtract numbers as well as remove elements from an array.
+You can use subtract to subtract numbers, as well as removing elements from an array.
 
 ## Array subtraction
 Running
@@ -59,6 +59,24 @@ a: -1.5
 b: 4.5
 ```
 
+## Number subtraction - float
+If the lhs or rhs are floats then the expression will be calculated with floats.
+
+Given a sample.yml file of:
+```yaml
+a: 3
+b: 4.5
+```
+then
+```bash
+yq '.a = .a - .b' sample.yml
+```
+will output
+```yaml
+a: -1.5
+b: 4.5
+```
+
 ## Number subtraction - int
 If both the lhs and rhs are ints then the expression will be calculated with ints.
 

pkg/yqlib/doc/operators/traverse-read.md

@@ -1,6 +1,6 @@
 # Traverse (Read)
 
-This is the simplest (and perhaps most used) operator. It is used to navigate deeply into yaml structures.
+This is the simplest (and perhaps most used) operator, it is used to navigate deeply into yaml structures.
 
 ## Simple map navigation
 Given a sample.yml file of:
@@ -51,7 +51,7 @@ will output
 ```
 
 ## Special characters
-Use quotes with square brackets around path elements with special characters
+Use quotes with brackets around path elements with special characters
 
 Given a sample.yml file of:
 ```yaml
@@ -83,7 +83,7 @@ apple
 ```
 
 ## Keys with spaces
-Use quotes with square brackets around path elements with special characters
+Use quotes with brackets around path elements with special characters
 
 Given a sample.yml file of:
 ```yaml

pkg/yqlib/doc/usage/xml.md

@@ -407,10 +407,8 @@ A best attempt is made to copy comments to xml.
 
 Given a sample.yml file of:
 ```yaml
-#
 # header comment
 # above_cat
-#
 cat: # inline_cat
   # above_array
   array: # inline_array
@@ -427,11 +425,9 @@ yq -o=xml '.' sample.yml
 will output
 ```xml
 <!--
-header comment
-above_cat
--->
-<!-- inline_cat -->
-<cat><!-- above_array inline_array -->
+ header comment
+ above_cat
+ --><!-- inline_cat --><cat><!-- above_array inline_array -->
   <array>val1<!-- inline_val1 --></array>
   <array><!-- above_val2 -->val2<!-- inline_val2 --></array>
 </cat><!-- below_cat -->
@@ -493,8 +489,7 @@ yq -p=xml -o=xml '.' sample.xml
 ```
 will output
 ```xml
-<!-- before cat -->
-<cat><!-- in cat before -->
+<!-- before cat --><cat><!-- in cat before -->
   <x>3<!-- multi
 line comment 
 for x --></x><!-- before y -->

pkg/yqlib/encoder.go

@@ -1,6 +1,10 @@
 package yqlib
 
 import (
+	"bytes"
+	"encoding/json"
+	"errors"
+	"fmt"
 	"io"
 
 	yaml "gopkg.in/yaml.v3"
@@ -13,17 +17,162 @@ type Encoder interface {
 	CanHandleAliases() bool
 }
 
-func mapKeysToStrings(node *yaml.Node) {
+// orderedMap allows to marshal and unmarshal JSON and YAML values keeping the
+// order of keys and values in a map or an object.
+type orderedMap struct {
+	// if this is an object, kv != nil. If this is not an object, kv == nil.
+	kv     []orderedMapKV
+	altVal interface{}
+}
 
-	if node.Kind == yaml.MappingNode {
-		for index, child := range node.Content {
-			if index%2 == 0 { // its a map key
-				child.Tag = "!!str"
+type orderedMapKV struct {
+	K string
+	V orderedMap
+}
+
+func (o *orderedMap) UnmarshalJSON(data []byte) error {
+	switch data[0] {
+	case '{':
+		// initialise so that even if the object is empty it is not nil
+		o.kv = []orderedMapKV{}
+
+		// create decoder
+		dec := json.NewDecoder(bytes.NewReader(data))
+		_, err := dec.Token() // open object
+		if err != nil {
+			return err
+		}
+
+		// cycle through k/v
+		var tok json.Token
+		for tok, err = dec.Token(); err == nil; tok, err = dec.Token() {
+			// we can expect two types: string or Delim. Delim automatically means
+			// that it is the closing bracket of the object, whereas string means
+			// that there is another key.
+			if _, ok := tok.(json.Delim); ok {
+				break
 			}
+			kv := orderedMapKV{
+				K: tok.(string),
+			}
+			if err := dec.Decode(&kv.V); err != nil {
+				return err
+			}
+			o.kv = append(o.kv, kv)
+		}
+		// unexpected error
+		if err != nil && !errors.Is(err, io.EOF) {
+			return err
+		}
+		return nil
+	case '[':
+		var res []*orderedMap
+		if err := json.Unmarshal(data, &res); err != nil {
+			return err
+		}
+		o.altVal = res
+		o.kv = nil
+		return nil
+	}
+
+	return json.Unmarshal(data, &o.altVal)
+}
+
+func (o orderedMap) MarshalJSON() ([]byte, error) {
+	buf := new(bytes.Buffer)
+	enc := json.NewEncoder(buf)
+	enc.SetEscapeHTML(false) // do not escape html chars e.g. &, <, >
+	if o.kv == nil {
+		if err := enc.Encode(o.altVal); err != nil {
+			return nil, err
+		}
+		return buf.Bytes(), nil
+	}
+	buf.WriteByte('{')
+	for idx, el := range o.kv {
+		if err := enc.Encode(el.K); err != nil {
+			return nil, err
+		}
+		buf.WriteByte(':')
+		if err := enc.Encode(el.V); err != nil {
+			return nil, err
+		}
+		if idx != len(o.kv)-1 {
+			buf.WriteByte(',')
 		}
 	}
+	buf.WriteByte('}')
+	return buf.Bytes(), nil
+}
 
-	for _, child := range node.Content {
-		mapKeysToStrings(child)
+func (o *orderedMap) UnmarshalYAML(node *yaml.Node) error {
+	switch node.Kind {
+	case yaml.DocumentNode:
+		if len(node.Content) == 0 {
+			return nil
+		}
+		return o.UnmarshalYAML(node.Content[0])
+	case yaml.AliasNode:
+		return o.UnmarshalYAML(node.Alias)
+	case yaml.ScalarNode:
+		return node.Decode(&o.altVal)
+	case yaml.MappingNode:
+		// set kv to non-nil
+		o.kv = []orderedMapKV{}
+		for i := 0; i < len(node.Content); i += 2 {
+			var key string
+			var val orderedMap
+			if err := node.Content[i].Decode(&key); err != nil {
+				return err
+			}
+			if err := node.Content[i+1].Decode(&val); err != nil {
+				return err
+			}
+			o.kv = append(o.kv, orderedMapKV{
+				K: key,
+				V: val,
+			})
+		}
+		return nil
+	case yaml.SequenceNode:
+		// note that this has to be a pointer, so that nulls can be represented.
+		var res []*orderedMap
+		if err := node.Decode(&res); err != nil {
+			return err
+		}
+		o.altVal = res
+		o.kv = nil
+		return nil
+	case 0:
+		// null
+		o.kv = nil
+		o.altVal = nil
+		return nil
+	default:
+		return fmt.Errorf("orderedMap: invalid yaml node")
 	}
 }
+
+func (o *orderedMap) MarshalYAML() (interface{}, error) {
+	// fast path: kv is nil, use altVal
+	if o.kv == nil {
+		return o.altVal, nil
+	}
+	content := make([]*yaml.Node, 0, len(o.kv)*2)
+	for _, val := range o.kv {
+		n := new(yaml.Node)
+		if err := n.Encode(val.V); err != nil {
+			return nil, err
+		}
+		content = append(content, &yaml.Node{
+			Kind:  yaml.ScalarNode,
+			Tag:   "!!str",
+			Value: val.K,
+		}, n)
+	}
+	return &yaml.Node{
+		Kind:    yaml.MappingNode,
+		Tag:     "!!map",
+		Content: content,
+	}, nil
+}

pkg/yqlib/encoder_json.go

@@ -1,5 +1,3 @@
-//go:build !yq_nojson
-
 package yqlib
 
 import (
@@ -16,6 +14,21 @@ type jsonEncoder struct {
 	UnwrapScalar bool
 }
 
+func mapKeysToStrings(node *yaml.Node) {
+
+	if node.Kind == yaml.MappingNode {
+		for index, child := range node.Content {
+			if index%2 == 0 { // its a map key
+				child.Tag = "!!str"
+			}
+		}
+	}
+
+	for _, child := range node.Content {
+		mapKeysToStrings(child)
+	}
+}
+
 func NewJSONEncoder(indent int, colorise bool, unwrapScalar bool) Encoder {
 	var indentString = ""
 

pkg/yqlib/encoder_properties.go

@@ -51,7 +51,7 @@ func (pe *propertiesEncoder) PrintLeadingContent(writer io.Writer, content strin
 
 		if errors.Is(errReading, io.EOF) {
 			if readline != "" {
-				// the last comment we read didn't have a newline, put one in
+				// the last comment we read didn't have a new line, put one in
 				if err := writeString(writer, "\n"); err != nil {
 					return err
 				}

pkg/yqlib/encoder_test.go

@@ -1,5 +1,3 @@
-//go:build !yq_nojson
-
 package yqlib
 
 import (

pkg/yqlib/encoder_xml.go

@@ -1,5 +1,3 @@
-//go:build !yq_noxml
-
 package yqlib
 
 import (
@@ -19,6 +17,8 @@ type xmlEncoder struct {
 	leadingContent string
 }
 
+var commentPrefix = regexp.MustCompile(`(^|\n)\s*#`)
+
 func NewXMLEncoder(indent int, prefs XmlPreferences) Encoder {
 	var indentString = ""
 
@@ -37,7 +37,7 @@ func (e *xmlEncoder) PrintDocumentSeparator(writer io.Writer) error {
 }
 
 func (e *xmlEncoder) PrintLeadingContent(writer io.Writer, content string) error {
-	e.leadingContent = content
+	e.leadingContent = commentPrefix.ReplaceAllString(content, "\n")
 	return nil
 }
 
@@ -46,39 +46,12 @@ func (e *xmlEncoder) Encode(writer io.Writer, node *yaml.Node) error {
 	// hack so we can manually add newlines to procInst and directives
 	e.writer = writer
 	encoder.Indent("", e.indentString)
-	var newLine xml.CharData = []byte("\n")
-
-	mapNode := unwrapDoc(node)
-	if mapNode.Tag == "!!map" {
-		// make sure <?xml .. ?> processing instructions are encoded first
-		for i := 0; i < len(mapNode.Content); i += 2 {
-			key := mapNode.Content[i]
-			value := mapNode.Content[i+1]
-
-			if key.Value == (e.prefs.ProcInstPrefix + "xml") {
-				name := strings.Replace(key.Value, e.prefs.ProcInstPrefix, "", 1)
-				procInst := xml.ProcInst{Target: name, Inst: []byte(value.Value)}
-				if err := encoder.EncodeToken(procInst); err != nil {
-					return err
-				}
-				if _, err := e.writer.Write([]byte("\n")); err != nil {
-					log.Warning("Unable to write newline, skipping: %w", err)
-				}
-			}
-		}
-	}
 
 	if e.leadingContent != "" {
-
-		// remove first and last newlines if present
 		err := e.encodeComment(encoder, e.leadingContent)
 		if err != nil {
 			return err
 		}
-		err = encoder.EncodeToken(newLine)
-		if err != nil {
-			return err
-		}
 	}
 
 	switch node.Kind {
@@ -114,12 +87,29 @@ func (e *xmlEncoder) Encode(writer io.Writer, node *yaml.Node) error {
 	default:
 		return fmt.Errorf("unsupported type %v", node.Tag)
 	}
-
-	return encoder.EncodeToken(newLine)
+	var charData xml.CharData = []byte("\n")
+	return encoder.EncodeToken(charData)
 
 }
 
 func (e *xmlEncoder) encodeTopLevelMap(encoder *xml.Encoder, node *yaml.Node) error {
+	// make sure <?xml .. ?> processing instructions are encoded first
+	for i := 0; i < len(node.Content); i += 2 {
+		key := node.Content[i]
+		value := node.Content[i+1]
+
+		if key.Value == (e.prefs.ProcInstPrefix + "xml") {
+			name := strings.Replace(key.Value, e.prefs.ProcInstPrefix, "", 1)
+			procInst := xml.ProcInst{Target: name, Inst: []byte(value.Value)}
+			if err := encoder.EncodeToken(procInst); err != nil {
+				return err
+			}
+			if _, err := e.writer.Write([]byte("\n")); err != nil {
+				log.Warning("Unable to write newline, skipping: %w", err)
+			}
+		}
+	}
+
 	err := e.encodeComment(encoder, headAndLineComment(node))
 	if err != nil {
 		return err
@@ -134,13 +124,6 @@ func (e *xmlEncoder) encodeTopLevelMap(encoder *xml.Encoder, node *yaml.Node) er
 		if err != nil {
 			return err
 		}
-		if headAndLineComment(key) != "" {
-			var newLine xml.CharData = []byte("\n")
-			err = encoder.EncodeToken(newLine)
-			if err != nil {
-				return err
-			}
-		}
 
 		if key.Value == (e.prefs.ProcInstPrefix + "xml") {
 			// dont double process these.
@@ -221,33 +204,12 @@ func (e *xmlEncoder) doEncode(encoder *xml.Encoder, node *yaml.Node, start xml.S
 	return fmt.Errorf("unsupported type %v", node.Tag)
 }
 
-var xmlEncodeMultilineCommentRegex = regexp.MustCompile(`(^|\n) *# ?(.*)`)
-var xmlEncodeSingleLineCommentRegex = regexp.MustCompile(`^\s*#(.*)\n?`)
-var chompRegexp = regexp.MustCompile(`\n$`)
-
 func (e *xmlEncoder) encodeComment(encoder *xml.Encoder, commentStr string) error {
 	if commentStr != "" {
-		log.Debugf("got comment [%v]", commentStr)
-		// multi line string
-		if len(commentStr) > 2 && strings.Contains(commentStr[1:len(commentStr)-1], "\n") {
-			commentStr = chompRegexp.ReplaceAllString(commentStr, "")
-			log.Debugf("chompRegexp [%v]", commentStr)
-			commentStr = xmlEncodeMultilineCommentRegex.ReplaceAllString(commentStr, "$1$2")
-			log.Debugf("processed multine [%v]", commentStr)
-			// if the first line is non blank, add a space
-			if commentStr[0] != '\n' && commentStr[0] != ' ' {
-				commentStr = " " + commentStr
-			}
-
-		} else {
-			commentStr = xmlEncodeSingleLineCommentRegex.ReplaceAllString(commentStr, "$1")
-		}
-
-		if !strings.HasSuffix(commentStr, " ") && !strings.HasSuffix(commentStr, "\n") {
+		log.Debugf("encoding comment %v", commentStr)
+		if !strings.HasSuffix(commentStr, " ") {
 			commentStr = commentStr + " "
-			log.Debugf("added suffix [%v]", commentStr)
 		}
-		log.Debugf("encoding comment [%v]", commentStr)
 
 		var comment xml.Comment = []byte(commentStr)
 		err := encoder.EncodeToken(comment)

pkg/yqlib/encoder_yaml.go

@@ -61,7 +61,7 @@ func (ye *yamlEncoder) PrintLeadingContent(writer io.Writer, content string) err
 
 		if errors.Is(errReading, io.EOF) {
 			if readline != "" {
-				// the last comment we read didn't have a newline, put one in
+				// the last comment we read didn't have a new line, put one in
 				if err := writeString(writer, "\n"); err != nil {
 					return err
 				}

pkg/yqlib/json_test.go

@@ -1,5 +1,3 @@
-//go:build !yq_nojson
-
 package yqlib
 
 import (

pkg/yqlib/lexer_participle.go

@@ -37,7 +37,6 @@ var participleYqRules = []*participleYqRule{
 
 	{"MapValues", `map_?values`, opToken(mapValuesOpType), 0},
 	simpleOp("map", mapOpType),
-	simpleOp("filter", filterOpType),
 	simpleOp("pick", pickOpType),
 
 	{"FlattenWithDepth", `flatten\([0-9]+\)`, flattenWithDepth(), 0},
@@ -210,10 +209,6 @@ var participleYqRules = []*participleYqRule{
 	{"MultiplyAssign", `\*=[\+|\?cdn]*`, multiplyWithPrefs(multiplyAssignOpType), 0},
 	{"Multiply", `\*[\+|\?cdn]*`, multiplyWithPrefs(multiplyOpType), 0},
 
-	{"Divide", `\/`, opToken(divideOpType), 0},
-
-	{"Modulo", `%`, opToken(moduloOpType), 0},
-
 	{"AddAssign", `\+=`, opToken(addAssignOpType), 0},
 	{"Add", `\+`, opToken(addOpType), 0},
 

pkg/yqlib/lib.go

@@ -62,10 +62,6 @@ var assignAliasOpType = &operationType{Type: "ASSIGN_ALIAS", NumArgs: 2, Precede
 var multiplyOpType = &operationType{Type: "MULTIPLY", NumArgs: 2, Precedence: 42, Handler: multiplyOperator}
 var multiplyAssignOpType = &operationType{Type: "MULTIPLY_ASSIGN", NumArgs: 2, Precedence: 42, Handler: multiplyAssignOperator}
 
-var divideOpType = &operationType{Type: "DIVIDE", NumArgs: 2, Precedence: 42, Handler: divideOperator}
-
-var moduloOpType = &operationType{Type: "MODULO", NumArgs: 2, Precedence: 42, Handler: moduloOperator}
-
 var addOpType = &operationType{Type: "ADD", NumArgs: 2, Precedence: 42, Handler: addOperator}
 var subtractOpType = &operationType{Type: "SUBTRACT", NumArgs: 2, Precedence: 42, Handler: subtractOperator}
 var alternativeOpType = &operationType{Type: "ALTERNATIVE", NumArgs: 2, Precedence: 42, Handler: alternativeOperator}
@@ -88,7 +84,6 @@ var expressionOpType = &operationType{Type: "EXP", NumArgs: 0, Precedence: 50, H
 
 var collectOpType = &operationType{Type: "COLLECT", NumArgs: 1, Precedence: 50, Handler: collectOperator}
 var mapOpType = &operationType{Type: "MAP", NumArgs: 1, Precedence: 50, Handler: mapOperator}
-var filterOpType = &operationType{Type: "FILTER", NumArgs: 1, Precedence: 50, Handler: filterOperator}
 var errorOpType = &operationType{Type: "ERROR", NumArgs: 1, Precedence: 50, Handler: errorOperator}
 var pickOpType = &operationType{Type: "PICK", NumArgs: 1, Precedence: 50, Handler: pickOperator}
 var evalOpType = &operationType{Type: "EVAL", NumArgs: 1, Precedence: 50, Handler: evalOperator}
@@ -343,7 +338,7 @@ func deepCloneWithOptions(node *yaml.Node, cloneContent bool) *yaml.Node {
 		Tag:         node.Tag,
 		Value:       node.Value,
 		Anchor:      node.Anchor,
-		Alias:       node.Alias,
+		Alias:       deepClone(node.Alias),
 		HeadComment: node.HeadComment,
 		LineComment: node.LineComment,
 		FootComment: node.FootComment,

pkg/yqlib/no_json.go

@@ -1,11 +0,0 @@
-//go:build yq_nojson
-
-package yqlib
-
-func NewJSONDecoder() Decoder {
-	return nil
-}
-
-func NewJSONEncoder(indent int, colorise bool, unwrapScalar bool) Encoder {
-	return nil
-}

pkg/yqlib/no_xml.go

@@ -1,11 +0,0 @@
-//go:build yq_noxml
-
-package yqlib
-
-func NewXMLDecoder(prefs XmlPreferences) Decoder {
-	return nil
-}
-
-func NewXMLEncoder(indent int, prefs XmlPreferences) Encoder {
-	return nil
-}

pkg/yqlib/operator_anchors_aliases_test.go

@@ -228,7 +228,7 @@ foobar:
 	},
 	{
 		description:    "Dereference and update a field",
-		subdescription: "Use explode with multiply to dereference an object",
+		subdescription: "`Use explode with multiply to dereference an object",
 		document:       simpleArrayRef,
 		expression:     `.thingOne |= explode(.) * {"value": false}`,
 		expected:       []string{expectedUpdatedArrayRef},

pkg/yqlib/operator_assign_test.go

@@ -4,11 +4,6 @@ import (
 	"testing"
 )
 
-var mergeAnchorAssign = `a: &a
-  x: OriginalValue
-b:
-  <<: *a`
-
 var assignOperatorScenarios = []expressionScenario{
 	{
 		description: "Create yaml file",
@@ -25,14 +20,6 @@ var assignOperatorScenarios = []expressionScenario{
 			"D0, P[], (doc)::a: null\n",
 		},
 	},
-	{
-		skipDoc:    true,
-		document:   mergeAnchorAssign,
-		expression: `.c = .b | .a.x = "ModifiedValue" | explode(.)`,
-		expected: []string{
-			"D0, P[], (doc)::a:\n    x: ModifiedValue\nb:\n    x: ModifiedValue\nc:\n    x: ModifiedValue\n",
-		},
-	},
 	{
 		skipDoc:    true,
 		document:   "{}",
@@ -196,7 +183,7 @@ var assignOperatorScenarios = []expressionScenario{
 	},
 	{
 		description:           "Update node value that has an anchor",
-		subdescription:        "Anchor will remain",
+		subdescription:        "Anchor will remaple",
 		dontFormatInputForDoc: true,
 		document:              `a: &cool cat`,
 		expression:            `.a = "dog"`,
@@ -230,7 +217,7 @@ var assignOperatorScenarios = []expressionScenario{
 		},
 	},
 	{
-		description:    "Custom types: clobber",
+		description:    "Custom types: clovver",
 		subdescription: "Use the `c` option to clobber custom tags",
 		document:       "a: !cat meow\nb: !dog woof",
 		expression:     `.a =c .b`,

pkg/yqlib/operator_divide.go

@@ -1,78 +0,0 @@
-package yqlib
-
-import (
-	"fmt"
-	"strconv"
-	"strings"
-
-	yaml "gopkg.in/yaml.v3"
-)
-
-func divideOperator(d *dataTreeNavigator, context Context, expressionNode *ExpressionNode) (Context, error) {
-	log.Debugf("Divide operator")
-
-	return crossFunction(d, context.ReadOnlyClone(), expressionNode, divide, false)
-}
-
-func divide(d *dataTreeNavigator, context Context, lhs *CandidateNode, rhs *CandidateNode) (*CandidateNode, error) {
-	lhs.Node = unwrapDoc(lhs.Node)
-	rhs.Node = unwrapDoc(rhs.Node)
-
-	lhsNode := lhs.Node
-
-	if lhsNode.Tag == "!!null" {
-		return nil, fmt.Errorf("%v (%v) cannot be divided by %v (%v)", lhsNode.Tag, lhs.GetNicePath(), rhs.Node.Tag, rhs.GetNicePath())
-	}
-
-	target := &yaml.Node{}
-
-	if lhsNode.Kind == yaml.ScalarNode && rhs.Node.Kind == yaml.ScalarNode {
-		if err := divideScalars(target, lhsNode, rhs.Node); err != nil {
-			return nil, err
-		}
-	} else {
-		return nil, fmt.Errorf("%v (%v) cannot be divided by %v (%v)", lhsNode.Tag, lhs.GetNicePath(), rhs.Node.Tag, rhs.GetNicePath())
-	}
-
-	return lhs.CreateReplacement(target), nil
-}
-
-func divideScalars(target *yaml.Node, lhs *yaml.Node, rhs *yaml.Node) error {
-	lhsTag := lhs.Tag
-	rhsTag := guessTagFromCustomType(rhs)
-	lhsIsCustom := false
-	if !strings.HasPrefix(lhsTag, "!!") {
-		// custom tag - we have to have a guess
-		lhsTag = guessTagFromCustomType(lhs)
-		lhsIsCustom = true
-	}
-
-	if lhsTag == "!!str" && rhsTag == "!!str" {
-		res := split(lhs.Value, rhs.Value)
-		target.Kind = res.Kind
-		target.Tag = res.Tag
-		target.Content = res.Content
-	} else if (lhsTag == "!!int" || lhsTag == "!!float") && (rhsTag == "!!int" || rhsTag == "!!float") {
-		target.Kind = yaml.ScalarNode
-		target.Style = lhs.Style
-
-		lhsNum, err := strconv.ParseFloat(lhs.Value, 64)
-		if err != nil {
-			return err
-		}
-		rhsNum, err := strconv.ParseFloat(rhs.Value, 64)
-		if err != nil {
-			return err
-		}
-		quotient := lhsNum / rhsNum
-		if lhsIsCustom {
-			target.Tag = lhs.Tag
-		} else {
-			target.Tag = "!!float"
-		}
-		target.Value = fmt.Sprintf("%v", quotient)
-	} else {
-		return fmt.Errorf("%v cannot be divided by %v", lhsTag, rhsTag)
-	}
-	return nil
-}

pkg/yqlib/operator_divide_test.go

@@ -1,130 +0,0 @@
-package yqlib
-
-import (
-	"testing"
-)
-
-var divideOperatorScenarios = []expressionScenario{
-	{
-		skipDoc:    true,
-		document:   `[{a: foo_bar, b: _}, {a: 4, b: 2}]`,
-		expression: ".[] | .a / .b",
-		expected: []string{
-			"D0, P[0 a], (!!seq)::- foo\n- bar\n",
-			"D0, P[1 a], (!!float)::2\n",
-		},
-	},
-	{
-		skipDoc:    true,
-		document:   `{}`,
-		expression: "(.a / .b) as $x | .",
-		expected: []string{
-			"D0, P[], (doc)::{}\n",
-		},
-	},
-	{
-		description: "String split",
-		document:    `{a: cat_meow, b: _}`,
-		expression:  `.c = .a / .b`,
-		expected: []string{
-			"D0, P[], (doc)::{a: cat_meow, b: _, c: [cat, meow]}\n",
-		},
-	},
-	{
-		description:    "Number division",
-		subdescription: "The result during division is calculated as a float",
-		document:       `{a: 12, b: 2.5}`,
-		expression:     `.a = .a / .b`,
-		expected: []string{
-			"D0, P[], (doc)::{a: 4.8, b: 2.5}\n",
-		},
-	},
-	{
-		description:    "Number division by zero",
-		subdescription: "Dividing by zero results in +Inf or -Inf",
-		document:       `{a: 1, b: -1}`,
-		expression:     `.a = .a / 0 | .b = .b / 0`,
-		expected: []string{
-			"D0, P[], (doc)::{a: !!float +Inf, b: !!float -Inf}\n",
-		},
-	},
-	{
-		skipDoc:     true,
-		description: "Custom types: that are really strings",
-		document:    "a: !horse cat_meow\nb: !goat _",
-		expression:  `.a = .a / .b`,
-		expected: []string{
-			"D0, P[], (doc)::a: !horse\n    - cat\n    - meow\nb: !goat _\n",
-		},
-	},
-	{
-		skipDoc:     true,
-		description: "Custom types: that are really numbers",
-		document:    "a: !horse 1.2\nb: !goat 2.3",
-		expression:  `.a = .a / .b`,
-		expected: []string{
-			"D0, P[], (doc)::a: !horse 0.5217391304347826\nb: !goat 2.3\n",
-		},
-	},
-	{
-		skipDoc:    true,
-		document:   "a: 2\nb: !goat 2.3",
-		expression: `.a = .a / .b`,
-		expected: []string{
-			"D0, P[], (doc)::a: 0.8695652173913044\nb: !goat 2.3\n",
-		},
-	},
-	{
-		skipDoc:     true,
-		description: "Custom types: that are really ints",
-		document:    "a: !horse 2\nb: !goat 3",
-		expression:  `.a = .a / .b`,
-		expected: []string{
-			"D0, P[], (doc)::a: !horse 0.6666666666666666\nb: !goat 3\n",
-		},
-	},
-	{
-		skipDoc:     true,
-		description: "Keep anchors",
-		document:    "a: &horse [1]",
-		expression:  `.a[1] = .a[0] / 2`,
-		expected: []string{
-			"D0, P[], (doc)::a: &horse [1, 0.5]\n",
-		},
-	},
-	{
-		skipDoc:       true,
-		description:   "Divide int by string",
-		document:      "a: 123\nb: '2'",
-		expression:    `.a / .b`,
-		expectedError: "!!int cannot be divided by !!str",
-	},
-	{
-		skipDoc:       true,
-		description:   "Divide string by int",
-		document:      "a: 2\nb: '123'",
-		expression:    `.b / .a`,
-		expectedError: "!!str cannot be divided by !!int",
-	},
-	{
-		skipDoc:       true,
-		description:   "Divide map by int",
-		document:      "a: {\"a\":1}\nb: 2",
-		expression:    `.a / .b`,
-		expectedError: "!!map (a) cannot be divided by !!int (b)",
-	},
-	{
-		skipDoc:       true,
-		description:   "Divide array by str",
-		document:      "a: [1,2]\nb: '2'",
-		expression:    `.a / .b`,
-		expectedError: "!!seq (a) cannot be divided by !!str (b)",
-	},
-}
-
-func TestDivideOperatorScenarios(t *testing.T) {
-	for _, tt := range divideOperatorScenarios {
-		testScenario(t, &tt)
-	}
-	documentOperatorScenarios(t, "divide", divideOperatorScenarios)
-}

pkg/yqlib/operator_encoder_decoder.go

@@ -4,7 +4,6 @@ import (
 	"bufio"
 	"bytes"
 	"container/list"
-	"errors"
 	"regexp"
 	"strings"
 
@@ -40,9 +39,6 @@ func encodeToString(candidate *CandidateNode, prefs encoderPreferences) (string,
 	log.Debug("printing with indent: %v", prefs.indent)
 
 	encoder := configureEncoder(prefs.format, prefs.indent)
-	if encoder == nil {
-		return "", errors.New("no support for output format")
-	}
 
 	printer := NewPrinter(encoder, NewSinglePrinterWriter(bufio.NewWriter(&output)))
 	err := printer.PrintResults(candidate.AsList())
@@ -79,13 +75,13 @@ func encodeOperator(d *dataTreeNavigator, context Context, expressionNode *Expre
 
 			original := originalList.Front().Value.(*CandidateNode)
 			originalNode := unwrapDoc(original.Node)
-			// original block did not have a newline at the end, get rid of this one too
+			// original block did not have a new line at the end, get rid of this one too
 			if !endWithNewLine.MatchString(originalNode.Value) {
 				stringValue = chomper.ReplaceAllString(stringValue, "")
 			}
 		}
 
-		// dont print a newline when printing json on a single line.
+		// dont print a new line when printing json on a single line.
 		if (preferences.format == JSONOutputFormat && preferences.indent == 0) ||
 			preferences.format == CSVOutputFormat ||
 			preferences.format == TSVOutputFormat {
@@ -102,11 +98,13 @@ type decoderPreferences struct {
 	format InputFormat
 }
 
-func createDecoder(format InputFormat) Decoder {
+/* takes a string and decodes it back into an object */
+func decodeOperator(d *dataTreeNavigator, context Context, expressionNode *ExpressionNode) (Context, error) {
+
+	preferences := expressionNode.Operation.Preferences.(decoderPreferences)
+
 	var decoder Decoder
-	switch format {
-	case JsonInputFormat:
-		decoder = NewJSONDecoder()
+	switch preferences.format {
 	case YamlInputFormat:
 		decoder = NewYamlDecoder(ConfiguredYamlPreferences)
 	case XMLInputFormat:
@@ -122,18 +120,6 @@ func createDecoder(format InputFormat) Decoder {
 	case UriInputFormat:
 		decoder = NewUriDecoder()
 	}
-	return decoder
-}
-
-/* takes a string and decodes it back into an object */
-func decodeOperator(d *dataTreeNavigator, context Context, expressionNode *ExpressionNode) (Context, error) {
-
-	preferences := expressionNode.Operation.Preferences.(decoderPreferences)
-
-	decoder := createDecoder(preferences.format)
-	if decoder == nil {
-		return Context{}, errors.New("no support for input format")
-	}
 
 	var results = list.New()
 	for el := context.MatchingNodes.Front(); el != nil; el = el.Next() {

pkg/yqlib/operator_encoder_decoder_test.go

@@ -8,17 +8,15 @@ var prefix = "D0, P[], (doc)::a:\n    cool:\n        bob: dylan\n"
 
 var encoderDecoderOperatorScenarios = []expressionScenario{
 	{
-		requiresFormat: "json",
-		description:    "Encode value as json string",
-		document:       `{a: {cool: "thing"}}`,
-		expression:     `.b = (.a | to_json)`,
+		description: "Encode value as json string",
+		document:    `{a: {cool: "thing"}}`,
+		expression:  `.b = (.a | to_json)`,
 		expected: []string{
 			`D0, P[], (doc)::{a: {cool: "thing"}, b: "{\n  \"cool\": \"thing\"\n}\n"}
 `,
 		},
 	},
 	{
-		requiresFormat: "json",
 		description:    "Encode value as json string, on one line",
 		subdescription: "Pass in a 0 indent to print json on a single line.",
 		document:       `{a: {cool: "thing"}}`,
@@ -29,7 +27,6 @@ var encoderDecoderOperatorScenarios = []expressionScenario{
 		},
 	},
 	{
-		requiresFormat: "json",
 		description:    "Encode value as json string, on one line shorthand",
 		subdescription: "Pass in a 0 indent to print json on a single line.",
 		document:       `{a: {cool: "thing"}}`,
@@ -40,7 +37,6 @@ var encoderDecoderOperatorScenarios = []expressionScenario{
 		},
 	},
 	{
-		requiresFormat: "json",
 		description:    "Decode a json encoded string",
 		subdescription: "Keep in mind JSON is a subset of YAML. If you want idiomatic yaml, pipe through the style operator to clear out the JSON styling.",
 		document:       `a: '{"cool":"thing"}'`,
@@ -179,7 +175,7 @@ var encoderDecoderOperatorScenarios = []expressionScenario{
 		},
 	},
 	{
-		description:    "Encode array of arrays as tsv string",
+		description:    "Encode array of array scalars as tsv string",
 		subdescription: "Scalars are strings, numbers and booleans.",
 		document:       `[[cat, "thing1,thing2", true, 3.40], [dog, thing3, false, 12]]`,
 		expression:     `@tsv`,
@@ -197,37 +193,33 @@ var encoderDecoderOperatorScenarios = []expressionScenario{
 		},
 	},
 	{
-		requiresFormat: "xml",
-		description:    "Encode value as xml string",
-		document:       `{a: {cool: {foo: "bar", +@id: hi}}}`,
-		expression:     `.a | to_xml`,
+		description: "Encode value as xml string",
+		document:    `{a: {cool: {foo: "bar", +@id: hi}}}`,
+		expression:  `.a | to_xml`,
 		expected: []string{
 			"D0, P[a], (!!str)::<cool id=\"hi\">\n  <foo>bar</foo>\n</cool>\n\n",
 		},
 	},
 	{
-		requiresFormat: "xml",
-		description:    "Encode value as xml string on a single line",
-		document:       `{a: {cool: {foo: "bar", +@id: hi}}}`,
-		expression:     `.a | @xml`,
+		description: "Encode value as xml string on a single line",
+		document:    `{a: {cool: {foo: "bar", +@id: hi}}}`,
+		expression:  `.a | @xml`,
 		expected: []string{
 			"D0, P[a], (!!str)::<cool id=\"hi\"><foo>bar</foo></cool>\n\n",
 		},
 	},
 	{
-		requiresFormat: "xml",
-		description:    "Encode value as xml string with custom indentation",
-		document:       `{a: {cool: {foo: "bar", +@id: hi}}}`,
-		expression:     `{"cat": .a | to_xml(1)}`,
+		description: "Encode value as xml string with custom indentation",
+		document:    `{a: {cool: {foo: "bar", +@id: hi}}}`,
+		expression:  `{"cat": .a | to_xml(1)}`,
 		expected: []string{
 			"D0, P[], (!!map)::cat: |\n    <cool id=\"hi\">\n     <foo>bar</foo>\n    </cool>\n",
 		},
 	},
 	{
-		requiresFormat: "xml",
-		description:    "Decode a xml encoded string",
-		document:       `a: "<foo>bar</foo>"`,
-		expression:     `.b = (.a | from_xml)`,
+		description: "Decode a xml encoded string",
+		document:    `a: "<foo>bar</foo>"`,
+		expression:  `.b = (.a | from_xml)`,
 		expected: []string{
 			"D0, P[], (doc)::a: \"<foo>bar</foo>\"\nb:\n    foo: bar\n",
 		},
@@ -311,26 +303,9 @@ var encoderDecoderOperatorScenarios = []expressionScenario{
 		},
 	},
 	{
-		description: "base64 missing padding test",
+		description: "empty xml decode",
 		skipDoc:     true,
-		expression:  `"Y2F0cw" | @base64d`,
-		expected: []string{
-			"D0, P[], (!!str)::cats\n",
-		},
-	},
-	{
-		description: "base64 missing padding test",
-		skipDoc:     true,
-		expression:  `"cats" | @base64 | @base64d`,
-		expected: []string{
-			"D0, P[], (!!str)::cats\n",
-		},
-	},
-	{
-		requiresFormat: "xml",
-		description:    "empty xml decode",
-		skipDoc:        true,
-		expression:     `"" | @xmld`,
+		expression:  `"" | @xmld`,
 		expected: []string{
 			"D0, P[], (!!null)::\n",
 		},

pkg/yqlib/operator_entries_test.go

@@ -36,7 +36,7 @@ var entriesOperatorScenarios = []expressionScenario{
 		},
 	},
 	{
-		description:    "from_entries with numeric key indices",
+		description:    "from_entries with numeric key indexes",
 		subdescription: "from_entries always creates a map, even for numeric keys",
 		document:       `[a,b]`,
 		expression:     `to_entries | from_entries`,

pkg/yqlib/operator_filter.go

@@ -1,32 +0,0 @@
-package yqlib
-
-import (
-	"container/list"
-)
-
-func filterOperator(d *dataTreeNavigator, context Context, expressionNode *ExpressionNode) (Context, error) {
-	log.Debugf("-- filterOperation")
-	var results = list.New()
-
-	for el := context.MatchingNodes.Front(); el != nil; el = el.Next() {
-		candidate := el.Value.(*CandidateNode)
-		children := context.SingleChildContext(candidate)
-		splatted, err := splat(children, traversePreferences{})
-		if err != nil {
-			return Context{}, err
-		}
-		filtered, err := selectOperator(d, splatted, expressionNode)
-		if err != nil {
-			return Context{}, err
-		}
-
-		selfExpression := &ExpressionNode{Operation: &Operation{OperationType: selfReferenceOpType}}
-		collected, err := collectTogether(d, filtered, selfExpression)
-		if err != nil {
-			return Context{}, err
-		}
-		collected.Node.Style = unwrapDoc(candidate.Node).Style
-		results.PushBack(collected)
-	}
-	return context.ChildContext(results), nil
-}

pkg/yqlib/operator_filter_test.go

@@ -1,57 +0,0 @@
-package yqlib
-
-import (
-	"testing"
-)
-
-var filterOperatorScenarios = []expressionScenario{
-	{
-		description: "Filter array",
-		document:    `[1,2,3]`,
-		expression:  `filter(. < 3)`,
-		expected: []string{
-			"D0, P[], (!!seq)::[1, 2]\n",
-		},
-	},
-	{
-		description: "Filter map values",
-		document:    `{c: {things: cool, frog: yes}, d: {things: hot, frog: false}}`,
-		expression:  `filter(.things == "cool")`,
-		expected: []string{
-			"D0, P[], (!!seq)::[{things: cool, frog: yes}]\n",
-		},
-	},
-	{
-		skipDoc:    true,
-		document:   `[1,2,3]`,
-		expression: `filter(. > 1)`,
-		expected: []string{
-			"D0, P[], (!!seq)::[2, 3]\n",
-		},
-	},
-	{
-		skipDoc:     true,
-		description: "Filter array to empty",
-		document:    `[1,2,3]`,
-		expression:  `filter(. > 4)`,
-		expected: []string{
-			"D0, P[], (!!seq)::[]\n",
-		},
-	},
-	{
-		skipDoc:     true,
-		description: "Filter empty array",
-		document:    `[]`,
-		expression:  `filter(. > 1)`,
-		expected: []string{
-			"D0, P[], (!!seq)::[]\n",
-		},
-	},
-}
-
-func TestFilterOperatorScenarios(t *testing.T) {
-	for _, tt := range filterOperatorScenarios {
-		testScenario(t, &tt)
-	}
-	documentOperatorScenarios(t, "filter", filterOperatorScenarios)
-}

pkg/yqlib/operator_line_test.go

@@ -17,7 +17,7 @@ var lineOperatorScenarios = []expressionScenario{
 		description:    "Returns line of _key_ node",
 		subdescription: "Pipe through the key operator to get the line of the key",
 		document:       "a: cat\nb:\n   c: cat",
-		expression:     `.b | key | line`,
+		expression:     `.b | key| line`,
 		expected: []string{
 			"D0, P[b], (!!int)::2\n",
 		},

pkg/yqlib/operator_load.go

@@ -34,9 +34,6 @@ func loadString(filename string) (*CandidateNode, error) {
 }
 
 func loadYaml(filename string, decoder Decoder) (*CandidateNode, error) {
-	if decoder == nil {
-		return nil, fmt.Errorf("could not load %s", filename)
-	}
 
 	file, err := os.Open(filename) // #nosec
 	if err != nil {

pkg/yqlib/operator_load_test.go

@@ -74,10 +74,9 @@ var loadScenarios = []expressionScenario{
 		},
 	},
 	{
-		requiresFormat: "xml",
-		description:    "Load from XML",
-		document:       "cool: things",
-		expression:     `.more_stuff = load_xml("../../examples/small.xml")`,
+		description: "Load from XML",
+		document:    "cool: things",
+		expression:  `.more_stuff = load_xml("../../examples/small.xml")`,
 		expected: []string{
 			"D0, P[], (doc)::cool: things\nmore_stuff:\n    this: is some xml\n",
 		},

pkg/yqlib/operator_modulo.go

@@ -1,93 +0,0 @@
-package yqlib
-
-import (
-	"fmt"
-	"math"
-	"strconv"
-	"strings"
-
-	yaml "gopkg.in/yaml.v3"
-)
-
-func moduloOperator(d *dataTreeNavigator, context Context, expressionNode *ExpressionNode) (Context, error) {
-	log.Debugf("Modulo operator")
-
-	return crossFunction(d, context.ReadOnlyClone(), expressionNode, modulo, false)
-}
-
-func modulo(d *dataTreeNavigator, context Context, lhs *CandidateNode, rhs *CandidateNode) (*CandidateNode, error) {
-	lhs.Node = unwrapDoc(lhs.Node)
-	rhs.Node = unwrapDoc(rhs.Node)
-
-	lhsNode := lhs.Node
-
-	if lhsNode.Tag == "!!null" {
-		return nil, fmt.Errorf("%v (%v) cannot modulo by %v (%v)", lhsNode.Tag, lhs.GetNicePath(), rhs.Node.Tag, rhs.GetNicePath())
-	}
-
-	target := &yaml.Node{}
-
-	if lhsNode.Kind == yaml.ScalarNode && rhs.Node.Kind == yaml.ScalarNode {
-		if err := moduloScalars(target, lhsNode, rhs.Node); err != nil {
-			return nil, err
-		}
-	} else {
-		return nil, fmt.Errorf("%v (%v) cannot modulo by %v (%v)", lhsNode.Tag, lhs.GetNicePath(), rhs.Node.Tag, rhs.GetNicePath())
-	}
-
-	return lhs.CreateReplacement(target), nil
-}
-
-func moduloScalars(target *yaml.Node, lhs *yaml.Node, rhs *yaml.Node) error {
-	lhsTag := lhs.Tag
-	rhsTag := guessTagFromCustomType(rhs)
-	lhsIsCustom := false
-	if !strings.HasPrefix(lhsTag, "!!") {
-		// custom tag - we have to have a guess
-		lhsTag = guessTagFromCustomType(lhs)
-		lhsIsCustom = true
-	}
-
-	if lhsTag == "!!int" && rhsTag == "!!int" {
-		target.Kind = yaml.ScalarNode
-		target.Style = lhs.Style
-
-		format, lhsNum, err := parseInt64(lhs.Value)
-		if err != nil {
-			return err
-		}
-		_, rhsNum, err := parseInt64(rhs.Value)
-		if err != nil {
-			return err
-		}
-		if rhsNum == 0 {
-			return fmt.Errorf("cannot modulo by 0")
-		}
-		remainder := lhsNum % rhsNum
-
-		target.Tag = lhs.Tag
-		target.Value = fmt.Sprintf(format, remainder)
-	} else if (lhsTag == "!!int" || lhsTag == "!!float") && (rhsTag == "!!int" || rhsTag == "!!float") {
-		target.Kind = yaml.ScalarNode
-		target.Style = lhs.Style
-
-		lhsNum, err := strconv.ParseFloat(lhs.Value, 64)
-		if err != nil {
-			return err
-		}
-		rhsNum, err := strconv.ParseFloat(rhs.Value, 64)
-		if err != nil {
-			return err
-		}
-		remainder := math.Mod(lhsNum, rhsNum)
-		if lhsIsCustom {
-			target.Tag = lhs.Tag
-		} else {
-			target.Tag = "!!float"
-		}
-		target.Value = fmt.Sprintf("%v", remainder)
-	} else {
-		return fmt.Errorf("%v cannot modulo by %v", lhsTag, rhsTag)
-	}
-	return nil
-}

pkg/yqlib/operator_modulo_test.go

@@ -1,120 +0,0 @@
-package yqlib
-
-import (
-	"testing"
-)
-
-var moduloOperatorScenarios = []expressionScenario{
-	{
-		skipDoc:    true,
-		document:   `[{a: 2.5, b: 2}, {a: 2, b: 0.75}]`,
-		expression: ".[] | .a % .b",
-		expected: []string{
-			"D0, P[0 a], (!!float)::0.5\n",
-			"D0, P[1 a], (!!float)::0.5\n",
-		},
-	},
-	{
-		skipDoc:    true,
-		document:   `{}`,
-		expression: "(.a / .b) as $x | .",
-		expected: []string{
-			"D0, P[], (doc)::{}\n",
-		},
-	},
-	{
-		description:    "Number modulo - int",
-		subdescription: "If the lhs and rhs are ints then the expression will be calculated with ints.",
-		document:       `{a: 13, b: 2}`,
-		expression:     `.a = .a % .b`,
-		expected: []string{
-			"D0, P[], (doc)::{a: 1, b: 2}\n",
-		},
-	},
-	{
-		description:    "Number modulo - float",
-		subdescription: "If the lhs or rhs are floats then the expression will be calculated with floats.",
-		document:       `{a: 12, b: 2.5}`,
-		expression:     `.a = .a % .b`,
-		expected: []string{
-			"D0, P[], (doc)::{a: !!float 2, b: 2.5}\n",
-		},
-	},
-	{
-		description:    "Number modulo - int by zero",
-		subdescription: "If the lhs is an int and rhs is a 0 the result is an error.",
-		document:       `{a: 1, b: 0}`,
-		expression:     `.a = .a % .b`,
-		expectedError:  "cannot modulo by 0",
-	},
-	{
-		description:    "Number modulo - float by zero",
-		subdescription: "If the lhs is a float and rhs is a 0 the result is NaN.",
-		document:       `{a: 1.1, b: 0}`,
-		expression:     `.a = .a % .b`,
-		expected: []string{
-			"D0, P[], (doc)::{a: !!float NaN, b: 0}\n",
-		},
-	},
-	{
-		skipDoc:     true,
-		description: "Custom types: that are really numbers",
-		document:    "a: !horse 333.975\nb: !goat 299.2",
-		expression:  `.a = .a % .b`,
-		expected: []string{
-			"D0, P[], (doc)::a: !horse 34.775000000000034\nb: !goat 299.2\n",
-		},
-	},
-	{
-		skipDoc:    true,
-		document:   "a: 2\nb: !goat 2.3",
-		expression: `.a = .a % .b`,
-		expected: []string{
-			"D0, P[], (doc)::a: !!float 2\nb: !goat 2.3\n",
-		},
-	},
-	{
-		skipDoc:     true,
-		description: "Keep anchors",
-		document:    "a: &horse [1]",
-		expression:  `.a[1] = .a[0] % 2`,
-		expected: []string{
-			"D0, P[], (doc)::a: &horse [1, 1]\n",
-		},
-	},
-	{
-		skipDoc:       true,
-		description:   "Modulo int by string",
-		document:      "a: 123\nb: '2'",
-		expression:    `.a % .b`,
-		expectedError: "!!int cannot modulo by !!str",
-	},
-	{
-		skipDoc:       true,
-		description:   "Modulo string by int",
-		document:      "a: 2\nb: '123'",
-		expression:    `.b % .a`,
-		expectedError: "!!str cannot modulo by !!int",
-	},
-	{
-		skipDoc:       true,
-		description:   "Modulo map by int",
-		document:      "a: {\"a\":1}\nb: 2",
-		expression:    `.a % .b`,
-		expectedError: "!!map (a) cannot modulo by !!int (b)",
-	},
-	{
-		skipDoc:       true,
-		description:   "Modulo array by str",
-		document:      "a: [1,2]\nb: '2'",
-		expression:    `.a % .b`,
-		expectedError: "!!seq (a) cannot modulo by !!str (b)",
-	},
-}
-
-func TestModuloOperatorScenarios(t *testing.T) {
-	for _, tt := range moduloOperatorScenarios {
-		testScenario(t, &tt)
-	}
-	documentOperatorScenarios(t, "modulo", moduloOperatorScenarios)
-}

pkg/yqlib/operator_multiply_test.go

@@ -420,7 +420,7 @@ var multiplyOperatorScenarios = []expressionScenario{
 	},
 	{
 		description:    "Merge, deeply merging arrays",
-		subdescription: "Merging arrays deeply means arrays are merged like objects, with indices as their key. In this case, we merge the first item in the array and do nothing with the second.",
+		subdescription: "Merging arrays deeply means arrays are merge like objects, with indexes as their key. In this case, we merge the first item in the array, and do nothing with the second.",
 		document:       `{a: [{name: fred, age: 12}, {name: bob, age: 32}], b: [{name: fred, age: 34}]}`,
 		expression:     `.a *d .b`,
 		expected: []string{
@@ -525,7 +525,7 @@ var multiplyOperatorScenarios = []expressionScenario{
 	},
 	{
 		description:    "Custom types: clobber tags",
-		subdescription: "Use the `c` option to clobber custom tags. Note that the second tag is now used.",
+		subdescription: "Use the `c` option to clobber custom tags. Note that the second tag is now used",
 		document:       "a: !horse {cat: meow}\nb: !goat {dog: woof}",
 		expression:     ".a *=c .b",
 		expected: []string{
@@ -535,7 +535,7 @@ var multiplyOperatorScenarios = []expressionScenario{
 	{
 		skipDoc:        true,
 		description:    "Custom types: clobber tags - *=",
-		subdescription: "Use the `c` option to clobber custom tags - on both the `=` and `*` operator. Note that the second tag is now used.",
+		subdescription: "Use the `c` option to clobber custom tags - on both the `=` and `*` operator. Note that the second tag is now used",
 		document:       "a: !horse {cat: meow}\nb: !goat {dog: woof}",
 		expression:     ".a =c .a *c .b",
 		expected: []string{
@@ -545,7 +545,7 @@ var multiplyOperatorScenarios = []expressionScenario{
 	{
 		skipDoc:        true,
 		description:    "Custom types: dont clobber tags - *=",
-		subdescription: "Use the `c` option to clobber custom tags - on both the `=` and `*` operator. Note that the second tag is now used.",
+		subdescription: "Use the `c` option to clobber custom tags - on both the `=` and `*` operator. Note that the second tag is now used",
 		document:       "a: !horse {cat: meow}\nb: !goat {dog: woof}",
 		expression:     ".a *= .b",
 		expected: []string{

pkg/yqlib/operator_path_test.go

@@ -90,7 +90,7 @@ var pathOperatorScenarios = []expressionScenario{
 	},
 	{
 		description:    "Set path to prune deep paths",
-		subdescription: "Like pick but recursive. This uses `ireduce` to deeply set the selected paths into an empty object.",
+		subdescription: "Like pick but recursive. This uses `ireduce` to deeply set the selected paths into an empty object,",
 		document:       documentToPrune,
 		expression:     "(.parentB.child2, .parentC.child1) as $i\n  ireduce({}; setpath($i | path; $i))",
 		expected: []string{

pkg/yqlib/operator_pick_test.go

@@ -34,7 +34,7 @@ var pickOperatorScenarios = []expressionScenario{
 	},
 	{
 		description:    "Pick indices from array",
-		subdescription: "Note that the order of the indices matches the pick order and non existent indices are skipped.",
+		subdescription: "Note that the order of the indexes matches the pick order and non existent indexes are skipped.",
 		document:       `[cat, leopard, lion]`,
 		expression:     `pick([2, 0, 734, -5])`,
 		expected: []string{

pkg/yqlib/operator_select_test.go

@@ -57,7 +57,7 @@ var selectOperatorScenarios = []expressionScenario{
 	},
 	{
 		description:    "Select elements from array with regular expression",
-		subdescription: "See more regular expression examples under the [`string` operator docs](https://mikefarah.gitbook.io/yq/operators/string-operators).",
+		subdescription: "See more regular expression examples under the `string` operator docs.",
 		document:       `[this_0, not_this, nor_0_this, thisTo_4]`,
 		expression:     `.[] | select(test("[a-zA-Z]+_[0-9]$"))`,
 		expected: []string{

pkg/yqlib/operator_strings_test.go

@@ -205,7 +205,7 @@ var stringsOperatorScenarios = []expressionScenario{
 	},
 	{
 		description:    "Substitute / Replace string",
-		subdescription: "This uses Golang's regex, described [here](https://github.com/google/re2/wiki/Syntax).\nNote the use of `|=` to run in context of the current string value.",
+		subdescription: "This uses golang regex, described [here](https://github.com/google/re2/wiki/Syntax)\nNote the use of `|=` to run in context of the current string value.",
 		document:       `a: dogs are great`,
 		expression:     `.a |= sub("dogs", "cats")`,
 		expected: []string{
@@ -214,7 +214,7 @@ var stringsOperatorScenarios = []expressionScenario{
 	},
 	{
 		description:    "Substitute / Replace string with regex",
-		subdescription: "This uses Golang's regex, described [here](https://github.com/google/re2/wiki/Syntax).\nNote the use of `|=` to run in context of the current string value.",
+		subdescription: "This uses golang regex, described [here](https://github.com/google/re2/wiki/Syntax)\nNote the use of `|=` to run in context of the current string value.",
 		document:       "a: cat\nb: heat",
 		expression:     `.[] |= sub("(a)", "${1}r")`,
 		expected: []string{

pkg/yqlib/operator_subtract_test.go

@@ -67,6 +67,15 @@ var subtractOperatorScenarios = []expressionScenario{
 			"D0, P[], (doc)::{a: -1.5, b: 4.5}\n",
 		},
 	},
+	{
+		description:    "Number subtraction - float",
+		subdescription: "If the lhs or rhs are floats then the expression will be calculated with floats.",
+		document:       `{a: 3, b: 4.5}`,
+		expression:     `.a = .a - .b`,
+		expected: []string{
+			"D0, P[], (doc)::{a: -1.5, b: 4.5}\n",
+		},
+	},
 	{
 		description:    "Number subtraction - int",
 		subdescription: "If both the lhs and rhs are ints then the expression will be calculated with ints.",

pkg/yqlib/operator_traverse_path.go

@@ -89,7 +89,7 @@ func traverseArrayOperator(d *dataTreeNavigator, context Context, expressionNode
 		return Context{}, err
 	}
 
-	// rhs is a collect expression that will yield indices to retrieve of the arrays
+	// rhs is a collect expression that will yield indexes to retrieve of the arrays
 
 	rhs, err := d.GetMatchingNodes(context.ReadOnlyClone(), expressionNode.RHS)
 
@@ -267,7 +267,7 @@ func traverseMap(context Context, matchingNode *CandidateNode, keyNode *yaml.Nod
 
 func doTraverseMap(newMatches *orderedmap.OrderedMap, candidate *CandidateNode, wantedKey string, prefs traversePreferences, splat bool) error {
 	// value.Content is a concatenated array of key, value,
-	// so keys are in the even indices, values in odd.
+	// so keys are in the even indexes, values in odd.
 	// merge aliases are defined first, but we only want to traverse them
 	// if we don't find a match directly on this node first.
 

pkg/yqlib/operator_traverse_path_test.go

@@ -116,7 +116,7 @@ var traversePathOperatorScenarios = []expressionScenario{
 	},
 	{
 		description:    "Special characters",
-		subdescription: "Use quotes with square brackets around path elements with special characters",
+		subdescription: "Use quotes with brackets around path elements with special characters",
 		document:       `{"{}": frog}`,
 		expression:     `.["{}"]`,
 		expected: []string{
@@ -133,7 +133,7 @@ var traversePathOperatorScenarios = []expressionScenario{
 	},
 	{
 		description:    "Keys with spaces",
-		subdescription: "Use quotes with square brackets around path elements with special characters",
+		subdescription: "Use quotes with brackets around path elements with special characters",
 		document:       `{"red rabbit": frog}`,
 		expression:     `.["red rabbit"]`,
 		expected: []string{

pkg/yqlib/operator_variables.go

@@ -82,11 +82,10 @@ func variableLoopSingleChild(d *dataTreeNavigator, context Context, originalExp
 		newContext.SetVariable(variableName, variableValue)
 
 		rhs, err := d.GetMatchingNodes(newContext, originalExp.RHS)
-
+		log.Debug("PROCESSING VARIABLE DONE, got back: ", rhs.MatchingNodes.Len())
 		if err != nil {
 			return Context{}, err
 		}
-		log.Debug("PROCESSING VARIABLE DONE, got back: ", rhs.MatchingNodes.Len())
 		results.PushBackList(rhs.MatchingNodes)
 	}
 

pkg/yqlib/operator_variables_test.go

@@ -13,12 +13,6 @@ var variableOperatorScenarios = []expressionScenario{
 			"D0, P[], (doc)::{}\n",
 		},
 	},
-	{
-		skipDoc:       true,
-		document:      `{}`,
-		expression:    `.a.b as $foo`,
-		expectedError: "must use variable with a pipe, e.g. `exp as $x | ...`",
-	},
 	{
 		document:      "a: [cat]",
 		skipDoc:       true,

pkg/yqlib/operators_test.go

@@ -28,7 +28,6 @@ type expressionScenario struct {
 	skipDoc               bool
 	expectedError         string
 	dontFormatInputForDoc bool // dont format input doc for documentation generation
-	requiresFormat        string
 }
 
 func TestMain(m *testing.M) {
@@ -104,23 +103,6 @@ func testScenario(t *testing.T, s *expressionScenario) {
 		return
 	}
 
-	if s.requiresFormat != "" {
-		format := s.requiresFormat
-		inputFormat, err := InputFormatFromString(format)
-		if err != nil {
-			t.Error(err)
-		}
-		if decoder := createDecoder(inputFormat); decoder == nil {
-			t.Skipf("no support for %s input format", format)
-		}
-		outputFormat, err := OutputFormatFromString(format)
-		if err != nil {
-			t.Error(err)
-		}
-		if encoder := configureEncoder(outputFormat, 4); encoder == nil {
-			t.Skipf("no support for %s output format", format)
-		}
-	}
 	if err != nil {
 		t.Error(fmt.Errorf("%w: %v: %v", err, s.description, s.expression))
 		return

pkg/yqlib/ordered_map.go

@@ -1,14 +0,0 @@
-package yqlib
-
-// orderedMap allows to marshal and unmarshal JSON and YAML values keeping the
-// order of keys and values in a map or an object.
-type orderedMap struct {
-	// if this is an object, kv != nil. If this is not an object, kv == nil.
-	kv     []orderedMapKV
-	altVal interface{}
-}
-
-type orderedMapKV struct {
-	K string
-	V orderedMap
-}

pkg/yqlib/ordered_map_json.go

@@ -1,83 +0,0 @@
-package yqlib
-
-import (
-	"bytes"
-	"encoding/json"
-	"errors"
-	"io"
-)
-
-func (o *orderedMap) UnmarshalJSON(data []byte) error {
-	switch data[0] {
-	case '{':
-		// initialise so that even if the object is empty it is not nil
-		o.kv = []orderedMapKV{}
-
-		// create decoder
-		dec := json.NewDecoder(bytes.NewReader(data))
-		_, err := dec.Token() // open object
-		if err != nil {
-			return err
-		}
-
-		// cycle through k/v
-		var tok json.Token
-		for tok, err = dec.Token(); err == nil; tok, err = dec.Token() {
-			// we can expect two types: string or Delim. Delim automatically means
-			// that it is the closing bracket of the object, whereas string means
-			// that there is another key.
-			if _, ok := tok.(json.Delim); ok {
-				break
-			}
-			kv := orderedMapKV{
-				K: tok.(string),
-			}
-			if err := dec.Decode(&kv.V); err != nil {
-				return err
-			}
-			o.kv = append(o.kv, kv)
-		}
-		// unexpected error
-		if err != nil && !errors.Is(err, io.EOF) {
-			return err
-		}
-		return nil
-	case '[':
-		var res []*orderedMap
-		if err := json.Unmarshal(data, &res); err != nil {
-			return err
-		}
-		o.altVal = res
-		o.kv = nil
-		return nil
-	}
-
-	return json.Unmarshal(data, &o.altVal)
-}
-
-func (o orderedMap) MarshalJSON() ([]byte, error) {
-	buf := new(bytes.Buffer)
-	enc := json.NewEncoder(buf)
-	enc.SetEscapeHTML(false) // do not escape html chars e.g. &, <, >
-	if o.kv == nil {
-		if err := enc.Encode(o.altVal); err != nil {
-			return nil, err
-		}
-		return buf.Bytes(), nil
-	}
-	buf.WriteByte('{')
-	for idx, el := range o.kv {
-		if err := enc.Encode(el.K); err != nil {
-			return nil, err
-		}
-		buf.WriteByte(':')
-		if err := enc.Encode(el.V); err != nil {
-			return nil, err
-		}
-		if idx != len(o.kv)-1 {
-			buf.WriteByte(',')
-		}
-	}
-	buf.WriteByte('}')
-	return buf.Bytes(), nil
-}

pkg/yqlib/ordered_map_yaml.go

@@ -1,79 +0,0 @@
-package yqlib
-
-import (
-	"fmt"
-
-	yaml "gopkg.in/yaml.v3"
-)
-
-func (o *orderedMap) UnmarshalYAML(node *yaml.Node) error {
-	switch node.Kind {
-	case yaml.DocumentNode:
-		if len(node.Content) == 0 {
-			return nil
-		}
-		return o.UnmarshalYAML(node.Content[0])
-	case yaml.AliasNode:
-		return o.UnmarshalYAML(node.Alias)
-	case yaml.ScalarNode:
-		return node.Decode(&o.altVal)
-	case yaml.MappingNode:
-		// set kv to non-nil
-		o.kv = []orderedMapKV{}
-		for i := 0; i < len(node.Content); i += 2 {
-			var key string
-			var val orderedMap
-			if err := node.Content[i].Decode(&key); err != nil {
-				return err
-			}
-			if err := node.Content[i+1].Decode(&val); err != nil {
-				return err
-			}
-			o.kv = append(o.kv, orderedMapKV{
-				K: key,
-				V: val,
-			})
-		}
-		return nil
-	case yaml.SequenceNode:
-		// note that this has to be a pointer, so that nulls can be represented.
-		var res []*orderedMap
-		if err := node.Decode(&res); err != nil {
-			return err
-		}
-		o.altVal = res
-		o.kv = nil
-		return nil
-	case 0:
-		// null
-		o.kv = nil
-		o.altVal = nil
-		return nil
-	default:
-		return fmt.Errorf("orderedMap: invalid yaml node")
-	}
-}
-
-func (o *orderedMap) MarshalYAML() (interface{}, error) {
-	// fast path: kv is nil, use altVal
-	if o.kv == nil {
-		return o.altVal, nil
-	}
-	content := make([]*yaml.Node, 0, len(o.kv)*2)
-	for _, val := range o.kv {
-		n := new(yaml.Node)
-		if err := n.Encode(val.V); err != nil {
-			return nil, err
-		}
-		content = append(content, &yaml.Node{
-			Kind:  yaml.ScalarNode,
-			Tag:   "!!str",
-			Value: val.K,
-		}, n)
-	}
-	return &yaml.Node{
-		Kind:    yaml.MappingNode,
-		Tag:     "!!map",
-		Content: content,
-	}, nil
-}

pkg/yqlib/printer.go

@@ -33,11 +33,11 @@ const (
 
 func OutputFormatFromString(format string) (PrinterOutputFormat, error) {
 	switch format {
-	case "yaml", "y", "yml":
+	case "yaml", "y":
 		return YamlOutputFormat, nil
 	case "json", "j":
 		return JSONOutputFormat, nil
-	case "props", "p", "properties":
+	case "props", "p":
 		return PropsOutputFormat, nil
 	case "csv", "c":
 		return CSVOutputFormat, nil