api-tuner 0.1.1 → 0.1.3

package/README.md

@@ -6,6 +6,14 @@
 
 - [SWI Prolog](https://www.swi-prolog.org/Download.html)
 
+Follow platform-specific instructions to install locally oor in a docker image.
+
+To run `api-tuner` in GitHub workflow, you add this action to your jobs:
+
+```yaml
+- uses: fabasoad/setup-prolog-action@v1
+```
+
 ## Installation
 
 `npm i api-tuner`

package/bin/tuner.sh

@@ -88,4 +88,5 @@ for path in "${PATHS[@]}"; do
   cat "$path" >> "$MERGED"
 done
 
+set -o pipefail
 $eye $ARGS "${SCRIPT_PATH}"/../rules/*.n3 "${MERGED}" | $SUMMARY

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "api-tuner",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "main": "index.js",
   "type": "module",
   "license": "MIT",

package/rules/curl-body.n3

@@ -38,17 +38,8 @@ prefix math: <http://www.w3.org/2000/10/swap/math#>
   (
     ?formField
     {
-      ?multipartBody tuner:form ( ?name ?value ) .
-
-      (
-        { ?value log:rawType log:Literal }
-        {
-          ( " -F " ?name "=" ?value ) string:concatenation ?formField .
-        }
-        {
-          ( " -F " ?name "=" ?value!file:curlFileReference ) string:concatenation ?formField .
-        }
-      ) log:ifThenElseIn [] .
+      ?multipartBody tuner:form ?list .
+      ?list </#field> ?formField .
     }
     ?formFields
   ) log:collectAllIn [] .
@@ -57,3 +48,34 @@ prefix math: <http://www.w3.org/2000/10/swap/math#>
     ?formFields!string:concatenation
   ) string:concatenation ?curlArgs .
 } .
+
+{
+  ( ?name ?value ) </#field> ?formField .
+} <= {
+  {
+    ?value log:rawType log:Literal .
+    ( " -F " ?name "=" ?value ) string:concatenation ?formField .
+  } log:callWithCut true .
+} .
+
+{
+  ( ?name ?value ) </#field> ?formField .
+} <= {
+  ( ?name ?value "" ) </#field> ?formField .
+} .
+
+{
+  ( ?name ?value ?type ) </#field> ?formField .
+} <= {
+  (
+    { ?type!string:length math:greaterThan 0 }
+    {
+      ( "';type=" ?type "'" ) string:concatenation ?typeParam
+    }
+    {
+      ?typeParam log:equalTo "" .
+    }
+  ) log:ifThenElseIn [] .
+
+  ( " -F " ?name "=" ?value!file:curlFileReference ?typeParam ) string:concatenation ?formField .
+} .

package/rules/files.n3

@@ -24,7 +24,7 @@ prefix file: <http://www.w3.org/2000/10/swap/file#>
 {
   ?path file:rm ?iDoNotCare .
 } <= {
-  ( "rm " ?path )!string:concatenation!e:exec .
+  ( "rm " ?path " 2> /dev/null" )!string:concatenation!e:exec .
 } .
 
 {

package/rules/requests.n3

@@ -42,37 +42,44 @@ prefix earl: <http://www.w3.org/ns/earl#>
   ( ?responseBodyFile ".curl.json" ) string:concatenation ?responseHeadersFile .
   ( ?responseBodyFile ".n3" ) string:concatenation ?responseFile .
 
-  ( "Calling " ?method " " ?endpoint )!string:concatenation^tuner:info .
-
-  (
-    { ?req tuner:body ?body  }
-    { ?body </#body> ( ?bodyArgs ?requestBodyFile ) }
-    { ?bodyArgs log:equalTo "" }
-  ) log:ifThenElseIn [] .
+  {
+    ( "Calling " ?method " " ?endpoint )!string:concatenation^tuner:info .
 
-  (
-    "curl -s -X " ?method " '" ?endpoint "'"
-    ?headersArgs
-    ?bodyArgs
-    " -w @" ( "lib/curl-format.txt"!file:libPath )!string:concatenation
-    " -o " ?responseBodyFile
-    " > " ?responseHeadersFile
-  ) string:concatenation ?command .
+    (
+      { ?req tuner:body ?body  }
+      { ?body </#body> ( ?bodyArgs ?requestBodyFile ) }
+      { ?bodyArgs log:equalTo "" }
+    ) log:ifThenElseIn [] .
 
-  ?command^tuner:trace .
-  ?command!e:exec .
+    (
+      "curl -s -X " ?method " '" ?endpoint "'"
+      ?headersArgs
+      ?bodyArgs
+      " -w @" ( "lib/curl-format.txt"!file:libPath )!string:concatenation
+      " -o " ?responseBodyFile
+      " > " ?responseHeadersFile
+    ) string:concatenation ?command .
 
-  (
-    "node " "lib/merge-curl-output.js"!file:libPath " "
-    ?responseBodyFile
-    " > " ?responseFile
-  )!string:concatenation!e:exec .
+    ?command^tuner:trace .
+    {
+      ?command!e:exec .
+    } log:callWithCleanup {
+      {
+        ( { ?requestBodyFile log:rawType log:Literal } { ?requestBodyFile!file:rm } true ) log:ifThenElseIn [] .
+      } log:callWithCleanup true .
+    } .
 
-  ("file://" ?responseFile)!string:concatenation^log:uri log:semantics ?res .
-  ?res^tuner:trace .
+    (
+      "node " "lib/merge-curl-output.js"!file:libPath " "
+      ?responseBodyFile
+      " > " ?responseFile
+    )!string:concatenation!e:exec .
 
-  ( { ?requestBodyFile log:rawType log:Literal } { ?requestBodyFile!file:rm } true ) log:ifThenElseIn [] .
-  ?responseHeadersFile!file:rm .
-  ?responseBodyFile!file:rm .
-  ?responseFile!file:rm .
+    ("file://" ?responseFile)!string:concatenation^log:uri log:semantics ?res .
+    ?res^tuner:trace .
+  } log:callWithCleanup {
+    { ?responseHeadersFile!file:rm } log:callWithCleanup true .
+    { ?responseBodyFile!file:rm } log:callWithCleanup true .
+    { ?responseFile!file:rm } log:callWithCleanup true .
+  } .
 } .