@quenty/settings 11.23.3-canary.550.afa1b3b.0 → 11.23.4-canary.11a5dcf.0

package/CHANGELOG.md

@@ -3,7 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [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)
+## [11.23.4-canary.11a5dcf.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/settings@11.23.3...@quenty/settings@11.23.4-canary.11a5dcf.0) (2025-05-10)
+
+
+### Bug Fixes
+
+* Additional type checking updates ([05ba29a](https://github.com/Quenty/NevermoreEngine/commit/05ba29a03efc9f3feed74b34f1d9dfb237496214))
+
+
+
+
+
+## [11.23.3](https://github.com/Quenty/NevermoreEngine/compare/@quenty/settings@11.23.2...@quenty/settings@11.23.3) (2025-04-10)
 
 **Note:** Version bump only for package @quenty/settings
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/settings",
-  "version": "11.23.3-canary.550.afa1b3b.0",
+  "version": "11.23.4-canary.11a5dcf.0",
   "description": "Centralized player settings service",
   "keywords": [
     "Roblox",
@@ -25,38 +25,38 @@
     "Quenty"
   ],
   "dependencies": {
-    "@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/attributeutils": "14.17.4-canary.11a5dcf.0",
+    "@quenty/baseobject": "10.8.4-canary.11a5dcf.0",
+    "@quenty/binder": "14.19.4-canary.11a5dcf.0",
+    "@quenty/brio": "14.17.4-canary.11a5dcf.0",
+    "@quenty/cmdrservice": "13.22.4-canary.11a5dcf.0",
+    "@quenty/datastore": "13.20.4-canary.11a5dcf.0",
+    "@quenty/ducktype": "5.8.5-canary.11a5dcf.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/instanceutils": "13.17.4-canary.11a5dcf.0",
+    "@quenty/jsonutils": "10.10.5-canary.11a5dcf.0",
+    "@quenty/loader": "10.8.4-canary.11a5dcf.0",
+    "@quenty/maid": "3.4.4-canary.11a5dcf.0",
+    "@quenty/observablecollection": "12.20.4-canary.11a5dcf.0",
+    "@quenty/playerbinder": "14.19.4-canary.11a5dcf.0",
+    "@quenty/playerutils": "8.17.4-canary.11a5dcf.0",
+    "@quenty/remotefunctionutils": "10.10.5-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/rxsignal": "7.17.4-canary.11a5dcf.0",
+    "@quenty/servicebag": "11.11.5-canary.11a5dcf.0",
+    "@quenty/signal": "7.10.4-canary.11a5dcf.0",
+    "@quenty/statestack": "14.18.4-canary.11a5dcf.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"
+    "@quenty/symbol": "3.4.3-canary.11a5dcf.0",
+    "@quenty/table": "3.7.5-canary.11a5dcf.0",
+    "@quenty/throttle": "10.9.4-canary.11a5dcf.0",
+    "@quenty/tie": "10.20.4-canary.11a5dcf.0",
+    "@quenty/valueobject": "13.17.4-canary.11a5dcf.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "afa1b3b99b862698c3ab46009497bd507150867c"
+  "gitHead": "11a5dcf7d4c7a0bfbf3337e97d30e8346ea09d3f"
 }

package/src/Client/Player/PlayerSettingsClient.lua

@@ -19,12 +19,12 @@ local PlayerSettingsBase = require("PlayerSettingsBase")
 local PlayerSettingsConstants = require("PlayerSettingsConstants")
 local PlayerSettingsInterface = require("PlayerSettingsInterface")
 local PlayerSettingsUtils = require("PlayerSettingsUtils")
+local Promise = require("Promise")
 local Remoting = require("Remoting")
+local ServiceBag = require("ServiceBag")
 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")
 
@@ -38,7 +38,7 @@ export type PlayerSettingsClient = typeof(setmetatable(
 		_pendingReplicationDataInTransit: ValueObject.ValueObject<any>,
 		_toReplicate: { [any]: any? }?,
 		_toReplicateCallbacks: { [string]: { [any]: any } },
-		_currentReplicationRequest: _Promise.Promise<()>?,
+		_currentReplicationRequest: Promise.Promise<()>?,
 		_queueSendSettingsFunc: ThrottledFunction.ThrottledFunction<()>,
 	},
 	{} :: typeof({ __index = PlayerSettingsClient })
@@ -51,7 +51,7 @@ export type PlayerSettingsClient = typeof(setmetatable(
 	@param serviceBag ServiceBag
 	@return PlayerSettingsClient
 ]=]
-function PlayerSettingsClient.new(folder: Folder, serviceBag: _ServiceBag.ServiceBag): PlayerSettingsClient
+function PlayerSettingsClient.new(folder: Folder, serviceBag: ServiceBag.ServiceBag): PlayerSettingsClient
 	local self: PlayerSettingsClient =
 		setmetatable(PlayerSettingsBase.new(folder, serviceBag) :: any, PlayerSettingsClient)
 

package/src/Client/SettingsServiceClient.lua

@@ -11,20 +11,20 @@ local require = require(script.Parent.loader).load(script)
 
 local Players = game:GetService("Players")
 
+local Brio = require("Brio")
+local CancelToken = require("CancelToken")
 local Maid = require("Maid")
+local Observable = require("Observable")
+local PlayerSettingsClient = require("PlayerSettingsClient")
+local Promise = require("Promise")
+local ServiceBag = require("ServiceBag")
 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,
+		_serviceBag: ServiceBag.ServiceBag,
 		_maid: Maid.Maid,
 		_settingsDataService: any,
 	},
@@ -36,7 +36,7 @@ export type SettingsServiceClient = typeof(setmetatable(
 
 	@param serviceBag ServiceBag
 ]=]
-function SettingsServiceClient.Init(self: SettingsServiceClient, serviceBag: _ServiceBag.ServiceBag)
+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()
@@ -61,7 +61,7 @@ end
 ]=]
 function SettingsServiceClient.GetLocalPlayerSettings(
 	self: SettingsServiceClient
-): _PlayerSettingsClient.PlayerSettingsClient?
+): PlayerSettingsClient.PlayerSettingsClient?
 	return self:GetPlayerSettings(Players.LocalPlayer)
 end
 
@@ -70,8 +70,8 @@ end
 
 	@return Observable<Brio<PlayerSettingsClient>>
 ]=]
-function SettingsServiceClient.ObserveLocalPlayerSettingsBrio(self: SettingsServiceClient): _Observable.Observable<
-	_Brio.Brio<_PlayerSettingsClient.PlayerSettingsClient>
+function SettingsServiceClient.ObserveLocalPlayerSettingsBrio(self: SettingsServiceClient): Observable.Observable<
+	Brio.Brio<PlayerSettingsClient.PlayerSettingsClient>
 >
 	return self:ObservePlayerSettingsBrio(Players.LocalPlayer)
 end
@@ -81,8 +81,8 @@ end
 
 	@return Observable<PlayerSettingsClient | nil>
 ]=]
-function SettingsServiceClient.ObserveLocalPlayerSettings(self: SettingsServiceClient): _Observable.Observable<
-	_PlayerSettingsClient.PlayerSettingsClient
+function SettingsServiceClient.ObserveLocalPlayerSettings(self: SettingsServiceClient): Observable.Observable<
+	PlayerSettingsClient.PlayerSettingsClient
 >
 	return self:ObservePlayerSettings(Players.LocalPlayer)
 end
@@ -95,8 +95,8 @@ end
 ]=]
 function SettingsServiceClient.PromiseLocalPlayerSettings(
 	self: SettingsServiceClient,
-	cancelToken: _CancelToken.CancelToken
-): _Promise.Promise<_PlayerSettingsClient.PlayerSettingsClient>
+	cancelToken: CancelToken.CancelToken
+): Promise.Promise<PlayerSettingsClient.PlayerSettingsClient>
 	return self:PromisePlayerSettings(Players.LocalPlayer, cancelToken)
 end
 
@@ -109,7 +109,7 @@ end
 function SettingsServiceClient.ObservePlayerSettings(
 	self: SettingsServiceClient,
 	player: Player
-): _Observable.Observable<_PlayerSettingsClient.PlayerSettingsClient>
+): Observable.Observable<PlayerSettingsClient.PlayerSettingsClient>
 	assert(typeof(player) == "Instance" and player:IsA("Player"), "Bad player")
 
 	return self._settingsDataService:ObservePlayerSettings(player)
@@ -124,8 +124,8 @@ end
 function SettingsServiceClient.ObservePlayerSettingsBrio(
 	self: SettingsServiceClient,
 	player: Player
-): _Observable.Observable<
-	_Brio.Brio<_PlayerSettingsClient.PlayerSettingsClient>
+): Observable.Observable<
+	Brio.Brio<PlayerSettingsClient.PlayerSettingsClient>
 >
 	assert(typeof(player) == "Instance" and player:IsA("Player"), "Bad player")
 
@@ -141,7 +141,7 @@ end
 function SettingsServiceClient.GetPlayerSettings(
 	self: SettingsServiceClient,
 	player: Player
-): _PlayerSettingsClient.PlayerSettingsClient?
+): PlayerSettingsClient.PlayerSettingsClient?
 	assert(typeof(player) == "Instance" and player:IsA("Player"), "Bad player")
 
 	return self._settingsDataService:GetPlayerSettings(player)
@@ -157,8 +157,8 @@ end
 function SettingsServiceClient.PromisePlayerSettings(
 	self: SettingsServiceClient,
 	player: Player,
-	cancelToken: _CancelToken.CancelToken
-): _Promise.Promise<_PlayerSettingsClient.PlayerSettingsClient>
+	cancelToken: CancelToken.CancelToken
+): Promise.Promise<PlayerSettingsClient.PlayerSettingsClient>
 	assert(typeof(player) == "Instance" and player:IsA("Player"), "Bad player")
 
 	return self._settingsDataService:PromisePlayerSettings(player, cancelToken)

package/src/Server/Cmdr/SettingsCmdrService.lua

@@ -6,15 +6,15 @@
 
 local require = require(script.Parent.loader).load(script)
 
+local Maid = require("Maid")
 local PlayerUtils = require("PlayerUtils")
+local ServiceBag = require("ServiceBag")
 local SettingsCmdrUtils = require("SettingsCmdrUtils")
-local Maid = require("Maid")
-local _ServiceBag = require("ServiceBag")
 
 local SettingsCmdrService = {}
 SettingsCmdrService.ServiceName = "SettingsCmdrService"
 
-function SettingsCmdrService:Init(serviceBag: _ServiceBag.ServiceBag)
+function SettingsCmdrService:Init(serviceBag: ServiceBag.ServiceBag)
 	assert(not self._serviceBag, "Already initialized")
 	self._serviceBag = assert(serviceBag, "No serviceBag")
 	self._maid = Maid.new()

package/src/Server/Player/PlayerHasSettings.lua

@@ -5,12 +5,13 @@
 local require = require(script.Parent.loader).load(script)
 
 local BaseObject = require("BaseObject")
-local PlayerSettingsUtils = require("PlayerSettingsUtils")
-local PlayerSettings = require("PlayerSettings")
-local PlayerDataStoreService = require("PlayerDataStoreService")
 local DataStoreStringUtils = require("DataStoreStringUtils")
-local PlayerSettingsConstants = require("PlayerSettingsConstants")
 local PlayerBinder = require("PlayerBinder")
+local PlayerDataStoreService = require("PlayerDataStoreService")
+local PlayerSettings = require("PlayerSettings")
+local PlayerSettingsConstants = require("PlayerSettingsConstants")
+local PlayerSettingsUtils = require("PlayerSettingsUtils")
+local ServiceBag = require("ServiceBag")
 
 local PlayerHasSettings = setmetatable({}, BaseObject)
 PlayerHasSettings.ClassName = "PlayerHasSettings"
@@ -18,7 +19,7 @@ PlayerHasSettings.__index = PlayerHasSettings
 
 export type PlayerHasSettings = typeof(setmetatable(
 	{} :: {
-		_serviceBag: any,
+		_serviceBag: ServiceBag.ServiceBag,
 		_playerSettingsBinder: PlayerSettings.PlayerSettings,
 		_playerDataStoreService: PlayerDataStoreService.PlayerDataStoreService,
 	},
@@ -40,24 +41,24 @@ end
 function PlayerHasSettings:_promiseLoadSettings()
 	self._settings = self._maid:Add(PlayerSettingsUtils.create())
 
-	self._maid:GivePromise(self._playerDataStoreService:PromiseDataStore(self._obj))
+	self._maid
+		:GivePromise(self._playerDataStoreService:PromiseDataStore(self._obj))
 		:Then(function(dataStore)
 			-- Ensure we've fully loaded before we parent.
 			-- This should ensure the cache is mostly instant.
 
 			local subStore = dataStore:GetSubStore("settings")
 
-			return dataStore:Load("settings", {})
-				:Then(function(settings)
-					for settingName, value in settings do
-						local attributeName = PlayerSettingsUtils.getAttributeName(settingName)
-						self._settings:SetAttribute(attributeName, PlayerSettingsUtils.encodeForAttribute(value))
-					end
-
-					self._maid:GiveTask(self._settings.AttributeChanged:Connect(function(attributeName)
-						self:_handleAttributeChanged(subStore, attributeName)
-					end))
-				end)
+			return dataStore:Load("settings", {}):Then(function(settings)
+				for settingName, value in settings do
+					local attributeName = PlayerSettingsUtils.getAttributeName(settingName)
+					self._settings:SetAttribute(attributeName, PlayerSettingsUtils.encodeForAttribute(value))
+				end
+
+				self._maid:GiveTask(self._settings.AttributeChanged:Connect(function(attributeName)
+					self:_handleAttributeChanged(subStore, attributeName)
+				end))
+			end)
 		end)
 		:Catch(function(err)
 			warn(string.format("[PlayerHasSettings] - Failed to load settings for player. %s", tostring(err)))
@@ -84,7 +85,9 @@ function PlayerHasSettings:_handleAttributeChanged(subStore, attributeName)
 
 	if type(newValue) == "string" then
 		if (#settingName + #newValue) > PlayerSettingsConstants.MAX_SETTINGS_LENGTH then
-			warn(string.format("[PlayerSettingsClient.SetValue] - Setting is too long for %q. Cannot save.", settingName))
+			warn(
+				string.format("[PlayerSettingsClient.SetValue] - Setting is too long for %q. Cannot save.", settingName)
+			)
 			return
 		end
 		-- TODO: JSON encode and check length for ther scenarios
@@ -93,4 +96,4 @@ function PlayerHasSettings:_handleAttributeChanged(subStore, attributeName)
 	subStore:Store(settingName, newValue)
 end
 
-return PlayerBinder.new("PlayerHasSettings", PlayerHasSettings)
+return PlayerBinder.new("PlayerHasSettings", PlayerHasSettings)

package/src/Server/Player/PlayerSettings.lua

@@ -12,8 +12,8 @@ local PlayerSettingsConstants = require("PlayerSettingsConstants")
 local PlayerSettingsInterface = require("PlayerSettingsInterface")
 local PlayerSettingsUtils = require("PlayerSettingsUtils")
 local Remoting = require("Remoting")
+local ServiceBag = require("ServiceBag")
 local SettingsDataService = require("SettingsDataService")
-local _ServiceBag = require("ServiceBag")
 
 local PlayerSettings = setmetatable({}, PlayerSettingsBase)
 PlayerSettings.ClassName = "PlayerSettings"
@@ -21,18 +21,18 @@ PlayerSettings.__index = PlayerSettings
 
 export type PlayerSettings = typeof(setmetatable(
 	{} :: {
-		_serviceBag: any,
+		_serviceBag: ServiceBag.ServiceBag,
 		_remoting: Remoting.Remoting,
 		_settingsDataService: SettingsDataService.SettingsDataService,
 	},
 	{} :: typeof({ __index = PlayerSettings })
 )) & PlayerSettingsBase.PlayerSettingsBase
 
-function PlayerSettings.new(folder: Folder, serviceBag: _ServiceBag.ServiceBag)
+function PlayerSettings.new(folder: Folder, serviceBag: ServiceBag.ServiceBag): PlayerSettings
 	local self: PlayerSettings = setmetatable(PlayerSettingsBase.new(folder, serviceBag) :: any, PlayerSettings)
 
 	self._serviceBag = assert(serviceBag, "No serviceBag")
-	self._settingsDataService = self._serviceBag:GetService(SettingsDataService)
+	self._settingsDataService = self._serviceBag:GetService(SettingsDataService) :: any
 
 	self:_setupRemoting()
 

package/src/Server/SettingsService.lua

@@ -7,12 +7,12 @@
 local require = require(script.Parent.loader).load(script)
 
 local Maid = require("Maid")
-local _ServiceBag = require("ServiceBag")
+local ServiceBag = require("ServiceBag")
 
 local SettingsService = {}
 SettingsService.ServiceName = "SettingsService"
 
-function SettingsService:Init(serviceBag: _ServiceBag.ServiceBag)
+function SettingsService:Init(serviceBag: ServiceBag.ServiceBag)
 	assert(not self._serviceBag, "Already initialized")
 	self._serviceBag = assert(serviceBag, "No serviceBag")
 	self._maid = Maid.new()

package/src/Shared/Cmdr/SettingsCmdrUtils.lua

@@ -18,23 +18,23 @@ function SettingsCmdrUtils.registerSettingDefinition(cmdr, serviceBag)
 		Transform = function(text)
 			local definitions = settingsDataService:GetSettingDefinitions()
 			local settingNames = {}
-		for _, settingDefinition in definitions do
-			table.insert(settingNames, settingDefinition:GetSettingName())
-		end
+			for _, settingDefinition in definitions do
+				table.insert(settingNames, settingDefinition:GetSettingName())
+			end
 
-		local find = cmdr.Util.MakeFuzzyFinder(settingNames)
-		return find(text)
-		end;
+			local find = cmdr.Util.MakeFuzzyFinder(settingNames)
+			return find(text)
+		end,
 		Validate = function(keys)
-		return #keys > 0, "No item model with that name could be found."
+			return #keys > 0, "No item model with that name could be found."
 		end,
 		Autocomplete = function(keys)
-		return keys
+			return keys
 		end,
 		Parse = function(keys)
-		local name = keys[1]
+			local name = keys[1]
 
-		local definitions = settingsDataService:GetSettingDefinitions()
+			local definitions = settingsDataService:GetSettingDefinitions()
 			for _, settingDefinition in definitions do
 				if settingDefinition:GetSettingName() == name then
 					return settingDefinition
@@ -42,12 +42,11 @@ function SettingsCmdrUtils.registerSettingDefinition(cmdr, serviceBag)
 			end
 
 			return nil
-		end;
+		end,
 	}
 
 	cmdr.Registry:RegisterType("settingDefinition", settingDefinitionType)
 	cmdr.Registry:RegisterType("settingDefinitions", cmdr.Util.MakeListableType(settingDefinitionType))
 end
 
-
-return SettingsCmdrUtils
+return SettingsCmdrUtils

package/src/Shared/Interface/PlayerSettingsInterface.lua

@@ -7,11 +7,11 @@ local require = require(script.Parent.loader).load(script)
 local TieDefinition = require("TieDefinition")
 
 return TieDefinition.new("PlayerSettings", {
-	GetSettingProperty = TieDefinition.Types.METHOD;
-	GetValue = TieDefinition.Types.METHOD;
-	SetValue = TieDefinition.Types.METHOD;
-	ObserveValue = TieDefinition.Types.METHOD;
-	RestoreDefault = TieDefinition.Types.METHOD;
-	EnsureInitialized = TieDefinition.Types.METHOD;
-	GetPlayer = TieDefinition.Types.METHOD;
-})
+	GetSettingProperty = TieDefinition.Types.METHOD,
+	GetValue = TieDefinition.Types.METHOD,
+	SetValue = TieDefinition.Types.METHOD,
+	ObserveValue = TieDefinition.Types.METHOD,
+	RestoreDefault = TieDefinition.Types.METHOD,
+	EnsureInitialized = TieDefinition.Types.METHOD,
+	GetPlayer = TieDefinition.Types.METHOD,
+})

package/src/Shared/Player/PlayerSettingsBase.lua

@@ -8,12 +8,12 @@
 local require = require(script.Parent.loader).load(script)
 
 local BaseObject = require("BaseObject")
+local DataStoreStringUtils = require("DataStoreStringUtils")
 local PlayerSettingsUtils = require("PlayerSettingsUtils")
+local Rx = require("Rx")
 local RxAttributeUtils = require("RxAttributeUtils")
+local ServiceBag = require("ServiceBag")
 local SettingDefinition = require("SettingDefinition")
-local Rx = require("Rx")
-local DataStoreStringUtils = require("DataStoreStringUtils")
-local _ServiceBag = require("ServiceBag")
 
 local PlayerSettingsBase = setmetatable({}, BaseObject)
 PlayerSettingsBase.ClassName = "PlayerSettingsBase"
@@ -22,7 +22,7 @@ PlayerSettingsBase.__index = PlayerSettingsBase
 export type PlayerSettingsBase = typeof(setmetatable(
 	{} :: {
 		_obj: Folder,
-		_serviceBag: _ServiceBag.ServiceBag,
+		_serviceBag: ServiceBag.ServiceBag,
 	},
 	{} :: typeof({ __index = PlayerSettingsBase })
 )) & BaseObject.BaseObject
@@ -34,7 +34,7 @@ export type PlayerSettingsBase = typeof(setmetatable(
 	@param serviceBag ServiceBag
 	@return PlayerSettingsBase
 ]=]
-function PlayerSettingsBase.new(folder: Folder, serviceBag: _ServiceBag.ServiceBag): 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")
@@ -164,4 +164,4 @@ function PlayerSettingsBase.EnsureInitialized(_self: PlayerSettingsBase, setting
 	-- noop
 end
 
-return PlayerSettingsBase
+return PlayerSettingsBase

package/src/Shared/Player/PlayerSettingsConstants.lua

@@ -8,12 +8,12 @@ local require = require(script.Parent.loader).load(script)
 local Table = require("Table")
 
 return Table.readonly({
-	SETTING_ATTRIBUTE_PREFIX = "Setting_";
-	SETTING_DEFAULT_VALUE_SUFFIX = "_Default";
-	SETTING_LOCAL_USER_VALUE_SUFFIX = "_Client";
+	SETTING_ATTRIBUTE_PREFIX = "Setting_",
+	SETTING_DEFAULT_VALUE_SUFFIX = "_Default",
+	SETTING_LOCAL_USER_VALUE_SUFFIX = "_Client",
 
-	PLAYER_SETTINGS_NAME = "PlayerSettings";
-	REMOTE_FUNCTION_NAME = "PlayerSettingsRemoteFunction";
-	REQUEST_UPDATE_SETTINGS = "requestUpdateSettings";
-	MAX_SETTINGS_LENGTH = 2048;
-})
+	PLAYER_SETTINGS_NAME = "PlayerSettings",
+	REMOTE_FUNCTION_NAME = "PlayerSettingsRemoteFunction",
+	REQUEST_UPDATE_SETTINGS = "requestUpdateSettings",
+	MAX_SETTINGS_LENGTH = 2048,
+})

package/src/Shared/Player/PlayerSettingsUtils.lua

@@ -7,10 +7,10 @@
 
 local require = require(script.Parent.loader).load(script)
 
+local DataStoreStringUtils = require("DataStoreStringUtils")
+local EnumUtils = require("EnumUtils")
 local PlayerSettingsConstants = require("PlayerSettingsConstants")
 local String = require("String")
-local EnumUtils = require("EnumUtils")
-local DataStoreStringUtils = require("DataStoreStringUtils")
 
 local PlayerSettingsUtils = {}
 

package/src/Shared/Setting/SettingDefinition.lua

@@ -22,12 +22,11 @@ local require = require(script.Parent.loader).load(script)
 
 local Players = game:GetService("Players")
 
-local SettingsDataService = require("SettingsDataService")
-local SettingProperty = require("SettingProperty")
-local ServiceBag = require("ServiceBag")
 local DuckTypeUtils = require("DuckTypeUtils")
 local Maid = require("Maid")
-local _ServiceBag = require("ServiceBag")
+local ServiceBag = require("ServiceBag")
+local SettingProperty = require("SettingProperty")
+local SettingsDataService = require("SettingsDataService")
 
 local SettingDefinition = {}
 SettingDefinition.ClassName = "SettingDefinition"
@@ -60,7 +59,7 @@ end
 
 	@param serviceBag ServiceBag
 ]=]
-function SettingDefinition:Init(serviceBag: _ServiceBag.ServiceBag)
+function SettingDefinition:Init(serviceBag: ServiceBag.ServiceBag)
 	assert(serviceBag, "No serviceBag")
 	assert(not self._maid, "Already initialized")
 
@@ -195,4 +194,4 @@ function SettingDefinition:Destroy()
 	self._maid:DoCleaning()
 end
 
-return SettingDefinition
+return SettingDefinition

package/src/Shared/Setting/SettingDefinitionProvider.lua

@@ -27,8 +27,8 @@
 local require = require(script.Parent.loader).load(script)
 
 local Maid = require("Maid")
+local ServiceBag = require("ServiceBag")
 local SettingDefinition = require("SettingDefinition")
-local _ServiceBag = require("ServiceBag")
 
 local SettingDefinitionProvider = {}
 SettingDefinitionProvider.ClassName = "SettingDefinitionProvider"
@@ -105,7 +105,7 @@ end
 
 	@param serviceBag ServiceBag
 ]=]
-function SettingDefinitionProvider:Init(serviceBag: _ServiceBag.ServiceBag)
+function SettingDefinitionProvider:Init(serviceBag: ServiceBag.ServiceBag)
 	assert(serviceBag, "No serviceBag")
 	assert(not self._maid, "Already initialized")
 
@@ -176,12 +176,13 @@ function SettingDefinitionProvider:__index(index)
 		error("[SettingDefinitionProvider] - Cannot index provider with nil value")
 	elseif SettingDefinitionProvider[index] then
 		return SettingDefinitionProvider[index]
-	elseif index == "_lookup"
+	elseif
+		index == "_lookup"
 		or index == "_settingDefinitionList"
 		or index == "_maid"
 		or index == "_initializedDefinitionLookup"
-		or index == "_serviceBag" then
-
+		or index == "_serviceBag"
+	then
 		return rawget(self, index)
 	elseif type(index) == "string" then
 		local lookup = rawget(self, "_lookup")
@@ -228,4 +229,4 @@ function SettingDefinitionProvider:Destroy()
 	self._maid:DoCleaning()
 end
 
-return SettingDefinitionProvider
+return SettingDefinitionProvider

package/src/Shared/Setting/SettingProperty.lua

@@ -5,12 +5,12 @@
 
 local require = require(script.Parent.loader).load(script)
 
-local SettingsDataService = require("SettingsDataService")
+local Observable = require("Observable")
+local Promise = require("Promise")
 local Rx = require("Rx")
 local RxSignal = require("RxSignal")
-local _ServiceBag = require("ServiceBag")
-local _Promise = require("Promise")
-local _Observable = require("Observable")
+local ServiceBag = require("ServiceBag")
+local SettingsDataService = require("SettingsDataService")
 
 local SettingProperty = {}
 SettingProperty.ClassName = "SettingProperty"
@@ -22,7 +22,7 @@ export type SettingProperty<T> = typeof(setmetatable(
 		Changed: any,
 		DefaultValue: T,
 
-		_serviceBag: any,
+		_serviceBag: ServiceBag.ServiceBag,
 		_bridge: SettingsDataService.SettingsDataService,
 		_player: Player,
 		_definition: any,
@@ -38,11 +38,11 @@ export type SettingProperty<T> = typeof(setmetatable(
 	@param definition SettingDefinition
 	@return SettingProperty<T>
 ]=]
-function SettingProperty.new<T>(serviceBag: _ServiceBag.ServiceBag, player: Player, definition): SettingProperty<T>
+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)
+	self._bridge = self._serviceBag:GetService(SettingsDataService) :: any
 
 	self._player = assert(player, "No player")
 	self._definition = assert(definition, "No definition")
@@ -58,7 +58,7 @@ end
 	Observes the value of the setting property
 	@return Observable<T>
 ]=]
-function SettingProperty.Observe<T>(self: SettingProperty<T>): _Observable.Observable<T>
+function SettingProperty.Observe<T>(self: SettingProperty<T>): Observable.Observable<T>
 	return self:_observePlayerSettings():Pipe({
 		Rx.where(function(settings)
 			return settings ~= nil
@@ -146,7 +146,7 @@ end
 
 	@return Promise<T>
 ]=]
-function SettingProperty.PromiseValue<T>(self: SettingProperty<T>): _Promise.Promise<T>
+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)
@@ -158,7 +158,7 @@ end
 	@param value T
 	@return Promise
 ]=]
-function SettingProperty.PromiseSetValue<T>(self: SettingProperty<T>, value: T): _Promise.Promise<()>
+function SettingProperty.PromiseSetValue<T>(self: SettingProperty<T>, value: T): Promise.Promise<()>
 	return self:_promisePlayerSettings():Then(function(playerSettings)
 		playerSettings:SetValue(self._definition:GetSettingName(), value)
 	end)
@@ -185,7 +185,7 @@ end
 
 	@return Promise
 ]=]
-function SettingProperty.PromiseRestoreDefault<T>(self: SettingProperty<T>): _Promise.Promise<()>
+function SettingProperty.PromiseRestoreDefault<T>(self: SettingProperty<T>): Promise.Promise<()>
 	return self:_promisePlayerSettings():Then(function(playerSettings)
 		playerSettings:RestoreDefault(self._definition:GetSettingName(), self._definition:GetDefaultValue())
 	end)
@@ -203,4 +203,4 @@ function SettingProperty._promisePlayerSettings<T>(self: SettingProperty<T>)
 	return self._bridge:PromisePlayerSettings(self._player)
 end
 
-return SettingProperty
+return SettingProperty

package/src/Shared/SettingsDataService.lua

@@ -15,12 +15,13 @@ local PlayerSettingsInterface = require("PlayerSettingsInterface")
 local Rx = require("Rx")
 local RxBrioUtils = require("RxBrioUtils")
 local RxInstanceUtils = require("RxInstanceUtils")
-local _ServiceBag = require("ServiceBag")
+local ServiceBag = require("ServiceBag")
 
 local SettingsDataService = {}
 
 export type SettingsDataService = typeof(setmetatable(
 	{} :: {
+		_serviceBag: ServiceBag.ServiceBag,
 		_maid: Maid.Maid,
 	},
 	{} :: typeof({ __index = SettingsDataService })
@@ -31,7 +32,7 @@ export type SettingsDataService = typeof(setmetatable(
 
 	@param serviceBag ServiceBag
 ]=]
-function SettingsDataService:Init(serviceBag: _ServiceBag.ServiceBag)
+function SettingsDataService:Init(serviceBag: ServiceBag.ServiceBag)
 	assert(not self._serviceBag, "Already initialized")
 	self._serviceBag = assert(serviceBag, "No serviceBag")
 	self._maid = Maid.new()

package/test/scripts/Client/ClientMain.client.lua

@@ -22,4 +22,4 @@ game:GetService("UserInputService").InputBegan:Connect(function(input)
 	if input.UserInputType == Enum.UserInputType.MouseButton1 then
 		volume.Value = math.random()
 	end
-end)
+end)

package/test/scripts/Server/ServerMain.server.lua

@@ -17,7 +17,6 @@ serviceBag:GetService(screenShakeDefinition)
 serviceBag:Init()
 serviceBag:Start()
 
-
 local volumeDefinition = SettingDefinition.new("Volume", 1)
 bridge:RegisterSettingDefinition(volumeDefinition)
 
@@ -41,4 +40,3 @@ game.Players.PlayerAdded:Connect(handlePlayer)
 for _, player in game.Players:GetPlayers() do
 	handlePlayer(player)
 end
-