Merge pull request #20 from wader/jaq

Add jaq support
wader · Nov 26, 2024 · a6dc457 · a6dc457
2 parents 482c422 + b3c6edc
commit a6dc457
Show file tree

Hide file tree

Showing 6 changed files with 274 additions and 190 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,29 +15,34 @@ jobs:
       - run: |
           curl -sOLJ 'https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux-amd64'
           chmod a+x jq-linux-amd64
-          make test-jq JQ=./jq-linux-amd64
+          JQ=./jq-linux-amd64 make test-jq
 
   test-jqjq-jq:
     name: Run tests with jqjq using jq
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      # does PATH tricks so that jq that runs invoke_client_jqjq is same jq
       - run: |
           curl -sOLJ 'https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux-amd64'
-          mv jq-linux-amd64 jq
-          chmod a+x jq
-          PATH="$PWD:$PATH" make test-jqjq JQ=jq
+          chmod a+x jq-linux-amd64
+          JQ=./jq-linux-amd64 make test-jqjq
 
   test-jqjq-gojq:
     name: Run tests with jqjq using gojq
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - run: |
-          curl -sOLJ 'https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux-amd64'
-          mv jq-linux-amd64 jq
-          chmod a+x jq
           curl -Ls 'https://github.com/itchyny/gojq/releases/download/v0.12.16/gojq_v0.12.16_linux_amd64.tar.gz' | tar xz
           mv gojq*/gojq gojq
-          PATH="$PWD:$PATH" make test-jqjq JQ=gojq
+          JQ=./gojq make test-jqjq
+
+  test-jqjq-jaq:
+    name: Run tests with jqjq using jaq
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - run: |
+          curl -sOLJ 'https://github.com/01mf02/jaq/releases/download/v2.0.0-epsilon/jaq-x86_64-unknown-linux-gnu'
+          chmod a+x jaq-x86_64-unknown-linux-gnu
+          JQ=./jaq-x86_64-unknown-linux-gnu make test-jqjq
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-JQ=jq
+JQ ?= jq
 
 test: test-jq test-jqjq
 
@@ -8,4 +8,4 @@ test-jq:
 
 .PHONY: test-jqjq
 test-jqjq:
-	./jqjq --jq "${JQ}" --run-tests < jqjq.test
+	./jqjq --run-tests < jqjq.test
diff --git a/README.md b/README.md
@@ -242,8 +242,7 @@ Note that the tests are meant to be used with jq 1.7.1.
   - [x] gojq
   - [x] jqjq
     - Used to work but runs out of memory on my laptop
-  - [ ] jaq
-    - Fails on missing destructing support
+  - [x] jaq
   - [ ] xq
     - Fails on missing `debug`, maths, jqjq `lex` returns empty (regexp issues?)
 - [x] Bugs

diff --git a/jqjq b/jqjq
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 eval "$(
-  jq \
+  "${JQ:=jq}" \
     -nr \
     -L "$(dirname "$(realpath "${BASH_SOURCE[0]}")")" \
     'include "jqjq"; $ARGS.positional | invoke_client_jqjq' \