fixed leading content logic

wip
put comments on key node instead
2026-08-24 16:39:58 +08:00 · 2022-10-28 13:50:22 +11:00 · 2022-10-27 16:16:00 +11:00 · 2022-10-27 15:27:37 +11:00 · 2022-10-26 13:24:36 +11:00 · 2022-10-26 13:12:30 +11:00
117 changed files with 404 additions and 2743 deletions
@@ -10,10 +10,10 @@ jobs:
    runs-on: ubuntu-latest
    steps:

-    - name: Set up Go
+    - name: Set up Go 1.19
      uses: actions/setup-go@v3
      with:
-        go-version: '^1.20'
+        go-version: 1.19
      id: go

    - name: Check out code into the Go module directory
@@ -12,16 +12,17 @@ jobs:
      - uses: actions/checkout@v3
      - uses: actions/setup-go@v3
        with:
-          go-version: '^1.20'
+          go-version: '^1.19'
          check-latest: true
      - name: Compile man page markup
        id: gen-man-page-md
        run: |
          ./scripts/generate-man-page-md.sh
+          echo "::set-output name=man-page-md::man.md"

      - name: Get the version
        id: get_version
-        run: echo "VERSION=${GITHUB_REF##*/}" >> "${GITHUB_OUTPUT}"
+        run: echo ::set-output name=VERSION::${GITHUB_REF##*/}

      - name: Generate man page
        uses: docker://pandoc/core:2.14.2
@@ -35,7 +36,7 @@ jobs:
            --variable=header:"yq (https://github.com/mikefarah/yq/) version ${{ steps.get_version.outputs.VERSION }}"
            --variable=author:"Mike Farah"
            --output=yq.1
-            man.md
+            ${{ steps.gen-man-page-md.outputs.man-page-md }}

      - name: Cross compile
        run: |
@@ -1,23 +0,0 @@
-name: Release Snap
-
-on:
-  release:
-    types: [released]
-
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
-
-jobs:
-    buildSnap:
-      environment: snap
-      runs-on: ubuntu-latest
-      steps:
-        - uses: actions/checkout@v3
-        - uses: snapcore/action-build@v1
-          id: build
-        - uses: snapcore/action-publish@v1
-          env:
-            SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.STORE_LOGIN }}
-          with:
-            snap: ${{ steps.build.outputs.snap }}
-            release: stable
@@ -1,4 +1,4 @@
-FROM golang:1.20.1 as builder
+FROM golang:1.19.2 as builder

 WORKDIR /go/src/mikefarah/yq

@@ -1,4 +1,4 @@
-FROM golang:1.20.1
+FROM golang:1.19.2

 COPY scripts/devtools.sh /opt/devtools.sh

@@ -61,9 +61,6 @@ Take a look at the discussions for [common questions](https://github.com/mikefar
 ### wget
 Use wget to download, gzipped pre-compiled binaries:

-
-For instance, VERSION=v4.2.0 and BINARY=yq_linux_amd64
-
 #### Compressed via tar.gz
 ```bash
 wget https://github.com/mikefarah/yq/releases/download/${VERSION}/${BINARY}.tar.gz -O - |\
@@ -77,7 +74,9 @@ wget https://github.com/mikefarah/yq/releases/download/${VERSION}/${BINARY} -O /
    chmod +x /usr/bin/yq
 ```

-#### Latest version
+For instance, VERSION=v4.2.0 and BINARY=yq_linux_amd64
+
+Use VERSION=latest to always get the latest version:

 ```bash
 wget https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 -O /usr/bin/yq &&\
@@ -109,7 +109,7 @@ EOL
  read -r -d '' expected << EOM
 cat:
  +content: BiBi
-  +@legs: "4"
+  +legs: "4"
 EOM

  X=$(./yq e -p=xml test.yml)
@@ -129,9 +129,9 @@ EOL
  read -r -d '' expected << EOM
 +p_xml: version="1.0"
 map:
-  +@xmlns: some-namespace
-  +@xmlns:xsi: some-instance
-  +@xsi:schemaLocation: some-url
+  +xmlns: some-namespace
+  +xmlns:xsi: some-instance
+  +xsi:schemaLocation: some-url
 EOM

  X=$(./yq e -p=xml test.yml)
@@ -190,7 +190,7 @@ EOL
  read -r -d '' expected << EOM
 cat:
  +content: BiBi
-  +@legs: "4"
+  +legs: "4"
 EOM

  X=$(cat /dev/null | ./yq e -p=xml test.yml)
@@ -34,82 +34,6 @@ EOM
  assertEquals "$expected" "$X"
 }

-
-testLeadingSeperatorWithNewlinesNewDoc() {
-  cat >test.yml <<EOL
-# hi peeps
-# cool
-
-
---
-a: test
---
-b: cool
-EOL
-
-  read -r -d '' expected << EOM
-# hi peeps
-# cool
-
-
---
-a: thing
---
-b: cool
-EOM
-
-  X=$(./yq e '(select(di == 0) | .a) = "thing"' - < test.yml)
-  assertEquals "$expected" "$X"
-}
-
-testLeadingSeperatorWithNewlinesMoreComments() {
-  cat >test.yml <<EOL
-# hi peeps
-# cool
-
---
-# great
-
-a: test
---
-b: cool
-EOL
-
-  read -r -d '' expected << EOM
-# hi peeps
-# cool
-
---
-# great
-
-a: thing
---
-b: cool
-EOM
-
-  X=$(./yq e '(select(di == 0) | .a) = "thing"' - < test.yml)
-  assertEquals "$expected" "$X"
-}
-
-
-testLeadingSeperatorWithDirective() {
-  cat >test.yml <<EOL
-%YAML 1.1
---
-this: should really work
-EOL
-
-  read -r -d '' expected << EOM
-%YAML 1.1
---
-this: should really work
-EOM
-
-  X=$(./yq < test.yml)
-  assertEquals "$expected" "$X"
-}
-
-
 testLeadingSeperatorPipeIntoEvalSeq() {
  X=$(./yq e - < test.yml)
  expected=$(cat test.yml)
@@ -48,55 +48,6 @@ EOM
  assertEquals "$expected" "$X"
 }

-testOutputYamlRawDefault() {
-  cat >test.yml <<EOL
-a: "cat"
-EOL
-
-  X=$(./yq e  '.a' test.yml)
-  assertEquals "cat" "$X"
-
-  X=$(./yq ea '.a' test.yml)
-  assertEquals "cat" "$X"
-}
-
-testOutputYamlRawOff() {
-  cat >test.yml <<EOL
-a: "cat"
-EOL
-
-  X=$(./yq e -r=false '.a' test.yml)
-  assertEquals "\"cat\"" "$X"
-
-  X=$(./yq ea -r=false '.a' test.yml)
-  assertEquals "\"cat\"" "$X"
-}
-
-testOutputJsonRaw() {
-  cat >test.yml <<EOL
-a: cat
-EOL
-
-  X=$(./yq e -r --output-format=json '.a' test.yml)
-  assertEquals "cat" "$X"
-
-  X=$(./yq ea -r --output-format=json '.a' test.yml)
-  assertEquals "cat" "$X"
-}
-
-testOutputJsonDefault() {
-  cat >test.yml <<EOL
-a: cat
-EOL
-
-  X=$(./yq e --output-format=json '.a' test.yml)
-  assertEquals "\"cat\"" "$X"
-
-  X=$(./yq ea --output-format=json '.a' test.yml)
-  assertEquals "\"cat\"" "$X"
-}
-
-
 testOutputJsonShort() {
  cat >test.yml <<EOL
 a: {b: ["cat"]}
@@ -121,11 +72,11 @@ EOM

 testOutputProperties() {
  cat >test.yml <<EOL
-a: {b: {c: ["cat cat"]}}
+a: {b: {c: ["cat"]}}
 EOL

  read -r -d '' expected << EOM
-a.b.c.0 = cat cat
+a.b.c.0 = cat
 EOM

  X=$(./yq e --output-format=props test.yml)
@@ -135,30 +86,13 @@ EOM
  assertEquals "$expected" "$X"
 }

-testOutputPropertiesDontUnwrap() {
-  cat >test.yml <<EOL
-a: {b: {c: ["cat cat"]}}
-EOL
-
-  read -r -d '' expected << EOM
-a.b.c.0 = "cat cat"
-EOM
-
-  X=$(./yq e -r=false --output-format=props test.yml)
-  assertEquals "$expected" "$X"
-
-  X=$(./yq ea -r=false --output-format=props test.yml)
-  assertEquals "$expected" "$X"
-}
-
-
 testOutputPropertiesShort() {
  cat >test.yml <<EOL
-a: {b: {c: ["cat cat"]}}
+a: {b: {c: ["cat"]}}
 EOL

  read -r -d '' expected << EOM
-a.b.c.0 = cat cat
+a.b.c.0 = cat
 EOM

  X=$(./yq e -o=p test.yml)
@@ -252,7 +186,7 @@ EOM

 testOutputXmComplex() {
  cat >test.yml <<EOL
-a: {b: {c: ["cat", "dog"], +@f: meow}}
+a: {b: {c: ["cat", "dog"], +f: meow}}
 EOL

  read -r -d '' expected << EOM
@@ -1,8 +1,6 @@
 package cmd

-var unwrapScalarFlag = newUnwrapFlag()
-
-var unwrapScalar = false
+var unwrapScalar = true

 var writeInplace = false
 var outputToJSON = false
@@ -35,7 +35,7 @@ yq -P sample.json
 			return evaluateSequence(cmd, args)

 		},
-		PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
+		PersistentPreRun: func(cmd *cobra.Command, args []string) {
 			cmd.SetOut(cmd.OutOrStdout())

 			var format = logging.MustStringFormatter(
@@ -52,27 +52,18 @@ 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()
+			if (inputFormat == "x" || inputFormat == "xml") &&
+				outputFormat != "x" && outputFormat != "xml" &&
+				yqlib.ConfiguredXMLPreferences.AttributePrefix == "+" {
+				yqlib.GetLogger().Warning("The default xml-attribute-prefix will change in the v4.30 to `+@` to avoid " +
+					"naming conflicts with the default content name, directive name and proc inst prefix. If you need to keep " +
+					"`+` please set that value explicityly with --xml-attribute-prefix.")
 			}

 			//copy preference form global setting
 			yqlib.ConfiguredYamlPreferences.UnwrapScalar = unwrapScalar

 			yqlib.ConfiguredYamlPreferences.PrintDocSeparators = !noDocSeparators
-
-			return nil
 		},
 	}

@@ -87,15 +78,15 @@ yq -P sample.json
 	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).")
-	rootCmd.PersistentFlags().BoolVar(&yqlib.ConfiguredXMLPreferences.StrictMode, "xml-strict-mode", yqlib.ConfiguredXMLPreferences.StrictMode, "enables strict parsing of XML. See https://pkg.go.dev/encoding/xml for more details.")
-	rootCmd.PersistentFlags().BoolVar(&yqlib.ConfiguredXMLPreferences.KeepNamespace, "xml-keep-namespace", yqlib.ConfiguredXMLPreferences.KeepNamespace, "enables keeping namespace after parsing attributes")
-	rootCmd.PersistentFlags().BoolVar(&yqlib.ConfiguredXMLPreferences.UseRawToken, "xml-raw-token", yqlib.ConfiguredXMLPreferences.UseRawToken, "enables using RawToken method instead Token. Commonly disables namespace translations. See https://pkg.go.dev/encoding/xml#Decoder.RawToken for details.")
-	rootCmd.PersistentFlags().StringVar(&yqlib.ConfiguredXMLPreferences.ProcInstPrefix, "xml-proc-inst-prefix", yqlib.ConfiguredXMLPreferences.ProcInstPrefix, "prefix for xml processing instructions (e.g. <?xml version=\"1\"?>)")
-	rootCmd.PersistentFlags().StringVar(&yqlib.ConfiguredXMLPreferences.DirectiveName, "xml-directive-name", yqlib.ConfiguredXMLPreferences.DirectiveName, "name for xml directives (e.g. <!DOCTYPE thing cat>)")
-	rootCmd.PersistentFlags().BoolVar(&yqlib.ConfiguredXMLPreferences.SkipProcInst, "xml-skip-proc-inst", yqlib.ConfiguredXMLPreferences.SkipProcInst, "skip over process instructions (e.g. <?xml version=\"1\"?>)")
-	rootCmd.PersistentFlags().BoolVar(&yqlib.ConfiguredXMLPreferences.SkipDirectives, "xml-skip-directives", yqlib.ConfiguredXMLPreferences.SkipDirectives, "skip over directives (e.g. <!DOCTYPE thing cat>)")
+	rootCmd.PersistentFlags().StringVar(&yqlib.ConfiguredXMLPreferences.AttributePrefix, "xml-attribute-prefix", "+", "prefix for xml attributes")
+	rootCmd.PersistentFlags().StringVar(&yqlib.ConfiguredXMLPreferences.ContentName, "xml-content-name", "+content", "name for xml content (if no attribute name is present).")
+	rootCmd.PersistentFlags().BoolVar(&yqlib.ConfiguredXMLPreferences.StrictMode, "xml-strict-mode", false, "enables strict parsing of XML. See https://pkg.go.dev/encoding/xml for more details.")
+	rootCmd.PersistentFlags().BoolVar(&yqlib.ConfiguredXMLPreferences.KeepNamespace, "xml-keep-namespace", true, "enables keeping namespace after parsing attributes")
+	rootCmd.PersistentFlags().BoolVar(&yqlib.ConfiguredXMLPreferences.UseRawToken, "xml-raw-token", true, "enables using RawToken method instead Token. Commonly disables namespace translations. See https://pkg.go.dev/encoding/xml#Decoder.RawToken for details.")
+	rootCmd.PersistentFlags().StringVar(&yqlib.ConfiguredXMLPreferences.ProcInstPrefix, "xml-proc-inst-prefix", "+p_", "prefix for xml processing instructions (e.g. <?xml version=\"1\"?>)")
+	rootCmd.PersistentFlags().StringVar(&yqlib.ConfiguredXMLPreferences.DirectiveName, "xml-directive-name", "+directive", "name for xml directives (e.g. <!DOCTYPE thing cat>)")
+	rootCmd.PersistentFlags().BoolVar(&yqlib.ConfiguredXMLPreferences.SkipProcInst, "xml-skip-proc-inst", false, "skip over process instructions (e.g. <?xml version=\"1\"?>)")
+	rootCmd.PersistentFlags().BoolVar(&yqlib.ConfiguredXMLPreferences.SkipDirectives, "xml-skip-directives", false, "skip over directives (e.g. <!DOCTYPE thing cat>)")

 	rootCmd.PersistentFlags().BoolVarP(&nullInput, "null-input", "n", false, "Don't read input, simply evaluate the expression given. Useful for creating docs from scratch.")
 	rootCmd.PersistentFlags().BoolVarP(&noDocSeparators, "no-doc", "N", false, "Don't print document separators (---)")
@@ -103,9 +94,7 @@ yq -P sample.json
 	rootCmd.PersistentFlags().IntVarP(&indent, "indent", "I", 2, "sets indent level for output")
 	rootCmd.Flags().BoolVarP(&version, "version", "V", false, "Print version information and quit")
 	rootCmd.PersistentFlags().BoolVarP(&writeInplace, "inplace", "i", false, "update the file inplace of first file given.")
-	rootCmd.PersistentFlags().VarP(unwrapScalarFlag, "unwrapScalar", "r", "unwrap scalar, print the value with no quotes, colors or comments. Defaults to true for yaml")
-	rootCmd.PersistentFlags().Lookup("unwrapScalar").NoOptDefVal = "true"
-
+	rootCmd.PersistentFlags().BoolVarP(&unwrapScalar, "unwrapScalar", "r", true, "unwrap scalar, print the value with no quotes, colors or comments")
 	rootCmd.PersistentFlags().BoolVarP(&prettyPrint, "prettyPrint", "P", false, "pretty print, shorthand for '... style = \"\"'")
 	rootCmd.PersistentFlags().BoolVarP(&exitStatus, "exit-status", "e", false, "set exit status if there are no matches or null or false is returned")

@@ -1,46 +0,0 @@
-package cmd
-
-import (
-	"strconv"
-
-	"github.com/spf13/pflag"
-)
-
-type boolFlag interface {
-	pflag.Value
-	IsExplicitySet() bool
-	IsSet() bool
-}
-
-type unwrapScalarFlagStrc struct {
-	explicitySet bool
-	value        bool
-}
-
-func newUnwrapFlag() boolFlag {
-	return &unwrapScalarFlagStrc{value: true}
-}
-
-func (f *unwrapScalarFlagStrc) IsExplicitySet() bool {
-	return f.explicitySet
-}
-
-func (f *unwrapScalarFlagStrc) IsSet() bool {
-	return f.value
-}
-
-func (f *unwrapScalarFlagStrc) String() string {
-	return strconv.FormatBool(f.value)
-}
-
-func (f *unwrapScalarFlagStrc) Set(value string) error {
-
-	v, err := strconv.ParseBool(value)
-	f.value = v
-	f.explicitySet = true
-	return err
-}
-
-func (*unwrapScalarFlagStrc) Type() string {
-	return "bool"
-}
@@ -98,7 +98,7 @@ func configurePrinterWriter(format yqlib.PrinterOutputFormat, out io.Writer) (yq
 func configureEncoder(format yqlib.PrinterOutputFormat) yqlib.Encoder {
 	switch format {
 	case yqlib.JSONOutputFormat:
-		return yqlib.NewJSONEncoder(indent, colorsEnabled, unwrapScalar)
+		return yqlib.NewJSONEncoder(indent, colorsEnabled)
 	case yqlib.PropsOutputFormat:
 		return yqlib.NewPropertiesEncoder(unwrapScalar)
 	case yqlib.CSVOutputFormat:
@@ -11,7 +11,7 @@ var (
 	GitDescribe string

 	// Version is main version number that is being run at the moment.
-	Version = "v4.31.1"
+	Version = "4.28.2"

 	// 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
@@ -1,2 +1,11 @@
- [cat, dog, frog, cow]
- [apple, banana, grape, mango]
+---
+- become: true
+  gather_facts: false
+  hosts: lalaland
+  name: "Apply smth"
+  roles:
+    - lala
+    - land
+  serial: 1
+- become: false
+  gather_facts: true
@@ -1 +1,5 @@
-["foobar", "foobaz", "blarp"]
+volumes:
+  beehive-conf:
+    driver: local
+services:
+  - beehive
@@ -1,5 +1,7 @@
-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
+<?xml version="1.0"?>
+<!DOCTYPE config SYSTEM "/etc/iwatch/iwatch.dtd" >
+<apple>
+<?coolioo version="1.0"?>
+<!DOCTYPE config SYSTEM "/etc/iwatch/iwatch.dtd" >
+<b>things</b>
+</apple>
@@ -1,3 +1,3 @@
 name,numberOfCats,likesApples,height
-,1,true,168.8
+Gary,1,true,168.8
 Samantha's Rabbit,2,false,-188.8
@@ -1,4 +0,0 @@
---
-# comment
-# about things
-a: cat
@@ -1,31 +1,31 @@
 module github.com/mikefarah/yq/v4

 require (
-	github.com/a8m/envsubst v1.4.1
+	github.com/a8m/envsubst v1.3.0
 	github.com/alecthomas/participle/v2 v2.0.0-beta.5
-	github.com/alecthomas/repr v0.2.0
+	github.com/alecthomas/repr v0.1.1
 	github.com/dimchansky/utfbom v1.1.1
 	github.com/elliotchance/orderedmap v1.5.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/fatih/color v1.13.0
+	github.com/goccy/go-json v0.9.11
+	github.com/goccy/go-yaml v1.9.5
 	github.com/jinzhu/copier v0.3.5
-	github.com/magiconair/properties v1.8.7
+	github.com/magiconair/properties v1.8.6
 	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.1.1-0.20221104162952-702349b0e862
+	github.com/spf13/cobra v1.6.0
+	golang.org/x/net v0.0.0-20220708220712-1185a9018129
 	gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473
 	gopkg.in/yaml.v3 v3.0.1
 )

 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.3.0 // indirect
-	golang.org/x/text v0.4.0 // indirect
+	github.com/mattn/go-colorable v0.1.12 // indirect
+	github.com/mattn/go-isatty v0.0.14 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+	golang.org/x/sys v0.0.0-20220712014510-0a85c31ab51e // indirect
+	golang.org/x/text v0.3.7 // indirect
 	golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect
 )

-go 1.20
+go 1.19
@@ -1,10 +1,10 @@
-github.com/a8m/envsubst v1.4.1 h1:RShc2OKbQpIIp5qR2glVsBOJCImTVHFrDkJvmGh0Qi0=
-github.com/a8m/envsubst v1.4.1/go.mod h1:MVUTQNGQ3tsjOOtKCNd+fl8RzhsXcDvvAEzkhGtlsbY=
+github.com/a8m/envsubst v1.3.0 h1:GmXKmVssap0YtlU3E230W98RWtWCyIZzjtf1apWWyAg=
+github.com/a8m/envsubst v1.3.0/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=
-github.com/alecthomas/repr v0.2.0 h1:HAzS41CIzNW5syS8Mf9UwXhNH1J9aix/BvDRf1Ml2Yk=
-github.com/alecthomas/repr v0.2.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
+github.com/alecthomas/repr v0.1.1 h1:87P60cSmareLAxMc4Hro0r2RBY4ROm0dYwkJNpS4pPs=
+github.com/alecthomas/repr v0.1.1/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
 github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -13,38 +13,38 @@ 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.14.1 h1:qfhVLaG5s+nCROl1zJsZRxFeYrHLqWroPOQ8BWiNb4w=
-github.com/fatih/color v1.14.1/go.mod h1:2oHN61fhTpgcxD3TSWCgKDiH1+x4OiDVVGH8WlgGZGg=
+github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=
+github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
 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.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/goccy/go-json v0.9.11 h1:/pAaQDLHEoCq/5FFmSKBswWmK6H0e8g4159Kc/X/nqk=
+github.com/goccy/go-json v0.9.11/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
+github.com/goccy/go-yaml v1.9.5 h1:Eh/+3uk9kLxG4koCX6lRMAPS1OaMSAi+FJcya0INdB0=
+github.com/goccy/go-yaml v1.9.5/go.mod h1:U/jl18uSupI5rdI2jmuCswEA2htH9eXfferR3KfscvA=
 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=
 github.com/jinzhu/copier v0.3.5 h1:GlvfUwHk62RokgqVNvYsku0TATCF7bAHVwEXoBh3iJg=
 github.com/jinzhu/copier v0.3.5/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg=
 github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
-github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
-github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
+github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo=
+github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
 github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
-github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
-github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
+github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
+github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40=
+github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng=
-github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
+github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e h1:aoZm08cpOy4WuID//EZDgcC4zIxODThtZNPirFr42+A=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/spf13/cobra v1.6.1 h1:o94oiPyS4KD1mPy2fmcYYHHfCxLqYjJOhGsCHFZtEzA=
-github.com/spf13/cobra v1.6.1/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY=
+github.com/spf13/cobra v1.6.0 h1:42a0n6jwCot1pUmomAp4T7DeMD+20LFv4Q54pxLf2LI=
+github.com/spf13/cobra v1.6.0/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -54,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.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/net v0.0.0-20220708220712-1185a9018129 h1:vucSRfWwTsoXro7P+3Cjlr6flUMtzCwzlvkxEQtHHB0=
+golang.org/x/net v0.0.0-20220708220712-1185a9018129/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 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.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=
-golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220712014510-0a85c31ab51e h1:NHvCuwuS43lGnYhten69ZWqi2QOj/CiDNcKbVqwVoew=
+golang.org/x/sys v0.0.0-20220712014510-0a85c31ab51e/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.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg=
-golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 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=
@@ -1,25 +0,0 @@
-//go:build linux
-
-package yqlib
-
-import (
-	"io/fs"
-	"os"
-	"syscall"
-)
-
-func changeOwner(info fs.FileInfo, file *os.File) error {
-	if stat, ok := info.Sys().(*syscall.Stat_t); ok {
-		uid := int(stat.Uid)
-		gid := int(stat.Gid)
-
-		err := os.Chown(file.Name(), uid, gid)
-		if err != nil {
-			// this happens with snap confinement
-			// not really a big issue as users can chown
-			// the file themselves if required.
-			log.Info("Skipping chown: %v", err)
-		}
-	}
-	return nil
-}
@@ -1,12 +0,0 @@
-//go:build !linux
-
-package yqlib
-
-import (
-	"io/fs"
-	"os"
-)
-
-func changeOwner(info fs.FileInfo, file *os.File) error {
-	return nil
-}
@@ -3,6 +3,7 @@ package yqlib
 import (
 	"fmt"
 	"strconv"
+	"time"

 	yaml "gopkg.in/yaml.v3"
 )
@@ -15,7 +16,7 @@ type compareTypePref struct {
 func compareOperator(d *dataTreeNavigator, context Context, expressionNode *ExpressionNode) (Context, error) {
 	log.Debugf("-- compareOperator")
 	prefs := expressionNode.Operation.Preferences.(compareTypePref)
-	return crossFunction(d, context, expressionNode, compare(prefs), true)
+	return crossFunction(d, context.ReadOnlyClone(), expressionNode, compare(prefs), true)
 }

 func compare(prefs compareTypePref) func(d *dataTreeNavigator, context Context, lhs *CandidateNode, rhs *CandidateNode) (*CandidateNode, error) {
@@ -53,12 +54,12 @@ func compare(prefs compareTypePref) func(d *dataTreeNavigator, context Context,
 }

 func compareDateTime(layout string, prefs compareTypePref, lhs *yaml.Node, rhs *yaml.Node) (bool, error) {
-	lhsTime, err := parseDateTime(layout, lhs.Value)
+	lhsTime, err := time.Parse(layout, lhs.Value)
 	if err != nil {
 		return false, err
 	}

-	rhsTime, err := parseDateTime(layout, rhs.Value)
+	rhsTime, err := time.Parse(layout, rhs.Value)
 	if err != nil {
 		return false, err
 	}
@@ -79,8 +80,8 @@ func compareScalars(context Context, prefs compareTypePref, lhs *yaml.Node, rhs

 	isDateTime := lhs.Tag == "!!timestamp"
 	// if the lhs is a string, it might be a timestamp in a custom format.
-	if lhsTag == "!!str" {
-		_, err := parseDateTime(context.GetDateTimeLayout(), lhs.Value)
+	if lhsTag == "!!str" && context.GetDateTimeLayout() != time.RFC3339 {
+		_, err := time.Parse(context.GetDateTimeLayout(), lhs.Value)
 		isDateTime = err == nil
 	}
 	if isDateTime {
@@ -126,10 +127,6 @@ func compareScalars(context Context, prefs compareTypePref, lhs *yaml.Node, rhs
 			return lhs.Value > rhs.Value, nil
 		}
 		return lhs.Value < rhs.Value, nil
-	} else if lhsTag == "!!null" && rhsTag == "!!null" && prefs.OrEqual {
-		return true, nil
-	} else if lhsTag == "!!null" || rhsTag == "!!null" {
-		return false, nil
 	}

 	return false, fmt.Errorf("%v not yet supported for comparison", lhs.Tag)
@@ -14,20 +14,6 @@ var compareOperatorScenarios = []expressionScenario{
 			"D0, P[a], (!!bool)::true\n",
 		},
 	},
-	{
-		skipDoc:    true,
-		expression: "(.k | length) >= 0",
-		expected: []string{
-			"D0, P[k], (!!bool)::true\n",
-		},
-	},
-	{
-		skipDoc:    true,
-		expression: `"2022-01-30T15:53:09Z" > "2020-01-30T15:53:09Z"`,
-		expected: []string{
-			"D0, P[], (!!bool)::true\n",
-		},
-	},
 	{
 		skipDoc:    true,
 		document:   "a: 5\nb: 4",
@@ -299,28 +285,28 @@ var compareOperatorScenarios = []expressionScenario{
 		description: "Both sides are null: > is false",
 		expression:  ".a > .b",
 		expected: []string{
-			"D0, P[a], (!!bool)::false\n",
+			"D0, P[], (!!bool)::false\n",
 		},
 	},
 	{
 		skipDoc:    true,
 		expression: ".a < .b",
 		expected: []string{
-			"D0, P[a], (!!bool)::false\n",
+			"D0, P[], (!!bool)::false\n",
 		},
 	},
 	{
 		description: "Both sides are null: >= is true",
 		expression:  ".a >= .b",
 		expected: []string{
-			"D0, P[a], (!!bool)::true\n",
+			"D0, P[], (!!bool)::true\n",
 		},
 	},
 	{
 		skipDoc:    true,
 		expression: ".a <= .b",
 		expected: []string{
-			"D0, P[a], (!!bool)::true\n",
+			"D0, P[], (!!bool)::true\n",
 		},
 	},

@@ -364,7 +350,7 @@ var compareOperatorScenarios = []expressionScenario{
 		document:   `a: 5`,
 		expression: ".b <= .a",
 		expected: []string{
-			"D0, P[b], (!!bool)::false\n",
+			"D0, P[a], (!!bool)::false\n",
 		},
 	},
 	{
@@ -372,7 +358,7 @@ var compareOperatorScenarios = []expressionScenario{
 		document:   `a: 5`,
 		expression: ".b < .a",
 		expected: []string{
-			"D0, P[b], (!!bool)::false\n",
+			"D0, P[a], (!!bool)::false\n",
 		},
 	},
 }
@@ -12,9 +12,7 @@ const csvSimple = `name,numberOfCats,likesApples,height
 Gary,1,true,168.8
 Samantha's Rabbit,2,false,-188.8
 `
-const csvMissing = `name,numberOfCats,likesApples,height
-,null,,168.8
-`
+
 const expectedUpdatedSimpleCsv = `name,numberOfCats,likesApples,height
 Gary,3,true,168.8
 Samantha's Rabbit,2,false,-188.8
@@ -112,13 +110,6 @@ var csvScenarios = []formatScenario{
 		expected:       csvSimpleMissingData,
 		scenarioType:   "encode-csv",
 	},
-	{
-		description:  "decode csv missing",
-		skipDoc:      true,
-		input:        csvMissing,
-		expected:     csvMissing,
-		scenarioType: "roundtrip-csv",
-	},
 	{
 		description:    "Parse CSV into an array of objects",
 		subdescription: "First row is assumed to be the header row.",
@@ -145,15 +136,15 @@ var csvScenarios = []formatScenario{
 func testCSVScenario(t *testing.T, s formatScenario) {
 	switch s.scenarioType {
 	case "encode-csv":
-		test.AssertResultWithContext(t, s.expected, mustProcessFormatScenario(s, NewYamlDecoder(ConfiguredYamlPreferences), NewCsvEncoder(',')), s.description)
+		test.AssertResultWithContext(t, s.expected, processFormatScenario(s, NewYamlDecoder(ConfiguredYamlPreferences), NewCsvEncoder(',')), s.description)
 	case "encode-tsv":
-		test.AssertResultWithContext(t, s.expected, mustProcessFormatScenario(s, NewYamlDecoder(ConfiguredYamlPreferences), NewCsvEncoder('\t')), s.description)
+		test.AssertResultWithContext(t, s.expected, processFormatScenario(s, NewYamlDecoder(ConfiguredYamlPreferences), NewCsvEncoder('\t')), s.description)
 	case "decode-csv-object":
-		test.AssertResultWithContext(t, s.expected, mustProcessFormatScenario(s, NewCSVObjectDecoder(','), NewYamlEncoder(2, false, ConfiguredYamlPreferences)), s.description)
+		test.AssertResultWithContext(t, s.expected, processFormatScenario(s, NewCSVObjectDecoder(','), NewYamlEncoder(2, false, ConfiguredYamlPreferences)), s.description)
 	case "decode-tsv-object":
-		test.AssertResultWithContext(t, s.expected, mustProcessFormatScenario(s, NewCSVObjectDecoder('\t'), NewYamlEncoder(2, false, ConfiguredYamlPreferences)), s.description)
+		test.AssertResultWithContext(t, s.expected, processFormatScenario(s, NewCSVObjectDecoder('\t'), NewYamlEncoder(2, false, ConfiguredYamlPreferences)), s.description)
 	case "roundtrip-csv":
-		test.AssertResultWithContext(t, s.expected, mustProcessFormatScenario(s, NewCSVObjectDecoder(','), NewCsvEncoder(',')), s.description)
+		test.AssertResultWithContext(t, s.expected, processFormatScenario(s, NewCSVObjectDecoder(','), NewCsvEncoder(',')), s.description)
 	default:
 		panic(fmt.Sprintf("unhandled scenario type %q", s.scenarioType))
 	}
@@ -180,7 +171,7 @@ func documentCSVDecodeObjectScenario(w *bufio.Writer, s formatScenario, formatTy
 	}

 	writeOrPanic(w, fmt.Sprintf("```yaml\n%v```\n\n",
-		mustProcessFormatScenario(s, NewCSVObjectDecoder(separator), NewYamlEncoder(s.indent, false, ConfiguredYamlPreferences))),
+		processFormatScenario(s, NewCSVObjectDecoder(separator), NewYamlEncoder(s.indent, false, ConfiguredYamlPreferences))),
 	)
 }

@@ -212,7 +203,7 @@ func documentCSVEncodeScenario(w *bufio.Writer, s formatScenario, formatType str
 	}

 	writeOrPanic(w, fmt.Sprintf("```%v\n%v```\n\n", formatType,
-		mustProcessFormatScenario(s, NewYamlDecoder(ConfiguredYamlPreferences), NewCsvEncoder(separator))),
+		processFormatScenario(s, NewYamlDecoder(ConfiguredYamlPreferences), NewCsvEncoder(separator))),
 	)
 }

@@ -244,7 +235,7 @@ func documentCSVRoundTripScenario(w *bufio.Writer, s formatScenario, formatType
 	}

 	writeOrPanic(w, fmt.Sprintf("```%v\n%v```\n\n", formatType,
-		mustProcessFormatScenario(s, NewCSVObjectDecoder(separator), NewCsvEncoder(separator))),
+		processFormatScenario(s, NewCSVObjectDecoder(separator), NewCsvEncoder(separator))),
 	)
 }

@@ -15,7 +15,6 @@ const (
 	JsonInputFormat
 	CSVObjectInputFormat
 	TSVObjectInputFormat
-	UriInputFormat
 )

 type Decoder interface {
@@ -60,7 +60,7 @@ func (dec *jsonDecoder) convertToYamlNode(data *orderedMap) (*yaml.Node, error)
 		}
 	}

-	var yamlMap = &yaml.Node{Kind: yaml.MappingNode, Tag: "!!map"}
+	var yamlMap = &yaml.Node{Kind: yaml.MappingNode}
 	for _, keyValuePair := range data.kv {
 		yamlValue, err := dec.convertToYamlNode(&keyValuePair.V)
 		if err != nil {
@@ -74,7 +74,7 @@ func (dec *jsonDecoder) convertToYamlNode(data *orderedMap) (*yaml.Node, error)

 func (dec *jsonDecoder) parseArray(dataArray []*orderedMap) (*yaml.Node, error) {

-	var yamlMap = &yaml.Node{Kind: yaml.SequenceNode, Tag: "!!seq"}
+	var yamlMap = &yaml.Node{Kind: yaml.SequenceNode}

 	for _, value := range dataArray {
 		yamlValue, err := dec.convertToYamlNode(value)
@@ -63,7 +63,7 @@ func (dec *propertiesDecoder) applyPropertyComments(context Context, path []inte

 	rhsCandidateNode.Node.Tag = guessTagFromCustomType(rhsCandidateNode.Node)

-	rhsOp := &Operation{OperationType: referenceOpType, CandidateNode: rhsCandidateNode}
+	rhsOp := &Operation{OperationType: valueOpType, CandidateNode: rhsCandidateNode}

 	assignmentOpNode := &ExpressionNode{
 		Operation: assignmentOp,
@@ -102,7 +102,7 @@ func (dec *propertiesDecoder) applyProperty(context Context, properties *propert

 	assignmentOp := &Operation{OperationType: assignOpType, Preferences: assignPreferences{}}

-	rhsOp := &Operation{OperationType: referenceOpType, CandidateNode: rhsCandidateNode}
+	rhsOp := &Operation{OperationType: valueOpType, CandidateNode: rhsCandidateNode}

 	assignmentOpNode := &ExpressionNode{
 		Operation: assignmentOp,
@@ -15,10 +15,10 @@ type formatScenario struct {
 	subdescription string
 	skipDoc        bool
 	scenarioType   string
-	expectedError  string
 }

-func processFormatScenario(s formatScenario, decoder Decoder, encoder Encoder) (string, error) {
+func processFormatScenario(s formatScenario, decoder Decoder, encoder Encoder) string {
+
 	var output bytes.Buffer
 	writer := bufio.NewWriter(&output)

@@ -28,7 +28,7 @@ func processFormatScenario(s formatScenario, decoder Decoder, encoder Encoder) (

 	inputs, err := readDocuments(strings.NewReader(s.input), "sample.yml", 0, decoder)
 	if err != nil {
-		return "", err
+		panic(err)
 	}

 	expression := s.expression
@@ -39,31 +39,22 @@ func processFormatScenario(s formatScenario, decoder Decoder, encoder Encoder) (
 	exp, err := getExpressionParser().ParseExpression(expression)

 	if err != nil {
-		return "", err
+		panic(err)
 	}

 	context, err := NewDataTreeNavigator().GetMatchingNodes(Context{MatchingNodes: inputs}, exp)

 	if err != nil {
-		return "", err
+		panic(err)
 	}

 	printer := NewPrinter(encoder, NewSinglePrinterWriter(writer))
 	err = printer.PrintResults(context.MatchingNodes)
 	if err != nil {
-		return "", err
+		panic(err)
 	}
 	writer.Flush()

-	return output.String(), nil
-}
-
-func mustProcessFormatScenario(s formatScenario, decoder Decoder, encoder Encoder) string {
-
-	result, err := processFormatScenario(s, decoder, encoder)
-	if err != nil {
-		panic(err)
-	}
-	return result
+	return output.String()

 }
@@ -1,60 +0,0 @@
-package yqlib
-
-import (
-	"bytes"
-	"io"
-	"net/url"
-
-	yaml "gopkg.in/yaml.v3"
-)
-
-type uriDecoder struct {
-	reader       io.Reader
-	finished     bool
-	readAnything bool
-}
-
-func NewUriDecoder() Decoder {
-	return &uriDecoder{finished: false}
-}
-
-func (dec *uriDecoder) Init(reader io.Reader) error {
-	dec.reader = reader
-	dec.readAnything = false
-	dec.finished = false
-	return nil
-}
-
-func (dec *uriDecoder) Decode() (*CandidateNode, error) {
-	if dec.finished {
-		return nil, io.EOF
-	}
-
-	buf := new(bytes.Buffer)
-
-	if _, err := buf.ReadFrom(dec.reader); err != nil {
-		return nil, err
-	}
-	if buf.Len() == 0 {
-		dec.finished = true
-
-		// if we've read _only_ an empty string, lets return that
-		// otherwise if we've already read some bytes, and now we get
-		// an empty string, then we are done.
-		if dec.readAnything {
-			return nil, io.EOF
-		}
-	}
-	newValue, err := url.QueryUnescape(buf.String())
-	if err != nil {
-		return nil, err
-	}
-	dec.readAnything = true
-	return &CandidateNode{
-		Node: &yaml.Node{
-			Kind:  yaml.ScalarNode,
-			Tag:   "!!str",
-			Value: newValue,
-		},
-	}, nil
-}
@@ -3,7 +3,6 @@ package yqlib
 import (
 	"encoding/xml"
 	"errors"
-	"fmt"
 	"io"
 	"strings"
 	"unicode"
@@ -54,17 +53,15 @@ func (dec *xmlDecoder) processComment(c string) string {
 }

 func (dec *xmlDecoder) createMap(n *xmlNode) (*yaml.Node, error) {
-	log.Debug("createMap: headC: %v, lineC: %v, footC: %v", n.HeadComment, n.LineComment, n.FootComment)
+	log.Debug("createMap: headC: %v, footC: %v", n.HeadComment, n.FootComment)
 	yamlNode := &yaml.Node{Kind: yaml.MappingNode, Tag: "!!map"}

 	if len(n.Data) > 0 {
-		log.Debugf("creating content node for map: %v", dec.prefs.ContentName)
 		label := dec.prefs.ContentName
 		labelNode := createScalarNode(label, label)
 		labelNode.HeadComment = dec.processComment(n.HeadComment)
-		labelNode.LineComment = dec.processComment(n.LineComment)
 		labelNode.FootComment = dec.processComment(n.FootComment)
-		yamlNode.Content = append(yamlNode.Content, labelNode, dec.createValueNodeFromData(n.Data))
+		yamlNode.Content = append(yamlNode.Content, labelNode, createScalarNode(n.Data, n.Data))
 	}

 	for i, keyValuePair := range n.Children {
@@ -78,7 +75,7 @@ func (dec *xmlDecoder) createMap(n *xmlNode) (*yaml.Node, error) {
 			labelNode.HeadComment = dec.processComment(n.HeadComment)

 		}
-		log.Debugf("label=%v, i=%v, keyValuePair.FootComment: %v", label, i, keyValuePair.FootComment)
+
 		labelNode.FootComment = dec.processComment(keyValuePair.FootComment)

 		log.Debug("len of children in %v is %v", label, len(children))
@@ -92,16 +89,8 @@ func (dec *xmlDecoder) createMap(n *xmlNode) (*yaml.Node, error) {
 			// if the value is a scalar, the head comment of the scalar needs to go on the key?
 			// add tests for <z/> as well as multiple <ds> of inputXmlWithComments > yaml
 			if len(children[0].Children) == 0 && children[0].HeadComment != "" {
-				if len(children[0].Data) > 0 {
-
-					log.Debug("scalar comment hack, currentlabel [%v]", labelNode.HeadComment)
-					labelNode.HeadComment = joinComments([]string{labelNode.HeadComment, strings.TrimSpace(children[0].HeadComment)}, "\n")
-					children[0].HeadComment = ""
-				} else {
-					// child is null, put the headComment as a linecomment for reasons
-					children[0].LineComment = children[0].HeadComment
-					children[0].HeadComment = ""
-				}
+				labelNode.HeadComment = labelNode.HeadComment + "\n" + strings.TrimSpace(children[0].HeadComment)
+				children[0].HeadComment = ""
 			}
 			valueNode, err = dec.convertToYamlNode(children[0])
 			if err != nil {
@@ -114,40 +103,17 @@ func (dec *xmlDecoder) createMap(n *xmlNode) (*yaml.Node, error) {
 	return yamlNode, nil
 }

-func (dec *xmlDecoder) createValueNodeFromData(values []string) *yaml.Node {
-	switch len(values) {
-	case 0:
-		return createScalarNode(nil, "")
-	case 1:
-		return createScalarNode(values[0], values[0])
-	default:
-		content := make([]*yaml.Node, 0)
-		for _, value := range values {
-			content = append(content, createScalarNode(value, value))
-		}
-		return &yaml.Node{
-			Kind:    yaml.SequenceNode,
-			Tag:     "!!seq",
-			Content: content,
-		}
-	}
-}
-
 func (dec *xmlDecoder) convertToYamlNode(n *xmlNode) (*yaml.Node, error) {
 	if len(n.Children) > 0 {
 		return dec.createMap(n)
 	}
-
-	scalar := dec.createValueNodeFromData(n.Data)
-
-	log.Debug("scalar (%v), headC: %v, lineC: %v, footC: %v", scalar.Tag, n.HeadComment, n.LineComment, n.FootComment)
+	scalar := createScalarNode(n.Data, n.Data)
+	if n.Data == "" {
+		scalar = createScalarNode(nil, "")
+	}
+	log.Debug("scalar headC: %v, footC: %v", n.HeadComment, n.FootComment)
 	scalar.HeadComment = dec.processComment(n.HeadComment)
 	scalar.LineComment = dec.processComment(n.LineComment)
-	if scalar.Tag == "!!seq" {
-		scalar.Content[0].HeadComment = scalar.LineComment
-		scalar.LineComment = ""
-	}
-
 	scalar.FootComment = dec.processComment(n.FootComment)

 	return scalar, nil
@@ -190,7 +156,7 @@ type xmlNode struct {
 	HeadComment string
 	FootComment string
 	LineComment string
-	Data        []string
+	Data        string
 }

 type xmlChildrenKv struct {
@@ -235,8 +201,6 @@ func (dec *xmlDecoder) decodeXML(root *xmlNode) error {
 	// That will convert the charset if the provided XML is non-UTF-8
 	xmlDec.CharsetReader = charset.NewReaderLabel

-	started := false
-
 	// Create first element from the root node
 	elem := &element{
 		parent: nil,
@@ -277,18 +241,12 @@ func (dec *xmlDecoder) decodeXML(root *xmlNode) error {
 						a.Name.Local = a.Name.Space + ":" + a.Name.Local
 					}
 				}
-				elem.n.AddChild(dec.prefs.AttributePrefix+a.Name.Local, &xmlNode{Data: []string{a.Value}})
+				elem.n.AddChild(dec.prefs.AttributePrefix+a.Name.Local, &xmlNode{Data: a.Value})
 			}
 		case xml.CharData:
-
 			// Extract XML data (if any)
-			newBit := trimNonGraphic(string(se))
-			if !started && len(newBit) > 0 {
-				return fmt.Errorf("invalid XML: Encountered chardata [%v] outside of XML node", newBit)
-			}
-
-			if len(newBit) > 0 {
-				elem.n.Data = append(elem.n.Data, newBit)
+			elem.n.Data = trimNonGraphic(string(se))
+			if elem.n.Data != "" {
 				elem.state = "chardata"
 				log.Debug("chardata [%v] for %v", elem.n.Data, elem.label)
 			}
@@ -310,22 +268,21 @@ func (dec *xmlDecoder) decodeXML(root *xmlNode) error {

 			} else if elem.state == "chardata" {
 				log.Debug("got a line comment for (%v) %v: [%v]", elem.state, elem.label, commentStr)
-				elem.n.LineComment = joinComments([]string{elem.n.LineComment, commentStr}, " ")
+				elem.n.LineComment = joinFilter([]string{elem.n.LineComment, commentStr})
 			} else {
 				log.Debug("got a head comment for (%v) %v: [%v]", elem.state, elem.label, commentStr)
-				elem.n.HeadComment = joinComments([]string{elem.n.HeadComment, commentStr}, " ")
+				elem.n.HeadComment = joinFilter([]string{elem.n.HeadComment, commentStr})
 			}

 		case xml.ProcInst:
 			if !dec.prefs.SkipProcInst {
-				elem.n.AddChild(dec.prefs.ProcInstPrefix+se.Target, &xmlNode{Data: []string{string(se.Inst)}})
+				elem.n.AddChild(dec.prefs.ProcInstPrefix+se.Target, &xmlNode{Data: string(se.Inst)})
 			}
 		case xml.Directive:
 			if !dec.prefs.SkipDirectives {
-				elem.n.AddChild(dec.prefs.DirectiveName, &xmlNode{Data: []string{string(se)}})
+				elem.n.AddChild(dec.prefs.DirectiveName, &xmlNode{Data: string(se)})
 			}
 		}
-		started = true
 	}

 	return nil
@@ -337,28 +294,22 @@ func applyFootComment(elem *element, commentStr string) {
 	if len(elem.n.Children) > 0 {
 		lastChildIndex := len(elem.n.Children) - 1
 		childKv := elem.n.Children[lastChildIndex]
-		log.Debug("got a foot comment, putting on last child for %v: [%v]", childKv.K, commentStr)
-		// if it's an array of scalars, put the foot comment on the scalar itself
-		if len(childKv.V) > 0 && len(childKv.V[0].Children) == 0 {
-			nodeToUpdate := childKv.V[len(childKv.V)-1]
-			nodeToUpdate.FootComment = joinComments([]string{nodeToUpdate.FootComment, commentStr}, " ")
-		} else {
-			childKv.FootComment = joinComments([]string{elem.n.FootComment, commentStr}, " ")
-		}
+		log.Debug("got a foot comment for %v: [%v]", childKv.K, commentStr)
+		childKv.FootComment = joinFilter([]string{elem.n.FootComment, commentStr})
 	} else {
 		log.Debug("got a foot comment for %v: [%v]", elem.label, commentStr)
-		elem.n.FootComment = joinComments([]string{elem.n.FootComment, commentStr}, " ")
+		elem.n.FootComment = joinFilter([]string{elem.n.FootComment, commentStr})
 	}
 }

-func joinComments(rawStrings []string, joinStr string) string {
+func joinFilter(rawStrings []string) string {
 	stringsToJoin := make([]string, 0)
 	for _, str := range rawStrings {
 		if str != "" {
 			stringsToJoin = append(stringsToJoin, str)
 		}
 	}
-	return strings.Join(stringsToJoin, joinStr)
+	return strings.Join(stringsToJoin, " ")
 }

 // trimNonGraphic returns a slice of the string s, with all leading and trailing
@@ -2,7 +2,6 @@ package yqlib

 import (
 	"bufio"
-	"bytes"
 	"errors"
 	"io"
 	"regexp"
@@ -13,15 +12,11 @@ import (

 type yamlDecoder struct {
 	decoder yaml.Decoder
-
-	prefs YamlPreferences
-
 	// work around of various parsing issues by yaml.v3 with document headers
+	prefs          YamlPreferences
 	leadingContent string
-	bufferRead     bytes.Buffer
-
-	readAnything bool
-	firstFile    bool
+	readAnything   bool
+	firstFile      bool
 }

 func NewYamlDecoder(prefs YamlPreferences) Decoder {
@@ -30,7 +25,6 @@ func NewYamlDecoder(prefs YamlPreferences) Decoder {

 func (dec *yamlDecoder) processReadStream(reader *bufio.Reader) (io.Reader, string, error) {
 	var commentLineRegEx = regexp.MustCompile(`^\s*#`)
-	var yamlDirectiveLineRegEx = regexp.MustCompile(`^\s*%YA`)
 	var sb strings.Builder
 	for {
 		peekBytes, err := reader.Peek(3)
@@ -39,14 +33,6 @@ func (dec *yamlDecoder) processReadStream(reader *bufio.Reader) (io.Reader, stri
 			return reader, sb.String(), nil
 		} else if err != nil {
 			return reader, sb.String(), err
-		} else if string(peekBytes[0]) == "\n" {
-			_, err := reader.ReadString('\n')
-			sb.WriteString("\n")
-			if errors.Is(err, io.EOF) {
-				return reader, sb.String(), nil
-			} else if err != nil {
-				return reader, sb.String(), err
-			}
 		} else if string(peekBytes) == "---" {
 			_, err := reader.ReadString('\n')
 			sb.WriteString("$yqDocSeperator$\n")
@@ -55,7 +41,7 @@ func (dec *yamlDecoder) processReadStream(reader *bufio.Reader) (io.Reader, stri
 			} else if err != nil {
 				return reader, sb.String(), err
 			}
-		} else if commentLineRegEx.MatchString(string(peekBytes)) || yamlDirectiveLineRegEx.MatchString(string(peekBytes)) {
+		} else if commentLineRegEx.MatchString(string(peekBytes)) {
 			line, err := reader.ReadString('\n')
 			sb.WriteString(line)
 			if errors.Is(err, io.EOF) {
@@ -72,7 +58,6 @@ func (dec *yamlDecoder) processReadStream(reader *bufio.Reader) (io.Reader, stri
 func (dec *yamlDecoder) Init(reader io.Reader) error {
 	readerToUse := reader
 	leadingContent := ""
-	dec.bufferRead = bytes.Buffer{}
 	var err error
 	// if we 'evaluating together' - we only process the leading content
 	// of the first file - this ensures comments from subsequent files are
@@ -82,12 +67,6 @@ func (dec *yamlDecoder) Init(reader io.Reader) error {
 		if err != nil {
 			return err
 		}
-	} else if !dec.prefs.LeadingContentPreProcessing {
-		// if we're not process the leading content
-		// keep a copy of what we've read. This is incase its a
-		// doc with only comments - the decoder will return nothing
-		// then we can read the comments from bufferRead
-		readerToUse = io.TeeReader(reader, &dec.bufferRead)
 	}
 	dec.leadingContent = leadingContent
 	dec.readAnything = false
@@ -98,20 +77,13 @@ func (dec *yamlDecoder) Init(reader io.Reader) error {

 func (dec *yamlDecoder) Decode() (*CandidateNode, error) {
 	var dataBucket yaml.Node
+
 	err := dec.decoder.Decode(&dataBucket)
 	if errors.Is(err, io.EOF) && dec.leadingContent != "" && !dec.readAnything {
 		// force returning an empty node with a comment.
 		dec.readAnything = true
 		return dec.blankNodeWithComment(), nil
-	} else if errors.Is(err, io.EOF) && !dec.prefs.LeadingContentPreProcessing && !dec.readAnything {
-		// didn't find any yaml,
-		// check the tee buffer, maybe there were comments
-		dec.readAnything = true
-		dec.leadingContent = dec.bufferRead.String()
-		if dec.leadingContent != "" {
-			return dec.blankNodeWithComment(), nil
-		}
-		return nil, err
+
 	} else if err != nil {
 		return nil, err
 	}
@@ -124,7 +96,6 @@ func (dec *yamlDecoder) Decode() (*CandidateNode, error) {
 		candidateNode.LeadingContent = dec.leadingContent
 		dec.leadingContent = ""
 	}
-	dec.readAnything = true
 	// move document comments into candidate node
 	// otherwise unwrap drops them.
 	candidateNode.TrailingContent = dataBucket.FootComment
@@ -86,23 +86,6 @@ will output
 a: ['dog', 'cat']
 ```

-## Prepend to existing array
-Given a sample.yml file of:
-```yaml
-a:
-  - dog
-```
-then
-```bash
-yq '.a = ["cat"] + .a' sample.yml
-```
-will output
-```yaml
-a:
-  - cat
-  - dog
-```
-
 ## Add new object to array
 Given a sample.yml file of:
 ```yaml
@@ -1,28 +0,0 @@
-# Array to Map
-
-Use this operator to convert an array to..a map. The indices are used as map keys, null values in the array are skipped over.
-
-Behind the scenes, this is implemented using reduce:
-
-```
-(.[] | select(. != null) ) as $i ireduce({}; .[$i | key] = $i)
-```
-
-## Simple example
-Given a sample.yml file of:
-```yaml
-cool:
-  - null
-  - null
-  - hello
-```
-then
-```bash
-yq '.cool |= array_to_map' sample.yml
-```
-will output
-```yaml
-cool:
-  2: hello
-```
-
@@ -247,7 +247,6 @@ Note the use of `...` to ensure key nodes are included.
 Given a sample.yml file of:
 ```yaml
 # hi
-
 a: cat # comment
 # great
 b: # key comment
@@ -266,7 +265,6 @@ b:
 Given a sample.yml file of:
 ```yaml
 # welcome!
-
 a: cat # meow
 # have a great day
 ```
@@ -295,7 +293,6 @@ yq '. | head_comment' sample.yml
 will output
 ```yaml
 welcome!
-
 ```

 ## Head comment with document split
@@ -1,14 +1,6 @@
 # Contains

-This returns `true` if the context contains the passed in parameter, and false otherwise. For arrays, this will return true if the passed in array is contained within the array. For strings, it will return true if the string is a substring.
-
-{% 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 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.
-
-{% endhint %}
+This returns `true` if the context contains the passed in parameter, and false otherwise.

 ## Array contains array
 Array is equal or subset of
@@ -28,24 +20,6 @@ will output
 true
 ```

-## Array has a subset array
-Subtract the superset array from the subset, if there's anything left, it's not a subset
-
-Given a sample.yml file of:
-```yaml
- foobar
- foobaz
- blarp
-```
-then
-```bash
-yq '["baz", "bar"] - . | length == 0' sample.yml
-```
-will output
-```yaml
-false
-```
-
 ## Object included in array
 Given a sample.yml file of:
 ```yaml
@@ -60,7 +60,7 @@ a: 2001-12-15
 ## Format: get the day of the week
 Given a sample.yml file of:
 ```yaml
-a: 2001-12-15
+a: 2001-12-15T02:59:43.1Z
 ```
 then
 ```bash
@@ -86,30 +86,6 @@ a: cool
 updated: 2021-05-19T01:02:03Z
 ```

-## From Unix
-Converts from unix time. Note, you don't have to pipe through the tz operator :)
-
-Running
-```bash
-yq --null-input '1675301929 | from_unix | tz("UTC")'
-```
-will output
-```yaml
-2023-02-02T01:38:49Z
-```
-
-## To Unix
-Converts to unix time
-
-Running
-```bash
-yq --null-input 'now | to_unix'
-```
-will output
-```yaml
-1621386123
-```
-
 ## Timezone: from standard RFC3339 format
 Returns a new datetime in the specified timezone. Specify standard IANA Time Zone format or 'utc', 'local'. When given a single parameter, this assumes the datetime is in RFC3339 format.

@@ -16,8 +16,6 @@ These operators are useful to process yaml documents that have stringified embed
 | TSV | from_tsv/@tsvd | to_tsv/@tsv |
 | XML | from_xml/@xmld | to_xml(i)/@xml |
 | Base64 | @base64d | @base64 |
-| URI | @urid | @uri |
-| Shell |  | @sh |


 See CSV and TSV [documentation](https://mikefarah.gitbook.io/yq/usage/csv-tsv) for accepted formats.
@@ -339,7 +337,7 @@ Given a sample.yml file of:
 a:
  cool:
    foo: bar
-    +@id: hi
+    +id: hi
 ```
 then
 ```bash
@@ -359,7 +357,7 @@ Given a sample.yml file of:
 a:
  cool:
    foo: bar
-    +@id: hi
+    +id: hi
 ```
 then
 ```bash
@@ -377,7 +375,7 @@ Given a sample.yml file of:
 a:
  cool:
    foo: bar
-    +@id: hi
+    +id: hi
 ```
 then
 ```bash
@@ -437,50 +435,6 @@ will output
 YTogYXBwbGUK
 ```

-## Encode a string to uri
-Given a sample.yml file of:
-```yaml
-coolData: this has & special () characters *
-```
-then
-```bash
-yq '.coolData | @uri' sample.yml
-```
-will output
-```yaml
-this+has+%26+special+%28%29+characters+%2A
-```
-
-## Decode a URI to a string
-Given a sample.yml file of:
-```yaml
-this+has+%26+special+%28%29+characters+%2A
-```
-then
-```bash
-yq '@urid' sample.yml
-```
-will output
-```yaml
-this has & special () characters *
-```
-
-## Encode a string to sh
-Sh/Bash friendly string
-
-Given a sample.yml file of:
-```yaml
-coolData: strings with spaces and a 'quote'
-```
-then
-```bash
-yq '.coolData | @sh' sample.yml
-```
-will output
-```yaml
-strings' with spaces and a '\'quote\'
-```
-
 ## Decode a base64 encoded string
 Decoded data is assumed to be a string.

@@ -1,9 +0,0 @@
-# Array to Map
-
-Use this operator to convert an array to..a map. The indices are used as map keys, null values in the array are skipped over.
-
-Behind the scenes, this is implemented using reduce:
-
-```
-(.[] | select(. != null) ) as $i ireduce({}; .[$i | key] = $i)
-```
@@ -1,11 +1,3 @@
 # Contains

-This returns `true` if the context contains the passed in parameter, and false otherwise. For arrays, this will return true if the passed in array is contained within the array. For strings, it will return true if the string is a substring.
-
-{% 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 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.
-
-{% endhint %}
+This returns `true` if the context contains the passed in parameter, and false otherwise.
@@ -16,8 +16,6 @@ These operators are useful to process yaml documents that have stringified embed
 | TSV | from_tsv/@tsvd | to_tsv/@tsv |
 | XML | from_xml/@xmld | to_xml(i)/@xml |
 | Base64 | @base64d | @base64 |
-| URI | @urid | @uri |
-| Shell |  | @sh |


 See CSV and TSV [documentation](https://mikefarah.gitbook.io/yq/usage/csv-tsv) for accepted formats.
@@ -1,4 +0,0 @@
-# Shuffle
-
-Shuffles an array. Note that this command does _not_ use a cryptographically secure random number generator to randomise the array order.
-
@@ -1,5 +0,0 @@
-# Slice/Splice Array
-
-The slice array operator takes an array as input and returns a subarray. Like the `jq` equivalent, `.[10:15]` will return an array of length 5, starting from index 10 inclusive, up to index 15 exclusive. Negative numbers count backwards from the end of the array.
-
-You may leave out the first or second number, which will will refer to the start or end of the array respectively.
@@ -499,43 +499,3 @@ b: !goat
  dog: woof
 ```

-## Merging a null with a map
-Running
-```bash
-yq --null-input 'null * {"some": "thing"}'
-```
-will output
-```yaml
-some: thing
-```
-
-## Merging a map with null
-Running
-```bash
-yq --null-input '{"some": "thing"} * null'
-```
-will output
-```yaml
-some: thing
-```
-
-## Merging an null with an array
-Running
-```bash
-yq --null-input 'null * ["some"]'
-```
-will output
-```yaml
- some
-```
-
-## Merging an array with null
-Running
-```bash
-yq --null-input '["some"] * null'
-```
-will output
-```yaml
- some
-```
-
@@ -122,33 +122,6 @@ a:
  b: things
 ```

-## Set path to prune deep paths
-Like pick but recursive. This uses `ireduce` to deeply set the selected paths into an empty object,
-
-Given a sample.yml file of:
-```yaml
-
-parentA: bob
-parentB:
-  child1: i am child1
-  child2: i am child2
-parentC:
-  child1: me child1
-  child2: me child2
-```
-then
-```bash
-yq '(.parentB.child2, .parentC.child1) as $i
-  ireduce({}; setpath($i | path; $i))' sample.yml
-```
-will output
-```yaml
-parentB:
-  child2: i am child2
-parentC:
-  child1: me child1
-```
-
 ## Set array path
 Given a sample.yml file of:
 ```yaml
@@ -1,51 +0,0 @@
-# Shuffle
-
-Shuffles an array. Note that this command does _not_ use a cryptographically secure random number generator to randomise the array order.
-
-
-## Shuffle array
-Given a sample.yml file of:
-```yaml
- 1
- 2
- 3
- 4
- 5
-```
-then
-```bash
-yq 'shuffle' sample.yml
-```
-will output
-```yaml
- 5
- 2
- 4
- 1
- 3
-```
-
-## Shuffle array in place
-Given a sample.yml file of:
-```yaml
-cool:
-  - 1
-  - 2
-  - 3
-  - 4
-  - 5
-```
-then
-```bash
-yq '.cool |= shuffle' sample.yml
-```
-will output
-```yaml
-cool:
-  - 5
-  - 2
-  - 4
-  - 1
-  - 3
-```
-
@@ -1,105 +0,0 @@
-# Slice/Splice Array
-
-The slice array operator takes an array as input and returns a subarray. Like the `jq` equivalent, `.[10:15]` will return an array of length 5, starting from index 10 inclusive, up to index 15 exclusive. Negative numbers count backwards from the end of the array.
-
-You may leave out the first or second number, which will will refer to the start or end of the array respectively.
-
-## Slicing arrays
-Given a sample.yml file of:
-```yaml
- cat
- dog
- frog
- cow
-```
-then
-```bash
-yq '.[1:3]' sample.yml
-```
-will output
-```yaml
- dog
- frog
-```
-
-## Slicing arrays - without the first number
-Starts from the start of the array
-
-Given a sample.yml file of:
-```yaml
- cat
- dog
- frog
- cow
-```
-then
-```bash
-yq '.[:2]' sample.yml
-```
-will output
-```yaml
- cat
- dog
-```
-
-## Slicing arrays - without the second number
-Finishes at the end of the array
-
-Given a sample.yml file of:
-```yaml
- cat
- dog
- frog
- cow
-```
-then
-```bash
-yq '.[2:]' sample.yml
-```
-will output
-```yaml
- frog
- cow
-```
-
-## Slicing arrays - use negative numbers to count backwards from the end
-Given a sample.yml file of:
-```yaml
- cat
- dog
- frog
- cow
-```
-then
-```bash
-yq '.[1:-1]' sample.yml
-```
-will output
-```yaml
- dog
- frog
-```
-
-## Inserting into the middle of an array
-using an expression to find the index
-
-Given a sample.yml file of:
-```yaml
- cat
- dog
- frog
- cow
-```
-then
-```bash
-yq '(.[] | select(. == "dog") | key + 1) as $pos | .[0:($pos)] + ["rabbit"] + .[$pos:]' sample.yml
-```
-will output
-```yaml
- cat
- dog
- rabbit
- frog
- cow
-```
-
@@ -25,28 +25,6 @@ will output
 - a: cat
 ```

-## Sort by multiple fields
-Given a sample.yml file of:
-```yaml
- a: dog
- a: cat
-  b: banana
- a: cat
-  b: apple
-```
-then
-```bash
-yq 'sort_by(.a, .b)' sample.yml
-```
-will output
-```yaml
- a: cat
-  b: apple
- a: cat
-  b: banana
- a: dog
-```
-
 ## Sort descending by string field
 Use sort with reverse to sort in descending order.

@@ -157,24 +135,6 @@ will output
 - a: 100
 ```

-## Sort by custom date field
-Given a sample.yml file of:
-```yaml
- a: 12-Jun-2011
- a: 23-Dec-2010
- a: 10-Aug-2011
-```
-then
-```bash
-yq 'with_dtf("02-Jan-2006"; sort_by(.a))' sample.yml
-```
-will output
-```yaml
- a: 23-Dec-2010
- a: 12-Jun-2011
- a: 10-Aug-2011
-```
-
 ## Sort, nulls come first
 Given a sample.yml file of:
 ```yaml
@@ -149,23 +149,6 @@ person:
        - pizza
 ```

-## Decode properties - array should be a map
-If you have a numeric map key in your property files, use array_to_map to convert them to maps.
-
-Given a sample.properties file of:
-```properties
-things.10 = mike
-```
-then
-```bash
-yq -p=props '.things |= array_to_map' sample.properties
-```
-will output
-```yaml
-things:
-    10: mike
-```
-
 ## Roundtrip
 Given a sample.properties file of:
 ```properties
@@ -128,7 +128,7 @@ will output
 ```yaml
 +p_xml: version="1.0" encoding="UTF-8"
 cat:
-  +@legs: "4"
+  +legs: "4"
  legs: "7"
 ```

@@ -149,28 +149,7 @@ will output
 +p_xml: version="1.0" encoding="UTF-8"
 cat:
  +content: meow
-  +@legs: "4"
-```
-
-## Parse xml: content split between comments/children
-Multiple content texts are collected into a sequence.
-
-Given a sample.xml file of:
-```xml
-<root>  value  <!-- comment-->anotherValue <a>frog</a> cool!</root>
-```
-then
-```bash
-yq -p=xml '.' sample.xml
-```
-will output
-```yaml
-root:
-  +content: # comment
-    - value
-    - anotherValue
-    - cool!
-  a: frog
+  +legs: "4"
 ```

 ## Parse xml: custom dtd
@@ -279,42 +258,17 @@ cat:
 ```

 ## Parse xml: keep attribute namespace
-Defaults to true
-
 Given a sample.xml file of:
 ```xml
+
 <?xml version="1.0"?>
-<map xmlns="some-namespace" xmlns:xsi="some-instance" xsi:schemaLocation="some-url"></map>
+<map xmlns="some-namespace" xmlns:xsi="some-instance" xsi:schemaLocation="some-url">
+</map>

 ```
 then
 ```bash
-yq -p=xml -o=xml --xml-keep-namespace=false '.' sample.xml
-```
-will output
-```xml
-<?xml version="1.0"?>
-<map xmlns="some-namespace" xsi="some-instance" schemaLocation="some-url"></map>
-```
-
-instead of
-```xml
-<?xml version="1.0"?>
-<map xmlns="some-namespace" xmlns:xsi="some-instance" xsi:schemaLocation="some-url"></map>
-```
-
-## Parse xml: keep raw attribute namespace
-Defaults to true
-
-Given a sample.xml file of:
-```xml
-<?xml version="1.0"?>
-<map xmlns="some-namespace" xmlns:xsi="some-instance" xsi:schemaLocation="some-url"></map>
-
-```
-then
-```bash
-yq -p=xml -o=xml --xml-raw-token=false '.' sample.xml
+yq -p=xml -o=xml --xml-keep-namespace '.' sample.xml
 ```
 will output
 ```xml
@@ -325,7 +279,32 @@ will output
 instead of
 ```xml
 <?xml version="1.0"?>
-<map xmlns="some-namespace" xmlns:xsi="some-instance" xsi:schemaLocation="some-url"></map>
+<map xmlns="some-namespace" xmlns:xsi="some-instance" some-instance:schemaLocation="some-url"></map>
+```
+
+## Parse xml: keep raw attribute namespace
+Given a sample.xml file of:
+```xml
+
+<?xml version="1.0"?>
+<map xmlns="some-namespace" xmlns:xsi="some-instance" xsi:schemaLocation="some-url">
+</map>
+
+```
+then
+```bash
+yq -p=xml -o=xml --xml-keep-namespace --xml-raw-token '.' sample.xml
+```
+will output
+```xml
+<?xml version="1.0"?>
+<map xmlns="some-namespace" xmlns:xsi="some-instance" some-instance:schemaLocation="some-url"></map>
+```
+
+instead of
+```xml
+<?xml version="1.0"?>
+<map xmlns="some-namespace" xsi="some-instance" schemaLocation="some-url"></map>
 ```

 ## Encode xml: simple
@@ -368,7 +347,7 @@ Fields with the matching xml-attribute-prefix are assumed to be attributes.
 Given a sample.yml file of:
 ```yaml
 cat:
-  +@name: tiger
+  +name: tiger
  meows: true

 ```
@@ -389,7 +368,7 @@ Fields with the matching xml-content-name is assumed to be content.
 Given a sample.yml file of:
 ```yaml
 cat:
-  +@name: tiger
+  +name: tiger
  +content: cool

 ```
@@ -45,7 +45,7 @@ func (o *orderedMap) UnmarshalJSON(data []byte) error {

 		// cycle through k/v
 		var tok json.Token
-		for tok, err = dec.Token(); err == nil; tok, err = dec.Token() {
+		for tok, err = dec.Token(); !errors.Is(err, io.EOF); 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.
@@ -11,7 +11,6 @@ import (
 type jsonEncoder struct {
 	indentString string
 	colorise     bool
-	UnwrapScalar bool
 }

 func mapKeysToStrings(node *yaml.Node) {
@@ -29,14 +28,14 @@ func mapKeysToStrings(node *yaml.Node) {
 	}
 }

-func NewJSONEncoder(indent int, colorise bool, unwrapScalar bool) Encoder {
+func NewJSONEncoder(indent int, colorise bool) Encoder {
 	var indentString = ""

 	for index := 0; index < indent; index++ {
 		indentString = indentString + " "
 	}

-	return &jsonEncoder{indentString, colorise, unwrapScalar}
+	return &jsonEncoder{indentString, colorise}
 }

 func (je *jsonEncoder) CanHandleAliases() bool {
@@ -53,10 +52,6 @@ func (je *jsonEncoder) PrintLeadingContent(writer io.Writer, content string) err

 func (je *jsonEncoder) Encode(writer io.Writer, node *yaml.Node) error {

-	if node.Kind == yaml.ScalarNode && je.UnwrapScalar {
-		return writeString(writer, node.Value+"\n")
-	}
-
 	destination := writer
 	tempBuffer := bytes.NewBuffer(nil)
 	if je.colorise {
@@ -1,79 +0,0 @@
-package yqlib
-
-import (
-	"fmt"
-	"io"
-	"regexp"
-	"strings"
-
-	yaml "gopkg.in/yaml.v3"
-)
-
-var unsafeChars = regexp.MustCompile(`[^\w@%+=:,./-]`)
-
-type shEncoder struct {
-	quoteAll bool
-}
-
-func NewShEncoder() Encoder {
-	return &shEncoder{false}
-}
-
-func (e *shEncoder) CanHandleAliases() bool {
-	return false
-}
-
-func (e *shEncoder) PrintDocumentSeparator(writer io.Writer) error {
-	return nil
-}
-
-func (e *shEncoder) PrintLeadingContent(writer io.Writer, content string) error {
-	return nil
-}
-
-func (e *shEncoder) Encode(writer io.Writer, originalNode *yaml.Node) error {
-	node := unwrapDoc(originalNode)
-	if guessTagFromCustomType(node) != "!!str" {
-		return fmt.Errorf("cannot encode %v as URI, can only operate on strings. Please first pipe through another encoding operator to convert the value to a string", node.Tag)
-	}
-
-	return writeString(writer, e.encode(originalNode.Value))
-}
-
-// put any (shell-unsafe) characters into a single-quoted block, close the block lazily
-func (e *shEncoder) encode(input string) string {
-	const quote = '\''
-	var inQuoteBlock = false
-	var encoded strings.Builder
-	encoded.Grow(len(input))
-
-	for _, ir := range input {
-		// open or close a single-quote block
-		if ir == quote {
-			if inQuoteBlock {
-				// get out of a quote block for an input quote
-				encoded.WriteRune(quote)
-				inQuoteBlock = !inQuoteBlock
-			}
-			// escape the quote with a backslash
-			encoded.WriteRune('\\')
-		} else {
-			if e.shouldQuote(ir) && !inQuoteBlock {
-				// start a quote block for any (unsafe) characters
-				encoded.WriteRune(quote)
-				inQuoteBlock = !inQuoteBlock
-			}
-		}
-		// pass on the input character
-		encoded.WriteRune(ir)
-	}
-	// close any pending quote block
-	if inQuoteBlock {
-		encoded.WriteRune(quote)
-	}
-	return encoded.String()
-}
-
-func (e *shEncoder) shouldQuote(ir rune) bool {
-	return e.quoteAll || unsafeChars.MatchString(string(ir))
-}
@@ -13,7 +13,7 @@ func yamlToJSON(sampleYaml string, indent int) string {
 	var output bytes.Buffer
 	writer := bufio.NewWriter(&output)

-	var jsonEncoder = NewJSONEncoder(indent, false, false)
+	var jsonEncoder = NewJSONEncoder(indent, false)
 	inputs, err := readDocuments(strings.NewReader(sampleYaml), "sample.yml", 0, NewYamlDecoder(ConfiguredYamlPreferences))
 	if err != nil {
 		panic(err)
@@ -1,37 +0,0 @@
-package yqlib
-
-import (
-	"fmt"
-	"io"
-	"net/url"
-
-	yaml "gopkg.in/yaml.v3"
-)
-
-type uriEncoder struct {
-}
-
-func NewUriEncoder() Encoder {
-	return &uriEncoder{}
-}
-
-func (e *uriEncoder) CanHandleAliases() bool {
-	return false
-}
-
-func (e *uriEncoder) PrintDocumentSeparator(writer io.Writer) error {
-	return nil
-}
-
-func (e *uriEncoder) PrintLeadingContent(writer io.Writer, content string) error {
-	return nil
-}
-
-func (e *uriEncoder) Encode(writer io.Writer, originalNode *yaml.Node) error {
-	node := unwrapDoc(originalNode)
-	if guessTagFromCustomType(node) != "!!str" {
-		return fmt.Errorf("cannot encode %v as URI, can only operate on strings. Please first pipe through another encoding operator to convert the value to a string", node.Tag)
-	}
-	_, err := writer.Write([]byte(url.QueryEscape(originalNode.Value)))
-	return err
-}
@@ -65,11 +65,7 @@ func (e *xmlEncoder) Encode(writer io.Writer, node *yaml.Node) error {
 		if err != nil {
 			return err
 		}
-		unwrappedNode := unwrapDoc(node)
-		if unwrappedNode.Kind != yaml.MappingNode {
-			return fmt.Errorf("cannot encode %v to XML - only maps can be encoded", unwrappedNode.Tag)
-		}
-		err = e.encodeTopLevelMap(encoder, unwrappedNode)
+		err = e.encodeTopLevelMap(encoder, unwrapDoc(node))
 		if err != nil {
 			return err
 		}
@@ -78,27 +78,12 @@ const roundTripMultiLineJson = `{
 `

 var jsonScenarios = []formatScenario{
-	{
-		description:  "set tags",
-		skipDoc:      true,
-		input:        "[{}]",
-		expression:   `[.. | type]`,
-		scenarioType: "roundtrip-ndjson",
-		expected:     "[\"!!seq\",\"!!map\"]\n",
-	},
 	{
 		description:    "Parse json: simple",
 		subdescription: "JSON is a subset of yaml, so all you need to do is prettify the output",
 		input:          `{"cat": "meow"}`,
 		expected:       "D0, P[], (!!map)::cat: meow\n",
 	},
-	{
-		description:   "bad json",
-		skipDoc:       true,
-		input:         `{"a": 1 "b": 2}`,
-		expectedError: `bad file 'sample.yml': invalid character '"' after object key:value pair`,
-		scenarioType:  "decode-error",
-	},
 	{
 		description:    "Parse json: complex",
 		subdescription: "JSON is a subset of yaml, so all you need to do is prettify the output",
@@ -252,7 +237,7 @@ func documentRoundtripNdJsonScenario(w *bufio.Writer, s formatScenario, indent i

 	writeOrPanic(w, "will output\n")

-	writeOrPanic(w, fmt.Sprintf("```yaml\n%v```\n\n", mustProcessFormatScenario(s, NewJSONDecoder(), NewJSONEncoder(indent, false, false))))
+	writeOrPanic(w, fmt.Sprintf("```yaml\n%v```\n\n", processFormatScenario(s, NewJSONDecoder(), NewJSONEncoder(indent, false))))
 }

 func documentDecodeNdJsonScenario(w *bufio.Writer, s formatScenario) {
@@ -277,7 +262,7 @@ func documentDecodeNdJsonScenario(w *bufio.Writer, s formatScenario) {

 	writeOrPanic(w, "will output\n")

-	writeOrPanic(w, fmt.Sprintf("```yaml\n%v```\n\n", mustProcessFormatScenario(s, NewJSONDecoder(), NewYamlEncoder(s.indent, false, ConfiguredYamlPreferences))))
+	writeOrPanic(w, fmt.Sprintf("```yaml\n%v```\n\n", processFormatScenario(s, NewJSONDecoder(), NewYamlEncoder(s.indent, false, ConfiguredYamlPreferences))))
 }

 func decodeJSON(t *testing.T, jsonString string) *CandidateNode {
@@ -308,23 +293,17 @@ func decodeJSON(t *testing.T, jsonString string) *CandidateNode {
 func testJSONScenario(t *testing.T, s formatScenario) {
 	switch s.scenarioType {
 	case "encode", "decode":
-		test.AssertResultWithContext(t, s.expected, mustProcessFormatScenario(s, NewYamlDecoder(ConfiguredYamlPreferences), NewJSONEncoder(s.indent, false, false)), s.description)
+		test.AssertResultWithContext(t, s.expected, processFormatScenario(s, NewYamlDecoder(ConfiguredYamlPreferences), NewJSONEncoder(s.indent, false)), s.description)
 	case "":
 		var actual = resultToString(t, decodeJSON(t, s.input))
 		test.AssertResultWithContext(t, s.expected, actual, s.description)
 	case "decode-ndjson":
-		test.AssertResultWithContext(t, s.expected, mustProcessFormatScenario(s, NewJSONDecoder(), NewYamlEncoder(2, false, ConfiguredYamlPreferences)), s.description)
+		test.AssertResultWithContext(t, s.expected, processFormatScenario(s, NewJSONDecoder(), NewYamlEncoder(2, false, ConfiguredYamlPreferences)), s.description)
 	case "roundtrip-ndjson":
-		test.AssertResultWithContext(t, s.expected, mustProcessFormatScenario(s, NewJSONDecoder(), NewJSONEncoder(0, false, false)), s.description)
+		test.AssertResultWithContext(t, s.expected, processFormatScenario(s, NewJSONDecoder(), NewJSONEncoder(0, false)), s.description)
 	case "roundtrip-multi":
-		test.AssertResultWithContext(t, s.expected, mustProcessFormatScenario(s, NewJSONDecoder(), NewJSONEncoder(2, false, false)), s.description)
-	case "decode-error":
-		result, err := processFormatScenario(s, NewJSONDecoder(), NewJSONEncoder(2, false, false))
-		if err == nil {
-			t.Errorf("Expected error '%v' but it worked: %v", s.expectedError, result)
-		} else {
-			test.AssertResultComplexWithContext(t, s.expectedError, err.Error(), s.description)
-		}
+		test.AssertResultWithContext(t, s.expected, processFormatScenario(s, NewJSONDecoder(), NewJSONEncoder(2, false)), s.description)
+
 	default:
 		panic(fmt.Sprintf("unhandled scenario type %q", s.scenarioType))
 	}
@@ -406,7 +385,7 @@ func documentJSONEncodeScenario(w *bufio.Writer, s formatScenario) {
 	}
 	writeOrPanic(w, "will output\n")

-	writeOrPanic(w, fmt.Sprintf("```json\n%v```\n\n", mustProcessFormatScenario(s, NewYamlDecoder(ConfiguredYamlPreferences), NewJSONEncoder(s.indent, false, false))))
+	writeOrPanic(w, fmt.Sprintf("```json\n%v```\n\n", processFormatScenario(s, NewYamlDecoder(ConfiguredYamlPreferences), NewJSONEncoder(s.indent, false))))
 }

 func TestJSONScenarios(t *testing.T) {
@@ -3,6 +3,7 @@ package yqlib
 import (
 	"fmt"
 	"regexp"
+	"strconv"
 )

 type expressionTokeniser interface {
@@ -63,11 +64,11 @@ func unwrap(value string) string {
 func extractNumberParameter(value string) (int, error) {
 	parameterParser := regexp.MustCompile(`.*\(([0-9]+)\)`)
 	matches := parameterParser.FindStringSubmatch(value)
-	var indent, errParsingInt = parseInt(matches[1])
+	var indent, errParsingInt = strconv.ParseInt(matches[1], 10, 32)
 	if errParsingInt != nil {
 		return 0, errParsingInt
 	}
-	return indent, nil
+	return int(indent), nil
 }

 func hasOptionParameter(value string, option string) bool {
@@ -97,10 +98,6 @@ func postProcessTokens(tokens []*token) []*token {
 	return postProcessedTokens
 }

-func tokenIsOpType(token *token, opType *operationType) bool {
-	return token.TokenType == operationToken && token.Operation.OperationType == opType
-}
-
 func handleToken(tokens []*token, index int, postProcessedTokens []*token) (tokensAccum []*token, skipNextToken bool) {
 	skipNextToken = false
 	currentToken := tokens[index]
@@ -124,18 +121,9 @@ func handleToken(tokens []*token, index int, postProcessedTokens []*token) (toke

 	}

-	if tokenIsOpType(currentToken, createMapOpType) {
-		log.Debugf("tokenIsOpType: createMapOpType")
-		// check the previous token is '[', means we are slice, but dont have a first number
-		if tokens[index-1].TokenType == traverseArrayCollect {
-			log.Debugf("previous token is : traverseArrayOpType")
-			// need to put the number 0 before this token, as that is implied
-			postProcessedTokens = append(postProcessedTokens, &token{TokenType: operationToken, Operation: createValueOperation(0, "0")})
-		}
-	}
-
 	if index != len(tokens)-1 && currentToken.AssignOperation != nil &&
-		tokenIsOpType(tokens[index+1], assignOpType) {
+		tokens[index+1].TokenType == operationToken &&
+		tokens[index+1].Operation.OperationType == assignOpType {
 		log.Debug("  its an update assign")
 		currentToken.Operation = currentToken.AssignOperation
 		currentToken.Operation.UpdateAssign = tokens[index+1].Operation.UpdateAssign
@@ -145,17 +133,6 @@ func handleToken(tokens []*token, index int, postProcessedTokens []*token) (toke
 	log.Debug("  adding token to the fixed list")
 	postProcessedTokens = append(postProcessedTokens, currentToken)

-	if tokenIsOpType(currentToken, createMapOpType) {
-		log.Debugf("tokenIsOpType: createMapOpType")
-		// check the next token is ']', means we are slice, but dont have a second number
-		if index != len(tokens)-1 && tokens[index+1].TokenType == closeCollect {
-			log.Debugf("next token is : closeCollect")
-			// need to put the number 0 before this token, as that is implied
-			lengthOp := &Operation{OperationType: lengthOpType}
-			postProcessedTokens = append(postProcessedTokens, &token{TokenType: operationToken, Operation: lengthOp})
-		}
-	}
-
 	if index != len(tokens)-1 &&
 		((currentToken.TokenType == openCollect && tokens[index+1].TokenType == closeCollect) ||
 			(currentToken.TokenType == openCollectObject && tokens[index+1].TokenType == closeCollectObject)) {
@@ -165,8 +142,7 @@ func handleToken(tokens []*token, index int, postProcessedTokens []*token) (toke
 	}

 	if index != len(tokens)-1 && currentToken.CheckForPostTraverse &&
-
-		(tokenIsOpType(tokens[index+1], traversePathOpType) ||
+		((tokens[index+1].TokenType == operationToken && (tokens[index+1].Operation.OperationType == traversePathOpType)) ||
 			(tokens[index+1].TokenType == traverseArrayCollect)) {
 		log.Debug("  adding pipe because the next thing is traverse")
 		op := &Operation{OperationType: shortPipeOpType, Value: "PIPE", StringValue: "."}
@@ -45,16 +45,11 @@ var participleYqRules = []*participleYqRule{
 	simpleOp("format_datetime", formatDateTimeOpType),
 	simpleOp("now", nowOpType),
 	simpleOp("tz", tzOpType),
-	simpleOp("from_?unix", fromUnixOpType),
-	simpleOp("to_?unix", toUnixOpType),
 	simpleOp("with_dtf", withDtFormatOpType),
 	simpleOp("error", errorOpType),
-	simpleOp("shuffle", shuffleOpType),
 	simpleOp("sortKeys", sortKeysOpType),
 	simpleOp("sort_?keys", sortKeysOpType),

-	{"ArrayToMap", "array_?to_?map", expressionOpToken(`(.[] | select(. != null) ) as $i ireduce({}; .[$i | key] = $i)`), 0},
-
 	{"YamlEncodeWithIndent", `to_?yaml\([0-9]+\)`, encodeParseIndent(YamlOutputFormat), 0},
 	{"XMLEncodeWithIndent", `to_?xml\([0-9]+\)`, encodeParseIndent(XMLOutputFormat), 0},
 	{"JSONEncodeWithIndent", `to_?json\([0-9]+\)`, encodeParseIndent(JSONOutputFormat), 0},
@@ -81,10 +76,6 @@ var participleYqRules = []*participleYqRule{
 	{"Base64d", `@base64d`, decodeOp(Base64InputFormat), 0},
 	{"Base64", `@base64`, encodeWithIndent(Base64OutputFormat, 0), 0},

-	{"Urid", `@urid`, decodeOp(UriInputFormat), 0},
-	{"Uri", `@uri`, encodeWithIndent(UriOutputFormat, 0), 0},
-	{"SH", `@sh`, encodeWithIndent(ShOutputFormat, 0), 0},
-
 	{"LoadXML", `load_?xml|xml_?load`, loadOp(NewXMLDecoder(ConfiguredXMLPreferences), false), 0},

 	{"LoadBase64", `load_?base64`, loadOp(NewBase64Decoder(), false), 0},
@@ -93,7 +84,7 @@ var participleYqRules = []*participleYqRule{

 	{"LoadString", `load_?str|str_?load`, loadOp(nil, true), 0},

-	{"LoadYaml", `load`, loadOp(NewYamlDecoder(LoadYamlPreferences), false), 0},
+	{"LoadYaml", `load`, loadOp(NewYamlDecoder(ConfiguredYamlPreferences), false), 0},

 	{"SplitDocument", `splitDoc|split_?doc`, opToken(splitDocumentOpType), 0},

@@ -295,14 +286,6 @@ func opTokenWithPrefs(opType *operationType, assignOpType *operationType, prefer
 	}
 }

-func expressionOpToken(expression string) yqAction {
-	return func(rawToken lexer.Token) (*token, error) {
-		prefs := expressionOpPreferences{expression: expression}
-		expressionOp := &Operation{OperationType: expressionOpType, Preferences: prefs}
-		return &token{TokenType: operationToken, Operation: expressionOp}, nil
-	}
-}
-
 func flattenWithDepth() yqAction {
 	return func(rawToken lexer.Token) (*token, error) {
 		value := rawToken.Value
@@ -359,12 +342,8 @@ func nullValue() yqAction {

 func stringValue() yqAction {
 	return func(rawToken lexer.Token) (*token, error) {
-		log.Debug("rawTokenvalue: %v", rawToken.Value)
 		value := unwrap(rawToken.Value)
-		log.Debug("unwrapped: %v", value)
 		value = strings.ReplaceAll(value, "\\\"", "\"")
-		value = strings.ReplaceAll(value, "\\n", "\n")
-		log.Debug("replaced: %v", value)
 		return &token{TokenType: operationToken, Operation: createValueOperation(value, value)}, nil
 	}
 }
@@ -5,7 +5,7 @@ import (

 	"github.com/alecthomas/repr"
 	"github.com/mikefarah/yq/v4/test"
-	yaml "gopkg.in/yaml.v3"
+	"gopkg.in/yaml.v3"
 )

 type participleLexerScenario struct {
@@ -14,127 +14,6 @@ type participleLexerScenario struct {
 }

 var participleLexerScenarios = []participleLexerScenario{
-	{
-		expression: ".[:3]",
-		tokens: []*token{
-			{
-				TokenType: operationToken,
-				Operation: &Operation{
-					OperationType: selfReferenceOpType,
-					StringValue:   "SELF",
-				},
-			},
-			{
-				TokenType: operationToken,
-				Operation: &Operation{
-					OperationType: traverseArrayOpType,
-					StringValue:   "TRAVERSE_ARRAY",
-				},
-			},
-			{
-				TokenType: openCollect,
-			},
-			{
-				TokenType: operationToken,
-				Operation: &Operation{
-					OperationType: valueOpType,
-					Value:         0,
-					StringValue:   "0",
-					CandidateNode: &CandidateNode{
-						Node: &yaml.Node{
-							Kind:  yaml.ScalarNode,
-							Tag:   "!!int",
-							Value: "0",
-						},
-					},
-				},
-			},
-			{
-				TokenType: operationToken,
-				Operation: &Operation{
-					OperationType: createMapOpType,
-					Value:         "CREATE_MAP",
-					StringValue:   ":",
-				},
-			},
-			{
-				TokenType: operationToken,
-				Operation: &Operation{
-					OperationType: valueOpType,
-					Value:         int64(3),
-					StringValue:   "3",
-					CandidateNode: &CandidateNode{
-						Node: &yaml.Node{
-							Kind:  yaml.Kind(8),
-							Tag:   "!!int",
-							Value: "3",
-						},
-					},
-				},
-			},
-			{
-				TokenType:            closeCollect,
-				CheckForPostTraverse: true,
-				Match:                "]",
-			},
-		},
-	},
-	{
-		expression: ".[-2:]",
-		tokens: []*token{
-			{
-				TokenType: operationToken,
-				Operation: &Operation{
-					OperationType: selfReferenceOpType,
-					StringValue:   "SELF",
-				},
-			},
-			{
-				TokenType: operationToken,
-				Operation: &Operation{
-					OperationType: traverseArrayOpType,
-					StringValue:   "TRAVERSE_ARRAY",
-				},
-			},
-			{
-				TokenType: openCollect,
-			},
-			{
-				TokenType: operationToken,
-				Operation: &Operation{
-					OperationType: valueOpType,
-					Value:         int64(-2),
-					StringValue:   "-2",
-					CandidateNode: &CandidateNode{
-						Node: &yaml.Node{
-							Kind:  yaml.ScalarNode,
-							Tag:   "!!int",
-							Value: "-2",
-						},
-					},
-				},
-			},
-			{
-				TokenType: operationToken,
-				Operation: &Operation{
-					OperationType: createMapOpType,
-					Value:         "CREATE_MAP",
-					StringValue:   ":",
-				},
-			},
-			{
-				TokenType: operationToken,
-				Operation: &Operation{
-					OperationType: lengthOpType,
-				},
-			},
-			{
-				TokenType:            closeCollect,
-				CheckForPostTraverse: true,
-				Match:                "]",
-			},
-		},
-	},
 	{
 		expression: ".a",
 		tokens: []*token{
@@ -620,27 +499,6 @@ var participleLexerScenarios = []participleLexerScenario{
 			},
 		},
 	},
-	{
-		expression: `"string with a\n"`,
-		tokens: []*token{
-			{
-				TokenType: operationToken,
-				Operation: &Operation{
-					OperationType: valueOpType,
-					Value:         "string with a\n",
-					StringValue:   "string with a\n",
-					Preferences:   nil,
-					CandidateNode: &CandidateNode{
-						Node: &yaml.Node{
-							Kind:  yaml.ScalarNode,
-							Tag:   "!!str",
-							Value: "string with a\n",
-						},
-					},
-				},
-			},
-		},
-	},
 	{
 		expression: `"string with a \""`,
 		tokens: []*token{
@@ -53,7 +53,7 @@ var subtractAssignOpType = &operationType{Type: "SUBTRACT_ASSIGN", NumArgs: 2, P

 var assignAttributesOpType = &operationType{Type: "ASSIGN_ATTRIBUTES", NumArgs: 2, Precedence: 40, Handler: assignAttributesOperator}
 var assignStyleOpType = &operationType{Type: "ASSIGN_STYLE", NumArgs: 2, Precedence: 40, Handler: assignStyleOperator}
-var assignVariableOpType = &operationType{Type: "ASSIGN_VARIABLE", NumArgs: 2, Precedence: 40, Handler: useWithPipe}
+var assignVariableOpType = &operationType{Type: "ASSIGN_VARIABLE", NumArgs: 2, Precedence: 40, Handler: assignVariableOperator}
 var assignTagOpType = &operationType{Type: "ASSIGN_TAG", NumArgs: 2, Precedence: 40, Handler: assignTagOperator}
 var assignCommentOpType = &operationType{Type: "ASSIGN_COMMENT", NumArgs: 2, Precedence: 40, Handler: assignCommentsOperator}
 var assignAnchorOpType = &operationType{Type: "ASSIGN_ANCHOR", NumArgs: 2, Precedence: 40, Handler: assignAnchorOperator}
@@ -80,8 +80,6 @@ var lengthOpType = &operationType{Type: "LENGTH", NumArgs: 0, Precedence: 50, Ha
 var lineOpType = &operationType{Type: "LINE", NumArgs: 0, Precedence: 50, Handler: lineOperator}
 var columnOpType = &operationType{Type: "LINE", NumArgs: 0, Precedence: 50, Handler: columnOperator}

-var expressionOpType = &operationType{Type: "EXP", NumArgs: 0, Precedence: 50, Handler: expressionOperator}
-
 var collectOpType = &operationType{Type: "COLLECT", NumArgs: 1, Precedence: 50, Handler: collectOperator}
 var mapOpType = &operationType{Type: "MAP", NumArgs: 1, Precedence: 50, Handler: mapOperator}
 var errorOpType = &operationType{Type: "ERROR", NumArgs: 1, Precedence: 50, Handler: errorOperator}
@@ -93,8 +91,6 @@ var formatDateTimeOpType = &operationType{Type: "FORMAT_DATE_TIME", NumArgs: 1,
 var withDtFormatOpType = &operationType{Type: "WITH_DATE_TIME_FORMAT", NumArgs: 1, Precedence: 50, Handler: withDateTimeFormat}
 var nowOpType = &operationType{Type: "NOW", NumArgs: 0, Precedence: 50, Handler: nowOp}
 var tzOpType = &operationType{Type: "TIMEZONE", NumArgs: 1, Precedence: 50, Handler: tzOp}
-var fromUnixOpType = &operationType{Type: "FROM_UNIX", NumArgs: 0, Precedence: 50, Handler: fromUnixOp}
-var toUnixOpType = &operationType{Type: "TO_UNIX", NumArgs: 0, Precedence: 50, Handler: toUnixOp}

 var encodeOpType = &operationType{Type: "ENCODE", NumArgs: 0, Precedence: 50, Handler: encodeOperator}
 var decodeOpType = &operationType{Type: "DECODE", NumArgs: 0, Precedence: 50, Handler: decodeOperator}
@@ -135,7 +131,6 @@ var explodeOpType = &operationType{Type: "EXPLODE", NumArgs: 1, Precedence: 50,
 var sortByOpType = &operationType{Type: "SORT_BY", NumArgs: 1, Precedence: 50, Handler: sortByOperator}
 var reverseOpType = &operationType{Type: "REVERSE", NumArgs: 0, Precedence: 50, Handler: reverseOperator}
 var sortOpType = &operationType{Type: "SORT", NumArgs: 0, Precedence: 50, Handler: sortOperator}
-var shuffleOpType = &operationType{Type: "SHUFFLE", NumArgs: 0, Precedence: 50, Handler: shuffleOperator}

 var sortKeysOpType = &operationType{Type: "SORT_KEYS", NumArgs: 1, Precedence: 50, Handler: sortKeysOperator}

@@ -158,7 +153,6 @@ var traverseArrayOpType = &operationType{Type: "TRAVERSE_ARRAY", NumArgs: 2, Pre

 var selfReferenceOpType = &operationType{Type: "SELF", NumArgs: 0, Precedence: 55, Handler: selfOperator}
 var valueOpType = &operationType{Type: "VALUE", NumArgs: 0, Precedence: 50, Handler: valueOperator}
-var referenceOpType = &operationType{Type: "REF", NumArgs: 0, Precedence: 50, Handler: referenceOperator}
 var envOpType = &operationType{Type: "ENV", NumArgs: 0, Precedence: 50, Handler: envOperator}
 var notOpType = &operationType{Type: "NOT", NumArgs: 0, Precedence: 50, Handler: notOperator}
 var emptyOpType = &operationType{Type: "EMPTY", Precedence: 50, Handler: emptyOperator}
@@ -239,13 +233,13 @@ func guessTagFromCustomType(node *yaml.Node) string {
 	if strings.HasPrefix(node.Tag, "!!") {
 		return node.Tag
 	} else if node.Value == "" {
-		log.Debug("guessTagFromCustomType: node has no value to guess the type with")
+		log.Warning("node has no value to guess the type with")
 		return node.Tag
 	}
 	dataBucket, errorReading := parseSnippet(node.Value)

 	if errorReading != nil {
-		log.Debug("guessTagFromCustomType: could not guess underlying tag type %v", errorReading)
+		log.Warning("could not guess underlying tag type %v", errorReading)
 		return node.Tag
 	}
 	guessedTag := unwrapDoc(dataBucket).Tag
@@ -254,28 +248,16 @@ func guessTagFromCustomType(node *yaml.Node) string {
 }

 func parseSnippet(value string) (*yaml.Node, error) {
-	if value == "" {
-		return &yaml.Node{
-			Kind: yaml.ScalarNode,
-			Tag:  "!!null",
-		}, nil
-	}
 	decoder := NewYamlDecoder(ConfiguredYamlPreferences)
 	err := decoder.Init(strings.NewReader(value))
 	if err != nil {
 		return nil, err
 	}
 	parsedNode, err := decoder.Decode()
-	if err != nil {
-		return nil, err
-	}
 	if len(parsedNode.Node.Content) == 0 {
 		return nil, fmt.Errorf("bad data")
 	}
-	result := unwrapDoc(parsedNode.Node)
-	result.Line = 0
-	result.Column = 0
-	return result, err
+	return unwrapDoc(parsedNode.Node), err
 }

 func recursiveNodeEqual(lhs *yaml.Node, rhs *yaml.Node) bool {
@@ -370,8 +352,8 @@ func parseInt(numberString string) (int, error) {

 	if err != nil {
 		return 0, err
-	} else if parsed > math.MaxInt || parsed < math.MinInt {
-		return 0, fmt.Errorf("%v is not within [%v, %v]", parsed, math.MinInt, math.MaxInt)
+	} else if parsed > math.MaxInt {
+		return 0, fmt.Errorf("%v is too big (larger than %v)", parsed, math.MaxInt)
 	}

 	return int(parsed), err
@@ -420,7 +402,6 @@ func footComment(node *yaml.Node) string {
 }

 func createValueOperation(value interface{}, stringValue string) *Operation {
-	log.Debug("creating value op for string %v", stringValue)
 	var node = createScalarNode(value, stringValue)

 	return &Operation{
@@ -1,11 +1,6 @@
 package yqlib

-import (
-	"testing"
-
-	"github.com/mikefarah/yq/v4/test"
-	yaml "gopkg.in/yaml.v3"
-)
+import "testing"

 func TestGetLogger(t *testing.T) {
 	l := GetLogger()
@@ -13,92 +8,3 @@ func TestGetLogger(t *testing.T) {
 		t.Fatal("GetLogger should return the yq logger instance, not a copy")
 	}
 }
-
-type parseSnippetScenario struct {
-	snippet       string
-	expected      *yaml.Node
-	expectedError string
-}
-
-var parseSnippetScenarios = []parseSnippetScenario{
-	{
-		snippet:       ":",
-		expectedError: "yaml: did not find expected key",
-	},
-	{
-		snippet: "",
-		expected: &yaml.Node{
-			Kind: yaml.ScalarNode,
-			Tag:  "!!null",
-		},
-	},
-	{
-		snippet: "null",
-		expected: &yaml.Node{
-			Kind:   yaml.ScalarNode,
-			Tag:    "!!null",
-			Value:  "null",
-			Line:   0,
-			Column: 0,
-		},
-	},
-	{
-		snippet: "3",
-		expected: &yaml.Node{
-			Kind:   yaml.ScalarNode,
-			Tag:    "!!int",
-			Value:  "3",
-			Line:   0,
-			Column: 0,
-		},
-	},
-	{
-		snippet: "cat",
-		expected: &yaml.Node{
-			Kind:   yaml.ScalarNode,
-			Tag:    "!!str",
-			Value:  "cat",
-			Line:   0,
-			Column: 0,
-		},
-	},
-	{
-		snippet: "3.1",
-		expected: &yaml.Node{
-			Kind:   yaml.ScalarNode,
-			Tag:    "!!float",
-			Value:  "3.1",
-			Line:   0,
-			Column: 0,
-		},
-	},
-	{
-		snippet: "true",
-		expected: &yaml.Node{
-			Kind:   yaml.ScalarNode,
-			Tag:    "!!bool",
-			Value:  "true",
-			Line:   0,
-			Column: 0,
-		},
-	},
-}
-
-func TestParseSnippet(t *testing.T) {
-	for _, tt := range parseSnippetScenarios {
-		actual, err := parseSnippet(tt.snippet)
-		if tt.expectedError != "" {
-			if err == nil {
-				t.Errorf("Expected error '%v' but it worked!", tt.expectedError)
-			} else {
-				test.AssertResultComplexWithContext(t, tt.expectedError, err.Error(), tt.snippet)
-			}
-			return
-		}
-		if err != nil {
-			t.Error(tt.snippet)
-			t.Error(err)
-		}
-		test.AssertResultComplexWithContext(t, tt.expected, actual, tt.snippet)
-	}
-}
@@ -98,7 +98,7 @@ func addScalars(context Context, target *CandidateNode, lhs *yaml.Node, rhs *yam

 	// if the lhs is a string, it might be a timestamp in a custom format.
 	if lhsTag == "!!str" && context.GetDateTimeLayout() != time.RFC3339 {
-		_, err := parseDateTime(context.GetDateTimeLayout(), lhs.Value)
+		_, err := time.Parse(context.GetDateTimeLayout(), lhs.Value)
 		isDateTime = err == nil
 	}

@@ -152,7 +152,7 @@ func addDateTimes(layout string, target *CandidateNode, lhs *yaml.Node, rhs *yam
 		return fmt.Errorf("unable to parse duration [%v]: %w", rhs.Value, err)
 	}

-	currentTime, err := parseDateTime(layout, lhs.Value)
+	currentTime, err := time.Parse(layout, lhs.Value)
 	if err != nil {
 		return err
 	}
@@ -34,7 +34,7 @@ var addOperatorScenarios = []expressionScenario{
 	{
 		skipDoc:    true,
 		document:   `{}`,
-		expression: "(.a + .b) as $x | .",
+		expression: "(.a + .b) as $x",
 		expected: []string{
 			"D0, P[], (doc)::{}\n",
 		},
@@ -101,14 +101,6 @@ var addOperatorScenarios = []expressionScenario{
 			"D0, P[], (doc)::a: ['dog', 'cat']\n",
 		},
 	},
-	{
-		description: "Prepend to existing array",
-		document:    `a: [dog]`,
-		expression:  `.a = ["cat"] + .a`,
-		expected: []string{
-			"D0, P[], (doc)::a: [cat, dog]\n",
-		},
-	},
 	{
 		skipDoc:        true,
 		description:    "Concatenate to existing array",
@@ -260,15 +252,6 @@ var addOperatorScenarios = []expressionScenario{
 			"D0, P[], (doc)::a: 2021-01-01T03:10:00Z\n",
 		},
 	},
-	{
-		description: "Date addition -date only",
-		skipDoc:     true,
-		document:    `a: 2021-01-01`,
-		expression:  `.a += "24h"`,
-		expected: []string{
-			"D0, P[], (doc)::a: 2021-01-02T00:00:00Z\n",
-		},
-	},
 	{
 		description:    "Date addition - custom format",
 		subdescription: "You can add durations to dates. See [date-time operators](https://mikefarah.gitbook.io/yq/operators/date-time-operators) for more information.",
@@ -16,7 +16,7 @@ var alternativeOperatorScenarios = []expressionScenario{
 	},
 	{
 		skipDoc:    true,
-		expression: `(.b // "hello") as $x | .`,
+		expression: `(.b // "hello") as $x`,
 		document:   `a: bridge`,
 		expected: []string{
 			"D0, P[], (doc)::a: bridge\n",
@@ -2,7 +2,6 @@ package yqlib

 import (
 	"container/list"
-	"fmt"

 	yaml "gopkg.in/yaml.v3"
 )
@@ -245,9 +244,6 @@ func applyAlias(node *yaml.Node, alias *yaml.Node, aliasIndex int, newContent Co
 	if alias == nil {
 		return nil
 	}
-	if alias.Kind != yaml.MappingNode {
-		return fmt.Errorf("merge anchor only supports maps, got %v instead", alias.Tag)
-	}
 	for index := 0; index < len(alias.Content); index = index + 2 {
 		keyNode := alias.Content[index]
 		log.Debugf("applying alias key %v", keyNode.Value)
@@ -12,7 +12,8 @@ var specDocument = `- &CENTER { x: 1, y: 2 }

 var expectedSpecResult = "D0, P[4], (!!map)::x: 1\ny: 2\nr: 10\n"

-var simpleArrayRef = `item_value: &item_value
+var simpleArrayRef = `
+item_value: &item_value
  value: true

 thingOne:
@@ -35,13 +36,6 @@ thingTwo:
 `

 var anchorOperatorScenarios = []expressionScenario{
-	{
-		skipDoc:       true,
-		description:   "merge anchor not map",
-		document:      "a: &a\n  - 0\nc:\n  <<: [*a]\n",
-		expectedError: "merge anchor only supports maps, got !!seq instead",
-		expression:    "explode(.)",
-	},
 	{
 		description:    "Merge one map",
 		subdescription: "see https://yaml.org/type/merge.html",
@@ -1,23 +0,0 @@
-package yqlib
-
-import (
-	"testing"
-)
-
-var arrayToMapScenarios = []expressionScenario{
-	{
-		description: "Simple example",
-		document:    `cool: [null, null, hello]`,
-		expression:  `.cool |= array_to_map`,
-		expected: []string{
-			"D0, P[], (doc)::cool:\n    2: hello\n",
-		},
-	},
-}
-
-func TestArrayToMapScenarios(t *testing.T) {
-	for _, tt := range arrayToMapScenarios {
-		testScenario(t, &tt)
-	}
-	documentOperatorScenarios(t, "array-to-map", arrayToMapScenarios)
-}
@@ -102,7 +102,7 @@ var booleanOperatorScenarios = []expressionScenario{
 	{
 		skipDoc:    true,
 		document:   `[{pet: cat}]`,
-		expression: `any_c(.name == "harry") as $c | .`,
+		expression: `any_c(.name == "harry") as $c`,
 		expected: []string{
 			"D0, P[], (doc)::[{pet: cat}]\n",
 		},
@@ -110,17 +110,9 @@ var booleanOperatorScenarios = []expressionScenario{
 	{
 		skipDoc:    true,
 		document:   `[{pet: cat}]`,
-		expression: `any_c(.name == "harry") as $c | $c`,
+		expression: `all_c(.name == "harry") as $c`,
 		expected: []string{
-			"D0, P[], (!!bool)::false\n",
-		},
-	},
-	{
-		skipDoc:    true,
-		document:   `[{pet: cat}]`,
-		expression: `all_c(.name == "harry") as $c | $c`,
-		expected: []string{
-			"D0, P[], (!!bool)::false\n",
+			"D0, P[], (doc)::[{pet: cat}]\n",
 		},
 	},
 	{
@@ -193,7 +185,7 @@ var booleanOperatorScenarios = []expressionScenario{
 	{
 		skipDoc:    true,
 		document:   `{}`,
-		expression: `(.a.b or .c) as $x | .`,
+		expression: `(.a.b or .c) as $x`,
 		expected: []string{
 			"D0, P[], (doc)::{}\n",
 		},
@@ -201,7 +193,7 @@ var booleanOperatorScenarios = []expressionScenario{
 	{
 		skipDoc:    true,
 		document:   `{}`,
-		expression: `(.a.b and .c) as $x | .`,
+		expression: `(.a.b and .c) as $x`,
 		expected: []string{
 			"D0, P[], (doc)::{}\n",
 		},
@@ -221,7 +221,7 @@ var commentOperatorScenarios = []expressionScenario{
 		document:              "# welcome!\n\na: cat # meow\n\n# have a great day",
 		expression:            `. | head_comment`,
 		expected: []string{
-			"D0, P[], (!!str)::welcome!\n\n",
+			"D0, P[], (!!str)::welcome!\n",
 		},
 	},
 	{
@@ -33,15 +33,6 @@ var containsOperatorScenarios = []expressionScenario{
 			"D0, P[], (!!bool)::true\n",
 		},
 	},
-	{
-		description:    "Array has a subset array",
-		subdescription: "Subtract the superset array from the subset, if there's anything left, it's not a subset",
-		document:       `["foobar", "foobaz", "blarp"]`,
-		expression:     `["baz", "bar"] - . | length == 0`,
-		expected: []string{
-			"D0, P[], (!!bool)::false\n",
-		},
-	},
 	{
 		skipDoc:    true,
 		expression: `["dog", "cat", "giraffe"] | contains(["camel"])`,
@@ -4,7 +4,6 @@ import (
 	"container/list"
 	"errors"
 	"fmt"
-	"strconv"
 	"time"

 	"gopkg.in/yaml.v3"
@@ -51,17 +50,6 @@ func nowOp(d *dataTreeNavigator, context Context, expressionNode *ExpressionNode

 }

-func parseDateTime(layout string, datestring string) (time.Time, error) {
-
-	parsedTime, err := time.Parse(layout, datestring)
-	if err != nil && layout == time.RFC3339 {
-		// try parsing the date time with only the date
-		return time.Parse("2006-01-02", datestring)
-	}
-	return parsedTime, err
-
-}
-
 func formatDateTime(d *dataTreeNavigator, context Context, expressionNode *ExpressionNode) (Context, error) {
 	format, err := getStringParamter("format", d, context, expressionNode.RHS)
 	layout := context.GetDateTimeLayout()
@@ -74,7 +62,7 @@ func formatDateTime(d *dataTreeNavigator, context Context, expressionNode *Expre
 	for el := context.MatchingNodes.Front(); el != nil; el = el.Next() {
 		candidate := el.Value.(*CandidateNode)

-		parsedTime, err := parseDateTime(layout, candidate.Node.Value)
+		parsedTime, err := time.Parse(layout, candidate.Node.Value)
 		if err != nil {
 			return Context{}, fmt.Errorf("could not parse datetime of [%v]: %w", candidate.GetNicePath(), err)
 		}
@@ -113,7 +101,7 @@ func tzOp(d *dataTreeNavigator, context Context, expressionNode *ExpressionNode)
 	for el := context.MatchingNodes.Front(); el != nil; el = el.Next() {
 		candidate := el.Value.(*CandidateNode)

-		parsedTime, err := parseDateTime(layout, candidate.Node.Value)
+		parsedTime, err := time.Parse(layout, candidate.Node.Value)
 		if err != nil {
 			return Context{}, fmt.Errorf("could not parse datetime of [%v] using layout [%v]: %w", candidate.GetNicePath(), layout, err)
 		}
@@ -130,69 +118,3 @@ func tzOp(d *dataTreeNavigator, context Context, expressionNode *ExpressionNode)

 	return context.ChildContext(results), nil
 }
-
-func parseUnixTime(unixTime string) (time.Time, error) {
-	seconds, err := strconv.ParseFloat(unixTime, 64)
-
-	if err != nil {
-		return time.Now(), err
-	}
-
-	return time.UnixMilli(int64(seconds * 1000)), nil
-}
-
-func fromUnixOp(d *dataTreeNavigator, context Context, expressionNode *ExpressionNode) (Context, error) {
-
-	var results = list.New()
-
-	for el := context.MatchingNodes.Front(); el != nil; el = el.Next() {
-		candidate := el.Value.(*CandidateNode)
-
-		actualTag := guessTagFromCustomType(candidate.Node)
-
-		if actualTag != "!!int" && guessTagFromCustomType(candidate.Node) != "!!float" {
-			return Context{}, fmt.Errorf("from_unix only works on numbers, found %v instead", candidate.Node.Tag)
-		}
-
-		parsedTime, err := parseUnixTime(candidate.Node.Value)
-		if err != nil {
-			return Context{}, err
-		}
-
-		node := &yaml.Node{
-			Kind:  yaml.ScalarNode,
-			Tag:   "!!timestamp",
-			Value: parsedTime.Format(time.RFC3339),
-		}
-
-		results.PushBack(candidate.CreateReplacement(node))
-	}
-
-	return context.ChildContext(results), nil
-}
-
-func toUnixOp(d *dataTreeNavigator, context Context, expressionNode *ExpressionNode) (Context, error) {
-
-	layout := context.GetDateTimeLayout()
-
-	var results = list.New()
-
-	for el := context.MatchingNodes.Front(); el != nil; el = el.Next() {
-		candidate := el.Value.(*CandidateNode)
-
-		parsedTime, err := parseDateTime(layout, candidate.Node.Value)
-		if err != nil {
-			return Context{}, fmt.Errorf("could not parse datetime of [%v] using layout [%v]: %w", candidate.GetNicePath(), layout, err)
-		}
-
-		node := &yaml.Node{
-			Kind:  yaml.ScalarNode,
-			Tag:   "!!int",
-			Value: fmt.Sprintf("%v", parsedTime.Unix()),
-		}
-
-		results.PushBack(candidate.CreateReplacement(node))
-	}
-
-	return context.ChildContext(results), nil
-}
@@ -25,7 +25,7 @@ var dateTimeOperatorScenarios = []expressionScenario{
 	},
 	{
 		description: "Format: get the day of the week",
-		document:    `a: 2001-12-15`,
+		document:    `a: 2001-12-15T02:59:43.1Z`,
 		expression:  `.a | format_datetime("Monday")`,
 		expected: []string{
 			"D0, P[a], (!!str)::Saturday\n",
@@ -39,22 +39,6 @@ var dateTimeOperatorScenarios = []expressionScenario{
 			"D0, P[], (doc)::a: cool\nupdated: 2021-05-19T01:02:03Z\n",
 		},
 	},
-	{
-		description:    "From Unix",
-		subdescription: "Converts from unix time. Note, you don't have to pipe through the tz operator :)",
-		expression:     `1675301929 | from_unix | tz("UTC")`,
-		expected: []string{
-			"D0, P[], (!!timestamp)::2023-02-02T01:38:49Z\n",
-		},
-	},
-	{
-		description:    "To Unix",
-		subdescription: "Converts to unix time",
-		expression:     `now | to_unix`,
-		expected: []string{
-			"D0, P[], (!!int)::1621386123\n",
-		},
-	},
 	{
 		description:    "Timezone: from standard RFC3339 format",
 		subdescription: "Returns a new datetime in the specified timezone. Specify standard IANA Time Zone format or 'utc', 'local'. When given a single parameter, this assumes the datetime is in RFC3339 format.",
@@ -13,7 +13,7 @@ import (
 func configureEncoder(format PrinterOutputFormat, indent int) Encoder {
 	switch format {
 	case JSONOutputFormat:
-		return NewJSONEncoder(indent, false, false)
+		return NewJSONEncoder(indent, false)
 	case PropsOutputFormat:
 		return NewPropertiesEncoder(true)
 	case CSVOutputFormat:
@@ -26,10 +26,6 @@ func configureEncoder(format PrinterOutputFormat, indent int) Encoder {
 		return NewXMLEncoder(indent, ConfiguredXMLPreferences)
 	case Base64OutputFormat:
 		return NewBase64Encoder()
-	case UriOutputFormat:
-		return NewUriEncoder()
-	case ShOutputFormat:
-		return NewShEncoder()
 	}
 	panic("invalid encoder")
 }
@@ -117,8 +113,6 @@ func decodeOperator(d *dataTreeNavigator, context Context, expressionNode *Expre
 		decoder = NewCSVObjectDecoder(',')
 	case TSVObjectInputFormat:
 		decoder = NewCSVObjectDecoder('\t')
-	case UriInputFormat:
-		decoder = NewUriDecoder()
 	}

 	var results = list.New()
@@ -194,7 +194,7 @@ var encoderDecoderOperatorScenarios = []expressionScenario{
 	},
 	{
 		description: "Encode value as xml string",
-		document:    `{a: {cool: {foo: "bar", +@id: hi}}}`,
+		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",
@@ -202,7 +202,7 @@ var encoderDecoderOperatorScenarios = []expressionScenario{
 	},
 	{
 		description: "Encode value as xml string on a single line",
-		document:    `{a: {cool: {foo: "bar", +@id: hi}}}`,
+		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",
@@ -210,7 +210,7 @@ var encoderDecoderOperatorScenarios = []expressionScenario{
 	},
 	{
 		description: "Encode value as xml string with custom indentation",
-		document:    `{a: {cool: {foo: "bar", +@id: hi}}}`,
+		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",
@@ -241,41 +241,6 @@ var encoderDecoderOperatorScenarios = []expressionScenario{
 			"D0, P[], (!!str)::YTogYXBwbGUK\n",
 		},
 	},
-	{
-		description: "Encode a string to uri",
-		document:    "coolData: this has & special () characters *",
-		expression:  ".coolData | @uri",
-		expected: []string{
-			"D0, P[coolData], (!!str)::this+has+%26+special+%28%29+characters+%2A\n",
-		},
-	},
-	{
-		description: "Decode a URI to a string",
-		document:    "this+has+%26+special+%28%29+characters+%2A",
-		expression:  "@urid",
-		expected: []string{
-			"D0, P[], (!!str)::this has & special () characters *\n",
-		},
-	},
-	{
-		description:    "Encode a string to sh",
-		subdescription: "Sh/Bash friendly string",
-		document:       "coolData: strings with spaces and a 'quote'",
-		expression:     ".coolData | @sh",
-		expected: []string{
-			"D0, P[coolData], (!!str)::strings' with spaces and a '\\'quote\\'\n",
-		},
-	},
-	{
-		description:    "Encode a string to sh",
-		subdescription: "Watch out for stray '' (empty strings)",
-		document:       "coolData: \"'starts, contains more '' and ends with a quote'\"",
-		expression:     ".coolData | @sh",
-		expected: []string{
-			"D0, P[coolData], (!!str)::\\'starts,' contains more '\\'\\'' and ends with a quote'\\'\n",
-		},
-		skipDoc: true,
-	},
 	{
 		description:    "Decode a base64 encoded string",
 		subdescription: "Decoded data is assumed to be a string.",
@@ -4,7 +4,7 @@ import "gopkg.in/yaml.v3"

 func equalsOperator(d *dataTreeNavigator, context Context, expressionNode *ExpressionNode) (Context, error) {
 	log.Debugf("-- equalsOperation")
-	return crossFunction(d, context, expressionNode, isEquals(false), true)
+	return crossFunction(d, context.ReadOnlyClone(), expressionNode, isEquals(false), true)
 }

 func isEquals(flip bool) func(d *dataTreeNavigator, context Context, lhs *CandidateNode, rhs *CandidateNode) (*CandidateNode, error) {
@@ -9,14 +9,7 @@ var equalsOperatorScenarios = []expressionScenario{
 		skipDoc:    true,
 		expression: ".a == .b",
 		expected: []string{
-			"D0, P[a], (!!bool)::true\n",
-		},
-	},
-	{
-		expression: `(.k | length) == 0`,
-		skipDoc:    true,
-		expected: []string{
-			"D0, P[k], (!!bool)::true\n",
+			"D0, P[], (!!bool)::true\n",
 		},
 	},
 	{
@@ -32,7 +25,7 @@ var equalsOperatorScenarios = []expressionScenario{
 		document:   `a: cat`,
 		expression: ".b == .a",
 		expected: []string{
-			"D0, P[b], (!!bool)::false\n",
+			"D0, P[a], (!!bool)::false\n",
 		},
 	},
 	{
@@ -47,7 +40,7 @@ var equalsOperatorScenarios = []expressionScenario{
 	{
 		skipDoc:    true,
 		document:   "{}",
-		expression: "(.a == .b) as $x | .",
+		expression: "(.a == .b) as $x",
 		expected: []string{
 			"D0, P[], (doc)::{}\n",
 		},
@@ -57,13 +50,13 @@ var equalsOperatorScenarios = []expressionScenario{
 		document:   "{}",
 		expression: ".a == .b",
 		expected: []string{
-			"D0, P[a], (!!bool)::true\n",
+			"D0, P[], (!!bool)::true\n",
 		},
 	},
 	{
 		skipDoc:    true,
 		document:   "{}",
-		expression: "(.a != .b) as $x | .",
+		expression: "(.a != .b) as $x",
 		expected: []string{
 			"D0, P[], (doc)::{}\n",
 		},
@@ -1,16 +0,0 @@
-package yqlib
-
-type expressionOpPreferences struct {
-	expression string
-}
-
-func expressionOperator(d *dataTreeNavigator, context Context, expressionNode *ExpressionNode) (Context, error) {
-
-	prefs := expressionNode.Operation.Preferences.(expressionOpPreferences)
-	expNode, err := ExpressionParser.ParseExpression(prefs.expression)
-	if err != nil {
-		return Context{}, err
-	}
-
-	return d.GetMatchingNodes(context, expNode)
-}
@@ -16,7 +16,7 @@ var hasOperatorScenarios = []expressionScenario{
 	{
 		skipDoc:    true,
 		document:   `a: hello`,
-		expression: `has(.b) as $c | .`,
+		expression: `has(.b) as $c`,
 		expected: []string{
 			"D0, P[], (doc)::a: hello\n",
 		},
@@ -9,13 +9,6 @@ import (
 	"gopkg.in/yaml.v3"
 )

-var LoadYamlPreferences = YamlPreferences{
-	LeadingContentPreProcessing: false,
-	PrintDocSeparators:          true,
-	UnwrapScalar:                true,
-	EvaluateTogether:            false,
-}
-
 type loadPrefs struct {
 	loadAsString bool
 	decoder      Decoder
@@ -50,8 +43,7 @@ func loadYaml(filename string, decoder Decoder) (*CandidateNode, error) {
 		// return null candidate
 		return &CandidateNode{Node: &yaml.Node{Kind: yaml.ScalarNode, Tag: "!!null"}}, nil
 	} else if documents.Len() == 1 {
-		candidate := documents.Front().Value.(*CandidateNode)
-		return candidate, nil
+		return documents.Front().Value.(*CandidateNode), nil

 	} else {
 		sequenceNode := &CandidateNode{Node: &yaml.Node{Kind: yaml.SequenceNode}}
@@ -13,15 +13,6 @@ var loadScenarios = []expressionScenario{
 			"D0, P[], (doc)::# comment\n\n",
 		},
 	},
-	{
-		skipDoc:     true,
-		description: "Load file with a header comment into an array",
-		document:    `- "../../examples/small.yaml"`,
-		expression:  `.[] |= load(.)`,
-		expected: []string{
-			"D0, P[], (doc)::- # comment\n  # about things\n  a: cat\n",
-		},
-	},
 	{
 		skipDoc:     true,
 		description: "Load empty file with no comment",
@@ -60,14 +60,8 @@ func multiply(preferences multiplyPreferences) func(d *dataTreeNavigator, contex
 		log.Debugf("Multiplying LHS: %v", lhs.Node.Tag)
 		log.Debugf("-          RHS: %v", rhs.Node.Tag)

-		if rhs.Node.Tag == "!!null" {
-			return lhs.Copy()
-		}
-
-		if (lhs.Node.Kind == yaml.MappingNode && rhs.Node.Kind == yaml.MappingNode) ||
-			(lhs.Node.Tag == "!!null" && rhs.Node.Kind == yaml.MappingNode) ||
-			(lhs.Node.Kind == yaml.SequenceNode && rhs.Node.Kind == yaml.SequenceNode) ||
-			(lhs.Node.Tag == "!!null" && rhs.Node.Kind == yaml.SequenceNode) {
+		if lhs.Node.Kind == yaml.MappingNode && rhs.Node.Kind == yaml.MappingNode ||
+			(lhs.Node.Kind == yaml.SequenceNode && rhs.Node.Kind == yaml.SequenceNode) {
 			var newBlank = CandidateNode{}
 			err := copier.CopyWithOption(&newBlank, lhs, copier.Option{IgnoreEmpty: true, DeepCopy: true})
 			if err != nil {
@@ -195,7 +189,7 @@ func applyAssignment(d *dataTreeNavigator, context Context, pathIndexToStartFrom
 	} else {
 		log.Debugf("merge - assignmentOp := &Operation{OperationType: assignAttributesOpType}")
 	}
-	rhsOp := &Operation{OperationType: referenceOpType, CandidateNode: rhs}
+	rhsOp := &Operation{OperationType: valueOpType, CandidateNode: rhs}

 	assignmentOpNode := &ExpressionNode{
 		Operation: assignmentOp,
@@ -108,7 +108,7 @@ var multiplyOperatorScenarios = []expressionScenario{
 		document2:  docNoComments,
 		expression: `select(fi == 0) * select(fi == 1)`,
 		expected: []string{
-			"D0, P[], (!!map)::# here\n\na: apple\nb: banana\n",
+			"D0, P[], (!!map)::# here\na: apple\nb: banana\n",
 		},
 	},
 	{
@@ -126,7 +126,7 @@ var multiplyOperatorScenarios = []expressionScenario{
 		document2:  docWithHeader,
 		expression: `select(fi == 0) * select(fi == 1)`,
 		expected: []string{
-			"D0, P[], (!!map)::# here\n\nb: banana\na: apple\n",
+			"D0, P[], (!!map)::# here\nb: banana\na: apple\n",
 		},
 	},
 	{
@@ -579,41 +579,6 @@ var multiplyOperatorScenarios = []expressionScenario{
 			"D0, P[], (doc)::a: {a: apple is included, b: cool.}\n",
 		},
 	},
-	{
-		description: "Merging a null with a map",
-		expression:  `null * {"some": "thing"}`,
-		expected: []string{
-			"D0, P[], (!!map)::some: thing\n",
-		},
-	},
-	{
-		description: "Merging a map with null",
-		expression:  `{"some": "thing"} * null`,
-		expected: []string{
-			"D0, P[], (!!map)::some: thing\n",
-		},
-	},
-	{
-		description: "Merging an null with an array",
-		expression:  `null * ["some"]`,
-		expected: []string{
-			"D0, P[], (!!seq)::- some\n",
-		},
-	},
-	{
-		description: "Merging an array with null",
-		expression:  `["some"] * null`,
-		expected: []string{
-			"D0, P[], (!!seq)::- some\n",
-		},
-	},
-	{
-		skipDoc:    true,
-		expression: `null * null`,
-		expected: []string{
-			"D0, P[], (!!null)::null\n",
-		},
-	},
 }

 func TestMultiplyOperatorScenarios(t *testing.T) {
@@ -81,7 +81,7 @@ func setPathOperator(d *dataTreeNavigator, context Context, expressionNode *Expr
 			return Context{}, fmt.Errorf("SETPATH: expected single value on RHS but found %v", targetContextValue.MatchingNodes.Len())
 		}

-		rhsOp := &Operation{OperationType: referenceOpType, CandidateNode: targetContextValue.MatchingNodes.Front().Value.(*CandidateNode)}
+		rhsOp := &Operation{OperationType: valueOpType, CandidateNode: targetContextValue.MatchingNodes.Front().Value.(*CandidateNode)}

 		assignmentOpNode := &ExpressionNode{
 			Operation: assignmentOp,
@@ -4,16 +4,6 @@ import (
 	"testing"
 )

-var documentToPrune = `
-parentA: bob
-parentB:
-  child1: i am child1
-  child2: i am child2
-parentC:
-  child1: me child1
-  child2: me child2
-`
-
 var pathOperatorScenarios = []expressionScenario{
 	{
 		description: "Map path",
@@ -88,15 +78,6 @@ var pathOperatorScenarios = []expressionScenario{
 			"D0, P[], ()::a:\n    b: things\n",
 		},
 	},
-	{
-		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,",
-		document:       documentToPrune,
-		expression:     "(.parentB.child2, .parentC.child1) as $i\n  ireduce({}; setpath($i | path; $i))",
-		expected: []string{
-			"D0, P[], (!!map)::parentB:\n    child2: i am child2\nparentC:\n    child1: me child1\n",
-		},
-	},
 	{
 		description: "Set array path",
 		document:    `a: [cat, frog]`,
@@ -2,9 +2,9 @@ package yqlib

 func pipeOperator(d *dataTreeNavigator, context Context, expressionNode *ExpressionNode) (Context, error) {

-	if expressionNode.LHS.Operation.OperationType == assignVariableOpType {
-		return variableLoop(d, context, expressionNode)
-	}
+	//lhs may update the variable context, we should pass that into the RHS
+	// BUT we still return the original context back (see jq)
+	// https://stedolan.github.io/jq/manual/#Variable/SymbolicBindingOperator:...as$identifier|...

 	lhs, err := d.GetMatchingNodes(context, expressionNode.LHS)
 	if err != nil {
@@ -76,10 +76,9 @@ var selectOperatorScenarios = []expressionScenario{
 		},
 	},
 	{
-		description: "select does not update the map",
-		skipDoc:     true,
-		document:    `[{animal: cat, legs: {cool: true}}, {animal: fish}]`,
-		expression:  `(.[] | select(.legs.cool == true).canWalk) = true | (.[] | .alive.things) = "yes"`,
+		skipDoc:    true,
+		document:   `[{animal: cat, legs: {cool: true}}, {animal: fish}]`,
+		expression: `(.[] | select(.legs.cool == true).canWalk) = true | (.[] | .alive.things) = "yes"`,
 		expected: []string{
 			"D0, P[], (doc)::[{animal: cat, legs: {cool: true}, canWalk: true, alive: {things: yes}}, {animal: fish, alive: {things: yes}}]\n",
 		},
@@ -1,37 +0,0 @@
-package yqlib
-
-import (
-	"container/list"
-	"fmt"
-	"math/rand"
-
-	yaml "gopkg.in/yaml.v3"
-)
-
-func shuffleOperator(d *dataTreeNavigator, context Context, expressionNode *ExpressionNode) (Context, error) {
-
-	// ignore CWE-338 gosec issue of not using crypto/rand
-	// this is just to shuffle an array rather generating a
-	// secret or something that needs proper rand.
-	myRand := rand.New(rand.NewSource(Now().UnixNano())) // #nosec
-
-	results := list.New()
-
-	for el := context.MatchingNodes.Front(); el != nil; el = el.Next() {
-		candidate := el.Value.(*CandidateNode)
-
-		candidateNode := unwrapDoc(candidate.Node)
-
-		if candidateNode.Kind != yaml.SequenceNode {
-			return context, fmt.Errorf("node at path [%v] is not an array (it's a %v)", candidate.GetNicePath(), candidate.GetNiceTag())
-		}
-
-		result := deepClone(candidateNode)
-
-		a := result.Content
-
-		myRand.Shuffle(len(a), func(i, j int) { a[i], a[j] = a[j], a[i] })
-		results.PushBack(candidate.CreateReplacement(result))
-	}
-	return context.ChildContext(results), nil
-}
@@ -1,30 +0,0 @@
-package yqlib
-
-import "testing"
-
-var shuffleOperatorScenarios = []expressionScenario{
-	{
-		description: "Shuffle array",
-		document:    "[1, 2, 3, 4, 5]",
-		expression:  `shuffle`,
-		expected: []string{
-			"D0, P[], (!!seq)::[5, 2, 4, 1, 3]\n",
-		},
-	},
-
-	{
-		description: "Shuffle array in place",
-		document:    "cool: [1, 2, 3, 4, 5]",
-		expression:  `.cool |= shuffle`,
-		expected: []string{
-			"D0, P[], (doc)::cool: [5, 2, 4, 1, 3]\n",
-		},
-	},
-}
-
-func TestShuffleByOperatorScenarios(t *testing.T) {
-	for _, tt := range shuffleOperatorScenarios {
-		testScenario(t, &tt)
-	}
-	documentOperatorScenarios(t, "shuffle", shuffleOperatorScenarios)
-}
@@ -1,74 +0,0 @@
-package yqlib
-
-import (
-	"container/list"
-	"fmt"
-
-	yaml "gopkg.in/yaml.v3"
-)
-
-func getSliceNumber(d *dataTreeNavigator, context Context, node *CandidateNode, expressionNode *ExpressionNode) (int, error) {
-	result, err := d.GetMatchingNodes(context.SingleChildContext(node), expressionNode)
-	if err != nil {
-		return 0, err
-	}
-	if result.MatchingNodes.Len() != 1 {
-		return 0, fmt.Errorf("expected to find 1 number, got %v instead", result.MatchingNodes.Len())
-	}
-	return parseInt(result.MatchingNodes.Front().Value.(*CandidateNode).Node.Value)
-}
-
-func sliceArrayOperator(d *dataTreeNavigator, context Context, expressionNode *ExpressionNode) (Context, error) {
-
-	log.Debug("slice array operator!")
-	log.Debug("lhs: %v", expressionNode.LHS.Operation.toString())
-	log.Debug("rhs: %v", expressionNode.RHS.Operation.toString())
-
-	results := list.New()
-
-	for el := context.MatchingNodes.Front(); el != nil; el = el.Next() {
-		lhsNode := el.Value.(*CandidateNode)
-		original := unwrapDoc(lhsNode.Node)
-
-		firstNumber, err := getSliceNumber(d, context, lhsNode, expressionNode.LHS)
-
-		if err != nil {
-			return Context{}, err
-		}
-		relativeFirstNumber := firstNumber
-		if relativeFirstNumber < 0 {
-			relativeFirstNumber = len(original.Content) + firstNumber
-		}
-
-		secondNumber, err := getSliceNumber(d, context, lhsNode, expressionNode.RHS)
-		if err != nil {
-			return Context{}, err
-		}
-
-		relativeSecondNumber := secondNumber
-		if relativeSecondNumber < 0 {
-			relativeSecondNumber = len(original.Content) + secondNumber
-		} else if relativeSecondNumber > len(original.Content) {
-			relativeSecondNumber = len(original.Content)
-		}
-
-		log.Debug("calculateIndicesToTraverse: slice from %v to %v", relativeFirstNumber, relativeSecondNumber)
-
-		var newResults []*yaml.Node
-		for i := relativeFirstNumber; i < relativeSecondNumber; i++ {
-			newResults = append(newResults, original.Content[i])
-		}
-
-		slicedArrayNode := &yaml.Node{
-			Kind:    yaml.SequenceNode,
-			Tag:     original.Tag,
-			Content: newResults,
-		}
-		results.PushBack(lhsNode.CreateReplacement(slicedArrayNode))
-
-	}
-
-	// result is now the context that has the nodes we need to put back into a sequence.
-	//what about multiple arrays in the context? I think we need to create an array for each one
-	return context.ChildContext(results), nil
-}
@@ -1,108 +0,0 @@
-package yqlib
-
-import "testing"
-
-var sliceArrayScenarios = []expressionScenario{
-	{
-		description: "Slicing arrays",
-		document:    `[cat, dog, frog, cow]`,
-		expression:  `.[1:3]`,
-		expected: []string{
-			"D0, P[], (!!seq)::- dog\n- frog\n",
-		},
-	},
-	{
-		description:    "Slicing arrays - without the first number",
-		subdescription: "Starts from the start of the array",
-		document:       `[cat, dog, frog, cow]`,
-		expression:     `.[:2]`,
-		expected: []string{
-			"D0, P[], (!!seq)::- cat\n- dog\n",
-		},
-	},
-	{
-		description:    "Slicing arrays - without the second number",
-		subdescription: "Finishes at the end of the array",
-		document:       `[cat, dog, frog, cow]`,
-		expression:     `.[2:]`,
-		expected: []string{
-			"D0, P[], (!!seq)::- frog\n- cow\n",
-		},
-	},
-	{
-		description: "Slicing arrays - use negative numbers to count backwards from the end",
-		document:    `[cat, dog, frog, cow]`,
-		expression:  `.[1:-1]`,
-		expected: []string{
-			"D0, P[], (!!seq)::- dog\n- frog\n",
-		},
-	},
-	{
-		description:    "Inserting into the middle of an array",
-		subdescription: "using an expression to find the index",
-		document:       `[cat, dog, frog, cow]`,
-		expression:     `(.[] | select(. == "dog") | key + 1) as $pos | .[0:($pos)] + ["rabbit"] + .[$pos:]`,
-		expected: []string{
-			"D0, P[], (!!seq)::- cat\n- dog\n- rabbit\n- frog\n- cow\n",
-		},
-	},
-	{
-		skipDoc:    true,
-		document:   `[[cat, dog, frog, cow], [apple, banana, grape, mango]]`,
-		expression: `.[] | .[1:3]`,
-		expected: []string{
-			"D0, P[0], (!!seq)::- dog\n- frog\n",
-			"D0, P[1], (!!seq)::- banana\n- grape\n",
-		},
-	},
-	{
-		skipDoc:     true,
-		description: "second index beyond array clamps",
-		document:    `[cat]`,
-		expression:  `.[:3]`,
-		expected: []string{
-			"D0, P[], (!!seq)::- cat\n",
-		},
-	},
-	{
-		skipDoc:     true,
-		description: "first index beyond array returns nothing",
-		document:    `[cat]`,
-		expression:  `.[3:]`,
-		expected: []string{
-			"D0, P[], (!!seq)::[]\n",
-		},
-	},
-	{
-		skipDoc:    true,
-		document:   `[[cat, dog, frog, cow], [apple, banana, grape, mango]]`,
-		expression: `.[] | .[-2:-1]`,
-		expected: []string{
-			"D0, P[0], (!!seq)::- frog\n",
-			"D0, P[1], (!!seq)::- grape\n",
-		},
-	},
-	{
-		skipDoc:    true,
-		document:   `[cat1, cat2, cat3, cat4, cat5, cat6, cat7, cat8, cat9, cat10, cat11]`,
-		expression: `.[10:11]`,
-		expected: []string{
-			"D0, P[], (!!seq)::- cat11\n",
-		},
-	},
-	{
-		skipDoc:    true,
-		document:   `[cat1, cat2, cat3, cat4, cat5, cat6, cat7, cat8, cat9, cat10, cat11]`,
-		expression: `.[-11:-10]`,
-		expected: []string{
-			"D0, P[], (!!seq)::- cat1\n",
-		},
-	},
-}
-
-func TestSliceOperatorScenarios(t *testing.T) {
-	for _, tt := range sliceArrayScenarios {
-		testScenario(t, &tt)
-	}
-	documentOperatorScenarios(t, "slice-array", sliceArrayScenarios)
-}
@@ -6,7 +6,6 @@ import (
 	"sort"
 	"strconv"
 	"strings"
-	"time"

 	yaml "gopkg.in/yaml.v3"
 )
@@ -42,7 +41,18 @@ func sortByOperator(d *dataTreeNavigator, context Context, expressionNode *Expre
 				return Context{}, err
 			}

-			sortableArray[i] = sortableNode{Node: originalNode, CompareContext: compareContext, dateTimeLayout: context.GetDateTimeLayout()}
+			nodeToCompare := &yaml.Node{Kind: yaml.ScalarNode, Tag: "!!null"}
+			if compareContext.MatchingNodes.Len() > 0 {
+				nodeToCompare = compareContext.MatchingNodes.Front().Value.(*CandidateNode).Node
+			}
+
+			log.Debug("going to compare %v by %v", NodeToString(candidate.CreateReplacement(originalNode)), NodeToString(candidate.CreateReplacement(nodeToCompare)))
+
+			sortableArray[i] = sortableNode{Node: originalNode, NodeToCompare: nodeToCompare}
+
+			if nodeToCompare.Kind != yaml.ScalarNode {
+				return Context{}, fmt.Errorf("sort only works for scalars, got %v", nodeToCompare.Tag)
+			}

 		}

@@ -60,9 +70,8 @@ func sortByOperator(d *dataTreeNavigator, context Context, expressionNode *Expre
 }

 type sortableNode struct {
-	Node           *yaml.Node
-	CompareContext Context
-	dateTimeLayout string
+	Node          *yaml.Node
+	NodeToCompare *yaml.Node
 }

 type sortableNodeArray []sortableNode
@@ -71,59 +80,18 @@ func (a sortableNodeArray) Len() int      { return len(a) }
 func (a sortableNodeArray) Swap(i, j int) { a[i], a[j] = a[j], a[i] }

 func (a sortableNodeArray) Less(i, j int) bool {
-	lhsContext := a[i].CompareContext
-	rhsContext := a[j].CompareContext
+	lhs := a[i].NodeToCompare
+	rhs := a[j].NodeToCompare

-	rhsEl := rhsContext.MatchingNodes.Front()
-	for lhsEl := lhsContext.MatchingNodes.Front(); lhsEl != nil && rhsEl != nil; lhsEl = lhsEl.Next() {
-		lhs := lhsEl.Value.(*CandidateNode)
-		rhs := rhsEl.Value.(*CandidateNode)
-
-		result := a.compare(lhs.Node, rhs.Node, a[i].dateTimeLayout)
-
-		if result < 0 {
-			return true
-		} else if result > 0 {
-			return false
-		}
-
-		rhsEl = rhsEl.Next()
-	}
-	return false
-}
-
-func (a sortableNodeArray) compare(lhs *yaml.Node, rhs *yaml.Node, dateTimeLayout string) int {
-	lhsTag := lhs.Tag
-	rhsTag := rhs.Tag
-
-	if !strings.HasPrefix(lhsTag, "!!") {
-		// custom tag - we have to have a guess
-		lhsTag = guessTagFromCustomType(lhs)
-	}
-
-	if !strings.HasPrefix(rhsTag, "!!") {
-		// custom tag - we have to have a guess
-		rhsTag = guessTagFromCustomType(rhs)
-	}
-
-	isDateTime := lhsTag == "!!timestamp" && rhsTag == "!!timestamp"
-	layout := dateTimeLayout
-	// if the lhs is a string, it might be a timestamp in a custom format.
-	if lhsTag == "!!str" && layout != time.RFC3339 {
-		_, errLhs := parseDateTime(layout, lhs.Value)
-		_, errRhs := parseDateTime(layout, rhs.Value)
-		isDateTime = errLhs == nil && errRhs == nil
-	}
-
-	if lhsTag == "!!null" && rhsTag != "!!null" {
-		return -1
-	} else if lhsTag != "!!null" && rhsTag == "!!null" {
-		return 1
-	} else if lhsTag == "!!bool" && rhsTag != "!!bool" {
-		return -1
-	} else if lhsTag != "!!bool" && rhsTag == "!!bool" {
-		return 1
-	} else if lhsTag == "!!bool" && rhsTag == "!!bool" {
+	if lhs.Tag == "!!null" && rhs.Tag != "!!null" {
+		return true
+	} else if lhs.Tag != "!!null" && rhs.Tag == "!!null" {
+		return false
+	} else if lhs.Tag == "!!bool" && rhs.Tag != "!!bool" {
+		return true
+	} else if lhs.Tag != "!!bool" && rhs.Tag == "!!bool" {
+		return false
+	} else if lhs.Tag == "!!bool" && rhs.Tag == "!!bool" {
 		lhsTruthy, err := isTruthyNode(lhs)
 		if err != nil {
 			panic(fmt.Errorf("could not parse %v as boolean: %w", lhs.Value, err))
@@ -133,31 +101,11 @@ func (a sortableNodeArray) compare(lhs *yaml.Node, rhs *yaml.Node, dateTimeLayou
 		if err != nil {
 			panic(fmt.Errorf("could not parse %v as boolean: %w", rhs.Value, err))
 		}
-		if lhsTruthy == rhsTruthy {
-			return 0
-		} else if lhsTruthy {
-			return 1
-		}
-		return -1
-	} else if isDateTime {
-		lhsTime, err := parseDateTime(layout, lhs.Value)
-		if err != nil {
-			log.Warningf("Could not parse time %v with layout %v for sort, sorting by string instead: %w", lhs.Value, layout, err)
-			return strings.Compare(lhs.Value, rhs.Value)
-		}
-		rhsTime, err := parseDateTime(layout, rhs.Value)
-		if err != nil {
-			log.Warningf("Could not parse time %v with layout %v for sort, sorting by string instead: %w", rhs.Value, layout, err)
-			return strings.Compare(lhs.Value, rhs.Value)
-		}
-		if lhsTime.Equal(rhsTime) {
-			return 0
-		} else if lhsTime.Before(rhsTime) {
-			return -1
-		}

-		return 1
-	} else if lhsTag == "!!int" && rhsTag == "!!int" {
+		return !lhsTruthy && rhsTruthy
+	} else if lhs.Tag != rhs.Tag || lhs.Tag == "!!str" {
+		return strings.Compare(lhs.Value, rhs.Value) < 0
+	} else if lhs.Tag == "!!int" && rhs.Tag == "!!int" {
 		_, lhsNum, err := parseInt64(lhs.Value)
 		if err != nil {
 			panic(err)
@@ -166,8 +114,8 @@ func (a sortableNodeArray) compare(lhs *yaml.Node, rhs *yaml.Node, dateTimeLayou
 		if err != nil {
 			panic(err)
 		}
-		return int(lhsNum - rhsNum)
-	} else if (lhsTag == "!!int" || lhsTag == "!!float") && (rhsTag == "!!int" || rhsTag == "!!float") {
+		return lhsNum < rhsNum
+	} else if (lhs.Tag == "!!int" || lhs.Tag == "!!float") && (rhs.Tag == "!!int" || rhs.Tag == "!!float") {
 		lhsNum, err := strconv.ParseFloat(lhs.Value, 64)
 		if err != nil {
 			panic(err)
@@ -176,14 +124,8 @@ func (a sortableNodeArray) compare(lhs *yaml.Node, rhs *yaml.Node, dateTimeLayou
 		if err != nil {
 			panic(err)
 		}
-		if lhsNum == rhsNum {
-			return 0
-		} else if lhsNum < rhsNum {
-			return -1
-		}
-
-		return 1
+		return lhsNum < rhsNum
 	}

-	return strings.Compare(lhs.Value, rhs.Value)
+	return true
 }
@@ -11,32 +11,6 @@ var sortByOperatorScenarios = []expressionScenario{
 			"D0, P[], (!!seq)::[{a: apple}, {a: banana}, {a: cat}]\n",
 		},
 	},
-	{
-		description: "Sort by multiple fields",
-		document:    "[{a: dog},{a: cat, b: banana},{a: cat, b: apple}]",
-		expression:  `sort_by(.a, .b)`,
-		expected: []string{
-			"D0, P[], (!!seq)::[{a: cat, b: apple}, {a: cat, b: banana}, {a: dog}]\n",
-		},
-	},
-	{
-		description: "Sort by multiple fields",
-		skipDoc:     true,
-		document:    "[{a: dog, b: good},{a: cat, c: things},{a: cat, b: apple}]",
-		expression:  `sort_by(.a, .b)`,
-		expected: []string{
-			"D0, P[], (!!seq)::[{a: cat, c: things}, {a: cat, b: apple}, {a: dog, b: good}]\n",
-		},
-	},
-	{
-		description: "Sort by multiple fields",
-		skipDoc:     true,
-		document:    "[{a: dog, b: 0.1},{a: cat, b: 0.01},{a: cat, b: 0.001}]",
-		expression:  `sort_by(.a, .b)`,
-		expected: []string{
-			"D0, P[], (!!seq)::[{a: cat, b: 0.001}, {a: cat, b: 0.01}, {a: dog, b: 0.1}]\n",
-		},
-	},
 	{
 		description:    "Sort descending by string field",
 		subdescription: "Use sort with reverse to sort in descending order.",
@@ -80,14 +54,6 @@ var sortByOperatorScenarios = []expressionScenario{
 			"D0, P[], (!!seq)::[{a: 1}, {a: 10}, {a: 100}]\n",
 		},
 	},
-	{
-		description: "Sort by custom date field",
-		document:    `[{a: "12-Jun-2011"},{a: "23-Dec-2010"},{a: "10-Aug-2011"}]`,
-		expression:  `with_dtf("02-Jan-2006"; sort_by(.a))`,
-		expected: []string{
-			"D0, P[], (!!seq)::[{a: \"23-Dec-2010\"}, {a: \"12-Jun-2011\"}, {a: \"10-Aug-2011\"}]\n",
-		},
-	},
 	{
 		skipDoc:    true,
 		document:   "[{a: 1.1},{a: 1.001},{a: 1.01}]",
@@ -432,7 +432,6 @@ func split(value string, spltStr string) *yaml.Node {
 	var contents []*yaml.Node

 	if value != "" {
-		log.Debug("going to spltStr[%v]", spltStr)
 		var newStrings = strings.Split(value, spltStr)
 		contents = make([]*yaml.Node, len(newStrings))

@@ -92,10 +92,10 @@ func subtractScalars(context Context, target *CandidateNode, lhs *yaml.Node, rhs
 		rhsTag = guessTagFromCustomType(rhs)
 	}

-	isDateTime := lhsTag == "!!timestamp"
+	isDateTime := lhs.Tag == "!!timestamp"
 	// if the lhs is a string, it might be a timestamp in a custom format.
 	if lhsTag == "!!str" && context.GetDateTimeLayout() != time.RFC3339 {
-		_, err := parseDateTime(context.GetDateTimeLayout(), lhs.Value)
+		_, err := time.Parse(context.GetDateTimeLayout(), lhs.Value)
 		isDateTime = err == nil
 	}

@@ -151,7 +151,7 @@ func subtractDateTime(layout string, target *CandidateNode, lhs *yaml.Node, rhs
 		return fmt.Errorf("unable to parse duration [%v]: %w", rhs.Value, err)
 	}

-	currentTime, err := parseDateTime(layout, lhs.Value)
+	currentTime, err := time.Parse(layout, lhs.Value)
 	if err != nil {
 		return err
 	}
@@ -8,7 +8,7 @@ var subtractOperatorScenarios = []expressionScenario{
 	{
 		skipDoc:    true,
 		document:   `{}`,
-		expression: "(.a - .b) as $x | .",
+		expression: "(.a - .b) as $x",
 		expected: []string{
 			"D0, P[], (doc)::{}\n",
 		},
@@ -102,15 +102,6 @@ var subtractOperatorScenarios = []expressionScenario{
 			"D0, P[], (doc)::a: 2021-01-01T00:00:00Z\n",
 		},
 	},
-	{
-		description: "Date subtraction - only date",
-		skipDoc:     true,
-		document:    `a: 2021-01-01`,
-		expression:  `.a -= "24h"`,
-		expected: []string{
-			"D0, P[], (doc)::a: 2020-12-31T00:00:00Z\n",
-		},
-	},
 	{
 		description:    "Date subtraction - custom format",
 		subdescription: "Use with_dtf to specify your datetime format. See [date-time operators](https://mikefarah.gitbook.io/yq/operators/date-time-operators) for more information.",
@@ -39,7 +39,7 @@ func traverse(context Context, matchingNode *CandidateNode, operation *Operation
 	log.Debug("Traversing %v", NodeToString(matchingNode))
 	value := matchingNode.Node

-	if value.Tag == "!!null" && operation.Value != "[]" && !context.DontAutoCreate {
+	if value.Tag == "!!null" && operation.Value != "[]" {
 		log.Debugf("Guessing kind")
 		// we must have added this automatically, lets guess what it should be now
 		switch operation.Value.(type) {
@@ -76,14 +76,11 @@ func traverse(context Context, matchingNode *CandidateNode, operation *Operation
 }

 func traverseArrayOperator(d *dataTreeNavigator, context Context, expressionNode *ExpressionNode) (Context, error) {
+
 	//lhs may update the variable context, we should pass that into the RHS
 	// BUT we still return the original context back (see jq)
 	// https://stedolan.github.io/jq/manual/#Variable/SymbolicBindingOperator:...as$identifier|...

-	if expressionNode.RHS != nil && expressionNode.RHS.RHS != nil && expressionNode.RHS.RHS.Operation.OperationType == createMapOpType {
-		return sliceArrayOperator(d, context, expressionNode.RHS.RHS)
-	}
-
 	lhs, err := d.GetMatchingNodes(context, expressionNode.LHS)
 	if err != nil {
 		return Context{}, err
@@ -4,7 +4,8 @@ import (
 	"testing"
 )

-var mergeDocSample = `foo: &foo
+var mergeDocSample = `
+foo: &foo
  a: foo_a
  thing: foo_thing
  c: foo_c
@@ -151,7 +152,7 @@ var traversePathOperatorScenarios = []expressionScenario{
 	{
 		skipDoc:    true,
 		document:   `c: dog`,
-		expression: `.[.a.b] as $x | .`,
+		expression: `.[.a.b] as $x`,
 		expected: []string{
 			"D0, P[], (doc)::c: dog\n",
 		},
@@ -8,7 +8,7 @@ var unionOperatorScenarios = []expressionScenario{
 	{
 		skipDoc:    true,
 		document:   "{}",
-		expression: `(.a, .b.c) as $x | .`,
+		expression: `(.a, .b.c) as $x`,
 		expected: []string{
 			"D0, P[], (doc)::{}\n",
 		},
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Mike Farah	e918bec740	fixed leading content logic	2022-10-28 13:50:22 +11:00
Mike Farah	b87c1503f4	wip	2022-10-27 16:16:00 +11:00
Mike Farah	fd79ac8603	put comments on key node instead	2022-10-27 15:27:37 +11:00
Mike Farah	7eccbe5902	put comments on key node instead	2022-10-26 13:24:36 +11:00
Mike Farah	fe27ddedc0	fixing property comment handling	2022-10-26 13:12:30 +11:00
Mike Farah	23b2aa5668	fixing property comment handling	2022-10-26 13:12:30 +11:00
Mike Farah	2e588a11a0	moving leading content processing logic into yaml decoder	2022-10-26 13:12:30 +11:00
Mike Farah	4138c3b005	wip	2022-10-26 13:12:30 +11:00