@quenty/observablecollection 12.14.0 → 12.14.1-canary.522.1d2faf4.0

package/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [12.14.1-canary.522.1d2faf4.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/observablecollection@12.14.0...@quenty/observablecollection@12.14.1-canary.522.1d2faf4.0) (2024-12-03)
+
+
+### Bug Fixes
+
+* ObservableSortedList fires removed indexes (note: Doesn't handle negatives right now) ([f1c068d](https://github.com/Quenty/NevermoreEngine/commit/f1c068dd206b6a624e97cab86bb18c39e800a79a))
+
+
+### Features
+
+* Return a cleanup method, even when amount is 0 ([8544c2b](https://github.com/Quenty/NevermoreEngine/commit/8544c2b9b5993de54d299ec8cbf4443b721af029))
+
+
+
+
+
 # [12.14.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/observablecollection@12.13.0...@quenty/observablecollection@12.14.0) (2024-11-13)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/observablecollection",
-  "version": "12.14.0",
+  "version": "12.14.1-canary.522.1d2faf4.0",
   "description": "A set of observable collections, such as sets, maps, sorted lists, and more.",
   "keywords": [
     "Roblox",
@@ -27,24 +27,24 @@
     "Quenty"
   ],
   "dependencies": {
-    "@quenty/baseobject": "^10.7.1",
-    "@quenty/brio": "^14.13.0",
-    "@quenty/ducktype": "^5.7.1",
-    "@quenty/loader": "^10.7.1",
-    "@quenty/maid": "^3.4.0",
-    "@quenty/promise": "^10.8.0",
-    "@quenty/rx": "^13.13.0",
-    "@quenty/signal": "^7.9.0",
-    "@quenty/steputils": "^3.5.2",
-    "@quenty/symbol": "^3.3.0",
-    "@quenty/table": "^3.7.0",
-    "@quenty/valueobject": "^13.13.0"
+    "@quenty/baseobject": "10.7.1",
+    "@quenty/brio": "14.13.1-canary.522.1d2faf4.0",
+    "@quenty/ducktype": "5.7.1",
+    "@quenty/loader": "10.7.1",
+    "@quenty/maid": "3.4.0",
+    "@quenty/promise": "10.8.0",
+    "@quenty/rx": "13.13.1-canary.522.1d2faf4.0",
+    "@quenty/signal": "7.9.0",
+    "@quenty/steputils": "3.5.2",
+    "@quenty/symbol": "3.3.1-canary.522.1d2faf4.0",
+    "@quenty/table": "3.7.0",
+    "@quenty/valueobject": "13.13.1-canary.522.1d2faf4.0"
   },
   "devDependencies": {
-    "@quenty/blend": "^12.13.0"
+    "@quenty/blend": "12.13.1-canary.522.1d2faf4.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "451334becfa36a10b55fa53cbdd88091cdf9ddbf"
+  "gitHead": "1d2faf48e778ada6f57aecb8000c7c6c76ac33cd"
 }

package/src/Shared/ObservableCountingMap.lua

@@ -271,18 +271,10 @@ end
 ]=]
 function ObservableCountingMap:Set(key, amount)
 	local current = self:Get(key)
-	if current == amount then
-		return
-	end
-
 	if current < amount then
 		self:Add(-(amount - current))
-		return
-	elseif current == amount then
-		return
-	else
+	elseif current > amount then
 		self:Add(current - amount)
-		return
 	end
 end
 
@@ -298,7 +290,9 @@ function ObservableCountingMap:Add(key, amount)
 	amount = amount or 1
 
 	if amount == 0 then
-		return
+		return function()
+
+		end
 	end
 
 	local oldValue = self._map[key]

package/src/Shared/SortedList/ObservableSortedList.lua

@@ -298,17 +298,14 @@ end
 function ObservableSortedList:ObserveAtIndex(indexToObserve)
 	assert(type(indexToObserve) == "number", "Bad indexToObserve")
 
-	return self._indexObservers:Observe(indexToObserve)
-		:Pipe({
-			Rx.start(function()
-				local node = self:_findNodeAtIndex(indexToObserve)
-				if node then
-					return node.data, node
-				else
-					return nil
-				end
-			end);
-		})
+	return self._indexObservers:Observe(indexToObserve, function(sub)
+		local node = self:_findNodeAtIndex(indexToObserve)
+		if node then
+			sub:Fire(node.data, node)
+		else
+			sub:Fire(nil, nil)
+		end
+	end)
 end
 
 --[=[
@@ -321,16 +318,12 @@ end
 function ObservableSortedList:ObserveIndexByKey(node)
 	assert(SortedNode.isSortedNode(node), "Bad node")
 
-	return self._nodeIndexObservables:Observe(node):Pipe({
-		Rx.startFrom(function()
-			local currentIndex = self:_findNodeIndex(node)
-			if currentIndex then
-				return { currentIndex }
-			else
-				return {}
-			end
-		end);
-	})
+	return self._nodeIndexObservables:Observe(node, function(sub)
+		local currentIndex = self:_findNodeIndex(node)
+		if currentIndex then
+			sub:Fire(currentIndex)
+		end
+	end)
 end
 
 --[=[
@@ -494,12 +487,11 @@ function ObservableSortedList:_fireEvents()
 	local nodesRemoved = self._nodesRemoved
 	self._nodesRemoved = {}
 
+	local lastCount = self._countValue.Value
+	local newCount = if self._root then self._root.descendantCount else 0
+
 	-- Fire count changed first
-	if self._root then
-		self._countValue.Value = self._root.descendantCount
-	else
-		self._countValue.Value = 0
-	end
+	self._countValue.Value = newCount
 
 	if not self.Destroy then return end
 
@@ -532,6 +524,12 @@ function ObservableSortedList:_fireEvents()
 			self._indexObservers:Fire(index, node.data, node)
 			self._indexObservers:Fire(negative, node.data, node)
 		end
+
+		for index=newCount+1, lastCount do
+			self._indexObservers:Fire(index, nil, nil)
+		end
+
+		-- TODO: Fire negatives beyond range
 	end
 
 	if not self.Destroy then return end