disabled packages were still getting force loaded

unkown options

doc/dep.txt

@@ -217,10 +217,17 @@ is equivalent to the following:
   load:cmd("Command", {
     callback = function()
       load:cleanup()
+
+      if (rerun) then
+	vim.cmd("Command")
+      end
     end
   })
 <
-If you wish the second argument may be completely ommitted.
+If you wish the second argument may be completely ommitted. Note the inclusion
+of a `rerun` field, this is a parameter which may be passed into the options table
+to re-run the binding after loading the package. You may choose to disable the
+built-in logic by passing false.
 
 ------------------------------------------------------------------------------
 LOAD:AUTO                                           *dep-lazy-loading-api-auto*

lua/dep/lazy/loader/init.lua

@@ -3,10 +3,10 @@ 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 command_ids string[] the commands that have been registered
----@field auto_ids table the auto commands that have been registered
+---@field auto_ids number[] the auto commands that have been registered
----@field keybind_ids table the keybinds that have been registered
+---@field keybind_ids table[] the keybinds that have been registered
----@field plugin_ids table the plugins that have been registered
+---@field plugin_ids table[] the plugins that have been registered
 local lazy_loader = {}
 
 --- create a new instance of lazy
@@ -37,6 +37,11 @@ end
 function lazy_loader:cmd(name, opts)
   opts = opts or {}
 
+  -- move the rerun arg to a seperate variable because keymap.set doesn't like
+  -- options it doesn't know of
+  local rerun = opts["rerun"] or true
+  opts['rerun'] = nil
+
   -- load the plugin on completion
   if not opts["complete"] then
     opts["complete"] = function(_, line, _)
@@ -52,6 +57,11 @@ function lazy_loader:cmd(name, opts)
 
   vim.api.nvim_create_user_command(name, opts['callback'] or function(_)
     self:cleanup()
+
+    -- attempt to rerun the command
+    if not rerun then
+      pcall(vim.cmd, name)
+    end
   end, opts)
 
   table.insert(self.command_ids, name)
@@ -133,29 +143,29 @@ end
 --- cleanup all the callbacks, and load the plugin
 function lazy_loader:cleanup()
   -- cleanup user commands
-  for _, command_id in pairs(self.command_ids) do
+  for _, command_id in ipairs(self.command_ids) do
     local ok, err = pcall(vim.api.nvim_del_user_command, command_id)
     if not ok then
       logger:log("lazy", err or "failed to delete user command")
     end
   end
   -- cleanup auto commands
-  for _, auto_id in pairs(self.auto_ids) do
+  for _, auto_id in ipairs(self.auto_ids) do
     local ok, err = pcall(vim.api.nvim_del_autocmd, auto_id)
     if not ok then
       logger:log("lazy", err or "failed to delete auto command")
     end
   end
   -- cleanup keymaps
-  for _, keybind_id in pairs(self.keybind_ids) do
+  for _, keybind_id in ipairs(self.keybind_ids) do
     local ok, err = pcall(vim.keymap.del, keybind_id.mode, keybind_id.bind, {})
     if not ok then
       logger:log("lazy", err or "failed to delete keymap")
     end
   end
   -- cleanup plugins
-  for _, plugin_id in pairs(self.plugin_ids) do
+  for _, plugin_id in ipairs(self.plugin_ids) do
-    table.remove(packager.get_packages()[plugin_id[0]], plugin_id[1])
+    table.remove(packager.get_packages()[plugin_id[1]].on_load, plugin_id[2])
   end
   -- load the plugin
   self:load()

lua/dep/package.lua

@@ -244,6 +244,10 @@ function package:ensureadded(force)
   --- load a package
   ---@param pkg package
   local function loadpkg(pkg)
+    if not self.enabled then
+      return false
+    end
+
     -- make sure to load the dependencies first
     for _, p in pairs(pkg.requirements) do
       if not p.loaded then
@@ -308,7 +312,7 @@ function package:ensureadded(force)
       if load_cond ~= true then
         local ok, err = pcall(load_cond, l)
         if not ok then
-          logger:log("lazy", "failed to register load conditions for '%s': %s",
+          logger:log("error", "failed to register lazy load conditions for '%s': %s",
             self.name, err)
         end
       end

lua/dep/ui/format.lua

@@ -20,16 +20,29 @@ end
 ---@param log_line string log line
 ---@return chunk[] chunks
 function format.log_line(log_line)
-  local log_time = string.sub( log_line, string.find(log_line, "%[") + 1,
+  -- make sure we don't do operations on nil values
+  if not log_line or log_line == "" then
+    return {}
+  end
+
+  -- error on any nil values, this should prevent us from parsing an incorrectly
+  -- formatted log line
+  local log_time, colon, log_path, log_path_ln, level, rest
+  local ok = pcall(function()
+    log_time = string.sub(log_line, string.find(log_line, "%[") + 1,
       string.find(log_line, "%]") - 1)
-  local colon = string.find(log_line, ":", 11)
+    colon = string.find(log_line, ":", 11)
-  local log_path = string.sub(log_line, string.find(log_line, "%]") + 2,
+    log_path = string.sub(log_line, string.find(log_line, "%]") + 2,
       colon - 1)
-  local log_path_ln = string.sub(log_line, colon + 1,
+    log_path_ln = string.sub(log_line, colon + 1,
       string.find(log_line, ":", colon + 1) - 1)
-  local level = string.sub(log_line, string.find(log_line, "%(") + 1,
+    level = string.sub(log_line, string.find(log_line, "%(") + 1,
       string.find(log_line, "%)") - 1)
-  local rest = string.sub(log_line, string.find(log_line, "%)") + 2)
+    rest = string.sub(log_line, string.find(log_line, "%)") + 2)
+  end)
+  if not ok then
+    return {}
+  end
 
   return {
     { "[", "" },

tests/dep_spec.lua

@@ -17,6 +17,14 @@ describe("ui log formatting", function()
       },
       dep_ui_format.log_line("[11:22:33] file.lua:1:(vim) some fancy message")
     )
+
+    -- malformed log line
+    assert.same({},
+      dep_ui_format.log_line("11:22:33] file.lua:1:(vim) some fancy message"))
+
+    -- test nil values
+    assert.same({}, dep_ui_format.log_line(""))
+    assert.same({}, dep_ui_format.log_line(nil))
   end)
 end)