feat: get rid of _G usage

Author: boltlessengineer

lua/rest-nvim/request.lua

@@ -8,6 +8,7 @@ local logger = require("rest-nvim.logger")
 local config = require("rest-nvim.config")
 local ui     = require("rest-nvim.ui.result")
 local nio    = require("nio")
+local response = require("rest-nvim.response")
 
 ---@class Request
 ---@field context Context
@@ -30,7 +31,7 @@ local function run_request(req)
   rest_nvim_last_request = req
 
   -- remove previous result
-  _G._rest_nvim_result = nil
+  response.current = nil
   -- clear the ui
   ui.update()
 
@@ -46,19 +47,17 @@ local function run_request(req)
       -- TODO: should return here
       return
     end
+    ---@cast res rest.Response
     logger.info("request success")
-    -- wrap with schedule to set global variable outside of lua callback loop
-    vim.schedule(function ()
-      _G._rest_nvim_result = res
+    response.current = res
 
-      -- run request handler scripts
-      vim.iter(req.handlers):each(function (f) f() end)
+    -- run request handler scripts
+    vim.iter(req.handlers):each(function (f) f() end)
+    logger.info("handler done")
 
-      logger.info("handler done")
-
-      -- update result UI
-      ui.update()
-    end)
+    -- update result UI
+    -- NOTE: wrap with schedule to set vim variable outside of lua callback loop
+    vim.schedule(ui.update)
   end)
   -- FIXME: use future instead of returning true here
   return true

lua/rest-nvim/response.lua

@@ -8,6 +8,9 @@ local logger = require("rest-nvim.logger")
 ---@field body string?
 ---@field headers table<string,string>
 
+---@type rest.Response?
+response.current = nil
+
 ---@class rest.Response.status
 ---@field code number
 ---@field version string

lua/rest-nvim/ui/result.lua

@@ -24,7 +24,7 @@ local panes = {
   {
     name = "Response",
     render = function(self)
-      local result = _G._rest_nvim_result
+      local result = response.current
       if not result then
         vim.bo[self.bufnr].undolevels = -1
         set_lines(self.bufnr, { "Loading..." })
@@ -46,7 +46,7 @@ local panes = {
   {
     name = "Statistics",
     render = function(self)
-      local result = _G._rest_nvim_result
+      local result = response.current
       if not result then
         set_lines(self.bufnr, { "Loading..." })
         return
@@ -71,7 +71,7 @@ if config.result.window.cookies then
   table.insert(panes, 2, {
     name = "Cookies",
     render = function(self)
-      local result = _G._rest_nvim_result
+      local result = response.current
       if not result then
         set_lines(self.bufnr, { "Loading..." })
         return
@@ -93,7 +93,7 @@ if config.result.window.headers then
   table.insert(panes, 2, {
     name = "Headers",
     render = function(self)
-      local result = _G._rest_nvim_result
+      local result = response.current
       if not result then
         set_lines(self.bufnr, { "Loading..." })
         return
@@ -112,10 +112,10 @@ end
 
 local winbar = "%#Normal# %{%v:lua.require('rest-nvim.ui.panes').winbar()%}"
 winbar = winbar .. "%=%<"
-winbar = winbar .. "%{%v:lua._G._stat_winbar()%}"
+winbar = winbar .. "%{%v:lua.require('rest-nvim.ui.result').stat_winbar()%}"
 winbar = winbar .. " %#RestText#|%#Normal# "
 winbar = winbar .. "%#RestText#Press %#Keyword#?%#RestText# for help%#Normal# "
-function _G._stat_winbar()
+function M.stat_winbar()
   local content = ""
   local stats = vim.tbl_get(_G, "_rest_nvim_result", "statistics")
   if not stats then
@@ -134,18 +134,18 @@ function _G._stat_winbar()
   end
   return content
 end
-local result_help = require("rest-nvim.ui.help")
 
 ---@type rest.ui.panes.PaneGroup
 local group = paneui.create_pane_group("rest_nvim_result", panes, {
   on_init = function(self)
+    local help = require("rest-nvim.ui.help")
     vim.keymap.set("n", config.result.keybinds.prev, function()
       self.group:cycle(-1)
     end, { buffer = self.bufnr })
     vim.keymap.set("n", config.result.keybinds.next, function()
       self.group:cycle(1)
     end, { buffer = self.bufnr })
-    vim.keymap.set("n", "?", result_help.open, { buffer = self.bufnr })
+    vim.keymap.set("n", "?", help.open, { buffer = self.bufnr })
     vim.bo[self.bufnr].filetype = "rest_nvim_result"
     utils.nvim_lazy_set_wo(self.bufnr, "winbar", winbar)
   end,

spec/minimum_init.lua

@@ -11,9 +11,6 @@ if not vim.treesitter.language.get_lang("http") then
   vim.treesitter.language.register("http", "http")
 end
 vim.opt.runtimepath:append(rest_nvim_dir)
-_G._rest_nvim = {
+vim.g.rest_nvim = {
   _log_level = vim.log.levels.INFO
 }
-require("rest-nvim").setup({
-  _log_level = vim.log.levels.INFO
-})