@quenty/statestack 3.4.0 → 3.4.2-canary.4c04014.0

package/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.4.2-canary.4c04014.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/statestack@3.4.1...@quenty/statestack@3.4.2-canary.4c04014.0) (2022-01-17)
+
+**Note:** Version bump only for package @quenty/statestack
+
+
+
+
+
+## [3.4.1](https://github.com/Quenty/NevermoreEngine/compare/@quenty/statestack@3.4.0...@quenty/statestack@3.4.1) (2022-01-16)
+
+**Note:** Version bump only for package @quenty/statestack
+
+
+
+
+
 # [3.4.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/statestack@3.3.0...@quenty/statestack@3.4.0) (2022-01-07)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/statestack",
-  "version": "3.4.0",
+  "version": "3.4.2-canary.4c04014.0",
   "description": "Stack of values that allows multiple systems to enable or disable a state",
   "keywords": [
     "Roblox",
@@ -25,12 +25,13 @@
     "Quenty"
   ],
   "dependencies": {
-    "@quenty/baseobject": "^3.4.0",
-    "@quenty/loader": "^3.3.0",
-    "@quenty/valueobject": "^3.7.0"
+    "@quenty/baseobject": "3.4.1-canary.4c04014.0",
+    "@quenty/brio": "3.7.2-canary.4c04014.0",
+    "@quenty/loader": "3.3.1-canary.4c04014.0",
+    "@quenty/valueobject": "3.7.2-canary.4c04014.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "5a3f3fb6c908fd3874f5ceacc70b404780275119"
+  "gitHead": "4c040145693283525ba3f4c793cead7abee28fb2"
 }

package/src/Shared/RxStateStackUtils.lua

@@ -0,0 +1,50 @@
+--[=[
+	@class RxStateStackUtils
+]=]
+
+local require = require(script.Parent.loader).load(script)
+
+local StateStack = require("StateStack")
+local Observable = require("Observable")
+local Maid = require("Maid")
+local Brio = require("Brio")
+
+local RxStateStackUtils = {}
+
+--[=[
+	Converts the observable of Brios into a statestack.
+	@return (source: Observable<Brio<T>>) -> Observable<T?>
+]=]
+function RxStateStackUtils.topOfStack()
+	return function(source)
+		return Observable.new(function(sub)
+			local maid = Maid.new()
+
+			local current = StateStack.new(nil)
+			maid:GiveTask(current)
+
+			maid:GiveTask(source:Subscribe(function(brio)
+				if not Brio.isBrio(brio) then
+					warn("Not a brio")
+					return
+				end
+
+				if not brio:IsDead() then
+					brio:ToMaid():GiveTask(current:PushState(brio:GetValue()))
+				end
+			end))
+
+			local function update()
+				sub:Fire(current:GetState())
+			end
+
+			maid:GiveTask(current.Changed:Connect(update))
+			update()
+
+			return maid
+		end)
+
+	end
+end
+
+return RxStateStackUtils

package/src/Shared/StateStack.lua

@@ -2,14 +2,14 @@
 	Stack of values that allows multiple systems to enable or disable a state.
 
 	```lua
-	local disabledStack = StateStack.new()
+	local disabledStack = StateStack.new(false)
 	print(disabledStack:GetState()) --> false
 
 	disabledStack.Changed:Connect(function()
 		print("From changed event we have state: ", disabledStack:GetState())
 	end)
 
-	local cancel = disabledStack:PushState() --> From changed event we have state: true
+	local cancel = disabledStack:PushState(true) --> From changed event we have state: true
 	print(disabledStack:GetState()) --> true
 
 	cancel()  --> From changed event we have state: true
@@ -32,12 +32,14 @@ StateStack.__index = StateStack
 
 --[=[
 	Constructs a new StateStack.
+	@param defaultValue any -- The default value to use for the statestack.
 	@return StateStack
 ]=]
-function StateStack.new()
+function StateStack.new(defaultValue)
 	local self = setmetatable(BaseObject.new(), StateStack)
 
-	self._state = ValueObject.new(false)
+	self._defaultValue = defaultValue
+	self._state = ValueObject.new(defaultValue)
 	self._maid:GiveTask(self._state)
 
 	self._stateStack = {}
@@ -52,6 +54,14 @@ function StateStack.new()
 	return self
 end
 
+--[=[
+	Gets the count of the stack
+	@return number
+]=]
+function StateStack:GetCount()
+	return #self._stateStack
+end
+
 --[=[
 	Gets the current state
 	@return T?
@@ -74,13 +84,8 @@ end
 	@return function -- Cleanup function to invoke
 ]=]
 function StateStack:PushState(state)
-	if state == nil then
-		state = true
-	end
-
 	local data = { state }
 	table.insert(self._stateStack, data)
-
 	self:_updateState()
 
 	return function()
@@ -101,15 +106,11 @@ function StateStack:_popState(data)
 end
 
 function StateStack:_updateState()
-	local _, data = next(self._stateStack)
-	if data == nil then
-		if type(self._state.Value) == "boolean" then
-			self._state.Value = false
-		else
-			self._state.Value = nil
-		end
+	local dataContainer = self._stateStack[#self._stateStack]
+	if dataContainer == nil then
+		self._state.Value = self._defaultValue
 	else
-		self._state.Value = data[1]
+		self._state.Value = dataContainer[1]
 	end
 end