@quenty/observablecollection 12.20.2 → 12.20.3

package/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [12.20.3](https://github.com/Quenty/NevermoreEngine/compare/@quenty/observablecollection@12.20.2...@quenty/observablecollection@12.20.3) (2025-04-10)
+
+**Note:** Version bump only for package @quenty/observablecollection
+
+
+
+
+
 ## [12.20.2](https://github.com/Quenty/NevermoreEngine/compare/@quenty/observablecollection@12.20.0...@quenty/observablecollection@12.20.2) (2025-04-07)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/observablecollection",
-  "version": "12.20.2",
+  "version": "12.20.3",
   "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.8.2",
-    "@quenty/brio": "^14.17.2",
-    "@quenty/ducktype": "^5.8.3",
-    "@quenty/loader": "^10.8.2",
-    "@quenty/maid": "^3.4.2",
-    "@quenty/promise": "^10.10.3",
-    "@quenty/rx": "^13.17.2",
-    "@quenty/signal": "^7.10.2",
+    "@quenty/baseobject": "^10.8.3",
+    "@quenty/brio": "^14.17.3",
+    "@quenty/ducktype": "^5.8.4",
+    "@quenty/loader": "^10.8.3",
+    "@quenty/maid": "^3.4.3",
+    "@quenty/promise": "^10.10.4",
+    "@quenty/rx": "^13.17.3",
+    "@quenty/signal": "^7.10.3",
     "@quenty/steputils": "^3.5.5",
     "@quenty/symbol": "^3.4.2",
-    "@quenty/table": "^3.7.3",
-    "@quenty/valueobject": "^13.17.2"
+    "@quenty/table": "^3.7.4",
+    "@quenty/valueobject": "^13.17.3"
   },
   "devDependencies": {
-    "@quenty/blend": "^12.18.2"
+    "@quenty/blend": "^12.18.3"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "64def70499ec067077ee39f279936b620b217847"
+  "gitHead": "b06c070ae91d5dab7bd8de6e290ad2caabb15d8f"
 }

package/src/Shared/ObservableCountingMap.lua

@@ -57,7 +57,7 @@ export type ObservableCountingMap<T> = typeof(setmetatable(
 		_keySubTable: any, -- ObservableSubscriptionTable.ObservableSubscriptionTable<number>,
 		_totalKeyCountValue: ValueObject.ValueObject<number>,
 	},
-	ObservableCountingMap
+	{} :: typeof({ __index = ObservableCountingMap })
 ))
 
 --[=[
@@ -147,9 +147,9 @@ function ObservableCountingMap._observeDerivedDataStructureFromKeys<T>(
 
 		emit()
 
-		self._maid[sub :: any] = maid
+		self._maid[sub] = maid
 		maid:GiveTask(function()
-			self._maid[sub :: any] = nil
+			self._maid[sub] = nil
 			sub:Complete()
 		end)
 
@@ -184,9 +184,9 @@ function ObservableCountingMap.ObservePairsBrio<T>(
 
 		maid:GiveTask(self.KeyChanged:Connect(handleValue))
 
-		self._maid[sub :: any] = maid
+		self._maid[sub] = maid
 		maid:GiveTask(function()
-			self._maid[sub :: any] = nil
+			self._maid[sub] = nil
 			sub:Complete()
 		end)
 
@@ -237,9 +237,9 @@ function ObservableCountingMap.ObserveKeysBrio<T>(self: ObservableCountingMap<T>
 			handleItem(key)
 		end
 
-		self._maid[sub :: any] = maid
+		self._maid[sub] = maid
 		maid:GiveTask(function()
-			self._maid[sub :: any] = nil
+			self._maid[sub] = nil
 			sub:Complete()
 		end)
 

package/src/Shared/ObservableList.lua

@@ -28,8 +28,8 @@ export type ObservableList<T> = typeof(setmetatable(
 		_keyList: { Symbol.Symbol },
 		_contents: { [Symbol.Symbol]: T },
 		_indexes: { [Symbol.Symbol]: number },
-		_indexObservers: ObservableSubscriptionTable.ObservableSubscriptionTable<T?>,
-		_keyIndexObservables: ObservableSubscriptionTable.ObservableSubscriptionTable<number?>,
+		_indexObservers: any; -- ObservableSubscriptionTable.ObservableSubscriptionTable<T?>,
+		_keyIndexObservables: any; -- ObservableSubscriptionTable.ObservableSubscriptionTable<number?>,
 		_countValue: ValueObject.ValueObject<number>,
 
 		--[=[
@@ -55,7 +55,7 @@ export type ObservableList<T> = typeof(setmetatable(
 		]=]
 		CountChanged: Signal.Signal<number>,
 	},
-	ObservableList
+	{} :: typeof({ __index = ObservableList })
 ))
 
 --[=[
@@ -63,7 +63,7 @@ export type ObservableList<T> = typeof(setmetatable(
 	@return ObservableList<T>
 ]=]
 function ObservableList.new<T>(): ObservableList<T>
-	local self = setmetatable({}, ObservableList)
+	local self: ObservableList<T> = setmetatable({} :: any, ObservableList)
 
 	self._maid = Maid.new()
 
@@ -75,11 +75,11 @@ function ObservableList.new<T>(): ObservableList<T>
 	self._keyIndexObservables = self._maid:Add(ObservableSubscriptionTable.new())
 	self._countValue = self._maid:Add(ValueObject.new(0, "number"))
 
-	self.ItemAdded = self._maid:Add(Signal.new())
-	self.ItemRemoved = self._maid:Add(Signal.new())
-	self.CountChanged = self._countValue.Changed
+	self.ItemAdded = self._maid:Add(Signal.new() :: any)
+	self.ItemRemoved = self._maid:Add(Signal.new() :: any)
+	self.CountChanged = self._countValue.Changed :: any
 
-	return self :: any
+	return self
 end
 
 --[=[
@@ -154,9 +154,9 @@ function ObservableList.ObserveItemsBrio<T>(self: ObservableList<T>): Observable
 			handleItem(self._contents[key], index, key)
 		end
 
-		self._maid[sub :: any] = maid
+		self._maid[sub] = maid
 		maid:GiveTask(function()
-			self._maid[sub :: any] = nil
+			self._maid[sub] = nil
 			sub:Complete()
 		end)
 

package/src/Shared/ObservableMap.lua

@@ -58,7 +58,7 @@ export type ObservableMap<TKey, TValue> = typeof(setmetatable(
 		]=]
 		CountChanged: Signal.Signal<number>,
 	},
-	ObservableMap
+	{} :: typeof({ __index = ObservableMap })
 ))
 
 --[=[
@@ -129,7 +129,7 @@ function ObservableMap.ObservePairsBrio<TKey, TValue>(
 ): Observable.Observable<Brio.Brio<(TKey, TValue)>>
 	return self:_observeKeyValueChanged(function(key: TKey, value: TValue)
 		return Brio.new(key, value)
-	end)
+	end) :: any
 end
 
 function ObservableMap._observeKeyValueChanged<TKey, TValue>(
@@ -156,12 +156,12 @@ function ObservableMap._observeKeyValueChanged<TKey, TValue>(
 		local conn = self.KeyValueChanged:Connect(handleValue)
 
 		local function cleanup()
-			self._maid[sub :: any] = nil
+			self._maid[sub] = nil
 			conn:Disconnect()
 			sub:Complete()
 			maid:Destroy()
 		end
-		self._maid[sub :: any] = cleanup
+		self._maid[sub] = cleanup
 		return cleanup
 	end) :: any
 end

package/src/Shared/ObservableMapList.lua

@@ -1,3 +1,4 @@
+--!strict
 --[=[
 	Holds a map of lists. This is good for list-based
 
@@ -12,42 +13,58 @@ local ObservableList = require("ObservableList")
 local ObservableMap = require("ObservableMap")
 local Rx = require("Rx")
 local RxBrioUtils = require("RxBrioUtils")
+local _Signal = require("Signal")
+local _Brio = require("Brio")
 
 local ObservableMapList = {}
 ObservableMapList.ClassName = "ObservableMapList"
 ObservableMapList.__index = ObservableMapList
 
+type ObservableList<T> = any --ObservableList.ObservableList<T>
+
+export type ObservableMapList<TKey, TValue> = typeof(setmetatable(
+	{} :: {
+		_observableMapOfLists: any, --ObservableMap.ObservableMap<TKey, ObservableList<TValue>>,
+		_maid: Maid.Maid,
+
+		--[=[
+			Fires when an item is added
+			@readonly
+			@prop ListAdded Signal<TKey>
+			@within ObservableMapSet
+		]=]
+		ListAdded: _Signal.Signal<TKey, ObservableList<TValue>>,
+
+		--[=[
+			Fires when an item is removed
+			@readonly
+			@prop ListRemoved Signal<TKey>
+			@within ObservableMapSet
+		]=]
+		ListRemoved: _Signal.Signal<TKey>,
+
+		--[=[
+			Fires when the count changes.
+			@prop CountChanged RBXScriptSignal
+			@within ObservableMap
+		]=]
+		CountChanged: _Signal.Signal<number>,
+	},
+	{} :: typeof({ __index = ObservableMapList })
+))
+
 --[=[
 	Constructs a new ObservableMapList
 	@return ObservableMapList<TKey, TValue>
 ]=]
-function ObservableMapList.new()
-	local self = setmetatable({}, ObservableMapList)
+function ObservableMapList.new<TKey, TValue>(): ObservableMapList<TKey, TValue>
+	local self: ObservableMapList<TKey, TValue> = setmetatable({} :: any, ObservableMapList)
 
 	self._maid = Maid.new()
 	self._observableMapOfLists = self._maid:Add(ObservableMap.new())
 
---[=[
-	Fires when an item is added
-	@readonly
-	@prop ListAdded Signal<TKey>
-	@within ObservableMapSet
-]=]
 	self.ListAdded = assert(self._observableMapOfLists.KeyAdded, "Bad KeyAdded") -- :Fire(key, set)
-
---[=[
-	Fires when an item is removed
-	@readonly
-	@prop ListRemoved Signal<TKey>
-	@within ObservableMapSet
-]=]
 	self.ListRemoved = assert(self._observableMapOfLists.KeyRemoved, "Bad KeyRemoved") -- :Fire(key)
-
---[=[
-	Fires when the count changes.
-	@prop CountChanged RBXScriptSignal
-	@within ObservableMap
-]=]
 	self.CountChanged = assert(self._observableMapOfLists.CountChanged, "Bad CountChanged")
 
 	return self
@@ -65,7 +82,7 @@ end
 	@param observeKey Observable<TKey>
 	@return MaidTask -- Cleanup object that will remove the entry
 ]=]
-function ObservableMapList:Push(observeKey, entry)
+function ObservableMapList.Push<TKey, TValue>(self: ObservableMapList<TKey, TValue>, observeKey, entry: TValue): Maid.Maid
 	assert(observeKey ~= nil, "Bad observeKey")
 	assert(entry ~= nil, "Bad entry")
 
@@ -98,7 +115,7 @@ end
 	@param key TKey
 	@return TValue | nil
 ]=]
-function ObservableMapList:GetFirstItemForKey(key)
+function ObservableMapList.GetFirstItemForKey<TKey, TValue>(self: ObservableMapList<TKey, TValue>, key: TKey): TValue?
 	assert(key ~= nil, "Bad key")
 
 	local observableList = self:GetListForKey(key)
@@ -123,9 +140,13 @@ end
 
 	@param key TKey
 	@param index number
-	@return TValue | nil
+	@return TValue?
 ]=]
-function ObservableMapList:GetItemForKeyAtIndex(key, index)
+function ObservableMapList.GetItemForKeyAtIndex<TKey, TValue>(
+	self: ObservableMapList<TKey, TValue>,
+	key: TKey,
+	index: number
+): TValue?
 	assert(key ~= nil, "Bad key")
 	assert(type(index) == "number", "Bad index")
 
@@ -142,7 +163,7 @@ end
 
 	@return number
 ]=]
-function ObservableMapList:GetListCount()
+function ObservableMapList.GetListCount<TKey, TValue>(self: ObservableMapList<TKey, TValue>): number
 	return self._observableMapOfLists:GetCount()
 end
 
@@ -153,7 +174,7 @@ ObservableMapList.__len = ObservableMapList.GetListCount
 
 	@return Observable<number>
 ]=]
-function ObservableMapList:ObserveListCount()
+function ObservableMapList.ObserveListCount<TKey, TValue>(self: ObservableMapList<TKey, TValue>): Observable.Observable<number>
 	return self._observableMapOfLists:ObserveCount()
 end
 
@@ -162,9 +183,9 @@ end
 
 	@param key TKey
 	@param index number
-	@return Observable<TValue?>
+	@return TValue?
 ]=]
-function ObservableMapList:GetAtListIndex(key, index)
+function ObservableMapList.GetAtListIndex<TKey, TValue>(self: ObservableMapList<TKey, TValue>, key: TKey, index: number): TValue?
 	assert(key ~= nil, "Bad key")
 	assert(type(index) == "number", "Bad index")
 
@@ -183,19 +204,23 @@ end
 	@param index number
 	@return Observable<TValue?>
 ]=]
-function ObservableMapList:ObserveAtListIndex(key, index)
+function ObservableMapList.ObserveAtListIndex<TKey, TValue>(
+	self: ObservableMapList<TKey, TValue>,
+	key: TKey,
+	index: number
+): Observable.Observable<TValue?>
 	assert(key ~= nil, "Bad key")
 	assert(type(index) == "number", "Bad index")
 
 	return self._observableMapOfLists:ObserveAtKey(key):Pipe({
-		Rx.switchMap(function(list)
+		Rx.switchMap(function(list): any
 			if list then
 				return list:ObserveAtIndex(index)
 			else
 				return Rx.of(nil)
 			end
-		end);
-	})
+		end) :: any,
+	}) :: any
 end
 
 --[=[
@@ -203,7 +228,7 @@ end
 
 	@return { TKey }
 ]=]
-function ObservableMapList:GetKeyList()
+function ObservableMapList.GetKeyList<TKey, TValue>(self: ObservableMapList<TKey, TValue>): { TKey }
 	return self._observableMapOfLists:GetKeyList()
 end
 
@@ -211,7 +236,7 @@ end
 	Observes the list of all keys.
 	@return Observable<{ TKey }>
 ]=]
-function ObservableMapList:ObserveKeyList()
+function ObservableMapList.ObserveKeyList<TKey, TValue>(self: ObservableMapList<TKey, TValue>): Observable.Observable<{ TKey }>
 	return self._observableMapOfLists:ObserveKeyList()
 end
 
@@ -219,7 +244,9 @@ end
 	Observes all keys in the map
 	@return Observable<Brio<TKey>>
 ]=]
-function ObservableMapList:ObserveKeysBrio()
+function ObservableMapList.ObserveKeysBrio<TKey, TValue>(
+	self: ObservableMapList<TKey, TValue>
+): Observable.Observable<_Brio.Brio<TKey>>
 	return self._observableMapOfLists:ObserveKeysBrio()
 end
 
@@ -230,19 +257,23 @@ end
 	@param index number
 	@return Observable<Brio<TValue>>
 ]=]
-function ObservableMapList:ObserveAtListIndexBrio(key, index)
+function ObservableMapList.ObserveAtListIndexBrio<TKey, TValue>(
+	self: ObservableMapList<TKey, TValue>,
+	key: TKey,
+	index: number
+): Observable.Observable<_Brio.Brio<TValue>>
 	assert(key ~= nil, "Bad key")
 	assert(type(index) == "number", "Bad index")
 
 	return self._observableMapOfLists:ObserveAtKeyBrio(key):Pipe({
 		RxBrioUtils.switchMapBrio(function(list)
 			return list:ObserveAtIndexBrio(index)
-		end);
-		RxBrioUtils.toBrio();
+		end) :: any,
+		RxBrioUtils.toBrio() :: any,
 		RxBrioUtils.where(function(value)
 			return value ~= nil
-		end)
-	})
+		end) :: any,
+	}) :: any
 end
 
 --[=[
@@ -251,18 +282,21 @@ end
 	@param key TKey
 	@return Observable<Brio<TValue>>
 ]=]
-function ObservableMapList:ObserveItemsForKeyBrio(key)
+function ObservableMapList.ObserveItemsForKeyBrio<TKey, TValue>(
+	self: ObservableMapList<TKey, TValue>,
+	key: TKey
+): Observable.Observable<_Brio.Brio<TValue>>
 	assert(key ~= nil, "Bad key")
 
 	return self._observableMapOfLists:ObserveAtKeyBrio(key):Pipe({
-		RxBrioUtils.switchMapBrio(function(list)
+		RxBrioUtils.switchMapBrio(function(list): any
 			if list then
 				return list:ObserveItemsBrio()
 			else
 				return Rx.EMPTY
 			end
-		end);
-	})
+		end) :: any,
+	}) :: any
 end
 
 --[=[
@@ -271,7 +305,7 @@ end
 	@param key TKey
 	@return { TValue }
 ]=]
-function ObservableMapList:GetListFromKey(key)
+function ObservableMapList.GetListFromKey<TKey, TValue>(self: ObservableMapList<TKey, TValue>, key: TKey): { TValue }
 	assert(key ~= nil, "Bad key")
 
 	local observableList = self:GetListForKey(key)
@@ -287,7 +321,7 @@ end
 	@param key TKey
 	@return ObservableList<TValue>
 ]=]
-function ObservableMapList:GetListForKey(key)
+function ObservableMapList.GetListForKey<TKey, TValue>(self: ObservableMapList<TKey, TValue>, key: TKey): any
 	assert(key ~= nil, "Bad key")
 
 	return self._observableMapOfLists:Get(key)
@@ -297,9 +331,9 @@ end
 	Gets a list of all of the entries at the given index, if it exists
 
 	@param index number
-	@return ObservableList<TValue>
+	@return { TValue}
 ]=]
-function ObservableMapList:GetListOfValuesAtListIndex(index: number)
+function ObservableMapList.GetListOfValuesAtListIndex<TKey, TValue>(self: ObservableMapList<TKey, TValue>, index: number): { TValue }
 	assert(type(index) == "number", "Bad index")
 
 	local list = table.create(self._observableMapOfLists:GetCount())
@@ -320,7 +354,10 @@ end
 	@param key TKey
 	@return Observable<ObservableList<TValue>>
 ]=]
-function ObservableMapList:ObserveList(key)
+function ObservableMapList.ObserveList<TKey, TValue>(
+	self: ObservableMapList<TKey, TValue>,
+	key: TKey
+): Observable.Observable<ObservableList<TValue>>
 	assert(key ~= nil, "Bad key")
 
 	return self._observableMapOfLists:ObserveAtKey(key)
@@ -332,7 +369,10 @@ end
 	@param key TKey
 	@return Observable<Brio<ObservableList<TValue>>>
 ]=]
-function ObservableMapList:ObserveListBrio(key)
+function ObservableMapList.ObserveListBrio<TKey, TValue>(
+	self: ObservableMapList<TKey, TValue>,
+	key: TKey
+): Observable.Observable<_Brio.Brio<ObservableList<TValue>>>
 	assert(key ~= nil, "Bad key")
 
 	return self._observableMapOfLists:ObserveAtKeyBrio(key)
@@ -343,7 +383,9 @@ end
 
 	@return Observable<Brio<ObservableList<TValue>>>
 ]=]
-function ObservableMapList:ObserveListsBrio()
+function ObservableMapList.ObserveListsBrio<TKey, TValue>(
+	self: ObservableMapList<TKey, TValue>
+): Observable.Observable<_Brio.Brio<ObservableList<TValue>>>
 	return self._observableMapOfLists:ObserveValuesBrio()
 end
 
@@ -353,30 +395,33 @@ end
 	@param key TKey
 	@return Observable<number>
 ]=]
-function ObservableMapList:ObserveCountForKey(key)
+function ObservableMapList.ObserveCountForKey<TKey, TValue>(
+	self: ObservableMapList<TKey, TValue>,
+	key: TKey
+): Observable.Observable<number>
 	assert(key ~= nil, "Bad key")
 
 	return self:ObserveListBrio(key):Pipe({
 		RxBrioUtils.switchMapBrio(function(observableList)
 			return observableList:ObserveCount()
-		end);
-		RxBrioUtils.emitOnDeath(0);
-	})
+		end) :: any,
+		RxBrioUtils.emitOnDeath(0) :: any,
+	}) :: any
 end
 
-function ObservableMapList:_addToList(key, entry)
+function ObservableMapList._addToList<TKey, TValue>(self: ObservableMapList<TKey, TValue>, key: TKey, entry: TValue): () -> ()
 	local list = self:_getOrCreateList(key)
 	return list:Add(entry)
 end
 
-function ObservableMapList:_getOrCreateList(key)
+function ObservableMapList._getOrCreateList<TKey, TValue>(self: ObservableMapList<TKey, TValue>, key: TKey): ObservableList<TValue>
 	local existing = self._observableMapOfLists:Get(key)
 	if existing then
 		return existing
 	end
 
 	local maid = Maid.new()
-	local list = maid:Add(ObservableList.new(nil))
+	local list = maid:Add(ObservableList.new())
 
 	maid:GiveTask(list.CountChanged:Connect(function(count)
 		if count <= 0 then
@@ -393,9 +438,9 @@ end
 --[=[
 	Cleans up the ObservableMapList and sets the metatable to nil.
 ]=]
-function ObservableMapList:Destroy()
+function ObservableMapList.Destroy<TKey, TValue>(self: ObservableMapList<TKey, TValue>)
 	self._maid:DoCleaning()
-	setmetatable(self, nil)
+	setmetatable(self :: any, nil)
 end
 
 

package/src/Shared/ObservableMapSet.lua

@@ -30,7 +30,7 @@ export type ObservableMapSet<TKey, TValue> = typeof(setmetatable(
 		SetRemoved: _Signal.Signal<TKey>,
 		CountChanged: _Signal.Signal<number>,
 	},
-	ObservableMapSet
+	{} :: typeof({ __index = ObservableMapSet })
 ))
 
 --[=[
@@ -105,9 +105,9 @@ function ObservableMapSet.Push<TKey, TValue>(
 	end
 
 	-- Ensure self-cleanup when map cleans up
-	self._maid[maid :: any] = maid
+	self._maid[maid] = maid
 	maid:GiveTask(function()
-		self._maid[maid :: any] = nil
+		self._maid[maid] = nil
 	end)
 
 	return maid
@@ -287,9 +287,9 @@ function ObservableMapSet.ObserveCountForKey<TKey, TValue>(
 	return self:ObserveSetBrio(key):Pipe({
 		RxBrioUtils.switchMapBrio(function(observableSet)
 			return observableSet:ObserveCount()
-		end),
-		RxBrioUtils.emitOnDeath(0),
-	}) :: any
+		end) :: any,
+		RxBrioUtils.emitOnDeath(0) :: any,
+	} :: any) :: any
 end
 
 function ObservableMapSet._addToSet<TKey, TValue>(self: ObservableMapSet<TKey, TValue>, key: TKey, entry: TValue): () -> ()
@@ -311,12 +311,12 @@ function ObservableMapSet._getOrCreateSet<TKey, TValue>(
 
 	maid:GiveTask(set.CountChanged:Connect(function(count)
 		if count <= 0 then
-			self._maid[set :: any] = nil
+			self._maid[set] = nil
 		end
 	end))
 
 	maid:GiveTask(self._observableMapOfSets:Set(key, set))
-	self._maid[set :: any] = maid
+	self._maid[set] = maid
 
 	return set
 end

package/src/Shared/ObservableSet.lua

@@ -29,7 +29,7 @@ export type ObservableSet<T> = typeof(setmetatable(
 		ItemRemoved: Signal.Signal<T>,
 		CountChanged: Signal.Signal<number>,
 	},
-	ObservableSet
+	{} :: typeof({ __index = ObservableSet })
 ))
 
 --[=[
@@ -127,12 +127,12 @@ function ObservableSet.ObserveItemsBrio<T>(self: ObservableSet<T>): Observable.O
 			handleItem(item)
 		end
 
-		self._maid[sub :: any] = maid
+		self._maid[sub] = maid
 		maid:GiveTask(function()
 			for _, brio: any in brios do
 				brio:Destroy()
 			end
-			self._maid[sub :: any] = nil
+			self._maid[sub] = nil
 			sub:Complete()
 		end)
 
@@ -167,9 +167,9 @@ function ObservableSet.ObserveContains<T>(self: ObservableSet<T>, item: T): Obse
 			sub:Fire(doesContain)
 		end))
 
-		self._maid[sub :: any] = maid
+		self._maid[sub] = maid
 		maid:GiveTask(function()
-			self._maid[sub :: any] = nil
+			self._maid[sub] = nil
 			sub:Complete()
 		end)
 

package/src/Shared/SortedList/ObservableSortedList.lua

@@ -55,7 +55,7 @@ export type ObservableSortedList<T> = typeof(setmetatable(
 		OrderChanged: Signal.Signal<()>,
 		CountChanged: Signal.Signal<number>,
 	},
-	ObservableSortedList
+	{} :: typeof({ __index = ObservableSortedList })
 ))
 
 --[=[
@@ -190,7 +190,7 @@ end
 function ObservableSortedList._iterateNodesRange<T>(
 	self: ObservableSortedList<T>,
 	start: number,
-	finish: number
+	finish: number?
 ): SortFunctionUtils.WrappedIterator<number, SortedNode.SortedNode<T>>
 	if self._root then
 		return self._root:IterateNodesRange(start, finish)
@@ -366,7 +366,7 @@ end
 function ObservableSortedList.ObserveIndexByKey<T>(
 	self: ObservableSortedList<T>,
 	node: SortedNode.SortedNode<T>
-): Observable.Observable<number?>
+): Observable.Observable<number>
 	assert(SortedNode.isSortedNode(node), "Bad node")
 
 	return self._nodeIndexObservables:Observe(node, function(sub)
@@ -443,7 +443,7 @@ function ObservableSortedList.Add<T>(
 			self:_assignSortValue(node, sortValue)
 		end))
 	elseif observeValue ~= nil then
-		self:_assignSortValue(node, observeValue)
+		self:_assignSortValue(node, observeValue :: number)
 	else
 		error("Bad observeValue")
 	end
@@ -661,7 +661,7 @@ end
 function ObservableSortedList.RemoveByKey<T>(self: ObservableSortedList<T>, node: SortedNode.SortedNode<T>)
 	assert(SortedNode.isSortedNode(node), "Bad node")
 
-	self._maid[node :: any] = nil
+	self._maid[node] = nil
 end
 
 --[=[

package/src/Shared/SortedList/SortedNode.lua

@@ -41,7 +41,7 @@ export type SortedNode<T> = typeof(setmetatable(
 		descendantCount: number,
 		data: T,
 	},
-	SortedNode
+	{} :: typeof({ __index = SortedNode })
 ))
 
 function SortedNode.new<T>(data: T): SortedNode<T>
@@ -113,7 +113,7 @@ end
 function SortedNode.IterateNodesRange<T>(
 	self: SortedNode<T>,
 	start: number,
-	finish: number
+	finish: number?
 ): _SortFunctionUtils.WrappedIterator<number, SortedNode<T>>
 	assert(type(start) == "number", "Bad start")
 	assert(type(finish) == "number" or finish == nil, "Bad finish")

package/src/Shared/SortedList/SortedNodeValue.lua

@@ -20,7 +20,7 @@ export type SortedNodeValue<T> = typeof(setmetatable(
 		_value: T,
 		_compare: CompareFunction<T>,
 	},
-	SortedNodeValue
+	{} :: typeof({ __index = SortedNodeValue })
 ))
 
 function SortedNodeValue.new<T>(value: T, compare: CompareFunction<T>): SortedNodeValue<T>