From 198562e5ef0e96f438d2758c2b4290cc04a7ec10 Mon Sep 17 00:00:00 2001
From: Ukendio <ukendio@gmail.com>
Date: Fri, 9 Aug 2024 13:20:17 +0200
Subject: [PATCH] Add tests

---
 benches/deferring.luau               |   4 +--
 docs/public/1221187281139007539.webp | Bin 0 -> 2748 bytes
 src/init.luau                        |  38 ++++++++++++++++++---------
 test/tests.luau                      |   2 +-
 4 files changed, 29 insertions(+), 15 deletions(-)
 create mode 100644 docs/public/1221187281139007539.webp

diff --git a/benches/deferring.luau b/benches/deferring.luau
index fc5990b4..340a9f61 100644
--- a/benches/deferring.luau
+++ b/benches/deferring.luau
@@ -27,7 +27,7 @@ do TITLE "deferring"
         for i = 1, START(N) do
             world:defer()
 
-            for i = 1, 100 do
+            for i = 1, 10 do
                 local e = world:entity()
                 world:set(e, A, 1)
                 world:set(e, B, 1)
@@ -54,7 +54,7 @@ do TITLE "immediate"
 
     BENCH("", function()
         for i = 1, START(N) do
-            for i = 1, 100 do
+            for i = 1, 10 do
                 local e = world:entity()
                 world:set(e, A, 1)
                 world:set(e, B, 1)
diff --git a/docs/public/1221187281139007539.webp b/docs/public/1221187281139007539.webp
new file mode 100644
index 0000000000000000000000000000000000000000..54499a84130ff68e7b6a11d9d7e310ccf88e093d
GIT binary patch
literal 2748
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
C`g5iL

literal 0
HcmV?d00001

diff --git a/src/init.luau b/src/init.luau
index f635e187..72cfc100 100644
--- a/src/init.luau
+++ b/src/init.luau
@@ -755,6 +755,8 @@ local function world_merge(world: World)
     local entityIndex = world.entityIndex
     local sparse = entityIndex.sparse
     local staged = world.staged
+    local root = world.ROOT_ARCHETYPE
+
     for _, cmd in world.commands do
         local id = cmd.id
         local entity = cmd.entity
@@ -762,15 +764,17 @@ local function world_merge(world: World)
         local record = sparse[entity]
         local from = record.archetype
         if (bit32.band(kind, CMD_KIND_ADD)) ~= 0 then
-            local to = archetype_traverse_add(
-                world, id, from)
             local batch = staged[entity]
             if not batch then
-                batch = { values = {} }
+                batch = { values = {}, to = {} }
                 staged[entity] = batch
             end
 
-            batch.to = to
+            local to = batch.to
+            local at = find_insert(to, id)
+            if at ~= -1 then
+                table.insert(to, at, id)
+            end
 
             if kind == CMD_KIND_SET then
                 batch.values[id] = cmd.value
@@ -781,26 +785,36 @@ local function world_merge(world: World)
             end
             local batch = staged[entity]
             if not batch then
-                batch = { values = {} }
+                batch = { values = {}, to = {} }
                 staged[entity] = batch
             end
-            local to = archetype_traverse_remove(
-                world, id, from)
+            local at = table.find(to, id)
+            table.remove(to, at)
 
-            batch.to = to
             local values = batch.values
             values[id] = nil
         elseif kind == CMD_KIND_CLEAR then
-            if from then
-                entity_move(entityIndex, entity,
-                    record, world.ROOT_ARCHETYPE)
+            local batch = staged[entity]
+            if not batch then
+                batch = { values = {}, to = {} }
+                staged[entity] = batch
             end
+            batch.to = {}
         end
     end
     for entity, batch in staged do
         local record = sparse[entity]
-        local to = batch.to
         local from = record.archetype
+        local to = batch.to
+        if from then
+            for _, id in from.types do
+                to[#to + 1] = id
+            end
+            table.sort(to)
+        end
+
+        to = archetype_ensure(world, to, from)
+
         if from and (not from == to) then
             entity_move(entityIndex, entity, record, to)
         else
diff --git a/test/tests.luau b/test/tests.luau
index 0c127f75..daccfd1e 100644
--- a/test/tests.luau
+++ b/test/tests.luau
@@ -813,7 +813,7 @@ TEST("world:defer", function()
         world:add(e2, B)
 
         world:merge()
-        CHECK(world:has(e2, A))
+        print(CHECK(world:has(e2, A)))
         CHECK(world:has(e2, B))
     end
 end)