@quenty/observablecollection 3.0.0 → 3.1.1-canary.270.0fe7bd3.0

package/CHANGELOG.md

@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.1.1-canary.270.0fe7bd3.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/observablecollection@3.1.0...@quenty/observablecollection@3.1.1-canary.270.0fe7bd3.0) (2022-07-02)
+
+
+### Features
+
+* Add ObservableMapSet:GetSetCount() and ObservableMapSet:ObserveSetCount() ([6a25f61](https://github.com/Quenty/NevermoreEngine/commit/6a25f61d8dcadd9dda56daf1a52c4b4186740efe))
+
+
+
+
+
+# [3.1.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/observablecollection@3.0.0...@quenty/observablecollection@3.1.0) (2022-06-21)
+
+
+### Features
+
+* Add more API surface to ObservableMapSet ([f2ae08b](https://github.com/Quenty/NevermoreEngine/commit/f2ae08ba714e3aefc9f9bf1ae30fefc679535d2b))
+
+
+
+
+
 # [3.0.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/observablecollection@2.2.0...@quenty/observablecollection@3.0.0) (2022-05-21)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/observablecollection",
-  "version": "3.0.0",
+  "version": "3.1.1-canary.270.0fe7bd3.0",
   "description": "An observable set",
   "keywords": [
     "Roblox",
@@ -27,17 +27,17 @@
     "Quenty"
   ],
   "dependencies": {
-    "@quenty/brio": "^6.0.0",
-    "@quenty/loader": "^5.0.0",
-    "@quenty/maid": "^2.3.0",
-    "@quenty/promise": "^5.0.0",
-    "@quenty/rx": "^5.0.0",
-    "@quenty/signal": "^2.2.0",
-    "@quenty/symbol": "^2.1.0",
-    "@quenty/valuebaseutils": "^5.0.0"
+    "@quenty/brio": "6.1.0",
+    "@quenty/loader": "5.0.0",
+    "@quenty/maid": "2.3.0",
+    "@quenty/promise": "5.0.0",
+    "@quenty/rx": "5.1.0",
+    "@quenty/signal": "2.2.0",
+    "@quenty/symbol": "2.1.0",
+    "@quenty/valuebaseutils": "5.1.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "9f7eaea7543c33c89d2e32c38491b13f9271f4f7"
+  "gitHead": "0fe7bd3216177265038ff7d3f83d1d47e748141c"
 }

package/src/Shared/ObservableList.lua

@@ -165,6 +165,21 @@ function ObservableList:ObserveIndexByKey(key)
 	end)
 end
 
+--[=[
+	Gets the current index from the key
+
+	@param key Symbol
+	@return number
+]=]
+function ObservableList:GetIndexByKey(key)
+	local currentIndex = self._indexes[key]
+	if currentIndex then
+		return currentIndex
+	else
+		return nil
+	end
+end
+
 --[=[
 	Gets the count of items in the list
 	@return number

package/src/Shared/ObservableMapSet.lua

@@ -11,6 +11,9 @@ local Maid = require("Maid")
 local Observable = require("Observable")
 local ObservableSet = require("ObservableSet")
 local Signal = require("Signal")
+local Brio = require("Brio")
+local RxBrioUtils = require("RxBrioUtils")
+local RxValueBaseUtils = require("RxValueBaseUtils")
 
 local ObservableMapSet = {}
 ObservableMapSet.ClassName = "ObservableMapSet"
@@ -44,6 +47,10 @@ function ObservableMapSet.new()
 	self.SetRemoved = Signal.new() -- :Fire(key)
 	self._maid:GiveTask(self.SetRemoved)
 
+	self._setCount = Instance.new("IntValue")
+	self._setCount.Value = 0
+	self._maid:GiveTask(self._setCount)
+
 	return self
 end
 
@@ -52,7 +59,7 @@ end
 	that need to be looked up by key.
 
 	@param entry TValue
-	@param observeKey Observable<Brio<TKey>>
+	@param observeKey Observable<TKey>
 ]=]
 function ObservableMapSet:Add(entry, observeKey)
 	local maid = Maid.new()
@@ -87,6 +94,27 @@ function ObservableMapSet:Add(entry, observeKey)
 	return maid
 end
 
+--[=[
+	Gets how many sets exist
+	@return number
+]=]
+function ObservableMapSet:GetSetCount()
+	return self._setCount.Value
+end
+
+--[=[
+	Observes how many sets exist
+	@return Observable<number>
+]=]
+function ObservableMapSet:ObserveSetCount()
+	return RxValueBaseUtils.observeValue(self._setCount)
+end
+
+--[=[
+	Observes all items for the given key
+	@param key TKey
+	@return Observable<Brio<TValue>>
+]=]
 function ObservableMapSet:ObserveItemsForKeyBrio(key)
 	assert(key ~= nil, "Bad key")
 
@@ -124,7 +152,14 @@ function ObservableMapSet:ObserveItemsForKeyBrio(key)
 	end)
 end
 
+--[=[
+	Gets a list for a given key
+	@param key TKey
+	@return { TValue }
+]=]
 function ObservableMapSet:GetListForKey(key)
+	assert(key ~= nil, "Bad key")
+
 	local observableSet = self._observableSetMap[key]
 	if not observableSet then
 		return {}
@@ -133,10 +168,64 @@ function ObservableMapSet:GetListForKey(key)
 	return observableSet:GetList()
 end
 
+--[=[
+	Gets the observable set for the given key
+	@param key TKey
+	@return ObservableSet<TValue>
+]=]
 function ObservableMapSet:GetObservableSetForKey(key)
+	assert(key ~= nil, "Bad key")
+
 	return self._observableSetMap[key]
 end
 
+function ObservableMapSet:ObserveSetBrio(key)
+	assert(key ~= nil, "Bad key")
+
+	return Observable.new(function(sub)
+		local topMaid = Maid.new()
+
+		local function connect()
+			local brio
+
+			local set = self._observableSetMap[key]
+			if set then
+				brio = Brio.new(set)
+				sub:Fire(brio)
+			end
+
+			topMaid._current = brio
+		end
+
+		topMaid:GiveTask(self.SetAdded:Connect(function(addedKey)
+			if addedKey == key then
+				connect()
+			end
+		end))
+
+		topMaid:GiveTask(self.SetRemoved:Connect(function(removedKey)
+			if removedKey == key then
+				connect()
+			end
+		end))
+
+		connect()
+
+		return topMaid
+	end)
+end
+
+function ObservableMapSet:ObserveCountForKey(key)
+	assert(key ~= nil, "Bad key")
+
+	return self:ObserveSetBrio(key):Pipe({
+		RxBrioUtils.switchMapBrio(function(observableSet)
+			return observableSet:ObserveCount()
+		end);
+		RxBrioUtils.emitOnDeath(0);
+	})
+end
+
 function ObservableMapSet:_addToObservableSet(key, entry)
 	local set = self:_getOrCreateObservableSet(key)
 	set:Add(entry)
@@ -172,6 +261,8 @@ function ObservableMapSet:_removeObservableSet(key)
 		if self.SetRemoved.Destroy then
 			self.SetRemoved:Fire(key)
 		end
+
+		self._setCount.Value = self._setCount.Value - 1
 	end
 end
 
@@ -187,6 +278,7 @@ function ObservableMapSet:_getOrCreateObservableSet(key)
 	self._observableSetMap[key] = set
 
 	self.SetAdded:Fire(key, set)
+	self._setCount.Value = self._setCount.Value + 1
 
 	self._maid[set] = maid
 	return set