tests passsing!

.dockerignore

@@ -1 +1 @@
-bin/*
+bin

.github/FUNDING.yml

@@ -1 +0,0 @@
-github: mikefarah

.github/ISSUE_TEMPLATE/bug_report_v3.md

@@ -10,8 +10,6 @@ assignees: ''
 **Describe the bug**
 A clear and concise description of what the bug is.
 
-Note that any how to questions should be posted in the discussion board and not raised as an issue.
-
 Version of yq: 3.X.X
 Operating system: mac/linux/windows/....
 Installed via: docker/binary release/homebrew/snap/...

.github/ISSUE_TEMPLATE/bug_report_v4.md

@@ -10,8 +10,6 @@ assignees: ''
 **Describe the bug**
 A clear and concise description of what the bug is.
 
-Note that any how to questions should be posted in the discussion board and not raised as an issue.
-
 Version of yq: 4.X.X
 Operating system: mac/linux/windows/....
 Installed via: docker/binary release/homebrew/snap/...

.github/ISSUE_TEMPLATE/feature_request.md

@@ -9,11 +9,9 @@ assignees: ''
 
 **Please describe your feature request.**
 A clear and concise description of what the request is and what it would solve. 
-Eg. I wish I could use yq to [...]
+Ex. I wish I could use yq to [...]
 
-Note:
-- how to questions should be posted in the discussion board and not raised as an issue.
-- V3 will no longer have any enhancements.
+Please note that V3 will no longer have any enhancements.
 
 **Describe the solution you'd like**
 If we have data1.yml like:
@@ -26,7 +24,7 @@ country: Australia
 And we run a command:
 
 ```bash
-yq 'predictWeatherOf(.country)'
+yq eval 'predictWeatherOf(.country)'
 ```
 
 it could output

.github/dependabot.yml

@@ -1,22 +0,0 @@
-# To get started with Dependabot version updates, you'll need to specify which
-# package ecosystems to update and where the package manifests are located.
-# Please see the documentation for all configuration options:
-# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
-
-version: 2
-updates:
-  - package-ecosystem: docker
-    directory: /
-    schedule:
-      day: thursday
-      interval: weekly
-  - package-ecosystem: github-actions
-    directory: /
-    schedule:
-      day: thursday
-      interval: weekly
-  - package-ecosystem: gomod
-    directory: /
-    schedule:
-      day: thursday
-      interval: weekly

.github/workflows/codeql.yml

@@ -1,70 +0,0 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
-name: "CodeQL"
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ master ]
-  schedule:
-    - cron: '24 3 * * 1'
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: [ 'go' ]
-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
-        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v4
-
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
-      with:
-        languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        # queries: ./path/to/local/query, your-org/your-repo/queries@main
-
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
-
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
-
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
-
-    #- run: |
-    #   make bootstrap
-    #   make release
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2

.github/workflows/docker-release.yml

@@ -1,82 +0,0 @@
-name: Release Docker
-
-on:
-  release:
-    types: [released]
-
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
-
-jobs:
-  publishDocker:
-    environment: dockerhub
-    env:
-      IMAGE_NAME: mikefarah/yq
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-        with:
-          platforms: all
-
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v3
-        with:
-          version: latest
-
-      - name: Available platforms
-        run: echo ${{ steps.buildx.outputs.platforms }} && docker version
-
-      - name: Build and push image
-        run: |
-          echo "GithubRef: ${GITHUB_REF}"
-          VERSION=${GITHUB_REF##*/}
-          echo "VERSION: ${VERSION}"
-          IMAGE_VERSION=${VERSION:1}
-          echo "IMAGE_VERSION: ${IMAGE_VERSION}"
-
-          PLATFORMS="linux/amd64,linux/ppc64le,linux/arm64"
-
-          echo "Building and pushing version ${IMAGE_VERSION} of image ${IMAGE_NAME}"
-          echo '${{ secrets.DOCKER_PASSWORD }}' | docker login -u '${{ secrets.DOCKER_USERNAME }}' --password-stdin
-          docker buildx build \
-            --label "org.opencontainers.image.authors=https://github.com/mikefarah/yq/graphs/contributors" \
-            --label "org.opencontainers.image.created=$(date --rfc-3339=seconds)" \
-            --label "org.opencontainers.image.description=yq is a portable command-line YAML processor" \
-            --label "org.opencontainers.image.documentation=https://mikefarah.gitbook.io/yq/" \
-            --label "org.opencontainers.image.licenses=MIT" \
-            --label "org.opencontainers.image.revision=$(git rev-parse HEAD)" \
-            --label "org.opencontainers.image.source=https://github.com/mikefarah/yq" \
-            --label "org.opencontainers.image.title=yq" \
-            --label "org.opencontainers.image.url=https://mikefarah.gitbook.io/yq/" \
-            --label "org.opencontainers.image.version=${IMAGE_VERSION}" \
-            --platform "${PLATFORMS}" \
-            --pull \
-            --push \
-            -t "${IMAGE_NAME}:${IMAGE_VERSION}" \
-            -t "${IMAGE_NAME}:4" \
-            -t "${IMAGE_NAME}:latest" \
-            .
-          
-          cd github-action
-          docker buildx build \
-            --label "org.opencontainers.image.authors=https://github.com/mikefarah/yq/graphs/contributors" \
-            --label "org.opencontainers.image.created=$(date --rfc-3339=seconds)" \
-            --label "org.opencontainers.image.description=yq is a portable command-line YAML processor" \
-            --label "org.opencontainers.image.documentation=https://mikefarah.gitbook.io/yq/" \
-            --label "org.opencontainers.image.licenses=MIT" \
-            --label "org.opencontainers.image.revision=$(git rev-parse HEAD)" \
-            --label "org.opencontainers.image.source=https://github.com/mikefarah/yq" \
-            --label "org.opencontainers.image.title=yq" \
-            --label "org.opencontainers.image.url=https://mikefarah.gitbook.io/yq/" \
-            --label "org.opencontainers.image.version=${IMAGE_VERSION}" \
-            --platform "${PLATFORMS}" \
-            --pull \
-            --push \
-            -t "${IMAGE_NAME}:${IMAGE_VERSION}-githubaction" \
-            -t "${IMAGE_NAME}:4-githubaction" \
-            -t "${IMAGE_NAME}:latest-githubaction" \
-            .

.github/workflows/go.yml

@@ -1,8 +1,5 @@
 name: Build
-on: [push, pull_request]
-permissions:
-  contents: read
-
+on: [push]
 jobs:
 
   build:
@@ -10,14 +7,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-    - name: Set up Go
-      uses: actions/setup-go@v4
+    - name: Set up Go 1.15
+      uses: actions/setup-go@v1
       with:
-        go-version: '^1.20'
+        go-version: 1.15
       id: go
 
     - name: Check out code into the Go module directory
-      uses: actions/checkout@v4
+      uses: actions/checkout@v2
 
     - name: Get dependencies
       run: |
@@ -27,9 +24,8 @@ jobs:
             dep ensure
         fi
 
-    - name: Check the build
-      shell: bash -l {0}
+    - name: Download deps
       run: |
         export PATH=${PATH}:`go env GOPATH`/bin
         scripts/devtools.sh
-        make local build
+        make local build

.github/workflows/release.yml

@@ -3,51 +3,76 @@ on:
   push:
     tags:
       - 'v*'
-      - 'draft-*'
 
 jobs:
   publishGitRelease:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-go@v4
+      - uses: actions/checkout@v2
+      - uses: actions/setup-go@v2
         with:
-          go-version: '^1.20'
-          check-latest: true
-      - name: Compile man page markup
-        id: gen-man-page-md
-        run: |
-          ./scripts/generate-man-page-md.sh
-
-      - name: Get the version
-        id: get_version
-        run: echo "VERSION=${GITHUB_REF##*/}" >> "${GITHUB_OUTPUT}"
-
-      - name: Generate man page
-        uses: docker://pandoc/core:2.14.2
-        id: gen-man-page
-        with:
-          args: >-
-            --standalone
-            --to man
-            --variable=title:"YQ"
-            --variable=section:"1"
-            --variable=header:"yq (https://github.com/mikefarah/yq/) version ${{ steps.get_version.outputs.VERSION }}"
-            --variable=author:"Mike Farah"
-            --output=yq.1
-            man.md
-
+          go-version: '^1.15'
       - name: Cross compile
         run: |
           sudo apt-get install rhash -y
-          go install github.com/mitchellh/gox@v1.0.1
-          mkdir -p build
-          cp yq.1 build/yq.1
+          go get github.com/mitchellh/gox
           ./scripts/xcompile.sh
 
-      - name: Release
-        uses: softprops/action-gh-release@v1
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1.0.0
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          files: build/*
+          tag_name: ${{ github.ref }}
+          release_name: ${{ github.ref }}
           draft: true
-          fail_on_unmatched_files: true
+          prerelease: false
+
+      - uses: shogo82148/actions-upload-release-asset@v1
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: build/*
+
+  publishDocker:
+    environment: dockerhub
+    env:
+      IMAGE_NAME: mikefarah/yq
+    runs-on: ubuntu-latest
+    steps:
+      - name: Get latest release tag      
+        uses: oprypin/find-latest-tag@v1
+        with:
+          repository: mikefarah/yq  # The repository to scan.
+          releases-only: true  # We know that all relevant tags have a GitHub release for them.
+        id: yq  
+        
+      - name: Clone source code
+        uses: actions/checkout@v2
+        with:
+          ref: ${{ steps.yq.outputs.tag }}
+      
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+        with:
+          platforms: all
+  
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v1
+        with:
+          version: latest
+
+      - name: Available platforms
+        run: echo ${{ steps.buildx.outputs.platforms }} && docker version
+ 
+      - name: Build and push image
+        run: |
+          IMAGE_VERSION="$(git describe --tags --abbrev=0)"
+          SHORT_SHA1=$(git rev-parse --short HEAD)
+          PLATFORMS="linux/amd64,linux/ppc64le,linux/arm64"
+          echo "Building and pushing version ${IMAGE_VERSION} of image ${IMAGE_NAME}"
+          echo ${{ secrets.DOCKER_PASSWORD }} | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
+          docker buildx build --platform "${PLATFORMS}" -t "${IMAGE_NAME}:${IMAGE_VERSION}"  -t "${IMAGE_NAME}:latest" -t "${IMAGE_NAME}:4" \
+            --push .
+    

.github/workflows/snap-release.yml

@@ -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@v4
-        - 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

.github/workflows/test-yq.yml

@@ -1,28 +0,0 @@
-name: Test Yq Action
-on: 
-  push:
-  workflow_dispatch:
-
-permissions:
-  contents: read
-
-jobs:
-
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-      - name: Get test
-        id: get_value
-        uses: mikefarah/yq@master
-        with:
-          cmd: yq '.test' examples/multiline-text.yaml
-      - name: Multiline test
-        run: echo "### It was [${{ steps.get_value.outputs.result }}]" >> $GITHUB_STEP_SUMMARY
-      - name: Write inplace test
-        id: lookupSdkVersion
-        uses: mikefarah/yq@master
-        with:
-          cmd: yq -i '.b.c = 5' examples/sample.yaml

.gitignore

@@ -38,29 +38,3 @@ parts/
 prime/
 .snapcraft/
 yq*.snap
-
-test.yml
-test*.yml
-test*.xml
-test*.toml
-test*.yaml
-0.yml
-1.yml
-2.yml
-
-
-# man page
-man.md
-yq.1
-
-# debian pkg
-_build
-debian/files
-
-# intellij
-/.idea
-
-# vscode
-.vscode
-
-yq3

.golangci.yml

@@ -1,40 +0,0 @@
-run:
-  timeout: 5m
-linters:
-  enable:
-    - asciicheck
-    - depguard
-    - errorlint
-    - gci
-    - gochecknoinits
-    - gofmt
-    - goimports
-    - gosec
-    - megacheck
-    - misspell
-    - nakedret
-    - nolintlint
-    - predeclared
-    - revive
-    - unconvert
-    - unparam
-linters-settings:
-  depguard:
-    list-type: blacklist
-    include-go-root: true
-    packages:
-      - io/ioutil
-    packages-with-error-message:
-      - io/ioutil: "The 'io/ioutil' package is deprecated. Use corresponding 'os' or 'io' functions instead."
-issues:
-  exclude-rules:
-  - linters:
-    - gosec
-    text:  "Implicit memory aliasing in for loop."
-    path: _test\.go
-  - linters:
-    - revive
-    text: "unexported-return"
-  - linters:
-    - revive
-    text: "var-naming"

CONTRIBUTING.md

@@ -1,6 +1,4 @@
-# Development
-
-1. Install (Golang)[https://golang.org/]
+1. Install (golang)[https://golang.org/]
 1. Run  `scripts/devtools.sh` to install the required devtools
 2. Run `make [local] vendor` to install the vendor dependencies
 2. Run `make [local] test` to ensure you can run the existing tests
@@ -8,33 +6,3 @@
 4. Make the code changes.
 5. `make [local] test` to lint code and run tests
 6. Profit! ok no profit, but raise a PR and get kudos :)
-
-
-# Documentation
-
-The documentation is a bit of a mixed bag (sorry in advance, I do plan on simplifying it...) - with some parts automatically generated and stiched together and some statically defined.
-
-Documentation is written in markdown, and is published in the 'gitbook' branch.
-
-The various operator documentation (e.g. 'strings') are generated from the 'master' branch, and have a statically defined header (e.g. `pkg/yqlib/doc/operators/headers/add.md`) and the bulk of the docs are generated from the unit tests e.g. `pkg/yqlib/operator_add_test.go`.
-
-The pipeline will run the tests and automatically concatenate the files together, and put them under 
-`pkg/qylib/doc/add.md`. These files are checked in the master branch (and are copied to the gitbook branch as part of the release process).
-
-## How to contribute
-
-The first step is to find if what you want is automatically generated or not - start by looking in the master branch. 
-
-### Updating dynamic documentation from master
-- Search for the documentation you want to update. If you find matches in a `*_test.go` file - update that, as that will automatically update the matching `*.md` file 
-- Assuming you are updating a `*_test.go` file, once updated, run the test to regenerated the docs. E.g. for the 'Add' test generated docs, from the pkg/yqlib folder run:
-`go test -run TestAddOperatorScenarios` which will run that test defined in the `operator_add_test.go` file.
-- Ensure the tests still pass, and check the generated documentation have your update.
-- Note: If the documentation is only in a `headers/*.md` file, then just update that directly
-- Raise a PR to merge the changes into master!
-
-### Updating static documentation from the gitbook branch
-If you haven't found what you want to update in the master branch, then check the gitbook branch directly as there are a few pages in there that are not in master.
-
-- Update the `*.md` files
-- Raise a PR to merge the changes into gitbook.

Dockerfile

@@ -1,28 +1,25 @@
-FROM golang:1.21.4 as builder
+FROM golang:1.15 as builder
 
 WORKDIR /go/src/mikefarah/yq
 
-COPY . .
+# cache devtools
+COPY ./scripts/devtools.sh /go/src/mikefarah/yq/scripts/devtools.sh
+RUN ./scripts/devtools.sh
 
-RUN CGO_ENABLED=0 go build -ldflags "-s -w" .
-# RUN ./scripts/test.sh -- this too often times out in the github pipeline.
-RUN ./scripts/acceptance.sh
+COPY . /go/src/mikefarah/yq
+
+RUN CGO_ENABLED=0 make local build
 
 # Choose alpine as a base image to make this useful for CI, as many
 # CI tools expect an interactive shell inside the container
-FROM alpine:3 as production
-LABEL maintainer="Mike Farah <mikefarah@users.noreply.github.com>"
+FROM alpine:3.12.3 as production
 
 COPY --from=builder /go/src/mikefarah/yq/yq /usr/bin/yq
+RUN chmod +x /usr/bin/yq
+
+ARG VERSION=none
+LABEL version=${VERSION}
 
 WORKDIR /workdir
 
-RUN set -eux; \
-  addgroup -g 1000 yq; \
-  adduser -u 1000 -G yq -s /bin/sh -h /home/yq -D yq
-
-RUN chown -R yq:yq /workdir
-
-USER yq
-
 ENTRYPOINT ["/usr/bin/yq"]

Dockerfile.dev

@@ -1,12 +1,30 @@
-FROM golang:1.21.4
+FROM golang:1.15
 
 COPY scripts/devtools.sh /opt/devtools.sh
 
 RUN set -e -x \
     && /opt/devtools.sh
-ENV PATH=/go/bin:$PATH
 
-RUN apt-get update && apt-get install -y npm && npm install -g npx cspell@latest
+# install mkdocs
+RUN set -ex \
+    && buildDeps=' \
+        build-essential \
+        python3-dev \
+    ' \
+    && apt-get update && apt-get install -y --no-install-recommends \
+        $buildDeps \
+        python3 \
+        python3-setuptools \
+        python3-wheel \
+        python3-pip \
+    && pip3 install --upgrade \
+        pip \
+        'Markdown>=2.6.9' \
+        'mkdocs>=0.16.3' \
+        'mkdocs-material>=1.10.1' \
+        'markdown-include>=0.5.1' \
+    && apt-get purge -y --auto-remove $buildDeps \
+    && rm -rf /var/lib/apt/lists/*
 
 ENV CGO_ENABLED 0
 ENV GOPATH /go:/yq

LICENSE

@@ -1,5 +1,3 @@
-The MIT License (MIT)
-
 Copyright (c) 2017 Mike Farah
 
 Permission is hereby granted, free of charge, to any person obtaining a copy

Makefile

@@ -2,7 +2,6 @@ MAKEFLAGS += --warn-undefined-variables
 SHELL := /bin/bash
 .SHELLFLAGS := -o pipefail -euc
 .DEFAULT_GOAL := install
-ENGINE := $(shell { command -v podman || command -v docker; } 2>/dev/null)
 
 include Makefile.variables
 
@@ -18,7 +17,6 @@ help:
 	@echo '    make vendor          Install dependencies to vendor directory.'
 	@echo '    make format          Run code formatter.'
 	@echo '    make check           Run static code analysis (lint).'
-	@echo '    make secure          Run gosec.'
 	@echo '    make test            Run tests on project.'
 	@echo '    make cover           Run tests and capture code coverage metrics on project.'
 	@echo '    make clean           Clean the directory tree of produced artifacts.'
@@ -34,7 +32,7 @@ clean:
 
 ## prefix before other make targets to run in your local dev environment
 local: | quiet
-	@$(eval ENGINERUN= )
+	@$(eval DOCKRUN= )
 	@mkdir -p tmp
 	@touch tmp/dev_image_id
 quiet: # this is silly but shuts up 'Nothing to be done for `local`'
@@ -43,9 +41,9 @@ quiet: # this is silly but shuts up 'Nothing to be done for `local`'
 prepare: tmp/dev_image_id
 tmp/dev_image_id: Dockerfile.dev scripts/devtools.sh
 	@mkdir -p tmp
-	@${ENGINE} rmi -f ${DEV_IMAGE} > /dev/null 2>&1 || true
-	@${ENGINE} build -t ${DEV_IMAGE} -f Dockerfile.dev .
-	@${ENGINE} inspect -f "{{ .ID }}" ${DEV_IMAGE} > tmp/dev_image_id
+	@docker rmi -f ${DEV_IMAGE} > /dev/null 2>&1 || true
+	@docker build -t ${DEV_IMAGE} -f Dockerfile.dev .
+	@docker inspect -f "{{ .ID }}" ${DEV_IMAGE} > tmp/dev_image_id
 
 # ----------------------------------------------
 # build
@@ -55,65 +53,58 @@ build: build/dev
 .PHONY: build/dev
 build/dev: test *.go
 	@mkdir -p bin/
-	${ENGINERUN} go build --ldflags "$(LDFLAGS)"
-	${ENGINERUN} bash ./scripts/acceptance.sh
+	${DOCKRUN} go build --ldflags "$(LDFLAGS)"
+	${DOCKRUN} bash ./scripts/acceptance.sh
 
 ## Compile the project for multiple OS and Architectures.
 xcompile: check
 	@rm -rf build/
 	@mkdir -p build
-	${ENGINERUN} bash ./scripts/xcompile.sh
+	${DOCKRUN} bash ./scripts/xcompile.sh
 	@find build -type d -exec chmod 755 {} \; || :
 	@find build -type f -exec chmod 755 {} \; || :
 
 .PHONY: install
 install: build
-	${ENGINERUN} go install
+	${DOCKRUN} go install
 
 # Each of the fetch should be an entry within vendor.json; not currently included within project
 .PHONY: vendor
 vendor: tmp/dev_image_id
-	@mkdir -p vendor
-	${ENGINERUN} go mod vendor
+	${DOCKRUN} go mod vendor
 
 # ----------------------------------------------
 # develop and test
 
 .PHONY: format
 format: vendor
-	${ENGINERUN} bash ./scripts/format.sh
-
-
-.PHONY: spelling
-spelling: format
-	${ENGINERUN} bash ./scripts/spelling.sh
-
-.PHONY: secure
-secure: spelling
-	${ENGINERUN} bash ./scripts/secure.sh
+	${DOCKRUN} bash ./scripts/format.sh
 
 .PHONY: check
-check: secure
-	${ENGINERUN} bash ./scripts/check.sh
-
-
+check: format
+	${DOCKRUN} bash ./scripts/check.sh
 
 .PHONY: test
 test: check
-	${ENGINERUN} bash ./scripts/test.sh
+	${DOCKRUN} bash ./scripts/test.sh
 
 .PHONY: cover
 cover: check
 	@rm -rf cover/
 	@mkdir -p cover
-	${ENGINERUN} bash ./scripts/coverage.sh
+	${DOCKRUN} bash ./scripts/coverage.sh
 	@find cover -type d -exec chmod 755 {} \; || :
 	@find cover -type f -exec chmod 644 {} \; || :
 
+.PHONY: build-docs
+build-docs: prepare mkdocs.yml mkdocs/*
+	${DOCKRUN} mkdocs build
+	@find docs -type d -exec chmod 755 {} \; || :
+	@find docs -type f -exec chmod 644 {} \; || :
 
 .PHONY: release
 release: xcompile
-	${ENGINERUN} bash ./scripts/publish.sh
+	${DOCKRUN} bash ./scripts/publish.sh
 
 # ----------------------------------------------
 # utilities

Makefile.variables

@@ -7,7 +7,6 @@ export GIT_DESCRIBE = $(shell git describe --tags --always)
 LDFLAGS :=
 LDFLAGS += -X main.GitCommit=${GIT_COMMIT}${GIT_DIRTY}
 LDFLAGS += -X main.GitDescribe=${GIT_DESCRIBE}
-LDFLAGS += -w -s
 
 GITHUB_TOKEN ?=
 
@@ -30,7 +29,7 @@ endif
 
 DEV_IMAGE := ${PROJECT}_dev
 
-ENGINERUN := ${ENGINE} run --rm \
+DOCKRUN := docker run --rm \
 	-e LDFLAGS="${LDFLAGS}" \
 	-e GITHUB_TOKEN="${GITHUB_TOKEN}" \
 	-v ${ROOT}/vendor:/go/src \

README.md

@@ -1,101 +1,28 @@
 # yq
 
-![Build](https://github.com/mikefarah/yq/workflows/Build/badge.svg)  ![Docker Pulls](https://img.shields.io/docker/pulls/mikefarah/yq.svg) ![Github Releases (by Release)](https://img.shields.io/github/downloads/mikefarah/yq/total.svg) ![Go Report](https://goreportcard.com/badge/github.com/mikefarah/yq) ![CodeQL](https://github.com/mikefarah/yq/workflows/CodeQL/badge.svg)
+![Build](https://github.com/mikefarah/yq/workflows/Build/badge.svg)  ![Docker Pulls](https://img.shields.io/docker/pulls/mikefarah/yq.svg) ![Github Releases (by Release)](https://img.shields.io/github/downloads/mikefarah/yq/total.svg) ![Go Report](https://goreportcard.com/badge/github.com/mikefarah/yq)
 
 
-a lightweight and portable command-line YAML, JSON and XML processor. `yq` uses [jq](https://github.com/stedolan/jq) like syntax but works with yaml files as well as json, xml, properties, csv and tsv. It doesn't yet support everything `jq` does - but it does support the most common operations and functions, and more is being added continuously.
+a lightweight and portable command-line YAML processor
 
-yq is written in go - so you can download a dependency free binary for your platform and you are good to go! If you prefer there are a variety of package managers that can be used as well as Docker and Podman, all listed below.
+The aim of the project is to be the [jq](https://github.com/stedolan/jq) or sed of yaml files.
 
-## Quick Usage Guide
+## V4 released!
+V4 is now officially released, it's quite different from V3 (sorry for the migration), however it is much more similar to ```jq```, using a similar expression syntax and therefore support much more complex functionality! 
 
-Read a value:
-```bash
-yq '.a.b[0].c' file.yaml
-```
-
-Pipe from STDIN:
-```bash
-yq '.a.b[0].c' < file.yaml
-```
-
-Update a yaml file, in place
-```bash
-yq -i '.a.b[0].c = "cool"' file.yaml
-```
-
-Update using environment variables
-```bash
-NAME=mike yq -i '.a.b[0].c = strenv(NAME)' file.yaml
-```
-
-Merge multiple files
-```bash
-# note the use of `ea` to evaluate all the files at once
-# instead of in sequence
-yq ea '. as $item ireduce ({}; . * $item )' path/to/*.yml
-```
-
-Multiple updates to a yaml file
-```bash
-yq -i '
-  .a.b[0].c = "cool" |
-  .x.y.z = "foobar" |
-  .person.name = strenv(NAME)
-' file.yaml
-```
-
-Find and update an item in an array:
-```bash
-yq '(.[] | select(.name == "foo") | .address) = "12 cat st"'
-```
-
-Convert JSON to YAML
-```bash
-yq -Poy sample.json
-```
-
-See [recipes](https://mikefarah.gitbook.io/yq/recipes) for more examples and the [documentation](https://mikefarah.gitbook.io/yq/) for more information.
-
-Take a look at the discussions for [common questions](https://github.com/mikefarah/yq/discussions/categories/q-a), and [cool ideas](https://github.com/mikefarah/yq/discussions/categories/show-and-tell)
+If you've been using v3 and want/need to upgrade, checkout the [upgrade guide](https://mikefarah.gitbook.io/yq/v/v4.x/upgrading-from-v3).
 
 ## Install
 
 ### [Download the latest binary](https://github.com/mikefarah/yq/releases/latest)
 
-### 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 - |\
-  tar xz && mv ${BINARY} /usr/bin/yq
-```
-
-#### Plain binary
-
-```bash
-wget https://github.com/mikefarah/yq/releases/download/${VERSION}/${BINARY} -O /usr/bin/yq &&\
-    chmod +x /usr/bin/yq
-```
-
-#### Latest version
-
-```bash
-wget https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 -O /usr/bin/yq &&\
-    chmod +x /usr/bin/yq
-```
-
-### MacOS / Linux via Homebrew:
+### MacOS:
 Using [Homebrew](https://brew.sh/)
 ```
 brew install yq
 ```
 
-### Linux via snap:
+### Ubuntu and other Linux distros supporting `snap` packages:
 ```
 snap install yq
 ```
@@ -104,54 +31,43 @@ snap install yq
 `yq` installs with [_strict confinement_](https://docs.snapcraft.io/snap-confinement/6233) in snap, this means it doesn't have direct access to root files. To read root files you can:
 
 ```
-sudo cat /etc/myfile | yq '.a.path'
+sudo cat /etc/myfile | yq e '.a.path' - 
 ```
 
 And to write to a root file you can either use [sponge](https://linux.die.net/man/1/sponge):
 ```
-sudo cat /etc/myfile | yq '.a.path = "value"' | sudo sponge /etc/myfile
+sudo cat /etc/myfile | yq e '.a.path = "value"' - | sudo sponge /etc/myfile
 ```
 or write to a temporary file:
 ```
-sudo cat /etc/myfile | yq '.a.path = "value"' | sudo tee /etc/myfile.tmp
+sudo cat /etc/myfile | yq e '.a.path = "value"' | sudo tee /etc/myfile.tmp
 sudo mv /etc/myfile.tmp /etc/myfile
 rm /etc/myfile.tmp
 ```
 
-### Run with Docker or Podman
+### wget
+
+Use wget to download the pre-compiled binaries:
+
+```bash
+wget https://github.com/mikefarah/yq/releases/download/${VERSION}/${BINARY} -O /usr/bin/yq &&\
+    chmod +x /usr/bin/yq
+```
+
+For instance, VERSION=4.0.0 and BINARY=yq_linux_amd64
+
+### Run with Docker
+
 #### Oneshot use:
 
 ```bash
-docker run --rm -v "${PWD}":/workdir mikefarah/yq [command] [flags] [expression ]FILE...
-```
-
-Note that you can run `yq` in docker without network access and other privileges if you desire,
-namely `--security-opt=no-new-privileges --cap-drop all --network none`.
-
-```bash
-podman run --rm -v "${PWD}":/workdir mikefarah/yq [command] [flags] [expression ]FILE...
-```
-
-#### Pipe in via STDIN:
-
-You'll need to pass the `-i\--interactive` flag to docker:
-
-```bash
-docker run -i --rm mikefarah/yq '.this.thing' < myfile.yml
-```
-
-```bash
-podman run -i --rm mikefarah/yq '.this.thing' < myfile.yml
+docker run --rm -v "${PWD}":/workdir mikefarah/yq <command> [flags] [expression ]FILE...
 ```
 
 #### Run commands interactively:
 
 ```bash
-docker run --rm -it -v "${PWD}":/workdir --entrypoint sh mikefarah/yq
-```
-
-```bash
-podman run --rm -it -v "${PWD}":/workdir --entrypoint sh mikefarah/yq
+docker run --rm -it -v "${PWD}":/workdir mikefarah/yq sh
 ```
 
 It can be useful to have a bash function to avoid typing the whole docker command:
@@ -162,126 +78,21 @@ yq() {
 }
 ```
 
-```bash
-yq() {
-  podman run --rm -i -v "${PWD}":/workdir mikefarah/yq "$@"
-}
+### Go Get:
 ```
-#### Running as root:
-
-`yq`'s container image no longer runs under root (https://github.com/mikefarah/yq/pull/860). If you'd like to install more things in the container image, or you're having permissions issues when attempting to read/write files you'll need to either:
-
-
-```
-docker run --user="root" -it --entrypoint sh mikefarah/yq
-```
-
-```
-podman run --user="root" -it --entrypoint sh mikefarah/yq
-```
-
-Or, in your Dockerfile:
-
-```
-FROM mikefarah/yq
-
-USER root
-RUN apk add --no-cache bash
-USER yq
-```
-
-#### Missing timezone data
-By default, the alpine image yq uses does not include timezone data. If you'd like to use the `tz` operator, you'll need to include this data:
-
-```
-FROM mikefarah/yq
-
-USER root
-RUN apk add --no-cache tzdata
-USER yq
-```
-
-#### Podman with SELinux
-
-If you are using podman with SELinux, you will need to set the shared volume flag `:z` on the volume mount:
-
-```
--v "${PWD}":/workdir:z
-```
-
-### GitHub Action
-```
-  - name: Set foobar to cool
-    uses: mikefarah/yq@master
-    with:
-      cmd: yq -i '.foo.bar = "cool"' 'config.yml'
-  - name: Get an entry with a variable that might contain dots or spaces
-    id: get_username
-    uses: mikefarah/yq@master
-    with:
-      cmd: yq '.all.children.["${{ matrix.ip_address }}"].username' ops/inventories/production.yml
-  - name: Reuse a variable obtained in another step
-    run: echo ${{ steps.get_username.outputs.result }}
-```
-
-See https://mikefarah.gitbook.io/yq/usage/github-action for more.
-
-### Go Install:
-```
-go install github.com/mikefarah/yq/v4@latest
+GO111MODULE=on go get github.com/mikefarah/yq
 ```
 
 ## Community Supported Installation methods
 As these are supported by the community :heart: - however, they may be out of date with the officially supported releases.
 
-_Please note that the Debian package (previously supported by @rmescandon) is no longer maintained. Please use an alternative installation method._
-
-
-### Nix
-
-```
-nix profile install nixpkgs#yq-go
-```
-
-See [here](https://search.nixos.org/packages?channel=unstable&show=yq-go&from=0&size=50&sort=relevance&type=packages&query=yq-go)
-
-
-### Webi
-
-```
-webi yq
-```
-
-See [webi](https://webinstall.dev/)
-Supported by @adithyasunil26 (https://github.com/webinstall/webi-installers/tree/master/yq)
-
-### Arch Linux
-
-```
-pacman -S go-yq
-```
 
 ### Windows:
-
-Using [Chocolatey](https://chocolatey.org)
-
-[![Chocolatey](https://img.shields.io/chocolatey/v/yq.svg)](https://chocolatey.org/packages/yq)
-[![Chocolatey](https://img.shields.io/chocolatey/dt/yq.svg)](https://chocolatey.org/packages/yq)
 ```
 choco install yq
 ```
 Supported by @chillum (https://chocolatey.org/packages/yq)
 
-Using [scoop](https://scoop.sh/)
-```
-scoop install main/yq
-```
-
-Using [winget](https://learn.microsoft.com/en-us/windows/package-manager/)
-```
-winget install --id MikeFarah.yq
-```
-
 ### Mac:
 Using [MacPorts](https://www.macports.org/)
 ```
@@ -299,29 +110,29 @@ Supported by Tuan Hoang
 https://pkgs.alpinelinux.org/package/edge/community/x86/yq
 
 
+### On Ubuntu 16.04 or higher from Debian package:
+```sh
+sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CC86BB64
+sudo add-apt-repository ppa:rmescandon/yq
+sudo apt update
+sudo apt install yq -y
+```
+Supported by @rmescandon (https://launchpad.net/~rmescandon/+archive/ubuntu/yq)
+
 ## Features
-- [Detailed documentation with many examples](https://mikefarah.gitbook.io/yq/)
 - Written in portable go, so you can download a lovely dependency free binary
-- Uses similar syntax as `jq` but works with YAML, [JSON](https://mikefarah.gitbook.io/yq/usage/convert) and [XML](https://mikefarah.gitbook.io/yq/usage/xml) files
+- Uses similar syntax as `jq` but works with YAML and JSON files
 - Fully supports multi document yaml files
-- Supports yaml [front matter](https://mikefarah.gitbook.io/yq/usage/front-matter) blocks (e.g. jekyll/assemble)
 - Colorized yaml output
-- [Date/Time manipulation and formatting with TZ](https://mikefarah.gitbook.io/yq/operators/datetime)
-- [Deeply data structures](https://mikefarah.gitbook.io/yq/operators/traverse-read)
-- [Sort keys](https://mikefarah.gitbook.io/yq/operators/sort-keys)
-- Manipulate yaml [comments](https://mikefarah.gitbook.io/yq/operators/comment-operators), [styling](https://mikefarah.gitbook.io/yq/operators/style), [tags](https://mikefarah.gitbook.io/yq/operators/tag) and [anchors and aliases](https://mikefarah.gitbook.io/yq/operators/anchor-and-alias-operators).
-- [Update in place](https://mikefarah.gitbook.io/yq/v/v4.x/commands/evaluate#flags)
-- [Complex expressions to select and update](https://mikefarah.gitbook.io/yq/operators/select#select-and-update-matching-values-in-map)
+- [Deeply traverse yaml](https://mikefarah.gitbook.io/yq/v/v4.x/traverse)
+- [Sort yaml by keys](https://mikefarah.gitbook.io/yq/v/v4.x/sort-keys)
+- Manipulate yaml [comments](https://mikefarah.gitbook.io/yq/comment-operators), [styling](https://mikefarah.gitbook.io/yq/style), [tags](https://mikefarah.gitbook.io/yq/tag) and [anchors and aliases](https://mikefarah.gitbook.io/yq/anchor-and-alias-operators).
+- [Update yaml inplace](https://mikefarah.gitbook.io/yq/v/v4.x/commands/evaluate#flags)
+- [Complex expressions to select and update](https://mikefarah.gitbook.io/yq/v/v4.x/select#select-and-update-matching-values-in-map)
 - Keeps yaml formatting and comments when updating (though there are issues with whitespace)
-- [Decode/Encode base64 data](https://mikefarah.gitbook.io/yq/operators/encode-decode)
-- [Load content from other files](https://mikefarah.gitbook.io/yq/operators/load)
-- [Convert to/from json/ndjson](https://mikefarah.gitbook.io/yq/v/v4.x/usage/convert)
-- [Convert to/from xml](https://mikefarah.gitbook.io/yq/v/v4.x/usage/xml)
-- [Convert to/from properties](https://mikefarah.gitbook.io/yq/v/v4.x/usage/properties)
-- [Convert to/from csv/tsv](https://mikefarah.gitbook.io/yq/usage/csv-tsv)
+- [Convert to/from json to yaml](https://mikefarah.gitbook.io/yq/v/v4.x/usage/convert)
+- [Pipe data in by using '-'](https://mikefarah.gitbook.io/yq/v/v4.x/commands/evaluate)
 - [General shell completion scripts (bash/zsh/fish/powershell)](https://mikefarah.gitbook.io/yq/v/v4.x/commands/shell-completion)
-- [Reduce](https://mikefarah.gitbook.io/yq/operators/reduce) to merge multiple files or sum an array or other fancy things.
-- [Github Action](https://mikefarah.gitbook.io/yq/usage/github-action) to use in your automated pipeline (thanks @devorbitus)
 
 ## [Usage](https://mikefarah.gitbook.io/yq/)
 
@@ -332,47 +143,33 @@ Usage:
   yq [flags]
   yq [command]
 
-Examples:
-
-# yq defaults to 'eval' command if no command is specified. See "yq eval --help" for more examples.
-yq '.stuff' < myfile.yml # outputs the data at the "stuff" node from "myfile.yml"
-
-yq -i '.stuff = "foo"' myfile.yml # update myfile.yml in place
-
-
 Available Commands:
-  completion       Generate the autocompletion script for the specified shell
-  eval             (default) Apply the expression to each document in each yaml file in sequence
+  eval             Apply expression to each document in each yaml file given in sequence
   eval-all         Loads _all_ yaml documents of _all_ yaml files and runs expression once
   help             Help about any command
   shell-completion Generate completion script
 
 Flags:
-  -C, --colors                        force print with colors
-  -e, --exit-status                   set exit status if there are no matches or null or false is returned
-  -f, --front-matter string           (extract|process) first input as yaml front-matter. Extract will pull out the yaml content, process will run the expression against the yaml content, leaving the remaining data intact
-      --header-preprocess             Slurp any header comments and separators before processing expression. (default true)
-  -h, --help                          help for yq
-  -I, --indent int                    sets indent level for output (default 2)
-  -i, --inplace                       update the file in place of first file given.
-  -p, --input-format string           [yaml|y|xml|x] parse format for input. Note that json is a subset of yaml. (default "yaml")
-  -M, --no-colors                     force print with no colors
-  -N, --no-doc                        Don't print document separators (---)
-  -n, --null-input                    Don't read input, simply evaluate the expression given. Useful for creating docs from scratch.
-  -o, --output-format string          [yaml|y|json|j|props|p|xml|x] output format type. (default "yaml")
-  -P, --prettyPrint                   pretty print, shorthand for '... style = ""'
-  -s, --split-exp string              print each result (or doc) into a file named (exp). [exp] argument must return a string. You can use $index in the expression as the result counter.
-      --unwrapScalar                  unwrap scalar, print the value with no quotes, colors or comments (default true)
-  -v, --verbose                       verbose mode
-  -V, --version                       Print version information and quit
-      --xml-attribute-prefix string   prefix for xml attributes (default "+")
-      --xml-content-name string       name for xml content (if no attribute name is present). (default "+content")
+  -C, --colors        force print with colors
+  -e, --exit-status   set exit status if there are no matches or null or false is returned
+  -h, --help          help for yq
+  -I, --indent int    sets indent level for output (default 2)
+  -i, --inplace       update the yaml file inplace of first yaml file given.
+  -M, --no-colors     force print with no colors
+  -N, --no-doc        Don't print document separators (---)
+  -n, --null-input    Don't read input, simply evaluate the expression given. Useful for creating yaml docs from scratch.
+  -j, --tojson        output as json. Set indent to 0 to print json in one line.
+  -v, --verbose       verbose mode
+  -V, --version       Print version information and quit
 
 Use "yq [command] --help" for more information about a command.
 ```
+
+Simple Example:
+
+```bash
+yq e '.a.b | length' f1.yml f2.yml 
+```
+
 ## Known Issues / Missing Features
 - `yq` attempts to preserve comment positions and whitespace as much as possible, but it does not handle all scenarios (see https://github.com/go-yaml/yaml/tree/v3 for details)
-- Powershell has its own...[opinions on quoting yq](https://mikefarah.gitbook.io/yq/usage/tips-and-tricks#quotes-in-windows-powershell)
-- "yes", "no" were dropped as boolean values in the yaml 1.2 standard - which is the standard yq assumes.
-
-See [tips and tricks](https://mikefarah.gitbook.io/yq/usage/tips-and-tricks) for more common problems and solutions.

acceptance_tests/bad_args.sh

@@ -1,41 +0,0 @@
-#!/bin/bash
-
-testWriteInPlacePipeIn() {
-  result=$(./yq e -i -n '.a' 2>&1)
-  assertEquals 1 $?
-  assertEquals "Error: write in place flag only applicable when giving an expression and at least one file" "$result"
-}
-
-testWriteInPlacePipeInEvalall() {
-  result=$(./yq ea -i -n '.a' 2>&1)
-  assertEquals 1 $?
-  assertEquals "Error: write in place flag only applicable when giving an expression and at least one file" "$result"
-}
-
-testWriteInPlaceWithSplit() {
-  result=$(./yq e -s "cat" -i '.a = "thing"' test.yml 2>&1)
-  assertEquals 1 $?
-  assertEquals "Error: write in place cannot be used with split file" "$result"
-}
-
-testWriteInPlaceWithSplitEvalAll() {
-  result=$(./yq ea -s "cat" -i '.a = "thing"' test.yml 2>&1)
-  assertEquals 1 $?
-  assertEquals "Error: write in place cannot be used with split file" "$result"
-}
-
-testNullWithFiles() {
-  result=$(./yq e -n '.a = "thing"' test.yml 2>&1)
-  assertEquals 1 $?
-  assertEquals "Error: cannot pass files in when using null-input flag" "$result"
-}
-
-testNullWithFilesEvalAll() {
-  result=$(./yq ea -n '.a = "thing"' test.yml 2>&1)
-  assertEquals 1 $?
-  assertEquals "Error: cannot pass files in when using null-input flag" "$result"
-}
-
-
-
-source ./scripts/shunit2

acceptance_tests/basic.sh

@@ -1,373 +0,0 @@
-#!/bin/bash
-
-setUp() {
-  rm test*.yml 2>/dev/null || true
-  rm .xyz 2>/dev/null || true
-  rm instructions.txt 2>/dev/null || true
-}
-
-testBasicEvalRoundTrip() {
-  ./yq -n ".a = 123" > test.yml
-  X=$(./yq '.a' test.yml)
-  assertEquals 123 "$X"
-}
-
-testBasicTrailingContent() {
-  cat >test-trailing.yml <<EOL
-test:
-# this comment will be removed
-EOL
-
-  read -r -d '' expected << EOM
-test:
-# this comment will be removed
-EOM
-  X=$(./yq test-trailing.yml -P)
-  assertEquals "$expected" "$X"
-}
-
-testBasicTrailingContent() {
-  cat >test-trailing.yml <<EOL
-test:
-# this comment will be removed
-EOL
-
-  read -r -d '' expected << EOM
-test:
-# hi
-EOM
-  X=$(./yq '. footComment = "hi"' test-trailing.yml)
-  assertEquals "$expected" "$X"
-}
-
-testBasicTrailingContentEvalAll() {
-  cat >test-trailing.yml <<EOL
-test:
-# this comment will be removed
-EOL
-
-  read -r -d '' expected << EOM
-test:
-# this comment will be removed
-EOM
-  X=$(./yq ea test-trailing.yml -P)
-  assertEquals "$expected" "$X"
-}
-
-testBasicTrailingContentEvalAll() {
-  cat >test-trailing.yml <<EOL
-test:
-# this comment will be removed
-EOL
-
-  read -r -d '' expected << EOM
-test:
-# hi
-EOM
-  X=$(./yq ea '. footComment = "hi"' test-trailing.yml)
-  assertEquals "$expected" "$X"
-}
-
-testBasicPipeWithDot() {
-  ./yq -n ".a = 123" > test.yml
-  X=$(cat test.yml | ./yq '.')
-  assertEquals "a: 123" "$X"
-}
-
-testBasicExpressionMatchesFileName() {
-  ./yq -n ".xyz = 123" > test.yml
-  touch .xyz
-  
-  X=$(./yq --expression '.xyz' test.yml)
-  assertEquals "123" "$X"
-
-  X=$(./yq ea --expression '.xyz' test.yml)
-  assertEquals "123" "$X"
-}
-
-testBasicExpressionFromFile() {
-  ./yq -n ".xyz = 123" > test.yml
-  echo '.xyz = "meow" | .cool = "frog"' > instructions.txt
-  
-  X=$(./yq --from-file instructions.txt test.yml -o=j -I=0)
-  assertEquals '{"xyz":"meow","cool":"frog"}' "$X"
-
-  X=$(./yq ea --from-file instructions.txt test.yml -o=j -I=0)
-  assertEquals '{"xyz":"meow","cool":"frog"}' "$X"
-}
-
-testBasicExpressionFromFileDos() {
-  ./yq -n ".xyz = 123" > test.yml
-  echo '.xyz = "meow" | .cool = "frog"' | sed 's/$'"/`echo \\\r`/" > instructions.txt
-  
-  X=$(./yq --from-file instructions.txt test.yml -o=j -I=0)
-  assertEquals '{"xyz":"meow","cool":"frog"}' "$X"
-
-  X=$(./yq ea --from-file instructions.txt test.yml -o=j -I=0)
-  assertEquals '{"xyz":"meow","cool":"frog"}' "$X"
-}
-
-testBasicGitHubAction() {
-  ./yq -n ".a = 123" > test.yml
-  X=$(cat /dev/null | ./yq test.yml)
-  assertEquals "a: 123" "$X"
-
-  X=$(cat /dev/null | ./yq e test.yml)
-  assertEquals "a: 123" "$X"
-
-  X=$(cat /dev/null | ./yq ea test.yml)
-  assertEquals "a: 123" "$X"
-}
-
-testBasicGitHubActionWithExpression() {
-  ./yq -n ".a = 123" > test.yml
-  X=$(cat /dev/null | ./yq '.a' test.yml)
-  assertEquals "123" "$X"
-
-  X=$(cat /dev/null | ./yq e '.a' test.yml)
-  assertEquals "123" "$X"
-
-  X=$(cat /dev/null | ./yq ea '.a' test.yml)
-  assertEquals "123" "$X"
-}
-
-
-testBasicEvalAllAllFiles() {
-  ./yq -n ".a = 123" > test.yml
-  ./yq -n ".a = 124" > test2.yml
-  X=$(./yq ea test.yml test2.yml)
-  Y=$(./yq e '.' test.yml test2.yml)
-  assertEquals "$Y" "$X"
-}
-
-# when given a file, don't read STDIN
-# otherwise strange things start happening
-# in scripts
-# https://github.com/mikefarah/yq/issues/1115
-
-testBasicCatWithFilesNoDash() {
-  ./yq -n ".a = 123" > test.yml
-  ./yq -n ".a = 124" > test2.yml
-  X=$(cat test.yml | ./yq test2.yml)
-  Y=$(./yq e '.' test2.yml)
-  assertEquals "$Y" "$X"
-}
-
-# when the nullinput flag is used
-# don't automatically read STDIN (this breaks github actions)
-testBasicCreateFileGithubAction() {
-  cat /dev/null | ./yq -n ".a = 123" > test.yml
-}
-
-testBasicEvalAllCatWithFilesNoDash() {
-  ./yq -n ".a = 123" > test.yml
-  ./yq -n ".a = 124" > test2.yml
-  X=$(cat test.yml | ./yq ea test2.yml)
-  Y=$(./yq e '.' test2.yml)
-  assertEquals "$Y" "$X"
-}
-
-testBasicCatWithFilesNoDashWithExp() {
-  ./yq -n ".a = 123" > test.yml
-  ./yq -n ".a = 124" > test2.yml
-  X=$(cat test.yml | ./yq '.a' test2.yml)
-  Y=$(./yq e '.a' test2.yml)
-  assertEquals "$Y" "$X"
-}
-
-testBasicEvalAllCatWithFilesNoDashWithExp() {
-  ./yq -n ".a = 123" > test.yml
-  ./yq -n ".a = 124" > test2.yml
-  X=$(cat test.yml | ./yq ea '.a' test2.yml)
-  Y=$(./yq e '.a' test2.yml)
-  assertEquals "$Y" "$X"
-}
-
-
-testBasicStdInWithFiles() {
-  ./yq -n ".a = 123" > test.yml
-  ./yq -n ".a = 124" > test2.yml
-  X=$(cat test.yml | ./yq - test2.yml)
-  Y=$(./yq e '.' test.yml test2.yml)
-  assertEquals "$Y" "$X"
-}
-
-testBasicEvalAllStdInWithFiles() {
-  ./yq -n ".a = 123" > test.yml
-  ./yq -n ".a = 124" > test2.yml
-  X=$(cat test.yml | ./yq ea - test2.yml)
-  Y=$(./yq e '.' test.yml test2.yml)
-  assertEquals "$Y" "$X"
-}
-
-testBasicStdInWithFilesReverse() {
-  ./yq -n ".a = 123" > test.yml
-  ./yq -n ".a = 124" > test2.yml
-  X=$(cat test.yml | ./yq test2.yml -)
-  Y=$(./yq e '.' test2.yml test.yml)
-  assertEquals "$Y" "$X"
-}
-
-testBasicEvalAllStdInWithFilesReverse() {
-  ./yq -n ".a = 123" > test.yml
-  ./yq -n ".a = 124" > test2.yml
-  X=$(cat test.yml | ./yq ea test2.yml -)
-  Y=$(./yq e '.' test2.yml test.yml)
-  assertEquals "$Y" "$X"
-}
-
-testBasicEvalRoundTripNoEval() {
-  ./yq -n ".a = 123" > test.yml
-  X=$(./yq '.a' test.yml)
-  assertEquals 123 "$X"
-}
-
-testBasicStdInWithOneArg() {
-  ./yq e -n ".a = 123" > test.yml
-  X=$(cat test.yml | ./yq e ".a")
-  assertEquals 123 "$X"
-
-  X=$(cat test.yml | ./yq ea ".a")
-  assertEquals 123 "$X"
-
-  X=$(cat test.yml | ./yq ".a")
-  assertEquals 123 "$X"
-}
-
-testBasicUpdateInPlaceSequence() {
-  cat >test.yml <<EOL
-a: 0
-EOL
-  ./yq e -i ".a = 10" test.yml
-  X=$(./yq e '.a' test.yml)
-  assertEquals "10" "$X"
-}
-
-testBasicUpdateInPlaceSequenceNoEval() {
-  cat >test.yml <<EOL
-a: 0
-EOL
-  ./yq -i ".a = 10" test.yml
-  X=$(./yq '.a' test.yml)
-  assertEquals "10" "$X"
-}
-
-testBasicUpdateInPlaceSequenceEvalAll() {
-  cat >test.yml <<EOL
-a: 0
-EOL
-  ./yq ea -i ".a = 10" test.yml
-  X=$(./yq e '.a' test.yml)
-  assertEquals "10" "$X"
-}
-
-testBasicUpdateInPlaceMultipleFilesNoExpressionEval() {
-  cat >test.yml <<EOL
-a: 0
-EOL
-  cat >test2.yml <<EOL
-a: 1
-EOL
-read -r -d '' expected << EOM
-0
----
-1
-EOM
-  ./yq -i test.yml test2.yml
-  X=$(./yq e '.a' test.yml)
-  assertEquals "$expected" "$X"
-}
-
-testBasicUpdateInPlaceMultipleFilesNoExpressionEvalAll() {
-  cat >test.yml <<EOL
-a: 0
-EOL
-  cat >test2.yml <<EOL
-a: 1
-EOL
-read -r -d '' expected << EOM
-0
----
-1
-EOM
-  ./yq -i ea test.yml test2.yml
-  X=$(./yq e '.a' test.yml)
-  assertEquals "$expected" "$X"
-}
-
-testBasicNoExitStatus() {
-  echo "a: cat" > test.yml
-  X=$(./yq e '.z' test.yml)
-  assertEquals "null" "$X"
-}
-
-testBasicExitStatus() {
-  echo "a: cat" > test.yml
-  X=$(./yq e -e '.z' test.yml 2&>/dev/null)
-  assertEquals 1 "$?"
-}
-
-testBasicExitStatusNoEval() {
-  echo "a: cat" > test.yml
-  X=$(./yq -e '.z' test.yml 2&>/dev/null)
-  assertEquals 1 "$?"
-}
-
-testBasicExtractFieldWithSeparator() {
-    cat >test.yml <<EOL
----
-name: chart-name
-version: 1.2.3
-EOL
-  X=$(./yq e '.name' test.yml)
-  assertEquals "chart-name" "$X"
-}
-
-testBasicExtractMultipleFieldWithSeparator() {
-    cat >test.yml <<EOL
----
-name: chart-name
-version: 1.2.3
----
-name: thing
-version: 1.2.3
-EOL
-
-read -r -d '' expected << EOM
-chart-name
----
-thing
-EOM
-  X=$(./yq e '.name' test.yml)
-  assertEquals "$expected" "$X"
-}
-
-testBasicMultiplyAssignMultiDoc() {
-      cat >test.yml <<EOL
-a: 1
----
-b: 2
-EOL
-
-read -r -d '' expected << EOM
-a: 1
-c: 3
----
-b: 2
-c: 3
-EOM
-
-
-  X=$(./yq '. *= {"c":3}' test.yml)
-  assertEquals "$expected" "$X"
-}
-
-testBasicClosedStdIn() {
-  cat >test.yml <<EOL
-a: 1
-EOL
-  X=$(./yq e '.a' test.yml <&-)
-  assertEquals "1" "$X"
-}
-
-source ./scripts/shunit2

acceptance_tests/completion.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-testCompletionRuns() {
-    result=$(./yq __complete "" 2>&1)
-    assertEquals 0 $?
-    assertContains "$result" "Completion ended with directive:"
-}
-
-source ./scripts/shunit2

acceptance_tests/empty.sh

@@ -1,83 +0,0 @@
-#!/bin/bash
-
-setUp() {
-  rm test*.yml || true
-  cat >test.yml <<EOL
-# comment
-EOL
-}
-
-testEmptyEval() {
-  X=$(./yq e test.yml)
-  expected="# comment"
-  assertEquals 0 $?
-  assertEquals "$expected" "$X"
-}
-
-testEmptyEvalNoNewLine() {
-  echo -n "#comment" >test.yml
-  X=$(./yq e test.yml)
-  expected=$(cat test.yml)
-  assertEquals 0 $?
-  assertEquals "$expected" "$X"
-}
-
-testEmptyEvalNoNewLineWithExpression() {
-  echo -n "# comment" >test.yml
-  X=$(./yq e '.apple = "tree"' test.yml)
-  read -r -d '' expected << EOM
-# comment
-apple: tree
-EOM
-  assertEquals "$expected" "$X"
-}
-
-testEmptyEvalPipe() {
-  X=$(./yq e - < test.yml)
-  assertEquals 0 $?
-}
-
-testEmptyCommentsWithExpressionEval() {
-  read -r -d '' expected << EOM
-# comment
-apple: tree
-EOM
-
-  X=$(./yq e '.apple="tree"' test.yml)
-
-  assertEquals "$expected" "$X"
-}
-
-testEmptyCommentsWithExpressionEvalAll() {
-  read -r -d '' expected << EOM
-# comment
-apple: tree
-EOM
-
-  X=$(./yq ea '.apple="tree"' test.yml)
-
-  assertEquals "$expected" "$X"
-}
-
-testEmptyWithExpressionEval() {
-  rm test.yml
-  touch test.yml
-  expected="apple: tree"
-
-  X=$(./yq e '.apple="tree"' test.yml)
-
-  assertEquals "$expected" "$X"
-}
-
-testEmptyWithExpressionEvalAll() {
-  rm test.yml
-  touch test.yml
-  expected="apple: tree"
-
-  X=$(./yq ea '.apple="tree"' test.yml)
-
-  assertEquals "$expected" "$X"
-}
-
-
-source ./scripts/shunit2

acceptance_tests/front-matter.sh

@@ -1,76 +0,0 @@
-#!/bin/bash
-
-setUp() {
-  rm test*.yml || true
-  cat >test.yml <<EOL
----
-a: apple
-b: cat
----
-not yaml
-c: at
-EOL
-}
-
-testFrontMatterProcessEval() {
-  read -r -d '' expected << EOM
----
-a: apple
-b: dog
----
-not yaml
-c: at
-EOM
-  ./yq e --front-matter="process" '.b = "dog"' test.yml -i
-  assertEquals "$expected" "$(cat test.yml)"
-}
-
-testFrontMatterProcessEvalAll() {
-  read -r -d '' expected << EOM
----
-a: apple
-b: dog
----
-not yaml
-c: at
-EOM
-  ./yq ea --front-matter="process" '.b = "dog"' test.yml -i
-  assertEquals "$expected" "$(cat test.yml)"
-}
-
-testFrontMatterExtractEval() {
-    cat >test.yml <<EOL
-a: apple
-b: cat
----
-not yaml
-c: at
-EOL
-
-  read -r -d '' expected << EOM
-a: apple
-b: dog
-EOM
-  ./yq e --front-matter="extract" '.b = "dog"' test.yml -i
-  assertEquals "$expected" "$(cat test.yml)"
-}
-
-testFrontMatterExtractEvalAll() {
-  cat >test.yml <<EOL
-a: apple
-b: cat
----
-not yaml
-c: at
-EOL
-
-  read -r -d '' expected << EOM
-a: apple
-b: dog
-EOM
-  ./yq ea --front-matter="extract" '.b = "dog"' test.yml -i
-  assertEquals "$expected" "$(cat test.yml)"
-}
-
-
-source ./scripts/shunit2

acceptance_tests/header-processing-off.sh

@@ -1,43 +0,0 @@
-#!/bin/bash
-
-setUp() {
-  rm test*.yml || true
-  
-}
-
-testLineCountFirstLineComment() {
-  cat >test.yml <<EOL
-#test123 
-abc: 123 
-test123: 123123 
-#comment 
-lalilu: lalilu
-EOL
-
-  X=$(./yq '.lalilu | line' --header-preprocess=false < test.yml)
-  assertEquals "5" "$X"
-}
-
-testArrayOfDocs() {
-  cat >test.yml <<EOL
----
-# leading comment doc 1
-a: 1
----
-# leading comment doc 2
-a: 2
-EOL
-
-read -r -d '' expected << EOM
-- # leading comment doc 1
-  a: 1
-- # leading comment doc 2
-  a: 2
-EOM
-
-  X=$(./yq ea '[.]' --header-preprocess=false < test.yml)
-  assertEquals "$expected" "$X"
-
-}
-
-source ./scripts/shunit2

acceptance_tests/inputs-format-auto.sh

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

acceptance_tests/inputs-format.sh

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

acceptance_tests/leading-separator.sh

@@ -1,529 +0,0 @@
-#!/bin/bash
-
-
-# examples where header-preprocess is required
-
-setUp() {
-  rm test*.yml || true
-  cat >test.yml <<EOL
----
-a: test
-EOL
-}
-
-testLeadingSeparatorWithDoc() {
-  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"
-}
-
-
-testLeadingSeparatorWithNewlinesNewDoc() {
-  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"
-}
-
-testLeadingSeparatorWithNewlinesMoreComments() {
-  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"
-}
-
-
-testLeadingSeparatorWithDirective() {
-  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"
-}
-
-
-testLeadingSeparatorPipeIntoEvalSeq() {
-  X=$(./yq e - < test.yml)
-  expected=$(cat test.yml)
-  assertEquals "$expected" "$X"
-}
-
-testLeadingSeparatorExtractField() {
-  X=$(./yq e '.a' - < test.yml)
-  assertEquals "test" "$X"
-}
-
-testLeadingSeparatorExtractFieldWithCommentsAfterSep() {
-  cat >test.yml <<EOL
----
-# hi peeps
-# cool
-a: test
-EOL
-  X=$(./yq e '.a' test.yml)
-  assertEquals "test" "$X"
-}
-
-testLeadingSeparatorExtractFieldWithCommentsBeforeSep() {
-  cat >test.yml <<EOL
-# hi peeps
-# cool
----
-a: test
-EOL
-  X=$(./yq e '.a' test.yml)
-  assertEquals "test" "$X"
-}
-
-
-testLeadingSeparatorExtractFieldMultiDoc() {
-  cat >test.yml <<EOL
----
-a: test
----
-a: test2
-EOL
-
-  read -r -d '' expected << EOM
-test
----
-test2
-EOM
-  X=$(./yq e '.a' test.yml)
-  assertEquals "$expected" "$X"
-}
-
-testLeadingSeparatorExtractFieldMultiDocWithComments() {
-  cat >test.yml <<EOL
-# here
----
-# there
-a: test
-# wherever
----
-# you are
-a: test2
-# woop
-EOL
-
-  read -r -d '' expected << EOM
-test
----
-test2
-EOM
-  X=$(./yq e '.a' test.yml)
-  assertEquals "$expected" "$X"
-}
-
-
-testLeadingSeparatorEvalSeq() {
-  X=$(./yq e test.yml)
-  expected=$(cat test.yml)
-  assertEquals "$expected" "$X"
-}
-
-testLeadingSeparatorPipeIntoEvalAll() {
-  X=$(./yq ea - < test.yml)
-  expected=$(cat test.yml)
-  assertEquals "$expected" "$X"
-}
-
-
-testLeadingSeparatorEvalAll() {
-  X=$(./yq ea test.yml)
-  expected=$(cat test.yml)
-  assertEquals "$expected" "$X"
-}
-
-testLeadingSeparatorMultiDocEvalSimple() {
-  read -r -d '' expected << EOM
----
-a: test
----
-version: 3
-application: MyApp
-EOM
-
-
-  X=$(./yq e '.' test.yml examples/order.yaml)
-  assertEquals "$expected" "$X"
-}
-
-testLeadingSeparatorMultiDocInOneFile() {
-  cat >test.yml <<EOL
----
-# hi peeps
-# cool
-a: test
----
-b: things
-EOL
-  expected=$(cat test.yml)
-  X=$(./yq e '.' test.yml)
-  assertEquals "$expected" "$X"
-}
-
-testLeadingSeparatorMultiDocInOneFileEvalAll() {
-  cat >test.yml <<EOL
----
-# hi peeps
-# cool
-a: test
----
-b: things
-EOL
-  expected=$(cat test.yml)
-  X=$(./yq ea '.' test.yml)
-  assertEquals "$expected" "$X"
-}
-
-testLeadingSeparatorMultiDocEvalComments() {
-  cat >test.yml <<EOL
-# hi peeps
-# cool
-a: test
-EOL
-
-cat >test2.yml <<EOL
-# this is another doc
-# great
-b: sane
-EOL
-
-  read -r -d '' expected << EOM
-# hi peeps
-# cool
-a: test
----
-# this is another doc
-# great
-b: sane
-EOM
-
-
-  X=$(./yq e '.' test.yml test2.yml)
-  assertEquals "$expected" "$X"
-}
-
-testLeadingSeparatorMultiDocEvalCommentsTrailingSep() {
-  cat >test.yml <<EOL
-# hi peeps
-# cool
----
-a: test
-EOL
-
-cat >test2.yml <<EOL
-# this is another doc
-# great
----
-b: sane
-EOL
-
-  read -r -d '' expected << EOM
-# hi peeps
-# cool
----
-a: test
----
-# this is another doc
-# great
----
-b: sane
-EOM
-
-
-  X=$(./yq e '.' test.yml test2.yml)
-  assertEquals "$expected" "$X"
-}
-
-testLeadingSeparatorMultiMultiDocEvalCommentsTrailingSep() {
-  cat >test.yml <<EOL
-# hi peeps
-# cool
----
-a: test
----
-a1: test2
-EOL
-
-cat >test2.yml <<EOL
-# this is another doc
-# great
----
-b: sane
----
-b2: cool
-EOL
-
-  read -r -d '' expected << EOM
-# hi peeps
-# cool
----
-a: test
----
-a1: test2
----
-# this is another doc
-# great
----
-b: sane
----
-b2: cool
-EOM
-
-
-  X=$(./yq e '.' test.yml test2.yml)
-  assertEquals "$expected" "$X"
-}
-
-testLeadingSeparatorMultiDocEvalCommentsLeadingSep() {
-  cat >test.yml <<EOL
----
-# hi peeps
-# cool
-a: test
-EOL
-
-cat >test2.yml <<EOL
----
-# this is another doc
-# great
-b: sane
-EOL
-
-  read -r -d '' expected << EOM
----
-# hi peeps
-# cool
-a: test
----
-# this is another doc
-# great
-b: sane
-EOM
-
-
-  X=$(./yq e '.' test.yml test2.yml)
-  assertEquals "$expected" "$X"
-}
-
-# https://github.com/mikefarah/yq/issues/919
-testLeadingSeparatorDoesNotBreakCommentsOnOtherFiles() {
-  cat >test.yml <<EOL
-# a1
-a: 1
-# a2
-EOL
-
-cat >test2.yml <<EOL
-# b1
-b: 2
-# b2
-EOL
-
-  read -r -d '' expected << EOM
-# a1
-a: 1
-# a2
-
-# b1
-b: 2
-# b2
-EOM
-
-
-  X=$(./yq ea 'select(fi == 0) * select(fi == 1)' test.yml test2.yml)
-  assertEquals "$expected" "$X"
-}
-
-testLeadingSeparatorMultiDocEvalCommentsStripComments() {
-  cat >test.yml <<EOL
----
-# hi peeps
-# cool
-a: test
----
-# this is another doc
-# great
-b: sane
-EOL
-
-  # it will be hard to remove that top level separator
-  read -r -d '' expected << EOM
-a: test
----
-b: sane
-EOM
-
-  X=$(./yq e '... comments=""'  test.yml)
-  assertEquals "$expected" "$X"
-}
-
-testLeadingSeparatorMultiDocEvalCommentsLeadingSepNoDocFlag() {
-  cat >test.yml <<EOL
----
-# hi peeps
-# cool
-a: test
----
-# this is another doc
-# great
-b: sane
-EOL
-
-  read -r -d '' expected << EOM
-# hi peeps
-# cool
-a: test
-# this is another doc
-# great
-b: sane
-EOM
-
-
-  X=$(./yq e '.' --no-doc test.yml)
-  assertEquals "$expected" "$X"
-}
-
-testLeadingSeparatorMultiDocEvalJsonFlag() {
-  cat >test.yml <<EOL
----
-# hi peeps
-# cool
-a: test
-EOL
-
-cat >test2.yml <<EOL
----
-# this is another doc
-# great
-b: sane
-EOL
-
-  read -r -d '' expected << EOM
-{
-  "a": "test"
-}
-{
-  "b": "sane"
-}
-EOM
-
-
-  X=$(./yq e '.' -j test.yml test2.yml)
-  assertEquals "$expected" "$X"
-}
-
-testLeadingSeparatorMultiDocEvalAllJsonFlag() {
-  cat >test.yml <<EOL
----
-# hi peeps
-# cool
-a: test
-EOL
-
-cat >test2.yml <<EOL
----
-# this is another doc
-# great
-b: sane
-EOL
-
-  read -r -d '' expected << EOM
-{
-  "a": "test"
-}
-{
-  "b": "sane"
-}
-EOM
-
-
-  X=$(./yq ea '.' -j test.yml test2.yml)
-  assertEquals "$expected" "$X"
-}
-
-testLeadingSeparatorMultiDocEvalAll() {
-  read -r -d '' expected << EOM
----
-a: test
----
-version: 3
-application: MyApp
-EOM
-
-
-  X=$(./yq ea '.' test.yml examples/order.yaml)
-  assertEquals "$expected" "$X"
-}
-
-source ./scripts/shunit2

acceptance_tests/load-file.sh

@@ -1,27 +0,0 @@
-#!/bin/bash
-
-testLoadFileNotExist() {
-  result=$(./yq e -n 'load("cat.yml")' 2>&1)
-  assertEquals 1 $?
-  assertEquals "Error: Failed to load cat.yml: open cat.yml: no such file or directory" "$result"
-}
-
-testLoadFileExpNotExist() {
-  result=$(./yq e -n 'load(.a)' 2>&1)
-  assertEquals 1 $?
-  assertEquals "Error: filename expression returned nil" "$result"
-}
-
-testStrLoadFileNotExist() {
-  result=$(./yq e -n 'strload("cat.yml")' 2>&1)
-  assertEquals 1 $?
-  assertEquals "Error: Failed to load cat.yml: open cat.yml: no such file or directory" "$result"
-}
-
-testStrLoadFileExpNotExist() {
-  result=$(./yq e -n 'strload(.a)' 2>&1)
-  assertEquals 1 $?
-  assertEquals "Error: filename expression returned nil" "$result"
-}
-
-source ./scripts/shunit2

acceptance_tests/nul-separator.sh

@@ -1,286 +0,0 @@
-#!/bin/bash
-
-setUp() {
-    rm test*.yml || true
-}
-
-## Convenient bash shortcut to read records of NUL separated values
-## from stdin the safe way. See example usage in the next tests.
-read-0() {
-    local eof="" IFS=''
-    while [ "$1" ]; do
-        ## - The `-r` avoids bad surprise with '\n' and other interpreted
-        ##   sequences that can be read.
-        ## - The `-d ''` is the (strange?) way to refer to NUL delimiter.
-        ## - The `--` is how to avoid unpleasant surprises if your
-        ##   "$1" starts with "-" (minus) sign. This protection also
-        ##   will produce a readable error if you want to try to start
-        ##   your variable names with a "-".
-        read -r -d '' -- "$1" || eof=1
-        shift
-    done
-    [ -z "$eof" ] ## fail on EOF
-}
-
-## Convenient bash shortcut to be used with the next function `p-err`
-## to read NUL separated values the safe way AND catch any errors from
-## the process creating the stream of NUL separated data.  See example
-## usage in the tests.
-read-0-err() {
-    local ret="$1" eof="" idx=0 last=
-    read -r -- "${ret?}" <<<"0"
-    shift
-    while [ "$1" ]; do
-        last=$idx
-        read -r -d '' -- "$1" || {
-            ## Put this last value in ${!ret}
-            eof="$1"
-            read -r -- "$ret" <<<"${!eof}"
-            break
-        }
-        ((idx++))
-        shift
-    done
-    [ -z "$eof" ] || {
-        if [ "$last" != 0 ]; then
-            ## Uhoh, we have no idea if the errorlevel of the internal
-            ## command was properly delimited with a NUL char, and
-            ## anyway something went really wrong at least about the
-            ## number of fields separated by NUL char and the one
-            ## expected.
-            echo "Error: read-0-err couldn't fill all value $ret = '${!ret}', '$eof', '${!eof}'" >&2
-            read -r -- "$ret" <<<"not-enough-values"
-        else
-            if ! [[ "${!ret}" =~ ^[0-9]+$ && "${!ret}" -ge 0 && "${!ret}" -le 127 ]]; then
-                ## This could happen if you don't use `p-err` wrapper,
-                ## or used stdout in unexpected ways in your inner
-                ## command.
-                echo "Error: last value is not a number, did you finish with an errorlevel ?" >&2
-                read -r -- "$ret" <<<"last-value-not-a-number"
-            fi
-        fi
-        false
-    }
-}
-
-## Simply runs command given as argument and adds errorlevel in the
-## standard output. Is expected to be used in tandem with
-## `read-0-err`.
-p-err() {
-    local exp="$1"
-    "$@"
-    printf "%s" "$?"
-}
-
-wyq-r() {
-    local exp="$1"
-    ./yq e -0 -r=false "$1"
-    printf "%s" "$?"
-}
-
-testBasicUsageRaw() {
-  cat >test.yml <<EOL
-a: foo
-b: bar
-EOL
-
-  printf "foo\0bar\0" > expected.out
-
-  ## We need to compare binary content here. We have to filter the compared
-  ## content through a representation that gets rid of NUL chars but accurately
-  ## transcribe the content.
-  ## Also as it would be nice to have a pretty output in case the test fails,
-  ## we use here 'hd': a widely available shortcut to 'hexdump' that will
-  ## pretty-print any binary to it's hexadecimal representation.
-  ##
-  ## Note that the standard `assertEquals` compare its arguments
-  ## value, but they can't hold NUL characters (this comes from the
-  ## limitation of the C API of `exec*(..)` functions that requires
-  ## `const char *arv[]`). And these are NUL terminated strings.  As a
-  ## consequence, the NUL characters gets removed in bash arguments.
-  assertEquals "$(hd expected.out)" \
-               "$(./yq e -0 '.a, .b' test.yml | hd)"
-
-  rm expected.out
-}
-
-testBasicUsage() {
-  local a b
-  cat >test.yml <<EOL
-a: foo
-b: bar
-EOL
-
-  ## We provide 2 values, and ask to fill 2 variables.
-  read-0 a b < <(./yq e -0 '.a, .b' test.yml)
-  assertEquals "$?" "0"      ## Everything is fine
-  assertEquals "foo" "$a"    ## Values are correctly parsed
-  assertEquals "bar" "$b"
-
-  a=YYY ; b=XXX
-  ## Not enough values provided to fill `a` and `b`.
-  read-0 a b < <(./yq e -0 '.a' test.yml)
-  assertEquals "$?" "1"      ## An error was emitted
-  assertEquals "foo" "$a"    ## First value was correctly parsed
-  assertEquals "" "$b"       ## Second was still reset
-
-  ## Error from inner command are not catchable !. Use
-  ## `read-0-err`/`p-err` for that.
-  read-0 a < <(printf "\0"; ./yq e -0 'xxx' test.yml; )
-  assertEquals "$?" "0"
-
-}
-
-testBasicUsageJson() {
-  cat >test.yml <<EOL
-a:
-  x: foo
-b: bar
-EOL
-
-  read-0 a b < <(./yq e -0 -o=json '.a, .b' test.yml)
-
-  assertEquals '{
-  "x": "foo"
-}' "$a"
-  assertEquals '"bar"' "$b"
-
-}
-
-testFailWithValueContainingNUL() {
-  local a b c
-  ## Note that value of field 'a' actually contains a NUL char !
-  cat >test.yml <<EOL
-a: "foo\u0000bar"
-b: 1
-c: |
-  wiz
-  boom
-EOL
-
-  ## We are looking for trouble with asking to separated fields with NUL
-  ## char and requested value `.a` actually contains itself a NUL char !
-  read-0 a b c < <(./yq e -0 '.a, .b, .c' test.yml)
-  assertNotEquals "0" "$?"   ## read-0 failed to fill all values
-
-  ## But here, we can request for one value, even if `./yq` fails
-  read-0 b < <(./yq e -0 '.b, .a' test.yml)
-  assertEquals "0" "$?"   ## read-0 succeeds at feeding the first value
-  ## Note: to catch the failure of `yq`, see in the next tests the usage
-  ## of `read-0-err`.
-
-  ## using -r=false solves any NUL containing value issues, but keeps
-  ## all in YAML representation:
-  read-0 a b c < <(./yq e -0 -r=false '.a, .b, .c' test.yml)
-  assertEquals "0" "$?"    ## All goes well despite asking for `a` value
-
-  assertEquals '"foo\0bar"' "$a"   ## This is a YAML string representation
-  assertEquals '1' "$b"
-  assertEquals '|
-  wiz
-  boom' "$c"
-}
-
-testStandardLoop() {
-    local E a b res
-
-    ## Here everything is normal: 4 values, that will be paired
-    ## in key/values.
-    cat >test.yml <<EOL
-- yay
-- wiz
-- hop
-- pow
-EOL
-
-    res=""
-    while read-0-err E a b; do
-        res+="$a: $b;"
-    done < <(p-err ./yq -0 '.[]' test.yml)
-
-    assertEquals "0" "$E"                     ## errorlevel of internal command
-    assertEquals "yay: wiz;hop: pow;" "$res"  ## expected result
-}
-
-testStandardLoopWithoutEnoughValues() {
-    local E a b res
-
-    ## Here 5 values, there will be a missing value when reading
-    ## pairs of value.
-    cat >test.yml <<EOL
-- yay
-- wiz
-- hop
-- pow
-- kwak
-EOL
-
-    res=""
-    ## The loop will succeed 2 times then fail
-    while read-0-err E a b; do
-        res+="$a: $b;"
-    done < <(p-err ./yq -0 '.[]' test.yml)
-
-    assertEquals "not-enough-values" "$E"     ## Not enough value error
-    assertEquals "yay: wiz;hop: pow;" "$res"  ## the 2 full key/value pairs
-
-}
-
-testStandardLoopWithInternalCmdError() {
-    local E a b res
-
-    ## Note the third value contains a NUL char !
-    cat >test.yml <<EOL
-- yay
-- wiz
-- "foo\0bar"
-- hop
-- pow
-EOL
-
-    res=""
-    ## It should be only upon the second pass in the loop that
-    ## read-0-err will catch the fact that there is an error !
-    while read-0-err E a b; do
-        res+="$a: $b;"
-    done < <(p-err ./yq -0 '.[]' test.yml)
-    assertEquals "1" "$E"            ## Internal command errorlevel (from `./yq`)
-    assertEquals "yay: wiz;" "$res"  ## first 2 values were ok at least
-
-}
-
-testStandardLoopNotEnoughErrorEatsCmdError() {
-    local E a b res
-
-    ## Because of possible edge cases where the internal errorlevel
-    ## reported by `p-err` in the standard output might be mangled
-    ## with the unfinished record, `read-0-err E ...` will NOT report
-    ## the internal command error in the variable E and instead will
-    ## store the value 'not-enough-values'. In real world, anyway, you
-    ## will want to react the same if the internal command failed
-    ## and/or you didn't get as much values as expected while
-    ## reading. Keep in mind also that standard error is not
-    ## swallowed, so you can read reports from the inner command AND
-    ## from `read-0-err`.
-
-    ## Here, note that the fourth value contains a NUL char !
-    cat >test.yml <<EOL
-- yay
-- wiz
-- hop
-- "foo\0bar"
-- pow
-EOL
-
-    res=""
-    ## It should be only upon the second loop that read-0-err will catch
-    ## the fact that there are not enough data to fill the requested variables
-    while read-0-err E a b; do
-        res+="$a: $b;"
-    done < <(p-err ./yq -0 '.[]' test.yml)
-    assertEquals "not-enough-values" "$E"          ## Not enough values error eats internal error !
-    assertEquals "yay: wiz;" "$res"  ## first 2 values were ok at least
-}
-
-
-source ./scripts/shunit2

acceptance_tests/output-format.sh

@@ -1,322 +0,0 @@
-#!/bin/bash
-
-setUp() {
-  rm test*.yml || true
-}
-
-testOutputJsonDeprecated() {
-  cat >test.yml <<EOL
-a: {b: ["cat"]}
-EOL
-
-  read -r -d '' expected << EOM
-{
-  "a": {
-    "b": [
-      "cat"
-    ]
-  }
-}
-EOM
-
-  X=$(./yq e -j test.yml)
-  assertEquals "$expected" "$X"
-
-  X=$(./yq ea -j test.yml)
-  assertEquals "$expected" "$X"
-}
-
-testOutputJson() {
-  cat >test.yml <<EOL
-a: {b: ["cat"]}
-EOL
-
-  read -r -d '' expected << EOM
-{
-  "a": {
-    "b": [
-      "cat"
-    ]
-  }
-}
-EOM
-
-  X=$(./yq e --output-format=json test.yml)
-  assertEquals "$expected" "$X"
-
-  X=$(./yq ea --output-format=json test.yml)
-  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"
-}
-
-testOutputYamlRawOnRoot() {
-  cat >test.yml <<EOL
-'a'
-EOL
-
-  X=$(./yq e -r '.' test.yml)
-  assertEquals "a" "$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"]}
-EOL
-
-  read -r -d '' expected << EOM
-{
-  "a": {
-    "b": [
-      "cat"
-    ]
-  }
-}
-EOM
-
-  X=$(./yq e -o=j test.yml)
-  assertEquals "$expected" "$X"
-
-  X=$(./yq ea -o=j test.yml)
-  assertEquals "$expected" "$X"
-}
-
-testOutputProperties() {
-  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 --output-format=props test.yml)
-  assertEquals "$expected" "$X"
-
-  X=$(./yq ea --output-format=props test.yml)
-  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"]}}
-EOL
-
-  read -r -d '' expected << EOM
-a.b.c.0 = cat cat
-EOM
-
-  X=$(./yq e -o=p test.yml)
-  assertEquals "$expected" "$X"
-
-  X=$(./yq ea -o=p test.yml)
-  assertEquals "$expected" "$X"
-}
-
-testOutputCSV() {
-  cat >test.yml <<EOL
-- fruit: apple
-  yumLevel: 5
-- fruit: banana
-  yumLevel: 4
-EOL
-
-  read -r -d '' expected << EOM
-fruit,yumLevel
-apple,5
-banana,4
-EOM
-
-  X=$(./yq -o=c test.yml)
-  assertEquals "$expected" "$X"
-
-  X=$(./yq ea -o=csv test.yml)
-  assertEquals "$expected" "$X"
-}
-
-testOutputTSV() {
-  cat >test.yml <<EOL
-- fruit: apple
-  yumLevel: 5
-- fruit: banana
-  yumLevel: 4
-EOL
-
-  read -r -d '' expected << EOM
-fruit	yumLevel
-apple	5
-banana	4
-EOM
-
-  X=$(./yq -o=t test.yml)
-  assertEquals "$expected" "$X"
-
-  X=$(./yq ea -o=tsv test.yml)
-  assertEquals "$expected" "$X"
-}
-
-testOutputXml() {
-  cat >test.yml <<EOL
-a: {b: {c: ["cat"]}}
-EOL
-
-  read -r -d '' expected << EOM
-<a>
-  <b>
-    <c>cat</c>
-  </b>
-</a>
-EOM
-
-  X=$(./yq e --output-format=xml test.yml)
-  assertEquals "$expected" "$X"
-
-  X=$(./yq ea --output-format=xml test.yml)
-  assertEquals "$expected" "$X"
-}
-
-testOutputXmlShort() {
-  cat >test.yml <<EOL
-a: {b: {c: ["cat"]}}
-EOL
-
-  read -r -d '' expected << EOM
-<a>
-  <b>
-    <c>cat</c>
-  </b>
-</a>
-EOM
-
-  X=$(./yq e --output-format=x test.yml)
-  assertEquals "$expected" "$X"
-
-  X=$(./yq ea --output-format=x test.yml)
-  assertEquals "$expected" "$X"
-}
-
-testOutputXmComplex() {
-  cat >test.yml <<EOL
-a: {b: {c: ["cat", "dog"], +@f: meow}}
-EOL
-
-  read -r -d '' expected << EOM
-<a>
-  <b f="meow">
-    <c>cat</c>
-    <c>dog</c>
-  </b>
-</a>
-EOM
-
-  X=$(./yq e --output-format=x test.yml)
-  assertEquals "$expected" "$X"
-
-  X=$(./yq ea --output-format=x test.yml)
-  assertEquals "$expected" "$X"
-}
-
-testLuaOutputPretty() {
-  cat >test.yml <<EOL
-animals:
-  cat: meow
-EOL
-
-  read -r -d '' expected << EOM
-return {
-	["animals"] = {
-		["cat"] = "meow";
-	};
-};
-EOM
-
-  X=$(./yq e --output-format=lua test.yml)
-  assertEquals "$expected" "$X"
-
-  X=$(./yq e --output-format=lua --prettyPrint test.yml)
-  assertEquals "$expected" "$X"
-
-}
-
-testLuaOutputSubset() {
-  cat >test.yml <<EOL
-animals:
-  cat: meow
-EOL
-
-  read -r -d '' expected << EOM
-return {
-	["cat"] = "meow";
-};
-EOM
-
-  X=$(./yq e --output-format=lua '.animals' test.yml)
-  assertEquals "$expected" "$X"
-
-}
-
-source ./scripts/shunit2

acceptance_tests/pipe.sh

@@ -1,70 +0,0 @@
-#!/bin/bash
-
-setUp() {
-  rm test*.yml || true
-  cat >test.yml <<EOL
-a: frog
-EOL
-}
-
-testPipeViaCatWithParam() {
-  X=$(cat test.yml | ./yq '.a')
-  assertEquals "frog" "$X"
-}
-
-testPipeViaCatWithParamEval() {
-  X=$(cat test.yml | ./yq e '.a')
-  assertEquals "frog" "$X"
-}
-
-testPipeViaCatWithParamEvalAll() {
-  X=$(cat test.yml | ./yq ea '.a')
-  assertEquals "frog" "$X"
-}
-
-testPipeViaCatNoParam() {
-  X=$(cat test.yml | ./yq)
-  assertEquals "a: frog" "$X"
-}
-
-testPipeViaCatNoParamEval() {
-  X=$(cat test.yml | ./yq e)
-  assertEquals "a: frog" "$X"
-}
-
-testPipeViaCatNoParamEvalAll() {
-  X=$(cat test.yml | ./yq ea)
-  assertEquals "a: frog" "$X"
-}
-
-testPipeViaFileishWithParam() {
-  X=$(./yq '.a' < test.yml)
-  assertEquals "frog" "$X"
-}
-
-testPipeViaFileishWithParamEval() {
-  X=$(./yq e '.a' < test.yml)
-  assertEquals "frog" "$X"
-}
-
-testPipeViaFileishWithParamEvalAll() {
-  X=$(./yq ea '.a' < test.yml)
-  assertEquals "frog" "$X"
-}
-
-testPipeViaFileishNoParam() {
-  X=$(./yq < test.yml)
-  assertEquals "a: frog" "$X"
-}
-
-testPipeViaFileishNoParamEval() {
-  X=$(./yq e < test.yml)
-  assertEquals "a: frog" "$X"
-}
-
-testPipeViaFileishNoParamEvalAll() {
-  X=$(./yq ea < test.yml)
-  assertEquals "a: frog" "$X"
-}
-
-source ./scripts/shunit2

acceptance_tests/pretty-print.sh

@@ -1,176 +0,0 @@
-#!/bin/bash
-
-setUp() {
-  rm test*.yml || true
-}
-
-testPrettyPrintWithBooleans() {
-  cat >test.yml <<EOL
-leaveUnquoted: [yes, no, on, off, y, n, true, false]
-leaveQuoted: ["yes", "no", "on", "off", "y", "n", "true", "false"]
-
-EOL
-
-  read -r -d '' expected << EOM
-leaveUnquoted:
-  - yes
-  - no
-  - on
-  - off
-  - y
-  - n
-  - true
-  - false
-leaveQuoted:
-  - "yes"
-  - "no"
-  - "on"
-  - "off"
-  - "y"
-  - "n"
-  - "true"
-  - "false"
-EOM
-
-  X=$(./yq e --prettyPrint test.yml)
-  assertEquals "$expected" "$X"
-
-  X=$(./yq ea --prettyPrint test.yml)
-  assertEquals "$expected" "$X"
-}
-
-testPrettyPrintWithBooleansCapitals() {
-  cat >test.yml <<EOL
-leaveUnquoted: [YES, NO, ON, OFF, Y, N, TRUE, FALSE]
-leaveQuoted: ["YES", "NO", "ON", "OFF", "Y", "N", "TRUE", "FALSE"]
-EOL
-
-  read -r -d '' expected << EOM
-leaveUnquoted:
-  - YES
-  - NO
-  - ON
-  - OFF
-  - Y
-  - N
-  - TRUE
-  - FALSE
-leaveQuoted:
-  - "YES"
-  - "NO"
-  - "ON"
-  - "OFF"
-  - "Y"
-  - "N"
-  - "TRUE"
-  - "FALSE"
-EOM
-
-  X=$(./yq e --prettyPrint test.yml)
-  assertEquals "$expected" "$X"
-
-  X=$(./yq ea --prettyPrint test.yml)
-  assertEquals "$expected" "$X"
-}
-
-testPrettyPrintOtherStringValues() {
-  cat >test.yml <<EOL
-leaveUnquoted: [yesSir, hellno, bonapite]
-makeUnquoted: ["yesSir", "hellno", "bonapite"]
-EOL
-
-  read -r -d '' expected << EOM
-leaveUnquoted:
-  - yesSir
-  - hellno
-  - bonapite
-makeUnquoted:
-  - yesSir
-  - hellno
-  - bonapite
-EOM
-
-  X=$(./yq e --prettyPrint test.yml)
-  assertEquals "$expected" "$X"
-
-  X=$(./yq ea --prettyPrint test.yml)
-  assertEquals "$expected" "$X"
-}
-
-testPrettyPrintKeys() {
-  cat >test.yml <<EOL
-"removeQuotes": "please"
-EOL
-
-  read -r -d '' expected << EOM
-removeQuotes: please
-EOM
-
-  X=$(./yq e --prettyPrint test.yml)
-  assertEquals "$expected" "$X"
-
-  X=$(./yq ea --prettyPrint test.yml)
-  assertEquals "$expected" "$X"
-}
-
-testPrettyPrintOtherStringValues() {
-  cat >test.yml <<EOL
-leaveUnquoted: [yesSir, hellno, bonapite]
-makeUnquoted: ["yesSir", "hellno", "bonapite"]
-EOL
-
-  read -r -d '' expected << EOM
-leaveUnquoted:
-  - yesSir
-  - hellno
-  - bonapite
-makeUnquoted:
-  - yesSir
-  - hellno
-  - bonapite
-EOM
-
-  X=$(./yq e --prettyPrint test.yml)
-  assertEquals "$expected" "$X"
-
-  X=$(./yq ea --prettyPrint test.yml)
-  assertEquals "$expected" "$X"
-}
-
-testPrettyPrintStringBlocks() {
-  cat >test.yml <<EOL
-"removeQuotes": | 
-  "please"
-EOL
-
-  read -r -d '' expected << EOM
-removeQuotes: |
-  "please"
-EOM
-
-  X=$(./yq e --prettyPrint test.yml)
-  assertEquals "$expected" "$X"
-
-  X=$(./yq ea --prettyPrint test.yml)
-  assertEquals "$expected" "$X"
-}
-
-testPrettyPrintWithExpression() {
-  cat >test.yml <<EOL
-a: {b: {c: ["cat"]}}
-EOL
-
-  read -r -d '' expected << EOM
-b:
-  c:
-    - cat
-EOM
-
-  X=$(./yq e '.a' --prettyPrint test.yml)
-  assertEquals "$expected" "$X"
-
-  X=$(./yq ea '.a' --prettyPrint test.yml)
-  assertEquals "$expected" "$X"
-}
-
-source ./scripts/shunit2

acceptance_tests/split-printer.sh

@@ -1,207 +0,0 @@
-#!/bin/bash
-
-setUp() {
-  rm test*.yml || true
-}
-
-testBasicSplitWithName() {
-  cat >test.yml <<EOL
-a: test_doc1
---- 
-a: test_doc2
-EOL
-
-  ./yq e test.yml -s ".a"
-
-  doc1=$(cat test_doc1.yml)
-  
-  assertEquals "a: test_doc1" "$doc1"
-
-  doc2=$(cat test_doc2.yml)
-  read -r -d '' expectedDoc2 << EOM
----
-a: test_doc2
-EOM
-  assertEquals "$expectedDoc2" "$doc2"
-}
-
-testBasicSplitWithNameCustomExtension() {
-  rm test*.yaml || true
-  cat >test.yml <<EOL
-a: test_doc1
---- 
-a: test_doc2
-EOL
-
-  ./yq e test.yml -s '.a + ".yaml"'
-
-  doc1=$(cat test_doc1.yaml)
-  
-  assertEquals "a: test_doc1" "$doc1"
-
-  doc2=$(cat test_doc2.yaml)
-  read -r -d '' expectedDoc2 << EOM
----
-a: test_doc2
-EOM
-  assertEquals "$expectedDoc2" "$doc2"
-}
-
-
-
-
-testSplitFromFile() {
-  cat >test.yml <<EOL
-a: test_doc1
---- 
-a: test_doc2
-EOL
-
-cat >test_splitExp.yml <<EOL
-.a
-EOL
-
-  ./yq test.yml --split-exp-file test_splitExp.yml
-
-  doc1=$(cat test_doc1.yml)
-  
-  assertEquals "a: test_doc1" "$doc1"
-
-  doc2=$(cat test_doc2.yml)
-  read -r -d '' expectedDoc2 << EOM
----
-a: test_doc2
-EOM
-  assertEquals "$expectedDoc2" "$doc2"
-}
-
-testBasicSplitWithNameEvalAll() {
-  cat >test.yml <<EOL
-a: test_doc1
---- 
-a: test_doc2
-EOL
-
-  ./yq ea test.yml -s ".a"
-
-  doc1=$(cat test_doc1.yml)
-  
-  assertEquals "a: test_doc1" "$doc1"
-
-  doc2=$(cat test_doc2.yml)
-  read -r -d '' expectedDoc2 << EOM
----
-a: test_doc2
-EOM
-  assertEquals "$expectedDoc2" "$doc2"
-}
-
-testBasicSplitWithIndex() {
-  cat >test.yml <<EOL
-a: test_doc1
---- 
-a: test_doc2
-EOL
-
-  ./yq e test.yml -s '"test_" + $index'
-
-  doc1=$(cat test_0.yml)
-  
-  assertEquals "a: test_doc1" "$doc1"
-
-  doc2=$(cat test_1.yml)
-  read -r -d '' expectedDoc2 << EOM
----
-a: test_doc2
-EOM
-  assertEquals "$expectedDoc2" "$doc2"
-}
-
-testBasicSplitWithIndexEvalAll() {
-  cat >test.yml <<EOL
-a: test_doc1
---- 
-a: test_doc2
-EOL
-
-  ./yq ea test.yml -s '"test_" + $index'
-
-  doc1=$(cat test_0.yml)
-  
-  assertEquals "a: test_doc1" "$doc1"
-
-  doc2=$(cat test_1.yml)
-  read -r -d '' expectedDoc2 << EOM
----
-a: test_doc2
-EOM
-  assertEquals "$expectedDoc2" "$doc2"
-}
-
-
-testArraySplitWithNameNoSeparators() {
-  cat >test.yml <<EOL
-- name: test_fred
-  age: 35
-- name: test_catherine
-  age: 37
-EOL
-
-  ./yq e --no-doc -s ".name"  ".[]" test.yml 
-
-  doc1=$(cat test_fred.yml)
-  read -r -d '' expectedDoc1 << EOM
-name: test_fred
-age: 35
-EOM
-
-  assertEquals "$expectedDoc1" "$doc1"
-
-  doc2=$(cat test_catherine.yml)
-  read -r -d '' expectedDoc2 << EOM
-name: test_catherine
-age: 37
-EOM
-  assertEquals "$expectedDoc2" "$doc2"
-}
-
-testArraySplitWithNameNoSeparatorsEvalAll() {
-  cat >test.yml <<EOL
-- name: test_fred
-  age: 35
-- name: test_catherine
-  age: 37
-EOL
-
-cat >test2.yml <<EOL
-- name: test_mike
-  age: 564
-EOL
-
-  ./yq ea --no-doc -s ".name"  ".[]" test.yml test2.yml
-
-  doc1=$(cat test_fred.yml)
-  read -r -d '' expectedDoc1 << EOM
-name: test_fred
-age: 35
-EOM
-
-  assertEquals "$expectedDoc1" "$doc1"
-
-  doc2=$(cat test_catherine.yml)
-  read -r -d '' expectedDoc2 << EOM
-name: test_catherine
-age: 37
-EOM
-  assertEquals "$expectedDoc2" "$doc2"
-
-
-  doc3=$(cat test_mike.yml)
-  read -r -d '' expectedDoc3 << EOM
-name: test_mike
-age: 564
-EOM
-  assertEquals "$expectedDoc3" "$doc3"
-}
-
-source ./scripts/shunit2

action.yml

@@ -1,17 +1,13 @@
 name: 'yq - portable yaml processor'
 description: 'create, read, update, delete, merge, validate and do more with yaml'
-branding:
-  icon: command
-  color: gray-dark
+icon: command
+color: gray-dark
 inputs:
   cmd:
     description: 'The Command which should be run'
     required: true
-outputs:
-  result:
-    description: "The complete result from the yq command being run"
 runs:
   using: 'docker'
-  image: 'docker://mikefarah/yq:4-githubaction'
+  image: 'github-action/Dockerfile'
   args:
     - ${{ inputs.cmd }}

cmd/commands_test.go

@@ -0,0 +1,83 @@
+package cmd
+
+// import (
+// 	"strings"
+// 	"testing"
+
+// 	"github.com/mikefarah/yq/v3/test"
+// 	"github.com/spf13/cobra"
+// )
+
+// func getRootCommand() *cobra.Command {
+// 	return New()
+// }
+
+// func TestRootCmd(t *testing.T) {
+// 	cmd := getRootCommand()
+// 	result := test.RunCmd(cmd, "")
+// 	if result.Error != nil {
+// 		t.Error(result.Error)
+// 	}
+
+// 	if !strings.Contains(result.Output, "Usage:") {
+// 		t.Error("Expected usage message to be printed out, but the usage message was not found.")
+// 	}
+// }
+
+// func TestRootCmd_Help(t *testing.T) {
+// 	cmd := getRootCommand()
+// 	result := test.RunCmd(cmd, "--help")
+// 	if result.Error != nil {
+// 		t.Error(result.Error)
+// 	}
+
+// 	if !strings.Contains(result.Output, "yq is a lightweight and portable command-line YAML processor. It aims to be the jq or sed of yaml files.") {
+// 		t.Error("Expected usage message to be printed out, but the usage message was not found.")
+// 	}
+// }
+
+// func TestRootCmd_VerboseLong(t *testing.T) {
+// 	cmd := getRootCommand()
+// 	result := test.RunCmd(cmd, "--verbose")
+// 	if result.Error != nil {
+// 		t.Error(result.Error)
+// 	}
+
+// 	if !verbose {
+// 		t.Error("Expected verbose to be true")
+// 	}
+// }
+
+// func TestRootCmd_VerboseShort(t *testing.T) {
+// 	cmd := getRootCommand()
+// 	result := test.RunCmd(cmd, "-v")
+// 	if result.Error != nil {
+// 		t.Error(result.Error)
+// 	}
+
+// 	if !verbose {
+// 		t.Error("Expected verbose to be true")
+// 	}
+// }
+
+// func TestRootCmd_VersionShort(t *testing.T) {
+// 	cmd := getRootCommand()
+// 	result := test.RunCmd(cmd, "-V")
+// 	if result.Error != nil {
+// 		t.Error(result.Error)
+// 	}
+// 	if !strings.Contains(result.Output, "yq version") {
+// 		t.Error("expected version message to be printed out, but the message was not found.")
+// 	}
+// }
+
+// func TestRootCmd_VersionLong(t *testing.T) {
+// 	cmd := getRootCommand()
+// 	result := test.RunCmd(cmd, "--version")
+// 	if result.Error != nil {
+// 		t.Error(result.Error)
+// 	}
+// 	if !strings.Contains(result.Output, "yq version") {
+// 		t.Error("expected version message to be printed out, but the message was not found.")
+// 	}
+// }

cmd/constant.go

@@ -1,16 +1,10 @@
 package cmd
 
-var unwrapScalarFlag = newUnwrapFlag()
-
-var unwrapScalar = false
+var unwrapScalar = true
 
 var writeInplace = false
 var outputToJSON = false
 
-var outputFormat = ""
-
-var inputFormat = ""
-
 var exitStatus = false
 var forceColor = false
 var forceNoColor = false
@@ -18,19 +12,7 @@ var colorsEnabled = false
 var indent = 2
 var noDocSeparators = false
 var nullInput = false
-var nulSepOutput = false
 var verbose = false
 var version = false
-var prettyPrint = false
-
-// can be either "" (off), "extract" or "process"
-var frontMatter = ""
-
-var splitFileExp = ""
-var splitFileExpFile = ""
 
 var completedSuccessfully = false
-
-var forceExpression = ""
-
-var expressionFile = ""

cmd/evaluate_all_command.go

@@ -2,6 +2,8 @@ package cmd
 
 import (
 	"errors"
+	"fmt"
+	"os"
 
 	"github.com/mikefarah/yq/v4/pkg/yqlib"
 	"github.com/spf13/cobra"
@@ -13,115 +15,69 @@ func createEvaluateAllCommand() *cobra.Command {
 		Aliases: []string{"ea"},
 		Short:   "Loads _all_ yaml documents of _all_ yaml files and runs expression once",
 		Example: `
-# Merge f2.yml into f1.yml (in place)
-yq eval-all --inplace 'select(fileIndex == 0) * select(fileIndex == 1)' f1.yml f2.yml
-## the same command and expression using shortened names:
-yq ea -i 'select(fi == 0) * select(fi == 1)' f1.yml f2.yml
-
-
-# Merge all given files
-yq ea '. as $item ireduce ({}; . * $item )' file1.yml file2.yml ...
-
-# Pipe from STDIN
-## use '-' as a filename to pipe from STDIN
-cat file2.yml | yq ea '.a.b' file1.yml - file3.yml
-`,
-		Long: `yq is a portable command-line YAML processor (https://github.com/mikefarah/yq/) 
-See https://mikefarah.gitbook.io/yq/ for detailed documentation and examples.
-
-## Evaluate All ##
-This command loads _all_ yaml documents of _all_ yaml files and runs expression once
-Useful when you need to run an expression across several yaml documents or files (like merge).
-Note that it consumes more memory than eval.
+# merges f2.yml into f1.yml (inplace)
+yq eval-all --inplace 'select(fileIndex == 0) * select(fileIndex == 1)' f1.yml f2.yml		
 `,
+		Long: "Evaluate All:\nUseful when you need to run an expression across several yaml documents or files. Consumes more memory than eval",
 		RunE: evaluateAll,
 	}
 	return cmdEvalAll
 }
-func evaluateAll(cmd *cobra.Command, args []string) (cmdError error) {
+func evaluateAll(cmd *cobra.Command, args []string) error {
+	cmd.SilenceUsage = true
 	// 0 args, read std in
 	// 1 arg, null input, process expression
 	// 1 arg, read file in sequence
 	// 2+ args, [0] = expression, file the rest
 
 	var err error
-
-	expression, args, err := initCommand(cmd, args)
-	if err != nil {
-		return err
-	}
+	stat, _ := os.Stdin.Stat()
+	pipingStdIn := (stat.Mode() & os.ModeCharDevice) == 0
 
 	out := cmd.OutOrStdout()
 
+	fileInfo, _ := os.Stdout.Stat()
+
+	if forceColor || (!forceNoColor && (fileInfo.Mode()&os.ModeCharDevice) != 0) {
+		colorsEnabled = true
+	}
+
+	if writeInplace && len(args) < 2 {
+		return fmt.Errorf("Write inplace flag only applicable when giving an expression and at least one file")
+	}
+
 	if writeInplace {
 		// only use colors if its forced
 		colorsEnabled = forceColor
-		writeInPlaceHandler := yqlib.NewWriteInPlaceHandler(args[0])
+		writeInPlaceHandler := yqlib.NewWriteInPlaceHandler(args[1])
 		out, err = writeInPlaceHandler.CreateTempFile()
 		if err != nil {
 			return err
 		}
 		// need to indirectly call the function so  that completedSuccessfully is
 		// passed when we finish execution as opposed to now
-		defer func() {
-			if cmdError == nil {
-				cmdError = writeInPlaceHandler.FinishWriteInPlace(completedSuccessfully)
-			}
-		}()
+		defer func() { writeInPlaceHandler.FinishWriteInPlace(completedSuccessfully) }()
 	}
 
-	format, err := yqlib.OutputFormatFromString(outputFormat)
-	if err != nil {
-		return err
-	}
-
-	decoder, err := configureDecoder(true)
-	if err != nil {
-		return err
-	}
-
-	printerWriter, err := configurePrinterWriter(format, out)
-	if err != nil {
-		return err
-	}
-	encoder, err := configureEncoder()
-	if err != nil {
-		return err
-	}
-
-	printer := yqlib.NewPrinter(encoder, printerWriter)
-	if nulSepOutput {
-		printer.SetNulSepOutput(true)
-	}
-
-	if frontMatter != "" {
-		frontMatterHandler := yqlib.NewFrontMatterHandler(args[0])
-		err = frontMatterHandler.Split()
-		if err != nil {
-			return err
-		}
-		args[0] = frontMatterHandler.GetYamlFrontMatterFilename()
-
-		if frontMatter == "process" {
-			reader := frontMatterHandler.GetContentReader()
-			printer.SetAppendix(reader)
-			defer yqlib.SafelyCloseReader(reader)
-		}
-		defer frontMatterHandler.CleanUp()
-	}
+	printer := yqlib.NewPrinter(out, outputToJSON, unwrapScalar, colorsEnabled, indent, !noDocSeparators)
 
 	allAtOnceEvaluator := yqlib.NewAllAtOnceEvaluator()
-
 	switch len(args) {
 	case 0:
-		if nullInput {
-			err = yqlib.NewStreamEvaluator().EvaluateNew(processExpression(expression), printer)
+		if pipingStdIn {
+			err = allAtOnceEvaluator.EvaluateFiles("", []string{"-"}, printer)
 		} else {
 			cmd.Println(cmd.UsageString())
 			return nil
 		}
+	case 1:
+		if nullInput {
+			err = yqlib.NewStreamEvaluator().EvaluateNew(args[0], printer)
+		} else {
+			err = allAtOnceEvaluator.EvaluateFiles("", []string{args[0]}, printer)
+		}
 	default:
-		err = allAtOnceEvaluator.EvaluateFiles(processExpression(expression), args, printer, decoder)
+		err = allAtOnceEvaluator.EvaluateFiles(args[0], args[1:], printer)
 	}
 
 	completedSuccessfully = err == nil

cmd/evaluate_sequence_command.go

@@ -1,147 +0,0 @@
-package cmd
-
-import (
-	"errors"
-	"fmt"
-
-	"github.com/mikefarah/yq/v4/pkg/yqlib"
-	"github.com/spf13/cobra"
-)
-
-func createEvaluateSequenceCommand() *cobra.Command {
-	var cmdEvalSequence = &cobra.Command{
-		Use:     "eval [expression] [yaml_file1]...",
-		Aliases: []string{"e"},
-		Short:   "(default) Apply the expression to each document in each yaml file in sequence",
-		Example: `
-# Reads field under the given path for each file
-yq e '.a.b' f1.yml f2.yml 
-
-# Prints out the file
-yq e sample.yaml 
-
-# Pipe from STDIN
-## use '-' as a filename to pipe from STDIN
-cat file2.yml | yq e '.a.b' file1.yml - file3.yml
-
-# Creates a new yaml document
-## Note that editing an empty file does not work.
-yq e -n '.a.b.c = "cat"' 
-
-# Update a file in place
-yq e '.a.b = "cool"' -i file.yaml 
-`,
-		Long: `yq is a portable command-line YAML processor (https://github.com/mikefarah/yq/) 
-See https://mikefarah.gitbook.io/yq/ for detailed documentation and examples.
-
-## Evaluate Sequence ##
-This command iterates over each yaml document from each given file, applies the 
-expression and prints the result in sequence.`,
-		RunE: evaluateSequence,
-	}
-	return cmdEvalSequence
-}
-
-func processExpression(expression string) string {
-
-	if prettyPrint && expression == "" {
-		return yqlib.PrettyPrintExp
-	} else if prettyPrint {
-		return fmt.Sprintf("%v | %v", expression, yqlib.PrettyPrintExp)
-	}
-	return expression
-}
-
-func evaluateSequence(cmd *cobra.Command, args []string) (cmdError error) {
-	// 0 args, read std in
-	// 1 arg, null input, process expression
-	// 1 arg, read file in sequence
-	// 2+ args, [0] = expression, file the rest
-
-	out := cmd.OutOrStdout()
-
-	var err error
-
-	expression, args, err := initCommand(cmd, args)
-	if err != nil {
-		return err
-	}
-
-	if writeInplace {
-		// only use colors if its forced
-		colorsEnabled = forceColor
-		writeInPlaceHandler := yqlib.NewWriteInPlaceHandler(args[0])
-		out, err = writeInPlaceHandler.CreateTempFile()
-		if err != nil {
-			return err
-		}
-		// need to indirectly call the function so  that completedSuccessfully is
-		// passed when we finish execution as opposed to now
-		defer func() {
-			if cmdError == nil {
-				cmdError = writeInPlaceHandler.FinishWriteInPlace(completedSuccessfully)
-			}
-		}()
-	}
-
-	format, err := yqlib.OutputFormatFromString(outputFormat)
-	if err != nil {
-		return err
-	}
-
-	printerWriter, err := configurePrinterWriter(format, out)
-	if err != nil {
-		return err
-	}
-	encoder, err := configureEncoder()
-	if err != nil {
-		return err
-	}
-
-	printer := yqlib.NewPrinter(encoder, printerWriter)
-	if nulSepOutput {
-		printer.SetNulSepOutput(true)
-	}
-
-	decoder, err := configureDecoder(false)
-	if err != nil {
-		return err
-	}
-	streamEvaluator := yqlib.NewStreamEvaluator()
-
-	if frontMatter != "" {
-		yqlib.GetLogger().Debug("using front matter handler")
-		frontMatterHandler := yqlib.NewFrontMatterHandler(args[0])
-		err = frontMatterHandler.Split()
-		if err != nil {
-			return err
-		}
-		args[0] = frontMatterHandler.GetYamlFrontMatterFilename()
-
-		if frontMatter == "process" {
-			reader := frontMatterHandler.GetContentReader()
-			printer.SetAppendix(reader)
-			defer yqlib.SafelyCloseReader(reader)
-		}
-		defer frontMatterHandler.CleanUp()
-	}
-
-	switch len(args) {
-	case 0:
-		if nullInput {
-			err = streamEvaluator.EvaluateNew(processExpression(expression), printer)
-		} else {
-			cmd.Println(cmd.UsageString())
-			return nil
-		}
-	default:
-		err = streamEvaluator.EvaluateFiles(processExpression(expression), args, printer, decoder)
-	}
-	completedSuccessfully = err == nil
-
-	if err == nil && exitStatus && !printer.PrintedAnything() {
-		return errors.New("no matches found")
-	}
-
-	return err
-}

cmd/evalute_sequence_command.go

@@ -0,0 +1,100 @@
+package cmd
+
+import (
+	"errors"
+	"fmt"
+	"os"
+
+	"github.com/mikefarah/yq/v4/pkg/yqlib"
+	"github.com/spf13/cobra"
+)
+
+func createEvaluateSequenceCommand() *cobra.Command {
+	var cmdEvalSequence = &cobra.Command{
+		Use:     "eval [expression] [yaml_file1]...",
+		Aliases: []string{"e"},
+		Short:   "Apply expression to each document in each yaml file given in sequence",
+		Example: `
+# runs the expression against each file, in series
+yq e '.a.b | length' f1.yml f2.yml 
+
+# prints out the file
+yq e sample.yaml 
+
+# prints a new yaml document
+yq e -n '.a.b.c = "cat"' 
+
+
+# updates file.yaml directly
+yq e '.a.b = "cool"' -i file.yaml 
+`,
+		Long: "Evaluate Sequence:\nIterate over each yaml document, apply the expression and print the results, in sequence.",
+		RunE: evaluateSequence,
+	}
+	return cmdEvalSequence
+}
+func evaluateSequence(cmd *cobra.Command, args []string) error {
+	cmd.SilenceUsage = true
+	// 0 args, read std in
+	// 1 arg, null input, process expression
+	// 1 arg, read file in sequence
+	// 2+ args, [0] = expression, file the rest
+
+	var err error
+	stat, _ := os.Stdin.Stat()
+	pipingStdIn := (stat.Mode() & os.ModeCharDevice) == 0
+
+	out := cmd.OutOrStdout()
+
+	fileInfo, _ := os.Stdout.Stat()
+
+	if forceColor || (!forceNoColor && (fileInfo.Mode()&os.ModeCharDevice) != 0) {
+		colorsEnabled = true
+	}
+
+	if writeInplace && len(args) < 2 {
+		return fmt.Errorf("Write inplace flag only applicable when giving an expression and at least one file")
+	}
+
+	if writeInplace {
+		// only use colors if its forced
+		colorsEnabled = forceColor
+		writeInPlaceHandler := yqlib.NewWriteInPlaceHandler(args[1])
+		out, err = writeInPlaceHandler.CreateTempFile()
+		if err != nil {
+			return err
+		}
+		// need to indirectly call the function so  that completedSuccessfully is
+		// passed when we finish execution as opposed to now
+		defer func() { writeInPlaceHandler.FinishWriteInPlace(completedSuccessfully) }()
+	}
+
+	printer := yqlib.NewPrinter(out, outputToJSON, unwrapScalar, colorsEnabled, indent, !noDocSeparators)
+
+	streamEvaluator := yqlib.NewStreamEvaluator()
+
+	switch len(args) {
+	case 0:
+		if pipingStdIn {
+			err = streamEvaluator.EvaluateFiles("", []string{"-"}, printer)
+		} else {
+			cmd.Println(cmd.UsageString())
+			return nil
+		}
+	case 1:
+		if nullInput {
+			err = streamEvaluator.EvaluateNew(args[0], printer)
+		} else {
+			err = streamEvaluator.EvaluateFiles("", []string{args[0]}, printer)
+		}
+	default:
+		err = streamEvaluator.EvaluateFiles(args[0], args[1:], printer)
+	}
+	completedSuccessfully = err == nil
+
+	if err == nil && exitStatus && !printer.PrintedAnything() {
+		return errors.New("no matches found")
+	}
+
+	return err
+}

cmd/root.go

@@ -3,7 +3,6 @@ package cmd
 import (
 	"os"
 
-	"github.com/mikefarah/yq/v4/pkg/yqlib"
 	"github.com/spf13/cobra"
 	logging "gopkg.in/op/go-logging.v1"
 )
@@ -12,32 +11,18 @@ func New() *cobra.Command {
 	var rootCmd = &cobra.Command{
 		Use:   "yq",
 		Short: "yq is a lightweight and portable command-line YAML processor.",
-		Long: `yq is a portable command-line YAML processor (https://github.com/mikefarah/yq/) 
-See https://mikefarah.gitbook.io/yq/ for detailed documentation and examples.`,
-		Example: `
-# yq defaults to 'eval' command if no command is specified. See "yq eval --help" for more examples.
-
-# read the "stuff" node from "myfile.yml"
-yq '.stuff' < myfile.yml
-
-# update myfile.yml in place
-yq -i '.stuff = "foo"' myfile.yml
-
-# print contents of sample.json as idiomatic YAML
-yq -P sample.json
-`,
-
+		Long:  `yq is a lightweight and portable command-line YAML processor. It aims to be the jq or sed of yaml files.`,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			if version {
 				cmd.Print(GetVersionDisplay())
 				return nil
 			}
-			return evaluateSequence(cmd, args)
+			cmd.Println(cmd.UsageString())
+			return nil
 
 		},
-		PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
+		PersistentPreRun: func(cmd *cobra.Command, args []string) {
 			cmd.SetOut(cmd.OutOrStdout())
-
 			var format = logging.MustStringFormatter(
 				`%{color}%{time:15:04:05} %{shortfunc} [%{level:.4s}]%{color:reset} %{message}`,
 			)
@@ -47,66 +32,26 @@ yq -P sample.json
 			if verbose {
 				backend.SetLevel(logging.DEBUG, "")
 			} else {
-				backend.SetLevel(logging.WARNING, "")
+				backend.SetLevel(logging.ERROR, "")
 			}
 
 			logging.SetBackend(backend)
-			yqlib.InitExpressionParser()
-
-			return nil
 		},
 	}
 
 	rootCmd.PersistentFlags().BoolVarP(&verbose, "verbose", "v", false, "verbose mode")
-
-	rootCmd.PersistentFlags().BoolVarP(&outputToJSON, "tojson", "j", false, "(deprecated) output as json. Set indent to 0 to print json in one line.")
-	err := rootCmd.PersistentFlags().MarkDeprecated("tojson", "please use -o=json instead")
-	if err != nil {
-		panic(err)
-	}
-
-	rootCmd.PersistentFlags().StringVarP(&outputFormat, "output-format", "o", "auto", "[auto|a|yaml|y|json|j|props|p|xml|x|tsv|t|csv|c] output format type.")
-	rootCmd.PersistentFlags().StringVarP(&inputFormat, "input-format", "p", "auto", "[auto|a|yaml|y|props|p|xml|x|tsv|t|csv|c|toml] 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.ConfiguredLuaPreferences.DocPrefix, "lua-prefix", yqlib.ConfiguredLuaPreferences.DocPrefix, "prefix")
-	rootCmd.PersistentFlags().StringVar(&yqlib.ConfiguredLuaPreferences.DocSuffix, "lua-suffix", yqlib.ConfiguredLuaPreferences.DocSuffix, "suffix")
-	rootCmd.PersistentFlags().BoolVar(&yqlib.ConfiguredLuaPreferences.UnquotedKeys, "lua-unquoted", yqlib.ConfiguredLuaPreferences.UnquotedKeys, "output unquoted string keys (e.g. {foo=\"bar\"})")
-	rootCmd.PersistentFlags().BoolVar(&yqlib.ConfiguredLuaPreferences.Globals, "lua-globals", yqlib.ConfiguredLuaPreferences.Globals, "output keys as top-level global variables")
-
-	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(&outputToJSON, "tojson", "j", false, "output as json. Set indent to 0 to print json in one line.")
+	rootCmd.PersistentFlags().BoolVarP(&nullInput, "null-input", "n", false, "Don't read input, simply evaluate the expression given. Useful for creating yaml docs from scratch.")
 	rootCmd.PersistentFlags().BoolVarP(&noDocSeparators, "no-doc", "N", false, "Don't print document separators (---)")
 
 	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 in place 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(&nulSepOutput, "nul-output", "0", false, "Use NUL char to separate values. If unwrap scalar is also set, fail if unwrapped scalar contains NUL char.")
-
-	rootCmd.PersistentFlags().BoolVarP(&prettyPrint, "prettyPrint", "P", false, "pretty print, shorthand for '... style = \"\"'")
+	rootCmd.PersistentFlags().BoolVarP(&writeInplace, "inplace", "i", false, "update the yaml file inplace of first yaml file given.")
+	rootCmd.PersistentFlags().BoolVarP(&unwrapScalar, "unwrapScalar", "", true, "unwrap scalar, print the value with no quotes, colors or comments")
 	rootCmd.PersistentFlags().BoolVarP(&exitStatus, "exit-status", "e", false, "set exit status if there are no matches or null or false is returned")
 
 	rootCmd.PersistentFlags().BoolVarP(&forceColor, "colors", "C", false, "force print with colors")
 	rootCmd.PersistentFlags().BoolVarP(&forceNoColor, "no-colors", "M", false, "force print with no colors")
-	rootCmd.PersistentFlags().StringVarP(&frontMatter, "front-matter", "f", "", "(extract|process) first input as yaml front-matter. Extract will pull out the yaml content, process will run the expression against the yaml content, leaving the remaining data intact")
-	rootCmd.PersistentFlags().StringVarP(&forceExpression, "expression", "", "", "forcibly set the expression argument. Useful when yq argument detection thinks your expression is a file.")
-	rootCmd.PersistentFlags().BoolVarP(&yqlib.ConfiguredYamlPreferences.LeadingContentPreProcessing, "header-preprocess", "", true, "Slurp any header comments and separators before processing expression.")
-
-	rootCmd.PersistentFlags().StringVarP(&splitFileExp, "split-exp", "s", "", "print each result (or doc) into a file named (exp). [exp] argument must return a string. You can use $index in the expression as the result counter.")
-	rootCmd.PersistentFlags().StringVarP(&splitFileExpFile, "split-exp-file", "", "", "Use a file to specify the split-exp expression.")
-
-	rootCmd.PersistentFlags().StringVarP(&expressionFile, "from-file", "", "", "Load expression from specified file.")
-
 	rootCmd.AddCommand(
 		createEvaluateSequenceCommand(),
 		createEvaluateAllCommand(),

cmd/shell-completion.go

@@ -42,7 +42,7 @@ $ yq shell-completion fish > ~/.config/fish/completions/yq.fish
 `,
 	DisableFlagsInUseLine: true,
 	ValidArgs:             []string{"bash", "zsh", "fish", "powershell"},
-	Args:                  cobra.MatchAll(cobra.ExactArgs(1), cobra.OnlyValidArgs),
+	Args:                  cobra.ExactValidArgs(1),
 	RunE: func(cmd *cobra.Command, args []string) error {
 		var err error = nil
 		switch args[0] {

cmd/unwrap_flag.go

@@ -1,46 +0,0 @@
-package cmd
-
-import (
-	"strconv"
-
-	"github.com/spf13/pflag"
-)
-
-type boolFlag interface {
-	pflag.Value
-	IsExplicitlySet() bool
-	IsSet() bool
-}
-
-type unwrapScalarFlagStrc struct {
-	explicitlySet bool
-	value         bool
-}
-
-func newUnwrapFlag() boolFlag {
-	return &unwrapScalarFlagStrc{value: true}
-}
-
-func (f *unwrapScalarFlagStrc) IsExplicitlySet() bool {
-	return f.explicitlySet
-}
-
-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.explicitlySet = true
-	return err
-}
-
-func (*unwrapScalarFlagStrc) Type() string {
-	return "bool"
-}

cmd/utils.go

@@ -1,275 +0,0 @@
-package cmd
-
-import (
-	"fmt"
-	"io"
-	"os"
-	"strings"
-
-	"github.com/mikefarah/yq/v4/pkg/yqlib"
-	"github.com/spf13/cobra"
-	"gopkg.in/op/go-logging.v1"
-)
-
-func isAutomaticOutputFormat() bool {
-	return outputFormat == "" || outputFormat == "auto" || outputFormat == "a"
-}
-
-func initCommand(cmd *cobra.Command, args []string) (string, []string, error) {
-	cmd.SilenceUsage = true
-
-	fileInfo, _ := os.Stdout.Stat()
-
-	if forceColor || (!forceNoColor && (fileInfo.Mode()&os.ModeCharDevice) != 0) {
-		colorsEnabled = true
-	}
-
-	expression, args, err := processArgs(args)
-	if err != nil {
-		return "", nil, err
-	}
-
-	if splitFileExpFile != "" {
-		splitExpressionBytes, err := os.ReadFile(splitFileExpFile)
-		if err != nil {
-			return "", nil, err
-		}
-		splitFileExp = string(splitExpressionBytes)
-	}
-
-	// backwards compatibility
-	if outputToJSON {
-		outputFormat = "json"
-	}
-
-	if writeInplace && (len(args) == 0 || args[0] == "-") {
-		return "", nil, fmt.Errorf("write in place flag only applicable when giving an expression and at least one file")
-	}
-
-	if frontMatter != "" && len(args) == 0 {
-		return "", nil, fmt.Errorf("front matter flag only applicable when giving an expression and at least one file")
-	}
-
-	if writeInplace && splitFileExp != "" {
-		return "", nil, fmt.Errorf("write in place cannot be used with split file")
-	}
-
-	if nullInput && len(args) > 0 {
-		return "", nil, fmt.Errorf("cannot pass files in when using null-input flag")
-	}
-
-	inputFilename := ""
-	if len(args) > 0 {
-		inputFilename = args[0]
-	}
-	if inputFormat == "" || inputFormat == "auto" || inputFormat == "a" {
-
-		inputFormat = yqlib.FormatFromFilename(inputFilename)
-
-		_, err := yqlib.InputFormatFromString(inputFormat)
-		if err != nil {
-			// unknown file type, default to yaml
-			yqlib.GetLogger().Debug("Unknown file format extension '%v', defaulting to yaml", inputFormat)
-			inputFormat = "yaml"
-			if isAutomaticOutputFormat() {
-				outputFormat = "yaml"
-			}
-		} else if isAutomaticOutputFormat() {
-			// automatic input worked, we can do it for output too unless specified
-			if inputFormat == "json" {
-				yqlib.GetLogger().Warning("JSON file output is now JSON by default (instead of yaml). Use '-oy' or '--output-format=yaml' for yaml output")
-			}
-			outputFormat = inputFormat
-		}
-	} else if isAutomaticOutputFormat() {
-		// backwards compatibility -
-		// before this was introduced, `yq -pcsv things.csv`
-		// would produce *yaml* output.
-		//
-		outputFormat = yqlib.FormatFromFilename(inputFilename)
-		if inputFilename != "-" {
-			yqlib.GetLogger().Warning("yq default output is now 'auto' (based on the filename extension). Normally yq would output '%v', but for backwards compatibility 'yaml' has been set. Please use -oy to specify yaml, or drop the -p flag.", outputFormat)
-		}
-		outputFormat = "yaml"
-	}
-
-	outputFormatType, err := yqlib.OutputFormatFromString(outputFormat)
-
-	if err != nil {
-		return "", nil, err
-	}
-	yqlib.GetLogger().Debug("Using input format %v", inputFormat)
-	yqlib.GetLogger().Debug("Using output format %v", outputFormat)
-
-	if outputFormatType == yqlib.YamlOutputFormat ||
-		outputFormatType == yqlib.PropsOutputFormat {
-		unwrapScalar = true
-	}
-	if unwrapScalarFlag.IsExplicitlySet() {
-		unwrapScalar = unwrapScalarFlag.IsSet()
-	}
-
-	//copy preference form global setting
-	yqlib.ConfiguredYamlPreferences.UnwrapScalar = unwrapScalar
-
-	yqlib.ConfiguredYamlPreferences.PrintDocSeparators = !noDocSeparators
-
-	return expression, args, nil
-}
-
-func configureDecoder(evaluateTogether bool) (yqlib.Decoder, error) {
-	yqlibInputFormat, err := yqlib.InputFormatFromString(inputFormat)
-	if err != nil {
-		return nil, err
-	}
-	yqlibDecoder, err := createDecoder(yqlibInputFormat, evaluateTogether)
-	if yqlibDecoder == nil {
-		return nil, fmt.Errorf("no support for %s input format", inputFormat)
-	}
-	return yqlibDecoder, err
-}
-
-func createDecoder(format yqlib.InputFormat, evaluateTogether bool) (yqlib.Decoder, error) {
-	switch format {
-	case yqlib.LuaInputFormat:
-		return yqlib.NewLuaDecoder(yqlib.ConfiguredLuaPreferences), nil
-	case yqlib.XMLInputFormat:
-		return yqlib.NewXMLDecoder(yqlib.ConfiguredXMLPreferences), nil
-	case yqlib.PropertiesInputFormat:
-		return yqlib.NewPropertiesDecoder(), nil
-	case yqlib.JsonInputFormat:
-		return yqlib.NewJSONDecoder(), nil
-	case yqlib.CSVObjectInputFormat:
-		return yqlib.NewCSVObjectDecoder(','), nil
-	case yqlib.TSVObjectInputFormat:
-		return yqlib.NewCSVObjectDecoder('\t'), nil
-	case yqlib.TomlInputFormat:
-		return yqlib.NewTomlDecoder(), nil
-	case yqlib.YamlInputFormat:
-		prefs := yqlib.ConfiguredYamlPreferences
-		prefs.EvaluateTogether = evaluateTogether
-		return yqlib.NewYamlDecoder(prefs), nil
-	}
-	return nil, fmt.Errorf("invalid decoder: %v", format)
-}
-
-func configurePrinterWriter(format yqlib.PrinterOutputFormat, out io.Writer) (yqlib.PrinterWriter, error) {
-
-	var printerWriter yqlib.PrinterWriter
-
-	if splitFileExp != "" {
-		colorsEnabled = forceColor
-		splitExp, err := yqlib.ExpressionParser.ParseExpression(splitFileExp)
-		if err != nil {
-			return nil, fmt.Errorf("bad split document expression: %w", err)
-		}
-		printerWriter = yqlib.NewMultiPrinterWriter(splitExp, format)
-	} else {
-		printerWriter = yqlib.NewSinglePrinterWriter(out)
-	}
-	return printerWriter, nil
-}
-
-func configureEncoder() (yqlib.Encoder, error) {
-	yqlibOutputFormat, err := yqlib.OutputFormatFromString(outputFormat)
-	if err != nil {
-		return nil, err
-	}
-	yqlibEncoder, err := createEncoder(yqlibOutputFormat)
-	if yqlibEncoder == nil {
-		return nil, fmt.Errorf("no support for %s output format", outputFormat)
-	}
-	return yqlibEncoder, err
-}
-
-func createEncoder(format yqlib.PrinterOutputFormat) (yqlib.Encoder, error) {
-	switch format {
-	case yqlib.JSONOutputFormat:
-		return yqlib.NewJSONEncoder(indent, colorsEnabled, unwrapScalar), nil
-	case yqlib.PropsOutputFormat:
-		return yqlib.NewPropertiesEncoder(unwrapScalar), nil
-	case yqlib.CSVOutputFormat:
-		return yqlib.NewCsvEncoder(','), nil
-	case yqlib.TSVOutputFormat:
-		return yqlib.NewCsvEncoder('\t'), nil
-	case yqlib.YamlOutputFormat:
-		return yqlib.NewYamlEncoder(indent, colorsEnabled, yqlib.ConfiguredYamlPreferences), nil
-	case yqlib.XMLOutputFormat:
-		return yqlib.NewXMLEncoder(indent, yqlib.ConfiguredXMLPreferences), nil
-	case yqlib.TomlOutputFormat:
-		return yqlib.NewTomlEncoder(), nil
-	case yqlib.ShellVariablesOutputFormat:
-		return yqlib.NewShellVariablesEncoder(), nil
-	case yqlib.LuaOutputFormat:
-		return yqlib.NewLuaEncoder(yqlib.ConfiguredLuaPreferences), nil
-	}
-	return nil, fmt.Errorf("invalid encoder: %v", format)
-}
-
-// this is a hack to enable backwards compatibility with githubactions (which pipe /dev/null into everything)
-// and being able to call yq with the filename as a single parameter
-//
-// without this - yq detects there is stdin (thanks githubactions),
-// then tries to parse the filename as an expression
-func maybeFile(str string) bool {
-	yqlib.GetLogger().Debugf("checking '%v' is a file", str)
-	stat, err := os.Stat(str) // #nosec
-	result := err == nil && !stat.IsDir()
-	if yqlib.GetLogger().IsEnabledFor(logging.DEBUG) {
-		if err != nil {
-			yqlib.GetLogger().Debugf("error: %v", err)
-		} else {
-			yqlib.GetLogger().Debugf("error: %v, dir: %v", err, stat.IsDir())
-		}
-		yqlib.GetLogger().Debugf("result: %v", result)
-	}
-	return result
-}
-
-func processStdInArgs(args []string) []string {
-	stat, err := os.Stdin.Stat()
-	if err != nil {
-		yqlib.GetLogger().Debugf("error getting stdin: %v", err)
-	}
-	pipingStdin := stat != nil && (stat.Mode()&os.ModeCharDevice) == 0
-
-	// if we've been given a file, don't automatically
-	// read from stdin.
-	// this happens if there is more than one argument
-	// or only one argument and its a file
-	if nullInput || !pipingStdin || len(args) > 1 || (len(args) > 0 && maybeFile(args[0])) {
-		return args
-	}
-
-	for _, arg := range args {
-		if arg == "-" {
-			return args
-		}
-	}
-	yqlib.GetLogger().Debugf("missing '-', adding it to the end")
-
-	// we're piping from stdin, but there's no '-' arg
-	// lets add one to the end
-	return append(args, "-")
-}
-
-func processArgs(originalArgs []string) (string, []string, error) {
-	expression := forceExpression
-	if expressionFile != "" {
-		expressionBytes, err := os.ReadFile(expressionFile)
-		if err != nil {
-			return "", nil, err
-		}
-		//replace \r\n (windows) with good ol' unix file endings.
-		expression = strings.ReplaceAll(string(expressionBytes), "\r\n", "\n")
-	}
-
-	args := processStdInArgs(originalArgs)
-	yqlib.GetLogger().Debugf("processed args: %v", args)
-	if expression == "" && len(args) > 0 && args[0] != "-" && !maybeFile(args[0]) {
-		yqlib.GetLogger().Debug("assuming expression is '%v'", args[0])
-		expression = args[0]
-		args = args[1:]
-	}
-	return expression, args, nil
-}

cmd/version.go

@@ -11,7 +11,7 @@ var (
 	GitDescribe string
 
 	// Version is main version number that is being run at the moment.
-	Version = "v4.40.2"
+	Version = "4.1.0"
 
 	// 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
@@ -25,7 +25,7 @@ const ProductName = "yq"
 // GetVersionDisplay composes the parts of the version in a way that's suitable
 // for displaying to humans.
 func GetVersionDisplay() string {
-	return fmt.Sprintf("yq (https://github.com/mikefarah/yq/) version %s\n", getHumanVersion())
+	return fmt.Sprintf("%s version %s\n", ProductName, getHumanVersion())
 }
 
 func getHumanVersion() string {

cmd/version_test.go

@@ -3,7 +3,7 @@ package cmd
 import "testing"
 
 func TestGetVersionDisplay(t *testing.T) {
-	var expectedVersion = ProductName + " (https://github.com/mikefarah/yq/) version " + Version
+	var expectedVersion = ProductName + " version " + Version
 	if VersionPrerelease != "" {
 		expectedVersion = expectedVersion + "-" + VersionPrerelease
 	}

cspell.config.yaml

@@ -1,14 +0,0 @@
----
-$schema: https://raw.githubusercontent.com/streetsidesoftware/cspell/main/cspell.schema.json
-version: '0.2'
-language: en-GB
-dictionaryDefinitions:
-  - name: project-words
-    path: './project-words.txt'
-    addWords: true
-dictionaries:
-  - project-words
-ignorePaths:
-  - 'vendor'
-  - 'bin'
-  - '/project-words.txt'

debian/changelog

@@ -1,137 +1,3 @@
-yq (4.16.2) focal; urgency=medium
-
-  * Fixed with semicolon space issue
-  * Updating with documentation
-  * Added STDIN example to the top
-  * minor readme cleanup
-  * Help text tweak
-  * Fixed docker timeout - simplify docker builds
-  * New release with docker build fixes
-  * Updating to go 1.17 to fix CVE #944
-  * Fix a typo in root.go
-  * Skip the tests if the nocheck Debian build option is specified
-  * Fixed select bug (#958)
-  * Sped up explode operator
-  * Slight performance improvement to context.ChildContext
-  * Speed up multiply
-  * Update README with recently added / changed options
-  * Make deepMatch report in linear time
-  * Removed leadingContentPreProcessing flag - header preprocessing is stable
-  * Revert "Removed leadingContentPreProcessing flag - header preprocessing is stable"
-  * Keep flag, it is needed in corner cases
-  * Updated Readme
-  * Man page
-  * Fixed expression parsing bug #970
-  * Bumping go-lang, docker versions
-  * Added test release flow
-  * Updated github action release to generate man page
-  * Bumping version
-  * Removing no longer needed github action
-  * Added decoder op
-  * Fixed newline handling when decoding/encoding
-  * Fixed newline handling in encoder/decoder
-  * Can specify indent in encode ops
-  * Added group_by operator
-  * Added flatten operator
-  * Fixed flatten error message
-  * Improving docs
-  * Split printer
-  * Refactored command logic
-  * Fix JSON encoding removing null #985
-  * Fixed acceptance tests
-  * gitbook
-  * Update document generation script
-  * Updating README
-  * Updating release instructions
-  * github action no longer uses data1.yml
-  * Create dependabot.yml
-  * Bump actions/create-release from 1.0.0 to 1.1.4
-  * Bump actions/setup-go from 1 to 2.1.4
-  * Bump github.com/goccy/go-yaml from 1.8.9 to 1.9.4
-  * Bump github.com/jinzhu/copier from 0.2.8 to 0.3.2
-  * Bump github.com/fatih/color from 1.10.0 to 1.13.0
-  * Bump github.com/spf13/cobra from 1.1.3 to 1.2.1
-  * Update dependabot.yml
-  * Update go.yml
-  * add build check to PRs
-  * Include secure as part of build process
-  * Fixing bad label in github action
-  * fixed printer test
-  * remove leading content indicator
-  * Fixed header preprocessing!
-  * lint : define golangci configuration file
-  * Update check.sh
-  * Load file acceptance test
-  * Minor improvement on handling front matter
-  * Improved load doc
-  * feature: detect MANPATh and install there
-  * Update install-man-page.sh
-  * simplify prod stage, move version label to action
-  * add labels, quote some values
-  * enable errorlint linter
-  * Added errorlint to devtools
-  * Added key operator
-  * Added more tests
-  * Fixing comments
-  * Attempt to fix golint problem
-  * Include version query for tools
-  * Clean up errored file?
-  * enable misspell linter
-  * updated readme
-  * update Golangci version to v1.43.0
-  * gci linter
-  * Better merge array by key example
-  * Added credit for merge by array example
-  * Better formatting of merge arrays example
-  * Better merge example
-  * Add accessor for the yq logger instance (#1013)
-  * Fixed collect op when working with multiple nodes
-  * Added map, map_values
-  * Add support for Podman as well as Docker (#1026)
-  * Bump github.com/jinzhu/copier from 0.3.2 to 0.3.4 (#1027)
-  * Added csv, tsv output formats
-  * Added encoder tests
-  * Cleanup test
-  * Fixed docker permission issue #1014
-  * Recording release notes for next release
-  * Assignment op no longer clobbers anchor (#1029)
-  * Added sort_by operator
-  * Improved error message
-  * Improved tips and tricks
-  * Report while filename failed to parse #1030
-  * Added script for extracting checksums
-  * Improved extract-checksum.sh
-  * Bump github.com/spf13/cobra from 1.2.1 to 1.3.0 (#1039)
-  * enable more linters (#1043)
-  * Bump Golang compiler #1037
-
- -- Roberto Mier Escandon <rmescandon@gmail.com>  Tue, 21 Dec 2021 09:41:44 +0000
-
-yq (4.13.0) focal; urgency=medium
-
-  * New `with` operator for making multiple changes to a given path
-  * New `contains` operator, works like the `jq` equivalent
-  * Subtract operator now supports subtracting elements from arrays!
-  * Fixed Swapping values using variables #934
-  * Github Action now properly supports multiline output #936, thanks @pjxiao
-  * Fixed missing closing bracket validation #932
-  * Fix processing of hex numbers #929
-  * Fixed alternative and union operator issues #930
-  * Can now convert yaml to properties properties format (`-o=props`), See [docs](https://mikefarah.gitbook.io/yq/v/v4.x/usage/properties) for more info.
-  * Fixed document header/footer comment handling when merging (https://github.com/mikefarah/yq/issues/919)
-  * pretty print yaml 1.1 compatibility  (https://github.com/mikefarah/yq/issues/914)
-
- -- Roberto Mier Escandon <rmescandon@gmail.com>  Thu, 16 Sep 2021 20:58:30 +0200
-
-yq (4.9.6) focal; urgency=medium
-
-  * Added darwin/arm64 build, thanks @alecthomas
-  * Incremented docker alpine base version, thanks @da6d6i7-bronga
-  * Bug fix: multiline expression
-  * Bug fix: special character
-
- -- Roberto Mier Escandon <rmescandon@gmail.com>  Tue, 29 Jun 2021 21:32:14 +0200
-
 yq (3.3.2) focal; urgency=medium
 
   * Bug fix: existStatus bug (#459)

debian/control

@@ -3,8 +3,8 @@ Section: devel
 Priority: optional
 Maintainer: Roberto Mier Escandón <rmescandon@gmail.com>
 Build-Depends: debhelper (>=10),
-               golang-1.17-go,
-               pandoc,
+               dh-golang (>=1.34),
+               golang-1.13,
                rsync
 Standards-Version: 4.1.4
 Homepage: https://github.com/mikefarah/yq.git

debian/rules

@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 #
-# Copyright (C) 2018-2021 Roberto Mier Escandón <rmescandon@gmail.com>
+# Copyright (C) 2018 Roberto Mier Escandón <rmescandon@gmail.com>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
@@ -17,25 +17,24 @@
 PROJECT := yq
 OWNER := mikefarah
 REPO := github.com
+GOVERSION := 1.13
 
 export DH_OPTIONS
 export DH_GOPKG := ${REPO}/${OWNER}/${PROJECT}
-export GOROOT := /usr/local/go
+export GOROOT := /usr/lib/go-${GOVERSION}
 export GOPATH := ${CURDIR}/_build
 export GOBIN := ${GOPATH}/bin
 export PATH := ${GOROOT}/bin:${GOBIN}:${PATH}
 export GOCACHE := /tmp/gocache
 export GOFLAGS := -mod=vendor
-export GO111MODULE := on
 
 SRCDIR := ${GOPATH}/src/${DH_GOPKG}
 DESTDIR := ${CURDIR}/debian/${PROJECT}
 BINDIR := /usr/bin
-MANDIR := /usr/share/man/man1/
 ASSETSDIR := /usr/share/${PROJECT}
 
 %:
-	dh $@
+	dh $@ --builddirectory=${GOPATH} --buildsystem=golang
 
 override_dh_auto_build:
 	mkdir -p ${SRCDIR}
@@ -43,32 +42,16 @@ override_dh_auto_build:
 	# copy project to local srcdir to build from there
 	rsync -avz --progress --exclude=_build --exclude=debian --exclude=tmp. --exclude=go.mod --exclude=docs . $(SRCDIR)
 	# build go code
-	( \
-		cd ${SRCDIR} && \
-		go install -buildmode=pie ./... \
-	)
-
-	# build man page
-	( \
-		cd ${SRCDIR} && \
-		./scripts/generate-man-page-md.sh && \
-		./scripts/generate-man-page.sh \
-	)
+	(cd ${SRCDIR} && go install -buildmode=pie ./...)
 	
 override_dh_auto_test:
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	(cd ${SRCDIR} && go test -v ./...)
-endif
 
 override_dh_auto_install:
 	cp ${GOBIN}/yq ${DESTDIR}/${BINDIR}
 	cp -f ${SRCDIR}/LICENSE ${DESTDIR}/${ASSETSDIR}
 	chmod a+x ${DESTDIR}/${BINDIR}/yq
 
-	# man
-	mkdir -p "${DESTDIR}"/"${MANDIR}"
-	cp "${SRCDIR}"/yq.1 "${DESTDIR}"/"${MANDIR}" \
-
 override_dh_auto_clean:
 	dh_clean
 	rm -rf ${CURDIR}/_build

examples/array.yaml

@@ -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

examples/base64.txt

@@ -1 +0,0 @@
-bXkgc2VjcmV0IGNoaWxsaSByZWNpcGUgaXMuLi4u

examples/data.lua

@@ -1,9 +0,0 @@
-return {
-	["country"] = "Australia"; -- this place
-	["cities"] = {
-		"Sydney",
-		"Melbourne",
-		"Brisbane",
-		"Perth",
-	};
-};

examples/data1.yaml

@@ -1,2 +1,4 @@
-a: #things
-  meow
+a: simple # just the best
+b: [1, 2]
+c:
+  test: 1

examples/data2.yaml

@@ -1,5 +1,7 @@
-# --------------------------------------------------
-# It's a test with comment
-# --------------------------------------------------
-groups:
-  - name: d
+a: other # better than the original
+b: [3, 4]
+c:
+  toast: leave
+  test: 1
+  tell: 1
+  tasty.taco: cool

examples/empty.yaml

@@ -1 +1,2 @@
-# comment
+# a: apple
+# b: cat

examples/example.properties

@@ -1,6 +0,0 @@
-# comments on values appear
-person.name = Mike
-
-# comments on array values appear
-person.pets.0 = cat
-person.food.0 = pizza

examples/front-matter.yaml

@@ -1,6 +0,0 @@
----
-a: apple
-b: bannana
----
-hello there
-apples: great

examples/leading-separator.yaml

@@ -1,2 +0,0 @@
----
-a: test

examples/mike.xml

@@ -1 +0,0 @@
-<zoo><thing><frog>boing</frog></thing></zoo>

examples/mike2.xml

@@ -1,11 +0,0 @@
-  <?xml version="1.0" encoding="UTF-8"?>
-  <!-- osm-->
-  <osm version="0.6" generator="CGImap 0.0.2">
-  <!-- bounds-->
-   <bounds minlat="54.0889580" minlon="12.2487570" maxlat="54.0913900" maxlon="12.2524800">
-   <!-- great -->
-   cool
-   </bounds>
-   <foo>ba2234r</foo>
-   <foo>bar2234233</foo>
-  </osm>

examples/sample.toml

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

examples/sample.yaml

@@ -1,2 +1,11 @@
- # things
-a: apple
+# Some doc
+
+a: true
+b:
+  c: 2
+  d: [3, 4, 5]
+  e:
+    - name: fred
+      value: 3
+    - name: sam
+      value: 4

examples/sample_objects.csv

@@ -1,3 +0,0 @@
-name,numberOfCats,likesApples,height
-,1,true,168.8
-Samantha's Rabbit,2,false,-188.8

examples/small.properties

@@ -1 +0,0 @@
-this.is = a properties file

examples/small.xml

@@ -1 +0,0 @@
-<this>is some xml</this>

examples/small.yaml

@@ -1,4 +0,0 @@
----
-# comment
-# about things
-a: cat

examples/thing.yml

@@ -1,2 +0,0 @@
-a: apple is included
-b: cool.

github-action/Dockerfile

@@ -1,9 +1,5 @@
-FROM mikefarah/yq:4
+FROM mikefarah/yq:3
 
 COPY entrypoint.sh /entrypoint.sh
 
-# github action recommendation is to run as root.
-# https://docs.github.com/en/actions/creating-actions/dockerfile-support-for-github-actions#user
-USER root
-
 ENTRYPOINT ["/entrypoint.sh"]

github-action/entrypoint.sh

@@ -1,12 +1,4 @@
 #!/bin/sh -l
-set -e
-echo "::debug::\$cmd: $1"
-RESULT=$(eval "$1")
-echo "::debug::\$RESULT: $RESULT"
-# updating from 
-# https://github.com/orgs/community/discussions/26288#discussioncomment-3876281
-# https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#setting-an-output-parameter
-delimiter=$(cat /proc/sys/kernel/random/uuid)
-echo "result<<${delimiter}" >> "${GITHUB_OUTPUT}"
-echo "${RESULT}" >> "${GITHUB_OUTPUT}"
-echo "${delimiter}" >> "${GITHUB_OUTPUT}"
+
+echo "$1"
+eval $1

go.mod

@@ -1,33 +1,18 @@
 module github.com/mikefarah/yq/v4
 
 require (
-	github.com/a8m/envsubst v1.4.2
-	github.com/alecthomas/participle/v2 v2.1.0
-	github.com/alecthomas/repr v0.3.0
-	github.com/dimchansky/utfbom v1.1.1
-	github.com/elliotchance/orderedmap v1.5.1
-	github.com/fatih/color v1.16.0
-	github.com/goccy/go-json v0.10.2
-	github.com/goccy/go-yaml v1.11.2
-	github.com/jinzhu/copier v0.4.0
-	github.com/magiconair/properties v1.8.7
-	github.com/pelletier/go-toml/v2 v2.1.0
-	github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e
-	github.com/spf13/cobra v1.8.0
-	github.com/spf13/pflag v1.0.5
-	github.com/yuin/gopher-lua v1.1.0
-	golang.org/x/net v0.18.0
-	golang.org/x/text v0.14.0
+	github.com/elliotchance/orderedmap v1.3.0
+	github.com/fatih/color v1.9.0
+	github.com/goccy/go-yaml v1.8.1
+	github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a
+	github.com/mattn/go-colorable v0.1.7 // indirect
+	github.com/spf13/cobra v1.1.1
+	github.com/timtadh/data-structures v0.5.3 // indirect
+	github.com/timtadh/lexmachine v0.2.2
+	golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f // indirect
+	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
 	gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473
-	gopkg.in/yaml.v3 v3.0.1
+	gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776
 )
 
-require (
-	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.20 // indirect
-	golang.org/x/sys v0.14.0 // indirect
-	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
-)
-
-go 1.21
+go 1.15

go.sum

@@ -1,85 +1,344 @@
-github.com/a8m/envsubst v1.4.2 h1:4yWIHXOLEJHQEFd4UjrWDrYeYlV7ncFWJOCBRLOZHQg=
-github.com/a8m/envsubst v1.4.2/go.mod h1:MVUTQNGQ3tsjOOtKCNd+fl8RzhsXcDvvAEzkhGtlsbY=
-github.com/alecthomas/assert/v2 v2.3.0 h1:mAsH2wmvjsuvyBvAmCtm7zFsBlb8mIHx5ySLVdDZXL0=
-github.com/alecthomas/assert/v2 v2.3.0/go.mod h1:pXcQ2Asjp247dahGEmsZ6ru0UVwnkhktn7S0bBDLxvQ=
-github.com/alecthomas/participle/v2 v2.1.0 h1:z7dElHRrOEEq45F2TG5cbQihMtNTv8vwldytDj7Wrz4=
-github.com/alecthomas/participle/v2 v2.1.0/go.mod h1:Y1+hAs8DHPmc3YUFzqllV+eSQ9ljPTk0ZkPMtEdAx2c=
-github.com/alecthomas/repr v0.3.0 h1:NeYzUPfjjlqHY4KtzgKJiWd6sVq2eNUPTi34PiFGjY8=
-github.com/alecthomas/repr v0.3.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
-github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
+cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
+cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
+cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=
+cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
+cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
+cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
+cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk=
+cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
+cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
+dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
+github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
+github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
+github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
+github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
+github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
+github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
+github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
+github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84=
+github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
+github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
+github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
+github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
+github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
+github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
+github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dimchansky/utfbom v1.1.1 h1:vV6w1AhK4VMnhBno/TPVCoK9U/LP0PkLCS9tbxHdi/U=
-github.com/dimchansky/utfbom v1.1.1/go.mod h1:SxdoEBH5qIqFocHMyGOXVAybYJdr71b1Q/j0mACtrfE=
-github.com/elliotchance/orderedmap v1.5.1 h1:G1X4PYlljzimbdQ3RXmtIZiQ9d6aRQ3sH1nzjq5mECE=
-github.com/elliotchance/orderedmap v1.5.1/go.mod h1:wsDwEaX5jEoyhbs7x93zk2H/qv0zwuhg4inXhDkYqys=
-github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM=
-github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE=
-github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q=
+github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
+github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
+github.com/elliotchance/orderedmap v1.3.0 h1:k6m77/d0zCXTjsk12nX40TkEBkSICq8T4s6R6bpCqU0=
+github.com/elliotchance/orderedmap v1.3.0/go.mod h1:8hdSl6jmveQw8ScByd3AaNHNk51RhbTazdqtTty+NFw=
+github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
+github.com/fatih/color v1.9.0 h1:8xPHl4/q1VyqGIPif1F+1V3Y3lSmrq01EabUW3CoW5s=
+github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
+github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
+github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
+github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
-github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no=
 github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
-github.com/go-playground/validator/v10 v10.4.1 h1:pH2c5ADXtd66mxoE0Zm9SUhxE20r7aM3F26W0hOn+GE=
-github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
-github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
-github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
-github.com/goccy/go-yaml v1.11.2 h1:joq77SxuyIs9zzxEjgyLBugMQ9NEgTWxXfz2wVqwAaQ=
-github.com/goccy/go-yaml v1.11.2/go.mod h1:wKnAMd44+9JAAnGQpWVEgBzGt3YuTaQ4uXoHvE4m7WU=
-github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
-github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=
-github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg=
-github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
-github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
-github.com/jinzhu/copier v0.4.0 h1:w3ciUoD19shMCRargcpm0cm91ytaBhDvuRpz1ODO/U8=
-github.com/jinzhu/copier v0.4.0/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg=
-github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y=
+github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
+github.com/goccy/go-yaml v1.8.1 h1:JuZRFlqLM5cWF6A+waL8AKVuCcqvKOuhJtUQI+L3ez0=
+github.com/goccy/go-yaml v1.8.1/go.mod h1:wS4gNoLalDSJxo/SpngzPQ2BN4uuZVLCmbM4S3vd4+Y=
+github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
+github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
+github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
+github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
+github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
+github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
+github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
+github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
+github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
+github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
+github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
+github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q=
+github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=
+github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
+github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
+github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
+github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
+github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
+github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU=
+github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU=
+github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4=
+github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
+github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
+github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90=
+github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
+github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
+github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ=
+github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I=
+github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=
+github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
+github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
+github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a h1:zPPuIq2jAWWPTrGt70eK/BSch+gFAGrNzecsoENgu2o=
+github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a/go.mod h1:yL958EeXv8Ylng6IfnvG4oflryUi3vgA3xPs9hmII1s=
+github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
+github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
+github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
+github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
+github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
+github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
+github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 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/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
-github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
-github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
-github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4=
-github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc=
-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/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
+github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
+github.com/mattn/go-colorable v0.1.4 h1:snbPLB8fVfU9iwbbo30TPtbLRzwWu6aJS6Xh4eaaviA=
+github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
+github.com/mattn/go-colorable v0.1.7 h1:bQGKb3vps/j0E9GfJQ03JyhRuxsvdAanXlT9BTw3mdw=
+github.com/mattn/go-colorable v0.1.7/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
+github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
+github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84=
+github.com/mattn/go-isatty v0.0.11 h1:FxPOTFNqGkuDUGi3H/qkUbQO4ZiBa2brKq5r0l8TGeM=
+github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
+github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
+github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
+github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
+github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
+github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
+github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
+github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
+github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
+github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg=
+github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY=
+github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
+github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
+github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
+github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
+github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 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.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0=
-github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho=
+github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
+github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
+github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso=
+github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
+github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
+github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
+github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
+github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
+github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
+github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
+github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
+github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
+github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
+github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
+github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
+github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
+github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
+github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
+github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
+github.com/spf13/cobra v1.1.1 h1:KfztREH0tPxJJ+geloSLaAkaPkr4ki2Er5quFV1TDo4=
+github.com/spf13/cobra v1.1.1/go.mod h1:WnodtKOvamDL/PwE2M4iKs8aMDBZ5Q5klgD3qfVJQMI=
+github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
+github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
+github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 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/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
-github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-github.com/yuin/gopher-lua v1.1.0 h1:BojcDhfyDWgU2f2TOzYK/g5p2gxMrku8oupLDqlnSqE=
-github.com/yuin/gopher-lua v1.1.0/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw=
-golang.org/x/crypto v0.15.0 h1:frVn1TEaCEaZcn3Tmd7Y2b5KKPaZ+I32Q2OA3kYp5TA=
-golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g=
-golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg=
-golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ=
-golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
-golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
-golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk=
-golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
+github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
+github.com/timtadh/data-structures v0.5.3 h1:F2tEjoG9qWIyUjbvXVgJqEOGJPMIiYn7U5W5mE+i/vQ=
+github.com/timtadh/data-structures v0.5.3/go.mod h1:9R4XODhJ8JdWFEI8P/HJKqxuJctfBQw6fDibMQny2oU=
+github.com/timtadh/lexmachine v0.2.2 h1:g55RnjdYazm5wnKv59pwFcBJHOyvTPfDEoz21s4PHmY=
+github.com/timtadh/lexmachine v0.2.2/go.mod h1:GBJvD5OAfRn/gnp92zb9KTgHLB7akKyxmVivoYCcjQI=
+github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
+github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
+go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
+go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
+go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
+go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
+go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
+go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
+golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
+golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek=
+golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=
+golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
+golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
+golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
+golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
+golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
+golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
+golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191026070338-33540a1f6037 h1:YyJpGZS1sBuBCzLAR1VEpK193GlqGZbnPFnPV/5Rsb4=
+golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/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 h1:/WDfKMnPU+m5M4xB+6x4kaepxRw6jWvR5iDRdvjHgy8=
+golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f h1:+Nyd8tzPX9R7BWHguqsrbFdRx3WQ/1ib8I44HXV5yTA=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
+golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
+golang.org/x/tools v0.0.0-20190311212946-11955173bddd h1:/e+gpKk9r3dJobndpTytxS2gOy6m5uvpg+ISQoEcusQ=
+golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898 h1:/atklqdjdhuosWIl6AIbOeHJjicWYPqR9bpxqxYG2pA=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
+google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
+google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
+google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
+google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
+google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
+google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
+google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
+google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
+google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
+gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
+gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE=
+gopkg.in/go-playground/validator.v9 v9.30.0/go.mod h1:+c9/zcJMFNgbLvly1L1V+PpxWdVbfP1avr/N00E2vyQ=
+gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 h1:6D+BvnJ/j6e222UW8s2qTSe3wGBtvo0MbVQG/c5k8RE=
 gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473/go.mod h1:N1eN2tsCx0Ydtgjl4cqmbRCsY4/+z4cYDeqwZTk6zog=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
+gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
+gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
+gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ=
+gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
+rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=

how-it-works.md

@@ -1,129 +0,0 @@
-# How it works
-
-In `yq` expressions are made up of operators and pipes. A context of nodes is passed through the expression and each operation takes the context as input and returns a new context as output. That output is piped in as input for the next operation in the expression. To begin with, the context is set to the first yaml document of the first yaml file (if processing in sequence using eval).
-
-Lets look at a couple of examples.
-
-## Simple assignment example
-
-Given a document like:
-
-```yaml
-a: cat
-b: dog
-```
-
-with an expression:
-
-```
-.a = .b
-```
-
-Like math expressions - operator precedence is important. 
-
-The `=` operator takes two arguments, a `lhs` expression, which in this case is `.a` and `rhs` expression which is `.b`. 
-
-It pipes the current, lets call it 'root' context through the `lhs` expression of `.a` to return the node 
-
-```yaml
-cat
-```
-
-Side note: this node holds not only its value 'cat', but comments and metadata too, including path and parent information.
-
-The `=` operator then pipes the 'root' context through the `rhs` expression of `.b` to return the node
-
-```yaml
-dog
-```
-
-Both sides have now been evaluated, so now the operator copies across the value from the RHS (`.b`) to the LHS (`.a`), and it returns the now updated context:
-
-```yaml
-a: dog
-b: dog
-```
-
-
-## Complex assignment, operator precedence rules
-
-Just like math expressions - `yq` expressions have an order of precedence. The pipe `|` operator has a low order of precedence, so operators with higher precedence will get evaluated first. 
-
-Most of the time, this is intuitively what you'd want, for instance `.a = "cat" | .b = "dog"` is effectively: `(.a = "cat") | (.b = "dog")`.
-
-However, this is not always the case, particularly if you have a complex LHS or RHS expression, for instance if you want to select particular nodes to update. 
-
-Lets say you had:
-
-```yaml
-- name: bob
-  fruit: apple
-- name: sally
-  fruit: orange
-
-```
-
-Lets say you wanted to update the `sally` entry to have fruit: 'mango'. The _incorrect_ way to do that is:
-`.[] | select(.name == "sally") | .fruit = "mango"`.
-
-Because `|` has a low operator precedence, this will be evaluated (_incorrectly_) as : `(.[]) | (select(.name == "sally")) | (.fruit = "mango")`. What you'll see is only the updated segment returned:
-
-```yaml
-name: sally
-fruit: mango
-```
-
-To properly update this yaml, you will need to use brackets (think BODMAS from maths) and wrap the entire LHS:
-`(.[] | select(.name == "sally") | .fruit) = "mango"`
-
-
-Now that entire LHS expression is passed to the 'assign' (`=`) operator, and the yaml is correctly updated and returned:
-
-
-```yaml
-- name: bob
-  fruit: apple
-- name: sally
-  fruit: mango
-
-```
-
-## Relative update (e.g. `|=`)
-There is another form of the `=` operator which we call the relative form. It's very similar to `=` but with one key difference when evaluating the RHS expression.
-
-In the plain form, we pass in the 'root' level context to the RHS expression. In relative form, we pass in _each result of the LHS_ to the RHS expression. Let's go through an example.
-
-Given a document like:
-
-```yaml
-a: 1
-b: thing
-```
-
-with an expression:
-
-```
-.a |= . + 1
-```
-
-Similar to the `=` operator, `|=` takes two operands, the LHS and RHS.
-
-It pipes the current context (the whole document) through the LHS expression of `.a` to get the node value:
-
-```
-1
-```
-
-Now it pipes _that LHS context_ into the RHS expression `. + 1` (whereas in the `=` plain form it piped the original document context into the RHS) to yield:
-
-
-```
-2
-```
-
-The assignment operator then copies across the value from the RHS to the value on the LHS, and it returns the now updated 'root' context:
-
-```yaml
-a: 2
-b: thing
-```

pkg/yqlib/all_at_once_evaluator.go

@@ -1,73 +1,43 @@
 package yqlib
 
-import (
-	"container/list"
-)
+import "container/list"
 
-// A yaml expression evaluator that runs the expression once against all files/nodes in memory.
+/**
+	Loads all yaml documents of all files given into memory, then runs the given expression once.
+**/
 type Evaluator interface {
-	EvaluateFiles(expression string, filenames []string, printer Printer, decoder Decoder) error
-
-	// EvaluateNodes takes an expression and one or more yaml nodes, returning a list of matching candidate nodes
-	EvaluateNodes(expression string, nodes ...*CandidateNode) (*list.List, error)
-
-	// EvaluateCandidateNodes takes an expression and list of candidate nodes, returning a list of matching candidate nodes
-	EvaluateCandidateNodes(expression string, inputCandidateNodes *list.List) (*list.List, error)
+	EvaluateFiles(expression string, filenames []string, printer Printer) error
 }
 
 type allAtOnceEvaluator struct {
 	treeNavigator DataTreeNavigator
+	treeCreator   PathTreeCreator
 }
 
 func NewAllAtOnceEvaluator() Evaluator {
-	InitExpressionParser()
-	return &allAtOnceEvaluator{treeNavigator: NewDataTreeNavigator()}
+	return &allAtOnceEvaluator{treeNavigator: NewDataTreeNavigator(), treeCreator: NewPathTreeCreator()}
 }
 
-func (e *allAtOnceEvaluator) EvaluateNodes(expression string, nodes ...*CandidateNode) (*list.List, error) {
-	inputCandidates := list.New()
-	for _, node := range nodes {
-		inputCandidates.PushBack(node)
-	}
-	return e.EvaluateCandidateNodes(expression, inputCandidates)
-}
-
-func (e *allAtOnceEvaluator) EvaluateCandidateNodes(expression string, inputCandidates *list.List) (*list.List, error) {
-	node, err := ExpressionParser.ParseExpression(expression)
-	if err != nil {
-		return nil, err
-	}
-	context, err := e.treeNavigator.GetMatchingNodes(Context{MatchingNodes: inputCandidates}, node)
-	if err != nil {
-		return nil, err
-	}
-	return context.MatchingNodes, nil
-}
-
-func (e *allAtOnceEvaluator) EvaluateFiles(expression string, filenames []string, printer Printer, decoder Decoder) error {
+func (e *allAtOnceEvaluator) EvaluateFiles(expression string, filenames []string, printer Printer) error {
 	fileIndex := 0
-
-	var allDocuments = list.New()
+	node, err := treeCreator.ParsePath(expression)
+	if err != nil {
+		return err
+	}
+	var allDocuments *list.List = list.New()
 	for _, filename := range filenames {
 		reader, err := readStream(filename)
 		if err != nil {
 			return err
 		}
-
-		fileDocuments, err := readDocuments(reader, filename, fileIndex, decoder)
+		fileDocuments, err := readDocuments(reader, filename, fileIndex)
 		if err != nil {
 			return err
 		}
 		allDocuments.PushBackList(fileDocuments)
 		fileIndex = fileIndex + 1
 	}
-
-	if allDocuments.Len() == 0 {
-		candidateNode := createScalarNode(nil, "")
-		allDocuments.PushBack(candidateNode)
-	}
-
-	matches, err := e.EvaluateCandidateNodes(expression, allDocuments)
+	matches, err := treeNavigator.GetMatchingNodes(allDocuments, node)
 	if err != nil {
 		return err
 	}

pkg/yqlib/all_at_once_evaluator_test.go

@@ -1,56 +0,0 @@
-package yqlib
-
-import (
-	"bufio"
-	"strings"
-	"testing"
-
-	"github.com/mikefarah/yq/v4/test"
-)
-
-var evaluateNodesScenario = []expressionScenario{
-	{
-		document:   `a: hello`,
-		expression: `.a`,
-		expected: []string{
-			"D0, P[a], (!!str)::hello\n",
-		},
-	},
-	{
-		document:   `a: hello`,
-		expression: `.`,
-		expected: []string{
-			"D0, P[], (!!map)::a: hello\n",
-		},
-	},
-	{
-		document:   `- a: "yes"`,
-		expression: `.[] | has("a")`,
-		expected: []string{
-			"D0, P[0], (!!bool)::true\n",
-		},
-	},
-}
-
-func TestAllAtOnceEvaluateNodes(t *testing.T) {
-	var evaluator = NewAllAtOnceEvaluator()
-	// logging.SetLevel(logging.DEBUG, "")
-	for _, tt := range evaluateNodesScenario {
-		decoder := NewYamlDecoder(NewDefaultYamlPreferences())
-		reader := bufio.NewReader(strings.NewReader(tt.document))
-		err := decoder.Init(reader)
-		if err != nil {
-			t.Error(err)
-			return
-		}
-		candidateNode, errorReading := decoder.Decode()
-
-		if errorReading != nil {
-			t.Error(errorReading)
-			return
-		}
-
-		list, _ := evaluator.EvaluateNodes(tt.expression, candidateNode)
-		test.AssertResultComplex(t, tt.expected, resultsToString(t, list))
-	}
-}

pkg/yqlib/candidate_node.go

@@ -1,429 +1,110 @@
 package yqlib
 
 import (
-	"container/list"
 	"fmt"
 	"strconv"
 	"strings"
+
+	"github.com/jinzhu/copier"
+	yaml "gopkg.in/yaml.v3"
 )
 
-type Kind uint32
-
-const (
-	SequenceNode Kind = 1 << iota
-	MappingNode
-	ScalarNode
-	AliasNode
-)
-
-type Style uint32
-
-const (
-	TaggedStyle Style = 1 << iota
-	DoubleQuotedStyle
-	SingleQuotedStyle
-	LiteralStyle
-	FoldedStyle
-	FlowStyle
-)
-
-func createStringScalarNode(stringValue string) *CandidateNode {
-	var node = &CandidateNode{Kind: ScalarNode}
-	node.Value = stringValue
-	node.Tag = "!!str"
-	return node
-}
-
-func createScalarNode(value interface{}, stringValue string) *CandidateNode {
-	var node = &CandidateNode{Kind: ScalarNode}
-	node.Value = stringValue
-
-	switch value.(type) {
-	case float32, float64:
-		node.Tag = "!!float"
-	case int, int64, int32:
-		node.Tag = "!!int"
-	case bool:
-		node.Tag = "!!bool"
-	case string:
-		node.Tag = "!!str"
-	case nil:
-		node.Tag = "!!null"
-	}
-	return node
-}
-
 type CandidateNode struct {
-	Kind  Kind
-	Style Style
-
-	Tag     string
-	Value   string
-	Anchor  string
-	Alias   *CandidateNode
-	Content []*CandidateNode
-
-	HeadComment string
-	LineComment string
-	FootComment string
-
-	Parent *CandidateNode // parent node
-	Key    *CandidateNode // node key, if this is a value from a map (or index in an array)
-
-	LeadingContent string
-
-	document uint // the document index of this node
-	filename string
-
-	Line   int
-	Column int
-
-	fileIndex int
-	// when performing op against all nodes given, this will treat all the nodes as one
-	// (e.g. top level cross document merge). This property does not propagate to child nodes.
-	EvaluateTogether bool
-	IsMapKey         bool
-}
-
-func (n *CandidateNode) CreateChild() *CandidateNode {
-	return &CandidateNode{
-		Parent: n,
-	}
-}
-
-func (n *CandidateNode) SetDocument(idx uint) {
-	n.document = idx
-}
-
-func (n *CandidateNode) GetDocument() uint {
-	// defer to parent
-	if n.Parent != nil {
-		return n.Parent.GetDocument()
-	}
-	return n.document
-}
-
-func (n *CandidateNode) SetFilename(name string) {
-	n.filename = name
-}
-
-func (n *CandidateNode) GetFilename() string {
-	if n.Parent != nil {
-		return n.Parent.GetFilename()
-	}
-	return n.filename
-}
-
-func (n *CandidateNode) SetFileIndex(idx int) {
-	n.fileIndex = idx
-}
-
-func (n *CandidateNode) GetFileIndex() int {
-	if n.Parent != nil {
-		return n.Parent.GetFileIndex()
-	}
-	return n.fileIndex
+	Node      *yaml.Node    // the actual node
+	Path      []interface{} /// the path we took to get to this node
+	Document  uint          // the document index of this node
+	Filename  string
+	FileIndex int
 }
 
 func (n *CandidateNode) GetKey() string {
-	keyPrefix := ""
-	if n.IsMapKey {
-		keyPrefix = fmt.Sprintf("key-%v-", n.Value)
-	}
-	key := ""
-	if n.Key != nil {
-		key = n.Key.Value
-	}
-	return fmt.Sprintf("%v%v - %v", keyPrefix, n.GetDocument(), key)
+	return fmt.Sprintf("%v - %v", n.Document, n.Path)
 }
 
-func (n *CandidateNode) getParsedKey() interface{} {
-	if n.IsMapKey {
-		return n.Value
-	}
-	if n.Key == nil {
-		return nil
-	}
-	if n.Key.Tag == "!!str" {
-		return n.Key.Value
-	}
-	index, err := parseInt(n.Key.Value)
+func (n *CandidateNode) CreateChildPath(path interface{}) []interface{} {
+	//don't use append as they may actually modify the path of the orignal node!
+	newPath := make([]interface{}, len(n.Path)+1)
+	copy(newPath, n.Path)
+	newPath[len(n.Path)] = path
+	return newPath
+}
+
+func (n *CandidateNode) Copy() (*CandidateNode, error) {
+	clone := &CandidateNode{}
+	err := copier.Copy(clone, n)
 	if err != nil {
-		return n.Key.Value
+		return nil, err
 	}
-	return index
-
+	return clone, nil
 }
 
-func (n *CandidateNode) GetPath() []interface{} {
-	key := n.getParsedKey()
-	if n.Parent != nil && key != nil {
-		return append(n.Parent.GetPath(), key)
-	}
-
-	if key != nil {
-		return []interface{}{key}
-	}
-	return make([]interface{}, 0)
+// updates this candidate from the given candidate node
+func (n *CandidateNode) UpdateFrom(other *CandidateNode) {
+	n.UpdateAttributesFrom(other)
+	n.Node.Content = other.Node.Content
+	n.Node.Value = other.Node.Value
+	n.Node.Alias = other.Node.Alias
 }
 
-func (n *CandidateNode) GetNicePath() string {
+func (n *CandidateNode) UpdateAttributesFrom(other *CandidateNode) {
+	if n.Node.Kind != other.Node.Kind {
+		// clear out the contents when switching to a different type
+		// e.g. map to array
+		n.Node.Content = make([]*yaml.Node, 0)
+		n.Node.Value = ""
+	}
+	n.Node.Kind = other.Node.Kind
+	n.Node.Tag = other.Node.Tag
+
+	// merge will pickup the style of the new thing
+	// when autocreating nodes
+	if n.Node.Style == 0 {
+		n.Node.Style = other.Node.Style
+	}
+	n.Node.FootComment = n.Node.FootComment + other.Node.FootComment
+	n.Node.HeadComment = n.Node.HeadComment + other.Node.HeadComment
+	n.Node.LineComment = n.Node.LineComment + other.Node.LineComment
+}
+
+func (n *CandidateNode) PathStackToString() string {
+	return mergePathStackToString(n.Path)
+}
+
+func mergePathStackToString(pathStack []interface{}) string {
 	var sb strings.Builder
-	path := n.GetPath()
-	for i, element := range path {
-		elementStr := fmt.Sprintf("%v", element)
-		switch element.(type) {
-		case int:
-			sb.WriteString("[" + elementStr + "]")
+	for index, path := range pathStack {
+		switch path.(type) {
+		case int, int64:
+			// if arrayMergeStrategy == AppendArrayMergeStrategy {
+			// sb.WriteString("[+]")
+			// } else {
+			sb.WriteString(fmt.Sprintf("[%v]", path))
+			// }
+
 		default:
-			if i == 0 {
-				sb.WriteString(elementStr)
-			} else if strings.ContainsRune(elementStr, '.') {
-				sb.WriteString("[" + elementStr + "]")
-			} else {
-				sb.WriteString("." + elementStr)
+			s := fmt.Sprintf("%v", path)
+			var _, errParsingInt = strconv.ParseInt(s, 10, 64) // nolint
+
+			hasSpecial := strings.Contains(s, ".") || strings.Contains(s, "[") || strings.Contains(s, "]") || strings.Contains(s, "\"")
+			hasDoubleQuotes := strings.Contains(s, "\"")
+			wrappingCharacterStart := "\""
+			wrappingCharacterEnd := "\""
+			if hasDoubleQuotes {
+				wrappingCharacterStart = "("
+				wrappingCharacterEnd = ")"
 			}
+			if hasSpecial || errParsingInt == nil {
+				sb.WriteString(wrappingCharacterStart)
+			}
+			sb.WriteString(s)
+			if hasSpecial || errParsingInt == nil {
+				sb.WriteString(wrappingCharacterEnd)
+			}
+		}
+
+		if index < len(pathStack)-1 {
+			sb.WriteString(".")
 		}
 	}
 	return sb.String()
 }
-
-func (n *CandidateNode) AsList() *list.List {
-	elMap := list.New()
-	elMap.PushBack(n)
-	return elMap
-}
-
-func (n *CandidateNode) SetParent(parent *CandidateNode) {
-	n.Parent = parent
-}
-
-func (n *CandidateNode) AddKeyValueChild(rawKey *CandidateNode, rawValue *CandidateNode) (*CandidateNode, *CandidateNode) {
-	key := rawKey.Copy()
-	key.SetParent(n)
-	key.IsMapKey = true
-
-	value := rawValue.Copy()
-	value.SetParent(n)
-	value.Key = key
-
-	n.Content = append(n.Content, key, value)
-	return key, value
-}
-
-func (n *CandidateNode) AddChild(rawChild *CandidateNode) {
-	value := rawChild.Copy()
-	value.SetParent(n)
-	if value.Key != nil {
-		value.Key.SetParent(n)
-	} else {
-		index := len(n.Content)
-		keyNode := createScalarNode(index, fmt.Sprintf("%v", index))
-		keyNode.SetParent(n)
-		value.Key = keyNode
-	}
-	n.Content = append(n.Content, value)
-}
-
-func (n *CandidateNode) AddChildren(children []*CandidateNode) {
-	if n.Kind == MappingNode {
-		for i := 0; i < len(children); i += 2 {
-			key := children[i]
-			value := children[i+1]
-			n.AddKeyValueChild(key, value)
-		}
-
-	} else {
-		for _, rawChild := range children {
-			n.AddChild(rawChild)
-		}
-	}
-}
-
-func (n *CandidateNode) GetValueRep() (interface{}, error) {
-	log.Debugf("GetValueRep for %v value: %v", n.GetNicePath(), n.Value)
-	realTag := n.guessTagFromCustomType()
-
-	switch realTag {
-	case "!!int":
-		_, val, err := parseInt64(n.Value)
-		return val, err
-	case "!!float":
-		// need to test this
-		return strconv.ParseFloat(n.Value, 64)
-	case "!!bool":
-		return isTruthyNode(n), nil
-	case "!!null":
-		return nil, nil
-	}
-
-	return n.Value, nil
-}
-
-func (n *CandidateNode) guessTagFromCustomType() string {
-	if strings.HasPrefix(n.Tag, "!!") {
-		return n.Tag
-	} else if n.Value == "" {
-		log.Debug("guessTagFromCustomType: node has no value to guess the type with")
-		return n.Tag
-	}
-	dataBucket, errorReading := parseSnippet(n.Value)
-
-	if errorReading != nil {
-		log.Debug("guessTagFromCustomType: could not guess underlying tag type %v", errorReading)
-		return n.Tag
-	}
-	guessedTag := dataBucket.Tag
-	log.Info("im guessing the tag %v is a %v", n.Tag, guessedTag)
-	return guessedTag
-}
-
-func (n *CandidateNode) CreateReplacement(kind Kind, tag string, value string) *CandidateNode {
-	node := &CandidateNode{
-		Kind:  kind,
-		Tag:   tag,
-		Value: value,
-	}
-	return n.CopyAsReplacement(node)
-}
-
-func (n *CandidateNode) CopyAsReplacement(replacement *CandidateNode) *CandidateNode {
-	newCopy := replacement.Copy()
-	newCopy.Parent = n.Parent
-
-	if n.IsMapKey {
-		newCopy.Key = n
-	} else {
-		newCopy.Key = n.Key
-	}
-
-	return newCopy
-}
-
-func (n *CandidateNode) CreateReplacementWithComments(kind Kind, tag string, style Style) *CandidateNode {
-	replacement := n.CreateReplacement(kind, tag, "")
-	replacement.LeadingContent = n.LeadingContent
-	replacement.HeadComment = n.HeadComment
-	replacement.LineComment = n.LineComment
-	replacement.FootComment = n.FootComment
-	replacement.Style = style
-	return replacement
-}
-
-func (n *CandidateNode) Copy() *CandidateNode {
-	return n.doCopy(true)
-}
-
-func (n *CandidateNode) CopyWithoutContent() *CandidateNode {
-	return n.doCopy(false)
-}
-
-func (n *CandidateNode) doCopy(cloneContent bool) *CandidateNode {
-	var content []*CandidateNode
-
-	var copyKey *CandidateNode
-	if n.Key != nil {
-		copyKey = n.Key.Copy()
-	}
-
-	clone := &CandidateNode{
-		Kind:  n.Kind,
-		Style: n.Style,
-
-		Tag:    n.Tag,
-		Value:  n.Value,
-		Anchor: n.Anchor,
-
-		// ok not to clone this,
-		// as its a reference to somewhere else.
-		Alias:   n.Alias,
-		Content: content,
-
-		HeadComment: n.HeadComment,
-		LineComment: n.LineComment,
-		FootComment: n.FootComment,
-
-		Parent: n.Parent,
-		Key:    copyKey,
-
-		LeadingContent: n.LeadingContent,
-
-		document:  n.document,
-		filename:  n.filename,
-		fileIndex: n.fileIndex,
-
-		Line:   n.Line,
-		Column: n.Column,
-
-		EvaluateTogether: n.EvaluateTogether,
-		IsMapKey:         n.IsMapKey,
-	}
-
-	if cloneContent {
-		clone.AddChildren(n.Content)
-	}
-
-	return clone
-}
-
-// updates this candidate from the given candidate node
-func (n *CandidateNode) UpdateFrom(other *CandidateNode, prefs assignPreferences) {
-	if n == other {
-		log.Debugf("UpdateFrom, no need to update from myself.")
-		return
-	}
-	// if this is an empty map or empty array, use the style of other node.
-	if (n.Kind != ScalarNode && len(n.Content) == 0) ||
-		// if the tag has changed (e.g. from str to bool)
-		(n.guessTagFromCustomType() != other.guessTagFromCustomType()) {
-		n.Style = other.Style
-	}
-
-	n.Content = make([]*CandidateNode, 0)
-	n.Kind = other.Kind
-	n.AddChildren(other.Content)
-
-	n.Value = other.Value
-
-	n.UpdateAttributesFrom(other, prefs)
-
-}
-
-func (n *CandidateNode) UpdateAttributesFrom(other *CandidateNode, prefs assignPreferences) {
-	log.Debug("UpdateAttributesFrom: n: %v other: %v", NodeToString(n), NodeToString(other))
-	if n.Kind != other.Kind {
-		// clear out the contents when switching to a different type
-		// e.g. map to array
-		n.Content = make([]*CandidateNode, 0)
-		n.Value = ""
-	}
-	n.Kind = other.Kind
-
-	// don't clobber custom tags...
-	if prefs.ClobberCustomTags || strings.HasPrefix(n.Tag, "!!") || n.Tag == "" {
-		n.Tag = other.Tag
-	}
-
-	n.Alias = other.Alias
-
-	if !prefs.DontOverWriteAnchor {
-		n.Anchor = other.Anchor
-	}
-
-	// merge will pickup the style of the new thing
-	// when autocreating nodes
-
-	if n.Style == 0 {
-		n.Style = other.Style
-	}
-
-	if other.FootComment != "" {
-		n.FootComment = other.FootComment
-	}
-	if other.HeadComment != "" {
-		n.HeadComment = other.HeadComment
-	}
-	if other.LineComment != "" {
-		n.LineComment = other.LineComment
-	}
-}

pkg/yqlib/candidate_node_goccy_yaml.go

@@ -1,187 +0,0 @@
-package yqlib
-
-import (
-	"fmt"
-	"strings"
-
-	yaml "github.com/goccy/go-yaml"
-	"github.com/goccy/go-yaml/ast"
-	goccyToken "github.com/goccy/go-yaml/token"
-)
-
-func (o *CandidateNode) goccyDecodeIntoChild(childNode ast.Node, cm yaml.CommentMap) (*CandidateNode, error) {
-	newChild := o.CreateChild()
-
-	err := newChild.UnmarshalGoccyYAML(childNode, cm)
-	return newChild, err
-}
-
-func (o *CandidateNode) UnmarshalGoccyYAML(node ast.Node, cm yaml.CommentMap, anchorMap map[string]*CandidateNode) error {
-	log.Debugf("UnmarshalYAML %v", node)
-	log.Debugf("UnmarshalYAML %v", node.Type().String())
-	log.Debugf("UnmarshalYAML Node Value: %v", node.String())
-	log.Debugf("UnmarshalYAML Node GetComment: %v", node.GetComment())
-
-	if node.GetComment() != nil {
-		commentMapComments := cm[node.GetPath()]
-		for _, comment := range node.GetComment().Comments {
-			// need to use the comment map to find the position :/
-			log.Debugf("%v has a comment of [%v]", node.GetPath(), comment.Token.Value)
-			for _, commentMapComment := range commentMapComments {
-				commentMapValue := strings.Join(commentMapComment.Texts, "\n")
-				if commentMapValue == comment.Token.Value {
-					log.Debug("found a matching entry in comment map")
-					// we found the comment in the comment map,
-					// now we can process the position
-					switch commentMapComment.Position {
-					case yaml.CommentHeadPosition:
-						o.HeadComment = comment.String()
-						log.Debug("its a head comment %v", comment.String())
-					case yaml.CommentLinePosition:
-						o.LineComment = comment.String()
-						log.Debug("its a line comment %v", comment.String())
-					case yaml.CommentFootPosition:
-						o.FootComment = comment.String()
-						log.Debug("its a foot comment %v", comment.String())
-					}
-				}
-			}
-
-		}
-	}
-	o.Anchor = node.
-
-	if o.Anchor != "" {
-		anchorMap[o.Anchor] = o
-	}
-
-	if o.Ali
-
-	o.Value = node.String()
-	switch node.Type() {
-	case ast.IntegerType:
-		o.Kind = ScalarNode
-		o.Tag = "!!int"
-	case ast.FloatType:
-		o.Kind = ScalarNode
-		o.Tag = "!!float"
-	case ast.BoolType:
-		o.Kind = ScalarNode
-		o.Tag = "!!bool"
-	case ast.NullType:
-		o.Kind = ScalarNode
-		o.Tag = "!!null"
-		o.Value = node.GetToken().Value
-	case ast.StringType:
-		o.Kind = ScalarNode
-		o.Tag = "!!str"
-		switch node.GetToken().Type {
-		case goccyToken.SingleQuoteType:
-			o.Style = SingleQuotedStyle
-		case goccyToken.DoubleQuoteType:
-			o.Style = DoubleQuotedStyle
-		}
-		o.Value = node.(*ast.StringNode).Value
-		log.Debugf("string value %v", node.(*ast.StringNode).Value)
-	case ast.LiteralType:
-		o.Kind = ScalarNode
-		o.Tag = "!!str"
-		o.Style = LiteralStyle
-		astLiteral := node.(*ast.LiteralNode)
-		log.Debugf("astLiteral.Start.Type %v", astLiteral.Start.Type)
-		if astLiteral.Start.Type == goccyToken.FoldedType {
-			log.Debugf("folded Type %v", astLiteral.Start.Type)
-			o.Style = FoldedStyle
-		}
-		log.Debug("start value: %v ", node.(*ast.LiteralNode).Start.Value)
-		log.Debug("start value: %v ", node.(*ast.LiteralNode).Start.Type)
-		// TODO: here I could put the original value with line breaks
-		// to solve the multiline > problem
-		o.Value = astLiteral.Value.Value
-	case ast.TagType:
-		if err := o.UnmarshalGoccyYAML(node.(*ast.TagNode).Value, cm, anchorMap); err != nil {
-			return err
-		}
-		o.Tag = node.(*ast.TagNode).Start.Value
-	case ast.MappingType:
-		log.Debugf("UnmarshalYAML -  a mapping node")
-		o.Kind = MappingNode
-		o.Tag = "!!map"
-
-		mappingNode := node.(*ast.MappingNode)
-		if mappingNode.IsFlowStyle {
-			o.Style = FlowStyle
-		}
-		for _, mappingValueNode := range mappingNode.Values {
-			err := o.goccyProcessMappingValueNode(mappingValueNode, cm)
-			if err != nil {
-				return ast.ErrInvalidAnchorName
-			}
-		}
-		if mappingNode.FootComment != nil {
-			log.Debugf("mapping node has a foot comment of: %v", mappingNode.FootComment)
-			o.FootComment = mappingNode.FootComment.String()
-		}
-	case ast.MappingValueType:
-		log.Debugf("UnmarshalYAML -  a mapping node")
-		o.Kind = MappingNode
-		o.Tag = "!!map"
-		mappingValueNode := node.(*ast.MappingValueNode)
-		err := o.goccyProcessMappingValueNode(mappingValueNode, cm)
-		if err != nil {
-			return ast.ErrInvalidAnchorName
-		}
-	case ast.SequenceType:
-		log.Debugf("UnmarshalYAML -  a sequence node")
-		o.Kind = SequenceNode
-		o.Tag = "!!seq"
-		sequenceNode := node.(*ast.SequenceNode)
-		if sequenceNode.IsFlowStyle {
-			o.Style = FlowStyle
-		}
-		astSeq := sequenceNode.Values
-		o.Content = make([]*CandidateNode, len(astSeq))
-		for i := 0; i < len(astSeq); i++ {
-			keyNode := o.CreateChild()
-			keyNode.IsMapKey = true
-			keyNode.Tag = "!!int"
-			keyNode.Kind = ScalarNode
-			keyNode.Value = fmt.Sprintf("%v", i)
-
-			valueNode, err := o.goccyDecodeIntoChild(astSeq[i], cm)
-			if err != nil {
-				return err
-			}
-
-			valueNode.Key = keyNode
-			o.Content[i] = valueNode
-		}
-
-	default:
-		log.Debugf("UnmarshalYAML -  node idea of the type!!")
-	}
-	log.Debugf("KIND: %v", o.Kind)
-	return nil
-}
-
-func (o *CandidateNode) goccyProcessMappingValueNode(mappingEntry *ast.MappingValueNode, cm yaml.CommentMap) error {
-	log.Debug("UnmarshalYAML MAP KEY entry %v", mappingEntry.Key)
-	keyNode, err := o.goccyDecodeIntoChild(mappingEntry.Key, cm)
-	if err != nil {
-		return err
-	}
-	keyNode.IsMapKey = true
-
-	log.Debug("UnmarshalYAML MAP VALUE entry %v", mappingEntry.Value)
-	valueNode, err := o.goccyDecodeIntoChild(mappingEntry.Value, cm)
-	if err != nil {
-		return err
-	}
-
-	if mappingEntry.FootComment != nil {
-		valueNode.FootComment = mappingEntry.FootComment.String()
-	}
-	o.AddKeyValueChild(keyNode, valueNode)
-
-	return nil
-}

pkg/yqlib/candidate_node_test.go

@@ -1,149 +0,0 @@
-package yqlib
-
-import (
-	"fmt"
-	"testing"
-
-	"github.com/mikefarah/yq/v4/test"
-)
-
-type valueRepScenario struct {
-	input    string
-	tag      string
-	expected interface{}
-}
-
-var valueRepScenarios = []valueRepScenario{
-	{
-		input:    `"cat"`,
-		expected: `"cat"`,
-	},
-	{
-		input:    `3`,
-		expected: int64(3),
-	},
-	{
-		input:    `3.1`,
-		expected: float64(3.1),
-	},
-	{
-		input:    `true`,
-		expected: true,
-	},
-	{
-		input:    `y`,
-		tag:      "!!bool",
-		expected: true,
-	},
-	{
-		tag:      "!!null",
-		expected: nil,
-	},
-}
-
-func TestCandidateNodeGetValueRepScenarios(t *testing.T) {
-	for _, tt := range valueRepScenarios {
-		node := CandidateNode{Value: tt.input, Tag: tt.tag}
-		actual, err := node.GetValueRep()
-		if err != nil {
-			t.Error(err)
-			return
-		}
-		test.AssertResult(t, tt.expected, actual)
-	}
-}
-
-func TestCandidateNodeChildWhenParentUpdated(t *testing.T) {
-	parent := CandidateNode{}
-	child := parent.CreateChild()
-	parent.SetDocument(1)
-	parent.SetFileIndex(2)
-	parent.SetFilename("meow")
-	test.AssertResultWithContext(t, "meow", child.GetFilename(), "filename")
-	test.AssertResultWithContext(t, 2, child.GetFileIndex(), "file index")
-	test.AssertResultWithContext(t, uint(1), child.GetDocument(), "document index")
-}
-
-type createScalarNodeScenario struct {
-	value       interface{}
-	stringValue string
-	expectedTag string
-}
-
-var createScalarScenarios = []createScalarNodeScenario{
-	{
-		value:       "mike",
-		stringValue: "mike",
-		expectedTag: "!!str",
-	},
-	{
-		value:       3,
-		stringValue: "3",
-		expectedTag: "!!int",
-	},
-	{
-		value:       3.1,
-		stringValue: "3.1",
-		expectedTag: "!!float",
-	},
-	{
-		value:       true,
-		stringValue: "true",
-		expectedTag: "!!bool",
-	},
-	{
-		value:       nil,
-		stringValue: "~",
-		expectedTag: "!!null",
-	},
-}
-
-func TestCreateScalarNodeScenarios(t *testing.T) {
-	for _, tt := range createScalarScenarios {
-		actual := createScalarNode(tt.value, tt.stringValue)
-		test.AssertResultWithContext(t, tt.stringValue, actual.Value, fmt.Sprintf("Value for: Value: [%v], String: %v", tt.value, tt.stringValue))
-		test.AssertResultWithContext(t, tt.expectedTag, actual.Tag, fmt.Sprintf("Value for: Value: [%v], String: %v", tt.value, tt.stringValue))
-	}
-}
-
-func TestGetKeyForMapValue(t *testing.T) {
-	key := createStringScalarNode("yourKey")
-	n := CandidateNode{Key: key, Value: "meow", document: 3}
-	test.AssertResult(t, "3 - yourKey", n.GetKey())
-}
-
-func TestGetKeyForMapKey(t *testing.T) {
-	key := createStringScalarNode("yourKey")
-	key.IsMapKey = true
-	key.document = 3
-	test.AssertResult(t, "key-yourKey-3 - ", key.GetKey())
-}
-
-func TestGetKeyForValue(t *testing.T) {
-	n := CandidateNode{Value: "meow", document: 3}
-	test.AssertResult(t, "3 - ", n.GetKey())
-}
-
-func TestGetParsedKeyForMapKey(t *testing.T) {
-	key := createStringScalarNode("yourKey")
-	key.IsMapKey = true
-	key.document = 3
-	test.AssertResult(t, "yourKey", key.getParsedKey())
-}
-
-func TestGetParsedKeyForLooseValue(t *testing.T) {
-	n := CandidateNode{Value: "meow", document: 3}
-	test.AssertResult(t, nil, n.getParsedKey())
-}
-
-func TestGetParsedKeyForMapValue(t *testing.T) {
-	key := createStringScalarNode("yourKey")
-	n := CandidateNode{Key: key, Value: "meow", document: 3}
-	test.AssertResult(t, "yourKey", n.getParsedKey())
-}
-
-func TestGetParsedKeyForArrayValue(t *testing.T) {
-	key := createScalarNode(4, "4")
-	n := CandidateNode{Key: key, Value: "meow", document: 3}
-	test.AssertResult(t, 4, n.getParsedKey())
-}

pkg/yqlib/candidate_node_yaml.go

@@ -1,218 +0,0 @@
-package yqlib
-
-import (
-	"fmt"
-
-	yaml "gopkg.in/yaml.v3"
-)
-
-func MapYamlStyle(original yaml.Style) Style {
-	switch original {
-	case yaml.TaggedStyle:
-		return TaggedStyle
-	case yaml.DoubleQuotedStyle:
-		return DoubleQuotedStyle
-	case yaml.SingleQuotedStyle:
-		return SingleQuotedStyle
-	case yaml.LiteralStyle:
-		return LiteralStyle
-	case yaml.FoldedStyle:
-		return FoldedStyle
-	case yaml.FlowStyle:
-		return FlowStyle
-	case 0:
-		return 0
-	}
-	return Style(original)
-}
-
-func MapToYamlStyle(original Style) yaml.Style {
-	switch original {
-	case TaggedStyle:
-		return yaml.TaggedStyle
-	case DoubleQuotedStyle:
-		return yaml.DoubleQuotedStyle
-	case SingleQuotedStyle:
-		return yaml.SingleQuotedStyle
-	case LiteralStyle:
-		return yaml.LiteralStyle
-	case FoldedStyle:
-		return yaml.FoldedStyle
-	case FlowStyle:
-		return yaml.FlowStyle
-	case 0:
-		return 0
-	}
-	return yaml.Style(original)
-}
-
-func (o *CandidateNode) copyFromYamlNode(node *yaml.Node, anchorMap map[string]*CandidateNode) {
-	o.Style = MapYamlStyle(node.Style)
-
-	o.Tag = node.Tag
-	o.Value = node.Value
-	o.Anchor = node.Anchor
-
-	if o.Anchor != "" {
-		anchorMap[o.Anchor] = o
-		log.Debug("set anchor %v to %v", o.Anchor, NodeToString(o))
-	}
-
-	// its a single alias
-	if node.Alias != nil && node.Alias.Anchor != "" {
-		o.Alias = anchorMap[node.Alias.Anchor]
-		log.Debug("set alias to %v", NodeToString(anchorMap[node.Alias.Anchor]))
-	}
-	o.HeadComment = node.HeadComment
-	o.LineComment = node.LineComment
-	o.FootComment = node.FootComment
-
-	o.Line = node.Line
-	o.Column = node.Column
-}
-
-func (o *CandidateNode) copyToYamlNode(node *yaml.Node) {
-	node.Style = MapToYamlStyle(o.Style)
-
-	node.Tag = o.Tag
-	node.Value = o.Value
-	node.Anchor = o.Anchor
-
-	// node.Alias = TODO - find Alias in our own structure
-	// might need to be a post process thing
-
-	node.HeadComment = o.HeadComment
-
-	node.LineComment = o.LineComment
-	node.FootComment = o.FootComment
-
-	node.Line = o.Line
-	node.Column = o.Column
-}
-
-func (o *CandidateNode) decodeIntoChild(childNode *yaml.Node, anchorMap map[string]*CandidateNode) (*CandidateNode, error) {
-	newChild := o.CreateChild()
-
-	// null yaml.Nodes to not end up calling UnmarshalYAML
-	// so we call it explicitly
-	if childNode.Tag == "!!null" {
-		newChild.Kind = ScalarNode
-		newChild.copyFromYamlNode(childNode, anchorMap)
-		return newChild, nil
-	}
-
-	err := newChild.UnmarshalYAML(childNode, anchorMap)
-	return newChild, err
-}
-
-func (o *CandidateNode) UnmarshalYAML(node *yaml.Node, anchorMap map[string]*CandidateNode) error {
-	log.Debugf("UnmarshalYAML %v", node.Tag)
-	switch node.Kind {
-	case yaml.AliasNode:
-		log.Debug("UnmarshalYAML - alias from yaml: %v", o.Tag)
-		o.Kind = AliasNode
-		o.copyFromYamlNode(node, anchorMap)
-		return nil
-	case yaml.ScalarNode:
-		log.Debugf("UnmarshalYAML -  a scalar")
-		o.Kind = ScalarNode
-		o.copyFromYamlNode(node, anchorMap)
-		return nil
-	case yaml.MappingNode:
-		log.Debugf("UnmarshalYAML -  a mapping node")
-		o.Kind = MappingNode
-		o.copyFromYamlNode(node, anchorMap)
-		o.Content = make([]*CandidateNode, len(node.Content))
-		for i := 0; i < len(node.Content); i += 2 {
-
-			keyNode, err := o.decodeIntoChild(node.Content[i], anchorMap)
-			if err != nil {
-				return err
-			}
-
-			keyNode.IsMapKey = true
-
-			valueNode, err := o.decodeIntoChild(node.Content[i+1], anchorMap)
-			if err != nil {
-				return err
-			}
-
-			valueNode.Key = keyNode
-
-			o.Content[i] = keyNode
-			o.Content[i+1] = valueNode
-		}
-		log.Debugf("UnmarshalYAML -  finished mapping node")
-		return nil
-	case yaml.SequenceNode:
-		log.Debugf("UnmarshalYAML -  a sequence: %v", len(node.Content))
-		o.Kind = SequenceNode
-
-		o.copyFromYamlNode(node, anchorMap)
-		log.Debugf("node Style: %v", node.Style)
-		log.Debugf("o Style: %v", o.Style)
-		o.Content = make([]*CandidateNode, len(node.Content))
-		for i := 0; i < len(node.Content); i++ {
-			keyNode := o.CreateChild()
-			keyNode.IsMapKey = true
-			keyNode.Tag = "!!int"
-			keyNode.Kind = ScalarNode
-			keyNode.Value = fmt.Sprintf("%v", i)
-
-			valueNode, err := o.decodeIntoChild(node.Content[i], anchorMap)
-			if err != nil {
-				return err
-			}
-
-			valueNode.Key = keyNode
-			o.Content[i] = valueNode
-		}
-		return nil
-	case 0:
-		// not sure when this happens
-		o.copyFromYamlNode(node, anchorMap)
-		log.Debugf("UnmarshalYAML -  err.. %v", NodeToString(o))
-		return nil
-	default:
-		return fmt.Errorf("orderedMap: invalid yaml node")
-	}
-}
-
-func (o *CandidateNode) MarshalYAML() (*yaml.Node, error) {
-	log.Debug("MarshalYAML to yaml: %v", o.Tag)
-	switch o.Kind {
-	case AliasNode:
-		log.Debug("MarshalYAML - alias to yaml: %v", o.Tag)
-		target := &yaml.Node{Kind: yaml.AliasNode}
-		o.copyToYamlNode(target)
-		return target, nil
-	case ScalarNode:
-		log.Debug("MarshalYAML - scalar: %v", o.Value)
-		target := &yaml.Node{Kind: yaml.ScalarNode}
-		o.copyToYamlNode(target)
-		return target, nil
-	case MappingNode, SequenceNode:
-		targetKind := yaml.MappingNode
-		if o.Kind == SequenceNode {
-			targetKind = yaml.SequenceNode
-		}
-		target := &yaml.Node{Kind: targetKind}
-		o.copyToYamlNode(target)
-		log.Debugf("original style: %v", o.Style)
-		log.Debugf("original: %v, tag: %v, style: %v, kind: %v", NodeToString(o), target.Tag, target.Style, target.Kind == yaml.SequenceNode)
-		target.Content = make([]*yaml.Node, len(o.Content))
-		for i := 0; i < len(o.Content); i++ {
-
-			child, err := o.Content[i].MarshalYAML()
-
-			if err != nil {
-				return nil, err
-			}
-			target.Content[i] = child
-		}
-		return target, nil
-	}
-	target := &yaml.Node{}
-	o.copyToYamlNode(target)
-	return target, nil
-}

pkg/yqlib/candidiate_node_json.go

@@ -1,172 +0,0 @@
-package yqlib
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"io"
-
-	"github.com/goccy/go-json"
-)
-
-func (o *CandidateNode) setScalarFromJson(value interface{}) error {
-	o.Kind = ScalarNode
-	switch rawData := value.(type) {
-	case nil:
-		o.Tag = "!!null"
-		o.Value = "null"
-	case float64, float32:
-		o.Value = fmt.Sprintf("%v", value)
-		o.Tag = "!!float"
-		// json decoder returns ints as float.
-		if value == float64(int64(rawData.(float64))) {
-			// aha it's an int disguised as a float
-			o.Tag = "!!int"
-			o.Value = fmt.Sprintf("%v", int64(value.(float64)))
-		}
-	case int, int64, int32:
-		o.Value = fmt.Sprintf("%v", value)
-		o.Tag = "!!int"
-	case bool:
-		o.Value = fmt.Sprintf("%v", value)
-		o.Tag = "!!bool"
-	case string:
-		o.Value = rawData
-		o.Tag = "!!str"
-	default:
-		return fmt.Errorf("unrecognised type :( %v", rawData)
-	}
-	return nil
-}
-
-func (o *CandidateNode) UnmarshalJSON(data []byte) error {
-	log.Debug("UnmarshalJSON")
-	switch data[0] {
-	case '{':
-		log.Debug("UnmarshalJSON -  its a map!")
-		// its a map
-		o.Kind = MappingNode
-		o.Tag = "!!map"
-
-		dec := json.NewDecoder(bytes.NewReader(data))
-		_, err := dec.Token() // open object
-		if err != nil {
-			return err
-		}
-
-		// cycle through k/v
-		var tok json.Token
-		for tok, err = dec.Token(); err == nil; tok, err = dec.Token() {
-			// we can expect two types: string or Delim. Delim automatically means
-			// that it is the closing bracket of the object, whereas string means
-			// that there is another key.
-			if _, ok := tok.(json.Delim); ok {
-				break
-			}
-
-			childKey := o.CreateChild()
-			childKey.IsMapKey = true
-			childKey.Value = tok.(string)
-			childKey.Kind = ScalarNode
-			childKey.Tag = "!!str"
-
-			childValue := o.CreateChild()
-			childValue.Key = childKey
-
-			if err := dec.Decode(childValue); err != nil {
-				return err
-			}
-			o.Content = append(o.Content, childKey, childValue)
-		}
-		// unexpected error
-		if err != nil && !errors.Is(err, io.EOF) {
-			return err
-		}
-		return nil
-	case '[':
-		o.Kind = SequenceNode
-		o.Tag = "!!seq"
-		log.Debug("UnmarshalJSON -  its an array!")
-		var children []*CandidateNode
-		if err := json.Unmarshal(data, &children); err != nil {
-			return err
-		}
-		// now we put the children into the content, and set a key value for them
-		for i, child := range children {
-
-			if child == nil {
-				// need to represent it as a null scalar
-				child = createScalarNode(nil, "null")
-			}
-			childKey := o.CreateChild()
-			childKey.Kind = ScalarNode
-			childKey.Tag = "!!int"
-			childKey.Value = fmt.Sprintf("%v", i)
-			childKey.IsMapKey = true
-
-			child.Parent = o
-			child.Key = childKey
-			o.Content = append(o.Content, child)
-		}
-		return nil
-	}
-	log.Debug("UnmarshalJSON -  its a scalar!")
-	// otherwise, must be a scalar
-	var scalar interface{}
-	err := json.Unmarshal(data, &scalar)
-
-	if err != nil {
-		return err
-	}
-	log.Debug("UnmarshalJSON -  scalar is %v", scalar)
-
-	return o.setScalarFromJson(scalar)
-
-}
-
-func (o *CandidateNode) MarshalJSON() ([]byte, error) {
-	log.Debugf("MarshalJSON %v", NodeToString(o))
-	buf := new(bytes.Buffer)
-	enc := json.NewEncoder(buf)
-	enc.SetIndent("", " ")
-	enc.SetEscapeHTML(false) // do not escape html chars e.g. &, <, >
-
-	switch o.Kind {
-	case AliasNode:
-		log.Debugf("MarshalJSON AliasNode")
-		err := enc.Encode(o.Alias)
-		return buf.Bytes(), err
-	case ScalarNode:
-		log.Debugf("MarshalJSON ScalarNode")
-		value, err := o.GetValueRep()
-		if err != nil {
-			return buf.Bytes(), err
-		}
-		err = enc.Encode(value)
-		return buf.Bytes(), err
-	case MappingNode:
-		log.Debugf("MarshalJSON MappingNode")
-		buf.WriteByte('{')
-		for i := 0; i < len(o.Content); i += 2 {
-			if err := enc.Encode(o.Content[i].Value); err != nil {
-				return nil, err
-			}
-			buf.WriteByte(':')
-			if err := enc.Encode(o.Content[i+1]); err != nil {
-				return nil, err
-			}
-			if i != len(o.Content)-2 {
-				buf.WriteByte(',')
-			}
-		}
-		buf.WriteByte('}')
-		return buf.Bytes(), nil
-	case SequenceNode:
-		log.Debugf("MarshalJSON SequenceNode")
-		err := enc.Encode(o.Content)
-		return buf.Bytes(), err
-	default:
-		err := enc.Encode(nil)
-		return buf.Bytes(), err
-	}
-}

pkg/yqlib/chown_linux.go

@@ -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
-}

pkg/yqlib/chown_not_linux_os.go

@@ -1,12 +0,0 @@
-//go:build !linux
-
-package yqlib
-
-import (
-	"io/fs"
-	"os"
-)
-
-func changeOwner(info fs.FileInfo, file *os.File) error {
-	return nil
-}

pkg/yqlib/color_print.go

@@ -17,8 +17,8 @@ func format(attr color.Attribute) string {
 	return fmt.Sprintf("%s[%dm", escape, attr)
 }
 
-func colorizeAndPrint(yamlBytes []byte, writer io.Writer) error {
-	tokens := lexer.Tokenize(string(yamlBytes))
+func ColorizeAndPrint(bytes []byte, writer io.Writer) error {
+	tokens := lexer.Tokenize(string(bytes))
 	var p printer.Printer
 	p.Bool = func() *printer.Property {
 		return &printer.Property{

pkg/yqlib/context.go

@@ -1,110 +0,0 @@
-package yqlib
-
-import (
-	"container/list"
-	"fmt"
-	"time"
-
-	logging "gopkg.in/op/go-logging.v1"
-)
-
-type Context struct {
-	MatchingNodes  *list.List
-	Variables      map[string]*list.List
-	DontAutoCreate bool
-	datetimeLayout string
-}
-
-func (n *Context) SingleReadonlyChildContext(candidate *CandidateNode) Context {
-	list := list.New()
-	list.PushBack(candidate)
-	newContext := n.ChildContext(list)
-	newContext.DontAutoCreate = true
-	return newContext
-}
-
-func (n *Context) SingleChildContext(candidate *CandidateNode) Context {
-	list := list.New()
-	list.PushBack(candidate)
-	return n.ChildContext(list)
-}
-
-func (n *Context) SetDateTimeLayout(newDateTimeLayout string) {
-	n.datetimeLayout = newDateTimeLayout
-}
-
-func (n *Context) GetDateTimeLayout() string {
-	if n.datetimeLayout != "" {
-		return n.datetimeLayout
-	}
-	return time.RFC3339
-}
-
-func (n *Context) GetVariable(name string) *list.List {
-	if n.Variables == nil {
-		return nil
-	}
-	return n.Variables[name]
-}
-
-func (n *Context) SetVariable(name string, value *list.List) {
-	if n.Variables == nil {
-		n.Variables = make(map[string]*list.List)
-	}
-	n.Variables[name] = value
-}
-
-func (n *Context) ChildContext(results *list.List) Context {
-	clone := Context{DontAutoCreate: n.DontAutoCreate, datetimeLayout: n.datetimeLayout}
-	clone.Variables = make(map[string]*list.List)
-	for variableKey, originalValueList := range n.Variables {
-
-		variableCopyList := list.New()
-		for el := originalValueList.Front(); el != nil; el = el.Next() {
-			// note that we dont make a copy of the candidate node
-			// this is so the 'ref' operator can work correctly.
-			clonedNode := el.Value.(*CandidateNode)
-			variableCopyList.PushBack(clonedNode)
-		}
-
-		clone.Variables[variableKey] = variableCopyList
-	}
-
-	clone.MatchingNodes = results
-	return clone
-}
-
-func (n *Context) ToString() string {
-	if !log.IsEnabledFor(logging.DEBUG) {
-		return ""
-	}
-	result := fmt.Sprintf("Context\nDontAutoCreate: %v\n", n.DontAutoCreate)
-	return result + NodesToString(n.MatchingNodes)
-}
-
-func (n *Context) DeepClone() Context {
-
-	clonedContent := list.New()
-	for el := n.MatchingNodes.Front(); el != nil; el = el.Next() {
-		clonedNode := el.Value.(*CandidateNode).Copy()
-		clonedContent.PushBack(clonedNode)
-	}
-
-	return n.ChildContext(clonedContent)
-}
-
-func (n *Context) Clone() Context {
-	return n.ChildContext(n.MatchingNodes)
-}
-
-func (n *Context) ReadOnlyClone() Context {
-	clone := n.Clone()
-	clone.DontAutoCreate = true
-	return clone
-}
-
-func (n *Context) WritableClone() Context {
-	clone := n.Clone()
-	clone.DontAutoCreate = false
-	return clone
-}

pkg/yqlib/context_test.go

@@ -1,51 +0,0 @@
-package yqlib
-
-import (
-	"container/list"
-	"testing"
-
-	"github.com/mikefarah/yq/v4/test"
-)
-
-func TestChildContext(t *testing.T) {
-
-	expectedOriginal := make(map[string]*list.List)
-	expectedOriginal["dog"] = list.New()
-	expectedOriginal["dog"].PushBack(&CandidateNode{Value: "woof"})
-
-	originalVariables := make(map[string]*list.List)
-	originalVariables["dog"] = list.New()
-	originalVariables["dog"].PushBack(&CandidateNode{Value: "woof"})
-
-	original := Context{
-		DontAutoCreate: true,
-		datetimeLayout: "cat",
-		Variables:      originalVariables,
-	}
-
-	newResults := list.New()
-	newResults.PushBack(&CandidateNode{Value: "bar"})
-
-	clone := original.ChildContext(newResults)
-	test.AssertResultComplex(t, originalVariables, clone.Variables)
-
-	clone.Variables["dog"].PushBack("bark")
-	// ensure this is a separate copy
-	test.AssertResultComplex(t, 1, originalVariables["dog"].Len())
-
-}
-
-func TestChildContextNoVariables(t *testing.T) {
-
-	original := Context{
-		DontAutoCreate: true,
-		datetimeLayout: "cat",
-	}
-
-	newResults := list.New()
-	newResults.PushBack(&CandidateNode{Value: "bar"})
-
-	clone := original.ChildContext(newResults)
-	test.AssertResultComplex(t, make(map[string]*list.List), clone.Variables)
-
-}

pkg/yqlib/csv_test.go

@@ -1,306 +0,0 @@
-package yqlib
-
-import (
-	"bufio"
-	"fmt"
-	"testing"
-
-	"github.com/mikefarah/yq/v4/test"
-)
-
-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
-`
-
-const csvSimpleShort = `Name,Number of Cats
-Gary,1
-Samantha's Rabbit,2
-`
-
-const tsvSimple = `name	numberOfCats	likesApples	height
-Gary	1	true	168.8
-Samantha's Rabbit	2	false	-188.8
-`
-
-const expectedYamlFromCSV = `- name: Gary
-  numberOfCats: 1
-  likesApples: true
-  height: 168.8
-- name: Samantha's Rabbit
-  numberOfCats: 2
-  likesApples: false
-  height: -188.8
-`
-
-const expectedYamlFromCSVMissingData = `- name: Gary
-  numberOfCats: 1
-  height: 168.8
-- name: Samantha's Rabbit
-  height: -188.8
-  likesApples: false
-`
-
-const csvSimpleMissingData = `name,numberOfCats,height
-Gary,1,168.8
-Samantha's Rabbit,,-188.8
-`
-
-const csvTestSimpleYaml = `- [i, like, csv]
-- [because, excel, is, cool]`
-
-const expectedSimpleCsv = `i,like,csv
-because,excel,is,cool
-`
-
-const tsvTestExpectedSimpleCsv = `i	like	csv
-because	excel	is	cool
-`
-
-var csvScenarios = []formatScenario{
-	{
-		description:  "Encode CSV simple",
-		input:        csvTestSimpleYaml,
-		expected:     expectedSimpleCsv,
-		scenarioType: "encode-csv",
-	},
-	{
-		description:  "Encode TSV simple",
-		input:        csvTestSimpleYaml,
-		expected:     tsvTestExpectedSimpleCsv,
-		scenarioType: "encode-tsv",
-	},
-	{
-		description:  "Encode Empty",
-		skipDoc:      true,
-		input:        `[]`,
-		expected:     "",
-		scenarioType: "encode-csv",
-	},
-	{
-		description:  "Comma in value",
-		skipDoc:      true,
-		input:        `["comma, in, value", things]`,
-		expected:     "\"comma, in, value\",things\n",
-		scenarioType: "encode-csv",
-	},
-	{
-		description:  "Encode array of objects to csv",
-		input:        expectedYamlFromCSV,
-		expected:     csvSimple,
-		scenarioType: "encode-csv",
-	},
-	{
-		description:    "Encode array of objects to custom csv format",
-		subdescription: "Add the header row manually, then the we convert each object into an array of values - resulting in an array of arrays. Pick the columns and call the header whatever you like.",
-		input:          expectedYamlFromCSV,
-		expected:       csvSimpleShort,
-		expression:     `[["Name", "Number of Cats"]] +  [.[] | [.name, .numberOfCats ]]`,
-		scenarioType:   "encode-csv",
-	},
-	{
-		description:    "Encode array of objects to csv - missing fields behaviour",
-		subdescription: "First entry is used to determine the headers, and it is missing 'likesApples', so it is not included in the csv. Second entry does not have 'numberOfCats' so that is blank",
-		input:          expectedYamlFromCSVMissingData,
-		expected:       csvSimpleMissingData,
-		scenarioType:   "encode-csv",
-	},
-	{
-		description:  "decode csv missing",
-		skipDoc:      true,
-		input:        csvMissing,
-		expected:     csvMissing,
-		scenarioType: "roundtrip-csv",
-	},
-	{
-		description:  "decode csv key",
-		skipDoc:      true,
-		input:        csvSimple,
-		expression:   ".[0].name | key",
-		expected:     "name\n",
-		scenarioType: "decode-csv-object",
-	},
-	{
-		description:  "decode csv parent",
-		skipDoc:      true,
-		input:        csvSimple,
-		expression:   ".[0].name | parent | .height",
-		expected:     "168.8\n",
-		scenarioType: "decode-csv-object",
-	},
-	{
-		description:    "Parse CSV into an array of objects",
-		subdescription: "First row is assumed to be the header row.",
-		input:          csvSimple,
-		expected:       expectedYamlFromCSV,
-		scenarioType:   "decode-csv-object",
-	},
-	{
-		description:  "Scalar roundtrip",
-		skipDoc:      true,
-		input:        "mike\ncat",
-		expression:   ".[0].mike",
-		expected:     "cat\n",
-		scenarioType: "roundtrip-csv",
-	},
-	{
-		description:    "Parse TSV into an array of objects",
-		subdescription: "First row is assumed to be the header row.",
-		input:          tsvSimple,
-		expected:       expectedYamlFromCSV,
-		scenarioType:   "decode-tsv-object",
-	},
-	{
-		description:  "Round trip",
-		input:        csvSimple,
-		expected:     expectedUpdatedSimpleCsv,
-		expression:   `(.[] | select(.name == "Gary") | .numberOfCats) = 3`,
-		scenarioType: "roundtrip-csv",
-	},
-}
-
-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)
-	case "encode-tsv":
-		test.AssertResultWithContext(t, s.expected, mustProcessFormatScenario(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)
-	case "decode-tsv-object":
-		test.AssertResultWithContext(t, s.expected, mustProcessFormatScenario(s, NewCSVObjectDecoder('\t'), NewYamlEncoder(2, false, ConfiguredYamlPreferences)), s.description)
-	case "roundtrip-csv":
-		test.AssertResultWithContext(t, s.expected, mustProcessFormatScenario(s, NewCSVObjectDecoder(','), NewCsvEncoder(',')), s.description)
-	default:
-		panic(fmt.Sprintf("unhandled scenario type %q", s.scenarioType))
-	}
-}
-
-func documentCSVDecodeObjectScenario(w *bufio.Writer, s formatScenario, formatType string) {
-	writeOrPanic(w, fmt.Sprintf("## %v\n", s.description))
-
-	if s.subdescription != "" {
-		writeOrPanic(w, s.subdescription)
-		writeOrPanic(w, "\n\n")
-	}
-
-	writeOrPanic(w, fmt.Sprintf("Given a sample.%v file of:\n", formatType))
-	writeOrPanic(w, fmt.Sprintf("```%v\n%v\n```\n", formatType, s.input))
-
-	writeOrPanic(w, "then\n")
-	writeOrPanic(w, fmt.Sprintf("```bash\nyq -p=%v sample.%v\n```\n", formatType, formatType))
-	writeOrPanic(w, "will output\n")
-
-	separator := ','
-	if formatType == "tsv" {
-		separator = '\t'
-	}
-
-	writeOrPanic(w, fmt.Sprintf("```yaml\n%v```\n\n",
-		mustProcessFormatScenario(s, NewCSVObjectDecoder(separator), NewYamlEncoder(s.indent, false, ConfiguredYamlPreferences))),
-	)
-}
-
-func documentCSVEncodeScenario(w *bufio.Writer, s formatScenario, formatType string) {
-	writeOrPanic(w, fmt.Sprintf("## %v\n", s.description))
-
-	if s.subdescription != "" {
-		writeOrPanic(w, s.subdescription)
-		writeOrPanic(w, "\n\n")
-	}
-
-	writeOrPanic(w, "Given a sample.yml file of:\n")
-	writeOrPanic(w, fmt.Sprintf("```yaml\n%v\n```\n", s.input))
-
-	writeOrPanic(w, "then\n")
-
-	expression := s.expression
-
-	if expression != "" {
-		writeOrPanic(w, fmt.Sprintf("```bash\nyq -o=%v '%v' sample.yml\n```\n", formatType, expression))
-	} else {
-		writeOrPanic(w, fmt.Sprintf("```bash\nyq -o=%v sample.yml\n```\n", formatType))
-	}
-	writeOrPanic(w, "will output\n")
-
-	separator := ','
-	if formatType == "tsv" {
-		separator = '\t'
-	}
-
-	writeOrPanic(w, fmt.Sprintf("```%v\n%v```\n\n", formatType,
-		mustProcessFormatScenario(s, NewYamlDecoder(ConfiguredYamlPreferences), NewCsvEncoder(separator))),
-	)
-}
-
-func documentCSVRoundTripScenario(w *bufio.Writer, s formatScenario, formatType string) {
-	writeOrPanic(w, fmt.Sprintf("## %v\n", s.description))
-
-	if s.subdescription != "" {
-		writeOrPanic(w, s.subdescription)
-		writeOrPanic(w, "\n\n")
-	}
-
-	writeOrPanic(w, fmt.Sprintf("Given a sample.%v file of:\n", formatType))
-	writeOrPanic(w, fmt.Sprintf("```%v\n%v\n```\n", formatType, s.input))
-
-	writeOrPanic(w, "then\n")
-
-	expression := s.expression
-
-	if expression != "" {
-		writeOrPanic(w, fmt.Sprintf("```bash\nyq -p=%v -o=%v '%v' sample.%v\n```\n", formatType, formatType, expression, formatType))
-	} else {
-		writeOrPanic(w, fmt.Sprintf("```bash\nyq -p=%v -o=%v sample.%v\n```\n", formatType, formatType, formatType))
-	}
-	writeOrPanic(w, "will output\n")
-
-	separator := ','
-	if formatType == "tsv" {
-		separator = '\t'
-	}
-
-	writeOrPanic(w, fmt.Sprintf("```%v\n%v```\n\n", formatType,
-		mustProcessFormatScenario(s, NewCSVObjectDecoder(separator), NewCsvEncoder(separator))),
-	)
-}
-
-func documentCSVScenario(t *testing.T, w *bufio.Writer, i interface{}) {
-	s := i.(formatScenario)
-	if s.skipDoc {
-		return
-	}
-	switch s.scenarioType {
-	case "encode-csv":
-		documentCSVEncodeScenario(w, s, "csv")
-	case "encode-tsv":
-		documentCSVEncodeScenario(w, s, "tsv")
-	case "decode-csv-object":
-		documentCSVDecodeObjectScenario(w, s, "csv")
-	case "decode-tsv-object":
-		documentCSVDecodeObjectScenario(w, s, "tsv")
-	case "roundtrip-csv":
-		documentCSVRoundTripScenario(w, s, "csv")
-
-	default:
-		panic(fmt.Sprintf("unhandled scenario type %q", s.scenarioType))
-	}
-}
-
-func TestCSVScenarios(t *testing.T) {
-	for _, tt := range csvScenarios {
-		testCSVScenario(t, tt)
-	}
-	genericScenarios := make([]interface{}, len(csvScenarios))
-	for i, s := range csvScenarios {
-		genericScenarios[i] = s
-	}
-	documentScenarios(t, "usage", "csv-tsv", genericScenarios, documentCSVScenario)
-}

pkg/yqlib/data_tree_navigator.go

@@ -3,16 +3,16 @@ package yqlib
 import (
 	"fmt"
 
+	"container/list"
+
 	logging "gopkg.in/op/go-logging.v1"
 )
 
 type DataTreeNavigator interface {
-	// given the context and a expressionNode,
-	// this will process the against the given expressionNode and return
-	// a new context of matching candidates
-	GetMatchingNodes(context Context, expressionNode *ExpressionNode) (Context, error)
-
-	DeeplyAssign(context Context, path []interface{}, rhsNode *CandidateNode) error
+	// given a list of CandidateEntities and a pathNode,
+	// this will process the list against the given pathNode and return
+	// a new list of matching candidates
+	GetMatchingNodes(matchingNodes *list.List, pathNode *PathTreeNode) (*list.List, error)
 }
 
 type dataTreeNavigator struct {
@@ -22,37 +22,22 @@ func NewDataTreeNavigator() DataTreeNavigator {
 	return &dataTreeNavigator{}
 }
 
-func (d *dataTreeNavigator) DeeplyAssign(context Context, path []interface{}, rhsCandidateNode *CandidateNode) error {
-
-	assignmentOp := &Operation{OperationType: assignOpType, Preferences: assignPreferences{}}
-
-	rhsOp := &Operation{OperationType: valueOpType, CandidateNode: rhsCandidateNode}
-
-	assignmentOpNode := &ExpressionNode{
-		Operation: assignmentOp,
-		LHS:       createTraversalTree(path, traversePreferences{}, false),
-		RHS:       &ExpressionNode{Operation: rhsOp},
-	}
-
-	_, err := d.GetMatchingNodes(context, assignmentOpNode)
-	return err
-}
-
-func (d *dataTreeNavigator) GetMatchingNodes(context Context, expressionNode *ExpressionNode) (Context, error) {
-	if expressionNode == nil {
+func (d *dataTreeNavigator) GetMatchingNodes(matchingNodes *list.List, pathNode *PathTreeNode) (*list.List, error) {
+	if pathNode == nil {
 		log.Debugf("getMatchingNodes - nothing to do")
-		return context, nil
+		return matchingNodes, nil
 	}
-	log.Debugf("Processing Op: %v", expressionNode.Operation.toString())
+	log.Debugf("Processing Op: %v", pathNode.Operation.toString())
 	if log.IsEnabledFor(logging.DEBUG) {
-		for el := context.MatchingNodes.Front(); el != nil; el = el.Next() {
+		for el := matchingNodes.Front(); el != nil; el = el.Next() {
 			log.Debug(NodeToString(el.Value.(*CandidateNode)))
 		}
 	}
-	handler := expressionNode.Operation.OperationType.Handler
+	log.Debug(">>")
+	handler := pathNode.Operation.OperationType.Handler
 	if handler != nil {
-		return handler(d, context, expressionNode)
+		return handler(d, matchingNodes, pathNode)
 	}
-	return Context{}, fmt.Errorf("Unknown operator %v", expressionNode.Operation.OperationType)
+	return nil, fmt.Errorf("Unknown operator %v", pathNode.Operation.OperationType)
 
 }

pkg/yqlib/decoder.go

@@ -1,66 +0,0 @@
-package yqlib
-
-import (
-	"fmt"
-	"io"
-	"strings"
-)
-
-type InputFormat uint
-
-const (
-	YamlInputFormat = 1 << iota
-	XMLInputFormat
-	PropertiesInputFormat
-	Base64InputFormat
-	JsonInputFormat
-	CSVObjectInputFormat
-	TSVObjectInputFormat
-	TomlInputFormat
-	UriInputFormat
-	LuaInputFormat
-)
-
-type Decoder interface {
-	Init(reader io.Reader) error
-	Decode() (*CandidateNode, error)
-}
-
-func InputFormatFromString(format string) (InputFormat, error) {
-	switch format {
-	case "yaml", "yml", "y":
-		return YamlInputFormat, nil
-	case "xml", "x":
-		return XMLInputFormat, nil
-	case "properties", "props", "p":
-		return PropertiesInputFormat, nil
-	case "json", "ndjson", "j":
-		return JsonInputFormat, nil
-	case "csv", "c":
-		return CSVObjectInputFormat, nil
-	case "tsv", "t":
-		return TSVObjectInputFormat, nil
-	case "toml":
-		return TomlInputFormat, nil
-	case "lua", "l":
-		return LuaInputFormat, nil
-	default:
-		return 0, fmt.Errorf("unknown format '%v' please use [yaml|json|props|csv|tsv|xml|toml]", format)
-	}
-}
-
-func FormatFromFilename(filename string) string {
-
-	if filename != "" {
-		GetLogger().Debugf("checking file extension '%s' for auto format detection", filename)
-		nPos := strings.LastIndex(filename, ".")
-		if nPos > -1 {
-			format := filename[nPos+1:]
-			GetLogger().Debugf("detected format '%s'", format)
-			return format
-		}
-	}
-
-	GetLogger().Debugf("using default inputFormat 'yaml'")
-	return "yaml"
-}

pkg/yqlib/decoder_base64.go

@@ -1,72 +0,0 @@
-package yqlib
-
-import (
-	"bytes"
-	"encoding/base64"
-	"io"
-	"strings"
-)
-
-type base64Padder struct {
-	count uint64
-	io.Reader
-}
-
-func (c *base64Padder) pad(buf []byte) (int, error) {
-	pad := strings.Repeat("=", int(4-c.count%4))
-	n, err := strings.NewReader(pad).Read(buf)
-	c.count += uint64(n)
-	return n, err
-}
-
-func (c *base64Padder) Read(buf []byte) (int, error) {
-	n, err := c.Reader.Read(buf)
-	c.count += uint64(n)
-
-	if err == io.EOF && c.count%4 != 0 {
-		return c.pad(buf)
-	}
-	return n, err
-}
-
-type base64Decoder struct {
-	reader       io.Reader
-	finished     bool
-	readAnything bool
-	encoding     base64.Encoding
-}
-
-func NewBase64Decoder() Decoder {
-	return &base64Decoder{finished: false, encoding: *base64.StdEncoding}
-}
-
-func (dec *base64Decoder) Init(reader io.Reader) error {
-	dec.reader = &base64Padder{Reader: reader}
-	dec.readAnything = false
-	dec.finished = false
-	return nil
-}
-
-func (dec *base64Decoder) Decode() (*CandidateNode, error) {
-	if dec.finished {
-		return nil, io.EOF
-	}
-	base64Reader := base64.NewDecoder(&dec.encoding, dec.reader)
-	buf := new(bytes.Buffer)
-
-	if _, err := buf.ReadFrom(base64Reader); 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
-		}
-	}
-	dec.readAnything = true
-	return createStringScalarNode(buf.String()), nil
-}

pkg/yqlib/decoder_csv_object.go

@@ -1,72 +0,0 @@
-package yqlib
-
-import (
-	"encoding/csv"
-	"errors"
-	"io"
-
-	"github.com/dimchansky/utfbom"
-)
-
-type csvObjectDecoder struct {
-	separator rune
-	reader    csv.Reader
-	finished  bool
-}
-
-func NewCSVObjectDecoder(separator rune) Decoder {
-	return &csvObjectDecoder{separator: separator}
-}
-
-func (dec *csvObjectDecoder) Init(reader io.Reader) error {
-	cleanReader, enc := utfbom.Skip(reader)
-	log.Debugf("Detected encoding: %s\n", enc)
-	dec.reader = *csv.NewReader(cleanReader)
-	dec.reader.Comma = dec.separator
-	dec.finished = false
-	return nil
-}
-
-func (dec *csvObjectDecoder) convertToNode(content string) *CandidateNode {
-	node, err := parseSnippet(content)
-	if err != nil {
-		return createScalarNode(content, content)
-	}
-	return node
-}
-
-func (dec *csvObjectDecoder) createObject(headerRow []string, contentRow []string) *CandidateNode {
-	objectNode := &CandidateNode{Kind: MappingNode, Tag: "!!map"}
-
-	for i, header := range headerRow {
-		objectNode.AddKeyValueChild(createScalarNode(header, header), dec.convertToNode(contentRow[i]))
-	}
-	return objectNode
-}
-
-func (dec *csvObjectDecoder) Decode() (*CandidateNode, error) {
-	if dec.finished {
-		return nil, io.EOF
-	}
-	headerRow, err := dec.reader.Read()
-	log.Debugf(": headerRow%v", headerRow)
-	if err != nil {
-		return nil, err
-	}
-
-	rootArray := &CandidateNode{Kind: SequenceNode, Tag: "!!seq"}
-
-	contentRow, err := dec.reader.Read()
-
-	for err == nil && len(contentRow) > 0 {
-		log.Debugf("Adding contentRow: %v", contentRow)
-		rootArray.AddChild(dec.createObject(headerRow, contentRow))
-		contentRow, err = dec.reader.Read()
-		log.Debugf("Read next contentRow: %v, %v", contentRow, err)
-	}
-	if !errors.Is(err, io.EOF) {
-		return nil, err
-	}
-
-	return rootArray, nil
-}

pkg/yqlib/decoder_goccy_yaml.go

@@ -1,67 +0,0 @@
-//go:build !yq_noyaml
-
-package yqlib
-
-import (
-	"bytes"
-	"errors"
-	"io"
-	"regexp"
-
-	yaml "github.com/goccy/go-yaml"
-	"github.com/goccy/go-yaml/ast"
-)
-
-type goccyYamlDecoder struct {
-	decoder      yaml.Decoder
-	cm           yaml.CommentMap
-	bufferRead   bytes.Buffer
-	readAnything bool
-	anchorMap    map[string]*CandidateNode
-}
-
-func NewGoccyYAMLDecoder() Decoder {
-	return &goccyYamlDecoder{}
-}
-
-func (dec *goccyYamlDecoder) Init(reader io.Reader) error {
-	dec.cm = yaml.CommentMap{}
-	dec.readAnything = false
-	dec.anchorMap = make(map[string]*CandidateNode)
-	readerToUse := io.TeeReader(reader, &dec.bufferRead)
-	dec.decoder = *yaml.NewDecoder(readerToUse, yaml.CommentToMap(dec.cm), yaml.UseOrderedMap())
-	return nil
-}
-
-func (dec *goccyYamlDecoder) Decode() (*CandidateNode, error) {
-
-	var commentLineRegEx = regexp.MustCompile(`^\s*#`)
-
-	var ast ast.Node
-
-	err := dec.decoder.Decode(&ast)
-	if errors.Is(err, io.EOF) && !dec.readAnything {
-
-		content := dec.bufferRead.String()
-		// only null fix
-		if content == "null" || content == "~" {
-			dec.readAnything = true
-			return createScalarNode(nil, content), nil
-		} else if commentLineRegEx.MatchString(content) {
-			dec.readAnything = true
-			node := createScalarNode(nil, "")
-			node.LeadingContent = content
-			return node, nil
-		}
-		return nil, err
-	} else if err != nil {
-		return nil, err
-	}
-
-	candidateNode := &CandidateNode{}
-	if err := candidateNode.UnmarshalGoccyYAML(ast, dec.cm, dec.anchorMap); err != nil {
-		return nil, err
-	}
-
-	return candidateNode, nil
-}

pkg/yqlib/decoder_json.go

@@ -1,33 +0,0 @@
-//go:build !yq_nojson
-
-package yqlib
-
-import (
-	"io"
-
-	"github.com/goccy/go-json"
-)
-
-type jsonDecoder struct {
-	decoder json.Decoder
-}
-
-func NewJSONDecoder() Decoder {
-	return &jsonDecoder{}
-}
-
-func (dec *jsonDecoder) Init(reader io.Reader) error {
-	dec.decoder = *json.NewDecoder(reader)
-	return nil
-}
-
-func (dec *jsonDecoder) Decode() (*CandidateNode, error) {
-
-	var dataBucket CandidateNode
-	err := dec.decoder.Decode(&dataBucket)
-	if err != nil {
-		return nil, err
-	}
-
-	return &dataBucket, nil
-}

pkg/yqlib/decoder_lua.go

@@ -1,165 +0,0 @@
-//go:build !yq_nolua
-
-package yqlib
-
-import (
-	"fmt"
-	"io"
-	"math"
-
-	lua "github.com/yuin/gopher-lua"
-)
-
-type luaDecoder struct {
-	reader   io.Reader
-	finished bool
-	prefs    LuaPreferences
-}
-
-func NewLuaDecoder(prefs LuaPreferences) Decoder {
-	return &luaDecoder{
-		prefs: prefs,
-	}
-}
-
-func (dec *luaDecoder) Init(reader io.Reader) error {
-	dec.reader = reader
-	return nil
-}
-
-func (dec *luaDecoder) convertToYamlNode(ls *lua.LState, lv lua.LValue) *CandidateNode {
-	switch lv.Type() {
-	case lua.LTNil:
-		return &CandidateNode{
-			Kind:  ScalarNode,
-			Tag:   "!!null",
-			Value: "",
-		}
-	case lua.LTBool:
-		return &CandidateNode{
-			Kind:  ScalarNode,
-			Tag:   "!!bool",
-			Value: lv.String(),
-		}
-	case lua.LTNumber:
-		n := float64(lua.LVAsNumber(lv))
-		// various special case floats
-		if math.IsNaN(n) {
-			return &CandidateNode{
-				Kind:  ScalarNode,
-				Tag:   "!!float",
-				Value: ".nan",
-			}
-		}
-		if math.IsInf(n, 1) {
-			return &CandidateNode{
-				Kind:  ScalarNode,
-				Tag:   "!!float",
-				Value: ".inf",
-			}
-		}
-		if math.IsInf(n, -1) {
-			return &CandidateNode{
-				Kind:  ScalarNode,
-				Tag:   "!!float",
-				Value: "-.inf",
-			}
-		}
-
-		// does it look like an integer?
-		if n == float64(int(n)) {
-			return &CandidateNode{
-				Kind:  ScalarNode,
-				Tag:   "!!int",
-				Value: lv.String(),
-			}
-		}
-
-		return &CandidateNode{
-			Kind:  ScalarNode,
-			Tag:   "!!float",
-			Value: lv.String(),
-		}
-	case lua.LTString:
-		return &CandidateNode{
-			Kind:  ScalarNode,
-			Tag:   "!!str",
-			Value: lv.String(),
-		}
-	case lua.LTFunction:
-		return &CandidateNode{
-			Kind:  ScalarNode,
-			Tag:   "tag:lua.org,2006,function",
-			Value: lv.String(),
-		}
-	case lua.LTTable:
-		// Simultaneously create a sequence and a map, pick which one to return
-		// based on whether all keys were consecutive integers
-		i := 1
-		yaml_sequence := &CandidateNode{
-			Kind: SequenceNode,
-			Tag:  "!!seq",
-		}
-		yaml_map := &CandidateNode{
-			Kind: MappingNode,
-			Tag:  "!!map",
-		}
-		t := lv.(*lua.LTable)
-		k, v := ls.Next(t, lua.LNil)
-		for k != lua.LNil {
-			if ki, ok := k.(lua.LNumber); i != 0 && ok && math.Mod(float64(ki), 1) == 0 && int(ki) == i {
-				i++
-			} else {
-				i = 0
-			}
-			newKey := dec.convertToYamlNode(ls, k)
-
-			yv := dec.convertToYamlNode(ls, v)
-			yaml_map.AddKeyValueChild(newKey, yv)
-
-			if i != 0 {
-				yaml_sequence.AddChild(yv)
-			}
-			k, v = ls.Next(t, k)
-		}
-		if i != 0 {
-			return yaml_sequence
-		}
-		return yaml_map
-	default:
-		return &CandidateNode{
-			Kind:        ScalarNode,
-			LineComment: fmt.Sprintf("Unhandled Lua type: %s", lv.Type().String()),
-			Tag:         "!!null",
-			Value:       lv.String(),
-		}
-	}
-}
-
-func (dec *luaDecoder) decideTopLevelNode(ls *lua.LState) *CandidateNode {
-	if ls.GetTop() == 0 {
-		// no items were explicitly returned, encode the globals table instead
-		return dec.convertToYamlNode(ls, ls.Get(lua.GlobalsIndex))
-	}
-	return dec.convertToYamlNode(ls, ls.Get(1))
-}
-
-func (dec *luaDecoder) Decode() (*CandidateNode, error) {
-	if dec.finished {
-		return nil, io.EOF
-	}
-	ls := lua.NewState(lua.Options{SkipOpenLibs: true})
-	defer ls.Close()
-	fn, err := ls.Load(dec.reader, "@input")
-	if err != nil {
-		return nil, err
-	}
-	ls.Push(fn)
-	err = ls.PCall(0, lua.MultRet, nil)
-	if err != nil {
-		return nil, err
-	}
-	firstNode := dec.decideTopLevelNode(ls)
-	dec.finished = true
-	return firstNode, nil
-}

pkg/yqlib/decoder_properties.go

@@ -1,129 +0,0 @@
-package yqlib
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"strconv"
-	"strings"
-
-	"github.com/magiconair/properties"
-)
-
-type propertiesDecoder struct {
-	reader   io.Reader
-	finished bool
-	d        DataTreeNavigator
-}
-
-func NewPropertiesDecoder() Decoder {
-	return &propertiesDecoder{d: NewDataTreeNavigator(), finished: false}
-}
-
-func (dec *propertiesDecoder) Init(reader io.Reader) error {
-	dec.reader = reader
-	dec.finished = false
-	return nil
-}
-
-func parsePropKey(key string) []interface{} {
-	pathStrArray := strings.Split(key, ".")
-	path := make([]interface{}, len(pathStrArray))
-	for i, pathStr := range pathStrArray {
-		num, err := strconv.ParseInt(pathStr, 10, 32)
-		if err == nil {
-			path[i] = num
-		} else {
-			path[i] = pathStr
-		}
-	}
-	return path
-}
-
-func (dec *propertiesDecoder) processComment(c string) string {
-	if c == "" {
-		return ""
-	}
-	return "# " + c
-}
-
-func (dec *propertiesDecoder) applyPropertyComments(context Context, path []interface{}, comments []string) error {
-	assignmentOp := &Operation{OperationType: assignOpType, Preferences: assignPreferences{}}
-
-	rhsCandidateNode := &CandidateNode{
-		Tag:         "!!str",
-		Value:       fmt.Sprintf("%v", path[len(path)-1]),
-		HeadComment: dec.processComment(strings.Join(comments, "\n")),
-		Kind:        ScalarNode,
-	}
-
-	rhsCandidateNode.Tag = rhsCandidateNode.guessTagFromCustomType()
-
-	rhsOp := &Operation{OperationType: referenceOpType, CandidateNode: rhsCandidateNode}
-
-	assignmentOpNode := &ExpressionNode{
-		Operation: assignmentOp,
-		LHS:       createTraversalTree(path, traversePreferences{}, true),
-		RHS:       &ExpressionNode{Operation: rhsOp},
-	}
-
-	_, err := dec.d.GetMatchingNodes(context, assignmentOpNode)
-	return err
-}
-
-func (dec *propertiesDecoder) applyProperty(context Context, properties *properties.Properties, key string) error {
-	value, _ := properties.Get(key)
-	path := parsePropKey(key)
-
-	propertyComments := properties.GetComments(key)
-	if len(propertyComments) > 0 {
-		err := dec.applyPropertyComments(context, path, propertyComments)
-		if err != nil {
-			return nil
-		}
-	}
-
-	rhsNode := createStringScalarNode(value)
-	rhsNode.Tag = rhsNode.guessTagFromCustomType()
-
-	return dec.d.DeeplyAssign(context, path, rhsNode)
-}
-
-func (dec *propertiesDecoder) 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
-		return nil, io.EOF
-	}
-	properties, err := properties.LoadString(buf.String())
-	if err != nil {
-		return nil, err
-	}
-	properties.DisableExpansion = true
-
-	rootMap := &CandidateNode{
-		Kind: MappingNode,
-		Tag:  "!!map",
-	}
-
-	context := Context{}
-	context = context.SingleChildContext(rootMap)
-
-	for _, key := range properties.Keys() {
-		if err := dec.applyProperty(context, properties, key); err != nil {
-			return nil, err
-		}
-
-	}
-	dec.finished = true
-
-	return rootMap, nil
-
-}

pkg/yqlib/decoder_test.go

@@ -1,75 +0,0 @@
-package yqlib
-
-import (
-	"bufio"
-	"bytes"
-	"fmt"
-	"strings"
-)
-
-type formatScenario struct {
-	input          string
-	indent         int
-	expression     string
-	expected       string
-	description    string
-	subdescription string
-	skipDoc        bool
-	scenarioType   string
-	expectedError  string
-}
-
-func processFormatScenario(s formatScenario, decoder Decoder, encoder Encoder) (string, error) {
-	var output bytes.Buffer
-	writer := bufio.NewWriter(&output)
-
-	if decoder == nil {
-		decoder = NewYamlDecoder(ConfiguredYamlPreferences)
-	}
-
-	log.Debugf("reading docs")
-	inputs, err := readDocuments(strings.NewReader(s.input), "sample.yml", 0, decoder)
-	if err != nil {
-		return "", err
-	}
-
-	log.Debugf("done reading the documents")
-
-	expression := s.expression
-	if expression == "" {
-		expression = "."
-	}
-
-	exp, err := getExpressionParser().ParseExpression(expression)
-
-	if err != nil {
-		return "", err
-	}
-
-	context, err := NewDataTreeNavigator().GetMatchingNodes(Context{MatchingNodes: inputs}, exp)
-
-	log.Debugf("Going to print: %v", NodesToString(context.MatchingNodes))
-
-	if err != nil {
-		return "", err
-	}
-
-	printer := NewPrinter(encoder, NewSinglePrinterWriter(writer))
-	err = printer.PrintResults(context.MatchingNodes)
-	if err != nil {
-		return "", 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(fmt.Errorf("Bad scenario %v: %w", s.description, err))
-	}
-	return result
-
-}

pkg/yqlib/decoder_toml.go

@@ -1,354 +0,0 @@
-//go:build !yq_notoml
-
-package yqlib
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"io"
-	"strconv"
-	"time"
-
-	toml "github.com/pelletier/go-toml/v2/unstable"
-)
-
-type tomlDecoder struct {
-	parser   toml.Parser
-	finished bool
-	d        DataTreeNavigator
-	rootMap  *CandidateNode
-}
-
-func NewTomlDecoder() Decoder {
-	return &tomlDecoder{
-		finished: false,
-		d:        NewDataTreeNavigator(),
-	}
-}
-
-func (dec *tomlDecoder) Init(reader io.Reader) error {
-	dec.parser = toml.Parser{}
-	buf := new(bytes.Buffer)
-	_, err := buf.ReadFrom(reader)
-	if err != nil {
-		return err
-	}
-	dec.parser.Reset(buf.Bytes())
-	dec.rootMap = &CandidateNode{
-		Kind: MappingNode,
-		Tag:  "!!map",
-	}
-	return nil
-}
-
-func (dec *tomlDecoder) getFullPath(tomlNode *toml.Node) []interface{} {
-	path := make([]interface{}, 0)
-	for {
-		path = append(path, string(tomlNode.Data))
-		tomlNode = tomlNode.Next()
-		if tomlNode == nil {
-			return path
-		}
-	}
-}
-
-func (dec *tomlDecoder) processKeyValueIntoMap(rootMap *CandidateNode, tomlNode *toml.Node) error {
-	value := tomlNode.Value()
-	path := dec.getFullPath(value.Next())
-	log.Debug("!!!processKeyValueIntoMap: %v", path)
-
-	valueNode, err := dec.decodeNode(value)
-	if err != nil {
-		return err
-	}
-
-	context := Context{}
-	context = context.SingleChildContext(rootMap)
-
-	return dec.d.DeeplyAssign(context, path, valueNode)
-}
-
-func (dec *tomlDecoder) decodeKeyValuesIntoMap(rootMap *CandidateNode, tomlNode *toml.Node) (bool, error) {
-	log.Debug("!! DECODE_KV_INTO_MAP -- processing first (current) entry")
-	if err := dec.processKeyValueIntoMap(rootMap, tomlNode); err != nil {
-		return false, err
-	}
-
-	for dec.parser.NextExpression() {
-		nextItem := dec.parser.Expression()
-		log.Debug("!! DECODE_KV_INTO_MAP -- next exp, its a %v", nextItem.Kind)
-
-		if nextItem.Kind == toml.KeyValue {
-			if err := dec.processKeyValueIntoMap(rootMap, nextItem); err != nil {
-				return false, err
-			}
-		} else {
-			// run out of key values
-			log.Debug("! DECODE_KV_INTO_MAP - ok we are done in decodeKeyValuesIntoMap, gota a %v", nextItem.Kind)
-			log.Debug("! DECODE_KV_INTO_MAP - processAgainstCurrentExp = true!")
-			return true, nil
-		}
-	}
-	log.Debug("! DECODE_KV_INTO_MAP - no more things to read in")
-	return false, nil
-}
-
-func (dec *tomlDecoder) createInlineTableMap(tomlNode *toml.Node) (*CandidateNode, error) {
-	content := make([]*CandidateNode, 0)
-	log.Debug("!! createInlineTableMap")
-
-	iterator := tomlNode.Children()
-	for iterator.Next() {
-		child := iterator.Node()
-		if child.Kind != toml.KeyValue {
-			return nil, fmt.Errorf("only keyvalue pairs are supported in inlinetables, got %v instead", child.Kind)
-		}
-
-		keyValues := &CandidateNode{
-			Kind: MappingNode,
-			Tag:  "!!map",
-		}
-
-		if err := dec.processKeyValueIntoMap(keyValues, child); err != nil {
-			return nil, err
-		}
-
-		content = append(content, keyValues.Content...)
-	}
-
-	return &CandidateNode{
-		Kind:    MappingNode,
-		Tag:     "!!map",
-		Content: content,
-	}, nil
-}
-
-func (dec *tomlDecoder) createArray(tomlNode *toml.Node) (*CandidateNode, error) {
-	content := make([]*CandidateNode, 0)
-	iterator := tomlNode.Children()
-	for iterator.Next() {
-		child := iterator.Node()
-		yamlNode, err := dec.decodeNode(child)
-		if err != nil {
-			return nil, err
-		}
-		content = append(content, yamlNode)
-	}
-
-	return &CandidateNode{
-		Kind:    SequenceNode,
-		Tag:     "!!seq",
-		Content: content,
-	}, nil
-
-}
-
-func (dec *tomlDecoder) createStringScalar(tomlNode *toml.Node) (*CandidateNode, error) {
-	content := string(tomlNode.Data)
-	return createScalarNode(content, content), nil
-}
-
-func (dec *tomlDecoder) createBoolScalar(tomlNode *toml.Node) (*CandidateNode, error) {
-	content := string(tomlNode.Data)
-	return createScalarNode(content == "true", content), nil
-}
-
-func (dec *tomlDecoder) createIntegerScalar(tomlNode *toml.Node) (*CandidateNode, error) {
-	content := string(tomlNode.Data)
-	_, num, err := parseInt64(content)
-	return createScalarNode(num, content), err
-}
-
-func (dec *tomlDecoder) createDateTimeScalar(tomlNode *toml.Node) (*CandidateNode, error) {
-	content := string(tomlNode.Data)
-	val, err := parseDateTime(time.RFC3339, content)
-	return createScalarNode(val, content), err
-}
-
-func (dec *tomlDecoder) createFloatScalar(tomlNode *toml.Node) (*CandidateNode, error) {
-	content := string(tomlNode.Data)
-	num, err := strconv.ParseFloat(content, 64)
-	return createScalarNode(num, content), err
-}
-
-func (dec *tomlDecoder) decodeNode(tomlNode *toml.Node) (*CandidateNode, error) {
-	switch tomlNode.Kind {
-	case toml.Key, toml.String:
-		return dec.createStringScalar(tomlNode)
-	case toml.Bool:
-		return dec.createBoolScalar(tomlNode)
-	case toml.Integer:
-		return dec.createIntegerScalar(tomlNode)
-	case toml.DateTime:
-		return dec.createDateTimeScalar(tomlNode)
-	case toml.Float:
-		return dec.createFloatScalar(tomlNode)
-	case toml.Array:
-		return dec.createArray(tomlNode)
-	case toml.InlineTable:
-		return dec.createInlineTableMap(tomlNode)
-	default:
-		return nil, fmt.Errorf("unsupported type %v", tomlNode.Kind)
-	}
-
-}
-
-func (dec *tomlDecoder) Decode() (*CandidateNode, error) {
-	if dec.finished {
-		return nil, io.EOF
-	}
-	//
-	// toml library likes to panic
-	var deferredError error
-	defer func() { //catch or finally
-		if r := recover(); r != nil {
-			var ok bool
-			deferredError, ok = r.(error)
-			if !ok {
-				deferredError = fmt.Errorf("pkg: %v", r)
-			}
-		}
-	}()
-
-	log.Debug("ok here we go")
-	var runAgainstCurrentExp = false
-	var err error
-	for runAgainstCurrentExp || dec.parser.NextExpression() {
-
-		if runAgainstCurrentExp {
-			log.Debug("running against current exp")
-		}
-
-		currentNode := dec.parser.Expression()
-
-		log.Debug("currentNode: %v ", currentNode.Kind)
-		runAgainstCurrentExp, err = dec.processTopLevelNode(currentNode)
-		if err != nil {
-			return dec.rootMap, err
-		}
-
-	}
-
-	err = dec.parser.Error()
-	if err != nil {
-		return nil, err
-	}
-
-	// must have finished
-	dec.finished = true
-
-	if len(dec.rootMap.Content) == 0 {
-		return nil, io.EOF
-	}
-
-	return dec.rootMap, deferredError
-
-}
-
-func (dec *tomlDecoder) processTopLevelNode(currentNode *toml.Node) (bool, error) {
-	var runAgainstCurrentExp bool
-	var err error
-	log.Debug("!!!!!!!!!!!!Going to process %v state is current %v", currentNode.Kind, NodeToString(dec.rootMap))
-	if currentNode.Kind == toml.Table {
-		runAgainstCurrentExp, err = dec.processTable(currentNode)
-	} else if currentNode.Kind == toml.ArrayTable {
-		runAgainstCurrentExp, err = dec.processArrayTable(currentNode)
-	} else {
-		runAgainstCurrentExp, err = dec.decodeKeyValuesIntoMap(dec.rootMap, currentNode)
-	}
-
-	log.Debug("!!!!!!!!!!!!DONE Processing state is now %v", NodeToString(dec.rootMap))
-	return runAgainstCurrentExp, err
-}
-
-func (dec *tomlDecoder) processTable(currentNode *toml.Node) (bool, error) {
-	log.Debug("!!! processing table")
-	fullPath := dec.getFullPath(currentNode.Child())
-	log.Debug("!!!fullpath: %v", fullPath)
-
-	hasValue := dec.parser.NextExpression()
-	if !hasValue {
-		return false, fmt.Errorf("error retrieving table %v value: %w", fullPath, dec.parser.Error())
-	}
-
-	tableNodeValue := &CandidateNode{
-		Kind: MappingNode,
-		Tag:  "!!map",
-	}
-
-	tableValue := dec.parser.Expression()
-	if tableValue.Kind != toml.KeyValue {
-		log.Debug("got an empty table, returning")
-		return true, nil
-	}
-
-	runAgainstCurrentExp, err := dec.decodeKeyValuesIntoMap(tableNodeValue, tableValue)
-	log.Debugf("table node err: %w", err)
-	if err != nil && !errors.Is(io.EOF, err) {
-		return false, err
-	}
-	c := Context{}
-
-	c = c.SingleChildContext(dec.rootMap)
-	err = dec.d.DeeplyAssign(c, fullPath, tableNodeValue)
-	if err != nil {
-		return false, err
-	}
-	return runAgainstCurrentExp, nil
-}
-
-func (dec *tomlDecoder) arrayAppend(context Context, path []interface{}, rhsNode *CandidateNode) error {
-	rhsCandidateNode := &CandidateNode{
-		Kind:    SequenceNode,
-		Tag:     "!!seq",
-		Content: []*CandidateNode{rhsNode},
-	}
-
-	assignmentOp := &Operation{OperationType: addAssignOpType}
-
-	rhsOp := &Operation{OperationType: valueOpType, CandidateNode: rhsCandidateNode}
-
-	assignmentOpNode := &ExpressionNode{
-		Operation: assignmentOp,
-		LHS:       createTraversalTree(path, traversePreferences{}, false),
-		RHS:       &ExpressionNode{Operation: rhsOp},
-	}
-
-	_, err := dec.d.GetMatchingNodes(context, assignmentOpNode)
-	return err
-}
-
-func (dec *tomlDecoder) processArrayTable(currentNode *toml.Node) (bool, error) {
-	log.Debug("!!! processing table")
-	fullPath := dec.getFullPath(currentNode.Child())
-	log.Debug("!!!fullpath: %v", fullPath)
-
-	// need to use the array append exp to add another entry to
-	// this array: fullpath += [ thing ]
-
-	hasValue := dec.parser.NextExpression()
-	if !hasValue {
-		return false, fmt.Errorf("error retrieving table %v value: %w", fullPath, dec.parser.Error())
-	}
-
-	tableNodeValue := &CandidateNode{
-		Kind: MappingNode,
-		Tag:  "!!map",
-	}
-
-	tableValue := dec.parser.Expression()
-	runAgainstCurrentExp, err := dec.decodeKeyValuesIntoMap(tableNodeValue, tableValue)
-	log.Debugf("table node err: %w", err)
-	if err != nil && !errors.Is(io.EOF, err) {
-		return false, err
-	}
-	c := Context{}
-
-	c = c.SingleChildContext(dec.rootMap)
-
-	// += function
-	err = dec.arrayAppend(c, fullPath, tableNodeValue)
-
-	return runAgainstCurrentExp, err
-}

pkg/yqlib/decoder_uri.go

@@ -1,52 +0,0 @@
-package yqlib
-
-import (
-	"bytes"
-	"io"
-	"net/url"
-)
-
-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 createStringScalarNode(newValue), nil
-}