fix(parser): handle variables in URI

- never uri-encode variables
- parse variables with quotes

Author: boltlessengineer

lua/rest-nvim/context.lua

@@ -2,6 +2,7 @@
 
 local dotenv = require("rest-nvim.dotenv")
 local config = require("rest-nvim.config")
+local logger = require("rest-nvim.logger")
 local M = {}
 
 ---@class rest.Context
@@ -57,6 +58,7 @@ end
 
 ---@param filepath string
 function Context:load_file(filepath)
+    logger.debug(("load file `%s` to context"):format(filepath))
     dotenv.load_file(filepath, function(key, value)
         self:set_global(key, value)
     end)

lua/rest-nvim/parser/dotenv.lua

@@ -62,20 +62,16 @@ function M.parse(path, setter)
             end
         end
     else
-        local vars_tbl = vim.split(file_contents, "\n")
-        table.remove(vars_tbl, #vars_tbl)
+        -- TODO: rewrite the parser with tree-sitter-bash instead
+        local vars_tbl = vim.split(file_contents, "\n", { trimempty = true })
+        logger.debug(vars_tbl)
         for _, var in ipairs(vars_tbl) do
-            local variable = vim.split(var, "=")
-            local variable_name = variable[1]
-            local variable_value
-            -- In case some weirdo adds a `=` character to his ENV value
-            if #variable > 2 then
-                table.remove(variable, 1)
-                variable_value = table.concat(variable, "=")
-            else
-                variable_value = variable[2]
+            local variable_name, variable_value = var:match("([^#=%s]+)%s*=%s*([^#]*)")
+            if variable_name then
+                variable_value = variable_value:match('^"(.*)"$') or variable_value:match("^'(.*)'$") or variable_value
+                logger.debug("set " .. variable_name .. "=" .. variable_value)
+                setter(variable_name, value_tostring(variable_value))
             end
-            setter(variable_name, value_tostring(variable_value))
         end
     end
     return true, vars

lua/rest-nvim/parser/init.lua

@@ -43,16 +43,12 @@ end
 
 ---@param src string
 ---@param context rest.Context
----@param encoder? fun(s:string):string
 ---@return string
 ---@return integer
-local function expand_variables(src, context, encoder)
+local function expand_variables(src, context)
     return src:gsub("{{(.-)}}", function(name)
         name = vim.trim(name)
         local res = context:resolve(name)
-        if encoder then
-            res = encoder(res)
-        end
         return res
     end)
 end
@@ -383,7 +379,7 @@ function parser.parse(node, source, ctx)
     for child, _ in node:iter_children() do
         local child_type = child:type()
         if child_type == "request" then
-            url = expand_variables(assert(get_node_field_text(req_node, "url", source)), ctx, utils.escape)
+            url = expand_variables(assert(get_node_field_text(req_node, "url", source)), ctx)
             url = url:gsub("\n%s+", "")
         elseif child_type == "pre_request_script" then
             parser.parse_pre_request_script(child, source, ctx)