@quenty/gameconfig 12.24.0 → 12.24.2-canary.547.11ae689.0

package/src/Shared/Config/Config/GameConfigBase.lua

@@ -15,18 +15,44 @@ local Rx = require("Rx")
 local RxBinderUtils = require("RxBinderUtils")
 local RxBrioUtils = require("RxBrioUtils")
 local RxInstanceUtils = require("RxInstanceUtils")
+local _GameConfigAssetBase = require("GameConfigAssetBase")
+local _Observable = require("Observable")
+local _Brio = require("Brio")
 
 local GameConfigBase = setmetatable({}, BaseObject)
 GameConfigBase.ClassName = "GameConfigBase"
 GameConfigBase.__index = GameConfigBase
 
+type GameConfigAssetType = GameConfigAssetTypes.GameConfigAssetType
+type ObservableMapSet<K, V> = ObservableMapSet.ObservableMapSet<K, V>
+type GameConfigAssetBase = _GameConfigAssetBase.GameConfigAssetBase
+
+export type GameConfigBase = typeof(setmetatable(
+	{} :: {
+		_obj: Folder,
+		_setupObservation: boolean,
+		_gameConfigBindersServer: any,
+		_gameId: AttributeValue.AttributeValue<number>,
+		_assetTypeToAssetConfig: any,
+		_assetTypeToAssetKeyMappings: {
+			[GameConfigAssetType]: any,
+		},
+		_assetTypeToAssetIdMappings: {
+			[GameConfigAssetType]: any,
+		},
+		_assetKeyToAssetConfig: any,
+		_assetIdToAssetConfig: any,
+	},
+	{ __index = GameConfigBase}
+))
+
 --[=[
 	Constructs a new game config.
 	@param folder
 	@return GameConfigBase
 ]=]
-function GameConfigBase.new(folder: Instance)
-	local self = setmetatable(BaseObject.new(folder), GameConfigBase)
+function GameConfigBase.new(folder: Folder): GameConfigBase
+	local self = setmetatable(BaseObject.new(folder) :: any, GameConfigBase)
 
 	self._gameId = AttributeValue.new(self._obj, GameConfigConstants.GAME_ID_ATTRIBUTE, game.GameId)
 
@@ -39,25 +65,28 @@ function GameConfigBase.new(folder: Instance)
 	self._assetTypeToAssetIdMappings = {}
 
 	-- Setup assetType mappings to key mapping observations
-	for _, assetType in pairs(GameConfigAssetTypes) do
+	for _, assetType in GameConfigAssetTypes do
 		self._assetTypeToAssetKeyMappings[assetType] = ObservableMapSet.new()
 		self._maid:GiveTask(self._assetTypeToAssetKeyMappings[assetType])
 
 		self._assetTypeToAssetIdMappings[assetType] = ObservableMapSet.new()
 		self._maid:GiveTask(self._assetTypeToAssetIdMappings[assetType])
 
-		self._maid:GiveTask(self._assetTypeToAssetConfig:ObserveItemsForKeyBrio(assetType)
-			:Subscribe(function(brio)
-				if brio:IsDead() then
-					return
-				end
-
-				local gameAssetConfig = brio:GetValue()
-				local maid = brio:ToMaid()
-
-				maid:GiveTask(self._assetTypeToAssetKeyMappings[assetType]:Push(gameAssetConfig:ObserveAssetKey(), gameAssetConfig))
-				maid:GiveTask(self._assetTypeToAssetIdMappings[assetType]:Push(gameAssetConfig:ObserveAssetId(), gameAssetConfig))
-			end))
+		self._maid:GiveTask(self._assetTypeToAssetConfig:ObserveItemsForKeyBrio(assetType):Subscribe(function(brio)
+			if brio:IsDead() then
+				return
+			end
+
+			local gameAssetConfig = brio:GetValue()
+			local maid = brio:ToMaid()
+
+			maid:GiveTask(
+				self._assetTypeToAssetKeyMappings[assetType]:Push(gameAssetConfig:ObserveAssetKey(), gameAssetConfig)
+			)
+			maid:GiveTask(
+				self._assetTypeToAssetIdMappings[assetType]:Push(gameAssetConfig:ObserveAssetId(), gameAssetConfig)
+			)
+		end))
 	end
 
 	return self
@@ -67,7 +96,7 @@ end
 	Gets the current folder
 	@return Instance
 ]=]
-function GameConfigBase:GetFolder()
+function GameConfigBase.GetFolder(self: GameConfigBase): Folder
 	return self._obj
 end
 
@@ -75,7 +104,7 @@ end
 	Returns an array of all the assets of that type underneath this config
 	@return { GameConfigAssetBase }
 ]=]
-function GameConfigBase:GetAssetsOfType(assetType: string)
+function GameConfigBase.GetAssetsOfType(self: GameConfigBase, assetType: GameConfigAssetType): { GameConfigAssetBase }
 	assert(GameConfigAssetTypeUtils.isAssetType(assetType), "Bad assetType")
 
 	return self._assetTypeToAssetConfig:GetListForKey(assetType)
@@ -87,7 +116,7 @@ end
 	@param assetKey
 	@return { GameConfigAssetBase }
 ]=]
-function GameConfigBase:GetAssetsOfTypeAndKey(assetType: string, assetKey: string)
+function GameConfigBase.GetAssetsOfTypeAndKey(self: GameConfigBase, assetType: GameConfigAssetType, assetKey: string)
 	assert(GameConfigAssetTypeUtils.isAssetType(assetType), "Bad assetType")
 	assert(type(assetKey) == "string", "Bad assetKey")
 
@@ -100,7 +129,7 @@ end
 	@param assetId
 	@return { GameConfigAssetBase }
 ]=]
-function GameConfigBase:GetAssetsOfTypeAndId(assetType: string, assetId: number)
+function GameConfigBase.GetAssetsOfTypeAndId(self: GameConfigBase, assetType: GameConfigAssetType, assetId: number)
 	assert(GameConfigAssetTypeUtils.isAssetType(assetType), "Bad assetType")
 	assert(type(assetId) == "number", "Bad assetId")
 
@@ -113,7 +142,11 @@ end
 	@param assetKey
 	@return Observable<Brio<GameConfigAssetBase>>
 ]=]
-function GameConfigBase:ObserveAssetByTypeAndKeyBrio(assetType: string, assetKey: string)
+function GameConfigBase.ObserveAssetByTypeAndKeyBrio(
+	self: GameConfigBase,
+	assetType: GameConfigAssetType,
+	assetKey: string
+): _Observable.Observable<_Brio.Brio<GameConfigAssetBase>>
 	assert(GameConfigAssetTypeUtils.isAssetType(assetType), "Bad assetType")
 	assert(type(assetKey) == "string", "Bad assetKey")
 
@@ -126,7 +159,11 @@ end
 	@param assetId
 	@return Observable<Brio<GameConfigAssetBase>>
 ]=]
-function GameConfigBase:ObserveAssetByTypeAndIdBrio(assetType: string, assetId: number)
+function GameConfigBase.ObserveAssetByTypeAndIdBrio(
+	self: GameConfigBase,
+	assetType: GameConfigAssetType,
+	assetId: number
+): _Observable.Observable<_Brio.Brio<GameConfigAssetBase>>
 	assert(GameConfigAssetTypeUtils.isAssetType(assetType), "Bad assetType")
 	assert(type(assetId) == "number", "Bad assetId")
 
@@ -138,7 +175,10 @@ end
 	@param assetId
 	@return Observable<Brio<GameConfigAssetBase>>
 ]=]
-function GameConfigBase:ObserveAssetByIdBrio(assetId: number)
+function GameConfigBase.ObserveAssetByIdBrio(
+	self: GameConfigBase,
+	assetId: number
+): _Observable.Observable<_Brio.Brio<GameConfigAssetBase>>
 	assert(type(assetId) == "number", "Bad assetId")
 
 	return self._assetIdToAssetConfig:ObserveItemsForKeyBrio(assetId)
@@ -149,7 +189,10 @@ end
 	@param assetKey
 	@return Observable<Brio<GameConfigAssetBase>>
 ]=]
-function GameConfigBase:ObserveAssetByKeyBrio(assetKey: string)
+function GameConfigBase.ObserveAssetByKeyBrio(
+	self: GameConfigBase,
+	assetKey: string
+): _Observable.Observable<_Brio.Brio<GameConfigAssetBase>>
 	assert(type(assetKey) == "string", "Bad assetKey")
 
 	return self._assetKeyToAssetConfig:ObserveItemsForKeyBrio(assetKey)
@@ -160,7 +203,10 @@ end
 	@param assetType
 	@return Observable<Brio<GameConfigAssetBase>>
 ]=]
-function GameConfigBase:ObserveAssetByTypeBrio(assetType: string)
+function GameConfigBase.ObserveAssetByTypeBrio(
+	self: GameConfigBase,
+	assetType: GameConfigAssetType
+): _Observable.Observable<_Brio.Brio<GameConfigAssetBase>>
 	assert(GameConfigAssetTypeUtils.isAssetType(assetType), "Bad assetType")
 
 	return self._assetTypeToAssetConfig:ObserveItemsForKeyBrio(assetType)
@@ -169,7 +215,7 @@ end
 --[=[
 	Initializes the observation. Should be called by the class inheriting this object.
 ]=]
-function GameConfigBase:InitObservation()
+function GameConfigBase.InitObservation(self: GameConfigBase)
 	if self._setupObservation then
 		return
 	end
@@ -177,12 +223,15 @@ function GameConfigBase:InitObservation()
 	self._setupObservation = true
 
 	local observables = {}
-	for _, assetType in pairs(GameConfigAssetTypes) do
-		table.insert(observables, self:_observeAssetFolderBrio(assetType):Pipe({
-			RxBrioUtils.switchMapBrio(function(folder)
-				return RxBinderUtils.observeBoundChildClassBrio(self:GetGameConfigAssetBinder(), folder)
-			end);
-		}))
+	for _, assetType in GameConfigAssetTypes do
+		table.insert(
+			observables,
+			self:_observeAssetFolderBrio(assetType):Pipe({
+				RxBrioUtils.switchMapBrio(function(folder)
+					return RxBinderUtils.observeBoundChildClassBrio(self:GetGameConfigAssetBinder(), folder)
+				end),
+			})
+		)
 	end
 
 	-- hook up mapping
@@ -200,7 +249,7 @@ function GameConfigBase:InitObservation()
 	end))
 end
 
-function GameConfigBase:_observeAssetFolderBrio(assetType)
+function GameConfigBase._observeAssetFolderBrio(self: GameConfigBase, assetType: GameConfigAssetType)
 	return GameConfigUtils.observeAssetFolderBrio(self._obj, assetType)
 end
 
@@ -208,7 +257,7 @@ end
 	Returns the game id for this profile.
 	@return Observable<number>
 ]=]
-function GameConfigBase:ObserveGameId()
+function GameConfigBase.ObserveGameId(self: GameConfigBase): _Observable.Observable<number>
 	return self._gameId:Observe()
 end
 
@@ -216,7 +265,7 @@ end
 	Returns the game id
 	@return number
 ]=]
-function GameConfigBase:GetGameId()
+function GameConfigBase.GetGameId(self: GameConfigBase): number?
 	return self._gameId.Value
 end
 
@@ -224,7 +273,7 @@ end
 	Returns this configuration's name
 	@return string
 ]=]
-function GameConfigBase:GetConfigName()
+function GameConfigBase.GetConfigName(self: GameConfigBase): string
 	return self._obj.Name
 end
 
@@ -232,11 +281,11 @@ end
 	Observes this configs name
 	@return Observable<string>
 ]=]
-function GameConfigBase:ObserveConfigName()
+function GameConfigBase.ObserveConfigName(self: GameConfigBase): _Observable.Observable<string>
 	return RxInstanceUtils.observeProperty(self._obj, "Name")
 end
 
-function GameConfigBase:GetGameConfigAssetBinder()
+function GameConfigBase.GetGameConfigAssetBinder(_self: GameConfigBase)
 	error("Not implemented")
 end
 

package/src/Shared/Config/Config/GameConfigUtils.lua

@@ -10,10 +10,12 @@ local GameConfigAssetTypes = require("GameConfigAssetTypes")
 local GameConfigAssetTypeUtils = require("GameConfigAssetTypeUtils")
 local Binder = require("Binder")
 local RxInstanceUtils = require("RxInstanceUtils")
+local _Observable = require("Observable")
+local _Brio = require("Brio")
 
 local GameConfigUtils = {}
 
-function GameConfigUtils.create(binder, gameId)
+function GameConfigUtils.create(binder, gameId: number): Folder
 	assert(Binder.isBinder(binder), "Bad binder")
 	assert(type(gameId) == "number", "Bad gameId")
 
@@ -22,7 +24,7 @@ function GameConfigUtils.create(binder, gameId)
 
 	AttributeUtils.initAttribute(config, GameConfigConstants.GAME_ID_ATTRIBUTE, gameId)
 
-	for _, assetType in pairs(GameConfigAssetTypes) do
+	for _, assetType in GameConfigAssetTypes do
 		GameConfigUtils.getOrCreateAssetFolder(config, assetType)
 	end
 
@@ -31,7 +33,10 @@ function GameConfigUtils.create(binder, gameId)
 	return config
 end
 
-function GameConfigUtils.getOrCreateAssetFolder(config, assetType)
+function GameConfigUtils.getOrCreateAssetFolder(
+	config: Folder,
+	assetType: GameConfigAssetTypes.GameConfigAssetType
+): Folder
 	assert(typeof(config) == "Instance", "Bad config")
 	assert(GameConfigAssetTypeUtils.isAssetType(assetType), "Bad assetType")
 
@@ -47,7 +52,7 @@ function GameConfigUtils.getOrCreateAssetFolder(config, assetType)
 	return folder
 end
 
-function GameConfigUtils.observeAssetFolderBrio(config, assetType)
+function GameConfigUtils.observeAssetFolderBrio(config: Folder, assetType: GameConfigAssetTypes.GameConfigAssetType): _Observable.Observable<_Brio.Brio<Folder>>
 	assert(typeof(config) == "Instance", "Bad config")
 	assert(GameConfigAssetTypeUtils.isAssetType(assetType), "Bad assetType")
 

package/src/Shared/Config/Picker/GameConfigPicker.lua

@@ -12,11 +12,29 @@ local RxBrioUtils = require("RxBrioUtils")
 local GameConfigAssetTypeUtils = require("GameConfigAssetTypeUtils")
 local Promise = require("Promise")
 local GameConfigAssetUtils = require("GameConfigAssetUtils")
+local _ServiceBag = require("ServiceBag")
+local _GameConfigAssetTypes = require("GameConfigAssetTypes")
+local _Observable = require("Observable")
+local _Brio = require("Brio")
+local _GameConfigAssetBase = require("GameConfigAssetBase")
+local _Promise = require("Promise")
+local _Binder = require("Binder")
+local _Maid = require("Maid")
 
 local GameConfigPicker = setmetatable({}, BaseObject)
 GameConfigPicker.ClassName = "GameConfigPicker"
 GameConfigPicker.__index = GameConfigPicker
 
+export type GameConfigPicker = typeof(setmetatable(
+	{} :: {
+		_serviceBag: _ServiceBag.ServiceBag,
+		_maid: _Maid.Maid,
+	},
+	{ __index = GameConfigPicker }
+))
+type GameConfigAssetType = _GameConfigAssetTypes.GameConfigAssetType
+type GameConfigAssetBase = _GameConfigAssetBase.GameConfigAssetBase
+
 --[=[
 	Constructs a new game config picker. Should be gotten by [GameConfigService].
 
@@ -25,7 +43,11 @@ GameConfigPicker.__index = GameConfigPicker
 	@param gameConfigAssetBinder Binder<GameConfigAsset>
 	@return GameConfigPicker
 ]=]
-function GameConfigPicker.new(serviceBag, gameConfigBinder, gameConfigAssetBinder)
+function GameConfigPicker.new(
+	serviceBag: _ServiceBag.ServiceBag,
+	gameConfigBinder,
+	gameConfigAssetBinder
+): GameConfigPicker
 	local self = setmetatable(BaseObject.new(), GameConfigPicker)
 
 	self._gameConfigBinder = assert(gameConfigBinder, "No gameConfigBinder")
@@ -34,17 +56,16 @@ function GameConfigPicker.new(serviceBag, gameConfigBinder, gameConfigAssetBinde
 
 	self._gameIdToConfigSet = self._maid:Add(ObservableMapSet.new())
 
-	self._maid:GiveTask(RxBinderUtils.observeAllBrio(self._gameConfigBinder)
-		:Subscribe(function(brio)
-			if brio:IsDead() then
-				return
-			end
+	self._maid:GiveTask(RxBinderUtils.observeAllBrio(self._gameConfigBinder):Subscribe(function(brio)
+		if brio:IsDead() then
+			return
+		end
 
-			local gameConfig = brio:GetValue()
-			local maid = brio:ToMaid()
+		local gameConfig = brio:GetValue()
+		local maid = brio:ToMaid()
 
-			maid:GiveTask(self._gameIdToConfigSet:Push(gameConfig:ObserveGameId(), gameConfig))
-		end))
+		maid:GiveTask(self._gameIdToConfigSet:Push(gameConfig:ObserveGameId(), gameConfig))
+	end))
 
 	return self
 end
@@ -54,21 +75,23 @@ end
 	@param assetType
 	@return Observable<Brio<GameConfigAssetBase>>
 ]=]
-function GameConfigPicker:ObserveActiveAssetOfTypeBrio(assetType: string)
+function GameConfigPicker.ObserveActiveAssetOfTypeBrio(
+	self: GameConfigPicker,
+	assetType: string
+): _Observable.Observable<_Brio.Brio<GameConfigAssetBase>>
 	assert(GameConfigAssetTypeUtils.isAssetType(assetType), "Bad assetType")
 
-	return self:ObserveActiveConfigsBrio(game.GameId)
-		:Pipe({
-			RxBrioUtils.flatMapBrio(function(gameConfig)
-				return gameConfig:ObserveAssetByTypeBrio(assetType)
-			end);
-		})
+	return self:ObserveActiveConfigsBrio(game.GameId):Pipe({
+		RxBrioUtils.flatMapBrio(function(gameConfig)
+			return gameConfig:ObserveAssetByTypeBrio(assetType)
+		end),
+	})
 end
 
 --[=[
 	Observes all active assets of a type and key.
 
-	```lua
+	```
 	maid:GiveTask(picker:ObserveActiveAssetOfAssetTypeAndKeyBrio(GameConfigAssetType.BADGE, "myBadge")
 		:Pipe({
 			RxStateStackUtils.topOfStack();
@@ -81,15 +104,18 @@ end
 	@param assetKey
 	@return Observable<Brio<GameConfigAssetBase>>
 ]=]
-function GameConfigPicker:ObserveActiveAssetOfAssetTypeAndKeyBrio(assetType: string, assetKey: string)
+function GameConfigPicker.ObserveActiveAssetOfAssetTypeAndKeyBrio(
+	self: GameConfigPicker,
+	assetType: string,
+	assetKey: string
+)
 	assert(type(assetKey) == "string", "Bad assetKey")
 
-	return self:ObserveActiveConfigsBrio(game.GameId)
-		:Pipe({
-			RxBrioUtils.flatMapBrio(function(gameConfig)
-				return gameConfig:ObserveAssetByTypeAndKeyBrio(assetType, assetKey)
-			end);
-		})
+	return self:ObserveActiveConfigsBrio(game.GameId):Pipe({
+		RxBrioUtils.flatMapBrio(function(gameConfig)
+			return gameConfig:ObserveAssetByTypeAndKeyBrio(assetType, assetKey)
+		end),
+	})
 end
 
 --[=[
@@ -99,15 +125,18 @@ end
 	@param assetId
 	@return Observable<Brio<GameConfigAssetBase>>
 ]=]
-function GameConfigPicker:ObserveActiveAssetOfAssetTypeAndIdBrio(assetType: string, assetId: number)
+function GameConfigPicker.ObserveActiveAssetOfAssetTypeAndIdBrio(
+	self: GameConfigPicker,
+	assetType: string,
+	assetId: number
+)
 	assert(type(assetId) == "number", "Bad assetId")
 
-	return self:ObserveActiveConfigsBrio(game.GameId)
-		:Pipe({
-			RxBrioUtils.flatMapBrio(function(gameConfig)
-				return gameConfig:ObserveAssetByTypeAndIdBrio(assetType, assetId)
-			end);
-		})
+	return self:ObserveActiveConfigsBrio(game.GameId):Pipe({
+		RxBrioUtils.flatMapBrio(function(gameConfig)
+			return gameConfig:ObserveAssetByTypeAndIdBrio(assetType, assetId)
+		end),
+	})
 end
 
 --[=[
@@ -116,15 +145,17 @@ end
 	@param assetId
 	@return Observable<Brio<GameConfigAssetBase>>
 ]=]
-function GameConfigPicker:ObserveActiveAssetOfAssetIdBrio(assetId: number)
+function GameConfigPicker.ObserveActiveAssetOfAssetIdBrio(
+	self: GameConfigPicker,
+	assetId: number
+): _Observable.Observable<_Brio.Brio<GameConfigAssetBase>>
 	assert(type(assetId) == "number", "Bad assetId")
 
-	return self:ObserveActiveConfigsBrio(game.GameId)
-		:Pipe({
-			RxBrioUtils.flatMapBrio(function(gameConfig)
-				return gameConfig:ObserveAssetByIdBrio(assetId)
-			end);
-		})
+	return self:ObserveActiveConfigsBrio(game.GameId):Pipe({
+		RxBrioUtils.flatMapBrio(function(gameConfig)
+			return gameConfig:ObserveAssetByIdBrio(assetId)
+		end),
+	})
 end
 
 --[=[
@@ -133,15 +164,17 @@ end
 	@param assetKey
 	@return Observable<Brio<GameConfigAssetBase>>
 ]=]
-function GameConfigPicker:ObserveActiveAssetOfKeyBrio(assetKey: string)
+function GameConfigPicker.ObserveActiveAssetOfKeyBrio(
+	self: GameConfigPicker,
+	assetKey: string
+): _Observable.Observable<_Brio.Brio<GameConfigAssetBase>>
 	assert(type(assetKey) == "string", "Bad assetKey")
 
-	return self:ObserveActiveConfigsBrio(game.GameId)
-		:Pipe({
-			RxBrioUtils.flatMapBrio(function(gameConfig)
-				return gameConfig:ObserveAssetByKeyBrio(assetKey)
-			end);
-		})
+	return self:ObserveActiveConfigsBrio(game.GameId):Pipe({
+		RxBrioUtils.flatMapBrio(function(gameConfig)
+			return gameConfig:ObserveAssetByKeyBrio(assetKey)
+		end),
+	})
 end
 
 --[=[
@@ -149,7 +182,9 @@ end
 
 	@return Observable<Brio<GameConfigAssetBase>>
 ]=]
-function GameConfigPicker:ObserveActiveConfigsBrio()
+function GameConfigPicker.ObserveActiveConfigsBrio(
+	self: GameConfigPicker
+): _Observable.Observable<_Brio.Brio<GameConfigAssetBase>>
 	return self:_observeConfigsForGameIdBrio(game.GameId)
 end
 
@@ -158,7 +193,7 @@ end
 
 	@return { GameConfigAssetBase }
 ]=]
-function GameConfigPicker:GetActiveConfigs()
+function GameConfigPicker.GetActiveConfigs(self: GameConfigPicker): { GameConfigAssetBase }
 	return self:_getConfigsForGameId(game.GameId)
 end
 
@@ -167,14 +202,18 @@ end
 
 	@param assetType
 	@param assetId
-	@return GameConfigAssetBase
+	@return GameConfigAssetBase?
 ]=]
-function GameConfigPicker:FindFirstActiveAssetOfId(assetType: string, assetId: number)
+function GameConfigPicker.FindFirstActiveAssetOfId(
+	self: GameConfigPicker,
+	assetType: string,
+	assetId: number
+): GameConfigAssetBase?
 	assert(GameConfigAssetTypeUtils.isAssetType(assetType), "Bad assetType")
 	assert(type(assetId) == "number", "Bad assetId")
 
-	for _, gameConfig in pairs(self:GetActiveConfigs()) do
-		for _, gameConfigAsset in pairs(gameConfig:GetAssetsOfTypeAndId(assetType, assetId)) do
+	for _, gameConfig in self:GetActiveConfigs() do
+		for _, gameConfigAsset in gameConfig:GetAssetsOfTypeAndId(assetType, assetId) do
 			return gameConfigAsset
 		end
 	end
@@ -187,9 +226,13 @@ end
 
 	@param assetType string
 	@param assetIdOrKey string | number
-	@return GameConfigAssetBase
+	@return Promise<number>
 ]=]
-function GameConfigPicker:PromisePriceInRobux(assetType, assetIdOrKey)
+function GameConfigPicker.PromisePriceInRobux(
+	self: GameConfigPicker,
+	assetType: _GameConfigAssetTypes.GameConfigAssetType,
+	assetIdOrKey
+): _Promise.Promise<number>
 	assert(GameConfigAssetTypeUtils.isAssetType(assetType), "Bad assetType")
 	assert(type(assetIdOrKey) == "number" or type(assetIdOrKey) == "string", "Bad assetIdOrKey")
 
@@ -225,14 +268,18 @@ end
 
 	@param assetType
 	@param assetKey
-	@return GameConfigAssetBase
+	@return GameConfigAssetBase?
 ]=]
-function GameConfigPicker:FindFirstActiveAssetOfKey(assetType: string, assetKey: string)
+function GameConfigPicker.FindFirstActiveAssetOfKey(
+	self: GameConfigPicker,
+	assetType: _GameConfigAssetTypes.GameConfigAssetType,
+	assetKey: string
+): GameConfigAssetBase?
 	assert(GameConfigAssetTypeUtils.isAssetType(assetType), "Bad assetType")
 	assert(type(assetKey) == "string", "Bad assetKey")
 
-	for _, gameConfig in pairs(self:GetActiveConfigs()) do
-		for _, gameConfigAsset in pairs(gameConfig:GetAssetsOfTypeAndKey(assetType, assetKey)) do
+	for _, gameConfig in self:GetActiveConfigs() do
+		for _, gameConfigAsset in gameConfig:GetAssetsOfTypeAndKey(assetType, assetKey) do
 			return gameConfigAsset
 		end
 	end
@@ -246,23 +293,29 @@ end
 	@param assetType
 	@return { GameConfigAssetBase }
 ]=]
-function GameConfigPicker:GetAllActiveAssetsOfType(assetType: string)
+function GameConfigPicker.GetAllActiveAssetsOfType(
+	self: GameConfigPicker,
+	assetType: _GameConfigAssetTypes.GameConfigAssetType
+)
 	local assetList = {}
-	for _, gameConfig in pairs(self:GetActiveConfigs()) do
-		for _, gameConfigAsset in pairs(gameConfig:GetAssetsOfType(assetType)) do
+	for _, gameConfig in self:GetActiveConfigs() do
+		for _, gameConfigAsset in gameConfig:GetAssetsOfType(assetType) do
 			table.insert(assetList, gameConfigAsset)
 		end
 	end
 	return assetList
 end
 
-function GameConfigPicker:_observeConfigsForGameIdBrio(gameId: number)
+function GameConfigPicker._observeConfigsForGameIdBrio(
+	self: GameConfigPicker,
+	gameId: number
+): _Observable.Observable<_Brio.Brio<GameConfigAssetBase>>
 	assert(type(gameId) == "number", "Bad gameId")
 
 	return self._gameIdToConfigSet:ObserveItemsForKeyBrio(gameId)
 end
 
-function GameConfigPicker:_getConfigsForGameId(gameId: number)
+function GameConfigPicker._getConfigsForGameId(self: GameConfigPicker, gameId: number)
 	assert(type(gameId) == "number", "Bad gameId")
 
 	return self._gameIdToConfigSet:GetListForKey(gameId)
@@ -273,9 +326,13 @@ end
 
 	@param assetType GameConfigAssetType
 	@param assetIdOrKey number | string
-	@return number | nil
+	@return number?
 ]=]
-function GameConfigPicker:ToAssetId(assetType, assetIdOrKey)
+function GameConfigPicker.ToAssetId(
+	self: GameConfigPicker,
+	assetType: _GameConfigAssetTypes.GameConfigAssetType,
+	assetIdOrKey: string | number
+): number?
 	assert(GameConfigAssetTypeUtils.isAssetType(assetType), "Bad assetType")
 	assert(type(assetIdOrKey) == "number" or type(assetIdOrKey) == "string", "Bad assetIdOrKey")
 
@@ -298,7 +355,11 @@ end
 	@param assetIdOrKey number | string
 	@return Observable<Brio<number>>
 ]=]
-function GameConfigPicker:ObserveToAssetIdBrio(assetType, assetIdOrKey)
+function GameConfigPicker.ObserveToAssetIdBrio(
+	self: GameConfigPicker,
+	assetType: _GameConfigAssetTypes.GameConfigAssetType,
+	assetIdOrKey: string | number
+): _Observable.Observable<_Brio.Brio<number>>
 	assert(GameConfigAssetTypeUtils.isAssetType(assetType), "Bad assetType")
 	assert(type(assetIdOrKey) == "number" or type(assetIdOrKey) == "string", "Bad assetIdOrKey")
 
@@ -306,7 +367,7 @@ function GameConfigPicker:ObserveToAssetIdBrio(assetType, assetIdOrKey)
 		return self:ObserveActiveAssetOfAssetTypeAndKeyBrio(assetType, assetIdOrKey):Pipe({
 			RxBrioUtils.switchMapBrio(function(asset)
 				return asset:ObserveAssetId()
-			end);
+			end),
 		})
 	elseif type(assetIdOrKey) == "number" then
 		return RxBrioUtils.of(assetIdOrKey)
@@ -315,5 +376,4 @@ function GameConfigPicker:ObserveToAssetIdBrio(assetType, assetIdOrKey)
 	end
 end
 
-
-return GameConfigPicker
+return GameConfigPicker

package/src/Shared/GameConfigDataService.lua

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

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

@@ -9,4 +9,4 @@ local serviceBag = require("ServiceBag").new()
 serviceBag:GetService(require("GameConfigServiceClient"))
 
 serviceBag:Init()
-serviceBag:Start()
+serviceBag:Start()