api-tuner 0.3.3 → 0.3.4

package/bin/tuner.sh

@@ -1,14 +1,9 @@
 #!/usr/bin/env bash
 
-WORKING_DIR=$(pwd)
-
-SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-cd "$SCRIPT_DIR" || exit
+SCRIPT_DIR=$(cd "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" && pwd)
 
 # find JS entrypoint
-tuner=$(node -e "console.log(require.resolve('api-tuner/bin/index.js'))" 2> /dev/null)
-
-cd "$WORKING_DIR" || exit
+tuner="$SCRIPT_DIR/index.js"
 
 # if tsx exists in path
 if command -v tsx > /dev/null 2>&1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "api-tuner",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "main": "index.js",
   "type": "module",
   "license": "MIT",
@@ -12,8 +12,9 @@
     "postinstall": "([ -d eye ] || npm run download-eye) && eye/install.sh --prefix=eye",
     "prepare": "husky",
     "lint": "eslint . --quiet --ignore-path .gitignore",
-    "pretest": "docker compose up -d",
-    "test": "./bin/tuner.sh tests/*.n3 tests/**/*.n3 --base-iri http://localhost:1080/",
+    "pre_test": "docker compose up -d",
+    "_test": "./bin/tuner.sh --base-iri http://localhost:1080/",
+    "test": "npm run _test -- tests/*.n3 tests/**/*.n3",
     "prepack": "tsc",
     "release": "changeset publish"
   },

package/rules/curl-body.n3

@@ -54,7 +54,7 @@ prefix math: <http://www.w3.org/2000/10/swap/math#>
 } <= {
   {
     ?value log:rawType log:Literal .
-    ( " -F " ?name "=" ?value ) string:concatenation ?formField .
+    ( " -F " ?name "='" ?value "'" ) string:concatenation ?formField .
   } log:callWithCut true .
 } .
 

package/rules/headers.n3

@@ -0,0 +1,8 @@
+prefix tuner: <https://api-tuner.described.at/>
+prefix string: <http://www.w3.org/2000/10/swap/string#>
+
+{
+  (?fieldName ?fieldValue) tuner:headerArg ?curlArg .
+} <= {
+  ( " -H '" ?fieldName ":" ?fieldValue "'" ) string:concatenation ?curlArg .
+} .

package/rules/queryParams.n3

@@ -0,0 +1,8 @@
+prefix tuner: <https://api-tuner.described.at/>
+prefix string: <http://www.w3.org/2000/10/swap/string#>
+
+{
+  (?name ?value) tuner:queryParamArg ?curlArg .
+} <= {
+  ( " --url-query '" ?name "=" ?value "'" ) string:concatenation ?curlArg .
+} .

package/rules/requests.n3

@@ -6,11 +6,7 @@ PREFIX tuner: <https://api-tuner.described.at/>
 prefix file: <http://www.w3.org/2000/10/swap/file#>
 prefix earl: <http://www.w3.org/ns/earl#>
 
-{
-  (?fieldName ?fieldValue) tuner:headerArg ?curlArg .
-} <= {
-  ( " -H '" ?fieldName ":" ?fieldValue "'" ) string:concatenation ?curlArg .
-} .
+
 
 {
   ?req tuner:response ?res .
@@ -34,6 +30,15 @@ prefix earl: <http://www.w3.org/ns/earl#>
     { ?headersArgs log:equalTo "" }
   ) log:ifThenElseIn [] .
 
+  (
+    { ?req tuner:query [] . }
+    {
+      ( ?queryParam { ?req tuner:query ?queryParam } ?queryParams ) log:collectAllIn [] .
+      ( ?queryParams tuner:queryParamArg )!list:map string:concatenation ?queryParamArgs .
+    }
+    { ?queryParamArgs log:equalTo "" }
+  ) log:ifThenElseIn [] .
+
   ?endpointUri log:uri ?endpoint .
 
   ( ?method " " ?endpoint )!string:concatenation^tuner:trace .
@@ -55,6 +60,7 @@ prefix earl: <http://www.w3.org/ns/earl#>
       "curl -s -X " ?method " '" ?endpoint "'"
       ?headersArgs
       ?bodyArgs
+      ?queryParamArgs
       " -w @" ( "lib/curl-format.txt"!file:libPath )!string:concatenation
       " -o " ?responseBodyFile
       " > " ?responseHeadersFile