@quenty/scoredactionservice 7.3.1 → 8.0.0

package/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [8.0.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/scoredactionservice@7.3.1...@quenty/scoredactionservice@8.0.0) (2022-08-14)
+
+**Note:** Version bump only for package @quenty/scoredactionservice
+
+
+
+
+
 ## [7.3.1](https://github.com/Quenty/NevermoreEngine/compare/@quenty/scoredactionservice@7.3.0...@quenty/scoredactionservice@7.3.1) (2022-08-11)
 
 **Note:** Version bump only for package @quenty/scoredactionservice

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/scoredactionservice",
-  "version": "7.3.1",
+  "version": "8.0.0",
   "description": "Scores actions and picks the highest rated one every frame",
   "keywords": [
     "Roblox",
@@ -27,19 +27,19 @@
   ],
   "dependencies": {
     "@quenty/baseobject": "^5.1.0",
-    "@quenty/brio": "^6.2.0",
-    "@quenty/inputkeymaputils": "^5.3.1",
-    "@quenty/inputmode": "^5.2.0",
+    "@quenty/brio": "^7.0.0",
+    "@quenty/inputkeymaputils": "^6.0.0",
+    "@quenty/inputmode": "^6.0.0",
     "@quenty/loader": "^5.0.0",
     "@quenty/maid": "^2.4.0",
-    "@quenty/rx": "^5.2.0",
+    "@quenty/rx": "^6.0.0",
     "@quenty/signal": "^2.2.0",
-    "@quenty/statestack": "^6.2.0",
+    "@quenty/statestack": "^7.0.0",
     "@quenty/table": "^3.1.0",
-    "@quenty/valueobject": "^5.2.0"
+    "@quenty/valueobject": "^6.0.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "45ffe88b893e29690163a42c3830c983f6098a59"
+  "gitHead": "dbb62609f980983cc32da90acfef13e30ed41113"
 }

package/src/Client/InputList/InputListScoreHelper.lua

@@ -7,16 +7,18 @@ local require = require(script.Parent.loader).load(script)
 
 local BaseObject = require("BaseObject")
 local InputKeyMapList = require("InputKeyMapList")
-local Set = require("Set")
+local InputKeyMapListUtils = require("InputKeyMapListUtils")
 local Rx = require("Rx")
+local Set = require("Set")
 
 local InputListScoreHelper = setmetatable({}, BaseObject)
 InputListScoreHelper.ClassName = "InputListScoreHelper"
 InputListScoreHelper.__index = InputListScoreHelper
 
-function InputListScoreHelper.new(provider, scoredAction, inputKeyMapList)
+function InputListScoreHelper.new(serviceBag, provider, scoredAction, inputKeyMapList)
 	local self = setmetatable(BaseObject.new(), InputListScoreHelper)
 
+	self._serviceBag = assert(serviceBag, "No serviceBag")
 	self._provider = assert(provider, "No provider")
 	self._scoredAction = assert(scoredAction, "No scoredAction")
 	self._inputKeyMapList = assert(inputKeyMapList, "No inputKeyMapList")
@@ -25,7 +27,7 @@ function InputListScoreHelper.new(provider, scoredAction, inputKeyMapList)
 
 	self._currentTypes = {}
 
-	self._maid:GiveTask(self._inputKeyMapList:ObserveActiveInputKeyMap():Pipe({
+	self._maid:GiveTask(InputKeyMapListUtils.observeActiveInputKeyMap(self._inputKeyMapList, self._serviceBag):Pipe({
 		Rx.switchMap(function(activeInputKeyMap)
 			if activeInputKeyMap then
 				return activeInputKeyMap:ObserveInputTypesList()

package/src/Client/ScoredAction.lua

@@ -1,5 +1,5 @@
 --[=[
-	An action that has a score, and may recieve priority from [ScoredActionService]
+	An action that has a score, and may recieve priority from [ScoredActionServiceClient]
 
 	@client
 	@class ScoredAction
@@ -16,7 +16,7 @@ ScoredAction.ClassName = "ScoredAction"
 ScoredAction.__index = ScoredAction
 
 --[=[
-	Constructs a new ScoredAction. Should not be called directly. See [ScoredActionService.GetScoredAction].
+	Constructs a new ScoredAction. Should not be called directly. See [ScoredActionServiceClient.GetScoredAction].
 
 	@return ScoredAction
 ]=]

package/src/Client/{ScoredActionService.lua → ScoredActionServiceClient.lua}

@@ -2,7 +2,7 @@
 	Scores actions and picks the highest rated one every frame.
 
 	@client
-	@class ScoredActionService
+	@class ScoredActionServiceClient
 ]=]
 
 local require = require(script.Parent.loader).load(script)
@@ -16,16 +16,23 @@ local InputListScoreHelper = require("InputListScoreHelper")
 local Observable = require("Observable")
 local InputKeyMapList = require("InputKeyMapList")
 
-local ScoredActionService = {}
+local ScoredActionServiceClient = {}
+ScoredActionServiceClient.ServiceName = "ScoredActionServiceClient"
 
 --[=[
-	Initializes the ScoredActionService. Should be done via [ServiceBag].
-	@param _serviceBag ServiceBag
+	Initializes the ScoredActionServiceClient. Should be done via [ServiceBag].
+	@param serviceBag ServiceBag
 ]=]
-function ScoredActionService:Init(_serviceBag)
+function ScoredActionServiceClient:Init(serviceBag)
 	assert(not self._provider, "Already initialize")
 
 	self._maid = Maid.new()
+	self._serviceBag = assert(serviceBag, "No serviceBag")
+
+	-- External
+	self._serviceBag:GetService(require("InputModeServiceClient"))
+	self._serviceBag:GetService(require("InputKeyMapServiceClient"))
+
 	self._provider = ScoredActionPickerProvider.new()
 	self._maid:GiveTask(self._provider)
 end
@@ -33,7 +40,7 @@ end
 --[=[
 	Starts the scored action service. Should be done via [ServiceBag].
 ]=]
-function ScoredActionService:Start()
+function ScoredActionServiceClient:Start()
 	self._maid:GiveTask(RunService.Stepped:Connect(function()
 		-- TODO: Push to end of frame so we don't delay input by a frame?
 		self._provider:Update()
@@ -46,7 +53,7 @@ end
 	@param inputKeyMapList InputKeyMapList
 	@return ScoredAction
 ]=]
-function ScoredActionService:GetScoredAction(inputKeyMapList)
+function ScoredActionServiceClient:GetScoredAction(inputKeyMapList)
 	assert(InputKeyMapList.isInputKeyMapList(inputKeyMapList), "Bad inputKeyMapList")
 	assert(self._provider, "Not initialized")
 
@@ -55,7 +62,7 @@ function ScoredActionService:GetScoredAction(inputKeyMapList)
 	local maid = Maid.new()
 	maid:GiveTask(scoredAction)
 
-	maid:GiveTask(InputListScoreHelper.new(self._provider, scoredAction, inputKeyMapList))
+	maid:GiveTask(InputListScoreHelper.new(self._serviceBag, self._provider, scoredAction, inputKeyMapList))
 
 	-- Couple cleanup to the scored action
 	maid:GiveTask(scoredAction.Removing:Connect(function()
@@ -75,7 +82,7 @@ end
 	@param scoreValue NumberValue
 	@return (source: Observable<InputKeyMapList>) -> Observable<ScoredAction>
 ]=]
-function ScoredActionService:ObserveNewFromInputKeyMapList(scoreValue)
+function ScoredActionServiceClient:ObserveNewFromInputKeyMapList(scoreValue)
 	assert(self._provider, "Not initialized")
 	assert(typeof(scoreValue) == "Instance" and scoreValue:IsA("NumberValue"), "Bad scoreValue")
 
@@ -113,4 +120,4 @@ function ScoredActionService:ObserveNewFromInputKeyMapList(scoreValue)
 	end
 end
 
-return ScoredActionService
+return ScoredActionServiceClient

package/src/Server/ScoredActionService.lua

@@ -0,0 +1,18 @@
+--[=[
+	@class ScoredActionService
+]=]
+
+local require = require(script.Parent.loader).load(script)
+
+local ScoredActionService = {}
+ScoredActionService.ServiceName = "ScoredActionService"
+
+function ScoredActionService:Init(serviceBag)
+	assert(not self._serviceBag, "Already initialized")
+	self._serviceBag = assert(serviceBag, "No serviceBag")
+
+	-- External
+	self._serviceBag:GetService(require("InputKeyMapService"))
+end
+
+return ScoredActionService