@quenty/cooldown 11.20.3 → 11.20.4-canary.11a5dcf.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.
 
+## [11.20.4-canary.11a5dcf.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/cooldown@11.20.3...@quenty/cooldown@11.20.4-canary.11a5dcf.0) (2025-05-10)
+
+
+### Bug Fixes
+
+* Additional type checking updates ([05ba29a](https://github.com/Quenty/NevermoreEngine/commit/05ba29a03efc9f3feed74b34f1d9dfb237496214))
+
+
+### Features
+
+* Add even more types ([b31717d](https://github.com/Quenty/NevermoreEngine/commit/b31717d8c9f7620c457f5018a2affa760a65334a))
+
+
+
+
+
 ## [11.20.3](https://github.com/Quenty/NevermoreEngine/compare/@quenty/cooldown@11.20.2...@quenty/cooldown@11.20.3) (2025-04-10)
 
 **Note:** Version bump only for package @quenty/cooldown

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/cooldown",
-  "version": "11.20.3",
+  "version": "11.20.4-canary.11a5dcf.0",
   "description": "Generalized networked cooldown system for Roblox",
   "keywords": [
     "Roblox",
@@ -25,26 +25,26 @@
     "Quenty"
   ],
   "dependencies": {
-    "@quenty/attributeutils": "^14.17.3",
-    "@quenty/baseobject": "^10.8.3",
-    "@quenty/binder": "^14.19.3",
-    "@quenty/ducktype": "^5.8.4",
-    "@quenty/instanceutils": "^13.17.3",
-    "@quenty/loader": "^10.8.3",
-    "@quenty/maid": "^3.4.3",
-    "@quenty/promise": "^10.10.4",
-    "@quenty/propertyvalue": "^7.17.3",
-    "@quenty/remoting": "^12.18.3",
-    "@quenty/rx": "^13.17.3",
-    "@quenty/rxbinderutils": "^14.19.3",
-    "@quenty/servicebag": "^11.11.4",
-    "@quenty/signal": "^7.10.3",
-    "@quenty/table": "^3.7.4",
-    "@quenty/timesyncservice": "^13.18.3",
-    "@quenty/valueobject": "^13.17.3"
+    "@quenty/attributeutils": "14.17.4-canary.11a5dcf.0",
+    "@quenty/baseobject": "10.8.4-canary.11a5dcf.0",
+    "@quenty/binder": "14.19.4-canary.11a5dcf.0",
+    "@quenty/ducktype": "5.8.5-canary.11a5dcf.0",
+    "@quenty/instanceutils": "13.17.4-canary.11a5dcf.0",
+    "@quenty/loader": "10.8.4-canary.11a5dcf.0",
+    "@quenty/maid": "3.4.4-canary.11a5dcf.0",
+    "@quenty/promise": "10.10.5-canary.11a5dcf.0",
+    "@quenty/propertyvalue": "7.17.4-canary.11a5dcf.0",
+    "@quenty/remoting": "12.18.4-canary.11a5dcf.0",
+    "@quenty/rx": "13.17.4-canary.11a5dcf.0",
+    "@quenty/rxbinderutils": "14.19.4-canary.11a5dcf.0",
+    "@quenty/servicebag": "11.11.5-canary.11a5dcf.0",
+    "@quenty/signal": "7.10.4-canary.11a5dcf.0",
+    "@quenty/table": "3.7.5-canary.11a5dcf.0",
+    "@quenty/timesyncservice": "13.18.4-canary.11a5dcf.0",
+    "@quenty/valueobject": "13.17.4-canary.11a5dcf.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b06c070ae91d5dab7bd8de6e290ad2caabb15d8f"
+  "gitHead": "11a5dcf7d4c7a0bfbf3337e97d30e8346ea09d3f"
 }

package/src/Client/Binders/CooldownClient.lua

@@ -1,3 +1,4 @@
+--!strict
 --[=[
 	Handles cooldown on the client. See [CooldownBase] for details.
 
@@ -7,13 +8,21 @@
 
 local require = require(script.Parent.loader).load(script)
 
-local CooldownBase = require("CooldownBase")
 local Binder = require("Binder")
+local CooldownBase = require("CooldownBase")
+local ServiceBag = require("ServiceBag")
 
 local CooldownClient = setmetatable({}, CooldownBase)
 CooldownClient.ClassName = "CooldownClient"
 CooldownClient.__index = CooldownClient
 
+export type CooldownClient = typeof(setmetatable(
+	{} :: {
+		_serviceBag: ServiceBag.ServiceBag,
+	},
+	{} :: typeof({ __index = CooldownClient })
+)) & CooldownBase.CooldownBase
+
 --[=[
 	Constructs a new cooldown. Should be done via [CooldownBindersClient]. To create an
 	instance of this in Roblox, see [CooldownUtils.create].
@@ -22,14 +31,14 @@ CooldownClient.__index = CooldownClient
 	@param serviceBag ServiceBag
 	@return Cooldown
 ]=]
-function CooldownClient.new(numberValue, serviceBag)
-	local self = setmetatable(CooldownBase.new(numberValue, serviceBag), CooldownClient)
+function CooldownClient.new(numberValue: NumberValue, serviceBag: ServiceBag.ServiceBag): CooldownClient
+	local self: CooldownClient = setmetatable(CooldownBase.new(numberValue, serviceBag) :: any, CooldownClient)
 
 	self._maid:GiveTask(self.Done:Connect(function()
-		self._obj:Remove()
+		(self._obj :: any):Remove()
 	end))
 
 	return self
 end
 
-return Binder.new("Cooldown", CooldownClient)
+return Binder.new("Cooldown", CooldownClient :: any) :: Binder.Binder<CooldownClient>

package/src/Client/CooldownServiceClient.lua

@@ -1,3 +1,4 @@
+--!strict
 --[=[
 	@class CooldownServiceClient
 ]=]
@@ -6,9 +7,9 @@ local require = require(script.Parent.loader).load(script)
 
 local CooldownServiceClient = {}
 CooldownServiceClient.ServiceName = "CooldownServiceClient"
-local _ServiceBag = require("ServiceBag")
+local ServiceBag = require("ServiceBag")
 
-function CooldownServiceClient:Init(serviceBag: _ServiceBag.ServiceBag)
+function CooldownServiceClient:Init(serviceBag: ServiceBag.ServiceBag)
 	assert(not self._serviceBag, "Already initialized")
 	self._serviceBag = assert(serviceBag, "No serviceBag")
 
@@ -20,4 +21,4 @@ function CooldownServiceClient:Init(serviceBag: _ServiceBag.ServiceBag)
 	self._serviceBag:GetService(require("CooldownShared"))
 end
 
-return CooldownServiceClient
+return CooldownServiceClient

package/src/Server/Binders/Cooldown.lua

@@ -1,3 +1,4 @@
+--!strict
 --[=[
 	Represents a cooldown state with a time limit. See [CooldownBase] for more API.
 
@@ -7,17 +8,28 @@
 
 local require = require(script.Parent.loader).load(script)
 
-local CooldownBase = require("CooldownBase")
-local TimeSyncService = require("TimeSyncService")
-local CooldownConstants = require("CooldownConstants")
 local AttributeValue = require("AttributeValue")
 local Binder = require("Binder")
+local CooldownBase = require("CooldownBase")
+local CooldownConstants = require("CooldownConstants")
 local PropertyValue = require("PropertyValue")
+local ServiceBag = require("ServiceBag")
+local TimeSyncService = require("TimeSyncService")
 
 local Cooldown = setmetatable({}, CooldownBase)
 Cooldown.ClassName = "Cooldown"
 Cooldown.__index = Cooldown
 
+export type Cooldown = typeof(setmetatable(
+	{} :: {
+		_serviceBag: ServiceBag.ServiceBag,
+		_syncedClock: TimeSyncService.SyncedClock,
+		_finishTime: PropertyValue.PropertyValue<number>,
+		_startTime: AttributeValue.AttributeValue<number>,
+	},
+	{} :: typeof({ __index = Cooldown })
+)) & CooldownBase.CooldownBase
+
 --[=[
 	Constructs a new cooldown. Should be done via [Binder].
 
@@ -25,20 +37,22 @@ Cooldown.__index = Cooldown
 	@param serviceBag ServiceBag
 	@return Cooldown
 ]=]
-function Cooldown.new(numberValue, serviceBag)
-	local self = setmetatable(CooldownBase.new(numberValue, serviceBag), Cooldown)
+function Cooldown.new(numberValue: NumberValue, serviceBag: ServiceBag.ServiceBag): Cooldown
+	local self: Cooldown = setmetatable(CooldownBase.new(numberValue, serviceBag) :: any, Cooldown)
 
 	self._serviceBag = assert(serviceBag, "No serviceBag")
-	self._syncedClock = self._serviceBag:GetService(TimeSyncService):GetSyncedClock()
+	self._timeSyncService = self._serviceBag:GetService(TimeSyncService) :: any
+	self._syncedClock = assert(self._timeSyncService:GetSyncedClock(), "No synced clock")
 
 	self._finishTime = PropertyValue.new(self._obj, "Value")
-	self._startTime = AttributeValue.new(self._obj, CooldownConstants.COOLDOWN_START_TIME_ATTRIBUTE, self._syncedClock:GetTime())
+	self._startTime =
+		AttributeValue.new(self._obj, CooldownConstants.COOLDOWN_START_TIME_ATTRIBUTE, self._syncedClock:GetTime())
 
 	self._maid:GiveTask(self.Done:Connect(function()
-		self._obj:Remove()
+		(self._obj :: any):Remove()
 	end))
 
 	return self
 end
 
-return Binder.new("Cooldown", Cooldown)
+return Binder.new("Cooldown", Cooldown :: any) :: Binder.Binder<Cooldown>

package/src/Server/CooldownService.lua

@@ -1,15 +1,16 @@
+--!strict
 --[=[
 	@class CooldownService
 ]=]
 
 local require = require(script.Parent.loader).load(script)
 
-local _ServiceBag = require("ServiceBag")
+local ServiceBag = require("ServiceBag")
 
 local CooldownService = {}
 CooldownService.ServiceName = "CooldownService"
 
-function CooldownService:Init(serviceBag: _ServiceBag.ServiceBag)
+function CooldownService:Init(serviceBag: ServiceBag.ServiceBag)
 	assert(not self._serviceBag, "Already initialized")
 	self._serviceBag = assert(serviceBag, "No serviceBag")
 
@@ -21,4 +22,4 @@ function CooldownService:Init(serviceBag: _ServiceBag.ServiceBag)
 	self._serviceBag:GetService(require("CooldownShared"))
 end
 
-return CooldownService
+return CooldownService

package/src/Shared/Binders/CooldownBase.lua

@@ -1,3 +1,4 @@
+--!strict
 --[=[
 	Base object for a cooldown. Provides calculation utilties.
 	@class CooldownBase
@@ -6,16 +7,30 @@
 local require = require(script.Parent.loader).load(script)
 
 local BaseObject = require("BaseObject")
-local TimeSyncService = require("TimeSyncService")
 local CooldownConstants = require("CooldownConstants")
 local CooldownModel = require("CooldownModel")
 local RxAttributeUtils = require("RxAttributeUtils")
 local RxInstanceUtils = require("RxInstanceUtils")
+local ServiceBag = require("ServiceBag")
+local Signal = require("Signal")
+local TimeSyncService = require("TimeSyncService")
 
 local CooldownBase = setmetatable({}, BaseObject)
 CooldownBase.ClassName = "CooldownBase"
 CooldownBase.__index = CooldownBase
 
+export type CooldownBase = typeof(setmetatable(
+	{} :: {
+		_obj: NumberValue,
+		_serviceBag: ServiceBag.ServiceBag,
+		_cooldownModel: CooldownModel.CooldownModel,
+		_timeSyncService: TimeSyncService.TimeSyncService,
+		_syncedClock: TimeSyncService.SyncedClock,
+		Done: Signal.Signal<()>,
+	},
+	{} :: typeof({ __index = CooldownBase })
+)) & BaseObject.BaseObject
+
 --[=[
 	Constructs a new Cooldown.
 
@@ -23,27 +38,32 @@ CooldownBase.__index = CooldownBase
 	@param serviceBag ServiceBag
 	@return CooldownBase
 ]=]
-function CooldownBase.new(numberValue, serviceBag)
-	local self = setmetatable(BaseObject.new(numberValue), CooldownBase)
+function CooldownBase.new(numberValue: NumberValue, serviceBag: ServiceBag.ServiceBag): CooldownBase
+	local self: CooldownBase = setmetatable(BaseObject.new(numberValue) :: any, CooldownBase)
 
 	self._serviceBag = assert(serviceBag, "No serviceBag")
-	self._timeSyncService = self._serviceBag:GetService(TimeSyncService)
+	self._timeSyncService = self._serviceBag:GetService(TimeSyncService) :: any
 
 	self._cooldownModel = self._maid:Add(CooldownModel.new())
-	self._maid:GivePromise(self._timeSyncService:PromiseSyncedClock())
-		:Then(function(syncedClock)
-			self._syncedClock = syncedClock
-
-			-- Setup
-			self._cooldownModel:SetStartTime(RxAttributeUtils.observeAttribute(self._obj, CooldownConstants.COOLDOWN_START_TIME_ATTRIBUTE, syncedClock:GetTime()))
-			self._cooldownModel:SetLength(RxInstanceUtils.observeProperty(self._obj, "Value"))
-
-			self._cooldownModel:SetClock(function()
-				return self._syncedClock:GetTime()
-			end)
+	self._maid:GivePromise(self._timeSyncService:PromiseSyncedClock()):Then(function(syncedClock)
+		self._syncedClock = syncedClock
+
+		-- Setup
+		self._cooldownModel:SetStartTime(
+			RxAttributeUtils.observeAttribute(
+				self._obj,
+				CooldownConstants.COOLDOWN_START_TIME_ATTRIBUTE,
+				syncedClock:GetTime()
+			)
+		)
+		self._cooldownModel:SetLength(RxInstanceUtils.observeProperty(self._obj, "Value"))
+
+		self._cooldownModel:SetClock(function()
+			return self._syncedClock:GetTime()
 		end)
+	end)
 
---[=[
+	--[=[
 	Event that fires when the cooldown is done.
 	@prop Done Signal<()>
 	@within CooldownBase
@@ -53,7 +73,7 @@ function CooldownBase.new(numberValue, serviceBag)
 	return self
 end
 
-function CooldownBase:GetCooldownModel()
+function CooldownBase.GetCooldownModel(self: CooldownBase): CooldownModel.CooldownModel
 	return self._cooldownModel
 end
 
@@ -61,7 +81,7 @@ end
 	Gets the Roblox instance of the cooldown.
 	@return Instance
 ]=]
-function CooldownBase:GetObject()
+function CooldownBase.GetObject(self: CooldownBase): NumberValue
 	return self._obj
 end
 
@@ -69,7 +89,7 @@ end
 	Gets the time passed
 	@return number?
 ]=]
-function CooldownBase:GetTimePassed()
+function CooldownBase.GetTimePassed(self: CooldownBase): number?
 	return self._cooldownModel:GetTimePassed()
 end
 
@@ -77,7 +97,7 @@ end
 	Gets the time remaining
 	@return number?
 ]=]
-function CooldownBase:GetTimeRemaining()
+function CooldownBase.GetTimeRemaining(self: CooldownBase): number?
 	return self._cooldownModel:GetTimeRemaining()
 end
 
@@ -85,7 +105,7 @@ end
 	Gets the syncronized time stamp the cooldown is ending at
 	@return number?
 ]=]
-function CooldownBase:GetEndTime()
+function CooldownBase.GetEndTime(self: CooldownBase): number?
 	return self._cooldownModel:GetEndTime()
 end
 
@@ -93,7 +113,7 @@ end
 	Gets the syncronized time stamp the cooldown is starting at
 	@return number?
 ]=]
-function CooldownBase:GetStartTime()
+function CooldownBase.GetStartTime(self: CooldownBase): number?
 	return self._cooldownModel:GetStartTime()
 end
 
@@ -101,8 +121,8 @@ end
 	Gets the length of the cooldown
 	@return number
 ]=]
-function CooldownBase:GetLength()
+function CooldownBase.GetLength(self: CooldownBase): number
 	return self._cooldownModel:GetLength()
 end
 
-return CooldownBase
+return CooldownBase

package/src/Shared/Binders/CooldownShared.lua

@@ -1,17 +1,26 @@
+--!strict
 --[=[
 	@class CooldownShared
 ]=]
 
 local require = require(script.Parent.loader).load(script)
 
-local CooldownBase = require("CooldownBase")
 local Binder = require("Binder")
+local CooldownBase = require("CooldownBase")
+local ServiceBag = require("ServiceBag")
 
 local CooldownShared = setmetatable({}, CooldownBase)
 CooldownShared.ClassName = "CooldownShared"
 CooldownShared.__index = CooldownShared
 
-function CooldownShared.new(numberValue, serviceBag)
+export type CooldownShared = typeof(setmetatable(
+	{} :: {
+		_serviceBag: ServiceBag.ServiceBag,
+	},
+	{} :: typeof({ __index = CooldownShared })
+)) & CooldownBase.CooldownBase
+
+function CooldownShared.new(numberValue: NumberValue, serviceBag: ServiceBag.ServiceBag)
 	local self = setmetatable(CooldownBase.new(numberValue, serviceBag), CooldownShared)
 
 	self._serviceBag = assert(serviceBag, "No serviceBag")
@@ -19,4 +28,4 @@ function CooldownShared.new(numberValue, serviceBag)
 	return self
 end
 
-return Binder.new("Cooldown", CooldownShared)
+return Binder.new("Cooldown", CooldownShared :: any) :: Binder.Binder<CooldownShared>

package/src/Shared/CooldownConstants.lua

@@ -1,3 +1,4 @@
+--!strict
 --[=[
 	Holds constants for the cooldown.
 	@class CooldownConstants
@@ -8,6 +9,6 @@ local require = require(script.Parent.loader).load(script)
 local Table = require("Table")
 
 return Table.readonly({
-	COOLDOWN_TIME_NAME = "CooldownTime";
-	COOLDOWN_START_TIME_ATTRIBUTE = "CooldownStartTime";
-})
+	COOLDOWN_TIME_NAME = "CooldownTime",
+	COOLDOWN_START_TIME_ATTRIBUTE = "CooldownStartTime",
+})

package/src/Shared/CooldownUtils.lua

@@ -1,3 +1,4 @@
+--!strict
 --[=[
 	Helper methods for cooldown. See [RxCooldownUtils] for [Rx] utilities.
 	@class CooldownUtils
@@ -17,7 +18,7 @@ local CooldownUtils = {}
 	@param length number
 	@return Instance
 ]=]
-function CooldownUtils.create(parent, length)
+function CooldownUtils.create(parent: Instance, length: number): NumberValue
 	assert(typeof(parent) == "Instance", "Bad parent")
 	assert(type(length) == "number", "Bad length")
 	assert(length > 0, "Bad length")
@@ -39,20 +40,19 @@ end
 	@param parent Instance
 	@return Cooldown? | CooldownClient?
 ]=]
-function CooldownUtils.findCooldown(cooldownBinder, parent)
+function CooldownUtils.findCooldown(cooldownBinder, parent: Instance)
 	assert(cooldownBinder, "Bad cooldownBinder")
 	assert(typeof(parent) == "Instance", "Bad parent")
 
 	return BinderUtils.findFirstChild(cooldownBinder, parent)
 end
 
-
 --[=[
 	Makes a copy of the cooldown
 	@param cooldown Instance
 	@return Instance
 ]=]
-function CooldownUtils.clone(cooldown)
+function CooldownUtils.clone(cooldown: NumberValue): NumberValue
 	assert(typeof(cooldown) == "Instance", "Bad cooldown")
 
 	local copy = cooldown:Clone()
@@ -60,4 +60,4 @@ function CooldownUtils.clone(cooldown)
 	return copy
 end
 
-return CooldownUtils
+return CooldownUtils

package/src/Shared/Model/CooldownModel.lua

@@ -1,3 +1,4 @@
+--!strict
 --[=[
 	@class CooldownModel
 ]=]
@@ -5,17 +6,36 @@
 local require = require(script.Parent.loader).load(script)
 
 local BaseObject = require("BaseObject")
-local ValueObject = require("ValueObject")
-local Signal = require("Signal")
-local Rx = require("Rx")
 local DuckTypeUtils = require("DuckTypeUtils")
+local Rx = require("Rx")
+local Signal = require("Signal")
+local ValueObject = require("ValueObject")
 
 local CooldownModel = setmetatable({}, BaseObject)
 CooldownModel.ClassName = "CooldownModel"
 CooldownModel.__index = CooldownModel
 
-function CooldownModel.new()
-	local self = setmetatable(BaseObject.new(), CooldownModel)
+export type Clock = () -> number
+
+export type CooldownModel = typeof(setmetatable(
+	{} :: {
+		_length: ValueObject.ValueObject<number>,
+		_startTime: ValueObject.ValueObject<number>,
+		_clock: ValueObject.ValueObject<Clock>,
+		_doneFired: boolean,
+		Done: Signal.Signal<()>,
+		_cleanup: any,
+	},
+	{} :: typeof({ __index = CooldownModel })
+)) & BaseObject.BaseObject
+
+--[=[
+	Creates a new cooldown model
+
+	@return CooldownModel
+]=]
+function CooldownModel.new(): CooldownModel
+	local self: CooldownModel = setmetatable(BaseObject.new() :: any, CooldownModel)
 
 	self._length = self._maid:Add(ValueObject.new(0, "number"))
 	self._startTime = self._maid:Add(ValueObject.new(os.clock(), "number"))
@@ -36,10 +56,10 @@ function CooldownModel.new()
 	end
 
 	self._maid:GiveTask(Rx.combineLatestDefer({
-		length = self._length:Observe();
-		clock = self._clock:Observe();
-		startTime = self._startTime:Observe();
-	}):Subscribe(function(state)
+		length = self._length:Observe(),
+		clock = self._clock:Observe(),
+		startTime = self._startTime:Observe(),
+	}):Subscribe(function(state: any)
 		local now = state.clock()
 		local waitTime = state.length + state.startTime - now
 
@@ -56,39 +76,56 @@ function CooldownModel.new()
 	return self
 end
 
-function CooldownModel.isCooldownModel(value)
+--[=[
+	Returns true if the value is a CooldownModel
+	@param value any
+	@return boolean
+]=]
+function CooldownModel.isCooldownModel(value: any): boolean
 	return DuckTypeUtils.isImplementation(CooldownModel, value)
 end
 
-function CooldownModel:SetClock(clock)
+--[=[
+	Sets the clock to use for the cooldown
+	@param clock Clock
+]=]
+function CooldownModel.SetClock(self: CooldownModel, clock: ValueObject.Mountable<Clock>): () -> ()
 	if self._doneFired then
 		warn("[CooldownModel] - Done already fired")
 	end
 
-	self._clock:Mount(clock)
+	return self._clock:Mount(clock)
 end
 
-function CooldownModel:SetStartTime(startTime)
+--[=[
+	Sets the start time for the cooldown
+	@param startTime number
+]=]
+function CooldownModel.SetStartTime(self: CooldownModel, startTime: ValueObject.Mountable<number>): () -> ()
 	if self._doneFired then
 		warn("[CooldownModel] - Done already fired")
 	end
 
-	self._startTime:Mount(startTime)
+	return self._startTime:Mount(startTime)
 end
 
-function CooldownModel:SetLength(length)
+--[=[
+	Sets the length of the cooldown
+	@param length number
+]=]
+function CooldownModel.SetLength(self: CooldownModel, length: ValueObject.Mountable<number>): () -> ()
 	if self._doneFired then
 		warn("[CooldownModel] - Done already fired")
 	end
 
-	self._length:Mount(length)
+	return self._length:Mount(length)
 end
 
 --[=[
 	Gets the syncronized time stamp the cooldown is starting at
 	@return number
 ]=]
-function CooldownModel:GetStartTime()
+function CooldownModel.GetStartTime(self: CooldownModel): number
 	return self._startTime.Value
 end
 
@@ -96,13 +133,17 @@ end
 	Gets the time remaining
 	@return number
 ]=]
-function CooldownModel:GetTimeRemaining()
+function CooldownModel.GetTimeRemaining(self: CooldownModel): number
 	local endTime = self:GetEndTime()
 
 	return math.max(0, endTime - self._clock.Value())
 end
 
-function CooldownModel:GetTimePassed()
+--[=[
+	Gets the time passed
+	@return number
+]=]
+function CooldownModel.GetTimePassed(self: CooldownModel): number
 	local startTime = self._startTime.Value
 	return self._clock.Value() - startTime
 end
@@ -111,13 +152,16 @@ end
 	Gets the syncronized time stamp the cooldown is ending at
 	@return number?
 ]=]
-function CooldownModel:GetEndTime()
+function CooldownModel.GetEndTime(self: CooldownModel)
 	return self._startTime.Value + self:GetLength()
 end
 
-function CooldownModel:GetLength()
+--[=[
+	Gets the length of the cooldown
+	@return number
+]=]
+function CooldownModel.GetLength(self: CooldownModel): number
 	return self._length.Value
 end
 
-
-return CooldownModel
+return CooldownModel

package/src/Shared/Model/CooldownTrackerModel.lua

@@ -1,36 +1,58 @@
+--!strict
 --[=[
+	Helps track the active cooldown that is running.
+
 	@class CooldownTrackerModel
 ]=]
 
 local require = require(script.Parent.loader).load(script)
 
 local BaseObject = require("BaseObject")
-local ValueObject = require("ValueObject")
+local Brio = require("Brio")
+local CooldownModel = require("CooldownModel")
 local DuckTypeUtils = require("DuckTypeUtils")
+local Observable = require("Observable")
+local ValueObject = require("ValueObject")
 
 local CooldownTrackerModel = setmetatable({}, BaseObject)
 CooldownTrackerModel.ClassName = "CooldownTrackerModel"
 CooldownTrackerModel.__index = CooldownTrackerModel
 
-function CooldownTrackerModel.new()
-	local self = setmetatable(BaseObject.new(), CooldownTrackerModel)
+export type CooldownTrackerModel = typeof(setmetatable(
+	{} :: {
+		_currentCooldownModel: ValueObject.ValueObject<CooldownModel.CooldownModel?>,
+	},
+	{} :: typeof({ __index = CooldownTrackerModel })
+)) & BaseObject.BaseObject
 
-	self._currentCooldownModel = self._maid:Add(ValueObject.new(nil))
+--[=[
+	Creates a new cooldown tracker model
 
-	self._maid:GiveTask(self._currentCooldownModel:ObserveBrio(function(value)
-		return value ~= nil
-	end):Subscribe(function(brio)
-		if brio:IsDead() then
-			return
-		end
+	@return CooldownTrackerModel
+]=]
+function CooldownTrackerModel.new(): CooldownTrackerModel
+	local self: CooldownTrackerModel = setmetatable(BaseObject.new() :: any, CooldownTrackerModel)
 
-		local maid, cooldown = brio:ToMaidAndValue()
-		maid:GiveTask(cooldown.Done:Connect(function()
-			if self._currentCooldownModel.Value == cooldown then
-				self._currentCooldownModel.Value = nil
+	self._currentCooldownModel = self._maid:Add(ValueObject.new(nil))
+
+	self._maid:GiveTask(self._currentCooldownModel
+		:ObserveBrio(function(value)
+			return value ~= nil
+		end)
+		:Subscribe(function(brio)
+			if brio:IsDead() then
+				return
 			end
+
+			local maid, cooldown = brio:ToMaidAndValue()
+			assert(cooldown, "Must have cooldown")
+
+			maid:GiveTask(cooldown.Done:Connect(function()
+				if self._currentCooldownModel.Value == cooldown then
+					self._currentCooldownModel.Value = nil
+				end
+			end))
 		end))
-	end))
 
 	return self
 end
@@ -39,21 +61,39 @@ function CooldownTrackerModel.isCooldownTrackerModel(value: any): boolean
 	return DuckTypeUtils.isImplementation(CooldownTrackerModel, value)
 end
 
-function CooldownTrackerModel:IsCoolingDown(): boolean
+function CooldownTrackerModel.IsCoolingDown(self: CooldownTrackerModel): boolean
 	return self._currentCooldownModel.Value ~= nil
 end
 
-function CooldownTrackerModel:ObserveActiveCooldownModel()
+function CooldownTrackerModel.ObserveActiveCooldownModel(
+	self: CooldownTrackerModel
+): Observable.Observable<CooldownModel.CooldownModel?>
 	return self._currentCooldownModel:Observe()
 end
 
-function CooldownTrackerModel:ObserveActiveCooldownModelBrio()
+--[=[
+	Observes the active cooldown model, but only fires when it is not nil
+
+	@return Observable<Brio<CooldownModel>>
+]=]
+function CooldownTrackerModel.ObserveActiveCooldownModelBrio(self: CooldownTrackerModel): Observable.Observable<
+	Brio.Brio<CooldownModel.CooldownModel>
+>
 	return self._currentCooldownModel:ObserveBrio(function(value)
 		return value ~= nil
-	end)
+	end) :: any
 end
 
-function CooldownTrackerModel:SetCooldownModel(cooldownModel)
+--[=[
+	Sets the cooldown model. Returns a function to unmount the model.
+
+	@param cooldownModel CooldownModel
+	@return function
+]=]
+function CooldownTrackerModel.SetCooldownModel(
+	self: CooldownTrackerModel,
+	cooldownModel: ValueObject.Mountable<CooldownModel.CooldownModel?>
+): () -> ()
 	self._currentCooldownModel:Mount(cooldownModel)
 
 	return function()
@@ -62,9 +102,9 @@ function CooldownTrackerModel:SetCooldownModel(cooldownModel)
 		end
 
 		if self._currentCooldownModel.Value == cooldownModel then
-			self._currentCooldownModel.Value = nil
+			self._currentCooldownModel:Mount(nil)
 		end
 	end
 end
 
-return CooldownTrackerModel
+return CooldownTrackerModel

package/src/Shared/RxCooldownUtils.lua

@@ -1,3 +1,4 @@
+--!strict
 --[=[
 	[Observable] utilities for [Cooldown] class.
 	@class RxCooldownUtils
@@ -5,6 +6,8 @@
 
 local require = require(script.Parent.loader).load(script)
 
+local Brio = require("Brio")
+local Observable = require("Observable")
 local RxBinderUtils = require("RxBinderUtils")
 
 local RxCooldownUtils = {}
@@ -15,8 +18,8 @@ local RxCooldownUtils = {}
 	@param parent Instance
 	@return Observable<Brio<Cooldown | CooldownClient>>
 ]=]
-function RxCooldownUtils.observeCooldownBrio(cooldownBinder, parent)
+function RxCooldownUtils.observeCooldownBrio(cooldownBinder, parent: Instance): Observable.Observable<Brio.Brio<any>>
 	return RxBinderUtils.observeBoundChildClassBrio(cooldownBinder, parent)
 end
 
-return RxCooldownUtils
+return RxCooldownUtils

package/src/Shared/Tracker/CooldownTracker.lua

@@ -7,10 +7,10 @@ local require = require(script.Parent.loader).load(script)
 
 local BaseObject = require("BaseObject")
 local CooldownShared = require("CooldownShared")
-local ValueObject = require("ValueObject")
-local RxBinderUtils = require("RxBinderUtils")
 local CooldownTrackerModel = require("CooldownTrackerModel")
 local Maid = require("Maid")
+local RxBinderUtils = require("RxBinderUtils")
+local ValueObject = require("ValueObject")
 
 local CooldownTracker = setmetatable({}, BaseObject)
 CooldownTracker.ClassName = "CooldownTracker"
@@ -32,8 +32,8 @@ function CooldownTracker.new(serviceBag, parent)
 	end))
 
 	-- Handle not running
-	self._maid:GiveTask(RxBinderUtils.observeBoundChildClassBrio(self._cooldownBinder, self._obj)
-		:Subscribe(function(brio)
+	self._maid:GiveTask(
+		RxBinderUtils.observeBoundChildClassBrio(self._cooldownBinder, self._obj):Subscribe(function(brio)
 			if brio:IsDead() then
 				return
 			end
@@ -56,7 +56,8 @@ function CooldownTracker.new(serviceBag, parent)
 					self.CurrentCooldown.Value = nil
 				end
 			end)
-		end))
+		end)
+	)
 
 	return self
 end
@@ -83,4 +84,4 @@ function CooldownTracker:_handleNewCooldown(new, _old)
 	self._maid._cooldownMaid = maid
 end
 
-return CooldownTracker
+return CooldownTracker