fix: use merged spec for pack_spec.version instead of first spec

Standalone spec version/branch was being overridden when a dependency
spec was processed first. Now resolve_all updates pack_spec.version.

Author: zuqini

lua/zpack/import.lua

@@ -14,23 +14,6 @@ local is_enabled = function(spec)
   return true
 end
 
----Normalize plugin version using priority: version > sem_version > branch > tag > commit
----@param spec zpack.Spec
----@return string|vim.VersionRange|nil version
-local normalize_version = function(spec)
-  if spec.version ~= nil then
-    return spec.version
-  elseif spec.sem_version then
-    return vim.version.range(spec.sem_version)
-  elseif spec.branch then
-    return spec.branch
-  elseif spec.tag then
-    return spec.tag
-  elseif spec.commit then
-    return spec.commit
-  end
-  return nil
-end
 
 ---Normalize plugin source using priority: [1] > src > url > dir
 ---@param spec zpack.Spec
@@ -186,7 +169,7 @@ M.import_specs = function(spec_item_or_list, ctx)
       table.insert(state.spec_registry[src].specs, spec)
     else
       state.spec_registry[src] = { specs = { spec }, load_status = "pending" }
-      local pack_spec = { src = src, version = normalize_version(spec), name = spec.name }
+      local pack_spec = { src = src, version = utils.normalize_version(spec), name = spec.name }
       table.insert(ctx.vim_packs, pack_spec)
       state.src_to_pack_spec[src] = pack_spec
     end

lua/zpack/merge.lua

@@ -231,13 +231,20 @@ function M.resolve_opts(specs, plugin)
 end
 
 ---Pre-compute merged_spec for all entries in the registry
+---Also updates pack_spec.version based on merged specs
 function M.resolve_all()
   local state = require('zpack.state')
+  local utils = require('zpack.utils')
 
-  for _, entry in pairs(state.spec_registry) do
+  for src, entry in pairs(state.spec_registry) do
     if entry.specs and #entry.specs > 0 then
       entry.sorted_specs = M.sort_specs(entry.specs)
       entry.merged_spec = M.merge_spec_array(entry.sorted_specs)
+
+      local pack_spec = state.src_to_pack_spec[src]
+      if pack_spec then
+        pack_spec.version = utils.normalize_version(entry.merged_spec)
+      end
     end
   end
 end

lua/zpack/utils.lua

@@ -161,6 +161,24 @@ M.normalize_name = function(name)
   return name:lower():gsub("^n?vim%-", ""):gsub("%.n?vim$", ""):gsub("[%.%-]lua", ""):gsub("[^a-z]+", "")
 end
 
+---Normalize plugin version using priority: version > sem_version > branch > tag > commit
+---@param spec zpack.Spec
+---@return string|vim.VersionRange|nil version
+M.normalize_version = function(spec)
+  if spec.version ~= nil then
+    return spec.version
+  elseif spec.sem_version then
+    return vim.version.range(spec.sem_version)
+  elseif spec.branch then
+    return spec.branch
+  elseif spec.tag then
+    return spec.tag
+  elseif spec.commit then
+    return spec.commit
+  end
+  return nil
+end
+
 ---Resolve the main module for a plugin (for auto-setup)
 ---Inspired by lazy.nvim's loader.get_main()
 ---Results are cached in plugin.main (for found modules) and state.resolve_main_not_found (for not-found)

tests/merge_test.lua

@@ -184,6 +184,70 @@ return function()
 
       helpers.cleanup_test_env()
     end)
+
+    helpers.test("standalone branch is not overridden by nil dependency branch", function()
+      helpers.setup_test_env()
+
+      require('zpack').setup({
+        spec = {
+          {
+            'test/parent',
+            dependencies = {
+              'test/dep',
+            },
+          },
+          {
+            'test/dep',
+            branch = 'main',
+          },
+        },
+        defaults = { confirm = false },
+      })
+
+      helpers.flush_pending()
+      local state = require('zpack.state')
+      local src = 'https://github.com/test/dep'
+
+      local merged_spec = state.spec_registry[src].merged_spec
+      helpers.assert_equal(merged_spec.branch, 'main', "standalone branch should be preserved")
+
+      local pack_spec = state.src_to_pack_spec[src]
+      helpers.assert_equal(pack_spec.version, 'main', "pack_spec.version should use merged branch")
+
+      helpers.cleanup_test_env()
+    end)
+
+    helpers.test("dependency branch is used when standalone has no branch", function()
+      helpers.setup_test_env()
+
+      require('zpack').setup({
+        spec = {
+          {
+            'test/parent',
+            dependencies = {
+              { 'test/dep', branch = 'develop' },
+            },
+          },
+          {
+            'test/dep',
+            config = function() end,
+          },
+        },
+        defaults = { confirm = false },
+      })
+
+      helpers.flush_pending()
+      local state = require('zpack.state')
+      local src = 'https://github.com/test/dep'
+
+      local merged_spec = state.spec_registry[src].merged_spec
+      helpers.assert_equal(merged_spec.branch, 'develop', "dependency branch should be used when standalone has none")
+
+      local pack_spec = state.src_to_pack_spec[src]
+      helpers.assert_equal(pack_spec.version, 'develop', "pack_spec.version should use dependency branch")
+
+      helpers.cleanup_test_env()
+    end)
   end)
 
   helpers.describe("Merge Module Unit Tests", function()