chore(functional): restructure and extend functional modules (#703)

3 files changed, 22 insertions, 34 deletions

diff --git a/lua/nvim-lsp-installer/servers/angularls/init.lua b/lua/nvim-lsp-installer/servers/angularls/init.lua
index 90209c3a..c10d0a97 100644
--- a/lua/nvim-lsp-installer/servers/angularls/init.lua
+++ b/lua/nvim-lsp-installer/servers/angularls/init.lua
@@ -1,16 +1,12 @@
 local server = require "nvim-lsp-installer.server"
 local platform = require "nvim-lsp-installer.core.platform"
 local npm = require "nvim-lsp-installer.core.managers.npm"
-local functional = require "nvim-lsp-installer.core.functional"
+local _ = require "nvim-lsp-installer.core.functional"
 local path = require "nvim-lsp-installer.core.path"
 
-local map = functional.list_map
-
-local function append_node_modules(dirs)
-    return map(function(dir)
-        return path.concat { dir, "node_modules" }
-    end, dirs)
-end
+local append_node_modules = _.map(function(dir)
+    return path.concat { dir, "node_modules" }
+end)
 
 return function(name, root_dir)
     local function get_cmd(workspace_dir)
diff --git a/lua/nvim-lsp-installer/servers/dhall_lsp_server/init.lua b/lua/nvim-lsp-installer/servers/dhall_lsp_server/init.lua
index 0d35a943..484ae389 100644
--- a/lua/nvim-lsp-installer/servers/dhall_lsp_server/init.lua
+++ b/lua/nvim-lsp-installer/servers/dhall_lsp_server/init.lua
@@ -2,13 +2,11 @@ local server = require "nvim-lsp-installer.server"
 local path = require "nvim-lsp-installer.core.path"
 local process = require "nvim-lsp-installer.core.process"
 local platform = require "nvim-lsp-installer.core.platform"
-local functional = require "nvim-lsp-installer.core.functional"
+local _ = require "nvim-lsp-installer.core.functional"
 local std = require "nvim-lsp-installer.core.managers.std"
 local github_client = require "nvim-lsp-installer.core.managers.github.client"
 local Optional = require "nvim-lsp-installer.core.optional"
 
-local coalesce, when, list_find_first = functional.coalesce, functional.when, functional.list_find_first
-
 return function(name, root_dir)
     return server.Server:new {
         name = name,
@@ -29,17 +27,14 @@ return function(name, root_dir)
                 :get_or_throw()
 
             local asset_name_pattern = assert(
-                coalesce(
-                    when(platform.is_mac, "dhall%-lsp%-server%-.+%-x86_64%-macos.tar.bz2"),
-                    when(platform.is_linux, "dhall%-lsp%-server%-.+%-x86_64%-linux.tar.bz2"),
-                    when(platform.is_win, "dhall%-lsp%-server%-.+%-x86_64%-windows.zip")
+                _.coalesce(
+                    _.when(platform.is.mac, "dhall%-lsp%-server%-.+%-x86_64%-macos.tar.bz2"),
+                    _.when(platform.is.linux_x64, "dhall%-lsp%-server%-.+%-x86_64%-linux.tar.bz2"),
+                    _.when(platform.is.win_x64, "dhall%-lsp%-server%-.+%-x86_64%-windows.zip")
                 )
             )
-            local dhall_lsp_server_asset = list_find_first(
-                ---@param asset GitHubReleaseAsset
-                function(asset)
-                    return asset.name:match(asset_name_pattern)
-                end,
+            local dhall_lsp_server_asset = _.find_first(
+                _.prop_satisfies(_.matches(asset_name_pattern), "name"),
                 gh_release.assets
             )
             Optional.of_nilable(dhall_lsp_server_asset)
diff --git a/lua/nvim-lsp-installer/servers/init.lua b/lua/nvim-lsp-installer/servers/init.lua
index 8ff7efaf..9d78d651 100644
--- a/lua/nvim-lsp-installer/servers/init.lua
+++ b/lua/nvim-lsp-installer/servers/init.lua
@@ -1,4 +1,4 @@
-local functional = require "nvim-lsp-installer.core.functional"
+local _ = require "nvim-lsp-installer.core.functional"
 local path = require "nvim-lsp-installer.core.path"
 local fs = require "nvim-lsp-installer.core.fs"
 local settings = require "nvim-lsp-installer.settings"
@@ -31,7 +31,7 @@ local INSTALL_DIRS = {
     ["yamlls"] = "yaml",
 }
 
-local CORE_SERVERS = functional.set_of {
+local CORE_SERVERS = _.set_of {
     "angularls",
     "ansiblels",
     "arduino_language_server",
@@ -175,7 +175,7 @@ local function scan_server_roots()
             result[#result + 1] = entry.name
         end
     end
-    cached_server_roots = functional.set_of(result)
+    cached_server_roots = _.set_of(result)
     vim.schedule(function()
         cached_server_roots = nil
     end)
@@ -239,17 +239,14 @@ function M.get_server(server_name)
         ):format(server_name, "https://github.com/williamboman/nvim-lsp-installer", server_factory)
 end
 
----@param server_names string[]
----@return Server[]
-local function resolve_servers(server_names)
-    return functional.list_map(function(server_name)
-        local ok, server = M.get_server(server_name)
-        if not ok then
-            error(server)
-        end
-        return server
-    end, server_names)
-end
+---@type fun(server_names: string): Server[]
+local resolve_servers = _.map(function(server_name)
+    local ok, server = M.get_server(server_name)
+    if not ok then
+        error(server)
+    end
+    return server
+end)
 
 ---@return string[]
 function M.get_available_server_names()