feat: treat form-urlencoded as raw-body

Author: boltlessengineer

lua/rest-nvim/client/curl/cli.lua

@@ -211,16 +211,6 @@ function builder.data_body(body)
   return kv_to_list(body, "-d", "=")
 end
 
----@package
----@param form table<string,string>?
----@return string[]? args
-function builder.form(form)
-  if not form then
-    return
-  end
-  return kv_to_list(form, "-F", "=")
-end
-
 function builder.file(file)
   if not file then
     return
@@ -284,12 +274,16 @@ function builder.build(req, ignore_stats)
   insert(args, builder.headers(req.headers))
   insert(args, builder.cookies(req.cookies))
   if req.body then
-    if req.body.__TYPE == "form" then
-      insert(args, builder.form(req.body.data))
-    elseif req.body.__TYPE == "external" then
+    if req.body.__TYPE == "external" then
       insert(args, builder.file(req.body.data.path))
-    else
+    elseif req.body.__TYPE == "graphql" then
+      log.error("graqphql body is not supportted yet")
+    elseif req.body.__TYPE == "multipart_form_data" then
+      log.error("multipart-form-data body is not supportted yet")
+    elseif vim.list_contains({ "json", "xml", "raw" }, req.body.__TYPE) then
       insert(args, builder.raw_body(req.body.data))
+    else
+      log.error(("unkown body type: '%s'"):format(req.body.__TYPE))
     end
   end
   if config.request.skip_ssl_verification then

lua/rest-nvim/parser/init.lua

@@ -90,19 +90,17 @@ local function validate_xml(str)
 end
 
 ---@param str string
----@return table<string,string>?
+---@return string?
 local function parse_urlencoded_form(str)
-  local form = {}
   local query_pairs = vim.split(str, "&")
-  for _, query in ipairs(query_pairs) do
+  return vim.iter(query_pairs):map(function (query)
     local key, value = query:match("([^=]+)=?(.*)")
     if not key then
       -- TODO: error
       return nil
     end
-    form[vim.trim(key)] = vim.trim(value)
-  end
-  return form
+    return vim.trim(key) .. "=" .. vim.trim(value)
+  end):join("&")
 end
 
 ---@param content_type string?
@@ -150,7 +148,7 @@ function parser.parse_body(content_type, body_node, source, context)
     -- TODO: exclude comments from text
     local text = vim.treesitter.get_node_text(body_node, source)
     if content_type and vim.startswith(content_type, "application/x-www-form-urlencoded") then
-      body.__TYPE = "form"
+      body.__TYPE = "raw"
       body.data = parse_urlencoded_form(text)
       if not body.data then
         -- TODO: parsing urlencoded form failed

lua/rest-nvim/request.lua

@@ -12,7 +12,7 @@ local jar    = require("rest-nvim.cookie_jar")
 local clients = require("rest-nvim.client")
 
 ---@class rest.Request.Body
----@field __TYPE "json"|"xml"|"raw"|"graphql"|"multipart_form_data"|"form"|"external"
+---@field __TYPE "json"|"xml"|"raw"|"graphql"|"multipart_form_data"|"external"
 ---@field data any
 
 ---@class rest.Request

spec/client/curl/cli_spec.lua

@@ -45,13 +45,11 @@ describe("curl cli builder", function()
       cookies = {},
       handlers = {},
       body = {
-        __TYPE = "form",
-        data = {
-          foo = "bar",
-        },
+        __TYPE = "raw",
+        data = "field1=value1&field2=value2",
       },
     })
-    assert.same({ "http://localhost:8000", "-X", "POST", "-F", "foo=bar", "-w", STAT_FORMAT }, args)
+    assert.same({ "http://localhost:8000", "-X", "POST", "--data-raw", "field1=value1&field2=value2", "-w", STAT_FORMAT }, args)
   end)
   it("from POST request with json body", function ()
     local json_text = [[{ "string": "foo", "number": 100, "array":  [1, 2, 3], "json": { "key": "value" } }]]

spec/parser/http_parser_spec.lua

@@ -34,14 +34,8 @@ key5 = value5
       cookies = {},
       handlers = {},
       body = {
-        __TYPE = "form",
-        data = {
-          key1 = "value1",
-          key2 = "value2",
-          key3 = "value3",
-          key4 = "value4",
-          key5 = "value5",
-        },
+        __TYPE = "raw",
+        data = "key1=value1&key2=value2&key3=value3&key4=value4&key5=value5",
       },
     }, parser.parse(req_node, source))
   end)
@@ -58,6 +52,7 @@ key5 = value5
       },
       cookies = {},
       handlers = {},
+      name = "post_with_external_body#1",
       body = {
         __TYPE = "external",
         data = {