feat: lockfile support

README.md

@@ -43,6 +43,7 @@
 - Command completions for plugins and versions on luarocks.org.
 - Binary rocks pulled from [rocks-binaries](https://nvim-neorocks.github.io/rocks-binaries/)
   so you don't have to compile them.
+- Lockfile support.
 
 ![demo](https://github.com/nvim-neorocks/rocks.nvim/assets/12857160/955c3ae7-c916-4a70-8fbd-4e28b7f0d77e)
 

doc/rocks.txt

@@ -80,6 +80,7 @@ RocksOpts                                                            *RocksOpts*
     Fields: ~
         {rocks_path?}                    (string)   Local path in your filesystem to install rocks. Defaults to a `rocks` directory in `vim.fn.stdpath("data")`.
         {config_path?}                   (string)   Rocks declaration file path. Defaults to `rocks.toml` in `vim.fn.stdpath("config")`.
+        {lockfile_path?}                 (string)   Rocks lockfile path. Defaults to `rocks.lock` in `vim.fn.stdpath("config")`.
         {luarocks_binary?}               (string)   Luarocks binary path. Defaults to `luarocks`.
         {lazy?}                          (boolean)  Whether to query luarocks.org lazily. Defaults to `false`. Setting this to `true` may improve startup time, but features like auto-completion will lag initially.
         {dynamic_rtp?}                   (boolean)  Whether to automatically add freshly installed plugins to the 'runtimepath'. Defaults to `true` for the best default experience.

lua/rocks/config/init.lua

@@ -16,6 +16,7 @@ local config = {}
 ---@class RocksOpts
 ---@field rocks_path? string Local path in your filesystem to install rocks. Defaults to a `rocks` directory in `vim.fn.stdpath("data")`.
 ---@field config_path? string Rocks declaration file path. Defaults to `rocks.toml` in `vim.fn.stdpath("config")`.
+---@field lockfile_path? string Rocks lockfile path. Defaults to `rocks.lock` in `vim.fn.stdpath("config")`.
 ---@field luarocks_binary? string Luarocks binary path. Defaults to `luarocks`.
 ---@field lazy? boolean Whether to query luarocks.org lazily. Defaults to `false`. Setting this to `true` may improve startup time, but features like auto-completion will lag initially.
 ---@field dynamic_rtp? boolean Whether to automatically add freshly installed plugins to the 'runtimepath'. Defaults to `true` for the best default experience.

lua/rocks/config/internal.lua

@@ -30,6 +30,9 @@ local default_config = {
     ---@type string Rocks declaration file path
     ---@diagnostic disable-next-line: param-type-mismatch
     config_path = vim.fs.joinpath(vim.fn.stdpath("config"), "rocks.toml"),
+    ---@type string Rocks lockfile path
+    ---@diagnostic disable-next-line: param-type-mismatch
+    lockfile_path = vim.fs.joinpath(vim.fn.stdpath("config"), "rocks.lock"),
     ---@type string Luarocks binary path
     luarocks_binary = "luarocks",
     ---@type boolean Whether to query luarocks.org lazily

lua/rocks/fs.lua

@@ -40,7 +40,7 @@ end
 ---@param mode string mode to open the file for
 ---@param contents string file contents
 function fs.write_file(location, mode, contents)
-    local dir = vim.fn.fnamemodify(location, ":h")
+    local dir = vim.fs.dirname(location)
     vim.fn.mkdir(dir, "p")
     -- 644 sets read and write permissions for the owner, and it sets read-only
     -- mode for the group and others
@@ -54,7 +54,9 @@ function fs.write_file(location, mode, contents)
         else
             local msg = ("Error writing %s: %s"):format(location, err)
             log.error(msg)
-            vim.notify(msg, vim.log.levels.ERROR)
+            vim.schedule(function()
+                vim.notify(msg, vim.log.levels.ERROR)
+            end)
         end
     end)
 end

lua/rocks/operations/helpers.lua

@@ -17,6 +17,7 @@
 ---@brief ]]
 
 local luarocks = require("rocks.luarocks")
+local lock = require("rocks.operations.lock")
 local constants = require("rocks.constants")
 local config = require("rocks.config.internal")
 local runtime = require("rocks.runtime")
@@ -28,18 +29,18 @@ local nio = require("nio")
 
 local helpers = {}
 
+---@class InstallOpts
+---@field use_lockfile boolean
+
 ---@param rock_spec RockSpec
----@param progress_handle? ProgressHandle
+---@param opts? InstallOpts
 ---@return Future
-helpers.install = function(rock_spec, progress_handle)
+helpers.install = function(rock_spec, opts)
     cache.invalidate_removable_rocks()
     local name = rock_spec.name:lower()
     local version = rock_spec.version
     local message = version and ("Installing: %s -> %s"):format(name, version) or ("Installing: %s"):format(name)
     log.info(message)
-    if progress_handle then
-        progress_handle:report({ message = message })
-    end
     -- TODO(vhyrro): Input checking on name and version
     local future = nio.control.future()
     local install_cmd = {
@@ -62,14 +63,22 @@ helpers.install = function(rock_spec, progress_handle)
             table.insert(install_cmd, version)
         end
     end
+    local install_opts = {
+        servers = servers,
+    }
+    if opts and opts.use_lockfile then
+        -- luarocks locks dependencies when there is a lockfile in the cwd
+        local lockfile = lock.create_luarocks_lock(rock_spec.name)
+        install_opts.cwd = vim.fs.dirname(lockfile)
+    end
+    -- We always want to insert --pin so that the luarocks.lock is created in the
+    -- install directory on the rtp
+    table.insert(install_cmd, "--pin")
     local systemObj = luarocks.cli(install_cmd, function(sc)
         ---@cast sc vim.SystemCompleted
         if sc.code ~= 0 then
             message = ("Failed to install %s"):format(name)
             log.error(message)
-            if progress_handle then
-                progress_handle:report({ message = message })
-            end
             future.set_error(sc.stderr)
         else
             ---@type Rock
@@ -82,20 +91,18 @@ helpers.install = function(rock_spec, progress_handle)
             }
             message = ("Installed: %s -> %s"):format(installed_rock.name, installed_rock.version)
             log.info(message)
-            if progress_handle then
-                progress_handle:report({ message = message })
-            end
 
             if config.dynamic_rtp and not rock_spec.opt then
                 runtime.packadd(name)
                 adapter.init_tree_sitter_parser_symlink()
+            else
+                -- Add rock to the rtp, but don't source any scripts
+                runtime.packadd(name, { bang = true })
             end
 
             future.set(installed_rock)
         end
-    end, {
-        servers = servers,
-    })
+    end, install_opts)
     return {
         wait = future.wait,
         wait_sync = function()

lua/rocks/operations/init.lua

@@ -27,6 +27,7 @@ local handlers = require("rocks.operations.handlers")
 local parser = require("rocks.operations.parser")
 local nio = require("nio")
 local progress = require("fidget.progress")
+local lock = require("rocks.operations.lock")
 
 local operations = {}
 
@@ -195,7 +196,7 @@ operations.sync = function(user_rocks)
             if vim.startswith(user_rocks[key].version, "scm-") then
                 user_rocks[key].version = "dev"
             end
-            local future = helpers.install(user_rocks[key])
+            local future = helpers.install(user_rocks[key], { use_lockfile = true })
             local success = pcall(future.wait)
 
             ct = ct + 1
@@ -243,7 +244,7 @@ operations.sync = function(user_rocks)
                 message = is_downgrading and ("Downgrading: %s"):format(key) or ("Updating: %s"):format(key),
             })
 
-            local future = helpers.install(user_rocks[key])
+            local future = helpers.install(user_rocks[key], { use_lockfile = true })
             local success = pcall(future.wait)
 
             ct = ct + 1
@@ -436,6 +437,7 @@ operations.update = function()
         else
             vim_schedule_nio_wait(function()
                 fs.write_file(config.config_path, "w", tostring(user_rocks))
+                lock.update_lockfile()
             end)
         end
         nio.scheduler()
@@ -603,6 +605,7 @@ operations.add = function(arg_list, callback)
                 user_rocks.plugins[rock_name] = installed_rock.version
             end
             fs.write_file(config.config_path, "w", tostring(user_rocks))
+            lock.update_lockfile(installed_rock.name)
             if success then
                 progress_handle:finish()
                 if callback then
@@ -642,6 +645,7 @@ operations.prune = function(rock_name)
         local success = helpers.remove_recursive(rock_name, user_rock_names, progress_handle)
         vim_schedule_nio_wait(function()
             fs.write_file(config.config_path, "w", tostring(user_config))
+            lock.update_lockfile()
             if success then
                 progress_handle:finish()
             else

lua/rocks/operations/lock.lua

@@ -0,0 +1,79 @@
+---@mod rocks.operations.lock
+--
+-- Copyright (C) 2024 Neorocks Org.
+--
+-- License:    GPLv3
+-- Created:    04 Apr 2024
+-- Updated:    04 Apr 2024
+-- Homepage:   https://github.com/nvim-neorocks/rocks.nvim
+-- Maintainers: NTBBloodbath <[email protected]>, Vhyrro <[email protected]>, mrcjkb <[email protected]>
+--
+---@brief [[
+--
+-- Lockfile management.
+--
+---@brief ]]
+
+local config = require("rocks.config.internal")
+local fs = require("rocks.fs")
+
+local lock = {}
+
+---@param reset boolean
+local function parse_rocks_lock(reset)
+    local lockfile = reset and "" or fs.read_or_create(config.lockfile_path, "")
+    return require("toml_edit").parse(lockfile)
+end
+
+---@param rock_name? rock_name
+function lock.update_lockfile(rock_name)
+    local luarocks_lockfiles = vim.iter(vim.api.nvim_get_runtime_file("luarocks.lock", true))
+        :filter(function(path)
+            return not rock_name or path:find(rock_name .. "/[^%/]+/luarocks.lock$") ~= nil
+        end)
+        :totable()
+    local reset = rock_name == nil
+    local rocks_lock = parse_rocks_lock(reset)
+    for _, luarocks_lockfile in ipairs(luarocks_lockfiles) do
+        local rock_key = rock_name or luarocks_lockfile:match("/([^%/]+)/[^%/]+/luarocks.lock$")
+        if rock_key then
+            local ok, loader = pcall(loadfile, luarocks_lockfile)
+            if not ok or not loader then
+                return
+            end
+            local success, luarocks_lock_tbl = pcall(loader)
+            if not success or not luarocks_lock_tbl or not luarocks_lock_tbl.dependencies then
+                return
+            end
+            rocks_lock[rock_key] = {}
+            for dep, version in pairs(luarocks_lock_tbl.dependencies) do
+                local is_semver = pcall(vim.version.parse, version)
+                if is_semver and dep ~= "lua" then
+                    rocks_lock[rock_key][dep] = version
+                end
+            end
+        end
+    end
+    fs.write_file(config.lockfile_path, "w", tostring(rocks_lock))
+end
+
+---@param rock_name rock_name
+---@return string | nil luarocks_lock
+function lock.create_luarocks_lock(rock_name)
+    local lockfile = require("toml").decode(fs.read_or_create(config.lockfile_path, ""))
+    local dependencies = lockfile[rock_name]
+    if not dependencies then
+        return
+    end
+    local temp_dir = vim.fs.dirname(vim.fn.tempname())
+    local luarocks_lock = vim.fs.joinpath(temp_dir, "luarocks.lock")
+    local content = ([[
+return {
+    dependencies = %s
+}
+]]):format(vim.inspect(dependencies))
+    fs.write_file(luarocks_lock, "w", content)
+    return luarocks_lock
+end
+
+return lock

spec/operations_lock_spec.lua

@@ -0,0 +1,72 @@
+---@diagnostic disable: inject-field
+
+local lock = require("rocks.operations.lock")
+local fs = require("rocks.fs")
+local config = require("rocks.config.internal")
+
+local tempdir = vim.fs.dirname(vim.fn.tempname())
+assert(vim.fn.mkdir(tempdir, "p") == 1, "Failed to create tempdir " .. tempdir)
+
+describe("operations.lock", function()
+    it("Lockfile roundtrip", function()
+        config.lockfile_path = vim.fs.joinpath(tempdir, "rocks.lock")
+        local lockfile_content = [[
+[neorg]
+"pathlib.nvim" = "2.2.0-1"
+"plenary.nvim" = "0.1.4-1"
+say = "1.4.1-3"
+"nui.nvim" = "0.3.0-1"
+"lua-utils.nvim" = "1.0.2-1"
+luassert = "1.9.0-1"
+nvim-nio = "1.7.0-1"
+
+[neotest]
+luassert = "1.9.0-1"
+say = "1.4.1-3"
+"plenary.nvim" = "0.1.4-1"
+]]
+        fs.write_file(config.lockfile_path, "w", lockfile_content)
+        assert.same(lockfile_content, fs.read_or_create(config.lockfile_path, ""))
+        local neorg_lockfile = assert(lock.create_luarocks_lock("neorg"), "Failed to create neorg luarocks.lock")
+        local neorg_rtp_path = vim.fs.joinpath(tempdir, "neorg", "1.0.0-1")
+        vim.fn.mkdir(neorg_rtp_path, "p")
+        vim.uv.fs_symlink(neorg_lockfile, vim.fs.joinpath(neorg_rtp_path, "luarocks.lock"))
+        vim.opt.runtimepath:append(neorg_rtp_path)
+        local neotest_lockfile = assert(lock.create_luarocks_lock("neotest"), "Failed to create neotest luarocks.lock")
+        local neotest_rtp_path = vim.fs.joinpath(tempdir, "neotest", "1.0.0-1")
+        vim.fn.mkdir(neotest_rtp_path, "p")
+        vim.uv.fs_symlink(neotest_lockfile, vim.fs.joinpath(neotest_rtp_path, "luarocks.lock"))
+        vim.opt.runtimepath:append(neotest_rtp_path)
+        -- Reset lockfile path
+        config.lockfile_path = vim.fs.joinpath(vim.fs.dirname(vim.fn.tempname()), "rocks.lock")
+        lock.update_lockfile()
+        local roundtrip_content = fs.read_or_create(config.lockfile_path, "")
+        assert.same(lockfile_content, roundtrip_content)
+    end)
+    it("Excludes lua and dev dependencies", function()
+        local luarocks_lockfile_content = [[
+return {
+    dependencies = {
+        lua = "5.1-1",
+        luassert = "1.9.0-1",
+        say = "1.4.1-3",
+        "plenary.nvim" = "scm",
+    }
+}
+]]
+        local neotest_rtp_path = vim.fs.joinpath(tempdir, "neotest", "1.0.0-1")
+        local luarocks_lockfile_path = vim.fs.joinpath(neotest_rtp_path, "luarocks.lock")
+        fs.write_file(luarocks_lockfile_path, "w", luarocks_lockfile_content)
+        vim.opt.runtimepath:append(neotest_rtp_path)
+        config.lockfile_path = vim.fs.joinpath(vim.fs.dirname(vim.fn.tempname()), "rocks.lock")
+        lock.update_lockfile()
+        local expected_content = [[
+[neotest]
+luassert = "1.9.0-1"
+say = "1.4.1-3"
+"plenary.nvim" = "scm"
+]]
+        local lockfile_content = fs.read_or_create(config.lockfile_path, "")
+        assert.same(expected_content, lockfile_content)
+    end)
+end)