@quenty/observablecollection 12.3.1 → 12.4.0-canary.490.601c967.0

package/CHANGELOG.md

@@ -3,12 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [12.3.1](https://github.com/Quenty/NevermoreEngine/compare/@quenty/observablecollection@12.3.0...@quenty/observablecollection@12.3.1) (2024-07-16)
+# [12.4.0-canary.490.601c967.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/observablecollection@12.3.0...@quenty/observablecollection@12.4.0-canary.490.601c967.0) (2024-08-27)
 
 
-### Bug Fixes
+### Features
 
-* Using integer keys in w/ Observe methods in ObservableMap ([#470](https://github.com/Quenty/NevermoreEngine/issues/470)) ([59cf850](https://github.com/Quenty/NevermoreEngine/commit/59cf8508f4afe060bea7b07d70cb9e312dffe996))
+* Add ObservableCountingMap:ObservePairsBrio() and ObservableCountingMap:ObserveAtKey(key) ([b3baa09](https://github.com/Quenty/NevermoreEngine/commit/b3baa09563be96ccfd985496e833ad87a78bc953))
 
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/observablecollection",
-  "version": "12.3.1",
+  "version": "12.4.0-canary.490.601c967.0",
   "description": "A set of observable collections, such as sets, maps, sorted lists, and more.",
   "keywords": [
     "Roblox",
@@ -27,23 +27,23 @@
     "Quenty"
   ],
   "dependencies": {
-    "@quenty/baseobject": "^10.3.0",
-    "@quenty/brio": "^14.3.0",
-    "@quenty/ducktype": "^5.3.0",
-    "@quenty/loader": "^10.3.0",
-    "@quenty/maid": "^3.2.0",
-    "@quenty/promise": "^10.3.0",
-    "@quenty/rx": "^13.3.0",
-    "@quenty/signal": "^7.3.0",
-    "@quenty/steputils": "^3.4.0",
-    "@quenty/symbol": "^3.1.0",
-    "@quenty/valueobject": "^13.3.0"
+    "@quenty/baseobject": "10.4.0-canary.490.601c967.0",
+    "@quenty/brio": "14.4.0-canary.490.601c967.0",
+    "@quenty/ducktype": "5.4.0-canary.490.601c967.0",
+    "@quenty/loader": "10.4.0-canary.490.601c967.0",
+    "@quenty/maid": "3.2.0",
+    "@quenty/promise": "10.4.0-canary.490.601c967.0",
+    "@quenty/rx": "13.4.0-canary.490.601c967.0",
+    "@quenty/signal": "7.4.0-canary.490.601c967.0",
+    "@quenty/steputils": "3.4.0",
+    "@quenty/symbol": "3.1.0",
+    "@quenty/valueobject": "13.4.0-canary.490.601c967.0"
   },
   "devDependencies": {
-    "@quenty/blend": "^12.3.0"
+    "@quenty/blend": "12.4.0-canary.490.601c967.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7f8a9f3c05df360add0f774bb94048c6d43f6af8"
+  "gitHead": "601c9671f09638be4f326e41fcfe3343ccfe76d8"
 }

package/src/Shared/ObservableCountingMap.lua

@@ -11,6 +11,7 @@ local Maid = require("Maid")
 local Brio = require("Brio")
 local ValueObject = require("ValueObject")
 local DuckTypeUtils = require("DuckTypeUtils")
+local ObservableSubscriptionTable = require("ObservableSubscriptionTable")
 
 local ObservableCountingMap = {}
 ObservableCountingMap.ClassName = "ObservableCountingMap"
@@ -27,6 +28,7 @@ function ObservableCountingMap.new()
 	self._map = {}
 
 	self._totalKeyCountValue = self._maid:Add(ValueObject.new(0, "number"))
+	self._keySubTable = self._maid:Add(ObservableSubscriptionTable.new())
 
 --[=[
 	Fires when an key is added
@@ -104,7 +106,7 @@ function ObservableCountingMap:ObserveKeysSet()
 end
 
 function ObservableCountingMap:_observeDerivedDataStructureFromKeys(gatherValues)
-		return Observable.new(function(sub)
+	return Observable.new(function(sub)
 		local maid = Maid.new()
 
 		local function emit()
@@ -126,6 +128,55 @@ function ObservableCountingMap:_observeDerivedDataStructureFromKeys(gatherValues
 	end)
 end
 
+--[=[
+	Observes all keys in the map
+	@return Observable<Brio<(T, number)>>
+]=]
+function ObservableCountingMap:ObservePairsBrio()
+	return Observable.new(function(sub)
+		local maid = Maid.new()
+
+		local function handleValue(key, value)
+			if value ~= 0 then
+				local brio = Brio.new(key, value)
+				maid[key] = brio
+				sub:Fire(brio)
+			else
+				maid[key] = nil
+			end
+		end
+
+		for key, value in pairs(self._map) do
+			handleValue(key, value)
+		end
+
+		maid:GiveTask(self.KeyChanged:Connect(handleValue))
+
+		self._maid[sub] = maid
+		maid:GiveTask(function()
+			self._maid[sub] = nil
+			sub:Complete()
+		end)
+
+		return maid
+
+	end)
+end
+
+--[=[
+	Observes the value for the given key.
+
+	@param key TKey
+	@return Observable<TValue?>
+]=]
+function ObservableCountingMap:ObserveAtKey(key)
+	assert(key ~= nil, "Bad key")
+
+	return self._keySubTable:Observe(key, function(sub)
+		sub:Fire(self._map[key] or 0)
+	end)
+end
+
 --[=[
 	Observes all keys in the map
 	@return Observable<Brio<T>>
@@ -250,11 +301,13 @@ function ObservableCountingMap:Add(key, amount)
 
 			if self.Destroy then
 				self.KeyChanged:Fire(key, 0)
+				self._keySubTable:Fire(key, 0)
 			end
 		else
 			-- Update item
 			self._map[key] = newValue
 			self.KeyChanged:Fire(key, newValue)
+			self._keySubTable:Fire(key, newValue)
 		end
 	else
 		-- Add item
@@ -269,6 +322,7 @@ function ObservableCountingMap:Add(key, amount)
 
 		if self.Destroy then
 			self.KeyChanged:Fire(key, amount)
+			self._keySubTable:Fire(key, amount)
 		end
 	end
 

package/src/Shared/ObservableMap.lua

@@ -122,16 +122,15 @@ function ObservableMap:_observeKeyValueChanged(packValue)
 			handleValue(key, value)
 		end
 
-		local conn = self.KeyValueChanged:Connect(handleValue)
+		maid:GiveTask(self.KeyValueChanged:Connect(handleValue))
 
-		local function cleanup()
+		self._maid[sub] = maid
+		maid:GiveTask(function()
 			self._maid[sub] = nil
-			conn:Disconnect()
 			sub:Complete()
-			maid:Destroy()
-		end
-		self._maid[sub] = cleanup
-		return cleanup
+		end)
+
+		return maid
 	end)
 end