@quenty/observablecollection 10.0.0 → 11.0.0

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [11.0.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/observablecollection@10.0.0...@quenty/observablecollection@11.0.0) (2024-02-14)
+
+
+### Bug Fixes
+
+* Fix sorting errors ([43ac468](https://github.com/Quenty/NevermoreEngine/commit/43ac468dd49147011c04e9d61e08573fb543423c))
+
+
+
+
+
 # [10.0.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/observablecollection@9.0.0...@quenty/observablecollection@10.0.0) (2024-02-13)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/observablecollection",
-  "version": "10.0.0",
+  "version": "11.0.0",
   "description": "A set of observable collections, such as sets, maps, sorted lists, and more.",
   "keywords": [
     "Roblox",
@@ -45,5 +45,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f113de0adce246ebd8115adf49a80533ede329cc"
+  "gitHead": "77d0a0b5b59a512311fa07293fb573953fcacbeb"
 }

package/src/Shared/FilteredObservableListView.lua

@@ -15,7 +15,14 @@ FilteredObservableListView.__index = FilteredObservableListView
 
 -- Higher numbers last
 local function defaultCompare(a, b)
-	return a < b
+	-- equivalent of `return a - b` except it supports comparison of strings and stuff
+	if b > a then
+		return -1
+	elseif b < a then
+		return 1
+	else
+		return 0
+	end
 end
 
 function FilteredObservableListView.new(observableList, observeScoreCallback, compare)
@@ -25,15 +32,14 @@ function FilteredObservableListView.new(observableList, observeScoreCallback, co
 	self._baseList = assert(observableList, "No observableList")
 	self._observeScoreCallback = assert(observeScoreCallback, "No observeScoreCallback")
 
-	self._scoredList = ObservableSortedList.new(false, function(a, b)
+	self._scoredList = self._maid:Add(ObservableSortedList.new(false, function(a, b)
 		-- Preserve index when scoring does not
 		if a.score == b.score then
 			return a.index - b.index
 		else
 			return self._compare(a.score, b.score)
 		end
-	end)
-	self._maid:GiveTask(self._scoredList)
+	end))
 
 	-- Shockingly this is somewhat performant because the sorted list defers all events
 	-- to process the list reordering.
@@ -58,8 +64,6 @@ function FilteredObservableListView.new(observableList, observeScoreCallback, co
 				return state
 			end)
 		}))
-
-
 	end))
 
 	return self

package/src/Shared/ObservableSortedList.lua

@@ -632,7 +632,9 @@ function ObservableSortedList:_highBinarySearch(sortValue)
 	while true do
 		local mid = math.floor((minIndex + maxIndex) / 2)
 		local compareValue = self._compare(self._sortValue[self._keyList[mid]], sortValue)
-		assert(type(compareValue) == "number", "Expecting number")
+		if type(compareValue) ~= "number" then
+			error(string.format("Bad compareValue, expected number, got %q", type(compareValue)))
+		end
 
 		if self._isReversed then
 			compareValue = -compareValue