@quenty/brio 3.7.0 → 3.7.2-canary.4c04014.0

package/CHANGELOG.md

@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.7.2-canary.4c04014.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/brio@3.7.1...@quenty/brio@3.7.2-canary.4c04014.0) (2022-01-17)
+
+
+### Bug Fixes
+
+* RxBrioUtils.map correctly maps for n == 1, and RxBrioUtils.where is not a switch map. ([56e3a3a](https://github.com/Quenty/NevermoreEngine/commit/56e3a3a06334a9ca86e02cbec38710b82c61b9f2))
+
+
+
+
+
+## [3.7.1](https://github.com/Quenty/NevermoreEngine/compare/@quenty/brio@3.7.0...@quenty/brio@3.7.1) (2022-01-16)
+
+**Note:** Version bump only for package @quenty/brio
+
+
+
+
+
 # [3.7.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/brio@3.6.0...@quenty/brio@3.7.0) (2022-01-07)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/brio",
-  "version": "3.7.0",
+  "version": "3.7.2-canary.4c04014.0",
   "description": "Brios wrap an object and either are alive or dead",
   "keywords": [
     "Roblox",
@@ -26,13 +26,13 @@
     "Quenty"
   ],
   "dependencies": {
-    "@quenty/loader": "^3.3.0",
-    "@quenty/maid": "^2.0.2",
-    "@quenty/rx": "^3.7.0",
-    "@quenty/statestack": "^3.4.0"
+    "@quenty/loader": "3.3.1-canary.4c04014.0",
+    "@quenty/maid": "2.0.3-canary.4c04014.0",
+    "@quenty/rx": "3.7.2-canary.4c04014.0",
+    "@quenty/statestack": "3.4.2-canary.4c04014.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "5a3f3fb6c908fd3874f5ceacc70b404780275119"
+  "gitHead": "4c040145693283525ba3f4c793cead7abee28fb2"
 }

package/src/Shared/RxBrioUtils.lua

@@ -40,7 +40,7 @@ end
 	@return StateStack<T>
 ]=]
 function RxBrioUtils.createStateStack(observable)
-	local stateStack = StateStack.new()
+	local stateStack = StateStack.new(nil)
 
 	stateStack._maid:GiveTask(observable:Subscribe(function(value)
 		assert(Brio.isBrio(value), "Observable must emit brio")
@@ -315,30 +315,18 @@ end
 ]=]
 function RxBrioUtils.where(predicate)
 	assert(type(predicate) == "function", "Bad predicate")
-
 	return function(source)
 		return Observable.new(function(sub)
 			local maid = Maid.new()
 
 			maid:GiveTask(source:Subscribe(function(brio)
-				maid._lastBrio = nil
-
-				if Brio.isBrio(brio) then
-					if brio:IsDead() then
-						return
-					end
+				assert(Brio.isBrio(brio), "Not a brio")
+				if brio:IsDead() then
+					return
+				end
 
-					if predicate(brio:GetValue()) then
-						local newBrio = BrioUtils.clone(brio)
-						maid._lastBrio = newBrio
-						sub:Fire(newBrio)
-					end
-				else
-					if predicate(brio) then
-						local newBrio = Brio.new(brio)
-						maid._lastBrio = newBrio
-						sub:Fire(newBrio)
-					end
+				if predicate(brio:GetValue()) then
+					sub:Fire(brio)
 				end
 			end, sub:GetFailComplete()))
 
@@ -570,27 +558,18 @@ function RxBrioUtils.map(project)
 		end
 
 		local results = table.pack(project(table.unpack(args, 1, args.n)))
-		if results.n == 1 then
-			if Brio.isBrio(results[1]) then
-				table.insert(brios, results[1])
-				return BrioUtils.first(brios, results:GetValue())
+		local transformedResults = {}
+		for i=1, results.n do
+			local item = results[i]
+			if Brio.isBrio(item) then
+				table.insert(brios, item) -- add all subsequent brios into this table...
+				transformedResults[i] = item:GetValue()
 			else
-				return BrioUtils.withOtherValues(brios, results[1])
+				transformedResults[i] = item
 			end
-		else
-			local transformedResults = {}
-			for i=1, results.n do
-				local item = results[i]
-				if Brio.isBrio(item) then
-					table.insert(brios, item) -- add all subsequent brios into this table...
-					transformedResults[i] = item:GetValue()
-				else
-					transformedResults[i] = item
-				end
-			end
-
-			return BrioUtils.first(brios, table.unpack(transformedResults, 1, transformedResults.n))
 		end
+
+		return BrioUtils.first(brios, table.unpack(transformedResults, 1, transformedResults.n))
 	end)
 end
 
@@ -666,7 +645,6 @@ function RxBrioUtils.toEmitOnDeathObservable(brio, emitOnDeathValue)
 				sub:Complete()
 			else
 				sub:Fire(brio:GetValue())
-
 				return brio:GetDiedSignal():Connect(function()
 					sub:Fire(emitOnDeathValue)
 					sub:Complete()

package/src/Shared/RxBrioUtils.spec.lua

@@ -13,12 +13,14 @@ return function()
 		it("should execute immediately", function()
 			local observe = RxBrioUtils.combineLatest({})
 			local brio
-			observe:Subscribe(function(result)
+			local sub = observe:Subscribe(function(result)
 				brio = result
 			end)
 			expect(brio).to.be.ok()
 			expect(Brio.isBrio(brio)).to.equal(true)
 			expect(brio:IsDead()).to.equal(true)
+
+			sub:Destroy()
 		end)
 	end)
 
@@ -32,7 +34,7 @@ return function()
 			})
 			local brio
 
-			observe:Subscribe(function(result)
+			local sub = observe:Subscribe(function(result)
 				brio = result
 			end)
 			expect(brio).to.be.ok()
@@ -40,6 +42,8 @@ return function()
 			expect(not brio:IsDead()).to.equal(true)
 			expect(brio:GetValue()).to.be.a("table")
 			expect(brio:GetValue().value).to.equal(5)
+
+			sub:Destroy()
 		end)
 	end)
 
@@ -60,7 +64,7 @@ return function()
 		local fireCount = 0
 
 		it("should execute immediately", function()
-			observe:Subscribe(function(result)
+			local sub = observe:Subscribe(function(result)
 				lastResult = result
 				fireCount = fireCount + 1
 			end)
@@ -69,6 +73,8 @@ return function()
 			expect(Brio.isBrio(lastResult)).to.equal(false)
 			expect(lastResult.value).to.equal(5)
 			expect(lastResult.otherValue).to.equal(25)
+
+			sub:Destroy()
 		end)
 
 		it("should reset when the brio is killed", function()