refactor: remove typescript and stick with only lua

Author: Massolari

lua/forem-nvim/api.lua

@@ -1,111 +1,134 @@
---[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
-local ____exports = {}
+local M = {}
 local curl = require("plenary.curl")
 local job = require("plenary.job")
 local notify = require("forem-nvim.notify")
 local article = require("forem-nvim.article")
-____exports.key = function() return vim.env.FOREM_API_KEY end
-local baseUrl = "https://dev.to/api"
-local function handleAsyncError(response)
-    notify.error("Error: " .. tostring(response.body.error))
+
+function M.key()
+  return vim.env.FOREM_API_KEY
 end
-____exports.handleError = function(response, onSuccess)
-    local startStatus = string.sub(response.status, 1, 2)
-    local ____temp_0
-    if startStatus == "20" then
-        ____temp_0 = onSuccess(response.body)
-    else
-        ____temp_0 = notify.error("Error: " .. tostring(response.body.error))
-    end
-    return ____temp_0
+
+local BASE_URL = "https://dev.to/api"
+
+local function handle_async_error(response)
+  notify.error("Error: " .. tostring(response.body.error))
+end
+
+function M.handle_error(response, on_success)
+  local start_status = string.sub(response.status, 1, 2)
+
+  if start_status == "20" then
+    on_success(response.body)
+  else
+    notify.error("Error: " .. tostring(response.body.error))
+  end
 end
-local function request(requestFunction, endpoint, options)
-    local parameters = vim.tbl_extend(
-        "force",
-        {
-            url = baseUrl .. endpoint,
-            headers = {
-                ["api-key"] = ____exports.key(),
-                content_type = "application/json",
-                accept = "application/vnd.forem.api-v1+json"
-            }
-        },
-        options
+
+local function request(request_function, endpoint, options)
+  local parameters = vim.tbl_extend(
+    "force",
+    {
+      url = BASE_URL .. endpoint,
+      headers = {
+        ["api-key"] = M.key(),
+        content_type = "application/json",
+        accept = "application/vnd.forem.api-v1+json"
+      }
+    },
+    options
+  )
+  local response = request_function(parameters)
+  if response.body then
+    return vim.tbl_extend(
+      "force",
+      response,
+      { body = vim.fn.json_decode(response.body) }
     )
-    local response = requestFunction(parameters)
-    if response.body then
-        return vim.tbl_extend(
-            "force",
-            response,
-            {body = vim.fn.json_decode(response.body)}
-        )
-    end
-    return response
+  end
+  return response
 end
-local function requestAsync(method, endpoint, options, onSuccess, onError)
-    return job:new({
-        command = "curl",
-        args = {
-            "-X",
-            method,
-            "-H",
-            "Content-Type: application/json",
-            "-H",
-            "Accept: application/vnd.forem.api-v1+json",
-            "-H",
-            "api-key: " .. tostring(____exports.key()),
-            "-d",
-            vim.fn.json_encode(options),
-            baseUrl .. endpoint
-        },
-        on_exit = function(job, code)
-            vim.schedule(function()
-                local result = table.concat(
-                    job:result(),
-                    "\n"
-                )
-                local response = vim.fn.json_decode(result)
-                if code == 0 then
-                    onSuccess(response)
-                    return
-                end
-                handleAsyncError(response)
-                if onError then
-                    onError(response)
-                end
-            end)
+
+local function request_async(method, endpoint, options, on_success, on_error)
+  -- TODO: Check if this could be done with `vim.system`
+  return job:new({
+    command = "curl",
+    args = {
+      "-X",
+      method,
+      "-H",
+      "Content-Type: application/json",
+      "-H",
+      "Accept: application/vnd.forem.api-v1+json",
+      "-H",
+      "api-key: " .. tostring(M.key()),
+      "-d",
+      vim.fn.json_encode(options),
+      BASE_URL .. endpoint
+    },
+    on_exit = function(this_job, code)
+      vim.schedule(function()
+        local result = table.concat(
+          this_job:result(),
+          "\n"
+        )
+        local response = vim.fn.json_decode(result)
+        if code == 0 then
+          on_success(response)
+          return
         end
-    }):start()
+        handle_async_error(response)
+        if on_error then
+          on_error(response)
+        end
+      end)
+    end
+  }):start()
 end
-local function get(endpoint, onSuccess, onError)
-    return requestAsync(
-        "GET",
-        endpoint,
-        {},
-        onSuccess,
-        onError
-    )
+
+local function get(endpoint, on_success, on_error)
+  return request_async(
+    "GET",
+    endpoint,
+    {},
+    on_success,
+    on_error
+  )
 end
+
 local function put(endpoint, body)
-    return request(curl.put, endpoint, {body = body})
+  return request(curl.put, endpoint, { body = body })
 end
+
 local function post(endpoint, body)
-    return request(curl.post, endpoint, {body = body})
+  return request(curl.post, endpoint, { body = body })
 end
-____exports.myArticles = function(onSuccess, onError) return get("/articles/me/all", onSuccess, onError) end
-____exports.saveArticle = function(id, content) return put(
+
+function M.my_articles(on_success, on_error) return get("/articles/me/all", on_success, on_error) end
+
+function M.save_article(id, content)
+  return put(
     "/articles/" .. tostring(id),
-    vim.fn.json_encode({article = {body_markdown = content}})
-) end
-____exports.newArticle = function(title) return post(
+    vim.fn.json_encode({ article = { body_markdown = content } })
+  )
+end
+
+function M.new_article(title)
+  return post(
     "/articles",
-    vim.fn.json_encode({article = {body_markdown = article.getTemplate(title)}})
-) end
-____exports.feed = function(onSuccess, onError) return get("/articles", onSuccess, onError) end
-____exports.getArticle = function(id, onSuccess, onError) return get(
+    vim.fn.json_encode({ article = { body_markdown = article.get_template(title) } })
+  )
+end
+
+function M.feed(on_success, on_error) return get("/articles", on_success, on_error) end
+
+function M.get_article(id, on_success, on_error)
+  return get(
     "/articles/" .. tostring(id),
-    onSuccess,
-    onError
-) end
-____exports.getArticleByPath = function(path, onSuccess, onError) return get("/articles/" .. path, onSuccess, onError) end
-return ____exports
+    on_success,
+    on_error
+  )
+end
+
+function M.get_article_by_path(path, on_success, on_error) return get("/articles/" .. path, on_success, on_error) end
+
+return M

lua/forem-nvim/article.lua

@@ -1,5 +1,15 @@
 --[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
-local ____exports = {}
-____exports.getBodyLines = function(article) return vim.split(article.body_markdown or "", "\n") end
-____exports.getTemplate = function(title) return ("---\ntitle: " .. title) .. "\npublished: false\ndescription:\ntags:\n# cover_image: https://direct_url_to_image.jpg\n# Use a ratio of 100:42 for best results.\n---\n\n" end
-return ____exports
+local M = {}
+
+-- TODO: Create class for Article
+
+function M.get_body_lines(article)
+  return vim.split(article.body_markdown or "", "\n")
+end
+
+function M.get_template(title)
+  return ("---\ntitle: " .. title) ..
+      "\npublished: false\ndescription:\ntags:\n# cover_image: https://direct_url_to_image.jpg\n# Use a ratio of 100:42 for best results.\n---\n\n"
+end
+
+return M

lua/forem-nvim/buffer.lua

@@ -1,49 +1,61 @@
---[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
-local ____exports = {}
+local M = {}
 local Article = require("forem-nvim.article")
-local ____util = require("forem-nvim.util")
-local setLocals = ____util.setLocals
-local getOption = ____util.getOption
-____exports.setBasicOptions = function()
-    setLocals({{"filetype", "markdown"}, {"modified", false}})
+local util = require("forem-nvim.util")
+local set_locals = util.set_locals
+
+M.set_basic_options = function()
+  set_locals({
+    filetype = "markdown",
+    modified = false
+  })
 end
-____exports.write = function(buffer, lines, offset)
-    local modifiable = getOption(vim.opt_local.modifiable)
-    vim.opt_local.modifiable = true
-    vim.api.nvim_buf_set_lines(
-        buffer,
-        offset or 0,
-        -1,
-        false,
-        lines
-    )
-    vim.opt_local.modifiable = modifiable
+
+M.write = function(buffer, lines, offset)
+  local modifiable = vim.opt_local.modifiable:get()
+  vim.opt_local.modifiable = true
+  vim.api.nvim_buf_set_lines(
+    buffer,
+    offset or 0,
+    -1,
+    false,
+    lines
+  )
+  vim.opt_local.modifiable = modifiable
 end
-____exports.getContent = function()
-    local buffer = vim.api.nvim_get_current_buf()
-    local lines = vim.api.nvim_buf_get_lines(buffer, 0, -1, true)
-    return {
-        content = table.concat(lines, "\n"),
-        bufnr = buffer
-    }
+
+M.get_content = function()
+  local buffer = vim.api.nvim_get_current_buf()
+  local lines = vim.api.nvim_buf_get_lines(buffer, 0, -1, true)
+  return {
+    content = table.concat(lines, "\n"),
+    bufnr = buffer
+  }
 end
-____exports.openMyArticle = function(article)
-    vim.cmd(":edit forem://my-article/" .. tostring(article.id))
-    local buffer = vim.api.nvim_get_current_buf()
-    ____exports.write(
-        buffer,
-        Article.getBodyLines(article)
-    )
-    ____exports.setBasicOptions()
-    setLocals({{"buftype", "acwrite"}, {"swapfile", false}})
+
+M.open_my_article = function(article)
+  vim.cmd(":edit forem://my-article/" .. tostring(article.id))
+  local buffer = vim.api.nvim_get_current_buf()
+  M.write(
+    buffer,
+    Article.get_body_lines(article)
+  )
+  M.set_basic_options()
+  set_locals({ buftype = "acwrite", swapfile = false })
 end
-____exports.loadArticle = function(article)
-    vim.cmd(":edit forem://article/" .. article.title)
-    setLocals({{"linebreak", true}, {"textwidth", 80}})
-    local buffer = vim.api.nvim_get_current_buf()
-    local body = Article.getBodyLines(article)
-    ____exports.write(buffer, body)
-    ____exports.setBasicOptions()
-    setLocals({{"modifiable", false}, {"spell", false}, {"buftype", "nowrite"}, {"swapfile", false}})
+
+M.load_article = function(article)
+  vim.cmd(":edit forem://article/" .. article.title)
+  set_locals({ linebreak = true, textwidth = 80 })
+  local buffer = vim.api.nvim_get_current_buf()
+  local body = Article.get_body_lines(article)
+  M.write(buffer, body)
+  M.set_basic_options()
+  set_locals({
+    modifiable = false,
+    spell = false,
+    buftype = "nowrite",
+    swapfile = false
+  })
 end
-return ____exports
+
+return M