@quenty/observablecollection 12.40.0 → 12.42.0

package/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [12.42.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/observablecollection@12.41.0...@quenty/observablecollection@12.42.0) (2026-07-23)
+
+### Features
+
+- Add baseline player-mock and support across Nevermore for mocked players. ([567d121](https://github.com/Quenty/NevermoreEngine/commit/567d121ffc014b42391554088189a1a6296dda83))
+
+# [12.41.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/observablecollection@12.40.0...@quenty/observablecollection@12.41.0) (2026-07-18)
+
+### Bug Fixes
+
+- pin translation behavior with tests and fix camelCase key generation ([#737](https://github.com/Quenty/NevermoreEngine/issues/737)) ([1b7a536](https://github.com/Quenty/NevermoreEngine/commit/1b7a536dde7e124f8432e57612ec8138dd835d75))
+
 # [12.40.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/observablecollection@12.39.0...@quenty/observablecollection@12.40.0) (2026-07-18)
 
 **Note:** Version bump only for package @quenty/observablecollection

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/observablecollection",
-  "version": "12.40.0",
+  "version": "12.42.0",
   "description": "A set of observable collections, such as sets, maps, sorted lists, and more.",
   "keywords": [
     "Roblox",
@@ -30,28 +30,28 @@
     "Quenty"
   ],
   "dependencies": {
-    "@quenty/baseobject": "10.13.0",
+    "@quenty/baseobject": "10.15.0",
     "@quenty/binarysearch": "2.4.0",
-    "@quenty/brio": "14.31.0",
+    "@quenty/brio": "14.33.0",
     "@quenty/ducktype": "5.11.0",
-    "@quenty/instanceutils": "13.31.0",
+    "@quenty/instanceutils": "13.33.0",
     "@quenty/loader": "10.11.0",
-    "@quenty/maid": "3.9.0",
-    "@quenty/nevermore-test-runner": "1.4.0",
-    "@quenty/promise": "10.19.0",
-    "@quenty/rx": "13.29.0",
+    "@quenty/maid": "3.11.0",
+    "@quenty/nevermore-test-runner": "1.5.0",
+    "@quenty/promise": "10.21.0",
+    "@quenty/rx": "13.31.0",
     "@quenty/signal": "7.13.1",
-    "@quenty/steputils": "3.6.3",
+    "@quenty/steputils": "3.7.0",
     "@quenty/symbol": "3.5.2",
     "@quenty/table": "3.9.2",
-    "@quenty/valueobject": "13.32.0",
+    "@quenty/valueobject": "13.34.0",
     "@quentystudios/jest-lua": "3.10.0-quenty.2"
   },
   "devDependencies": {
-    "@quenty/blend": "12.38.0"
+    "@quenty/blend": "12.40.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "cbbb89635bfdcbf32f26a40422ac736292917cca"
+  "gitHead": "1de37218a2bedb8e3f8614a2e09bba9eddc812da"
 }

package/src/Shared/ObservableCountingMap.lua

@@ -327,8 +327,12 @@ function ObservableCountingMap.Add<T>(self: ObservableCountingMap<T>, key: T, am
 			-- Remove item
 			self._map[key] = nil
 
-			-- Fire events
-			self._totalKeyCountValue.Value = self._totalKeyCountValue.Value - 1
+			-- Fire events. The backing ValueObject may already be destroyed when a stored removal
+			-- callback fires during this map's own teardown, in which case its Value reads nil.
+			local totalKeyCount = self._totalKeyCountValue.Value
+			if totalKeyCount ~= nil then
+				self._totalKeyCountValue.Value = totalKeyCount - 1
+			end
 
 			if self.Destroy then
 				self.KeyRemoved:Fire(key)
@@ -348,8 +352,11 @@ function ObservableCountingMap.Add<T>(self: ObservableCountingMap<T>, key: T, am
 		-- Add item
 		self._map[key] = change
 
-		-- Fire events
-		self._totalKeyCountValue.Value = self._totalKeyCountValue.Value + 1
+		-- Fire events (see the removal branch for why Value may read nil here)
+		local totalKeyCount = self._totalKeyCountValue.Value
+		if totalKeyCount ~= nil then
+			self._totalKeyCountValue.Value = totalKeyCount + 1
+		end
 
 		if self.Destroy then
 			self.KeyAdded:Fire(key)

package/src/Shared/ObservableCountingMap.spec.lua

@@ -1,11 +1,9 @@
---!nonstrict
+--!strict
 --[[
 	@class ObservableCountingMap.spec.lua
 ]]
 
-local require = (require :: any)(
-		game:GetService("ServerScriptService"):FindFirstChild("LoaderUtils", true).Parent
-	).bootstrapStory(script) :: typeof(require(script.Parent.loader).load(script))
+local require = require(script.Parent.loader).load(script)
 
 local Jest = require("Jest")
 local ObservableCountingMap = require("ObservableCountingMap")

package/src/Shared/ObservableList.spec.lua

@@ -1,11 +1,9 @@
---!nonstrict
+--!strict
 --[[
 	@class ObservableList.spec.lua
 ]]
 
-local require = (require :: any)(
-		game:GetService("ServerScriptService"):FindFirstChild("LoaderUtils", true).Parent
-	).bootstrapStory(script) :: typeof(require(script.Parent.loader).load(script))
+local require = require(script.Parent.loader).load(script)
 
 local Jest = require("Jest")
 local ObservableList = require("ObservableList")
@@ -37,7 +35,7 @@ describe("ObservableList.new()", function()
 
 	it("should allow false as a value", function()
 		expect(observableList:Get(2)).toEqual(nil)
-		observableList:Add(false)
+		observableList:Add(false :: any)
 		expect(observableList:Get(2)).toEqual(false)
 	end)
 

package/src/Shared/ObservableMap.spec.lua

@@ -1,11 +1,9 @@
---!nonstrict
+--!strict
 --[[
 	@class ObservableMap.spec.lua
 ]]
 
-local require = (require :: any)(
-		game:GetService("ServerScriptService"):FindFirstChild("LoaderUtils", true).Parent
-	).bootstrapStory(script) :: typeof(require(script.Parent.loader).load(script))
+local require = require(script.Parent.loader).load(script)
 
 local Jest = require("Jest")
 local ObservableMap = require("ObservableMap")
@@ -39,9 +37,9 @@ describe("ObservableMap.new()", function()
 	end)
 
 	it("should allow false as a key", function()
-		expect(observableMap:Get(false)).toEqual(nil)
-		observableMap:Set(false, "Hello")
-		expect(observableMap:Get(false)).toEqual("Hello")
+		expect(observableMap:Get(false :: any)).toEqual(nil)
+		observableMap:Set(false :: any, "Hello")
+		expect(observableMap:Get(false :: any)).toEqual("Hello")
 	end)
 
 	it("should fire off events for a specific key", function()

package/src/Shared/ObservableMapList.spec.lua

@@ -1,11 +1,9 @@
---!nonstrict
+--!strict
 --[[
 	@class ObservableMapList.spec.lua
 ]]
 
-local require = (require :: any)(
-		game:GetService("ServerScriptService"):FindFirstChild("LoaderUtils", true).Parent
-	).bootstrapStory(script) :: typeof(require(script.Parent.loader).load(script))
+local require = require(script.Parent.loader).load(script)
 
 local Jest = require("Jest")
 local ObservableMapList = require("ObservableMapList")

package/src/Shared/SortedList/ObservableSortedList.spec.lua

@@ -3,9 +3,7 @@
 	@class ObservableSortedList.spec.lua
 ]]
 
-local require = (require :: any)(
-		game:GetService("ServerScriptService"):FindFirstChild("LoaderUtils", true).Parent
-	).bootstrapStory(script) :: typeof(require(script.Parent.loader).load(script))
+local require = require(script.Parent.loader).load(script)
 
 local Brio = require("Brio")
 local Jest = require("Jest")
@@ -59,8 +57,9 @@ describe("ObservableSortedList", function()
 		it("should accept an observable as sort value", function()
 			local maid = Maid.new()
 			local list = maid:Add(ObservableSortedList.new())
-			list:Add("b", Rx.of(2))
-			list:Add("a", Rx.of(1))
+			-- Cast: the recursive Observable type does not unify structurally inside Add's union.
+			list:Add("b", Rx.of(2) :: any)
+			list:Add("a", Rx.of(1) :: any)
 
 			expect(list:Get(1)).toEqual("a")
 			expect(list:Get(2)).toEqual("b")
@@ -121,7 +120,6 @@ describe("ObservableSortedList", function()
 
 			expect(list:GetList()).toEqual({ "a", "b", "c" })
 
-			-- Move A to the end
 			sortValueA.Value = 10
 
 			expect(list:GetList()).toEqual({ "b", "c", "a" })
@@ -158,7 +156,6 @@ describe("ObservableSortedList", function()
 			local maid = Maid.new()
 			local list = maid:Add(ObservableSortedListTestUtils.fromList({ "a", "b" }))
 
-			-- GetCount reads from _countValue which updates via deferred events
 			list:_testForceFireEvents()
 
 			expect(list:GetCount()).toEqual(2)
@@ -235,7 +232,6 @@ describe("ObservableSortedList", function()
 			expect(#seenIndices).toEqual(1)
 			expect(seenIndices[1]).toEqual(3)
 
-			-- Remove B (index 2). C should shift from 3 to 2
 			removeB()
 			list:_testForceFireEvents()
 
@@ -258,20 +254,17 @@ describe("ObservableSortedList", function()
 
 			expect(list:GetCount()).toEqual(5)
 
-			-- Observe index of the last element (E, currently at index 5)
 			local seenIndicesForE, sub = ObservableSortedListTestUtils.collectValues(list:ObserveIndex(5))
 
 			expect(#seenIndicesForE).toEqual(1)
 			expect(seenIndicesForE[1]).toEqual(5)
 
-			-- Remove B (index 2). This should shift C->2, D->3, E->4
 			removeB()
 			list:_testForceFireEvents()
 
 			expect(list:GetCount()).toEqual(4)
 			expect(list:GetList()).toEqual({ "a", "c", "d", "e" })
 
-			-- E should have been notified that its index changed from 5 to 4
 			expect(#seenIndicesForE).toEqual(2)
 			expect(seenIndicesForE[2]).toEqual(4)
 
@@ -294,7 +287,6 @@ describe("ObservableSortedList", function()
 			expect(#seenItems).toEqual(1)
 			expect(seenItems[1]).toEqual("b")
 
-			-- Remove B. Now C should be at index 2
 			removeB()
 			list:_testForceFireEvents()
 
@@ -332,7 +324,7 @@ describe("ObservableSortedList", function()
 			local removeA = list:Add("a", 1)
 			list:_testForceFireEvents()
 
-			local seenBrios: { Brio.Brio<string> } = {}
+			local seenBrios: { Brio.Brio<string, any> } = {}
 			local sub = list:ObserveItemsBrio():Subscribe(function(brio)
 				table.insert(seenBrios, brio)
 			end)
@@ -479,7 +471,6 @@ describe("ObservableSortedList", function()
 			local list = maid:Add(ObservableSortedList.new())
 			list:Add("a", 1)
 
-			-- Use Get to verify synchronously, since GetCount requires deferred events
 			expect(list:Get(1)).toEqual("a")
 
 			maid:Destroy()
@@ -604,7 +595,6 @@ describe("ObservableSortedList", function()
 			expect(#seenItems).toEqual(1)
 			expect(seenItems[1]).toEqual("b")
 
-			-- Remove A. B moves to index 1, index 2 is now empty
 			removeA()
 			list:_testForceFireEvents()
 
@@ -633,17 +623,14 @@ describe("ObservableSortedList", function()
 				fireCount += 1
 			end)
 
-			-- Initial fire on subscribe
 			expect(fireCount).toEqual(1)
 
-			-- Change all three sort values before deferring
 			sortValueA.Value = 30
 			sortValueB.Value = 20
 			sortValueC.Value = 10
 
 			list:_testForceFireEvents()
 
-			-- Should have batched into a single additional fire
 			expect(fireCount).toEqual(2)
 			expect(list:GetList()).toEqual({ "c", "b", "a" })
 
@@ -666,7 +653,6 @@ describe("ObservableSortedList", function()
 
 			expect(completed).toEqual(false)
 
-			-- Remove A (the tracked node at index 1)
 			removeA()
 			list:_testForceFireEvents()
 
@@ -682,7 +668,6 @@ describe("ObservableSortedList", function()
 
 			local seenBrios, sub = ObservableSortedListTestUtils.collectValues(list:ObserveItemsBrio())
 
-			-- Should already have brios without deferWait
 			expect(#seenBrios).toEqual(2)
 
 			sub:Destroy()
@@ -727,7 +712,6 @@ describe("ObservableSortedList", function()
 
 			expect(fireCount).toEqual(1)
 
-			-- Set to same value - should be a no-op
 			sortValue.Value = 2
 			list:_testForceFireEvents()
 
@@ -750,17 +734,14 @@ describe("ObservableSortedList", function()
 
 			expect(list:GetList()).toEqual({ "a", "b", "c" })
 
-			-- Change multiple times before defer fires
 			sortValue.Value = 10 -- a goes to end
 			sortValue.Value = 0 -- a goes back to start
 			sortValue.Value = 5 -- a ends up in the middle
 
-			-- Tree should reflect the final state synchronously
 			expect(list:GetList()).toEqual({ "b", "c", "a" })
 
 			list:_testForceFireEvents()
 
-			-- Should still be correct after events fire
 			expect(list:GetList()).toEqual({ "b", "c", "a" })
 
 			maid:Destroy()
@@ -782,15 +763,12 @@ describe("ObservableSortedList", function()
 			end)
 			expect(fireCount).toEqual(1)
 
-			-- Oscillate: move to end, then back to start
 			sortValue.Value = 10
 			sortValue.Value = 1
 
 			expect(list:GetList()).toEqual({ "a", "b", "c" })
 			list:_testForceFireEvents()
 
-			-- Events may or may not fire depending on span tracker,
-			-- but the list should be correct
 			expect(list:GetList()).toEqual({ "a", "b", "c" })
 
 			sub:Destroy()
@@ -813,7 +791,6 @@ describe("ObservableSortedList", function()
 
 			expect(list:GetList()).toEqual({ "a", "b", "c", "d" })
 
-			-- Reverse all sort values simultaneously
 			sortA.Value = 4
 			sortB.Value = 3
 			sortC.Value = 2
@@ -841,13 +818,10 @@ describe("ObservableSortedList", function()
 
 			expect(list:GetList()).toEqual({ "a", "b", "c" })
 
-			-- Move all to the same sort value
 			sortA.Value = 5
 			sortB.Value = 5
 			sortC.Value = 5
 
-			-- All have equal sort values - order may vary based on tree rotation,
-			-- but should be deterministic
 			local result = list:GetList()
 			expect(#result).toEqual(3)
 			expect(list:Contains("a")).toEqual(true)
@@ -870,11 +844,9 @@ describe("ObservableSortedList", function()
 			local seenIndices, sub = ObservableSortedListTestUtils.collectValues(list:ObserveIndex(2))
 			expect(seenIndices[1]).toEqual(2)
 
-			-- Change from 5 to 7 - still between 1 and 10, no movement needed
 			sortB.Value = 7
 			list:_testForceFireEvents()
 
-			-- Index should not have changed
 			expect(#seenIndices).toEqual(1)
 			expect(list:GetList()).toEqual({ "a", "b", "c" })
 
@@ -893,11 +865,9 @@ describe("ObservableSortedList", function()
 			list:Add("b", sortValue:Observe())
 			list:Add("c", 3)
 
-			-- B should not be in the tree since its sort value is nil
 			expect(list:GetList()).toEqual({ "a", "c" })
 			expect(list:Contains("b")).toEqual(false)
 
-			-- Now emit a real value - B should appear
 			sortValue.Value = 2
 			expect(list:GetList()).toEqual({ "a", "b", "c" })
 			expect(list:Contains("b")).toEqual(true)
@@ -916,12 +886,10 @@ describe("ObservableSortedList", function()
 
 			expect(list:GetList()).toEqual({ "a", "b", "c" })
 
-			-- Emit nil - B should be removed from tree
-			sortValue.Value = nil
+			sortValue.Value = nil :: any
 			expect(list:GetList()).toEqual({ "a", "c" })
 			expect(list:Contains("b")).toEqual(false)
 
-			-- Re-emit a value - B should come back
 			sortValue.Value = 2
 			expect(list:GetList()).toEqual({ "a", "b", "c" })
 
@@ -942,8 +910,7 @@ describe("ObservableSortedList", function()
 			expect(seenBrios[1]:IsDead()).toEqual(false)
 			expect(seenBrios[2]:IsDead()).toEqual(false)
 
-			-- Emit nil - B's brio should die
-			sortValue.Value = nil
+			sortValue.Value = nil :: any
 			list:_testForceFireEvents()
 
 			expect(seenBrios[2]:IsDead()).toEqual(true)
@@ -958,16 +925,14 @@ describe("ObservableSortedList", function()
 			local list = maid:Add(ObservableSortedList.new())
 
 			list:Add("a", 1)
-			list:Add("b", Rx.EMPTY)
+			list:Add("b", Rx.EMPTY :: any)
 			list:Add("c", 3)
 
-			-- B should never enter the tree
 			expect(list:GetList()).toEqual({ "a", "c" })
 			expect(list:Contains("b")).toEqual(false)
 
 			list:_testForceFireEvents()
 
-			-- Still not there after events fire
 			expect(list:GetList()).toEqual({ "a", "c" })
 
 			maid:Destroy()
@@ -984,15 +949,12 @@ describe("ObservableSortedList", function()
 
 			expect(list:GetList()).toEqual({ "a", "c" })
 
-			-- First appearance
 			sortValue.Value = 2
 			expect(list:GetList()).toEqual({ "a", "b", "c" })
 
-			-- Disappear
-			sortValue.Value = nil
+			sortValue.Value = nil :: any
 			expect(list:GetList()).toEqual({ "a", "c" })
 
-			-- Reappear at different position
 			sortValue.Value = 4
 			expect(list:GetList()).toEqual({ "a", "c", "b" })
 
@@ -1011,8 +973,7 @@ describe("ObservableSortedList", function()
 
 			expect(list:GetList()).toEqual({ "a", "b", "c" })
 
-			-- Go nil then come back in the same frame
-			sortValue.Value = nil
+			sortValue.Value = nil :: any
 			sortValue.Value = 2
 
 			expect(list:GetList()).toEqual({ "a", "b", "c" })
@@ -1040,13 +1001,11 @@ describe("ObservableSortedList", function()
 				removeCount += 1
 			end))
 
-			-- Add and remove before events fire
 			local remove = list:Add("b", 2)
 			remove()
 
 			list:_testForceFireEvents()
 
-			-- Should have cancelled out - no add or remove events
 			expect(addCount).toEqual(0)
 			expect(removeCount).toEqual(0)
 			expect(list:GetList()).toEqual({ "a" })
@@ -1065,12 +1024,10 @@ describe("ObservableSortedList", function()
 
 			expect(list:GetList()).toEqual({ "a", "b", "c" })
 
-			-- Remove while sort value is "live" - should cleanly unsubscribe
 			remove()
 
 			expect(list:GetList()).toEqual({ "a", "c" })
 
-			-- Sort value change after removal should have no effect
 			sortValue.Value = 10
 			expect(list:GetList()).toEqual({ "a", "c" })
 
@@ -1085,12 +1042,10 @@ describe("ObservableSortedList", function()
 
 			list:Add("a", 1)
 			list:Add("b", 2)
-			-- Don't wait - add more before events fire
 			list:Add("c", 3)
 
 			list:_testForceFireEvents()
 
-			-- All three should batch into one count update
 			expect(counts[1]).toEqual(0)
 			expect(counts[2]).toEqual(3)
 			expect(#counts).toEqual(2)
@@ -1115,7 +1070,6 @@ describe("ObservableSortedList", function()
 
 			list:_testForceFireEvents()
 
-			-- Net result: b, c, d (3 items)
 			expect(list:GetList()).toEqual({ "b", "c", "d" })
 			expect(counts[2]).toEqual(3)
 
@@ -1133,8 +1087,7 @@ describe("ObservableSortedList", function()
 
 			expect(list:GetList()).toEqual({ "a", "b" })
 
-			-- Set nil (removes from tree) then also call cleanup
-			sortValue.Value = nil
+			sortValue.Value = nil :: any
 			remove()
 
 			expect(list:GetList()).toEqual({ "a" })
@@ -1205,7 +1158,6 @@ describe("ObservableSortedList", function()
 			local indexChanges, sub = ObservableSortedListTestUtils.collectValues(list:ObserveIndex(2))
 			expect(#indexChanges).toEqual(1)
 
-			-- Change value but stay in same position (between 1 and 10)
 			sortB.Value = 8
 			list:_testForceFireEvents()
 
@@ -1229,7 +1181,6 @@ describe("ObservableSortedList", function()
 			local seenAtIndex1, sub = ObservableSortedListTestUtils.collectValues(list:ObserveAtIndex(1))
 			expect(seenAtIndex1[1]).toEqual("a")
 
-			-- Move A to the end
 			sortA.Value = 10
 			list:_testForceFireEvents()
 
@@ -1248,24 +1199,21 @@ describe("ObservableSortedList", function()
 			list:Add("b", sortValue:Observe())
 			list:_testForceFireEvents()
 
-			local seenBrios: { Brio.Brio<string> } = {}
+			local seenBrios: { Brio.Brio<string, any> } = {}
 			local sub = list:ObserveItemsBrio():Subscribe(function(brio)
 				table.insert(seenBrios, brio)
 			end)
 
 			expect(#seenBrios).toEqual(2)
 
-			-- Remove via nil
-			sortValue.Value = nil
+			sortValue.Value = nil :: any
 			list:_testForceFireEvents()
 
 			expect(seenBrios[2]:IsDead()).toEqual(true)
 
-			-- Re-add via value
 			sortValue.Value = 2
 			list:_testForceFireEvents()
 
-			-- Should have gotten a new brio
 			expect(#seenBrios).toEqual(3)
 			expect(seenBrios[3]:IsDead()).toEqual(false)
 
@@ -1282,7 +1230,6 @@ describe("ObservableSortedList", function()
 				maid:Destroy()
 			end))
 
-			-- Should not error when the list is destroyed during event firing
 			list:Add("a", 1)
 			list:_testForceFireEvents()
 
@@ -1317,7 +1264,6 @@ describe("ObservableSortedList", function()
 
 			expect(list:GetList()).toEqual({ "a", "b", "c", "d", "e" })
 
-			-- Move C to the end - a, b, d, e should keep their relative order
 			sortC.Value = 10
 
 			expect(list:GetList()).toEqual({ "a", "b", "d", "e", "c" })
@@ -1341,7 +1287,6 @@ describe("ObservableSortedList", function()
 
 			expect(list:GetList()).toEqual({ "a", "b", "c", "d", "e" })
 
-			-- Swap B and D's positions
 			sortB.Value = 4
 			sortD.Value = 2
 
@@ -1364,15 +1309,12 @@ describe("ObservableSortedList", function()
 			list:Add("d", 4)
 			local removeE = list:Add("e", 5)
 
-			-- Remove last
 			removeE()
 			expect(list:GetList()).toEqual({ "a", "b", "c", "d" })
 
-			-- Remove first
 			removeA()
 			expect(list:GetList()).toEqual({ "b", "c", "d" })
 
-			-- Remove middle
 			removeC()
 			expect(list:GetList()).toEqual({ "b", "d" })
 
@@ -1399,7 +1341,6 @@ describe("ObservableSortedList", function()
 			expect(#fires1).toEqual(1)
 			expect(#fires5).toEqual(1)
 
-			-- Move B past C and D: changed span [2, 4], indices 1, 5 unaffected
 			sortB.Value = 4.5
 			list:_testForceFireEvents()
 
@@ -1434,7 +1375,6 @@ describe("ObservableSortedList", function()
 			expect(#firesA).toEqual(1)
 			expect(#firesE).toEqual(1)
 
-			-- Move B past C and D: only span [2, 4] changed
 			sortB.Value = 4.5
 			list:_testForceFireEvents()
 
@@ -1531,7 +1471,6 @@ describe("ObservableSortedList", function()
 			expect(#fires1).toEqual(1)
 			expect(#fires2).toEqual(1)
 
-			-- Remove c from middle (index 3). Indices 1, 2 unaffected.
 			removeC()
 			list:_testForceFireEvents()
 
@@ -1555,7 +1494,6 @@ describe("ObservableSortedList", function()
 			list:Add("e", 5)
 			list:_testForceFireEvents()
 
-			-- Index 4 (currently "d") will shift to index 3 after c is removed
 			local fires4, sub4 = ObservableSortedListTestUtils.collectValues(list:ObserveAtIndex(4))
 			expect(#fires4).toEqual(1)
 			expect(fires4[1]).toEqual("d")
@@ -1564,7 +1502,6 @@ describe("ObservableSortedList", function()
 			list:_testForceFireEvents()
 
 			expect(list:GetList()).toEqual({ "a", "b", "d", "e" })
-			-- Index 4 should have fired — now contains "e" instead of "d"
 			expect(#fires4).toEqual(2)
 			expect(fires4[2]).toEqual("e")
 
@@ -1596,7 +1533,6 @@ describe("ObservableSortedList", function()
 			removeC()
 			list:_testForceFireEvents()
 
-			-- D shifted 4->3, E shifted 5->4
 			expect(#firesD).toEqual(2)
 			expect(firesD[2]).toEqual(3)
 			expect(#firesE).toEqual(2)
@@ -1626,14 +1562,12 @@ describe("ObservableSortedList", function()
 			expect(#fires4).toEqual(1)
 			expect(#fires5).toEqual(1)
 
-			-- Remove b at index 2, add f at index 2. Count unchanged, only index 2 content changed.
 			removeB()
 			list:Add("f", 2)
 			list:_testForceFireEvents()
 
 			expect(list:GetList()).toEqual({ "a", "f", "c", "d", "e" })
 
-			-- Indices 3-5 unchanged — should not fire
 			expect(#fires3).toEqual(1)
 			expect(#fires4).toEqual(1)
 			expect(#fires5).toEqual(1)
@@ -1668,7 +1602,6 @@ describe("ObservableSortedList", function()
 			expect(#firesD).toEqual(1)
 			expect(#firesE).toEqual(1)
 
-			-- Replace b with f at same index. C, D, E positions unchanged.
 			removeB()
 			list:Add("f", 2)
 			list:_testForceFireEvents()
@@ -1695,20 +1628,16 @@ describe("ObservableSortedList", function()
 			list:Add("e", 5)
 			list:_testForceFireEvents()
 
-			-- Observe index 3 (currently "c")
 			local fires3, sub3 = ObservableSortedListTestUtils.collectValues(list:ObserveAtIndex(3))
 			expect(#fires3).toEqual(1)
 			expect(fires3[1]).toEqual("c")
 
-			-- Remove b (index 2), add f at index 4. Count unchanged, but index 3 shifts: c was at 3, now d is at 3
 			removeB()
 			list:Add("f", 4.5)
 			list:_testForceFireEvents()
 
-			-- List is now: a, c, d, f, e
 			expect(list:GetList()).toEqual({ "a", "c", "d", "f", "e" })
 
-			-- Index 3 changed from "c" to "d" — must fire
 			expect(#fires3).toEqual(2)
 			expect(fires3[2]).toEqual("d")
 
@@ -1737,15 +1666,12 @@ describe("ObservableSortedList", function()
 			expect(firesC[1]).toEqual(3)
 			expect(firesD[1]).toEqual(4)
 
-			-- Remove b (index 2), add f at index 4.5. Count unchanged, but c shifts 3->2, d shifts 4->3
 			removeB()
 			list:Add("f", 4.5)
 			list:_testForceFireEvents()
 
-			-- List is now: a, c, d, f, e
 			expect(list:GetList()).toEqual({ "a", "c", "d", "f", "e" })
 
-			-- C shifted 3->2, D shifted 4->3
 			expect(#firesC).toEqual(2)
 			expect(firesC[2]).toEqual(2)
 			expect(#firesD).toEqual(2)
@@ -1770,25 +1696,20 @@ describe("ObservableSortedList", function()
 			local fires3, sub3 = ObservableSortedListTestUtils.collectValues(list:ObserveAtIndex(3))
 			expect(fires3[1]).toEqual("c")
 
-			-- Remove b (index 2) and d (index 4), add f (1.5) and g (4.5). Count unchanged.
 			removeB()
 			removeD()
 			list:Add("f", 1.5)
 			list:Add("g", 4.5)
 			list:_testForceFireEvents()
 
-			-- List: a, f, c, g, e
 			expect(list:GetList()).toEqual({ "a", "f", "c", "g", "e" })
 
-			-- Index 3 still has "c" — should not fire extra
 			expect(#fires3).toEqual(1)
 
 			sub3:Destroy()
 			maid:Destroy()
 		end)
 
-		-- Should-fire tests: verify events ARE emitted when content/index actually changes
-
 		it("should fire ObserveAtIndex for ALL shifted indices when removing from beginning", function()
 			local maid = Maid.new()
 			local list = maid:Add(ObservableSortedList.new())
@@ -1810,7 +1731,6 @@ describe("ObservableSortedList", function()
 			removeA()
 			list:_testForceFireEvents()
 
-			-- Every index shifted: a removed, b->1, c->2, d->3
 			expect(list:GetList()).toEqual({ "b", "c", "d" })
 			expect(#fires1).toEqual(2)
 			expect(fires1[2]).toEqual("b")
@@ -1848,7 +1768,6 @@ describe("ObservableSortedList", function()
 			removeC()
 			list:_testForceFireEvents()
 
-			-- List: a, d, e — indices 2-4 all changed
 			expect(list:GetList()).toEqual({ "a", "d", "e" })
 			expect(#fires2).toEqual(2)
 			expect(fires2[2]).toEqual("d")
@@ -1883,7 +1802,6 @@ describe("ObservableSortedList", function()
 			list:Add("a", 1)
 			list:_testForceFireEvents()
 
-			-- List: a, b, c, d — everything shifted right
 			expect(list:GetList()).toEqual({ "a", "b", "c", "d" })
 			expect(#fires1).toEqual(2)
 			expect(fires1[2]).toEqual("a")
@@ -1922,7 +1840,6 @@ describe("ObservableSortedList", function()
 			expect(firesC[1]).toEqual(3)
 			expect(firesD[1]).toEqual(4)
 
-			-- Move A from index 1 to index 4 — all others shift left
 			sortA.Value = 10
 			list:_testForceFireEvents()
 
@@ -1940,8 +1857,6 @@ describe("ObservableSortedList", function()
 			maid:Destroy()
 		end)
 
-		-- Should-NOT-fire tests: verify events are NOT emitted when nothing changed at the observed position
-
 		it("should not fire ObserveAtIndex when remove+add cancel out at the same index", function()
 			local maid = Maid.new()
 			local list = maid:Add(ObservableSortedList.new())
@@ -1960,7 +1875,6 @@ describe("ObservableSortedList", function()
 			expect(fires3[1]).toEqual("c")
 			expect(fires4[1]).toEqual("d")
 
-			-- Remove b (index 2), add f at same sort position. c, d stay put.
 			removeB()
 			list:Add("f", 2)
 			list:_testForceFireEvents()
@@ -1996,7 +1910,6 @@ describe("ObservableSortedList", function()
 			expect(fires2[1]).toEqual("b")
 			expect(fires3[1]).toEqual("c")
 
-			-- Move D past E: only indices 4 and 5 change
 			sortD.Value = 6
 			list:_testForceFireEvents()
 
@@ -2034,14 +1947,12 @@ describe("ObservableSortedList", function()
 				expect(firesA[1]).toEqual(1)
 				expect(firesE[1]).toEqual(5)
 
-				-- Remove b and c (indices 2-3), add f(2) and g(3). Count stays at 5.
 				removeB()
 				removeC()
 				list:Add("f", 2)
 				list:Add("g", 3)
 				list:_testForceFireEvents()
 
-				-- List: a, f, g, d, e — A at 1 and E at 5, unchanged
 				expect(list:GetList()).toEqual({ "a", "f", "g", "d", "e" })
 				expect(#firesA).toEqual(1)
 				expect(#firesE).toEqual(1)
@@ -2073,15 +1984,12 @@ describe("ObservableSortedList", function()
 				expect(fires3[1]).toEqual("c")
 				expect(fires4[1]).toEqual("d")
 
-				-- Remove first and last: a(1) and e(5). Add f(0.5) at beginning and g(5.5) at end.
-				-- Net effect: f replaces a's slot, g replaces e's slot. Middle is untouched.
 				removeA()
 				removeE()
 				list:Add("f", 0.5)
 				list:Add("g", 5.5)
 				list:_testForceFireEvents()
 
-				-- List: f, b, c, d, g — indices 2, 3, 4 unchanged
 				expect(list:GetList()).toEqual({ "f", "b", "c", "d", "g" })
 				expect(#fires2).toEqual(1)
 				expect(#fires3).toEqual(1)
@@ -2115,13 +2023,10 @@ describe("ObservableSortedList", function()
 			expect(fires3[1]).toEqual("c")
 			expect(fires4[1]).toEqual("d")
 
-			-- Swap a and b (sort 1<->2), swap d and e (sort 4<->5). Index 3 unchanged.
 			sortA.Value = 2.5
 			sortE.Value = 3.5
 			list:_testForceFireEvents()
 
-			-- List: b, a, e, c, d  -- wait, let me reconsider
-			-- Actually a at 2.5, e at 3.5: b(2), a(2.5), c(3), e(3.5), d(4)
 			expect(list:GetList()).toEqual({ "b", "a", "c", "e", "d" })
 			expect(#fires3).toEqual(1)
 
@@ -2150,15 +2055,12 @@ describe("ObservableSortedList", function()
 				local firesC, subC = ObservableSortedListTestUtils.collectValues(list:ObserveIndexByKey(nodeC))
 				expect(firesC[1]).toEqual(3)
 
-				-- Remove a (before c), remove e (after c). Add f(0.5) before c, add g(5.5) after c.
-				-- C stays at index 3.
 				removeA()
 				removeE()
 				list:Add("f", 0.5)
 				list:Add("g", 5.5)
 				list:_testForceFireEvents()
 
-				-- List: f, b, c, d, g — c is still at index 3
 				expect(list:GetList()).toEqual({ "f", "b", "c", "d", "g" })
 				expect(#firesC).toEqual(1)
 
@@ -2169,14 +2071,7 @@ describe("ObservableSortedList", function()
 	end)
 
 	describe("coordinate system correctness", function()
-		-- These tests reproduce scenarios where intermediate tree mutations cause
-		-- span indices to be recorded in different coordinate systems, potentially
-		-- leading to under-firing (missed notifications).
-
 		it("should fire ObserveAtIndex for tail index when two removes collapse recorded indices", function()
-			-- Removing d then e records removed index 4 twice (from different tree states),
-			-- losing the information that e was originally at index 5. The effective span
-			-- must still cover index 5.
 			local maid = Maid.new()
 			local list = maid:Add(ObservableSortedList.new())
 
@@ -2190,18 +2085,14 @@ describe("ObservableSortedList", function()
 			local fires5, sub5 = ObservableSortedListTestUtils.collectValues(list:ObserveAtIndex(5))
 			expect(fires5[1]).toEqual("e")
 
-			-- Remove d (index 4 in 5-element tree), then e (index 4 in 4-element tree).
-			-- Add f(1.5) and g(2.5). Count stays at 5.
 			removeD()
 			removeE()
 			list:Add("f", 1.5)
 			list:Add("g", 2.5)
 			list:_testForceFireEvents()
 
-			-- List: a, f, b, g, c — index 5 changed from "e" to "c"
 			expect(list:GetList()).toEqual({ "a", "f", "b", "g", "c" })
 
-			-- Index 5 MUST fire — content changed from "e" to "c"
 			expect(#fires5).toEqual(2)
 			expect(fires5[2]).toEqual("c")
 
@@ -2210,8 +2101,6 @@ describe("ObservableSortedList", function()
 		end)
 
 		it("should fire ObserveIndexByKey for node shifted beyond recorded span", function()
-			-- When two removes from the end record the same intermediate index,
-			-- the span may not extend far enough to cover nodes that shifted.
 			local maid = Maid.new()
 			local list = maid:Add(ObservableSortedList.new())
 
@@ -2229,15 +2118,12 @@ describe("ObservableSortedList", function()
 			local firesF, subF = ObservableSortedListTestUtils.collectValues(list:ObserveIndexByKey(nodeF))
 			expect(firesF[1]).toEqual(6)
 
-			-- Remove d (index 4 in 6-element tree), then e (index 4 in 5-element tree).
-			-- Count goes from 6 to 4. F shifts from index 6 to index 4.
 			removeD()
 			removeE()
 			list:_testForceFireEvents()
 
 			expect(list:GetList()).toEqual({ "a", "b", "c", "f" })
 
-			-- F MUST be notified: its index changed from 6 to 4
 			expect(#firesF).toEqual(2)
 			expect(firesF[2]).toEqual(4)
 
@@ -2246,8 +2132,6 @@ describe("ObservableSortedList", function()
 		end)
 
 		it("should fire ObserveAtIndex for all affected indices when three consecutive items are removed", function()
-			-- Removing items 3, 4, 5 sequentially records indices 3, 3, 3 in intermediate
-			-- tree states, but indices 4 and 5 also changed content.
 			local maid = Maid.new()
 			local list = maid:Add(ObservableSortedList.new())
 
@@ -2266,20 +2150,16 @@ describe("ObservableSortedList", function()
 			expect(fires4[1]).toEqual("d")
 			expect(fires5[1]).toEqual("e")
 
-			-- Remove c, d, e. Each removal records index 3 in the shrinking tree.
 			removeC()
 			removeD()
 			removeE()
 			list:_testForceFireEvents()
 
-			-- List: a, b, f, g — indices 4 and 5 changed
 			expect(list:GetList()).toEqual({ "a", "b", "f", "g" })
 
-			-- Index 4 changed from "d" to "g"
 			expect(#fires4).toEqual(2)
 			expect(fires4[2]).toEqual("g")
 
-			-- Index 5 went out of bounds — must fire nil
 			expect(#fires5).toEqual(2)
 			expect(fires5[2]).toEqual(NIL_VALUE)
 
@@ -2289,8 +2169,6 @@ describe("ObservableSortedList", function()
 		end)
 
 		it("should fire ObserveAtIndex when adding at beginning shifts tail beyond recorded add index", function()
-			-- Adding three items at sort values 0.1, 0.2, 0.3 records add indices 1, 2, 3
-			-- in intermediate trees. But the original item at index 3 shifts to index 6.
 			local maid = Maid.new()
 			local list = maid:Add(ObservableSortedList.new())
 
@@ -2302,16 +2180,13 @@ describe("ObservableSortedList", function()
 			local fires3, sub3 = ObservableSortedListTestUtils.collectValues(list:ObserveAtIndex(3))
 			expect(fires3[1]).toEqual("c")
 
-			-- Add three items before everything. Each records a low add index.
 			list:Add("x", 0.1)
 			list:Add("y", 0.2)
 			list:Add("z", 0.3)
 			list:_testForceFireEvents()
 
-			-- List: x, y, z, a, b, c — index 3 changed from "c" to "z"
 			expect(list:GetList()).toEqual({ "x", "y", "z", "a", "b", "c" })
 
-			-- Index 3 MUST fire — content changed from "c" to "z"
 			expect(#fires3).toEqual(2)
 			expect(fires3[2]).toEqual("z")
 
@@ -2320,8 +2195,6 @@ describe("ObservableSortedList", function()
 		end)
 
 		it("should fire ObserveIndexByKey when multiple removes from same position shift a distant node", function()
-			-- Removing 3 items at position 1 records index 1 three times.
-			-- A node originally at index 5 should shift to index 2.
 			local maid = Maid.new()
 			local list = maid:Add(ObservableSortedList.new())
 
@@ -2338,7 +2211,6 @@ describe("ObservableSortedList", function()
 			local firesE, subE = ObservableSortedListTestUtils.collectValues(list:ObserveIndexByKey(nodeE))
 			expect(firesE[1]).toEqual(5)
 
-			-- Remove a, b, c. Each records removal at index 1 in the shrinking tree.
 			removeA()
 			removeB()
 			removeC()
@@ -2346,7 +2218,6 @@ describe("ObservableSortedList", function()
 
 			expect(list:GetList()).toEqual({ "d", "e" })
 
-			-- E shifted from 5 to 2 — must be notified
 			expect(#firesE).toEqual(2)
 			expect(firesE[2]).toEqual(2)
 

package/src/Shared/SortedList/SortFunctionUtils.spec.lua

@@ -3,9 +3,7 @@
 	@class SortFunctionUtils.spec.lua
 ]]
 
-local require = (require :: any)(
-		game:GetService("ServerScriptService"):FindFirstChild("LoaderUtils", true).Parent
-	).bootstrapStory(script) :: typeof(require(script.Parent.loader).load(script))
+local require = require(script.Parent.loader).load(script)
 
 local Jest = require("Jest")
 local SortFunctionUtils = require("SortFunctionUtils")
@@ -59,7 +57,7 @@ describe("SortFunctionUtils", function()
 	describe("emptyIterator", function()
 		it("should return nothing", function()
 			local count = 0
-			for _ in SortFunctionUtils.emptyIterator do
+			for _ in SortFunctionUtils.emptyIterator :: any do
 				count += 1
 			end
 			expect(count).toEqual(0)

package/src/Shared/SortedList/SortedNode.spec.lua

@@ -3,9 +3,7 @@
 	@class SortedNode.spec.lua
 ]]
 
-local require = (require :: any)(
-		game:GetService("ServerScriptService"):FindFirstChild("LoaderUtils", true).Parent
-	).bootstrapStory(script) :: typeof(require(script.Parent.loader).load(script))
+local require = require(script.Parent.loader).load(script)
 
 local Jest = require("Jest")
 local SortedNode = require("SortedNode")
@@ -114,7 +112,6 @@ describe("SortedNode", function()
 			second.value = 1
 			root = root:InsertNode(second)
 
-			-- Both should be present
 			expect(root.descendantCount).toEqual(2)
 
 			local result = {}
@@ -278,7 +275,6 @@ describe("SortedNode", function()
 	describe("NeedsToMove", function()
 		it("should return false when value stays valid relative to neighbors", function()
 			local root, nodes = buildTree({ 1, 3, 5 })
-			-- nodes[2] = "c" (value=3), between 1 and 5
 
 			expect(nodes[2]:NeedsToMove(root, 2)).toEqual(false)
 			expect(nodes[2]:NeedsToMove(root, 4)).toEqual(false)
@@ -287,7 +283,6 @@ describe("SortedNode", function()
 		it("should return true when value violates parent constraint", function()
 			local root, nodes = buildTree({ 1, 3, 5 })
 
-			-- Try to move "a" (value=1, leftmost) past its parent
 			expect(nodes[1]:NeedsToMove(root, 100)).toEqual(true)
 		end)
 
@@ -373,7 +368,6 @@ describe("SortedNode", function()
 				table.insert(result, node.data)
 			end
 
-			-- -2 means up to second-to-last (index 4)
 			expect(result).toEqual({ "a", "b", "c", "d" })
 		end)
 
@@ -412,7 +406,6 @@ describe("SortedNode", function()
 		it("should maintain sorted order through a sequence of inserts and removes", function()
 			local root, nodes = buildTree({ 5, 2, 8, 1, 3, 7, 9 })
 
-			-- Remove some internal nodes
 			root = root:RemoveNode(nodes[3]) -- value=8
 			root = root:RemoveNode(nodes[4]) -- value=1
 
@@ -425,25 +418,18 @@ describe("SortedNode", function()
 		end)
 
 		it("should maintain sorted order when swapping two nodes' values via remove-reinsert", function()
-			-- Simulates what ObservableSortedList does when two sort values swap:
-			-- Tree: a(1), b(2), c(3), d(4), e(5)
-			-- Swap B(2→4) and D(4→2)
-			-- Expected result: a(1), d(2), c(3), b(4), e(5)
 			local root, nodes = buildTree({ 1, 2, 3, 4, 5 })
 			local nodeB = nodes[2] -- data="b", value=2
 			local nodeD = nodes[4] -- data="d", value=4
 
-			-- Step 1: Move B from 2 to 4 (remove, change value, reinsert)
 			root = root:RemoveNode(nodeB)
 			nodeB.value = 4
 			root = root:InsertNode(nodeB)
 
-			-- Step 2: Move D from 4 to 2 (remove, change value, reinsert)
 			root = root:RemoveNode(nodeD)
 			nodeD.value = 2
 			root = root:InsertNode(nodeD)
 
-			-- Should be sorted: a(1), d(2), c(3), b(4), e(5)
 			local result = {}
 			for _, data in root:IterateData() do
 				table.insert(result, data)
@@ -453,13 +439,10 @@ describe("SortedNode", function()
 		end)
 
 		it("should maintain sorted order when swapping via NeedsToMove gated remove-reinsert", function()
-			-- Same as above but uses NeedsToMove to gate whether to remove-reinsert,
-			-- matching the exact logic of ObservableSortedList._assignSortValue
 			local root, nodes = buildTree({ 1, 2, 3, 4, 5 })
 			local nodeB = nodes[2] -- data="b", value=2
 			local nodeD = nodes[4] -- data="d", value=4
 
-			-- Step 1: Move B from 2 to 4
 			if nodeB:NeedsToMove(root, 4) then
 				root = root:RemoveNode(nodeB)
 				nodeB.value = 4
@@ -468,7 +451,6 @@ describe("SortedNode", function()
 				nodeB.value = 4
 			end
 
-			-- Step 2: Move D from 4 to 2
 			if nodeD:NeedsToMove(root, 2) then
 				root = root:RemoveNode(nodeD)
 				nodeD.value = 2
@@ -477,7 +459,6 @@ describe("SortedNode", function()
 				nodeD.value = 2
 			end
 
-			-- Should be sorted: a(1), d(2), c(3), b(4), e(5)
 			local result = {}
 			for _, data in root:IterateData() do
 				table.insert(result, data)

package/src/Shared/SortedList/SortedNodeValue.lua

@@ -70,6 +70,13 @@ function SortedNodeValue.__lt<T>(self: SortedNodeValue<T>, other: SortedNodeValu
 	return self._compare(self._value, other._value) < 0
 end
 
+function SortedNodeValue.__le<T>(self: SortedNodeValue<T>, other: SortedNodeValue<T>): boolean
+	assert(SortedNodeValue.isSortedNodeValue(other), "Bad other")
+	assert(other._compare == self._compare, "Bad compare")
+
+	return self._compare(self._value, other._value) <= 0
+end
+
 function SortedNodeValue.__gt<T>(self: SortedNodeValue<T>, other: SortedNodeValue<T>): boolean
 	assert(SortedNodeValue.isSortedNodeValue(other), "Bad other")
 	assert(other._compare == self._compare, "Bad compare")

package/src/Shared/SortedList/SortedNodeValue.spec.lua

@@ -3,9 +3,7 @@
 	@class SortedNodeValue.spec.lua
 ]]
 
-local require = (require :: any)(
-		game:GetService("ServerScriptService"):FindFirstChild("LoaderUtils", true).Parent
-	).bootstrapStory(script) :: typeof(require(script.Parent.loader).load(script))
+local require = require(script.Parent.loader).load(script)
 
 local Jest = require("Jest")
 local SortFunctionUtils = require("SortFunctionUtils")

package/src/Shared/SortedList/UnifiedChangedSpanTracker.spec.lua

@@ -3,9 +3,7 @@
 	@class UnifiedChangedSpanTracker.spec.lua
 ]]
 
-local require = (require :: any)(
-		game:GetService("ServerScriptService"):FindFirstChild("LoaderUtils", true).Parent
-	).bootstrapStory(script) :: typeof(require(script.Parent.loader).load(script))
+local require = require(script.Parent.loader).load(script)
 
 local Jest = require("Jest")
 local UnifiedChangedSpanTracker = require("UnifiedChangedSpanTracker")
@@ -229,7 +227,6 @@ describe("UnifiedChangedSpanTracker", function()
 
 			local result = tracker:ComputeEffectiveSpans(5, 5)
 
-			-- Index 3 stays as item c, so it's not dirty
 			expect(UnifiedChangedSpanTracker.isIndexInSpan(result, 1)).toEqual(false)
 			expect(UnifiedChangedSpanTracker.isIndexInSpan(result, 2)).toEqual(true)
 			expect(UnifiedChangedSpanTracker.isIndexInSpan(result, 3)).toEqual(false)
@@ -298,7 +295,6 @@ describe("UnifiedChangedSpanTracker", function()
 			local result1 = tracker:ComputeEffectiveSpans(3, 4)
 			expect(#result1 > 0).toEqual(true)
 
-			-- Second call should return nothing since state was cleared
 			local result2 = tracker:ComputeEffectiveSpans(4, 4)
 			expect(#result2).toEqual(0)
 		end)
@@ -308,10 +304,6 @@ describe("UnifiedChangedSpanTracker", function()
 		it(
 			"should cover index 5 when two end-removes collapse to same recorded index and count is unchanged",
 			function()
-				-- List [a,b,c,d,e] (5 items)
-				-- Remove d at index 4 → [a,b,c,e], remove e at index 4 → [a,b,c]
-				-- Add f at index 2 → [a,f,b,c], add g at index 4 → [a,f,b,g,c]
-				-- Count stays 5. Both removes record index 4.
 				local tracker = UnifiedChangedSpanTracker.new()
 				tracker:LogRemove(4)
 				tracker:LogRemove(4)
@@ -320,7 +312,6 @@ describe("UnifiedChangedSpanTracker", function()
 
 				local result = tracker:ComputeEffectiveSpans(5, 5)
 
-				-- Index 5 changed content (was "e", now "c"). Must be covered.
 				expect(UnifiedChangedSpanTracker.isIndexInSpan(result, 1)).toEqual(false)
 				expect(UnifiedChangedSpanTracker.isIndexInSpan(result, 2)).toEqual(true)
 				expect(UnifiedChangedSpanTracker.isIndexInSpan(result, 3)).toEqual(true)
@@ -330,10 +321,6 @@ describe("UnifiedChangedSpanTracker", function()
 		)
 
 		it("should only cover edges when removing first and last and replacing at edges", function()
-			-- List [a,b,c,d,e] (5 items)
-			-- Remove a at 1 → [b,c,d,e], remove e at 4 → [b,c,d]
-			-- Add f at 1 → [f,b,c,d], add g at 5 → [f,b,c,d,g]
-			-- Count stays 5. Middle indices 2,3,4 are unchanged.
 			local tracker = UnifiedChangedSpanTracker.new()
 			tracker:LogRemove(1)
 			tracker:LogRemove(4)
@@ -350,7 +337,6 @@ describe("UnifiedChangedSpanTracker", function()
 		end)
 
 		it("should produce two separate spans for non-overlapping moves when count is unchanged", function()
-			-- Item at 2 moves to 3, item at 8 moves to 9. Count stays 10.
 			local tracker = UnifiedChangedSpanTracker.new()
 			tracker:LogMove(2, 3)
 			tracker:LogMove(8, 9)
@@ -368,10 +354,6 @@ describe("UnifiedChangedSpanTracker", function()
 		end)
 
 		it("should not dirty index 3 when removing two and adding two leaves c at index 3", function()
-			-- List [a,b,c,d,e] (5 items)
-			-- Remove b at index 2 → [a,c,d,e], remove d at index 3 → [a,c,e]
-			-- Add f at index 2 (sort 1.5) → [a,f,c,e], add g at index 4 (sort 4.5) → [a,f,c,g,e]
-			-- Index 3 still has c.
 			local tracker = UnifiedChangedSpanTracker.new()
 			tracker:LogRemove(2)
 			tracker:LogRemove(3)
@@ -388,10 +370,6 @@ describe("UnifiedChangedSpanTracker", function()
 		end)
 
 		it("should not dirty middle indices when removing first and last and adding at edges", function()
-			-- List [a,b,c,d,e] (5 items)
-			-- Remove a at index 1 → [b,c,d,e], remove e at index 4 → [b,c,d]
-			-- Add f at index 1 (sort 0.5) → [f,b,c,d], add g at index 5 (sort 5.5) → [f,b,c,d,g]
-			-- Indices 2,3,4 unchanged.
 			local tracker = UnifiedChangedSpanTracker.new()
 			tracker:LogRemove(1)
 			tracker:LogRemove(4)
@@ -408,10 +386,6 @@ describe("UnifiedChangedSpanTracker", function()
 		end)
 
 		it("should not dirty index 3 when two opposite-end moves leave middle unchanged", function()
-			-- List [a,b,c,d,e] (5 items)
-			-- a moves from index 1 → index 2 (sort 1 → 2.5): remove at 1, insert at 2
-			-- e moves from index 5 → index 4 (sort 5 → 3.5): remove at 5, insert at 4
-			-- List becomes [b,a,c,e,d]. Index 3 still has c.
 			local tracker = UnifiedChangedSpanTracker.new()
 			tracker:LogMove(1, 2)
 			tracker:LogMove(5, 4)
@@ -426,10 +400,6 @@ describe("UnifiedChangedSpanTracker", function()
 		end)
 
 		it("should dirty index 5 when two removes from end collapse and adds shift content", function()
-			-- List [a,b,c,d,e] (5 items)
-			-- Remove d at index 4 → [a,b,c,e], remove e at index 4 → [a,b,c]
-			-- Add f at index 2 (sort 1.5) → [a,f,b,c], add g at index 3 (sort 2.5) → [a,f,g,b,c]
-			-- Index 5 changed from "e" to "c".
 			local tracker = UnifiedChangedSpanTracker.new()
 			tracker:LogRemove(4)
 			tracker:LogRemove(4)