refactor(installer): introduce PackageInstallOpts class (#802)

4 files changed, 8 insertions, 13 deletions

diff --git a/lua/mason-core/fs.lua b/lua/mason-core/fs.lua
index 1621d06c..b60749e2 100644
--- a/lua/mason-core/fs.lua
+++ b/lua/mason-core/fs.lua
@@ -89,7 +89,7 @@ local function make_module(uv)
     ---@param contents string
     ---@param flags string? Defaults to "w".
     function M.write_file(path, contents, flags)
-        log.debug("fs: write_file", path)
+        log.trace("fs: write_file", path)
         local fd = uv.fs_open(path, flags or "w", 438)
         uv.fs_write(fd, contents, -1)
         uv.fs_close(fd)
diff --git a/lua/mason-core/installer/context.lua b/lua/mason-core/installer/context.lua
index 132cc064..0b07b528 100644
--- a/lua/mason-core/installer/context.lua
+++ b/lua/mason-core/installer/context.lua
@@ -151,12 +151,8 @@ end
 local InstallContext = {}
 InstallContext.__index = InstallContext
 
----@class InstallContextOpts
----@field requested_version string?
----@field debug boolean?
-
 ---@param handle InstallHandle
----@param opts InstallContextOpts
+---@param opts PackageInstallOpts
 function InstallContext.new(handle, opts)
     local cwd_manager = CwdManager.new(path.install_prefix())
     return setmetatable({
@@ -166,7 +162,7 @@ function InstallContext.new(handle, opts)
         package = handle.package, -- for convenience
         fs = ContextualFs.new(cwd_manager),
         receipt = receipt.InstallReceiptBuilder.new(),
-        requested_version = Optional.of_nilable(opts.requested_version),
+        requested_version = Optional.of_nilable(opts.version),
         stdio_sink = handle.stdio.sink,
         bin_links = {},
     }, InstallContext)
diff --git a/lua/mason-core/installer/init.lua b/lua/mason-core/installer/init.lua
index 0d6c8dc9..4250508c 100644
--- a/lua/mason-core/installer/init.lua
+++ b/lua/mason-core/installer/init.lua
@@ -88,7 +88,7 @@ end
 
 ---@async
 ---@param handle InstallHandle
----@param opts InstallContextOpts
+---@param opts PackageInstallOpts
 function M.execute(handle, opts)
     if handle:is_active() or handle:is_closed() then
         log.fmt_debug("Received active or closed handle %s", handle)
diff --git a/lua/mason-core/package/init.lua b/lua/mason-core/package/init.lua
index faf25764..9fb82d42 100644
--- a/lua/mason-core/package/init.lua
+++ b/lua/mason-core/package/init.lua
@@ -92,7 +92,9 @@ function Package:new_handle()
     return handle
 end
 
----@param opts? { version: string?, debug: boolean? }
+---@alias PackageInstallOpts { version: string?, debug: boolean?, target: string? }
+
+---@param opts? PackageInstallOpts
 ---@return InstallHandle
 function Package:install(opts)
     opts = opts or {}
@@ -131,10 +133,7 @@ function Package:install(opts)
                         end)
                 end,
                 handle,
-                {
-                    requested_version = opts.version,
-                    debug = opts.debug,
-                }
+                opts
             )
             return handle
         end)