feat: expand variables inside external body (fix #455)

Author: boltlessengineer

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

@@ -299,7 +299,11 @@ function builder.build(req, ignore_stats)
     insert(args, builder.cookies(req.cookies))
     if req.body then
         if req.body.__TYPE == "external" then
-            insert(args, builder.file(req.body.data.path))
+            if req.body.data.content then
+                insert(args, builder.raw_body(req.body.data.content))
+            else
+                insert(args, builder.file(req.body.data.path))
+            end
         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", "graphql" }, req.body.__TYPE) then

lua/rest-nvim/parser/init.lua

@@ -136,6 +136,14 @@ function parser.parse_body(content_type, body_node, source, context)
             name = get_node_field_text(body_node, "name", source),
             path = path,
         }
+        local body_text = vim.treesitter.get_node_text(body_node, source)
+        if vim.startswith(body_text, "<@") then
+            logger.debug("external body with '<@' prefix")
+            return body
+        end
+        local file_content = utils.read_file(path)
+        file_content = expand_variables(file_content, context)
+        body.data.content = file_content
     elseif node_type == "graphql_body" then
         body.__TYPE = "graphql"
         local query_text = vim.treesitter.get_node_text(assert(body_node:named_child(0)), source)

spec/examples/examples_spec.lua

@@ -109,7 +109,7 @@ describe("builtin request hooks", function()
         it("with external body", function()
             local source = open("spec/examples/request_body/external_body.http")
             local _, tree = utils.ts_parse_source(source)
-            local req_node = assert(tree:root():child(0))
+            local req_node = assert(tree:root():child(1))
             local req = assert(parser.parse(req_node, source))
             _G.rest_request = req
             vim.api.nvim_exec_autocmds("User", {

spec/examples/request_body/external_body.http

@@ -1,5 +1,12 @@
+@bar=baz
 ### External body
 POST https://example.com:8080/api/html/post
 # rest.nvim can guess and fill the Content-Type header from file path
 
 < ./input.json
+
+### External body (raw)
+POST https://example.com:8080/api/html/post
+# rest.nvim can guess and fill the Content-Type header from file path
+
+<@ ./input.json

spec/examples/request_body/input.json

@@ -0,0 +1,3 @@
+{
+    "foo": "{{bar}}"
+}

spec/parser/http_parser_spec.lua

@@ -186,14 +186,35 @@ key5 = value5
             -- external body can be only sourced when
             local source = open("spec/examples/request_body/external_body.http")
             local _, tree = utils.ts_parse_source(source)
-            local req_node = assert(tree:root():child(0))
+            local req_node = assert(tree:root():child(1))
             assert.same({
                 method = "POST",
                 url = "https://example.com:8080/api/html/post",
                 headers = {},
                 cookies = {},
                 handlers = {},
                 name = "External body",
+                body = {
+                    __TYPE = "external",
+                    data = {
+                        path = "spec/examples/request_body/input.json",
+                        content = '{\n    "foo": "baz"\n}\n',
+                    },
+                },
+            }, parser.parse(req_node, source))
+        end)
+        it("parse external body (raw)", function()
+            -- external body can be only sourced when
+            local source = open("spec/examples/request_body/external_body.http")
+            local _, tree = utils.ts_parse_source(source)
+            local req_node = assert(tree:root():child(2))
+            assert.same({
+                method = "POST",
+                url = "https://example.com:8080/api/html/post",
+                headers = {},
+                cookies = {},
+                handlers = {},
+                name = "External body (raw)",
                 body = {
                     __TYPE = "external",
                     data = {