Skip to content

Format json with JQ_COLORS #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wader merged 15 commits into from
Feb 8, 2024
Merged

Format json with JQ_COLORS #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
fb9def0
Remove obsolete TODO
thaliaarchi Feb 6, 2024
d4d1806
Format with JQ_COLORS in _tojson
thaliaarchi Feb 6, 2024
feb9cc0
Write to stderr on invalid JQ_COLORS
thaliaarchi Feb 7, 2024
6b24db9
Color delimiters exactly like jq
thaliaarchi Feb 7, 2024
808b031
Remove jqjq-specific tojson/1 intrinsic
thaliaarchi Feb 7, 2024
231277f
Use colored _tojson for filter result
thaliaarchi Feb 7, 2024
c1e4148
Handle --color-output and --monochrome-output
thaliaarchi Feb 7, 2024
d7cea3c
Include CLI options in progress; add gsub/3
thaliaarchi Feb 7, 2024
f448745
Add raw output options
thaliaarchi Feb 7, 2024
843118e
Describe jq logic
thaliaarchi Feb 7, 2024
0477e3f
Use named constants for color IDs
thaliaarchi Feb 7, 2024
39bd5ed
Add --compact-output
thaliaarchi Feb 7, 2024
5a74355
Consistently reset colors to match jq
thaliaarchi Feb 7, 2024
3d715f5
Match option order of jq manual and `man jq`
thaliaarchi Feb 7, 2024
1822bdb
Use --raw-output for tests; use bash from PATH
thaliaarchi Feb 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 27 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ Note that the tests are meant to be used with jq 1.7.1.
- [x] `getpath(path)` (passthrough)
- [x] `group`, `group_by(f)`
- [x] `gsub($regex; f)` (passthrough)
- [ ] `gsub($regex; f; $flags)`
- [x] `gsub($regex; f; $flags)` (passthrough)
- [x] `halt_error`, `halt_error($exit_code)`
- [x] `has($key)` (passthrough)
- [x] `implode` (passthrough)
Expand Down Expand Up @@ -201,12 +201,37 @@ Note that the tests are meant to be used with jq 1.7.1.
- [ ] `@format "string"` Format string
- [ ] `label $out | break $out` Break out
- [ ] `include "f"`, `import "f"` Include
- [ ] CLI options
- [x] `--help` / `-h`
- [x] `--null-input` / `-n`
- [ ] `--raw-input` / `-R`
- [x] `--slurp` / `-s`
- [x] `--compact-output` / `-c`
- [x] `--raw-output` / `-r`
- [x] `--raw-output0`
- [x] `--join-output` / `-j`
- [x] `--color-output` / `-C`
- [x] `--monochrome-output` / `-M`
- [ ] `-L directory`
- [ ] `--arg name value`
- [ ] `--rawfile name filename`
- [x] `--run-tests`
- [ ] `--run-tests [filename]`
- [x] `--`
- [ ] Combined short options
- [ ] More...
- Non-standard CLI options
- [x] `--jq`
- [x] `--lex`
- [x] `--no-builtins`
- [x] `--parse`
- [x] `--repl`
- [x] Run jqjq with jqjq
- [x] Bugs

### jq's test suite

```
```sh
Copy link
Owner

@wader wader Feb 7, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried to rerun this, still 307, but i did notice that something seems strange with the output when running tests. Have a look at make test guessing it's the switch to --join-output that require some change?

Copy link
Collaborator Author

@thaliaarchi thaliaarchi Feb 8, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just changed ./jqjq to replace --join-output with --raw-output for --run-tests.

Copy link
Collaborator Author

@thaliaarchi thaliaarchi Feb 8, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I get 308 on jq.test from jq origin/main.

Copy link
Owner

@wader wader Feb 8, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Huh made sure i had master also now, still 307, weird, some locale thing? anyways, that's for another time

$ ./jqjq --run-tests < ../jq/tests/jq.test | grep passed
307 of 449 tests passed
```
Expand Down
8 changes: 4 additions & 4 deletions jqjq
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
#!/bin/bash
#!/usr/bin/env bash
# wrapper for jqjq cli entrypoint
# shellcheck disable=SC2016

JQ="jq"
JQJQ_PATH="$(dirname "$(realpath "${BASH_SOURCE[0]}")")"
ARGS=("$@")

JQ_ARGS=("--raw-output" "--null-input")
JQ_ARGS=("--join-output" "--null-input")
# some arguments require to run jq in different input/output mode
while [ "$1" != "" ]; do
case "$1" in
--jq) shift; JQ="$1";;
--run-tests) JQ_ARGS+=("--raw-input" "--slurp");;
--repl) JQ_ARGS+=("--raw-input" "--join-output");;
--run-tests) JQ_ARGS+=("--raw-input" "--slurp"); JQ_ARGS[0]="--raw-output";;
--repl) JQ_ARGS+=("--raw-input");;
--) break;;
esac
shift
Expand Down
Loading