api-tuner 0.6.2 → 0.6.3

package/README.md

@@ -172,7 +172,19 @@ Example:
     ```turtle
     tuner:body <file:data.json>
     ```
-3.  **Multipart Form**:
+3.  **URL-Encoded Form** (`application/x-www-form-urlencoded`): Use `tuner:form` directly on the `tuner:Request` object with `( name value )` pairs. Values are percent-encoded automatically.
+    ```turtle
+    <#test> tuner:request [
+      a tuner:Request ;
+      tuner:method "POST" ;
+      tuner:url <http://example.com/api> ;
+      tuner:form ( "foo" "hello world" ) ;
+      tuner:form ( "bar" "Ü" ) ;
+    ] .
+    ```
+    This sends `foo=hello%20world&bar=%C3%9C` as the request body.
+
+4.  **Multipart Form** (`multipart/form-data`): Use `tuner:body` with a blank node containing `tuner:form` triples. Each field is a `( name value )` pair. For file uploads, use a `file:` URI and optionally a MIME type as a third element.
     ```turtle
     tuner:body [
       tuner:form ( "field1" "value1" ) ;

package/package.json

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

package/rules/curl-body.n3

@@ -1,3 +1,4 @@
+PREFIX string: <http://www.w3.org/2000/10/swap/string#>
 PREFIX list: <http://www.w3.org/2000/10/swap/list#>
 PREFIX tuner: <https://api-tuner.described.at/>
 PREFIX string: <http://www.w3.org/2000/10/swap/string#>
@@ -66,6 +67,28 @@ prefix math: <http://www.w3.org/2000/10/swap/math#>
   ) string:concatenation ?curlArgs .
 } .
 
+{
+  ?req </#formUrlencoded> ?bodyArgs
+} <= {
+  (
+    { ?req tuner:form [] . }
+    {
+      ( ?formField { ?req tuner:form ?formField } ?formFields ) log:collectAllIn [] .
+      ( ( ?formFields <#encodeFormField> )!list:map "&" ) string:join ?formData .
+      ( ' -d "' ?formData '"' ) string:concatenation ?bodyArgs .
+    }
+    { ?bodyArgs log:equalTo "" }
+  ) log:ifThenElseIn [] .
+} .
+
+{
+  ( ?name ?value ) <#encodeFormField> ?urlEncodedPair .
+} <= {
+  ( "node -e 'console.log(encodeURIComponent(\"" ?value "\"))'" )!string:concatenation log:shellTrimmed ?encoded .
+
+  ( ?name "=" ?encoded ) string:concatenation ?urlEncodedPair .
+} .
+
 {
   ( ?name ?value ) </#field> ?formField .
 } <= {

package/rules/requests.n3

@@ -56,7 +56,7 @@ prefix earl: <http://www.w3.org/ns/earl#>
     (
       { ?req tuner:body ?body  }
       { ?body </#body> ( ?bodyArgs ?requestBodyFile ) }
-      { ?bodyArgs log:equalTo "" }
+      { ?req </#formUrlencoded> ?bodyArgs }
     ) log:ifThenElseIn [] .
 
     (

package/rules/util.n3

@@ -0,0 +1,10 @@
+PREFIX log: <http://www.w3.org/2000/10/swap/log#>
+prefix string: <http://www.w3.org/2000/10/swap/string#>
+
+{
+  ?command log:shellTrimmed ?output .
+} <= {
+  ?command log:shell ?outputRaw .
+  # Remove trailing newline that is usually present in shell output
+  ( ?outputRaw "\n$" "" ) string:replace ?output  .
+} .