append numbered members when merging

Overriding numbered members is not intuitive.
Merging {1} and {2} should return {1,2} not {2}.

2 files changed, 16 insertions, 16 deletions

diff --git a/util.lua b/util.lua
index 6aa4b92..265c272 100644
--- a/util.lua
+++ b/util.lua
@@ -3,7 +3,7 @@
 -- @author Florian Fischer
 -- @author git-bruh <prathamIN@proton.me>
 -- @license GPL-3
--- @copyright 2024 Florian Fischer
+-- @copyright 2024-2025 Florian Fischer
 -- @copyright 2024 git-bruh <prathamIN@proton.me>
 local util = {}
 
@@ -345,30 +345,25 @@ end
 --- Recursively merge two tables.
 -- This method modifies the weak table, if this is not intended make sure you
 -- use a deep copy of the weak table.
--- The members of the strong table override members of the weak one.
+-- Named members of the strong table override members of the weak one.
+-- Numbered members get inserted into the weak table.
 -- @param weak table which's members are potentially overridden
 -- @param strong table which's members override ones from the weak table
 -- @return the merged table
 function util.table.merge(weak, strong)
-  -- merge named members
   for k, v in pairs(strong) do
-    -- potentially override the weak member
     if type(v) ~= 'table' then
-      weak[k] = v
+      if tonumber(k) then -- append numeric members
+        table.insert(weak, v)
+      else -- potentially override the weak member
+        weak[k] = v
+      end
+
     else
       weak[k] = util.table.merge(weak[k] or {}, v)
     end
   end
 
-  -- merge numbered members
-  for i, v in ipairs(strong) do
-    -- potentially override the weak member
-    if type(v) ~= 'table' then
-      weak[i] = v
-    else
-      weak[i] = util.table.merge(weak[i] or {}, v)
-    end
-  end
   return weak
 end
 
diff --git a/util_test.lua b/util_test.lua
index 661b9f5..63393b1 100755
--- a/util_test.lua
+++ b/util_test.lua
@@ -57,11 +57,16 @@ function test_table_merge() -- luacheck: ignore 111
   util.table.merge(t, t2)
 
   lunatest.assert_table(t)
-  lunatest.assert_len(2, t)
+  lunatest.assert_len(3, t)
+
+  lunatest.assert_equal(1, t[1])
+  lunatest.assert_equal(2, t[2])
+  lunatest.assert_equal(3, t[3])
+
   lunatest.assert_table(t.foo)
   lunatest.assert_len(2, t.foo)
 
-  lunatest.assert_equal(t[1], t2[1])
+  lunatest.assert_equal(t[3], t2[1])
   lunatest.assert_equal(t[2], 2)
 
   lunatest.assert_equal(t.foo.bar.bar, 'bar')