@quenty/settings 11.9.0 → 11.11.0

package/CHANGELOG.md

@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [11.11.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/settings@11.10.0...@quenty/settings@11.11.0) (2024-10-04)
+
+
+### Performance Improvements
+
+* Fix settings to use a cache which reduces memory usage by 10 MB approximately ([990d0a6](https://github.com/Quenty/NevermoreEngine/commit/990d0a678ad405740acd045f041c0bbd51eca660))
+
+
+
+
+
+# [11.10.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/settings@11.9.0...@quenty/settings@11.10.0) (2024-09-25)
+
+**Note:** Version bump only for package @quenty/settings
+
+
+
+
+
 # [11.9.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/settings@11.8.2...@quenty/settings@11.9.0) (2024-09-25)
 
 **Note:** Version bump only for package @quenty/settings

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/settings",
-  "version": "11.9.0",
+  "version": "11.11.0",
   "description": "Centralized player settings service",
   "keywords": [
     "Roblox",
@@ -25,35 +25,35 @@
     "Quenty"
   ],
   "dependencies": {
-    "@quenty/attributeutils": "^14.6.0",
-    "@quenty/baseobject": "^10.5.0",
-    "@quenty/binder": "^14.7.0",
-    "@quenty/cmdrservice": "^13.8.0",
-    "@quenty/datastore": "^13.8.0",
-    "@quenty/ducktype": "^5.5.0",
+    "@quenty/attributeutils": "^14.8.0",
+    "@quenty/baseobject": "^10.6.0",
+    "@quenty/binder": "^14.9.0",
+    "@quenty/cmdrservice": "^13.10.0",
+    "@quenty/datastore": "^13.10.0",
+    "@quenty/ducktype": "^5.6.0",
     "@quenty/enumutils": "^3.3.0",
-    "@quenty/jsonutils": "^10.5.0",
-    "@quenty/loader": "^10.5.0",
-    "@quenty/maid": "^3.3.0",
-    "@quenty/observablecollection": "^12.6.0",
-    "@quenty/playerbinder": "^14.7.0",
-    "@quenty/playerutils": "^8.6.0",
-    "@quenty/remotefunctionutils": "^10.5.0",
-    "@quenty/remoting": "^12.7.0",
-    "@quenty/rx": "^13.6.0",
-    "@quenty/rxbinderutils": "^14.7.0",
-    "@quenty/servicebag": "^11.6.0",
-    "@quenty/signal": "^7.5.0",
-    "@quenty/statestack": "^14.7.0",
+    "@quenty/jsonutils": "^10.6.0",
+    "@quenty/loader": "^10.6.0",
+    "@quenty/maid": "^3.4.0",
+    "@quenty/observablecollection": "^12.8.0",
+    "@quenty/playerbinder": "^14.9.0",
+    "@quenty/playerutils": "^8.8.0",
+    "@quenty/remotefunctionutils": "^10.6.0",
+    "@quenty/remoting": "^12.9.0",
+    "@quenty/rx": "^13.8.0",
+    "@quenty/rxbinderutils": "^14.9.0",
+    "@quenty/servicebag": "^11.8.0",
+    "@quenty/signal": "^7.7.0",
+    "@quenty/statestack": "^14.9.0",
     "@quenty/string": "^3.3.0",
-    "@quenty/symbol": "^3.1.0",
+    "@quenty/symbol": "^3.2.0",
     "@quenty/table": "^3.5.0",
-    "@quenty/throttle": "^10.6.0",
-    "@quenty/tie": "^10.8.0",
-    "@quenty/valueobject": "^13.6.0"
+    "@quenty/throttle": "^10.7.0",
+    "@quenty/tie": "^10.10.0",
+    "@quenty/valueobject": "^13.8.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "41715b15e2b48b2d22ff4f5277a8d4b7a0d32ef3"
+  "gitHead": "035abfa088c854a73e1c65b350267eaa17669646"
 }

package/src/Client/SettingsServiceClient.lua

@@ -10,8 +10,6 @@ local require = require(script.Parent.loader).load(script)
 
 local Players = game:GetService("Players")
 
-local PlayerSettingsUtils = require("PlayerSettingsUtils")
-local Rx = require("Rx")
 local Maid = require("Maid")
 local SettingsCmdrUtils = require("SettingsCmdrUtils")
 
@@ -31,8 +29,10 @@ function SettingsServiceClient:Init(serviceBag)
 	self._serviceBag:GetService(require("CmdrServiceClient"))
 
 	-- Internal
-	self._serviceBag:GetService(require("SettingRegistryServiceShared")):RegisterSettingService(self)
-	self._playerSettingsBinder = self._serviceBag:GetService(require("PlayerSettingsClient"))
+	self._settingsDataService = self._serviceBag:GetService(require("SettingsDataService"))
+
+	-- Binders
+	self._serviceBag:GetService(require("PlayerSettingsClient"))
 end
 
 function SettingsServiceClient:Start()
@@ -84,7 +84,7 @@ end
 function SettingsServiceClient:ObservePlayerSettings(player)
 	assert(typeof(player) == "Instance" and player:IsA("Player"), "Bad player")
 
-	return PlayerSettingsUtils.observePlayerSettings(self._playerSettingsBinder, player)
+	return self._settingsDataService:ObservePlayerSettings(player)
 end
 
 --[=[
@@ -96,7 +96,7 @@ end
 function SettingsServiceClient:ObservePlayerSettingsBrio(player)
 	assert(typeof(player) == "Instance" and player:IsA("Player"), "Bad player")
 
-	return PlayerSettingsUtils.observePlayerSettingsBrio(self._playerSettingsBinder, player)
+	return self._settingsDataService:ObservePlayerSettingsBrio(player)
 end
 
 --[=[
@@ -108,7 +108,7 @@ end
 function SettingsServiceClient:GetPlayerSettings(player)
 	assert(typeof(player) == "Instance" and player:IsA("Player"), "Bad player")
 
-	return PlayerSettingsUtils.getPlayerSettings(self._playerSettingsBinder, player)
+	return self._settingsDataService:GetPlayerSettings(player)
 end
 
 --[=[
@@ -121,11 +121,7 @@ end
 function SettingsServiceClient:PromisePlayerSettings(player, cancelToken)
 	assert(typeof(player) == "Instance" and player:IsA("Player"), "Bad player")
 
-	return Rx.toPromise(self:ObservePlayerSettings(player):Pipe({
-		Rx.where(function(x)
-			return x ~= nil
-		end)
-	}), cancelToken)
+	return self._settingsDataService:PromisePlayerSettings(player, cancelToken)
 end
 
 

package/src/Server/Player/PlayerSettings.lua

@@ -11,7 +11,7 @@ local PlayerSettingsConstants = require("PlayerSettingsConstants")
 local PlayerSettingsInterface = require("PlayerSettingsInterface")
 local PlayerSettingsUtils = require("PlayerSettingsUtils")
 local Remoting = require("Remoting")
-local SettingRegistryServiceShared = require("SettingRegistryServiceShared")
+local SettingsDataService = require("SettingsDataService")
 
 local PlayerSettings = setmetatable({}, PlayerSettingsBase)
 PlayerSettings.ClassName = "PlayerSettings"
@@ -21,11 +21,11 @@ function PlayerSettings.new(obj, serviceBag)
 	local self = setmetatable(PlayerSettingsBase.new(obj, serviceBag), PlayerSettings)
 
 	self._serviceBag = assert(serviceBag, "No serviceBag")
-	self._settingRegistryServiceShared = self._serviceBag:GetService(SettingRegistryServiceShared)
+	self._settingsDataService = self._serviceBag:GetService(SettingsDataService)
 
 	self:_setupRemoting()
 
-	self._maid:GiveTask(self._settingRegistryServiceShared:ObserveRegisteredDefinitionsBrio():Subscribe(function(brio)
+	self._maid:GiveTask(self._settingsDataService:ObserveRegisteredDefinitionsBrio():Subscribe(function(brio)
 		if brio:IsDead() then
 			return
 		end

package/src/Server/SettingsService.lua

@@ -4,8 +4,6 @@
 
 local require = require(script.Parent.loader).load(script)
 
-local PlayerSettingsUtils = require("PlayerSettingsUtils")
-local Rx = require("Rx")
 local Maid = require("Maid")
 
 local SettingsService = {}
@@ -20,40 +18,36 @@ function SettingsService:Init(serviceBag)
 	self._serviceBag:GetService(require("PlayerDataStoreService"))
 	self._serviceBag:GetService(require("SettingsCmdrService"))
 
-
 	-- Internal
-	self._playerSettingsBinder = self._serviceBag:GetService(require("PlayerSettings"))
-	self._serviceBag:GetService(require("PlayerHasSettings"))
+	self._settingsDataService = self._serviceBag:GetService(require("SettingsDataService"))
 
-	self._serviceBag:GetService(require("SettingRegistryServiceShared")):RegisterSettingService(self)
+	-- Binders
+	self._serviceBag:GetService(require("PlayerHasSettings"))
+	self._serviceBag:GetService(require("PlayerSettings"))
 end
 
 function SettingsService:ObservePlayerSettingsBrio(player)
 	assert(typeof(player) == "Instance" and player:IsA("Player"), "Bad player")
 
-	return PlayerSettingsUtils.observePlayerSettingsBrio(self._playerSettingsBinder, player)
+	return self._settingsDataService:ObservePlayerSettingsBrio(player)
 end
 
 function SettingsService:ObservePlayerSettings(player)
 	assert(typeof(player) == "Instance" and player:IsA("Player"), "Bad player")
 
-	return PlayerSettingsUtils.observePlayerSettings(self._playerSettingsBinder, player)
+	return self._settingsDataService:ObservePlayerSettings(player)
 end
 
 function SettingsService:GetPlayerSettings(player)
 	assert(typeof(player) == "Instance" and player:IsA("Player"), "Bad player")
 
-	return PlayerSettingsUtils.getPlayerSettings(self._playerSettingsBinder, player)
+	return self._settingsDataService:GetPlayerSettings(player)
 end
 
 function SettingsService:PromisePlayerSettings(player, cancelToken)
 	assert(typeof(player) == "Instance" and player:IsA("Player"), "Bad player")
 
-	return Rx.toPromise(self:ObservePlayerSettings(player):Pipe({
-		Rx.where(function(x)
-			return x ~= nil
-		end)
-	}), cancelToken)
+	return self._settingsDataService:PromisePlayerSettings(player, cancelToken)
 end
 
 function SettingsService:Destroy()

package/src/Shared/Cmdr/SettingsCmdrUtils.lua

@@ -5,18 +5,18 @@
 local require = require(script.Parent.loader).load(script)
 
 local ServiceBag = require("ServiceBag")
-local SettingRegistryServiceShared = require("SettingRegistryServiceShared")
+local SettingsDataService = require("SettingsDataService")
 
 local SettingsCmdrUtils = {}
 
 function SettingsCmdrUtils.registerSettingDefinition(cmdr, serviceBag)
 	assert(ServiceBag.isServiceBag(serviceBag), "Bad serviceBag")
 
-	local settingRegistryService = serviceBag:GetService(SettingRegistryServiceShared)
+	local settingsDataService = serviceBag:GetService(SettingsDataService)
 
 	local settingDefinitionType = {
 		Transform = function(text)
-			local definitions = settingRegistryService:GetSettingDefinitions()
+			local definitions = settingsDataService:GetSettingDefinitions()
 			local settingNames = {}
 			for _, settingDefinition in pairs(definitions) do
 				table.insert(settingNames, settingDefinition:GetSettingName())
@@ -34,7 +34,7 @@ function SettingsCmdrUtils.registerSettingDefinition(cmdr, serviceBag)
 		Parse = function(keys)
 			local name = keys[1]
 
-			local definitions = settingRegistryService:GetSettingDefinitions()
+			local definitions = settingsDataService:GetSettingDefinitions()
 			for _, settingDefinition in pairs(definitions) do
 				if settingDefinition:GetSettingName() == name then
 					return settingDefinition

package/src/Shared/Interface/PlayerSettingsInterface.lua

@@ -13,4 +13,5 @@ return TieDefinition.new("PlayerSettings", {
 	ObserveValue = TieDefinition.Types.METHOD;
 	RestoreDefault = TieDefinition.Types.METHOD;
 	EnsureInitialized = TieDefinition.Types.METHOD;
+	GetPlayer = TieDefinition.Types.METHOD;
 })

package/src/Shared/Player/PlayerSettingsBase.lua

@@ -37,7 +37,7 @@ end
 	@return Player
 ]=]
 function PlayerSettingsBase:GetPlayer()
-	return self._obj.Parent
+	return self._obj:FindFirstAncestorWhichIsA("Player")
 end
 
 --[=[

package/src/Shared/Player/PlayerSettingsUtils.lua

@@ -8,10 +8,6 @@ local require = require(script.Parent.loader).load(script)
 
 local PlayerSettingsConstants = require("PlayerSettingsConstants")
 local String = require("String")
-local RxBinderUtils = require("RxBinderUtils")
-local BinderUtils = require("BinderUtils")
-local Binder = require("Binder")
-local RxStateStackUtils = require("RxStateStackUtils")
 local EnumUtils = require("EnumUtils")
 local DataStoreStringUtils = require("DataStoreStringUtils")
 
@@ -30,47 +26,6 @@ function PlayerSettingsUtils.create()
 	return playerSettings
 end
 
---[=[
-	Observe a player settings for a player.
-
-	@param binder Binder<PlayerSettings>
-	@param player Player
-	@return Observable<PlayerSettings>
-]=]
-function PlayerSettingsUtils.observePlayerSettingsBrio(binder, player)
-	assert(Binder.isBinder(binder), "No binder")
-	assert(typeof(player) == "Instance" and player:IsA("Player"), "Bad player")
-
-	return RxBinderUtils.observeBoundChildClassBrio(binder, player)
-end
-
---[=[
-	Observe a player's latest settings
-
-	@param binder Binder<PlayerSettings>
-	@param player Player
-	@return Observable<PlayerSettings>
-]=]
-function PlayerSettingsUtils.observePlayerSettings(binder, player)
-	return RxBinderUtils.observeBoundChildClassBrio(binder, player):Pipe({
-		RxStateStackUtils.topOfStack()
-	})
-end
-
---[=[
-	Gets a player's latest settings
-
-	@param binder Binder<PlayerSettings>
-	@param player Player
-	@return PlayerSettings
-]=]
-function PlayerSettingsUtils.getPlayerSettings(binder, player)
-	assert(Binder.isBinder(binder), "No binder")
-	assert(typeof(player) == "Instance" and player:IsA("Player"), "Bad player")
-
-	return BinderUtils.findFirstChild(binder, player)
-end
-
 --[=[
 	Gets the attribute name for a setting
 

package/src/Shared/Setting/SettingDefinition.lua

@@ -22,7 +22,7 @@ local require = require(script.Parent.loader).load(script)
 
 local Players = game:GetService("Players")
 
-local SettingRegistryServiceShared = require("SettingRegistryServiceShared")
+local SettingsDataService = require("SettingsDataService")
 local SettingProperty = require("SettingProperty")
 local ServiceBag = require("ServiceBag")
 local DuckTypeUtils = require("DuckTypeUtils")
@@ -66,8 +66,8 @@ function SettingDefinition:Init(serviceBag)
 	self._maid = Maid.new()
 	self._serviceBag = assert(serviceBag, "No serviceBag")
 
-	local settingRegistryServiceShared = self._serviceBag:GetService(SettingRegistryServiceShared)
-	self._maid:GiveTask(settingRegistryServiceShared:RegisterSettingDefinition(self))
+	local settingsDataService = self._serviceBag:GetService(SettingsDataService)
+	self._maid:GiveTask(settingsDataService:RegisterSettingDefinition(self))
 end
 
 --[=[

package/src/Shared/Setting/SettingDefinitionProvider.lua

@@ -4,10 +4,10 @@
 
 	:::tip
 	These settings providers should be used on both the client and the server. On the client, these
-	are registered with the [SettingRegistryServiceShared] so that they can be shown in UI automatically
+	are registered with the [SettingsDataService] so that they can be shown in UI automatically
 	if desired.
 
-	On the server, these are registered with [SettingRegistryServiceShared] and then are checked before
+	On the server, these are registered with [SettingsDataService] and then are checked before
 	arbitrary data can e sent.
 	:::
 
@@ -100,7 +100,7 @@ function SettingDefinitionProvider:_addSettingDefinition(settingDefinition)
 end
 
 --[=[
-	Initializes the provider, storing the data in [SettingRegistryServiceShared]
+	Initializes the provider, storing the data in [SettingsDataService]
 
 	@param serviceBag ServiceBag
 ]=]

package/src/Shared/Setting/SettingProperty.lua

@@ -4,7 +4,7 @@
 
 local require = require(script.Parent.loader).load(script)
 
-local SettingRegistryServiceShared = require("SettingRegistryServiceShared")
+local SettingsDataService = require("SettingsDataService")
 local Rx = require("Rx")
 
 local SettingProperty = {}
@@ -23,7 +23,7 @@ function SettingProperty.new(serviceBag, player, definition)
 	local self = setmetatable({}, SettingProperty)
 
 	self._serviceBag = assert(serviceBag, "No serviceBag")
-	self._bridge = self._serviceBag:GetService(SettingRegistryServiceShared)
+	self._bridge = self._serviceBag:GetService(SettingsDataService)
 
 	self._player = assert(player, "No player")
 	self._definition = assert(definition, "No definition")

package/src/Shared/SettingsDataService.lua

@@ -0,0 +1,174 @@
+--[=[
+	Shared between client and server, letting us centralize definitions in one place.
+
+	@class SettingsDataService
+]=]
+
+local require = require(script.Parent.loader).load(script)
+
+local Players = game:GetService("Players")
+
+local Maid = require("Maid")
+local ObservableMap = require("ObservableMap")
+local ObservableSet = require("ObservableSet")
+local PlayerSettingsInterface = require("PlayerSettingsInterface")
+local Rx = require("Rx")
+local RxBrioUtils = require("RxBrioUtils")
+local RxInstanceUtils = require("RxInstanceUtils")
+
+local SettingsDataService = {}
+
+--[=[
+	Initializes the shared registry service. Should be done via [ServiceBag].
+
+	@param serviceBag ServiceBag
+]=]
+function SettingsDataService:Init(serviceBag)
+	assert(not self._serviceBag, "Already initialized")
+	self._serviceBag = assert(serviceBag, "No serviceBag")
+	self._maid = Maid.new()
+
+	-- External
+	self._tieRealmService = self._serviceBag:GetService(require("TieRealmService"))
+
+	-- State
+	self._settingDefinitions = self._maid:Add(ObservableSet.new())
+end
+
+function SettingsDataService:_getPlayerSettingsCacheMap()
+	-- Avoid hydrating
+	if self._playerSettingsCacheMap then
+		return self._playerSettingsCacheMap
+	end
+
+	self._playerSettingsCacheMap = self._maid:Add(ObservableMap.new())
+	self._hydratedPlayersMaid = self._maid:Add(Maid.new())
+
+	self._maid:GiveTask(Players.PlayerRemoving:Connect(function(player)
+		self._hydratedPlayersMaid[player] = nil
+	end))
+
+	return self._playerSettingsCacheMap
+end
+
+function SettingsDataService:_getPlayerSettingsMapForPlayer(player)
+	local playerSettingsCacheMap = self:_getPlayerSettingsCacheMap()
+
+	if self._hydratedPlayersMaid[player] then
+		return playerSettingsCacheMap
+	end
+
+	-- Note we only do this as requested to save memory. On the client, we're unlikely
+	-- to even query other player's settings.
+	self._hydratedPlayersMaid[player] = self:_hydrateCacheForPlayer(player)
+
+	return playerSettingsCacheMap
+end
+
+function SettingsDataService:_hydrateCacheForPlayer(player)
+	local playerMaid = Maid.new()
+
+	playerMaid:GiveTask(RxInstanceUtils.observeChildrenBrio(player, function(value)
+		-- We really only care about this, and we can assume we have the tag immediately
+		return value:HasTag("PlayerSettings")
+	end):Pipe({
+		RxBrioUtils.flatMapBrio(function(playerSettingsInstance)
+			return PlayerSettingsInterface:ObserveBrio(playerSettingsInstance, self._tieRealmService:GetTieRealm())
+		end)
+	}):Subscribe(function(brio)
+		if brio:IsDead() then
+			return
+		end
+
+		local maid, playerSettings = brio:ToMaidAndValue()
+		maid:GiveTask(self._playerSettingsCacheMap:Set(playerSettings:GetPlayer(), playerSettings))
+	end))
+
+	return playerMaid
+end
+
+function SettingsDataService:GetSettingDefinitions()
+	return self._settingDefinitions:GetList()
+end
+
+--[=[
+	Registers settings definitions
+
+	@param definition SettingDefinition
+	@return callback -- Cleanup callback
+]=]
+function SettingsDataService:RegisterSettingDefinition(definition)
+	assert(definition, "No definition")
+
+	return self._settingDefinitions:Add(definition)
+end
+
+--[=[
+	Observes the registered definitions
+
+	@return Observable<Brio<SettingDefinition>>
+]=]
+function SettingsDataService:ObserveRegisteredDefinitionsBrio()
+	return self._settingDefinitions:ObserveItemsBrio()
+end
+
+
+--[=[
+	Observes the player's settings
+
+	@param player Player
+	@return Observable<PlayerSettingsBase>
+]=]
+function SettingsDataService:ObservePlayerSettings(player)
+	assert(typeof(player) == "Instance" and player:IsA("Player"), "Bad player")
+
+	return self:_getPlayerSettingsMapForPlayer(player):ObserveAtKey(player, self._tieRealmService:GetTieRealm())
+end
+
+--[=[
+	Observes the player settings in a brio
+
+	@param player Player
+	@return Observable<Brio<PlayerSettingsClient>>
+]=]
+function SettingsDataService:ObservePlayerSettingsBrio(player)
+	return self:_getPlayerSettingsMapForPlayer(player):ObserveAtKeyBrio(player, self._tieRealmService:GetTieRealm())
+end
+
+--[=[
+	Promises the player's settings
+
+	@param player Player
+	@param cancelToken CancelToken
+	@return Promise<PlayerSettingsBase>
+]=]
+function SettingsDataService:PromisePlayerSettings(player, cancelToken)
+	assert(typeof(player) == "Instance" and player:IsA("Player"), "Bad player")
+
+	return  Rx.toPromise(self:ObservePlayerSettings(player):Pipe({
+		Rx.where(function(playerSettings)
+			return playerSettings ~= nil
+		end)
+	}), cancelToken)
+end
+
+--[=[
+	Gets the player's settings
+
+	@param player Player
+	@return Promise<PlayerSettingsBase>
+]=]
+function SettingsDataService:GetPlayerSettings(player)
+	assert(typeof(player) == "Instance" and player:IsA("Player"), "Bad player")
+
+	return self:_getPlayerSettingsMapForPlayer(player):Get(player)
+end
+
+--[=[
+	Cleans up the shared registry service
+]=]
+function SettingsDataService:Destroy()
+	self._maid:DoCleaning()
+end
+
+return SettingsDataService

package/src/Shared/SettingRegistryServiceShared.lua

@@ -1,148 +0,0 @@
---[=[
-	Shared between client and server, letting us centralize definitions in one place.
-
-	@class SettingRegistryServiceShared
-]=]
-
-local require = require(script.Parent.loader).load(script)
-
-local ValueObject = require("ValueObject")
-local Rx = require("Rx")
-local ObservableSet = require("ObservableSet")
-local Maid = require("Maid")
-
-local SettingRegistryServiceShared = {}
-
---[=[
-	Initializes the shared registry service. Should be done via [ServiceBag].
-
-	@param serviceBag ServiceBag
-]=]
-function SettingRegistryServiceShared:Init(serviceBag)
-	assert(not self._serviceBag, "Already initialized")
-	self._serviceBag = assert(serviceBag, "No serviceBag")
-	self._maid = Maid.new()
-
-	self._settingService = ValueObject.new()
-	self._maid:GiveTask(self._settingService)
-
-	self._settingDefinitions = ObservableSet.new()
-	self._maid:GiveTask(self._settingDefinitions)
-end
-
-function SettingRegistryServiceShared:GetSettingDefinitions()
-	return self._settingDefinitions:GetList()
-end
-
---[=[
-	Registers the shared setting service for this bridge
-
-	@param settingService SettingService
-]=]
-function SettingRegistryServiceShared:RegisterSettingService(settingService)
-	self._settingService.Value = settingService
-end
-
---[=[
-	Registers settings definitions
-
-	@param definition SettingDefinition
-	@return callback -- Cleanup callback
-]=]
-function SettingRegistryServiceShared:RegisterSettingDefinition(definition)
-	assert(definition, "No definition")
-
-	return self._settingDefinitions:Add(definition)
-end
-
---[=[
-	Observes the registered definitions
-
-	@return Observable<Brio<SettingDefinition>>
-]=]
-function SettingRegistryServiceShared:ObserveRegisteredDefinitionsBrio()
-	return self._settingDefinitions:ObserveItemsBrio()
-end
-
---[=[
-	Gets the current settings service
-
-	@return SettingService
-]=]
-function SettingRegistryServiceShared:GetSettingsService()
-	return self._settingService.Value
-end
-
---[=[
-	Observes the current settings service
-
-	@return Observable<SettingService>
-]=]
-function SettingRegistryServiceShared:ObserveSettingsService()
-	return self._settingService:Observe()
-end
-
---[=[
-	Observes the player's settings
-
-	@param player Player
-	@return Observable<PlayerSettingsBase>
-]=]
-function SettingRegistryServiceShared:ObservePlayerSettings(player)
-	assert(typeof(player) == "Instance" and player:IsA("Player"), "Bad player")
-
-	return self:ObserveSettingsService():Pipe({
-		Rx.switchMap(function(settingService)
-			if settingService then
-				return settingService:ObservePlayerSettings(player)
-			else
-				return Rx.of(nil)
-			end
-		end)
-	})
-end
-
---[=[
-	Promises the player's settings
-
-	@param player Player
-	@return Promise<PlayerSettingsBase>
-]=]
-function SettingRegistryServiceShared:PromisePlayerSettings(player)
-	assert(typeof(player) == "Instance" and player:IsA("Player"), "Bad player")
-
-	return Rx.toPromise(self._settingService:Observe():Pipe({
-			Rx.where(function(x)
-				return x ~= nil
-			end)
-		}))
-		:Then(function(settingService)
-			return settingService:PromisePlayerSettings(player)
-		end)
-end
-
---[=[
-	Gets the player's settings
-
-	@param player Player
-	@return Promise<PlayerSettingsBase>
-]=]
-function SettingRegistryServiceShared:GetPlayerSettings(player)
-	assert(typeof(player) == "Instance" and player:IsA("Player"), "Bad player")
-
-	local settingService = self._settingService.Value
-	if settingService then
-		return settingService:GetPlayerSettings(player)
-	else
-		return nil
-	end
-end
-
---[=[
-	Cleans up the shared registry service
-]=]
-function SettingRegistryServiceShared:Destroy()
-	self._maid:DoCleaning()
-end
-
-return SettingRegistryServiceShared