@quenty/inputkeymaputils 14.23.3 → 14.23.4-canary.559.339cfa7.0

package/CHANGELOG.md

@@ -3,6 +3,23 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [14.23.4-canary.559.339cfa7.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/inputkeymaputils@14.23.3...@quenty/inputkeymaputils@14.23.4-canary.559.339cfa7.0) (2025-05-10)
+
+
+### Bug Fixes
+
+* Additional type checking updates ([05ba29a](https://github.com/Quenty/NevermoreEngine/commit/05ba29a03efc9f3feed74b34f1d9dfb237496214))
+* slottedtouchbutton recursion ([#557](https://github.com/Quenty/NevermoreEngine/issues/557)) ([c3e5c89](https://github.com/Quenty/NevermoreEngine/commit/c3e5c8977f9207f1b56489010ce12b204a28f4ae))
+
+
+### Features
+
+* Add even more types ([b31717d](https://github.com/Quenty/NevermoreEngine/commit/b31717d8c9f7620c457f5018a2affa760a65334a))
+
+
+
+
+
 ## [14.23.3](https://github.com/Quenty/NevermoreEngine/compare/@quenty/inputkeymaputils@14.23.2...@quenty/inputkeymaputils@14.23.3) (2025-04-10)
 
 **Note:** Version bump only for package @quenty/inputkeymaputils

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/inputkeymaputils",
-  "version": "14.23.3",
+  "version": "14.23.4-canary.559.339cfa7.0",
   "description": "System to define rebindable key bindings and inputs for Roblox.",
   "keywords": [
     "Roblox",
@@ -26,26 +26,26 @@
     "Quenty"
   ],
   "dependencies": {
-    "@quenty/baseobject": "^10.8.3",
-    "@quenty/brio": "^14.17.3",
-    "@quenty/clienttranslator": "^14.19.3",
-    "@quenty/ducktype": "^5.8.4",
-    "@quenty/enumutils": "^3.4.2",
-    "@quenty/inputmode": "^13.18.3",
-    "@quenty/loader": "^10.8.3",
-    "@quenty/maid": "^3.4.3",
-    "@quenty/observablecollection": "^12.20.3",
-    "@quenty/pseudolocalize": "^3.4.2",
-    "@quenty/rx": "^13.17.3",
-    "@quenty/servicebag": "^11.11.4",
-    "@quenty/statestack": "^14.18.3",
-    "@quenty/string": "^3.3.3",
-    "@quenty/table": "^3.7.4",
-    "@quenty/valuebaseutils": "^13.17.3",
-    "@quenty/valueobject": "^13.17.3"
+    "@quenty/baseobject": "10.8.4-canary.559.339cfa7.0",
+    "@quenty/brio": "14.17.4-canary.559.339cfa7.0",
+    "@quenty/clienttranslator": "14.19.4-canary.559.339cfa7.0",
+    "@quenty/ducktype": "5.8.5-canary.559.339cfa7.0",
+    "@quenty/enumutils": "3.4.2",
+    "@quenty/inputmode": "13.18.4-canary.559.339cfa7.0",
+    "@quenty/loader": "10.8.4-canary.559.339cfa7.0",
+    "@quenty/maid": "3.4.4-canary.559.339cfa7.0",
+    "@quenty/observablecollection": "12.20.4-canary.559.339cfa7.0",
+    "@quenty/pseudolocalize": "3.4.3-canary.559.339cfa7.0",
+    "@quenty/rx": "13.17.4-canary.559.339cfa7.0",
+    "@quenty/servicebag": "11.11.5-canary.559.339cfa7.0",
+    "@quenty/statestack": "14.18.4-canary.559.339cfa7.0",
+    "@quenty/string": "3.3.3",
+    "@quenty/table": "3.7.5-canary.559.339cfa7.0",
+    "@quenty/valuebaseutils": "13.17.4-canary.559.339cfa7.0",
+    "@quenty/valueobject": "13.17.4-canary.559.339cfa7.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b06c070ae91d5dab7bd8de6e290ad2caabb15d8f"
+  "gitHead": "339cfa778736f08768ed7305041f6221faa35bfc"
 }

package/src/Client/InputKeyMapListUtils.lua

@@ -47,7 +47,7 @@ function InputKeyMapListUtils.observeActiveInputKeyMap(inputKeyMapList, serviceB
 			else
 				return Rx.of(nil)
 			end
-		end);
+		end),
 	})
 end
 
@@ -74,8 +74,8 @@ function InputKeyMapListUtils.observeActiveInputTypesList(inputKeyMapList, servi
 			else
 				return Rx.of(nil)
 			end
-		end);
-		Rx.distinct();
+		end),
+		Rx.distinct(),
 	})
 end
 
@@ -104,4 +104,4 @@ function InputKeyMapListUtils.observeActiveInputModeType(inputKeyMapList, servic
 	end)
 end
 
-return InputKeyMapListUtils
+return InputKeyMapListUtils

package/src/Client/InputKeyMapServiceClient.lua

@@ -6,12 +6,12 @@ local require = require(script.Parent.loader).load(script)
 
 local Maid = require("Maid")
 local PseudoLocalize = require("PseudoLocalize")
-local _ServiceBag = require("ServiceBag")
+local ServiceBag = require("ServiceBag")
 
 local InputKeyMapServiceClient = {}
 InputKeyMapServiceClient.ServiceName = "InputKeyMapServiceClient"
 
-function InputKeyMapServiceClient:Init(serviceBag: _ServiceBag.ServiceBag)
+function InputKeyMapServiceClient:Init(serviceBag: ServiceBag.ServiceBag)
 	assert(not self._serviceBag, "Already initialized")
 	self._serviceBag = assert(serviceBag, "No serviceBag")
 	self._maid = Maid.new()
@@ -48,9 +48,13 @@ function InputKeyMapServiceClient:_ensureLocalizationEntries()
 		local value = text
 
 		localizationTable:SetEntryValue(key, source, context, localeId, value)
-		localizationTable:SetEntryValue(key, source, context,
+		localizationTable:SetEntryValue(
+			key,
+			source,
+			context,
 			PseudoLocalize.getDefaultPseudoLocaleId(),
-			PseudoLocalize.pseudoLocalize(value))
+			PseudoLocalize.pseudoLocalize(value)
+		)
 	end))
 end
 
@@ -58,4 +62,4 @@ function InputKeyMapServiceClient:Destroy()
 	self._maid:DoCleaning()
 end
 
-return InputKeyMapServiceClient
+return InputKeyMapServiceClient

package/src/Server/InputKeyMapService.lua

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

package/src/Shared/InputKeyMap.lua

@@ -11,10 +11,10 @@
 local require = require(script.Parent.loader).load(script)
 
 local BaseObject = require("BaseObject")
-local ValueObject = require("ValueObject")
 local InputModeType = require("InputModeType")
 local InputTypeUtils = require("InputTypeUtils")
-local _Observable = require("Observable")
+local Observable = require("Observable")
+local ValueObject = require("ValueObject")
 
 local InputKeyMap = setmetatable({}, BaseObject)
 InputKeyMap.ClassName = "InputKeyMap"
@@ -113,7 +113,7 @@ end
 
 	@return Observable<{ InputType }>
 ]=]
-function InputKeyMap.ObserveInputTypesList(self: InputKeyMap): _Observable.Observable<{ InputType }>
+function InputKeyMap.ObserveInputTypesList(self: InputKeyMap): Observable.Observable<{ InputType }>
 	return self._inputTypeList:Observe()
 end
 
@@ -126,4 +126,4 @@ function InputKeyMap.GetInputTypesList(self: InputKeyMap): { InputType }
 	return self._inputTypeList.Value
 end
 
-return InputKeyMap
+return InputKeyMap

package/src/Shared/InputKeyMapList.lua

@@ -50,16 +50,15 @@ local InputModeType = require("InputModeType")
 local InputModeTypes = require("InputModeTypes")
 local InputTypeUtils = require("InputTypeUtils")
 local Maid = require("Maid")
+local Observable = require("Observable")
 local ObservableCountingMap = require("ObservableCountingMap")
 local ObservableMap = require("ObservableMap")
 local Rx = require("Rx")
 local RxBrioUtils = require("RxBrioUtils")
+local Set = require("Set")
 local SlottedTouchButtonUtils = (require :: any)("SlottedTouchButtonUtils")
 local StateStack = require("StateStack")
 local String = require("String")
-local _Observable = require("Observable")
-local _Brio = require("Brio")
-local _Set = require("Set")
 
 local InputKeyMapList = setmetatable({}, BaseObject)
 InputKeyMapList.ClassName = "InputKeyMapList"
@@ -292,8 +291,8 @@ end
 	Observes a brio with the first value as the InputModeType and the second value as the KeyMapList
 	@return Observable<Brio<InputModeType, InputKeyMap>>
 ]=]
-function InputKeyMapList.ObservePairsBrio(self: InputKeyMapList): _Observable.Observable<
-	_Brio.Brio<InputModeType.InputModeType, InputKeyMap.InputKeyMap>
+function InputKeyMapList.ObservePairsBrio(self: InputKeyMapList): Observable.Observable<
+	Brio.Brio<InputModeType.InputModeType, InputKeyMap.InputKeyMap>
 >
 	return self._inputModeTypeToInputKeyMap:ObservePairsBrio()
 end
@@ -323,7 +322,7 @@ end
 ]=]
 function InputKeyMapList.ObserveInputKeyMapsBrio(
 	self: InputKeyMapList
-): _Observable.Observable<_Brio.Brio<InputKeyMap.InputKeyMap>>
+): Observable.Observable<Brio.Brio<InputKeyMap.InputKeyMap>>
 	return self._inputModeTypeToInputKeyMap:ObserveValuesBrio()
 end
 
@@ -332,7 +331,7 @@ end
 ]=]
 function InputKeyMapList.ObserveInputModesTypesBrio(
 	self: InputKeyMapList
-): _Observable.Observable<_Brio.Brio<InputModeType.InputModeType>>
+): Observable.Observable<Brio.Brio<InputModeType.InputModeType>>
 	return self._inputModeTypeToInputKeyMap:ObserveKeysBrio()
 end
 
@@ -345,7 +344,7 @@ end
 function InputKeyMapList.ObserveInputKeyMapForInputMode(
 	self: InputKeyMapList,
 	inputModeType: InputModeType.InputModeType
-): _Observable.Observable<InputKeyMap.InputKeyMap?>
+): Observable.Observable<InputKeyMap.InputKeyMap?>
 	assert(InputModeType.isInputModeType(inputModeType), "Bad inputModeType")
 
 	return self._inputModeTypeToInputKeyMap:ObserveValueForKey(inputModeType)
@@ -356,7 +355,7 @@ end
 
 	@return Observable<boolean>
 ]=]
-function InputKeyMapList.ObserveIsTapInWorld(self: InputKeyMapList): _Observable.Observable<boolean>
+function InputKeyMapList.ObserveIsTapInWorld(self: InputKeyMapList): Observable.Observable<boolean>
 	self:_ensureInit()
 
 	return self._isTapInWorld:Observe()
@@ -402,7 +401,7 @@ end
 ]=]
 function InputKeyMapList.ObserveInputEnumsList(
 	self: InputKeyMapList
-): _Observable.Observable<{ InputTypeUtils.InputType }>
+): Observable.Observable<{ InputTypeUtils.InputType }>
 	self:_ensureInit()
 
 	return self._inputTypesForBinding:ObserveKeysList()
@@ -426,7 +425,7 @@ end
 ]=]
 function InputKeyMapList.ObserveInputEnumsSet(
 	self: InputKeyMapList
-): _Observable.Observable<_Set.Set<InputTypeUtils.InputType>>
+): Observable.Observable<Set.Set<InputTypeUtils.InputType>>
 	self:_ensureInit()
 
 	return self._inputTypesForBinding:ObserveKeysSet()
@@ -479,35 +478,39 @@ function InputKeyMapList._ensureInit(self: InputKeyMapList)
 	self._isRobloxTouchButton = self._maid:Add(StateStack.new(false, "boolean"))
 
 	-- Listen
-	self._maid:GiveTask(self._inputModeTypeToInputKeyMap:ObserveValuesBrio():Subscribe(function(brio: Brio.Brio<InputKeyMap.InputKeyMap>)
-		if brio:IsDead() then
-			return
-		end
-
-		local inputKeyMapMaid = brio:ToMaid()
-		local inputKeyMap: InputKeyMap.InputKeyMap = brio:GetValue()
-
-		inputKeyMapMaid:GiveTask(inputKeyMap:ObserveInputTypesList():Subscribe(function(inputTypes)
-			local maid = Maid.new()
-
-			for _, inputType in inputTypes do
-				-- only emit enum items
-				if typeof(inputType) == "EnumItem" then
-					maid:GiveTask(countingMap:Add(inputType :: any))
-				elseif InputTypeUtils.isTapInWorld(inputType) then
-					maid:GiveTask(self._isTapInWorld:PushState(true))
-				elseif InputTypeUtils.isRobloxTouchButton(inputType) then
-					maid:GiveTask(self._isRobloxTouchButton:PushState(true))
-				elseif InputChordUtils.isModifierInputChord(inputType) then
-					maid:GiveTask(countingMap:Add((inputType :: any).keyCode))
+	self._maid:GiveTask(
+		self._inputModeTypeToInputKeyMap
+			:ObserveValuesBrio()
+			:Subscribe(function(brio: Brio.Brio<InputKeyMap.InputKeyMap>)
+				if brio:IsDead() then
+					return
 				end
-			end
 
-			inputKeyMapMaid._current = maid
-		end))
-	end))
+				local inputKeyMapMaid = brio:ToMaid()
+				local inputKeyMap: InputKeyMap.InputKeyMap = brio:GetValue()
+
+				inputKeyMapMaid:GiveTask(inputKeyMap:ObserveInputTypesList():Subscribe(function(inputTypes)
+					local maid = Maid.new()
+
+					for _, inputType in inputTypes do
+						-- only emit enum items
+						if typeof(inputType) == "EnumItem" then
+							maid:GiveTask(countingMap:Add(inputType :: any))
+						elseif InputTypeUtils.isTapInWorld(inputType) then
+							maid:GiveTask(self._isTapInWorld:PushState(true))
+						elseif InputTypeUtils.isRobloxTouchButton(inputType) then
+							maid:GiveTask(self._isRobloxTouchButton:PushState(true))
+						elseif InputChordUtils.isModifierInputChord(inputType) then
+							maid:GiveTask(countingMap:Add((inputType :: any).keyCode))
+						end
+					end
+
+					inputKeyMapMaid._current = maid
+				end))
+			end)
+	)
 
 	return self._inputTypesForBinding
 end
 
-return InputKeyMapList
+return InputKeyMapList

package/src/Shared/InputKeyMapListProvider.lua

@@ -45,26 +45,26 @@ local require = require(script.Parent.loader).load(script)
 
 local RunService = game:GetService("RunService")
 
-local Maid = require("Maid")
+local InputKeyMapList = require("InputKeyMapList")
 local InputKeyMapRegistryServiceShared = require("InputKeyMapRegistryServiceShared")
+local Maid = require("Maid")
 local ObservableList = require("ObservableList")
-local _ServiceBag = require("ServiceBag")
-local _InputKeyMapList = require("InputKeyMapList")
+local ServiceBag = require("ServiceBag")
 
 local InputKeyMapListProvider = {}
 InputKeyMapListProvider.ClassName = "InputKeyMapListProvider"
 InputKeyMapListProvider.ServiceName = "InputKeyMapListProvider"
 InputKeyMapListProvider.__index = InputKeyMapListProvider
 
-export type CreateDefaultsCallback = (self: InputKeyMapListProvider, serviceBag: _ServiceBag.ServiceBag) -> ()
+export type CreateDefaultsCallback = (self: InputKeyMapListProvider, serviceBag: ServiceBag.ServiceBag) -> ()
 export type InputKeyMapListProvider = typeof(setmetatable(
 	{} :: {
-		_serviceBag: _ServiceBag.ServiceBag,
+		_serviceBag: ServiceBag.ServiceBag,
 		_maid: Maid.Maid,
 		_providerName: string,
 		_createDefaults: CreateDefaultsCallback,
-		_inputKeyMapLists: { [string]: _InputKeyMapList.InputKeyMapList },
-		_inputMapLists: any, -- ObservableList.ObservableList<_InputKeyMapList.InputKeyMapList>,
+		_inputKeyMapLists: { [string]: InputKeyMapList.InputKeyMapList },
+		_inputMapLists: any, -- ObservableList.ObservableList<InputKeyMapList.InputKeyMapList>,
 	},
 	{} :: typeof({ __index = InputKeyMapListProvider })
 ))
@@ -91,7 +91,7 @@ function InputKeyMapListProvider.new(
 	return self
 end
 
-function InputKeyMapListProvider.Init(self: InputKeyMapListProvider, serviceBag: _ServiceBag.ServiceBag)
+function InputKeyMapListProvider.Init(self: InputKeyMapListProvider, serviceBag: ServiceBag.ServiceBag)
 	assert(not self._serviceBag, "Already initialized")
 	self._serviceBag = assert(serviceBag, "No serviceBag")
 	self._maid = Maid.new()
@@ -124,7 +124,7 @@ end
 function InputKeyMapListProvider.GetInputKeyMapList(
 	self: InputKeyMapListProvider,
 	keyMapListName: string
-): _InputKeyMapList.InputKeyMapList
+): InputKeyMapList.InputKeyMapList
 	local keyMapList = self:FindInputKeyMapList(keyMapListName)
 	if not keyMapList then
 		error(string.format("Bad keyMapListName %q", tostring(keyMapListName)))
@@ -141,7 +141,7 @@ end
 function InputKeyMapListProvider.FindInputKeyMapList(
 	self: InputKeyMapListProvider,
 	keyMapListName: string
-): _InputKeyMapList.InputKeyMapList?
+): InputKeyMapList.InputKeyMapList?
 	assert(type(keyMapListName) == "string", "Bad keyMapListName")
 
 	if RunService:IsRunning() and not self._inputKeyMapLists then
@@ -195,4 +195,4 @@ function InputKeyMapListProvider.Destroy(self: InputKeyMapListProvider)
 	self._inputKeyMapLists = {}
 end
 
-return InputKeyMapListProvider
+return InputKeyMapListProvider

package/src/Shared/InputKeyMapRegistryServiceShared.lua

@@ -12,14 +12,14 @@ local require = require(script.Parent.loader).load(script)
 
 local Maid = require("Maid")
 local ObservableList = require("ObservableList")
-local RxBrioUtils = require("RxBrioUtils")
 local Rx = require("Rx")
-local _ServiceBag = require("ServiceBag")
+local RxBrioUtils = require("RxBrioUtils")
+local ServiceBag = require("ServiceBag")
 
 local InputKeyMapRegistryServiceShared = {}
 InputKeyMapRegistryServiceShared.ServiceName = "InputKeyMapRegistryServiceShared"
 
-function InputKeyMapRegistryServiceShared:Init(serviceBag: _ServiceBag.ServiceBag)
+function InputKeyMapRegistryServiceShared:Init(serviceBag: ServiceBag.ServiceBag)
 	assert(not self._serviceBag, "Already initialized")
 	self._serviceBag = assert(serviceBag, "No serviceBag")
 	self._maid = Maid.new()
@@ -135,5 +135,4 @@ function InputKeyMapRegistryServiceShared:Destroy()
 	self._maid:DoCleaning()
 end
 
-
-return InputKeyMapRegistryServiceShared
+return InputKeyMapRegistryServiceShared

package/src/Shared/InputKeyMapTranslator.lua

@@ -5,4 +5,4 @@
 
 local require = require(script.Parent.loader).load(script)
 
-return require("JSONTranslator").new("InputKeyMapTranslator", "en", {})
+return require("JSONTranslator").new("InputKeyMapTranslator", "en", {})

package/src/Shared/ProximityPromptInputUtils.lua

@@ -7,12 +7,12 @@
 
 local require = require(script.Parent.loader).load(script)
 
-local InputKeyMapList = require("InputKeyMapList")
-local InputModeTypes = require("InputModeTypes")
 local InputKeyMap = require("InputKeyMap")
+local InputKeyMapList = require("InputKeyMapList")
 local InputModeType = require("InputModeType")
+local InputModeTypes = require("InputModeTypes")
+local InputTypeUtils = require("InputTypeUtils")
 local SlottedTouchButtonUtils = require("SlottedTouchButtonUtils")
-local _InputTypeUtils = require("InputTypeUtils")
 
 local ProximityPromptInputUtils = {}
 
@@ -67,11 +67,14 @@ end
 	@param inputModeType InputModeType
 	@return KeyCode?
 ]=]
-function ProximityPromptInputUtils.getFirstInputKeyCode(inputKeyMapList: InputKeyMapList.InputKeyMapList, inputModeType: InputModeType.InputModeType): Enum.KeyCode?
+function ProximityPromptInputUtils.getFirstInputKeyCode(
+	inputKeyMapList: InputKeyMapList.InputKeyMapList,
+	inputModeType: InputModeType.InputModeType
+): Enum.KeyCode?
 	assert(type(inputKeyMapList) == "table", "Bad inputKeyMapList")
 	assert(InputModeType.isInputModeType(inputModeType), "Bad inputModeType")
 
-	local inputTypesForInputMode: { _InputTypeUtils.InputType } = inputKeyMapList:GetInputTypesList(inputModeType)
+	local inputTypesForInputMode: { InputTypeUtils.InputType } = inputKeyMapList:GetInputTypesList(inputModeType)
 	for _, entry in inputTypesForInputMode do
 		if typeof(entry) == "EnumItem" and entry.EnumType == Enum.KeyCode then
 			return entry :: any
@@ -81,4 +84,4 @@ function ProximityPromptInputUtils.getFirstInputKeyCode(inputKeyMapList: InputKe
 	return nil
 end
 
-return ProximityPromptInputUtils
+return ProximityPromptInputUtils

package/src/Shared/Types/InputChordUtils.lua

@@ -38,10 +38,10 @@ function InputChordUtils.createModifierInputChord(modifiers, keyCode)
 	assert(EnumUtils.isOfType(Enum.KeyCode, keyCode), "Bad keyCode")
 
 	return {
-		type = "ModifierInputChord";
-		modifiers = modifiers;
-		keyCode = keyCode;
+		type = "ModifierInputChord",
+		modifiers = modifiers,
+		keyCode = keyCode,
 	}
 end
 
-return InputChordUtils
+return InputChordUtils

package/src/Shared/Types/InputTypeUtils.lua

@@ -137,4 +137,4 @@ function InputTypeUtils.areInputTypesListsEquivalent(a: { InputType }, b: { Inpu
 	return #left == 0
 end
 
-return InputTypeUtils
+return InputTypeUtils

package/src/Shared/Types/SlottedTouchButtonUtils.lua

@@ -5,10 +5,8 @@
 
 local require = require(script.Parent.loader).load(script)
 
-local _InputModeType = require("InputModeType")
-local _InputKeyMapList = require("InputKeyMapList")
-local _InputKeyMap = require("InputKeyMap")
-local _InputTypeUtils = require("InputTypeUtils")
+local InputKeyMapList = require("InputKeyMapList")
+local InputModeType = require("InputModeType")
 
 local SlottedTouchButtonUtils = {}
 
@@ -21,7 +19,7 @@ local SlottedTouchButtonUtils = {}
 ]=]
 export type SlottedTouchButtonData = {
 	slotId: string,
-	inputModeType: _InputModeType.InputModeType,
+	inputModeType: InputModeType.InputModeType,
 }
 
 --[=[
@@ -32,7 +30,7 @@ export type SlottedTouchButtonData = {
 	@param slotId string
 	@return SlottedTouchButton
 ]=]
-function SlottedTouchButtonUtils.createSlottedTouchButton(slotId: string): _InputTypeUtils.SlottedTouchButton
+function SlottedTouchButtonUtils.createSlottedTouchButton(slotId: string): any
 	assert(
 		slotId == "primary1"
 			or slotId == "primary2"
@@ -71,7 +69,7 @@ end
 ]=]
 function SlottedTouchButtonUtils.createTouchButtonData(
 	slotId: string,
-	inputModeType: _InputModeType.InputModeType
+	inputModeType: InputModeType.InputModeType
 ): SlottedTouchButtonData
 	return {
 		slotId = slotId,
@@ -85,13 +83,15 @@ end
 	@param inputKeyMapList InputKeyMapList
 	@return { SlottedTouchButtonData }
 ]=]
-function SlottedTouchButtonUtils.getSlottedTouchButtonData(inputKeyMapList: _InputKeyMapList.InputKeyMapList): { SlottedTouchButtonData }
+function SlottedTouchButtonUtils.getSlottedTouchButtonData(
+	inputKeyMapList: InputKeyMapList.InputKeyMapList
+): { SlottedTouchButtonData }
 	local slottedTouchButtons: { SlottedTouchButtonData } = {}
 
 	for _, inputKeyMap: any in inputKeyMapList:GetInputKeyMaps() do
 		for _, touchButtonData in inputKeyMap:GetInputTypesList() do
 			if SlottedTouchButtonUtils.isSlottedTouchButton(touchButtonData) then
-				local slottedButtonData: _InputTypeUtils.SlottedTouchButton = touchButtonData :: any
+				local slottedButtonData = touchButtonData :: any
 				table.insert(
 					slottedTouchButtons,
 					SlottedTouchButtonUtils.createTouchButtonData(

package/test/modules/Shared/TestInputKeyMap.lua

@@ -4,28 +4,28 @@
 ]=]
 local require = require(script.Parent.loader).load(script)
 
-local InputModeTypes = require("InputModeTypes")
 local InputKeyMap = require("InputKeyMap")
 local InputKeyMapList = require("InputKeyMapList")
 local InputKeyMapListProvider = require("InputKeyMapListProvider")
+local InputModeTypes = require("InputModeTypes")
 local SlottedTouchButtonUtils = require("SlottedTouchButtonUtils")
 
 return InputKeyMapListProvider.new(script.Name, function(self)
 	self:Add(InputKeyMapList.new("JUMP", {
-		InputKeyMap.new(InputModeTypes.KeyboardAndMouse, { Enum.KeyCode.Q });
-		InputKeyMap.new(InputModeTypes.Gamepads, { Enum.KeyCode.ButtonY });
-		InputKeyMap.new(InputModeTypes.Touch, { SlottedTouchButtonUtils.createSlottedTouchButton("primary3") });
+		InputKeyMap.new(InputModeTypes.KeyboardAndMouse, { Enum.KeyCode.Q }),
+		InputKeyMap.new(InputModeTypes.Gamepads, { Enum.KeyCode.ButtonY }),
+		InputKeyMap.new(InputModeTypes.Touch, { SlottedTouchButtonUtils.createSlottedTouchButton("primary3") }),
 	}, {
-		bindingName = "Jump";
-		rebindable = true;
+		bindingName = "Jump",
+		rebindable = true,
 	}))
 
 	self:Add(InputKeyMapList.new("HONK", {
-		InputKeyMap.new(InputModeTypes.KeyboardAndMouse, { Enum.KeyCode.H });
-		InputKeyMap.new(InputModeTypes.Gamepads, { Enum.KeyCode.ButtonL1 });
-		InputKeyMap.new(InputModeTypes.Touch, { SlottedTouchButtonUtils.createSlottedTouchButton("primary2") });
+		InputKeyMap.new(InputModeTypes.KeyboardAndMouse, { Enum.KeyCode.H }),
+		InputKeyMap.new(InputModeTypes.Gamepads, { Enum.KeyCode.ButtonL1 }),
+		InputKeyMap.new(InputModeTypes.Touch, { SlottedTouchButtonUtils.createSlottedTouchButton("primary2") }),
 	}, {
-		bindingName = "Honk";
-		rebindable = true;
+		bindingName = "Honk",
+		rebindable = true,
 	}))
-end)
+end)

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

@@ -23,5 +23,4 @@ keyMapList:ObserveInputEnumsList():Subscribe(function(...)
 	end, false, ...)
 end)
 
-
-keyMapList:SetForInputMode(InputModeTypes.Keypad, { Enum.KeyCode.Space })
+keyMapList:SetForInputMode(InputModeTypes.Keypad, { Enum.KeyCode.Space })

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

@@ -10,4 +10,3 @@ local serviceBag = require("ServiceBag").new()
 serviceBag:GetService(require("TestInputKeyMap"))
 serviceBag:Init()
 serviceBag:Start()
-