@quenty/settings 11.7.0 → 11.8.1-canary.496.cb49bdf.0

package/CHANGELOG.md

@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [11.8.1-canary.496.cb49bdf.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/settings@11.8.0...@quenty/settings@11.8.1-canary.496.cb49bdf.0) (2024-09-20)
+
+**Note:** Version bump only for package @quenty/settings
+
+
+
+
+
+# [11.8.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/settings@11.7.0...@quenty/settings@11.8.0) (2024-09-12)
+
+
+### Features
+
+* Simplified settings manager usage ([71fdb58](https://github.com/Quenty/NevermoreEngine/commit/71fdb5870c07e8b73b36bd4b938c4fcca914ba1b))
+* Unedited all changes ([60e64e3](https://github.com/Quenty/NevermoreEngine/commit/60e64e3efce17c10c4b8965871187d231b338dd4))
+
+
+
+
+
 # [11.7.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/settings@11.6.1...@quenty/settings@11.7.0) (2024-08-09)
 
 **Note:** Version bump only for package @quenty/settings

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/settings",
-  "version": "11.7.0",
+  "version": "11.8.1-canary.496.cb49bdf.0",
   "description": "Centralized player settings service",
   "keywords": [
     "Roblox",
@@ -25,33 +25,35 @@
     "Quenty"
   ],
   "dependencies": {
-    "@quenty/attributeutils": "^14.4.0",
-    "@quenty/baseobject": "^10.3.0",
-    "@quenty/binder": "^14.5.0",
-    "@quenty/cmdrservice": "^13.6.0",
-    "@quenty/datastore": "^13.6.0",
-    "@quenty/enumutils": "^3.2.0",
-    "@quenty/jsonutils": "^10.3.0",
-    "@quenty/loader": "^10.3.0",
-    "@quenty/maid": "^3.2.0",
-    "@quenty/observablecollection": "^12.4.0",
-    "@quenty/playerbinder": "^14.5.0",
-    "@quenty/playerutils": "^8.4.0",
-    "@quenty/remotefunctionutils": "^10.3.0",
-    "@quenty/remoting": "^12.5.0",
-    "@quenty/rx": "^13.4.0",
-    "@quenty/rxbinderutils": "^14.5.0",
-    "@quenty/servicebag": "^11.4.0",
-    "@quenty/signal": "^7.3.0",
-    "@quenty/statestack": "^14.5.0",
-    "@quenty/string": "^3.2.0",
-    "@quenty/symbol": "^3.1.0",
-    "@quenty/table": "^3.5.0",
-    "@quenty/throttle": "^10.4.0",
-    "@quenty/valueobject": "^13.4.0"
+    "@quenty/attributeutils": "14.5.0",
+    "@quenty/baseobject": "10.4.0",
+    "@quenty/binder": "14.6.0",
+    "@quenty/cmdrservice": "13.7.1-canary.496.cb49bdf.0",
+    "@quenty/datastore": "13.7.1-canary.496.cb49bdf.0",
+    "@quenty/ducktype": "5.4.0",
+    "@quenty/enumutils": "3.2.0",
+    "@quenty/jsonutils": "10.4.0",
+    "@quenty/loader": "10.4.0",
+    "@quenty/maid": "3.3.0",
+    "@quenty/observablecollection": "12.5.1-canary.496.cb49bdf.0",
+    "@quenty/playerbinder": "14.6.0",
+    "@quenty/playerutils": "8.5.0",
+    "@quenty/remotefunctionutils": "10.4.0",
+    "@quenty/remoting": "12.6.0",
+    "@quenty/rx": "13.5.0",
+    "@quenty/rxbinderutils": "14.6.0",
+    "@quenty/servicebag": "11.5.1-canary.496.cb49bdf.0",
+    "@quenty/signal": "7.4.0",
+    "@quenty/statestack": "14.6.0",
+    "@quenty/string": "3.2.0",
+    "@quenty/symbol": "3.1.0",
+    "@quenty/table": "3.5.0",
+    "@quenty/throttle": "10.5.0",
+    "@quenty/tie": "10.7.0",
+    "@quenty/valueobject": "13.5.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ba466bdbc05c42fb607cf5e228c16339201d21d7"
+  "gitHead": "cb49bdf8d79aac6e6901901c914271148df358b2"
 }

package/src/Client/Player/PlayerSettingsClient.lua

@@ -10,13 +10,15 @@ local require = require(script.Parent.loader).load(script)
 
 local Players = game:GetService("Players")
 
+local Binder = require("Binder")
 local DataStoreStringUtils = require("DataStoreStringUtils")
 local Maid = require("Maid")
 local Observable = require("Observable")
 local PlayerSettingsBase = require("PlayerSettingsBase")
 local PlayerSettingsConstants = require("PlayerSettingsConstants")
+local PlayerSettingsInterface = require("PlayerSettingsInterface")
 local PlayerSettingsUtils = require("PlayerSettingsUtils")
-local RemoteFunctionUtils = require("RemoteFunctionUtils")
+local Remoting = require("Remoting")
 local Symbol = require("Symbol")
 local ThrottledFunction = require("ThrottledFunction")
 local ValueObject = require("ValueObject")
@@ -27,8 +29,6 @@ local PlayerSettingsClient = setmetatable({}, PlayerSettingsBase)
 PlayerSettingsClient.ClassName = "PlayerSettingsClient"
 PlayerSettingsClient.__index = PlayerSettingsClient
 
-require("PromiseRemoteFunctionMixin"):Add(PlayerSettingsClient, PlayerSettingsConstants.REMOTE_FUNCTION_NAME)
-
 --[=[
 	See [SettingsBindersClient] and [SettingsServiceClient] on how to properly use this class.
 
@@ -40,21 +40,23 @@ function PlayerSettingsClient.new(folder, serviceBag)
 	local self = setmetatable(PlayerSettingsBase.new(folder, serviceBag), PlayerSettingsClient)
 
 	if self:GetPlayer() == Players.LocalPlayer then
+		self._remoting = self._maid:Add(Remoting.new(self._obj, "PlayerSettings", Remoting.Realms.CLIENT))
+
 		self._toReplicate = nil
 		self._toReplicateCallbacks = {}
 
 		-- We only want to keep this data here until we're
 		-- actually done sending and the server acknowledges this is the state that
 		-- we have. Otherwise we accept the server as the state of truth
-		self._pendingReplicationDataInTransit = ValueObject.new(nil)
-		self._maid:GiveTask(self._pendingReplicationDataInTransit)
+		self._pendingReplicationDataInTransit = self._maid:Add(ValueObject.new(nil))
 
 		-- We need to avoid sending these quickly because otherwise
 		-- sliding a slider can lag out stuff.
-		self._queueSendSettingsFunc = ThrottledFunction.new(0.3, function()
+		self._queueSendSettingsFunc = self._maid:Add(ThrottledFunction.new(0.3, function()
 			self:_sendSettings()
-		end, { leading = true, trailing = true })
-		self._maid:GiveTask(self._queueSendSettingsFunc)
+		end, { leading = true, trailing = true }))
+
+		self._maid:GiveTask(PlayerSettingsInterface.Client:Implement(self._obj, self))
 	end
 
 	return self
@@ -229,14 +231,7 @@ end
 function PlayerSettingsClient:_promiseReplicateSettings(settingsMap)
 	assert(type(settingsMap) == "table", "Bad settingsMap")
 
-	return self:PromiseRemoteFunction()
-		:Then(function(remoteFunction)
-			return self._maid:GivePromise(RemoteFunctionUtils.promiseInvokeServer(
-				remoteFunction,
-				PlayerSettingsConstants.REQUEST_UPDATE_SETTINGS,
-				settingsMap))
-		end)
+	return self._remoting.RequestUpdateSettings:PromiseInvokeServer(settingsMap)
 end
 
-
-return PlayerSettingsClient
+return Binder.new("PlayerSettings", PlayerSettingsClient)

package/src/Client/SettingsServiceClient.lua

@@ -32,7 +32,7 @@ function SettingsServiceClient:Init(serviceBag)
 
 	-- Internal
 	self._serviceBag:GetService(require("SettingRegistryServiceShared")):RegisterSettingService(self)
-	self._binders = self._serviceBag:GetService(require("SettingsBindersClient"))
+	self._playerSettingsBinder = 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._binders.PlayerSettings, player)
+	return PlayerSettingsUtils.observePlayerSettings(self._playerSettingsBinder, 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._binders.PlayerSettings, player)
+	return PlayerSettingsUtils.observePlayerSettingsBrio(self._playerSettingsBinder, 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._binders.PlayerSettings, player)
+	return PlayerSettingsUtils.getPlayerSettings(self._playerSettingsBinder, player)
 end
 
 --[=[

package/src/Server/Player/PlayerHasSettings.lua

@@ -6,10 +6,11 @@ local require = require(script.Parent.loader).load(script)
 
 local BaseObject = require("BaseObject")
 local PlayerSettingsUtils = require("PlayerSettingsUtils")
-local SettingsBindersServer = require("SettingsBindersServer")
+local PlayerSettings = require("PlayerSettings")
 local PlayerDataStoreService = require("PlayerDataStoreService")
 local DataStoreStringUtils = require("DataStoreStringUtils")
 local PlayerSettingsConstants = require("PlayerSettingsConstants")
+local PlayerBinder = require("PlayerBinder")
 
 local PlayerHasSettings = setmetatable({}, BaseObject)
 PlayerHasSettings.ClassName = "PlayerHasSettings"
@@ -19,7 +20,7 @@ function PlayerHasSettings.new(player, serviceBag)
 	local self = setmetatable(BaseObject.new(player), PlayerHasSettings)
 
 	self._serviceBag = assert(serviceBag, "No serviceBag")
-	self._settingsBindersServer = self._serviceBag:GetService(SettingsBindersServer)
+	self._playerSettingsBinder = self._serviceBag:GetService(PlayerSettings)
 	self._playerDataStoreService = self._serviceBag:GetService(PlayerDataStoreService)
 
 	self:_promiseLoadSettings()
@@ -28,8 +29,7 @@ function PlayerHasSettings.new(player, serviceBag)
 end
 
 function PlayerHasSettings:_promiseLoadSettings()
-	self._settings = PlayerSettingsUtils.create(self._settingsBindersServer.PlayerSettings)
-	self._maid:GiveTask(self._settings)
+	self._settings = self._maid:Add(PlayerSettingsUtils.create())
 
 	self._maid:GivePromise(self._playerDataStoreService:PromiseDataStore(self._obj))
 		:Then(function(dataStore)
@@ -51,7 +51,7 @@ function PlayerHasSettings:_promiseLoadSettings()
 				end)
 		end)
 		:Catch(function(err)
-			warn(("[PlayerHasSettings] - Failed to load settings for player. %s"):format(tostring(err)))
+			warn(string.format("[PlayerHasSettings] - Failed to load settings for player. %s", tostring(err)))
 		end)
 		:Finally(function()
 			-- Parent anyway...
@@ -84,4 +84,4 @@ function PlayerHasSettings:_handleAttributeChanged(subStore, attributeName)
 	subStore:Store(settingName, newValue)
 end
 
-return PlayerHasSettings
+return PlayerBinder.new("PlayerHasSettings", PlayerHasSettings)

package/src/Server/Player/PlayerSettings.lua

@@ -4,11 +4,14 @@
 
 local require = require(script.Parent.loader).load(script)
 
+local Binder = require("Binder")
+local DataStoreStringUtils = require("DataStoreStringUtils")
 local PlayerSettingsBase = require("PlayerSettingsBase")
 local PlayerSettingsConstants = require("PlayerSettingsConstants")
+local PlayerSettingsInterface = require("PlayerSettingsInterface")
 local PlayerSettingsUtils = require("PlayerSettingsUtils")
+local Remoting = require("Remoting")
 local SettingRegistryServiceShared = require("SettingRegistryServiceShared")
-local DataStoreStringUtils = require("DataStoreStringUtils")
 
 local PlayerSettings = setmetatable({}, PlayerSettingsBase)
 PlayerSettings.ClassName = "PlayerSettings"
@@ -20,15 +23,7 @@ function PlayerSettings.new(obj, serviceBag)
 	self._serviceBag = assert(serviceBag, "No serviceBag")
 	self._settingRegistryServiceShared = self._serviceBag:GetService(SettingRegistryServiceShared)
 
-	self._remoteFunction = Instance.new("RemoteFunction")
-	self._remoteFunction.Name = PlayerSettingsConstants.REMOTE_FUNCTION_NAME
-	self._remoteFunction.Archivable = false
-	self._remoteFunction.Parent = self._obj
-	self._maid:GiveTask(self._remoteFunction)
-
-	self._remoteFunction.OnServerInvoke = function(...)
-		return self:_handleServerInvoke(...)
-	end
+	self:_setupRemoting()
 
 	self._maid:GiveTask(self._settingRegistryServiceShared:ObserveRegisteredDefinitionsBrio():Subscribe(function(brio)
 		if brio:IsDead() then
@@ -39,6 +34,8 @@ function PlayerSettings.new(obj, serviceBag)
 		self:EnsureInitialized(value:GetSettingName(), value:GetDefaultValue())
 	end))
 
+	self._maid:GiveTask(PlayerSettingsInterface.Server:Implement(self._obj, self))
+
 	return self
 end
 
@@ -65,17 +62,17 @@ function PlayerSettings:EnsureInitialized(settingName, defaultValue)
 	end
 end
 
-function PlayerSettings:_handleServerInvoke(player, request, ...)
-	assert(self:GetPlayer() == player, "Bad player")
+function PlayerSettings:_setupRemoting()
+	self._remoting = self._maid:Add(Remoting.new(self._obj, "PlayerSettings", Remoting.Realms.SERVER))
 
-	if request == PlayerSettingsConstants.REQUEST_UPDATE_SETTINGS then
-		return self:_setSettings(...)
-	else
-		error(("Unknown request %q"):format(tostring(request)))
-	end
+	self._maid:Add(self._remoting.RequestUpdateSettings:Bind(function(player, settingsMap)
+		assert(self:GetPlayer() == player, "Bad player")
+
+		return self:_setSettingsMap(settingsMap)
+	end))
 end
 
-function PlayerSettings:_setSettings(settingsMap)
+function PlayerSettings:_setSettingsMap(settingsMap)
 	assert(type(settingsMap) == "table", "Bad settingsMap")
 
 	for settingName, value in pairs(settingsMap) do
@@ -123,4 +120,4 @@ function PlayerSettings:_setSettings(settingsMap)
 	end
 end
 
-return PlayerSettings
+return Binder.new("PlayerSettings", PlayerSettings)

package/src/Server/SettingsService.lua

@@ -22,26 +22,28 @@ function SettingsService:Init(serviceBag)
 
 
 	-- Internal
-	self._binders = self._serviceBag:GetService(require("SettingsBindersServer"))
+	self._playerSettingsBinder = self._serviceBag:GetService(require("PlayerSettings"))
+	self._serviceBag:GetService(require("PlayerHasSettings"))
+
 	self._serviceBag:GetService(require("SettingRegistryServiceShared")):RegisterSettingService(self)
 end
 
 function SettingsService:ObservePlayerSettingsBrio(player)
 	assert(typeof(player) == "Instance" and player:IsA("Player"), "Bad player")
 
-	return PlayerSettingsUtils.observePlayerSettingsBrio(self._binders.PlayerSettings, player)
+	return PlayerSettingsUtils.observePlayerSettingsBrio(self._playerSettingsBinder, player)
 end
 
 function SettingsService:ObservePlayerSettings(player)
 	assert(typeof(player) == "Instance" and player:IsA("Player"), "Bad player")
 
-	return PlayerSettingsUtils.observePlayerSettings(self._binders.PlayerSettings, player)
+	return PlayerSettingsUtils.observePlayerSettings(self._playerSettingsBinder, player)
 end
 
 function SettingsService:GetPlayerSettings(player)
 	assert(typeof(player) == "Instance" and player:IsA("Player"), "Bad player")
 
-	return PlayerSettingsUtils.getPlayerSettings(self._binders.PlayerSettings, player)
+	return PlayerSettingsUtils.getPlayerSettings(self._playerSettingsBinder, player)
 end
 
 function SettingsService:PromisePlayerSettings(player, cancelToken)

package/src/Shared/Interface/PlayerSettingsInterface.lua

@@ -0,0 +1,16 @@
+--[=[
+	@class PlayerSettingsInterface
+]=]
+
+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;
+})

package/src/Shared/Player/PlayerSettingsUtils.lua

@@ -20,16 +20,12 @@ local PlayerSettingsUtils = {}
 --[=[
 	Creates a new player settings
 
-	@param binder Binder<PlayerSettings>
 	@return Folder
 ]=]
-function PlayerSettingsUtils.create(binder)
-	assert(Binder.isBinder(binder), "No binder")
-
+function PlayerSettingsUtils.create()
 	local playerSettings = Instance.new("Folder")
 	playerSettings.Name = PlayerSettingsConstants.PLAYER_SETTINGS_NAME
-
-	binder:Bind(playerSettings)
+	playerSettings:AddTag("PlayerSettings")
 
 	return playerSettings
 end

package/src/Shared/Setting/SettingDefinition.lua

@@ -10,8 +10,8 @@
 	local SettingDefinition = require("SettingDefinition")
 
 	return require("SettingDefinitionProvider").new({
-		SettingDefinition.new("LastTimeUpdateSeen", 0);
-		SettingDefinition.new("LastTimeShopSeen", 0);
+		LastTimeUpdateSeen = 0;
+		LastTimeShopSeen = 0;
 	})
 	```
 
@@ -22,8 +22,11 @@ local require = require(script.Parent.loader).load(script)
 
 local Players = game:GetService("Players")
 
+local SettingRegistryServiceShared = require("SettingRegistryServiceShared")
 local SettingProperty = require("SettingProperty")
 local ServiceBag = require("ServiceBag")
+local DuckTypeUtils = require("DuckTypeUtils")
+local Maid = require("Maid")
 
 local SettingDefinition = {}
 SettingDefinition.ClassName = "SettingDefinition"
@@ -38,19 +41,111 @@ SettingDefinition.__index = SettingDefinition
 	@return SettingDefinition<T>
 ]=]
 function SettingDefinition.new(settingName, defaultValue)
-	local self = setmetatable({}, SettingDefinition)
-
 	assert(type(settingName) == "string", "Bad settingName")
 	assert(defaultValue ~= nil, "DefaultValue cannot be nil")
 
+	local self = setmetatable({}, SettingDefinition)
+
 	self._settingName = settingName
 	self._defaultValue = defaultValue
 
-	self.ServiceName = self._settingName
+	self.ServiceName = self._settingName .. "SettingDefinition"
 
 	return self
 end
 
+--[=[
+	Initializes the setting definition from a service bag.
+
+	@param serviceBag ServiceBag
+]=]
+function SettingDefinition:Init(serviceBag)
+	assert(serviceBag, "No serviceBag")
+	assert(not self._maid, "Already initialized")
+
+	self._maid = Maid.new()
+	self._serviceBag = assert(serviceBag, "No serviceBag")
+
+	local settingRegistryServiceShared = self._serviceBag:GetService(SettingRegistryServiceShared)
+	self._maid:GiveTask(settingRegistryServiceShared:RegisterSettingDefinition(self))
+end
+
+--[=[
+	Gets the value for the given player
+
+	@param player Player
+	@return T
+]=]
+function SettingDefinition:Get(player)
+	assert(typeof(player) == "Instance" and player:IsA("Player") or player == nil, "Bad player")
+	assert(self._serviceBag, "Retrieve from serviceBag")
+
+	return self:GetSettingProperty(self._serviceBag, player):GetValue()
+end
+
+--[=[
+	Sets the value
+
+	@param player Player
+	@param value T
+]=]
+function SettingDefinition:Set(player, value)
+	assert(typeof(player) == "Instance" and player:IsA("Player") or player == nil, "Bad player")
+	assert(self._serviceBag, "Retrieve from serviceBag")
+
+	return self:GetSettingProperty(self._serviceBag, player):SetValue(value)
+end
+
+--[=[
+	Promise gets the value
+
+	@param player Player
+	@return Promise<T>
+]=]
+function SettingDefinition:Promise(player)
+	assert(typeof(player) == "Instance" and player:IsA("Player") or player == nil, "Bad player")
+	assert(self._serviceBag, "Retrieve from serviceBag")
+
+	return self:GetSettingProperty(self._serviceBag, player):PromiseValue()
+end
+
+--[=[
+	Promise gets the value
+
+	@param player Player
+	@param value T
+	@return Promise<T>
+]=]
+function SettingDefinition:PromiseSet(player, value)
+	assert(typeof(player) == "Instance" and player:IsA("Player") or player == nil, "Bad player")
+	assert(self._serviceBag, "Retrieve from serviceBag")
+
+	return self:GetSettingProperty(self._serviceBag, player):PromiseSetValue(value)
+end
+
+--[=[
+	Promise gets the value
+
+	@param player Player
+	@return Promise<T>
+]=]
+function SettingDefinition:Observe(player)
+	assert(typeof(player) == "Instance" and player:IsA("Player") or player == nil, "Bad player")
+	assert(self._serviceBag, "Retrieve from serviceBag")
+
+	return self:GetSettingProperty(self._serviceBag, player):Observe()
+end
+
+--[=[
+	Returns true if the value is a setting definition
+
+	@param value any
+	@return boolean
+]=]
+function SettingDefinition.isSettingDefinition(value)
+	return DuckTypeUtils.isImplementation(SettingDefinition, value)
+end
+
 --[=[
 	Gets a new setting property for the given definition
 
@@ -60,7 +155,9 @@ end
 ]=]
 function SettingDefinition:GetSettingProperty(serviceBag, player)
 	assert(ServiceBag.isServiceBag(serviceBag), "Bad serviceBag")
-	assert(typeof(player) == "Instance" and player:IsA("Player"), "Bad player")
+	assert(typeof(player) == "Instance" and player:IsA("Player") or player == nil, "Bad player")
+
+	player = player or Players.LocalPlayer
 
 	return SettingProperty.new(serviceBag, player, self)
 end
@@ -93,4 +190,8 @@ function SettingDefinition:GetDefaultValue()
 	return self._defaultValue
 end
 
+function SettingDefinition:Destroy()
+	self._maid:DoCleaning()
+end
+
 return SettingDefinition

package/src/Shared/Setting/SettingDefinitionProvider.lua

@@ -15,9 +15,9 @@
 	local SettingDefinition = require("SettingDefinition")
 
 	return require("SettingDefinitionProvider").new({
-		SettingDefinition.new("KeyBinding", Enum.KeyCode.X);
-		SettingDefinition.new("CameraShake", true);
-		SettingDefinition.new("CameraSensitivity", 1);
+		KeyBinding = Enum.KeyCode.X;
+		CameraShake = true;
+		CameraSensitivity = 1;
 	})
 	```
 
@@ -26,8 +26,8 @@
 
 local require = require(script.Parent.loader).load(script)
 
-local SettingRegistryServiceShared = require("SettingRegistryServiceShared")
 local Maid = require("Maid")
+local SettingDefinition = require("SettingDefinition")
 
 local SettingDefinitionProvider = {}
 SettingDefinitionProvider.ClassName = "SettingDefinitionProvider"
@@ -38,32 +38,67 @@ SettingDefinitionProvider.__index = SettingDefinitionProvider
 	Constructs a new provider with a list of [SettingDefinition]'s.
 
 	```lua
+	-- In one location
 	local SettingDefinition = require("SettingDefinition")
 
 	return require("SettingDefinitionProvider").new({
-		SettingDefinition.new("KeyBinding", Enum.KeyCode.X);
-		SettingDefinition.new("CameraShake", true);
-		SettingDefinition.new("CameraSensitivity", 1);
+		KeyBinding = Enum.KeyCode.X;
+		CameraShake = true;
+		CameraSensitivity = 1;
 	})
 	```
 
+	Usage:
+
+	```lua
+	local ourSettings = serviceBag:GetService(require("OurSettings"))
+
+	print(ourSettings.CameraShake:Get(Players.LocalPlayer), true)
+
+	ourSettings.CameraShake:Set(Players.LocalPlayer, false)
+
+	ourSettings.CameraShake:Promise(Players.LocalPlayer)
+		:Then(function(cameraShake)
+			print(cameraShake)
+		end)
+	```
+
 	@param settingDefinitions { SettingDefinition }
 	@return SettingDefinitionProvider
 ]=]
 function SettingDefinitionProvider.new(settingDefinitions)
 	local self = setmetatable({}, SettingDefinitionProvider)
 
-	self._settingDefinitions = {}
+	self._settingDefinitionList = {}
 	self._lookup = {}
 
-	for _, settingDefinition in pairs(settingDefinitions) do
-		table.insert(self._settingDefinitions, settingDefinition)
-		self._lookup[settingDefinition:GetSettingName()] = settingDefinition
+	for key, value in pairs(settingDefinitions) do
+		if type(key) == "number" then
+			assert(SettingDefinition.isSettingDefinition(key), "Bad settingDefinition")
+
+			self:_addSettingDefinition(key)
+		elseif type(key) == "string" then
+			if SettingDefinition.isSettingDefinition(value) then
+				self:_addSettingDefinition(value)
+			else
+				local definition = SettingDefinition.new(key, value)
+				self:_addSettingDefinition(definition)
+			end
+		else
+			error("Bad key for settingDefinitions")
+		end
 	end
 
 	return self
 end
 
+function SettingDefinitionProvider:_addSettingDefinition(settingDefinition)
+	assert(SettingDefinition.isSettingDefinition(settingDefinition), "Bad settingDefinition")
+
+	table.insert(self._settingDefinitionList, settingDefinition)
+	self._lookup[settingDefinition:GetSettingName()] = settingDefinition
+end
+
 --[=[
 	Initializes the provider, storing the data in [SettingRegistryServiceShared]
 
@@ -74,10 +109,17 @@ function SettingDefinitionProvider:Init(serviceBag)
 	assert(not self._maid, "Already initialized")
 
 	self._maid = Maid.new()
+	self._serviceBag = assert(serviceBag, "No serviceBag")
+
+	self._initializedDefinitionLookup = {}
 
-	local settingRegistryServiceShared = serviceBag:GetService(SettingRegistryServiceShared)
-	for _, settingDefinition in pairs(self._settingDefinitions) do
-		self._maid:GiveTask(settingRegistryServiceShared:RegisterSettingDefinition(settingDefinition))
+	-- Register our setting definitions
+	for _, settingDefinition in pairs(self._settingDefinitionList) do
+		local initialized = self._serviceBag:GetService(settingDefinition)
+		self._initializedDefinitionLookup[settingDefinition] = initialized
+
+		-- Store lookup to overcome metatable lookup
+		self[settingDefinition:GetSettingName()] = initialized
 	end
 end
 
@@ -94,7 +136,17 @@ end
 	@return { SettingDefinition }
 ]=]
 function SettingDefinitionProvider:GetSettingDefinitions()
-	return self._settingDefinitions
+	if self._serviceBag then
+		local copy = table.clone(self._settingDefinitionList)
+
+		for key, settingDefinition in pairs(copy) do
+			copy[key] = assert(self._initializedDefinitionLookup[settingDefinition], "Missing settingDefinition")
+		end
+
+		return copy
+	end
+
+	return table.clone(self._settingDefinitionList)
 end
 
 --[=[
@@ -104,9 +156,9 @@ end
 	local SettingDefinition = require("SettingDefinition")
 
 	local provider = require("SettingDefinitionProvider").new({
-		SettingDefinition.new("KeyBinding", Enum.KeyCode.X);
-		SettingDefinition.new("CameraShake", true);
-		SettingDefinition.new("CameraSensitivity", 1);
+		KeyBinding = Enum.KeyCode.X;
+		CameraShake = true;
+		CameraSensitivity = 1;
 	})
 
 	local service = serviceBag:GetService(provider)
@@ -123,18 +175,27 @@ function SettingDefinitionProvider:__index(index)
 		error("[SettingDefinitionProvider] - Cannot index provider with nil value")
 	elseif SettingDefinitionProvider[index] then
 		return SettingDefinitionProvider[index]
-	elseif index == "_lookup" or index == "_settingDefinitions" or index == "_maid" then
+	elseif index == "_lookup"
+		or index == "_settingDefinitionList"
+		or index == "_maid"
+		or index == "_initializedDefinitionLookup"
+		or index == "_serviceBag" then
+
 		return rawget(self, index)
 	elseif type(index) == "string" then
 		local lookup = rawget(self, "_lookup")
 		local settingDefinition = lookup[index]
 		if not settingDefinition then
-			error(("Bad index %q into SettingDefinitionProvider"):format(tostring(index)))
+			error(string.format("Bad index %q into SettingDefinitionProvider", tostring(index)))
+		end
+
+		if self._serviceBag then
+			return assert(self._initializedDefinitionLookup[settingDefinition], "Missing settingDefinition")
 		else
 			return settingDefinition
 		end
 	else
-		error(("Bad index %q into SettingDefinitionProvider"):format(tostring(index)))
+		error(string.format("Bad index %q into SettingDefinitionProvider", tostring(index)))
 	end
 end
 
@@ -147,7 +208,16 @@ end
 function SettingDefinitionProvider:Get(settingName)
 	assert(type(settingName) == "string", "Bad settingName")
 
-	return self._lookup[settingName]
+	local found = self._lookup[settingName]
+	if not found then
+		return nil
+	end
+
+	if self._serviceBag then
+		return assert(self._initializedDefinitionLookup[found], "Missing settingDefinition")
+	else
+		return found
+	end
 end
 
 --[=[

package/src/Shared/Setting/SettingProperty.lua

@@ -83,7 +83,7 @@ function SettingProperty:__index(index)
 	elseif SettingProperty[index] then
 		return SettingProperty[index]
 	else
-		error(("%q is not a member of SettingProperty %s"):format(tostring(index), self._definition:GetSettingName()))
+		error(string.format("%q is not a member of SettingProperty %s", tostring(index), self._definition:GetSettingName()))
 	end
 end
 
@@ -91,7 +91,7 @@ function SettingProperty:__newindex(index, value)
 	if index == "Value" then
 		self:SetValue(value)
 	elseif index == "DefaultValue" or index == "Changed" or SettingProperty[index] then
-		error(("Cannot set %q"):format(tostring(index)))
+		error(string.format("Cannot set %q", tostring(index)))
 	else
 		rawset(self, index, value)
 	end

package/src/Client/SettingsBindersClient.lua

@@ -1,12 +0,0 @@
---[=[
-	@class SettingsBindersClient
-]=]
-
-local require = require(script.Parent.loader).load(script)
-
-local BinderProvider = require("BinderProvider")
-local Binder = require("Binder")
-
-return BinderProvider.new(script.Name, function(self, serviceBag)
-	self:Add(Binder.new("PlayerSettings", require("PlayerSettingsClient"), serviceBag))
-end)

package/src/Server/SettingsBindersServer.lua

@@ -1,14 +0,0 @@
---[=[
-	@class SettingsBindersServer
-]=]
-
-local require = require(script.Parent.loader).load(script)
-
-local BinderProvider = require("BinderProvider")
-local Binder = require("Binder")
-local PlayerBinder = require("PlayerBinder")
-
-return BinderProvider.new(script.Name, function(self, serviceBag)
-	self:Add(Binder.new("PlayerSettings", require("PlayerSettings"), serviceBag))
-	self:Add(PlayerBinder.new("PlayerHasSettings", require("PlayerHasSettings"), serviceBag))
-end)