@quenty/binder 14.19.0 → 14.19.1

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [14.19.1](https://github.com/Quenty/NevermoreEngine/compare/@quenty/binder@14.19.0...@quenty/binder@14.19.1) (2025-04-05)
+
+
+### Bug Fixes
+
+* Add types to packages ([2374fb2](https://github.com/Quenty/NevermoreEngine/commit/2374fb2b043cfbe0e9b507b3316eec46a4e353a0))
+
+
+
+
+
 # [14.19.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/binder@14.18.2...@quenty/binder@14.19.0) (2025-04-02)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/binder",
-  "version": "14.19.0",
+  "version": "14.19.1",
   "description": "Utility object to Bind a class to Roblox object, and associated helper methods",
   "keywords": [
     "Roblox",
@@ -25,19 +25,19 @@
     "Quenty"
   ],
   "dependencies": {
-    "@quenty/baseobject": "^10.8.0",
-    "@quenty/brio": "^14.17.0",
-    "@quenty/instanceutils": "^13.17.0",
-    "@quenty/linkutils": "^13.17.0",
-    "@quenty/loader": "^10.8.0",
-    "@quenty/maid": "^3.4.0",
-    "@quenty/promise": "^10.10.1",
-    "@quenty/rx": "^13.17.0",
-    "@quenty/signal": "^7.10.0",
-    "@quenty/valueobject": "^13.17.0"
+    "@quenty/baseobject": "^10.8.1",
+    "@quenty/brio": "^14.17.1",
+    "@quenty/instanceutils": "^13.17.1",
+    "@quenty/linkutils": "^13.17.1",
+    "@quenty/loader": "^10.8.1",
+    "@quenty/maid": "^3.4.1",
+    "@quenty/promise": "^10.10.2",
+    "@quenty/rx": "^13.17.1",
+    "@quenty/signal": "^7.10.1",
+    "@quenty/valueobject": "^13.17.1"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e8ea56930e65322fcffc05a1556d5df988068f0b"
+  "gitHead": "78c3ac0ab08dd18085b6e6e6e4f745e76ed99f68"
 }

package/src/Shared/Binder.lua

@@ -1,3 +1,4 @@
+--!strict
 --[=[
 	Bind class to Roblox Instance
 
@@ -29,17 +30,53 @@ local require = require(script.Parent.loader).load(script)
 local RunService = game:GetService("RunService")
 local CollectionService = game:GetService("CollectionService")
 
+local Brio = require("Brio")
 local Maid = require("Maid")
 local MaidTaskUtils = require("MaidTaskUtils")
 local Observable = require("Observable")
-local promiseBoundClass = require("promiseBoundClass")
+local Promise = require("Promise")
 local Signal = require("Signal")
-local Brio = require("Brio")
+local _CancelToken = require("CancelToken")
 
 local Binder = {}
 Binder.__index = Binder
 Binder.ClassName = "Binder"
 
+export type ConstructorCallback<T> = (Instance) -> T
+
+export type ClassDefinition<T> = {
+	new: ConstructorCallback<T>,
+}
+
+export type ProviderDefition<T> = {
+	Create: ConstructorCallback<T>,
+}
+
+export type BinderConstructor<T> = ClassDefinition<T> | ProviderDefition<T> | ConstructorCallback<T>
+
+export type Binder<T> = typeof(setmetatable(
+	{} :: {
+		ServiceName: string,
+
+		_tagName: string,
+		_defaultClassType: string,
+		_args: { any },
+		_constructor: BinderConstructor<T>,
+
+		_started: boolean,
+		_initialized: boolean,
+		_pendingInstSet: { [Instance]: true },
+		_instToClass: { [Instance]: T },
+		_allClassSet: { [T]: true },
+		_maid: Maid.Maid,
+		_listeners: { [Instance]: { [any]: true } },
+		_classAddedSignal: Signal.Signal<T, Instance>?,
+		_classRemovingSignal: Signal.Signal<T, Instance>?,
+		_classRemovedSignal: Signal.Signal<T, Instance>?,
+	},
+	Binder
+))
+
 --[=[
 	Constructor for a binder
 	@type BinderContructor (Instance, ...: any) -> T | { new: (Instance, ...: any) } | { Create(self, Instance, ...: any) }
@@ -66,7 +103,7 @@ Binder.ClassName = "Binder"
 	@param ... any -- Variable arguments that will be passed into the constructor
 	@return Binder<T>
 ]=]
-function Binder.new(tagName, constructor, ...)
+function Binder.new<T>(tagName: string, constructor: BinderConstructor<T>, ...): Binder<T>
 	assert(type(tagName) == "string", "Bad tagName")
 
 	local self = setmetatable({}, Binder)
@@ -84,7 +121,7 @@ function Binder.new(tagName, constructor, ...)
 		self._args = { ... }
 	end
 
-	return self
+	return self :: Binder<T>
 end
 
 --[=[
@@ -93,7 +130,7 @@ end
 	@param value any
 	@return boolean true or false, whether or not it is a value
 ]=]
-function Binder.isBinder(value)
+function Binder.isBinder(value: any): boolean
 	return type(value) == "table"
 		and type(value.Start) == "function"
 		and type(value.GetTag) == "function"
@@ -134,7 +171,7 @@ function Binder:Init(...)
 
 	if select("#", ...) > 0 then
 		if not self._args then
-			self._args = {...}
+			self._args = { ... }
 		elseif not self:_argsMatch(...) then
 			warn("[Binder.Init] - Non-matching args from :Init() and .new()")
 		end
@@ -153,7 +190,7 @@ function Binder:_argsMatch(...)
 		return false
 	end
 
-	for index, value in pairs({...}) do
+	for index, value in { ... } do
 		if self._args[index] ~= value then
 			return false
 		end
@@ -165,7 +202,7 @@ end
 --[=[
 	Listens for new instances and connects to the GetInstanceAddedSignal() and removed signal!
 ]=]
-function Binder:Start()
+function Binder.Start<T>(self: Binder<T>)
 	if not self._initialized then
 		self:Init()
 	end
@@ -176,7 +213,7 @@ function Binder:Start()
 	self._maid._warning = nil
 	self._started = true
 
-	for _, inst in pairs(CollectionService:GetTagged(self._tagName)) do
+	for _, inst in CollectionService:GetTagged(self._tagName) do
 		task.spawn(self._add, self, inst)
 	end
 
@@ -192,7 +229,7 @@ end
 	Returns the tag name that the binder has.
 	@return string
 ]=]
-function Binder:GetTag()
+function Binder.GetTag<T>(self: Binder<T>): string
 	return self._tagName
 end
 
@@ -202,7 +239,7 @@ end
 
 	@return BinderContructor
 ]=]
-function Binder:GetConstructor()
+function Binder.GetConstructor<T>(self: Binder<T>): BinderConstructor<T>
 	return self._constructor
 end
 
@@ -210,9 +247,9 @@ end
 	Observes the current value of the instance
 
 	@param instance Instance
-	@return Observable<T | nil>
+	@return Observable<T?>
 ]=]
-function Binder:Observe(instance)
+function Binder:Observe(instance: Instance)
 	assert(typeof(instance) == "Instance", "Bad instance")
 
 	return Observable.new(function(sub)
@@ -232,20 +269,20 @@ end
 
 	@return Observable<Brio<T>>
 ]=]
-function Binder:ObserveAllBrio()
+function Binder.ObserveAllBrio<T>(self: Binder<T>): Observable.Observable<Brio.Brio<T>>
 	return Observable.new(function(sub)
 		local maid = Maid.new()
 
-		local function handleNewClass(class)
+		local function handleNewClass(class: T)
 			local brio = Brio.new(class)
-			maid[class] = brio
+			maid[class :: any] = brio
 
 			sub:Fire(brio)
 		end
 
 		maid:GiveTask(self:GetClassAddedSignal():Connect(handleNewClass))
 
-		for _, item in pairs(self:GetAll()) do
+		for _, item in self:GetAll() do
 			if not sub:IsPending() then
 				break
 			end
@@ -255,12 +292,12 @@ function Binder:ObserveAllBrio()
 
 		if sub:IsPending() then
 			maid:GiveTask(self:GetClassRemovingSignal():Connect(function(class)
-				maid[class] = nil
+				maid[class :: any] = nil
 			end))
 		end
 
 		return maid
-	end)
+	end) :: any
 end
 
 --[=[
@@ -269,7 +306,7 @@ end
 	@param instance Instance
 	@return Observable<Brio<T>>
 ]=]
-function Binder:ObserveBrio(instance)
+function Binder.ObserveBrio<T>(self: Binder<T>, instance: Instance): Observable.Observable<Brio.Brio<T>>
 	assert(typeof(instance) == "Instance", "Bad instance")
 
 	return Observable.new(function(sub)
@@ -290,7 +327,7 @@ function Binder:ObserveBrio(instance)
 		handleClassChanged(self:Get(instance))
 
 		return maid
-	end)
+	end) :: any
 end
 
 --[=[
@@ -305,7 +342,7 @@ end
 	@param callback function
 	@return function -- Cleanup function
 ]=]
-function Binder:ObserveInstance(inst, callback)
+function Binder.ObserveInstance<T>(self: Binder<T>, inst: Instance, callback: (T?) -> ()): () -> ()
 	assert(typeof(inst) == "Instance", "Bad inst")
 	assert(type(callback) == "function", "Bad callback")
 
@@ -340,14 +377,14 @@ end
 
 	@return Signal<T>
 ]=]
-function Binder:GetClassAddedSignal()
+function Binder.GetClassAddedSignal<T>(self: Binder<T>): Signal.Signal<T, Instance>
 	if self._classAddedSignal then
 		return self._classAddedSignal
 	end
 
-	self._classAddedSignal = self._maid:Add(Signal.new()) -- :fire(class, inst)
+	self._classAddedSignal = self._maid:Add(Signal.new() :: any) -- :fire(class, inst)
 
-	return self._classAddedSignal
+	return self._classAddedSignal :: any
 end
 
 --[=[
@@ -355,14 +392,14 @@ end
 
 	@return Signal<T>
 	]=]
-function Binder:GetClassRemovingSignal()
+function Binder.GetClassRemovingSignal<T>(self: Binder<T>): Signal.Signal<T, Instance>
 	if self._classRemovingSignal then
 		return self._classRemovingSignal
 	end
 
-	self._classRemovingSignal = self._maid:Add(Signal.new()) -- :fire(class, inst)
+	self._classRemovingSignal = self._maid:Add(Signal.new() :: any) -- :fire(class, inst)
 
-	return self._classRemovingSignal
+	return self._classRemovingSignal :: any
 end
 
 --[=[
@@ -370,14 +407,14 @@ end
 
 	@return Signal<T>
 ]=]
-function Binder:GetClassRemovedSignal()
+function Binder.GetClassRemovedSignal<T>(self: Binder<T>): Signal.Signal<T, Instance>
 	if self._classRemovedSignal then
 		return self._classRemovedSignal
 	end
 
-	self._classRemovedSignal = self._maid:Add(Signal.new()) -- :fire(class, inst)
+	self._classRemovedSignal = self._maid:Add(Signal.new() :: any) -- :fire(class, inst)
 
-	return self._classRemovedSignal
+	return self._classRemovedSignal :: any
 end
 
 --[=[
@@ -388,7 +425,7 @@ end
 
 	-- Update every bird every frame
 	RunService.Stepped:Connect(function()
-		for _, bird in pairs(birdBinder:GetAll()) do
+		for _, bird in birdBinder:GetAll() do
 			bird:Update()
 		end
 	end)
@@ -398,15 +435,14 @@ end
 
 	@return {T}
 ]=]
-function Binder:GetAll()
+function Binder.GetAll<T>(self: Binder<T>): { T }
 	local all = {}
-	for class, _ in pairs(self._allClassSet) do
-		all[#all+1] = class
+	for class, _ in self._allClassSet do
+		all[#all + 1] = class
 	end
 	return all
 end
 
-
 --[=[
 	Faster method to get all items in a binder
 
@@ -427,9 +463,9 @@ end
 	Do not mutate this set directly
 	:::
 
-	@return { [T]: boolean }
+	@return { [T]: true }
 ]=]
-function Binder:GetAllSet()
+function Binder.GetAllSet<T>(self: Binder<T>): { [T]: true }
 	return self._allClassSet
 end
 
@@ -446,9 +482,15 @@ end
 	@param inst Instance -- Instance to check
 	@return T? -- Bound class
 ]=]
-function Binder:Bind(inst)
+function Binder.Bind<T>(self: Binder<T>, inst: Instance): T?
 	if RunService:IsClient() then
-		warn(string.format("[Binder.Bind] - Bindings '%s' done on the client! Will be disrupted upon server replication! %s", self._tagName, debug.traceback()))
+		warn(
+			string.format(
+				"[Binder.Bind] - Bindings '%s' done on the client! Will be disrupted upon server replication! %s",
+				self._tagName,
+				debug.traceback()
+			)
+		)
 	end
 
 	CollectionService:AddTag(inst, self._tagName)
@@ -460,7 +502,7 @@ end
 
 	@param inst Instance
 ]=]
-function Binder:Tag(inst)
+function Binder.Tag<T>(self: Binder<T>, inst: Instance)
 	assert(typeof(inst) == "Instance", "Bad inst")
 
 	CollectionService:AddTag(inst, self._tagName)
@@ -471,7 +513,7 @@ end
 
 	@param inst Instance
 ]=]
-function Binder:HasTag(inst)
+function Binder.HasTag<T>(self: Binder<T>, inst: Instance): boolean
 	assert(typeof(inst) == "Instance", "Bad inst")
 
 	return CollectionService:HasTag(inst, self._tagName)
@@ -482,7 +524,7 @@ end
 
 	@param inst Instance
 ]=]
-function Binder:Untag(inst)
+function Binder.Untag<T>(self: Binder<T>, inst: Instance)
 	assert(typeof(inst) == "Instance", "Bad inst")
 
 	CollectionService:RemoveTag(inst, self._tagName)
@@ -494,11 +536,17 @@ end
 	@server
 	@param inst Instance -- Instance to unbind
 ]=]
-function Binder:Unbind(inst)
+function Binder.Unbind<T>(self: Binder<T>, inst: Instance)
 	assert(typeof(inst) == "Instance", "Bad inst'")
 
 	if RunService:IsClient() then
-		warn(string.format("[Binder.Bind] - Unbinding '%s' done on the client! Might be disrupted upon server replication! %s", self._tagName, debug.traceback()))
+		warn(
+			string.format(
+				"[Binder.Bind] - Unbinding '%s' done on the client! Might be disrupted upon server replication! %s",
+				self._tagName,
+				debug.traceback()
+			)
+		)
 	end
 
 	CollectionService:RemoveTag(inst, self._tagName)
@@ -514,9 +562,11 @@ end
  @param inst Instance -- Instance to bind
  @return T? -- Bound class (potentially)
 ]=]
-function Binder:BindClient(inst)
+function Binder.BindClient<T>(self: Binder<T>, inst: Instance)
 	if not RunService:IsClient() then
-		warn(string.format("[Binder.BindClient] - Bindings '%s' done on the server! Will be replicated!", self._tagName))
+		warn(
+			string.format("[Binder.BindClient] - Bindings '%s' done on the server! Will be replicated!", self._tagName)
+		)
 	end
 
 	CollectionService:AddTag(inst, self._tagName)
@@ -529,7 +579,7 @@ end
 	@client
 	@param inst Instance -- Instance to unbind
 ]=]
-function Binder:UnbindClient(inst)
+function Binder.UnbindClient<T>(self: Binder<T>, inst: Instance)
 	assert(typeof(inst) == "Instance", "Bad inst")
 	CollectionService:RemoveTag(inst, self._tagName)
 end
@@ -540,7 +590,7 @@ end
 	@param inst Instance -- Instance to check
 	@return T?
 ]=]
-function Binder:Get(inst)
+function Binder.Get<T>(self: Binder<T>, inst: Instance): T?
 	assert(typeof(inst) == "Instance", "Argument 'inst' is not an Instance")
 	return self._instToClass[inst]
 end
@@ -549,21 +599,59 @@ end
 	Returns a promise which will resolve when the instance is bound.
 
 	@param inst Instance -- Instance to check
-	@param cancelToken? CancelToken
+	@param cancelToken CancelToken?
 	@return Promise<T>
 ]=]
-function Binder:Promise(inst, cancelToken)
+function Binder.Promise<T>(self: Binder<T>, inst: Instance, cancelToken: _CancelToken.CancelToken?): Promise.Promise<T>
 	assert(typeof(inst) == "Instance", "Argument 'inst' is not an Instance")
-	return promiseBoundClass(self, inst, cancelToken)
+
+	local class = self:Get(inst)
+	if class then
+		return Promise.resolved(class)
+	end
+
+	local maid = Maid.new()
+	local promise = Promise.new()
+
+	if cancelToken then
+		cancelToken:ErrorIfCancelled()
+		maid:GivePromise(cancelToken.PromiseCancelled):Then(function()
+			promise:Reject()
+		end)
+	end
+
+	maid:GiveTask(self:ObserveInstance(inst, function(classAdded)
+		if classAdded then
+			promise:Resolve(classAdded)
+		end
+	end))
+
+	task.delay(5, function()
+		if promise:IsPending() then
+			warn(
+				string.format(
+					"[promiseBoundClass] - Infinite yield possible on %q for binder %q\n",
+					inst:GetFullName(),
+					self:GetTag()
+				)
+			)
+		end
+	end)
+
+	promise:Finally(function()
+		maid:Destroy()
+	end)
+
+	return promise
 end
 
 --[=[
 	Creates a new class tagged with this binder's instance
 
-	@param className string | nil
+	@param className string?
 	@return Instance
 ]=]
-function Binder:Create(className)
+function Binder.Create<T>(self: Binder<T>, className: string): Instance
 	assert(type(className) == "string" or className == nil, "Bad className")
 
 	local instance = Instance.new(className or self._defaultClassType)
@@ -575,7 +663,7 @@ function Binder:Create(className)
 	return instance
 end
 
-function Binder:_add(inst)
+function Binder._add<T>(self: Binder<T>, inst: Instance)
 	assert(typeof(inst) == "Instance", "Argument 'inst' is not an Instance")
 
 	if self._instToClass[inst] then
@@ -590,28 +678,33 @@ function Binder:_add(inst)
 
 	self._pendingInstSet[inst] = true
 
-	local class
-	if type(self._constructor) == "function" then
-		class = self._constructor(inst, unpack(self._args))
-	elseif self._constructor.Create then
-		class = self._constructor:Create(inst, unpack(self._args))
+	local constructor: any = self._constructor
+	local class: T
+	if type(constructor) == "function" then
+		class = constructor(inst, unpack(self._args))
+	elseif constructor.Create then
+		class = constructor:Create(inst, unpack(self._args))
 	else
-		class = self._constructor.new(inst, unpack(self._args))
+		class = constructor.new(inst, unpack(self._args))
 	end
 
 	if self._pendingInstSet[inst] ~= true then
 		-- Got GCed in the process of loading?!
 		-- Constructor probably yields. Yikes.
-		warn(string.format("[Binder._add] - Failed to load instance %q of %q, removed while loading!",
+		warn(
+			string.format(
+				"[Binder._add] - Failed to load instance %q of %q, removed while loading!",
 				inst:GetFullName(),
-				tostring(type(self._constructor) == "table" and self._constructor.ClassName or self._constructor)))
+				tostring(type(constructor) == "table" and constructor.ClassName or constructor)
+			)
+		)
 		return
 	end
 
 	self._pendingInstSet[inst] = nil
 	assert(self._instToClass[inst] == nil, "Overwrote")
 
-	class = class or {}
+	class = class or {} :: any
 
 	-- Add to state
 	self._allClassSet[class] = true
@@ -620,7 +713,7 @@ function Binder:_add(inst)
 	-- Fire events
 	local listeners = self._listeners[inst]
 	if listeners then
-		for callback, _ in pairs(listeners) do
+		for callback, _ in listeners do
 			task.spawn(callback, class)
 		end
 	end
@@ -630,7 +723,7 @@ function Binder:_add(inst)
 	end
 end
 
-function Binder:_remove(inst)
+function Binder._remove<T>(self: Binder<T>, inst: Instance)
 	self._pendingInstSet[inst] = nil
 
 	local class = self._instToClass[inst]
@@ -650,7 +743,7 @@ function Binder:_remove(inst)
 	-- Fire listener here
 	local listeners = self._listeners[inst]
 	if listeners then
-		for callback, _ in pairs(listeners) do
+		for callback, _ in listeners do
 			task.spawn(callback, nil)
 		end
 	end
@@ -668,9 +761,9 @@ end
 --[=[
 	Cleans up all bound classes, and disconnects all events.
 ]=]
-function Binder:Destroy()
+function Binder.Destroy<T>(self: Binder<T>)
 	local inst, class = next(self._instToClass)
-	while class ~= nil do
+	while class ~= nil and inst ~= nil do
 		task.spawn(self._remove, self, inst)
 		inst, class = next(self._instToClass)
 	end
@@ -679,4 +772,4 @@ function Binder:Destroy()
 	self._maid:DoCleaning()
 end
 
-return Binder
+return Binder

package/src/Shared/BinderGroup.lua

@@ -44,12 +44,12 @@ end
 
 	@param binders { Binder<T> }
 ]=]
-function BinderGroup:AddList(binders)
+function BinderGroup:AddList(binders: { any })
 	assert(type(binders) == "table", "Bad binders")
 
 	-- Assume to be using osyris's typechecking library,
 	-- we have an optional constructor to validate binder classes.
-	for _, binder in pairs(binders) do
+	for _, binder in binders do
 		self:Add(binder)
 	end
 end

package/src/Shared/BinderGroupProvider.lua

@@ -71,8 +71,8 @@ end
 	@param groupName string
 	@return BinderGroup?
 ]=]
-function BinderGroupProvider:Get(groupName)
-	assert(type(groupName) == "string", "groupName must be a string")
+function BinderGroupProvider:Get(groupName: string)
+	assert(type(groupName) == "string", "Bad groupName")
 	return rawget(self, groupName)
 end
 

package/src/Shared/BinderProvider.lua

@@ -40,7 +40,7 @@ BinderProvider.__index = BinderProvider
 	@param initMethod (self, serviceBag: ServiceBag)
 	@return BinderProvider
 ]=]
-function BinderProvider.new(serviceName, initMethod)
+function BinderProvider.new(serviceName: string, initMethod)
 	local self = setmetatable({}, BinderProvider)
 
 	if type(serviceName) == "string" then
@@ -48,7 +48,9 @@ function BinderProvider.new(serviceName, initMethod)
 	else
 		-- Backwords compatibility (for now)
 		if type(serviceName) == "function" and initMethod == nil then
-			warn("[BinderProvider] - Missing serviceName for binder provider. Please pass in a service name as the first argument.")
+			warn(
+				"[BinderProvider] - Missing serviceName for binder provider. Please pass in a service name as the first argument."
+			)
 			initMethod = serviceName
 		else
 			error("Bad serviceName")
@@ -68,7 +70,7 @@ end
 	@param value any
 	@return boolean -- True if it is a binder provider
 ]=]
-function BinderProvider.isBinderProvider(value)
+function BinderProvider.isBinderProvider(value: any): boolean
 	return type(value) == "table" and value.ClassName == "BinderProvider"
 end
 
@@ -118,7 +120,7 @@ function BinderProvider:Init(...)
 
 	self._initMethod(self, ...)
 
-	for _, binder in pairs(self._binders) do
+	for _, binder in self._binders do
 		binder:Init(...)
 	end
 
@@ -151,7 +153,7 @@ function BinderProvider:Start()
 	assert(not self._started, "Already started")
 
 	self._started = true
-	for _, binder in pairs(self._binders) do
+	for _, binder in self._binders do
 		binder:Start()
 	end
 
@@ -176,8 +178,8 @@ end
 	@param tagName string
 	@return Binder<T>?
 ]=]
-function BinderProvider:Get(tagName)
-	assert(type(tagName) == "string", "tagName must be a string")
+function BinderProvider:Get(tagName: string)
+	assert(type(tagName) == "string", "Bad tagName")
 	return rawget(self, tagName)
 end
 
@@ -199,7 +201,7 @@ end
 function BinderProvider:Destroy()
 	self._destroyed = true
 
-	for _, item in pairs(self._binders) do
+	for _, item in self._binders do
 		rawset(self, item:GetTag(), nil)
 	end
 

package/src/Shared/BinderUtils.lua

@@ -42,7 +42,7 @@ function BinderUtils.findFirstChild(binder, parent)
 	assert(type(binder) == "table", "Binder must be binder")
 	assert(typeof(parent) == "Instance", "Parent parameter must be instance")
 
-	for _, child in pairs(parent:GetChildren()) do
+	for _, child in parent:GetChildren() do
 		local class = binder:Get(child)
 		if class then
 			return class
@@ -64,7 +64,7 @@ function BinderUtils.getChildren(binder, parent)
 	assert(typeof(parent) == "Instance", "Parent parameter must be instance")
 
 	local objects = {}
-	for _, item in pairs(parent:GetChildren()) do
+	for _, item in parent:GetChildren() do
 		local obj = binder:Get(item)
 		if obj then
 			table.insert(objects, obj)
@@ -73,7 +73,6 @@ function BinderUtils.getChildren(binder, parent)
 	return objects
 end
 
-
 --[=[
 	Maps a list of binders into a look up table where the keys are
 	tags and the value is the binder.
@@ -87,7 +86,7 @@ function BinderUtils.mapBinderListToTable(bindersList)
 	assert(type(bindersList) == "table", "bindersList must be a table of binders")
 
 	local tags = {}
-	for _, binder in pairs(bindersList) do
+	for _, binder in bindersList do
 		tags[binder:GetTag()] = binder
 	end
 	return tags
@@ -109,8 +108,8 @@ end
 function BinderUtils.getMappedFromList(tagsMap, instanceList)
 	local objects = {}
 
-	for _, instance in pairs(instanceList) do
-		for _, tag in pairs(CollectionService:GetTags(instance)) do
+	for _, instance in instanceList do
+		for _, tag in CollectionService:GetTags(instance) do
 			local binder = tagsMap[tag]
 			if binder then
 				local obj = binder:Get(instance)
@@ -150,7 +149,7 @@ end
 function BinderUtils.getLinkedChildren(binder, linkName, parent)
 	local seen = {}
 	local objects = {}
-	for _, item in pairs(parent:GetChildren()) do
+	for _, item in parent:GetChildren() do
 		if item.Name == linkName and item:IsA("ObjectValue") and item.Value then
 			local obj = binder:Get(item.Value)
 			if obj then
@@ -158,7 +157,12 @@ function BinderUtils.getLinkedChildren(binder, linkName, parent)
 					seen[obj] = true
 					table.insert(objects, obj)
 				else
-					warn(string.format("[BinderUtils.getLinkedChildren] - Double linked children at %q", item:GetFullName()))
+					warn(
+						string.format(
+							"[BinderUtils.getLinkedChildren] - Double linked children at %q",
+							item:GetFullName()
+						)
+					)
 				end
 			end
 		end
@@ -178,7 +182,7 @@ function BinderUtils.getDescendants(binder, parent)
 	assert(typeof(parent) == "Instance", "Parent parameter must be instance")
 
 	local objects = {}
-	for _, item in pairs(parent:GetDescendants()) do
+	for _, item in parent:GetDescendants() do
 		local obj = binder:Get(item)
 		if obj then
 			table.insert(objects, obj)

package/src/Shared/Collection/BoundChildCollection.lua

@@ -18,7 +18,7 @@ BoundChildCollection.__index = BoundChildCollection
 	@param parent Instance
 	@return BoundChildCollection<T>
 ]=]
-function BoundChildCollection.new(binder, parent)
+function BoundChildCollection.new(binder, parent: Instance)
 	local self = setmetatable(BaseObject.new(), BoundChildCollection)
 
 	self._binder = binder or error("No binder")
@@ -89,7 +89,7 @@ end
 ]=]
 function BoundChildCollection:GetClasses()
 	local list = {}
-	for class, _ in pairs(self._classes) do
+	for class, _ in self._classes do
 		table.insert(list, class)
 	end
 	return list
@@ -104,7 +104,7 @@ function BoundChildCollection:_startTracking()
 		self:_removeChild(child)
 	end))
 
-	for _, child in pairs(self._parent:GetChildren()) do
+	for _, child in self._parent:GetChildren() do
 		-- Specifically do not fire on init because nothing is listening
 		self:_addChild(child, true)
 	end

package/src/Shared/Promise/promiseBoundClass.lua

@@ -1,3 +1,4 @@
+--!strict
 --[=[
 	Utility function to promise a bound class on an object
 	@class promiseBoundClass
@@ -5,52 +6,22 @@
 
 local require = require(script.Parent.loader).load(script)
 
-local Promise = require("Promise")
-local Maid = require("Maid")
+local Binder = require("Binder")
+local _Promise = require("Promise")
+local _CancelToken = require("CancelToken")
 
 --[=[
-Returns a promise that resolves when the class is bound to the instance.
-@param binder Binder<T>
-@param inst Instance
-@param cancelToken CancelToken
-@return Promise<T>
-@function promiseBoundClass
-@within promiseBoundClass
+	Returns a promise that resolves when the class is bound to the instance.
+	@param binder Binder<T>
+	@param inst Instance
+	@param cancelToken CancelToken
+	@return Promise<T>
+	@function promiseBoundClass
+	@within promiseBoundClass
 ]=]
-return function(binder, inst, cancelToken)
-	assert(type(binder) == "table", "'binder' must be table")
+return function<T>(binder: Binder.Binder<T>, inst: Instance, cancelToken: _CancelToken.CancelToken?): _Promise.Promise<T>
+	assert(Binder.isBinder(binder), "'binder' must be table")
 	assert(typeof(inst) == "Instance", "'inst' must be instance")
 
-	local class = binder:Get(inst)
-	if class then
-		return Promise.resolved(class)
-	end
-
-	local maid = Maid.new()
-	local promise = Promise.new()
-
-	if cancelToken then
-		cancelToken:ErrorIfCancelled()
-		maid:GivePromise(cancelToken.PromiseCancelled):Then(function()
-			promise:Reject()
-		end)
-	end
-
-	maid:GiveTask(binder:ObserveInstance(inst, function(classAdded)
-		if classAdded then
-			promise:Resolve(classAdded)
-		end
-	end))
-
-	task.delay(5, function()
-		if promise:IsPending() then
-			warn(string.format("[promiseBoundClass] - Infinite yield possible on %q for binder %q\n", inst:GetFullName(), binder:GetTag()))
-		end
-	end)
-
-	promise:Finally(function()
-		maid:Destroy()
-	end)
-
-	return promise
+	return binder:Promise(inst, cancelToken)
 end