@quenty/settings 11.23.2-canary.547.ba47c62.0 → 11.23.3-canary.550.afa1b3b.0

package/CHANGELOG.md

@@ -3,7 +3,15 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [11.23.2-canary.547.ba47c62.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/settings@11.23.0...@quenty/settings@11.23.2-canary.547.ba47c62.0) (2025-04-07)
+## [11.23.3-canary.550.afa1b3b.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/settings@11.23.2...@quenty/settings@11.23.3-canary.550.afa1b3b.0) (2025-04-10)
+
+**Note:** Version bump only for package @quenty/settings
+
+
+
+
+
+## [11.23.2](https://github.com/Quenty/NevermoreEngine/compare/@quenty/settings@11.23.0...@quenty/settings@11.23.2) (2025-04-07)
 
 
 ### Bug Fixes

package/LICENSE.md

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2014-2024 James Onnen (Quenty)
+Copyright (c) 2014-2025 James Onnen (Quenty)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/settings",
-  "version": "11.23.2-canary.547.ba47c62.0",
+  "version": "11.23.3-canary.550.afa1b3b.0",
   "description": "Centralized player settings service",
   "keywords": [
     "Roblox",
@@ -25,38 +25,38 @@
     "Quenty"
   ],
   "dependencies": {
-    "@quenty/attributeutils": "14.17.2-canary.547.ba47c62.0",
-    "@quenty/baseobject": "10.8.2-canary.547.ba47c62.0",
-    "@quenty/binder": "14.19.2-canary.547.ba47c62.0",
-    "@quenty/brio": "14.17.2-canary.547.ba47c62.0",
-    "@quenty/cmdrservice": "13.22.2-canary.547.ba47c62.0",
-    "@quenty/datastore": "13.20.2-canary.547.ba47c62.0",
-    "@quenty/ducktype": "5.8.3-canary.547.ba47c62.0",
-    "@quenty/enumutils": "3.4.2-canary.547.ba47c62.0",
-    "@quenty/instanceutils": "13.17.2-canary.547.ba47c62.0",
-    "@quenty/jsonutils": "10.10.3-canary.547.ba47c62.0",
-    "@quenty/loader": "10.8.2-canary.547.ba47c62.0",
-    "@quenty/maid": "3.4.2-canary.547.ba47c62.0",
-    "@quenty/observablecollection": "12.20.2-canary.547.ba47c62.0",
-    "@quenty/playerbinder": "14.19.2-canary.547.ba47c62.0",
-    "@quenty/playerutils": "8.17.2-canary.547.ba47c62.0",
-    "@quenty/remotefunctionutils": "10.10.3-canary.547.ba47c62.0",
-    "@quenty/remoting": "12.18.2-canary.547.ba47c62.0",
-    "@quenty/rx": "13.17.2-canary.547.ba47c62.0",
-    "@quenty/rxbinderutils": "14.19.2-canary.547.ba47c62.0",
-    "@quenty/rxsignal": "7.17.2-canary.547.ba47c62.0",
-    "@quenty/servicebag": "11.11.3-canary.547.ba47c62.0",
-    "@quenty/signal": "7.10.2-canary.547.ba47c62.0",
-    "@quenty/statestack": "14.18.2-canary.547.ba47c62.0",
-    "@quenty/string": "3.3.3-canary.547.ba47c62.0",
-    "@quenty/symbol": "3.4.2-canary.547.ba47c62.0",
-    "@quenty/table": "3.7.3-canary.547.ba47c62.0",
-    "@quenty/throttle": "10.9.2-canary.547.ba47c62.0",
-    "@quenty/tie": "10.20.2-canary.547.ba47c62.0",
-    "@quenty/valueobject": "13.17.2-canary.547.ba47c62.0"
+    "@quenty/attributeutils": "14.17.3-canary.550.afa1b3b.0",
+    "@quenty/baseobject": "10.8.3-canary.550.afa1b3b.0",
+    "@quenty/binder": "14.19.3-canary.550.afa1b3b.0",
+    "@quenty/brio": "14.17.3-canary.550.afa1b3b.0",
+    "@quenty/cmdrservice": "13.22.3-canary.550.afa1b3b.0",
+    "@quenty/datastore": "13.20.3-canary.550.afa1b3b.0",
+    "@quenty/ducktype": "5.8.4-canary.550.afa1b3b.0",
+    "@quenty/enumutils": "3.4.2",
+    "@quenty/instanceutils": "13.17.3-canary.550.afa1b3b.0",
+    "@quenty/jsonutils": "10.10.4-canary.550.afa1b3b.0",
+    "@quenty/loader": "10.8.3-canary.550.afa1b3b.0",
+    "@quenty/maid": "3.4.3-canary.550.afa1b3b.0",
+    "@quenty/observablecollection": "12.20.3-canary.550.afa1b3b.0",
+    "@quenty/playerbinder": "14.19.3-canary.550.afa1b3b.0",
+    "@quenty/playerutils": "8.17.3-canary.550.afa1b3b.0",
+    "@quenty/remotefunctionutils": "10.10.4-canary.550.afa1b3b.0",
+    "@quenty/remoting": "12.18.3-canary.550.afa1b3b.0",
+    "@quenty/rx": "13.17.3-canary.550.afa1b3b.0",
+    "@quenty/rxbinderutils": "14.19.3-canary.550.afa1b3b.0",
+    "@quenty/rxsignal": "7.17.3-canary.550.afa1b3b.0",
+    "@quenty/servicebag": "11.11.4-canary.550.afa1b3b.0",
+    "@quenty/signal": "7.10.3-canary.550.afa1b3b.0",
+    "@quenty/statestack": "14.18.3-canary.550.afa1b3b.0",
+    "@quenty/string": "3.3.3",
+    "@quenty/symbol": "3.4.2",
+    "@quenty/table": "3.7.4-canary.550.afa1b3b.0",
+    "@quenty/throttle": "10.9.3-canary.550.afa1b3b.0",
+    "@quenty/tie": "10.20.3-canary.550.afa1b3b.0",
+    "@quenty/valueobject": "13.17.3-canary.550.afa1b3b.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ba47c62e32170bf74377b0c658c60b84306dc294"
+  "gitHead": "afa1b3b99b862698c3ab46009497bd507150867c"
 }

package/src/Client/Player/PlayerSettingsClient.lua

@@ -1,3 +1,4 @@
+--!strict
 --[=[
 	A player's current settings. Handles replication back to the server
 	when a setting changes. See [PlayerSettingsBase].
@@ -22,6 +23,8 @@ local Remoting = require("Remoting")
 local Symbol = require("Symbol")
 local ThrottledFunction = require("ThrottledFunction")
 local ValueObject = require("ValueObject")
+local _ServiceBag = require("ServiceBag")
+local _Promise = require("Promise")
 
 local UNSET_VALUE = Symbol.named("unsetValue")
 
@@ -29,6 +32,18 @@ local PlayerSettingsClient = setmetatable({}, PlayerSettingsBase)
 PlayerSettingsClient.ClassName = "PlayerSettingsClient"
 PlayerSettingsClient.__index = PlayerSettingsClient
 
+export type PlayerSettingsClient = typeof(setmetatable(
+	{} :: {
+		_remoting: Remoting.Remoting,
+		_pendingReplicationDataInTransit: ValueObject.ValueObject<any>,
+		_toReplicate: { [any]: any? }?,
+		_toReplicateCallbacks: { [string]: { [any]: any } },
+		_currentReplicationRequest: _Promise.Promise<()>?,
+		_queueSendSettingsFunc: ThrottledFunction.ThrottledFunction<()>,
+	},
+	{} :: typeof({ __index = PlayerSettingsClient })
+)) & PlayerSettingsBase.PlayerSettingsBase
+
 --[=[
 	See [SettingsBindersClient] and [SettingsServiceClient] on how to properly use this class.
 
@@ -36,8 +51,9 @@ PlayerSettingsClient.__index = PlayerSettingsClient
 	@param serviceBag ServiceBag
 	@return PlayerSettingsClient
 ]=]
-function PlayerSettingsClient.new(folder, serviceBag)
-	local self = setmetatable(PlayerSettingsBase.new(folder, serviceBag), PlayerSettingsClient)
+function PlayerSettingsClient.new(folder: Folder, serviceBag: _ServiceBag.ServiceBag): PlayerSettingsClient
+	local self: PlayerSettingsClient =
+		setmetatable(PlayerSettingsBase.new(folder, serviceBag) :: any, PlayerSettingsClient)
 
 	if self:GetPlayer() == Players.LocalPlayer then
 		self._remoting = self._maid:Add(Remoting.new(self._obj, "PlayerSettings", Remoting.Realms.CLIENT))
@@ -69,7 +85,7 @@ end
 	@param defaultValue T
 	@return T
 ]=]
-function PlayerSettingsClient:GetValue(settingName, defaultValue)
+function PlayerSettingsClient.GetValue<T>(self: PlayerSettingsClient, settingName: string, defaultValue: T): T
 	assert(type(settingName) == "string", "Bad settingName")
 
 	if self._toReplicate and self._toReplicate[settingName] ~= nil then
@@ -91,7 +107,11 @@ end
 	@param defaultValue T
 	@return Observable<T>
 ]=]
-function PlayerSettingsClient:ObserveValue(settingName, defaultValue)
+function PlayerSettingsClient.ObserveValue<T>(
+	self: PlayerSettingsClient,
+	settingName: string,
+	defaultValue: T
+): Observable.Observable<T>
 	assert(type(settingName) == "string", "Bad settingName")
 
 	local baseObservable = getmetatable(PlayerSettingsClient).ObserveValue(self, settingName, defaultValue)
@@ -149,11 +169,12 @@ function PlayerSettingsClient:ObserveValue(settingName, defaultValue)
 		maid:GiveTask(baseObservable:Subscribe(function(newValue)
 			lastObservedValue = newValue
 			update()
-		end), sub:GetFailComplete())
+		end, sub:GetFailComplete()))
+
 		update()
 
 		return maid
-	end)
+	end) :: any
 end
 
 --[=[
@@ -162,7 +183,7 @@ end
 	@param settingName string
 	@param value T
 ]=]
-function PlayerSettingsClient:SetValue(settingName, value)
+function PlayerSettingsClient.SetValue<T>(self: PlayerSettingsClient, settingName: string, value: T): ()
 	assert(type(settingName) == "string", "Bad settingName")
 	assert(self:GetPlayer() == Players.LocalPlayer, "Cannot set settings of another player")
 	assert(DataStoreStringUtils.isValidUTF8(settingName), "Bad settingName")
@@ -176,12 +197,16 @@ function PlayerSettingsClient:SetValue(settingName, value)
 	end
 
 	local queueReplication = false
-	if not self._toReplicate then
-		self._toReplicate = {}
+	local toReplicate
+	if self._toReplicate then
+		toReplicate = self._toReplicate
+	else
+		toReplicate = {}
+		self._toReplicate = toReplicate
 		queueReplication = true
 	end
 
-	self._toReplicate[settingName] = PlayerSettingsUtils.encodeForNetwork(value)
+	toReplicate[settingName] = PlayerSettingsUtils.encodeForNetwork(value)
 
 	if self._toReplicateCallbacks[settingName] then
 		for callback, _ in self._toReplicateCallbacks[settingName] do
@@ -203,7 +228,7 @@ function PlayerSettingsClient:SetValue(settingName, value)
 	end
 end
 
-function PlayerSettingsClient:_sendSettings()
+function PlayerSettingsClient._sendSettings(self: PlayerSettingsClient)
 	if not self._toReplicate then
 		warn("Nothing to save, should not have called this method")
 		return
@@ -228,10 +253,10 @@ function PlayerSettingsClient:_sendSettings()
 	return promise
 end
 
-function PlayerSettingsClient:_promiseReplicateSettings(settingsMap)
+function PlayerSettingsClient._promiseReplicateSettings(self: PlayerSettingsClient, settingsMap)
 	assert(type(settingsMap) == "table", "Bad settingsMap")
 
 	return self._remoting.RequestUpdateSettings:PromiseInvokeServer(settingsMap)
 end
 
-return Binder.new("PlayerSettings", PlayerSettingsClient)
+return Binder.new("PlayerSettings", PlayerSettingsClient :: any) :: Binder.Binder<PlayerSettingsClient>

package/src/Client/SettingsServiceClient.lua

@@ -1,3 +1,4 @@
+--!strict
 --[=[
 	Provides access to settings on the client. See [SettingDefinition] which should
 	register settings on the server. See [SettingsService] for server component.
@@ -13,16 +14,30 @@ local Players = game:GetService("Players")
 local Maid = require("Maid")
 local SettingsCmdrUtils = require("SettingsCmdrUtils")
 local _ServiceBag = require("ServiceBag")
+local _PlayerSettingsClient = require("PlayerSettingsClient")
+local _Observable = require("Observable")
+local _Brio = require("Brio")
+local _CancelToken = require("CancelToken")
+local _Promise = require("Promise")
 
 local SettingsServiceClient = {}
 
+export type SettingsServiceClient = typeof(setmetatable(
+	{} :: {
+		_serviceBag: _ServiceBag.ServiceBag,
+		_maid: Maid.Maid,
+		_settingsDataService: any,
+	},
+	{} :: typeof({ __index = SettingsServiceClient })
+))
+
 --[=[
 	Initializes the setting service. Should be done via ServiceBag.
 
 	@param serviceBag ServiceBag
 ]=]
-function SettingsServiceClient:Init(serviceBag: _ServiceBag.ServiceBag)
-	assert(not self._serviceBag, "Already initialized")
+function SettingsServiceClient.Init(self: SettingsServiceClient, serviceBag: _ServiceBag.ServiceBag)
+	assert(not (self :: any)._serviceBag, "Already initialized")
 	self._serviceBag = assert(serviceBag, "No serviceBag")
 	self._maid = Maid.new()
 
@@ -36,7 +51,7 @@ function SettingsServiceClient:Init(serviceBag: _ServiceBag.ServiceBag)
 	self._serviceBag:GetService(require("PlayerSettingsClient"))
 end
 
-function SettingsServiceClient:Start()
+function SettingsServiceClient.Start(self: SettingsServiceClient)
 	self:_setupCmdr()
 end
 
@@ -44,7 +59,9 @@ end
 	Gets the local player settings
 	@return PlayerSettingsClient | nil
 ]=]
-function SettingsServiceClient:GetLocalPlayerSettings()
+function SettingsServiceClient.GetLocalPlayerSettings(
+	self: SettingsServiceClient
+): _PlayerSettingsClient.PlayerSettingsClient?
 	return self:GetPlayerSettings(Players.LocalPlayer)
 end
 
@@ -53,7 +70,9 @@ end
 
 	@return Observable<Brio<PlayerSettingsClient>>
 ]=]
-function SettingsServiceClient:ObserveLocalPlayerSettingsBrio()
+function SettingsServiceClient.ObserveLocalPlayerSettingsBrio(self: SettingsServiceClient): _Observable.Observable<
+	_Brio.Brio<_PlayerSettingsClient.PlayerSettingsClient>
+>
 	return self:ObservePlayerSettingsBrio(Players.LocalPlayer)
 end
 
@@ -62,7 +81,9 @@ end
 
 	@return Observable<PlayerSettingsClient | nil>
 ]=]
-function SettingsServiceClient:ObserveLocalPlayerSettings()
+function SettingsServiceClient.ObserveLocalPlayerSettings(self: SettingsServiceClient): _Observable.Observable<
+	_PlayerSettingsClient.PlayerSettingsClient
+>
 	return self:ObservePlayerSettings(Players.LocalPlayer)
 end
 
@@ -72,7 +93,10 @@ end
 	@param cancelToken CancellationToken
 	@return Promise<PlayerSettingsClient>
 ]=]
-function SettingsServiceClient:PromiseLocalPlayerSettings(cancelToken)
+function SettingsServiceClient.PromiseLocalPlayerSettings(
+	self: SettingsServiceClient,
+	cancelToken: _CancelToken.CancelToken
+): _Promise.Promise<_PlayerSettingsClient.PlayerSettingsClient>
 	return self:PromisePlayerSettings(Players.LocalPlayer, cancelToken)
 end
 
@@ -82,7 +106,10 @@ end
 	@param player Player
 	@return Observable<PlayerSettingsClient | nil>
 ]=]
-function SettingsServiceClient:ObservePlayerSettings(player: Player)
+function SettingsServiceClient.ObservePlayerSettings(
+	self: SettingsServiceClient,
+	player: Player
+): _Observable.Observable<_PlayerSettingsClient.PlayerSettingsClient>
 	assert(typeof(player) == "Instance" and player:IsA("Player"), "Bad player")
 
 	return self._settingsDataService:ObservePlayerSettings(player)
@@ -94,7 +121,12 @@ end
 	@param player Player
 	@return Observable<Brio<PlayerSettingsClient>>
 ]=]
-function SettingsServiceClient:ObservePlayerSettingsBrio(player: Player)
+function SettingsServiceClient.ObservePlayerSettingsBrio(
+	self: SettingsServiceClient,
+	player: Player
+): _Observable.Observable<
+	_Brio.Brio<_PlayerSettingsClient.PlayerSettingsClient>
+>
 	assert(typeof(player) == "Instance" and player:IsA("Player"), "Bad player")
 
 	return self._settingsDataService:ObservePlayerSettingsBrio(player)
@@ -106,7 +138,10 @@ end
 	@param player Player
 	@return PlayerSettingsClient | nil
 ]=]
-function SettingsServiceClient:GetPlayerSettings(player: Player)
+function SettingsServiceClient.GetPlayerSettings(
+	self: SettingsServiceClient,
+	player: Player
+): _PlayerSettingsClient.PlayerSettingsClient?
 	assert(typeof(player) == "Instance" and player:IsA("Player"), "Bad player")
 
 	return self._settingsDataService:GetPlayerSettings(player)
@@ -119,14 +154,17 @@ end
 	@param cancelToken CancellationToken
 	@return Promise<PlayerSettingsClient>
 ]=]
-function SettingsServiceClient:PromisePlayerSettings(player: Player, cancelToken)
+function SettingsServiceClient.PromisePlayerSettings(
+	self: SettingsServiceClient,
+	player: Player,
+	cancelToken: _CancelToken.CancelToken
+): _Promise.Promise<_PlayerSettingsClient.PlayerSettingsClient>
 	assert(typeof(player) == "Instance" and player:IsA("Player"), "Bad player")
 
 	return self._settingsDataService:PromisePlayerSettings(player, cancelToken)
 end
 
-
-function SettingsServiceClient:_setupCmdr()
+function SettingsServiceClient._setupCmdr(self: SettingsServiceClient)
 	local cmdrServiceClient = self._serviceBag:GetService(require("CmdrServiceClient"))
 
 	self._maid:GivePromise(cmdrServiceClient:PromiseCmdr()):Then(function(cmdr)
@@ -134,8 +172,8 @@ function SettingsServiceClient:_setupCmdr()
 	end)
 end
 
-function SettingsServiceClient:Destroy()
+function SettingsServiceClient.Destroy(self: SettingsServiceClient)
 	self._maid:DoCleaning()
 end
 
-return SettingsServiceClient
+return SettingsServiceClient

package/src/Server/Player/PlayerHasSettings.lua

@@ -16,6 +16,15 @@ local PlayerHasSettings = setmetatable({}, BaseObject)
 PlayerHasSettings.ClassName = "PlayerHasSettings"
 PlayerHasSettings.__index = PlayerHasSettings
 
+export type PlayerHasSettings = typeof(setmetatable(
+	{} :: {
+		_serviceBag: any,
+		_playerSettingsBinder: PlayerSettings.PlayerSettings,
+		_playerDataStoreService: PlayerDataStoreService.PlayerDataStoreService,
+	},
+	{} :: typeof({ __index = PlayerHasSettings })
+)) & BaseObject.BaseObject
+
 function PlayerHasSettings.new(player: Player, serviceBag)
 	local self = setmetatable(BaseObject.new(player), PlayerHasSettings)
 

package/src/Server/Player/PlayerSettings.lua

@@ -1,3 +1,4 @@
+--!strict
 --[=[
 	@class PlayerSettings
 ]=]
@@ -12,13 +13,23 @@ local PlayerSettingsInterface = require("PlayerSettingsInterface")
 local PlayerSettingsUtils = require("PlayerSettingsUtils")
 local Remoting = require("Remoting")
 local SettingsDataService = require("SettingsDataService")
+local _ServiceBag = require("ServiceBag")
 
 local PlayerSettings = setmetatable({}, PlayerSettingsBase)
 PlayerSettings.ClassName = "PlayerSettings"
 PlayerSettings.__index = PlayerSettings
 
-function PlayerSettings.new(obj, serviceBag)
-	local self = setmetatable(PlayerSettingsBase.new(obj, serviceBag), PlayerSettings)
+export type PlayerSettings = typeof(setmetatable(
+	{} :: {
+		_serviceBag: any,
+		_remoting: Remoting.Remoting,
+		_settingsDataService: SettingsDataService.SettingsDataService,
+	},
+	{} :: typeof({ __index = PlayerSettings })
+)) & PlayerSettingsBase.PlayerSettingsBase
+
+function PlayerSettings.new(folder: Folder, serviceBag: _ServiceBag.ServiceBag)
+	local self: PlayerSettings = setmetatable(PlayerSettingsBase.new(folder, serviceBag) :: any, PlayerSettings)
 
 	self._serviceBag = assert(serviceBag, "No serviceBag")
 	self._settingsDataService = self._serviceBag:GetService(SettingsDataService)
@@ -39,7 +50,7 @@ function PlayerSettings.new(obj, serviceBag)
 	return self
 end
 
-function PlayerSettings:EnsureInitialized(settingName, defaultValue)
+function PlayerSettings.EnsureInitialized(self: PlayerSettings, settingName: string, defaultValue)
 	assert(DataStoreStringUtils.isValidUTF8(settingName), "Bad settingName")
 	assert(defaultValue ~= nil, "defaultValue cannot be nil")
 
@@ -62,7 +73,7 @@ function PlayerSettings:EnsureInitialized(settingName, defaultValue)
 	end
 end
 
-function PlayerSettings:_setupRemoting()
+function PlayerSettings._setupRemoting(self: PlayerSettings)
 	self._remoting = self._maid:Add(Remoting.new(self._obj, "PlayerSettings", Remoting.Realms.SERVER))
 
 	self._maid:Add(self._remoting.RequestUpdateSettings:Bind(function(player, settingsMap)
@@ -72,7 +83,7 @@ function PlayerSettings:_setupRemoting()
 	end))
 end
 
-function PlayerSettings:_setSettingsMap(settingsMap)
+function PlayerSettings._setSettingsMap(self: PlayerSettings, settingsMap)
 	assert(type(settingsMap) == "table", "Bad settingsMap")
 
 	for settingName, value in settingsMap do
@@ -87,14 +98,24 @@ function PlayerSettings:_setSettingsMap(settingsMap)
 		local attributeName = PlayerSettingsUtils.getAttributeName(settingName)
 
 		if self._obj:GetAttribute(attributeName) == nil then
-			warn(string.format("[PlayerSettings] - Cannot set setting %q on attribute that is not defined on the server.", attributeName))
+			warn(
+				string.format(
+					"[PlayerSettings] - Cannot set setting %q on attribute that is not defined on the server.",
+					attributeName
+				)
+			)
 			continue
 		end
 
 		-- Paranoid UTF8 check. Avoid letting this value be set.
 		if type(value) == "string" then
 			if not DataStoreStringUtils.isValidUTF8(value) then
-				warn(string.format("[PlayerSettings] - Bad UTF8 value setting value for %q. Skipping setting.", settingName))
+				warn(
+					string.format(
+						"[PlayerSettings] - Bad UTF8 value setting value for %q. Skipping setting.",
+						settingName
+					)
+				)
 				continue
 			end
 		end
@@ -105,7 +126,12 @@ function PlayerSettings:_setSettingsMap(settingsMap)
 		if type(encodedAttribute) == "string" then
 			-- Paranoid UTF8 check. Avoid letting this value be set.
 			if not DataStoreStringUtils.isValidUTF8(encodedAttribute) then
-				warn(string.format("[PlayerSettings] - Bad UTF8 encodedAttribute value for %q. Skipping setting.", settingName))
+				warn(
+					string.format(
+						"[PlayerSettings] - Bad UTF8 encodedAttribute value for %q. Skipping setting.",
+						settingName
+					)
+				)
 				continue
 			end
 
@@ -120,4 +146,4 @@ function PlayerSettings:_setSettingsMap(settingsMap)
 	end
 end
 
-return Binder.new("PlayerSettings", PlayerSettings)
+return Binder.new("PlayerSettings", PlayerSettings :: any) :: Binder.Binder<PlayerSettings>

package/src/Shared/Player/PlayerSettingsBase.lua

@@ -1,3 +1,4 @@
+--!strict
 --[=[
 	Base class for player settings.
 
@@ -12,11 +13,20 @@ local RxAttributeUtils = require("RxAttributeUtils")
 local SettingDefinition = require("SettingDefinition")
 local Rx = require("Rx")
 local DataStoreStringUtils = require("DataStoreStringUtils")
+local _ServiceBag = require("ServiceBag")
 
 local PlayerSettingsBase = setmetatable({}, BaseObject)
 PlayerSettingsBase.ClassName = "PlayerSettingsBase"
 PlayerSettingsBase.__index = PlayerSettingsBase
 
+export type PlayerSettingsBase = typeof(setmetatable(
+	{} :: {
+		_obj: Folder,
+		_serviceBag: _ServiceBag.ServiceBag,
+	},
+	{} :: typeof({ __index = PlayerSettingsBase })
+)) & BaseObject.BaseObject
+
 --[=[
 	Base class for player settings
 
@@ -24,8 +34,8 @@ PlayerSettingsBase.__index = PlayerSettingsBase
 	@param serviceBag ServiceBag
 	@return PlayerSettingsBase
 ]=]
-function PlayerSettingsBase.new(folder, serviceBag)
-	local self = setmetatable(BaseObject.new(folder), PlayerSettingsBase)
+function PlayerSettingsBase.new(folder: Folder, serviceBag: _ServiceBag.ServiceBag): PlayerSettingsBase
+	local self: PlayerSettingsBase = setmetatable(BaseObject.new(folder) :: any, PlayerSettingsBase)
 
 	self._serviceBag = assert(serviceBag, "No serviceBag")
 
@@ -36,7 +46,7 @@ end
 	Gets the player for this setting
 	@return Player
 ]=]
-function PlayerSettingsBase:GetPlayer()
+function PlayerSettingsBase.GetPlayer(self: PlayerSettingsBase): Player?
 	return self._obj:FindFirstAncestorWhichIsA("Player")
 end
 
@@ -44,7 +54,7 @@ end
 	Gets the settings folder
 	@return Folder
 ]=]
-function PlayerSettingsBase:GetFolder()
+function PlayerSettingsBase.GetFolder(self: PlayerSettingsBase): Folder
 	return self._obj
 end
 
@@ -56,7 +66,7 @@ end
 	@param defaultValue any
 	@return SettingProperty
 ]=]
-function PlayerSettingsBase:GetSettingProperty(settingName, defaultValue)
+function PlayerSettingsBase.GetSettingProperty(self: PlayerSettingsBase, settingName: string, defaultValue)
 	assert(type(settingName) == "string", "Bad settingName")
 	assert(defaultValue ~= nil, "defaultValue cannot be nil")
 
@@ -72,7 +82,7 @@ end
 	@param defaultValue any
 	@return any
 ]=]
-function PlayerSettingsBase:GetValue(settingName, defaultValue)
+function PlayerSettingsBase.GetValue(self: PlayerSettingsBase, settingName: string, defaultValue)
 	assert(type(settingName) == "string", "Bad settingName")
 	assert(defaultValue ~= nil, "defaultValue cannot be nil")
 	assert(DataStoreStringUtils.isValidUTF8(settingName), "Bad settingName")
@@ -96,7 +106,7 @@ end
 	@param value any
 	@return any
 ]=]
-function PlayerSettingsBase:SetValue(settingName, value)
+function PlayerSettingsBase.SetValue(self: PlayerSettingsBase, settingName: string, value)
 	assert(type(settingName) == "string", "Bad settingName")
 	assert(DataStoreStringUtils.isValidUTF8(settingName), "Bad settingName")
 
@@ -112,7 +122,7 @@ end
 	@param defaultValue any
 	@return Observable<any>
 ]=]
-function PlayerSettingsBase:ObserveValue(settingName, defaultValue)
+function PlayerSettingsBase.ObserveValue(self: PlayerSettingsBase, settingName: string, defaultValue)
 	assert(type(settingName) == "string", "Bad settingName")
 	assert(defaultValue ~= nil, "defaultValue cannot be nil")
 	assert(DataStoreStringUtils.isValidUTF8(settingName), "Bad settingName")
@@ -121,10 +131,9 @@ function PlayerSettingsBase:ObserveValue(settingName, defaultValue)
 
 	self:EnsureInitialized(settingName, defaultValue)
 
-	return RxAttributeUtils.observeAttribute(self._obj, attributeName, defaultValue)
-		:Pipe({
-			Rx.map(PlayerSettingsUtils.decodeForAttribute)
-		})
+	return RxAttributeUtils.observeAttribute(self._obj, attributeName, defaultValue):Pipe({
+		Rx.map(PlayerSettingsUtils.decodeForAttribute) :: any,
+	}) :: any
 end
 
 --[=[
@@ -133,7 +142,7 @@ end
 	@param settingName string
 	@param defaultValue T
 ]=]
-function PlayerSettingsBase:RestoreDefault(settingName, defaultValue)
+function PlayerSettingsBase.RestoreDefault(self: PlayerSettingsBase, settingName: string, defaultValue)
 	assert(type(settingName) == "string", "Bad settingName")
 	assert(DataStoreStringUtils.isValidUTF8(settingName), "Bad settingName")
 
@@ -147,7 +156,7 @@ end
 	@param settingName string
 	@param defaultValue any
 ]=]
-function PlayerSettingsBase:EnsureInitialized(settingName, defaultValue)
+function PlayerSettingsBase.EnsureInitialized(_self: PlayerSettingsBase, settingName: string, defaultValue)
 	assert(type(settingName) == "string", "Bad settingName")
 	assert(defaultValue ~= nil, "defaultValue cannot be nil")
 	assert(DataStoreStringUtils.isValidUTF8(settingName), "Bad settingName")

package/src/Shared/Player/PlayerSettingsConstants.lua

@@ -1,3 +1,4 @@
+--!strict
 --[=[
 	@class PlayerSettingsConstants
 ]=]

package/src/Shared/Player/PlayerSettingsUtils.lua

@@ -1,3 +1,4 @@
+--!strict
 --[=[
 	Utility helpers to work with settings.
 
@@ -18,7 +19,7 @@ local PlayerSettingsUtils = {}
 
 	@return Folder
 ]=]
-function PlayerSettingsUtils.create()
+function PlayerSettingsUtils.create(): Folder
 	local playerSettings = Instance.new("Folder")
 	playerSettings.Name = PlayerSettingsConstants.PLAYER_SETTINGS_NAME
 	playerSettings:AddTag("PlayerSettings")
@@ -32,7 +33,7 @@ end
 	@param settingName string
 	@return string
 ]=]
-function PlayerSettingsUtils.getAttributeName(settingName)
+function PlayerSettingsUtils.getAttributeName(settingName: string): string
 	assert(type(settingName) == "string", "Bad settingName")
 	assert(DataStoreStringUtils.isValidUTF8(settingName), "Bad settingName")
 
@@ -46,7 +47,7 @@ end
 	@param attributeName string
 	@return string
 ]=]
-function PlayerSettingsUtils.getSettingName(attributeName)
+function PlayerSettingsUtils.getSettingName(attributeName: string): string
 	assert(type(attributeName) == "string", "Bad attributeName")
 
 	return String.removePrefix(attributeName, PlayerSettingsConstants.SETTING_ATTRIBUTE_PREFIX)
@@ -58,7 +59,7 @@ end
 	@param attributeName string
 	@return string
 ]=]
-function PlayerSettingsUtils.isSettingAttribute(attributeName)
+function PlayerSettingsUtils.isSettingAttribute(attributeName: string): boolean
 	assert(type(attributeName) == "string", "Bad attributeName")
 
 	return String.startsWith(attributeName, PlayerSettingsConstants.SETTING_ATTRIBUTE_PREFIX)
@@ -70,7 +71,7 @@ end
 	@param settingValue any
 	@return any
 ]=]
-function PlayerSettingsUtils.encodeForNetwork(settingValue)
+function PlayerSettingsUtils.encodeForNetwork(settingValue: any): any
 	assert(settingValue ~= "<NIL_SETTING_VALUE>", "Cannot have setting as <NIL_SETTING_VALUE>")
 
 	if settingValue == nil then
@@ -88,7 +89,7 @@ end
 	@param settingValue any
 	@return any
 ]=]
-function PlayerSettingsUtils.decodeForNetwork(settingValue)
+function PlayerSettingsUtils.decodeForNetwork(settingValue: any): any
 	if settingValue == "<NIL_SETTING_VALUE>" then
 		return nil
 	elseif EnumUtils.isEncodedEnum(settingValue) then
@@ -104,7 +105,7 @@ end
 	@param settingValue any
 	@return any
 ]=]
-function PlayerSettingsUtils.decodeForAttribute(settingValue)
+function PlayerSettingsUtils.decodeForAttribute(settingValue: any): any
 	if EnumUtils.isEncodedEnum(settingValue) then
 		return EnumUtils.decodeFromString(settingValue)
 	else
@@ -118,7 +119,7 @@ end
 	@param settingValue any
 	@return any
 ]=]
-function PlayerSettingsUtils.encodeForAttribute(settingValue)
+function PlayerSettingsUtils.encodeForAttribute(settingValue: any): any
 	if typeof(settingValue) == "EnumItem" then
 		return EnumUtils.encodeAsString(settingValue)
 	else

package/src/Shared/Setting/SettingProperty.lua

@@ -1,3 +1,4 @@
+--!strict
 --[=[
 	@class SettingProperty
 ]=]
@@ -7,11 +8,28 @@ local require = require(script.Parent.loader).load(script)
 local SettingsDataService = require("SettingsDataService")
 local Rx = require("Rx")
 local RxSignal = require("RxSignal")
+local _ServiceBag = require("ServiceBag")
+local _Promise = require("Promise")
+local _Observable = require("Observable")
 
 local SettingProperty = {}
 SettingProperty.ClassName = "SettingProperty"
 SettingProperty.__index = SettingProperty
 
+export type SettingProperty<T> = typeof(setmetatable(
+	{} :: {
+		Value: T,
+		Changed: any,
+		DefaultValue: T,
+
+		_serviceBag: any,
+		_bridge: SettingsDataService.SettingsDataService,
+		_player: Player,
+		_definition: any,
+	},
+	{} :: typeof({ __index = SettingProperty })
+))
+
 --[=[
 	Constructs a new SettingProperty.
 
@@ -20,8 +38,8 @@ SettingProperty.__index = SettingProperty
 	@param definition SettingDefinition
 	@return SettingProperty<T>
 ]=]
-function SettingProperty.new(serviceBag, player, definition)
-	local self = setmetatable({}, SettingProperty)
+function SettingProperty.new<T>(serviceBag: _ServiceBag.ServiceBag, player: Player, definition): SettingProperty<T>
+	local self: SettingProperty<T> = setmetatable({} :: any, SettingProperty)
 
 	self._serviceBag = assert(serviceBag, "No serviceBag")
 	self._bridge = self._serviceBag:GetService(SettingsDataService)
@@ -40,28 +58,31 @@ end
 	Observes the value of the setting property
 	@return Observable<T>
 ]=]
-function SettingProperty:Observe()
+function SettingProperty.Observe<T>(self: SettingProperty<T>): _Observable.Observable<T>
 	return self:_observePlayerSettings():Pipe({
 		Rx.where(function(settings)
 			return settings ~= nil
-		end);
-		Rx.take(1);
+		end),
+		Rx.take(1),
 		Rx.switchMap(function()
 			-- Ensure we're loaded first and then register for real.
 			return self:_observePlayerSettings()
-		end);
-		Rx.switchMap(function(playerSettings)
+		end) :: any,
+		Rx.switchMap(function(playerSettings): any
 			if not playerSettings then
 				-- Don't emit until we have a value
 				return Rx.of(self._definition:GetDefaultValue())
 			else
-				return playerSettings:ObserveValue(self._definition:GetSettingName(), self._definition:GetDefaultValue())
+				return playerSettings:ObserveValue(
+					self._definition:GetSettingName(),
+					self._definition:GetDefaultValue()
+				)
 			end
-		end);
-	})
+		end) :: any,
+	}) :: any
 end
 
-function SettingProperty:__index(index)
+(SettingProperty :: any).__index = function(self, index): any
 	if index == "Value" then
 		local settings = self:_getPlayerSettings()
 		if settings then
@@ -71,20 +92,26 @@ function SettingProperty:__index(index)
 		end
 	elseif index == "Changed" then
 		return RxSignal.new(self:Observe():Pipe({
-					-- TODO: Handle scenario where we're loading and .Value changes because of what
-					-- we queried.
-					Rx.skip(1);
-				}))
+			-- TODO: Handle scenario where we're loading and .Value changes because of what
+			-- we queried.
+			Rx.skip(1),
+		}))
 	elseif index == "DefaultValue" then
 		return self._definition:GetDefaultValue()
 	elseif SettingProperty[index] then
 		return SettingProperty[index]
 	else
-		error(string.format("%q is not a member of SettingProperty %s", tostring(index), self._definition:GetSettingName()))
+		error(
+			string.format(
+				"%q is not a member of SettingProperty %s",
+				tostring(index),
+				self._definition:GetSettingName()
+			)
+		)
 	end
 end
 
-function SettingProperty:__newindex(index, value)
+function SettingProperty.__newindex<T>(self, index, value)
 	if index == "Value" then
 		self:SetValue(value)
 	elseif index == "DefaultValue" or index == "Changed" or SettingProperty[index] then
@@ -103,12 +130,14 @@ end
 
 	@param value T
 ]=]
-function SettingProperty:SetValue(value)
+function SettingProperty.SetValue<T>(self: SettingProperty<T>, value: T)
 	local settings = self:_getPlayerSettings()
 	if settings then
 		settings:SetValue(self._definition:GetSettingName(), value)
 	else
-		warn("[SettingProperty.SetValue] - Cannot set setting value. Use :PromiseSetValue() to ensure value is set after load.")
+		warn(
+			"[SettingProperty.SetValue] - Cannot set setting value. Use :PromiseSetValue() to ensure value is set after load."
+		)
 	end
 end
 
@@ -117,11 +146,10 @@ end
 
 	@return Promise<T>
 ]=]
-function SettingProperty:PromiseValue()
-	return self:_promisePlayerSettings()
-		:Then(function(playerSettings)
-			return playerSettings:GetValue(self._definition:GetSettingName(), self._definition:GetDefaultValue())
-		end)
+function SettingProperty.PromiseValue<T>(self: SettingProperty<T>): _Promise.Promise<T>
+	return self:_promisePlayerSettings():Then(function(playerSettings)
+		return playerSettings:GetValue(self._definition:GetSettingName(), self._definition:GetDefaultValue())
+	end)
 end
 
 --[=[
@@ -130,22 +158,23 @@ end
 	@param value T
 	@return Promise
 ]=]
-function SettingProperty:PromiseSetValue(value)
-	return self:_promisePlayerSettings()
-		:Then(function(playerSettings)
-			playerSettings:SetValue(self._definition:GetSettingName(), value)
-		end)
+function SettingProperty.PromiseSetValue<T>(self: SettingProperty<T>, value: T): _Promise.Promise<()>
+	return self:_promisePlayerSettings():Then(function(playerSettings)
+		playerSettings:SetValue(self._definition:GetSettingName(), value)
+	end)
 end
 
 --[=[
 	Restores the setting to the default value
 ]=]
-function SettingProperty:RestoreDefault()
+function SettingProperty.RestoreDefault<T>(self: SettingProperty<T>): ()
 	local settings = self:_getPlayerSettings()
 	if settings then
 		settings:RestoreDefault(self._definition:GetSettingName(), self._definition:GetDefaultValue())
 	else
-		warn("[SettingProperty.RestoreDefault] - Cannot set setting value. Use :PromiseRestoreDefault() to ensure value is set after load.")
+		warn(
+			"[SettingProperty.RestoreDefault] - Cannot set setting value. Use :PromiseRestoreDefault() to ensure value is set after load."
+		)
 	end
 end
 
@@ -156,23 +185,21 @@ end
 
 	@return Promise
 ]=]
-function SettingProperty:PromiseRestoreDefault()
-	return self:_promisePlayerSettings()
-		:Then(function(playerSettings)
-			playerSettings:RestoreDefault(self._definition:GetSettingName(), self._definition:GetDefaultValue())
-		end)
+function SettingProperty.PromiseRestoreDefault<T>(self: SettingProperty<T>): _Promise.Promise<()>
+	return self:_promisePlayerSettings():Then(function(playerSettings)
+		playerSettings:RestoreDefault(self._definition:GetSettingName(), self._definition:GetDefaultValue())
+	end)
 end
 
-
-function SettingProperty:_observePlayerSettings()
+function SettingProperty._observePlayerSettings<T>(self: SettingProperty<T>)
 	return self._bridge:ObservePlayerSettings(self._player)
 end
 
-function SettingProperty:_getPlayerSettings()
+function SettingProperty._getPlayerSettings<T>(self: SettingProperty<T>)
 	return self._bridge:GetPlayerSettings(self._player)
 end
 
-function SettingProperty:_promisePlayerSettings()
+function SettingProperty._promisePlayerSettings<T>(self: SettingProperty<T>)
 	return self._bridge:PromisePlayerSettings(self._player)
 end
 

package/src/Shared/SettingsDataService.lua

@@ -19,6 +19,13 @@ local _ServiceBag = require("ServiceBag")
 
 local SettingsDataService = {}
 
+export type SettingsDataService = typeof(setmetatable(
+	{} :: {
+		_maid: Maid.Maid,
+	},
+	{} :: typeof({ __index = SettingsDataService })
+))
+
 --[=[
 	Initializes the shared registry service. Should be done via [ServiceBag].