Allow users to lazy load on another package

lua/dep/lazy/loader/init.lua

@@ -1,10 +1,12 @@
 local logger = require('dep.log')
+local packager = require('dep.package')
 
 ---@class lazy_loader
 ---@field load function the function to load the plugin
 ---@field command_ids table the commands that have been registered
 ---@field auto_ids table the auto commands that have been registered
 ---@field keybind_ids table the keybinds that have been registered
+---@field plugin_ids table the plugins that have been registered
 local lazy_loader = {}
 
 --- create a new instance of lazy
@@ -16,6 +18,7 @@ function lazy_loader:new()
   o.command_ids = {}
   o.auto_ids = {}
   o.keybind_ids = {}
+  o.plugin_ids = {}
 
   self.__index = self
 
@@ -107,9 +110,29 @@ function lazy_loader:keymap(mode, bind, opts)
   table.insert(self.keybind_ids, { ['mode'] = mode, ['bind'] = bind })
 end
 
+--- load a plugin when another plugin loads
+---@param plugin string plugin name
+---@param opts table? options
+function lazy_loader:plugin(plugin, opts)
+  opts = opts or {}
+  opts["callback"] = opts["callback"] or function()
+    self:cleanup()
+  end
+
+  if packager.get_packages()[plugin].loaded then
+    opts["callback"]()
+  else
+    local on_load = packager.get_packages()[plugin].on_load
+    local on_load_idx = #on_load + 1
+    on_load[on_load_idx] = opts["callback"]
+
+    table.insert(self.plugin_ids, { plugin, on_load_idx })
+  end
+end
+
 --- cleanup all the callbacks, and load the plugin
 function lazy_loader:cleanup()
-    -- cleanup user commands
+  -- cleanup user commands
   for _, command_id in pairs(self.command_ids) do
     local ok, err = pcall(vim.api.nvim_del_user_command, command_id)
     if not ok then
@@ -130,6 +153,10 @@ function lazy_loader:cleanup()
       logger:log("lazy", err or "failed to delete keymap")
     end
   end
+  -- cleanup plugins
+  for _, plugin_id in pairs(self.plugin_ids) do
+    table.remove(packager.get_packages()[plugin_id[0]], plugin_id[1])
+  end
   -- load the plugin
   self:load()
 end

lua/dep/lazy/loader/short.lua

@@ -59,4 +59,14 @@ function short.keymap(mode, bind, opts)
   end
 end
 
+--- create a single plugin load event for when another plugin loads
+---@param plugin string plugin name
+---@param opts table? options
+---@return function callback
+function short.plugin(plugin, opts)
+  return function(load)
+    load:plugin(plugin, opts)
+  end
+end
+
 return short

lua/dep/package.lua

@@ -165,18 +165,10 @@ function package:new(spec, overrides)
       -- if the child package is lazy loaded make sure the child package
       -- is only loaded when the parent package has finished loading
       if o.lazy then
-        table.insert(o.on_load, function()
-          local ok = o:loadtree(true)
-          if not ok then
-            logger:log("lazy",
-              "failed to run loadtree for %s, some packages may not be loaded",
-              o.id)
-          end
-        end)
-
         -- tell the dep that it's gonna be lazy
         pkg.lazy = true
-        table.insert(pkg.lazy_load, function(_) end)
+        table.insert(pkg.lazy_load,
+          require("dep.lazy.loader.short").plugin(id))
       end
     end
   end