@quenty/gameproductservice 14.34.8-canary.ba2274e.0 → 14.34.8

package/CHANGELOG.md

@@ -3,7 +3,7 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [14.34.8-canary.ba2274e.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/gameproductservice@14.34.7...@quenty/gameproductservice@14.34.8-canary.ba2274e.0) (2026-01-02)
+## [14.34.8](https://github.com/Quenty/NevermoreEngine/compare/@quenty/gameproductservice@14.34.7...@quenty/gameproductservice@14.34.8) (2026-01-03)
 
 **Note:** Version bump only for package @quenty/gameproductservice
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/gameproductservice",
-  "version": "14.34.8-canary.ba2274e.0",
+  "version": "14.34.8",
   "description": "Generalized monetization system for handling products and purchases correctly.",
   "keywords": [
     "Roblox",
@@ -27,34 +27,34 @@
     "access": "public"
   },
   "dependencies": {
-    "@quenty/attributeutils": "14.20.5",
-    "@quenty/avatareditorutils": "7.25.6",
-    "@quenty/baseobject": "10.9.0",
-    "@quenty/binder": "14.25.7-canary.ba2274e.0",
-    "@quenty/brio": "14.20.4",
-    "@quenty/cmdrservice": "13.29.7",
-    "@quenty/enumutils": "3.4.2",
-    "@quenty/gameconfig": "12.33.8-canary.ba2274e.0",
-    "@quenty/instanceutils": "13.20.5",
-    "@quenty/loader": "10.9.0",
-    "@quenty/maid": "3.5.0",
-    "@quenty/marketplaceutils": "11.13.3",
-    "@quenty/observablecollection": "12.24.6",
-    "@quenty/playerbinder": "14.25.7-canary.ba2274e.0",
-    "@quenty/playerutils": "8.21.6",
-    "@quenty/promise": "10.12.3",
-    "@quenty/promisemaid": "5.12.3",
-    "@quenty/receiptprocessing": "7.23.6",
-    "@quenty/remoting": "12.21.5",
-    "@quenty/rx": "13.20.3",
-    "@quenty/rxbinderutils": "14.25.7-canary.ba2274e.0",
-    "@quenty/servicebag": "11.13.3",
-    "@quenty/signal": "7.11.2",
-    "@quenty/statestack": "14.22.6",
-    "@quenty/string": "3.3.3",
-    "@quenty/table": "3.8.0",
-    "@quenty/tie": "10.26.6",
-    "@quenty/valueobject": "13.21.6"
+    "@quenty/attributeutils": "^14.20.6",
+    "@quenty/avatareditorutils": "^7.25.7",
+    "@quenty/baseobject": "^10.9.1",
+    "@quenty/binder": "^14.25.7",
+    "@quenty/brio": "^14.20.5",
+    "@quenty/cmdrservice": "^13.29.8",
+    "@quenty/enumutils": "^3.4.3",
+    "@quenty/gameconfig": "^12.33.8",
+    "@quenty/instanceutils": "^13.20.6",
+    "@quenty/loader": "^10.9.1",
+    "@quenty/maid": "^3.5.1",
+    "@quenty/marketplaceutils": "^11.13.4",
+    "@quenty/observablecollection": "^12.24.7",
+    "@quenty/playerbinder": "^14.25.7",
+    "@quenty/playerutils": "^8.21.7",
+    "@quenty/promise": "^10.12.4",
+    "@quenty/promisemaid": "^5.12.4",
+    "@quenty/receiptprocessing": "^7.23.7",
+    "@quenty/remoting": "^12.21.6",
+    "@quenty/rx": "^13.20.4",
+    "@quenty/rxbinderutils": "^14.25.7",
+    "@quenty/servicebag": "^11.13.4",
+    "@quenty/signal": "^7.11.3",
+    "@quenty/statestack": "^14.22.7",
+    "@quenty/string": "^3.3.4",
+    "@quenty/table": "^3.8.0",
+    "@quenty/tie": "^10.26.7",
+    "@quenty/valueobject": "^13.21.7"
   },
-  "gitHead": "ba2274ec070356518a157d80f912b05de9f74451"
+  "gitHead": "44e41814ddc3c14c3879320a10ed2d8e88103a4c"
 }

package/src/Client/GameProductServiceClient.lua

@@ -1,3 +1,4 @@
+--!nonstrict
 --[=[
 	This service provides an interface to purchase produces, assets, and other
 	marketplace items. This listens to events, handles requests between server and

package/src/Client/Manager/PlayerProductManagerClient.lua

@@ -1,3 +1,4 @@
+--!strict
 --[=[
 	@client
 	@class PlayerProductManagerClient
@@ -24,11 +25,27 @@ local PlayerProductManagerClient = setmetatable({}, PlayerProductManagerBase)
 PlayerProductManagerClient.ClassName = "PlayerProductManagerClient"
 PlayerProductManagerClient.__index = PlayerProductManagerClient
 
-function PlayerProductManagerClient.new(obj, serviceBag: ServiceBag.ServiceBag)
-	local self = setmetatable(PlayerProductManagerBase.new(obj, serviceBag), PlayerProductManagerClient)
+export type PlayerProductManagerClient =
+	typeof(setmetatable(
+		{} :: {
+			_obj: Player,
+			_player: Player,
+			_serviceBag: ServiceBag.ServiceBag,
+			_remoting: Remoting.Remoting,
 
-	self._avatarEditorInventoryServiceClient = self._serviceBag:GetService(AvatarEditorInventoryServiceClient)
-	self._catalogSearchServiceCache = self._serviceBag:GetService(CatalogSearchServiceCache)
+			_avatarEditorInventoryServiceClient: AvatarEditorInventoryServiceClient.AvatarEditorInventoryServiceClient,
+			_catalogSearchServiceCache: CatalogSearchServiceCache.CatalogSearchServiceCache,
+		},
+		{} :: typeof({ __index = PlayerProductManagerClient })
+	))
+	& PlayerProductManagerBase.PlayerProductManagerBase
+
+function PlayerProductManagerClient.new(player: Player, serviceBag: ServiceBag.ServiceBag): PlayerProductManagerClient
+	local self: PlayerProductManagerClient =
+		setmetatable(PlayerProductManagerBase.new(player, serviceBag) :: any, PlayerProductManagerClient)
+
+	self._avatarEditorInventoryServiceClient = self._serviceBag:GetService(AvatarEditorInventoryServiceClient :: any)
+	self._catalogSearchServiceCache = self._serviceBag:GetService(CatalogSearchServiceCache :: any)
 
 	if self._obj == Players.LocalPlayer then
 		self._remoting = self._maid:Add(Remoting.new(self._obj, "PlayerProductManager", Remoting.Realms.CLIENT))
@@ -53,11 +70,11 @@ end
 	Gets the current player
 	@return Player
 ]=]
-function PlayerProductManagerClient:GetPlayer()
+function PlayerProductManagerClient.GetPlayer(self: PlayerProductManagerClient): Player
 	return self._obj
 end
 
-function PlayerProductManagerClient:_setupAssetTracker()
+function PlayerProductManagerClient._setupAssetTracker(self: PlayerProductManagerClient): ()
 	local tracker = self:GetAssetTrackerOrError(GameConfigAssetTypes.ASSET)
 	local assetOwnership = assert(tracker:GetOwnershipTracker(), "Missing ownershipTracker on client")
 
@@ -74,14 +91,18 @@ function PlayerProductManagerClient:_setupAssetTracker()
 	end))
 end
 
-function PlayerProductManagerClient:_setupMembershipTracker()
+function PlayerProductManagerClient._setupMembershipTracker(self: PlayerProductManagerClient): ()
 	local tracker = self:GetAssetTrackerOrError(GameConfigAssetTypes.MEMBERSHIP)
 
 	self._maid:GiveTask(MarketplaceService.PromptPremiumPurchaseFinished:Connect(function()
-		tracker:HandlePromptClosedEvent(Enum.MembershipType.Premium)
+		-- TODO: Fix typing, these expect a number
+		tracker:HandlePromptClosedEvent(Enum.MembershipType.Premium :: any)
 
 		-- Not great behavior but whatever
-		tracker:HandlePurchaseEvent(Enum.MembershipType.Premium, self._obj.MembershipType == true)
+		tracker:HandlePurchaseEvent(
+			Enum.MembershipType.Premium :: any,
+			self._obj.MembershipType == Enum.MembershipType.Premium
+		)
 	end))
 
 	-- I think this only fires on the server...
@@ -94,7 +115,7 @@ function PlayerProductManagerClient:_setupMembershipTracker()
 	end))
 end
 
-function PlayerProductManagerClient:_setupSubscriptionTracker()
+function PlayerProductManagerClient._setupSubscriptionTracker(self: PlayerProductManagerClient): ()
 	local tracker = self:GetAssetTrackerOrError(GameConfigAssetTypes.SUBSCRIPTION)
 
 	-- Main event
@@ -127,7 +148,7 @@ function PlayerProductManagerClient:_setupSubscriptionTracker()
 	end))
 end
 
-function PlayerProductManagerClient:_connectBulkPurchaseMarketplace()
+function PlayerProductManagerClient._connectBulkPurchaseMarketplace(self: PlayerProductManagerClient): ()
 	self._maid:GiveTask(MarketplaceService.PromptBulkPurchaseFinished:Connect(function(player, status, results)
 		if player ~= self._obj then
 			return
@@ -161,7 +182,7 @@ function PlayerProductManagerClient:_connectBulkPurchaseMarketplace()
 	end))
 end
 
-function PlayerProductManagerClient:_setupProductTracker()
+function PlayerProductManagerClient._setupProductTracker(self: PlayerProductManagerClient): ()
 	local tracker = self:GetAssetTrackerOrError(GameConfigAssetTypes.PRODUCT)
 
 	self._maid:GiveTask(
@@ -185,7 +206,7 @@ function PlayerProductManagerClient:_setupProductTracker()
 	end))
 end
 
-function PlayerProductManagerClient:_connectGamePassTracker()
+function PlayerProductManagerClient._connectGamePassTracker(self: PlayerProductManagerClient): ()
 	local tracker = self:GetAssetTrackerOrError(GameConfigAssetTypes.PASS)
 
 	self._maid:GiveTask(
@@ -202,13 +223,13 @@ function PlayerProductManagerClient:_connectGamePassTracker()
 	)
 end
 
-function PlayerProductManagerClient:_setupBundleTracker()
+function PlayerProductManagerClient._setupBundleTracker(self: PlayerProductManagerClient): ()
 	local tracker = self:GetAssetTrackerOrError(GameConfigAssetTypes.BUNDLE)
 
 	local bundleOwnership = assert(tracker:GetOwnershipTracker(), "Missing ownershipTracker on client")
 
 	bundleOwnership:SetQueryOwnershipCallback(function(assetId)
-		return self:_promiseBulkOwnsBundleQuery(assetId, Enum.AvatarItemType.Bundle)
+		return self:_promiseBulkOwnsBundleQuery(assetId)
 	end)
 
 	self._maid:GiveTask(MarketplaceService.PromptBundlePurchaseFinished:Connect(function(player, bundleId, isPurchased)
@@ -221,7 +242,7 @@ function PlayerProductManagerClient:_setupBundleTracker()
 	end))
 end
 
-function PlayerProductManagerClient:_promiseBulkOwnsAssetQuery(assetId)
+function PlayerProductManagerClient._promiseBulkOwnsAssetQuery(self: PlayerProductManagerClient, assetId)
 	if self._avatarEditorInventoryServiceClient:IsInventoryAccessAllowed() then
 		-- When scrolling through a ton of entries in the avatar editor we want to query
 		-- this is typically faster. We really hope we aren't the Roblox account.
@@ -230,7 +251,8 @@ function PlayerProductManagerClient:_promiseBulkOwnsAssetQuery(assetId)
 			:Then(function(itemDetails)
 				-- https://devforum.roblox.com/t/avatareditorservicegetitemdetails-returns-ownership-where-as-avatareditorservicegetbatchitemdetails-does-not/3257431
 
-				local assetType = EnumUtils.toEnum(Enum.AvatarAssetType, itemDetails.AssetType)
+				local assetType: Enum.AvatarAssetType? =
+					EnumUtils.toEnum(Enum.AvatarAssetType, itemDetails.AssetType) :: any
 				if not assetType then
 					-- TODO: Fallback to standard query?
 					return Promise.rejected("Failed to get assetType")
@@ -247,8 +269,11 @@ function PlayerProductManagerClient:_promiseBulkOwnsAssetQuery(assetId)
 	return MarketplaceUtils.promisePlayerOwnsAsset(self._player, assetId)
 end
 
-function PlayerProductManagerClient:_promiseBulkOwnsBundleQuery(bundleId)
+function PlayerProductManagerClient._promiseBulkOwnsBundleQuery(self: PlayerProductManagerClient, bundleId: number)
 	return MarketplaceUtils.promisePlayerOwnsBundle(self._player, bundleId)
 end
 
-return Binder.new("PlayerProductManager", PlayerProductManagerClient)
+return Binder.new(
+		"PlayerProductManager",
+		PlayerProductManagerClient :: any
+	) :: Binder.Binder<PlayerProductManagerClient>

package/src/Server/Cmdr/GameProductCmdrService.lua

@@ -1,3 +1,4 @@
+--!nonstrict
 --[=[
 	@class GameProductCmdrService
 ]=]

package/src/Server/GameProductService.lua

@@ -1,3 +1,4 @@
+--!nonstrict
 --[=[
 	This service provides an interface to purchase produces, assets, and other
 	marketplace items. This listens to events, handles requests between server and

package/src/Server/Manager/PlayerProductManager.lua

@@ -1,3 +1,4 @@
+--!nonstrict
 --[=[
 	Handles product prompting state on the server
 
@@ -23,6 +24,16 @@ local PlayerProductManager = setmetatable({}, PlayerProductManagerBase)
 PlayerProductManager.ClassName = "PlayerProductManager"
 PlayerProductManager.__index = PlayerProductManager
 
+export type PlayerProductManager =
+	typeof(setmetatable(
+		{} :: {
+			_serviceBag: ServiceBag.ServiceBag,
+			_receiptProcessingService: ReceiptProcessingService.ReceiptProcessingService,
+		},
+		{} :: typeof({ __index = PlayerProductManager })
+	))
+	& PlayerProductManagerBase.PlayerProductManagerBase
+
 --[=[
 	Managers players products and purchase state. Should be retrieved via binder.
 
@@ -30,8 +41,9 @@ PlayerProductManager.__index = PlayerProductManager
 	@param serviceBag ServiceBag
 	@return PlayerProductManager
 ]=]
-function PlayerProductManager.new(player, serviceBag: ServiceBag.ServiceBag)
-	local self = setmetatable(PlayerProductManagerBase.new(player, serviceBag), PlayerProductManager)
+function PlayerProductManager.new(player: Player, serviceBag: ServiceBag.ServiceBag): PlayerProductManager
+	local self: PlayerProductManager =
+		setmetatable(PlayerProductManagerBase.new(player, serviceBag) :: any, PlayerProductManager)
 
 	self._serviceBag = assert(serviceBag, "No serviceBag")
 	self._receiptProcessingService = self._serviceBag:GetService(ReceiptProcessingService)
@@ -55,11 +67,11 @@ function PlayerProductManager.new(player, serviceBag: ServiceBag.ServiceBag)
 	return self
 end
 
-function PlayerProductManager:_setupRemoting()
+function PlayerProductManager._setupRemoting(self: PlayerProductManager): ()
 	self._remoting = self._maid:Add(Remoting.Server.new(self._obj, "PlayerProductManager", Remoting.Realms.SERVER))
 end
 
-function PlayerProductManager:_setupAssetTracker()
+function PlayerProductManager._setupAssetTracker(self: PlayerProductManager): ()
 	local tracker = self:GetAssetTrackerOrError(GameConfigAssetTypes.ASSET)
 
 	self._maid:GiveTask(self._remoting.AssetPromptPurchaseFinished:Connect(function(player, assetId, isPurchased)
@@ -73,7 +85,7 @@ function PlayerProductManager:_setupAssetTracker()
 	end))
 end
 
-function PlayerProductManager:_setupProductTracker()
+function PlayerProductManager._setupProductTracker(self: PlayerProductManager): ()
 	local tracker = self:GetAssetTrackerOrError(GameConfigAssetTypes.PRODUCT)
 
 	-- Source of truth for purchase is here
@@ -105,7 +117,7 @@ function PlayerProductManager:_setupProductTracker()
 	)
 end
 
-function PlayerProductManager:_setupPassTracker()
+function PlayerProductManager._setupPassTracker(self: PlayerProductManager): ()
 	local tracker = self:GetAssetTrackerOrError(GameConfigAssetTypes.PASS)
 
 	self._maid:GiveTask(self._remoting.PromptGamePassPurchaseFinished:Connect(function(player, gamePassId, isPurchased)
@@ -119,7 +131,7 @@ function PlayerProductManager:_setupPassTracker()
 	end))
 end
 
-function PlayerProductManager:_setupMembershipTracker()
+function PlayerProductManager._setupMembershipTracker(self: PlayerProductManager): ()
 	local tracker = self:GetAssetTrackerOrError(GameConfigAssetTypes.MEMBERSHIP)
 
 	self._maid:GiveTask(Players.PlayerMembershipChanged:Connect(function(player)
@@ -131,7 +143,7 @@ function PlayerProductManager:_setupMembershipTracker()
 	end))
 end
 
-function PlayerProductManager:_setupSubscriptionTracker()
+function PlayerProductManager._setupSubscriptionTracker(self: PlayerProductManager): ()
 	self._remoting.UserSubscriptionStatusChanged:DeclareEvent()
 
 	local tracker = self:GetAssetTrackerOrError(GameConfigAssetTypes.SUBSCRIPTION)
@@ -164,7 +176,7 @@ function PlayerProductManager:_setupSubscriptionTracker()
 	end))
 end
 
-function PlayerProductManager:_setupBundleTracker()
+function PlayerProductManager._setupBundleTracker(self: PlayerProductManager): ()
 	local tracker = self:GetAssetTrackerOrError(GameConfigAssetTypes.BUNDLE)
 
 	self._maid:GiveTask(MarketplaceService.PromptBundlePurchaseFinished:Connect(function(player, bundleId, isPurchased)

package/src/Shared/Interfaces/PlayerAssetMarketTrackerInterface.lua

@@ -1,3 +1,4 @@
+--!nonstrict
 --[=[
 	@class PlayerAssetMarketTrackerInterface
 ]=]

package/src/Shared/Interfaces/PlayerProductManagerInterface.lua

@@ -1,3 +1,4 @@
+--!nonstrict
 --[=[
 	@class PlayerProductManagerInterface
 ]=]

package/src/Shared/Ownership/PlayerAssetOwnershipTracker.lua

@@ -1,3 +1,4 @@
+--!strict
 --[=[
 	This tracking is relatively complicated because we want to track both
 	ownership from attributes (can be customized locally), as well as async
@@ -10,6 +11,8 @@ local require = require(script.Parent.loader).load(script)
 
 local BaseObject = require("BaseObject")
 local GameConfigAssetTypeUtils = require("GameConfigAssetTypeUtils")
+local GameConfigAssetTypes = require("GameConfigAssetTypes")
+local GameConfigPicker = require("GameConfigPicker")
 local Maid = require("Maid")
 local Observable = require("Observable")
 local ObservableSet = require("ObservableSet")
@@ -20,10 +23,30 @@ local PlayerAssetOwnershipTracker = setmetatable({}, BaseObject)
 PlayerAssetOwnershipTracker.ClassName = "PlayerAssetOwnershipTracker"
 PlayerAssetOwnershipTracker.__index = PlayerAssetOwnershipTracker
 
-function PlayerAssetOwnershipTracker.new(player, configPicker, assetType, marketTracker)
+export type PlayerAssetOwnershipTracker =
+	typeof(setmetatable(
+		{} :: {
+			_player: Player,
+			_configPicker: any,
+			_assetType: GameConfigAssetTypes.GameConfigAssetType,
+			_marketTracker: any,
+			_ownershipCallback: ValueObject.ValueObject<(number) -> Promise.Promise<boolean> | nil>,
+			_ownedAssetIdSet: ObservableSet.ObservableSet<number>,
+			_assetOwnershipPromiseCache: { [number]: Promise.Promise<boolean> | boolean },
+		},
+		{} :: typeof({ __index = PlayerAssetOwnershipTracker })
+	))
+	& BaseObject.BaseObject
+
+function PlayerAssetOwnershipTracker.new(
+	player: Player,
+	configPicker: GameConfigPicker.GameConfigPicker,
+	assetType: GameConfigAssetTypes.GameConfigAssetType,
+	marketTracker: any
+): PlayerAssetOwnershipTracker
 	assert(GameConfigAssetTypeUtils.isAssetType(assetType), "Bad assetType")
 
-	local self = setmetatable(BaseObject.new(), PlayerAssetOwnershipTracker)
+	local self: PlayerAssetOwnershipTracker = setmetatable(BaseObject.new() :: any, PlayerAssetOwnershipTracker)
 
 	self._player = assert(player, "No player")
 	self._configPicker = assert(configPicker, "No configPicker")
@@ -46,7 +69,7 @@ end
 	Sets the callback which will query ownership
 	@param promiseOwnsAsset function
 ]=]
-function PlayerAssetOwnershipTracker:SetQueryOwnershipCallback(promiseOwnsAsset)
+function PlayerAssetOwnershipTracker:SetQueryOwnershipCallback(promiseOwnsAsset: (any) -> Promise.Promise<boolean>?): ()
 	assert(type(promiseOwnsAsset) == "function" or promiseOwnsAsset == nil, "Bad promiseOwnsAsset")
 
 	if self._ownershipCallback.Value == promiseOwnsAsset then
@@ -57,7 +80,7 @@ function PlayerAssetOwnershipTracker:SetQueryOwnershipCallback(promiseOwnsAsset)
 	self._ownershipCallback.Value = promiseOwnsAsset
 end
 
-function PlayerAssetOwnershipTracker:_promiseQueryAssetId(assetId: number)
+function PlayerAssetOwnershipTracker:_promiseQueryAssetId(assetId: number): Promise.Promise<boolean>?
 	assert(type(assetId) == "number", "Bad assetId")
 
 	local promiseOwnershipCallback = self._ownershipCallback.Value
@@ -103,7 +126,7 @@ end
 	@param idOrKey number
 	@param ownsAsset boolean
 ]=]
-function PlayerAssetOwnershipTracker:SetOwnership(idOrKey, ownsAsset)
+function PlayerAssetOwnershipTracker:SetOwnership(idOrKey, ownsAsset: boolean): ()
 	assert(type(idOrKey) == "number" or type(idOrKey) == "string", "idOrKey")
 	assert(type(ownsAsset) == "boolean", "Bad ownsAsset")
 
@@ -155,7 +178,7 @@ end
 	@param idOrKey number | number
 	@return Observable<boolean>
 ]=]
-function PlayerAssetOwnershipTracker:ObserveOwnsAsset(idOrKey)
+function PlayerAssetOwnershipTracker:ObserveOwnsAsset(idOrKey): Observable.Observable<boolean>
 	assert(type(idOrKey) == "number" or type(idOrKey) == "string", "Bad idOrKey")
 
 	-- TODO: Get rid of several concepts here, including well known assets, attributes, and more
@@ -179,7 +202,7 @@ function PlayerAssetOwnershipTracker:ObserveOwnsAsset(idOrKey)
 			end))
 
 			return topMaid
-		end)
+		end) :: any
 	elseif type(idOrKey) == "number" then
 		return Observable.new(function(sub)
 			local maid = Maid.new()
@@ -193,7 +216,7 @@ function PlayerAssetOwnershipTracker:ObserveOwnsAsset(idOrKey)
 			end)
 
 			return maid
-		end)
+		end) :: any
 	else
 		error("Bad idOrKey")
 	end

package/src/Shared/Trackers/PlayerAssetMarketTracker.lua

@@ -1,3 +1,4 @@
+--!strict
 --[=[
 	Tracks a single asset type for pending purchase prompts.
 
@@ -7,10 +8,12 @@
 local require = require(script.Parent.loader).load(script)
 
 local BaseObject = require("BaseObject")
+local Brio = require("Brio")
 local GameConfigAssetTypeUtils = require("GameConfigAssetTypeUtils")
 local GameConfigAssetTypes = require("GameConfigAssetTypes")
 local Maid = require("Maid")
 local Observable = require("Observable")
+local PlayerAssetOwnershipTracker = require("PlayerAssetOwnershipTracker")
 local Promise = require("Promise")
 local Signal = require("Signal")
 local ValueObject = require("ValueObject")
@@ -19,6 +22,28 @@ local PlayerAssetMarketTracker = setmetatable({}, BaseObject)
 PlayerAssetMarketTracker.ClassName = "PlayerAssetMarketTracker"
 PlayerAssetMarketTracker.__index = PlayerAssetMarketTracker
 
+export type PlayerAssetMarketTracker =
+	typeof(setmetatable(
+		{} :: {
+			_assetType: GameConfigAssetTypes.GameConfigAssetType,
+			_convertIds: (string | number) -> number?,
+			_observeIdsBrio: (string | number) -> Observable.Observable<Brio.Brio<number>>,
+			_pendingPurchasePromises: { Promise.Promise<boolean> },
+			_pendingPromptOpenPromises: { Promise.Promise<boolean> },
+			_purchasedThisSession: { [number]: boolean },
+			_promptsOpenCount: ValueObject.ValueObject<number>,
+			_ownershipTracker: PlayerAssetOwnershipTracker.PlayerAssetOwnershipTracker?,
+
+			Purchased: Signal.Signal<number>,
+			PromptClosed: Signal.Signal<(number, boolean)>,
+			ShowPromptRequested: Signal.Signal<number>,
+
+			_promiseNoPromptOpen: Promise.Promise<()>?,
+		},
+		{} :: typeof({ __index = PlayerAssetMarketTracker })
+	))
+	& BaseObject.BaseObject
+
 --[=[
 	Constructs a new market tracker. Generally you should not need to use
 	this directly.
@@ -28,10 +53,14 @@ PlayerAssetMarketTracker.__index = PlayerAssetMarketTracker
 	@param observeIdsBrio function
 	@return PlayerAssetMarketTracker
 ]=]
-function PlayerAssetMarketTracker.new(assetType: GameConfigAssetTypes.GameConfigAssetType, convertIds, observeIdsBrio)
+function PlayerAssetMarketTracker.new(
+	assetType: GameConfigAssetTypes.GameConfigAssetType,
+	convertIds,
+	observeIdsBrio
+): PlayerAssetMarketTracker
 	assert(GameConfigAssetTypeUtils.isAssetType(assetType), "Bad assetType")
 
-	local self = setmetatable(BaseObject.new(), PlayerAssetMarketTracker)
+	local self: PlayerAssetMarketTracker = setmetatable(BaseObject.new() :: any, PlayerAssetMarketTracker)
 
 	self._assetType = assert(assetType, "No assetType")
 	self._convertIds = assert(convertIds, "No convertIds")
@@ -44,9 +73,9 @@ function PlayerAssetMarketTracker.new(assetType: GameConfigAssetTypes.GameConfig
 
 	self._promptsOpenCount = self._maid:Add(ValueObject.new(0, "number"))
 
-	self.Purchased = self._maid:Add(Signal.new()) -- :Fire(id)
-	self.PromptClosed = self._maid:Add(Signal.new()) -- :Fire(id, isPurchased)
-	self.ShowPromptRequested = self._maid:Add(Signal.new()) -- :Fire(id)
+	self.Purchased = self._maid:Add(Signal.new() :: any) -- :Fire(id)
+	self.PromptClosed = self._maid:Add(Signal.new() :: any) -- :Fire(id, isPurchased)
+	self.ShowPromptRequested = self._maid:Add(Signal.new() :: any) -- :Fire(id)
 
 	self._maid:GiveTask(self.Purchased:Connect(function(id)
 		self._purchasedThisSession[id] = true
@@ -65,11 +94,15 @@ function PlayerAssetMarketTracker.new(assetType: GameConfigAssetTypes.GameConfig
 	self._maid:GiveTask(function()
 		while #self._pendingPurchasePromises > 0 do
 			local pending = table.remove(self._pendingPurchasePromises, #self._pendingPurchasePromises)
+			assert(pending, "Typechecking assertion")
+
 			pending:Reject()
 		end
 
 		while #self._pendingPromptOpenPromises > 0 do
 			local pending = table.remove(self._pendingPromptOpenPromises, #self._pendingPromptOpenPromises)
+			assert(pending, "Typechecking assertion")
+
 			pending:Reject()
 		end
 	end)
@@ -82,7 +115,7 @@ end
 
 	@return Observable<number>
 ]=]
-function PlayerAssetMarketTracker:ObservePromptOpenCount(): Observable.Observable<number>
+function PlayerAssetMarketTracker.ObservePromptOpenCount(self: PlayerAssetMarketTracker): Observable.Observable<number>
 	return self._promptsOpenCount:Observe()
 end
 
@@ -92,7 +125,10 @@ end
 	@param idOrKey string | number
 	@return Observable<()>
 ]=]
-function PlayerAssetMarketTracker:ObserveAssetPurchased(idOrKey: string | number): Observable.Observable<()>
+function PlayerAssetMarketTracker.ObserveAssetPurchased(
+	self: PlayerAssetMarketTracker,
+	idOrKey: string | number
+): Observable.Observable<()>
 	assert(type(idOrKey) == "number" or type(idOrKey) == "string", "Bad idOrKey")
 
 	return Observable.new(function(sub)
@@ -132,7 +168,9 @@ end
 
 	@return GetOwnershipTracker
 ]=]
-function PlayerAssetMarketTracker:GetOwnershipTracker()
+function PlayerAssetMarketTracker.GetOwnershipTracker(
+	self: PlayerAssetMarketTracker
+): PlayerAssetOwnershipTracker.PlayerAssetOwnershipTracker?
 	return self._ownershipTracker
 end
 
@@ -143,7 +181,10 @@ end
 	@param idOrKey number | string
 	@return Promise<boolean>
 ]=]
-function PlayerAssetMarketTracker:PromisePromptPurchase(idOrKey: string | number)
+function PlayerAssetMarketTracker.PromisePromptPurchase(
+	self: PlayerAssetMarketTracker,
+	idOrKey: string | number
+): Promise.Promise<boolean>
 	assert(type(idOrKey) == "number" or type(idOrKey) == "string", "Bad idOrKey")
 
 	local id = self._convertIds(idOrKey)
@@ -202,7 +243,7 @@ function PlayerAssetMarketTracker:PromisePromptPurchase(idOrKey: string | number
 			end
 
 			do
-				local promptOpenPromise = Promise.new()
+				local promptOpenPromise: Promise.Promise<boolean> = Promise.new()
 				self._pendingPromptOpenPromises[id] = promptOpenPromise
 
 				self._promptsOpenCount.Value = self._promptsOpenCount.Value + 1
@@ -215,7 +256,7 @@ function PlayerAssetMarketTracker:PromisePromptPurchase(idOrKey: string | number
 			end
 
 			-- Make sure to do promise here so we can't double-open prompts
-			local purchasePromise = Promise.new()
+			local purchasePromise: Promise.Promise<boolean> = Promise.new()
 			self._pendingPurchasePromises[id] = purchasePromise
 
 			purchasePromise:Finally(function()
@@ -235,7 +276,10 @@ end
 
 	@param ownershipTracker PlayerAssetOwnershipTracker
 ]=]
-function PlayerAssetMarketTracker:SetOwnershipTracker(ownershipTracker)
+function PlayerAssetMarketTracker.SetOwnershipTracker(
+	self: PlayerAssetMarketTracker,
+	ownershipTracker: PlayerAssetOwnershipTracker.PlayerAssetOwnershipTracker?
+): ()
 	assert(type(ownershipTracker) == "table" or ownershipTracker == nil, "Bad ownershipTracker")
 
 	self._ownershipTracker = ownershipTracker
@@ -246,7 +290,7 @@ end
 
 	@return GameConfigAssetTypes
 ]=]
-function PlayerAssetMarketTracker:GetAssetType(): GameConfigAssetTypes.GameConfigAssetType
+function PlayerAssetMarketTracker.GetAssetType(self: PlayerAssetMarketTracker): GameConfigAssetTypes.GameConfigAssetType
 	return self._assetType
 end
 
@@ -256,7 +300,10 @@ end
 	@param idOrKey string | number
 	@return boolean
 ]=]
-function PlayerAssetMarketTracker:HasPurchasedThisSession(idOrKey: string | number)
+function PlayerAssetMarketTracker.HasPurchasedThisSession(
+	self: PlayerAssetMarketTracker,
+	idOrKey: string | number
+): boolean
 	assert(type(idOrKey) == "number" or type(idOrKey) == "string", "idOrKey")
 
 	local id = self._convertIds(idOrKey)
@@ -277,7 +324,7 @@ end
 
 	@return boolean
 ]=]
-function PlayerAssetMarketTracker:IsPromptOpen(): boolean
+function PlayerAssetMarketTracker.IsPromptOpen(self: PlayerAssetMarketTracker): boolean
 	return self._promptsOpenCount.Value > 0
 end
 
@@ -287,11 +334,15 @@ end
 	@param id number
 	@param isPurchased boolean
 ]=]
-function PlayerAssetMarketTracker:HandlePurchaseEvent(id: number, isPurchased: boolean)
+function PlayerAssetMarketTracker.HandlePurchaseEvent(
+	self: PlayerAssetMarketTracker,
+	id: number,
+	isPurchased: boolean
+): ()
 	assert(type(id) == "number", "Bad id")
 	assert(type(isPurchased) == "boolean", "Bad isPurchased")
 
-	local purchasePromise = self._pendingPurchasePromises[id] or Promise.new()
+	local purchasePromise: any = self._pendingPurchasePromises[id] or Promise.new()
 
 	if isPurchased then
 		self.Purchased:Fire(id)
@@ -305,10 +356,10 @@ end
 
 	@param id number
 ]=]
-function PlayerAssetMarketTracker:HandlePromptClosedEvent(id: number)
+function PlayerAssetMarketTracker.HandlePromptClosedEvent(self: PlayerAssetMarketTracker, id: number): ()
 	assert(type(id) == "number", "Bad id")
 
-	local promptOpenPromise = self._pendingPromptOpenPromises[id] or Promise.new()
+	local promptOpenPromise: any = self._pendingPromptOpenPromises[id] or Promise.new()
 	promptOpenPromise:Resolve()
 end
 

package/src/Shared/Trackers/PlayerProductManagerBase.lua

@@ -1,3 +1,4 @@
+--!strict
 --[=[
 	See [PlayerProductManager] and [PlayerProductManagerClient]
 
@@ -13,6 +14,7 @@ local GameConfigAssetTypeUtils = require("GameConfigAssetTypeUtils")
 local GameConfigAssetTypes = require("GameConfigAssetTypes")
 local GameConfigDataService = require("GameConfigDataService")
 local MarketplaceUtils = require("MarketplaceUtils")
+local Observable = require("Observable")
 local PlayerAssetMarketTracker = require("PlayerAssetMarketTracker")
 local PlayerAssetMarketTrackerInterface = require("PlayerAssetMarketTrackerInterface")
 local PlayerAssetOwnershipTracker = require("PlayerAssetOwnershipTracker")
@@ -26,6 +28,27 @@ local PlayerProductManagerBase = setmetatable({}, BaseObject)
 PlayerProductManagerBase.ClassName = "PlayerProductManagerBase"
 PlayerProductManagerBase.__index = PlayerProductManagerBase
 
+export type PlayerProductManagerBase =
+	typeof(setmetatable(
+		{} :: {
+			_serviceBag: ServiceBag.ServiceBag,
+			_obj: Player,
+			_player: Player,
+			_tieRealmService: TieRealmService.TieRealmService,
+			_gameConfigDataService: GameConfigDataService.GameConfigDataService,
+			_configPicker: any,
+			_assetMarketTrackers: {
+				[GameConfigAssetTypes.GameConfigAssetType]: PlayerAssetMarketTracker.PlayerAssetMarketTracker,
+			},
+			_ownershipTrackers: {
+				[GameConfigAssetTypes.GameConfigAssetType]: PlayerAssetOwnershipTracker.PlayerAssetOwnershipTracker,
+			},
+			_observeNextNoPromptOpen: Observable.Observable<boolean>?,
+		},
+		{} :: typeof({ __index = PlayerProductManagerBase })
+	))
+	& BaseObject.BaseObject
+
 --[=[
 	Constructs a new PlayerProductManagerBase, which provides helper methods for
 	the PlayerProductManager.
@@ -34,14 +57,14 @@ PlayerProductManagerBase.__index = PlayerProductManagerBase
 	@param serviceBag ServiceBag
 	@return PlayerProductManagerBase
 ]=]
-function PlayerProductManagerBase.new(player, serviceBag: ServiceBag.ServiceBag)
-	local self = setmetatable(BaseObject.new(player), PlayerProductManagerBase)
+function PlayerProductManagerBase.new(player: Player, serviceBag: ServiceBag.ServiceBag): PlayerProductManagerBase
+	local self: PlayerProductManagerBase = setmetatable(BaseObject.new(player) :: any, PlayerProductManagerBase)
 
 	self._player = assert(player, "No player")
 
 	self._serviceBag = assert(serviceBag, "No serviceBag")
-	self._tieRealmService = self._serviceBag:GetService(TieRealmService)
-	self._gameConfigDataService = self._serviceBag:GetService(GameConfigDataService)
+	self._tieRealmService = self._serviceBag:GetService(TieRealmService :: any)
+	self._gameConfigDataService = self._serviceBag:GetService(GameConfigDataService :: any)
 
 	self._configPicker = self._gameConfigDataService:GetConfigPicker()
 
@@ -79,7 +102,9 @@ function PlayerProductManagerBase.new(player, serviceBag: ServiceBag.ServiceBag)
 		MarketplaceService:PromptSubscriptionPurchase(self._player, subscriptionId)
 	end))
 
-	self._maid:GiveTask(membership.ShowPromptRequested:Connect(function(membershipType)
+	self._maid:GiveTask(membership.ShowPromptRequested:Connect(function(membershipType: any)
+		-- TODO: membershipType is not a number and checking is wrong
+
 		if membershipType == Enum.MembershipType.Premium then
 			MarketplaceService:PromptPremiumPurchase(self._player)
 		else
@@ -121,8 +146,8 @@ function PlayerProductManagerBase.new(player, serviceBag: ServiceBag.ServiceBag)
 	return self
 end
 
-function PlayerProductManagerBase:ExportMarketTrackers(parent)
-	for assetType, assetMarketTracker in self._assetMarketTrackers do
+function PlayerProductManagerBase.ExportMarketTrackers(self: PlayerProductManagerBase, parent)
+	for assetType: GameConfigAssetTypes.GameConfigAssetType, assetMarketTracker in self._assetMarketTrackers do
 		local folder = self._maid:Add(Instance.new("Folder"))
 		folder.Name = String.toCamelCase(GameConfigAssetTypeUtils.getPlural(assetType))
 		folder.Archivable = false
@@ -139,7 +164,7 @@ end
 	Gets the current player
 	@return Player
 ]=]
-function PlayerProductManagerBase:GetPlayer(): Player
+function PlayerProductManagerBase.GetPlayer(self: PlayerProductManagerBase): Player
 	return self._obj
 end
 
@@ -148,7 +173,7 @@ end
 	@param assetType GameConfigAssetType
 	@return PlayerAssetMarketTracker
 ]=]
-function PlayerProductManagerBase:IsOwnable(assetType): boolean
+function PlayerProductManagerBase.IsOwnable(self: PlayerProductManagerBase, assetType): boolean
 	assert(GameConfigAssetTypeUtils.isAssetType(assetType), "Bad assetType")
 
 	return self._ownershipTrackers[assetType] ~= nil
@@ -159,8 +184,8 @@ end
 
 	@return boolean
 ]=]
-function PlayerProductManagerBase:IsPromptOpen(): boolean
-	for _, assetTracker in self._assetMarketTrackers do
+function PlayerProductManagerBase.IsPromptOpen(self: PlayerProductManagerBase): boolean
+	for _, assetTracker: any in self._assetMarketTrackers do
 		if assetTracker:IsPromptOpen() then
 			return true
 		end
@@ -174,18 +199,18 @@ end
 
 	@return Promise
 ]=]
-function PlayerProductManagerBase:PromisePlayerPromptClosed()
+function PlayerProductManagerBase.PromisePlayerPromptClosed(self: PlayerProductManagerBase): Promise.Promise<()>
 	if not self:IsPromptOpen() then
 		return Promise.resolved()
 	end
 
 	if self._observeNextNoPromptOpen then
-		return Rx.toPromise(self._observeNextNoPromptOpen)
+		return Rx.toPromise(self._observeNextNoPromptOpen :: any)
 	end
 
 	local observeOpenCounts = {}
 
-	for assetType, assetTracker in self._assetMarketTrackers do
+	for assetType, assetTracker: any in self._assetMarketTrackers do
 		observeOpenCounts[assetType] = assetTracker:ObservePromptOpenCount()
 	end
 
@@ -198,15 +223,15 @@ function PlayerProductManagerBase:PromisePlayerPromptClosed()
 			end
 
 			return true
-		end),
+		end) :: any,
 		Rx.where(function(value)
 			return value
-		end),
-		Rx.distinct(),
-		Rx.share(),
-	})
+		end) :: any,
+		Rx.distinct() :: any,
+		Rx.share() :: any,
+	}) :: any
 
-	return Rx.toPromise(self._observeNextNoPromptOpen)
+	return Rx.toPromise(self._observeNextNoPromptOpen :: any)
 end
 
 --[=[
@@ -215,7 +240,10 @@ end
 	@param assetType GameConfigAssetType
 	@return PlayerAssetMarketTracker
 ]=]
-function PlayerProductManagerBase:GetAssetTrackerOrError(assetType)
+function PlayerProductManagerBase.GetAssetTrackerOrError(
+	self: PlayerProductManagerBase,
+	assetType: GameConfigAssetTypes.GameConfigAssetType
+): PlayerAssetMarketTracker.PlayerAssetMarketTracker
 	assert(GameConfigAssetTypeUtils.isAssetType(assetType), "Bad assetType")
 
 	local assetTracker = self._assetMarketTrackers[assetType]
@@ -231,7 +259,10 @@ end
 	@param assetType GameConfigAssetType
 	@return PlayerAssetMarketTracker
 ]=]
-function PlayerProductManagerBase:GetOwnershipTrackerOrError(assetType)
+function PlayerProductManagerBase.GetOwnershipTrackerOrError(
+	self: PlayerProductManagerBase,
+	assetType: GameConfigAssetTypes.GameConfigAssetType
+): PlayerAssetOwnershipTracker.PlayerAssetOwnershipTracker
 	assert(GameConfigAssetTypeUtils.isAssetType(assetType), "Bad assetType")
 
 	local assetTracker = self._ownershipTrackers[assetType]
@@ -241,7 +272,10 @@ function PlayerProductManagerBase:GetOwnershipTrackerOrError(assetType)
 	return assetTracker
 end
 
-function PlayerProductManagerBase:_addOwnershipTracker(assetType)
+function PlayerProductManagerBase._addOwnershipTracker(
+	self: PlayerProductManagerBase,
+	assetType: GameConfigAssetTypes.GameConfigAssetType
+): PlayerAssetOwnershipTracker.PlayerAssetOwnershipTracker
 	assert(GameConfigAssetTypeUtils.isAssetType(assetType), "Bad assetType")
 	assert(not self._ownershipTrackers[assetType], "Already have ownership tracker")
 
@@ -256,7 +290,10 @@ function PlayerProductManagerBase:_addOwnershipTracker(assetType)
 	return ownershipTracker
 end
 
-function PlayerProductManagerBase:_addAssetTracker(assetType)
+function PlayerProductManagerBase._addAssetTracker(
+	self: PlayerProductManagerBase,
+	assetType: GameConfigAssetTypes.GameConfigAssetType
+): PlayerAssetMarketTracker.PlayerAssetMarketTracker
 	assert(GameConfigAssetTypeUtils.isAssetType(assetType), "Bad assetType")
 	assert(not self._assetMarketTrackers[assetType], "Already have tracker")
 

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

@@ -1,3 +1,4 @@
+--!nonstrict
 --[[
 	@class ClientMain
 ]]

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

@@ -1,3 +1,4 @@
+--!nonstrict
 --[[
 	@class ServerMain
 ]]
@@ -19,7 +20,7 @@ serviceBag:GetService(require("GameConfigService")):AddAsset("FrogOnHead", 45565
 
 local GameConfigAssetTypes = require("GameConfigAssetTypes")
 
-local function makePrompt(assetType, idOrKey, cframe)
+local function makePrompt(assetType: GameConfigAssetTypes.GameConfigAssetType, idOrKey: number | string, cframe: CFrame)
 	assert(type(idOrKey) == "number" or type(idOrKey) == "string", "Bad idOrKey")
 
 	local promptPart = Instance.new("Part")