@quenty/colorpalette 10.7.0 → 10.9.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.
 
+# [10.9.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/colorpalette@10.8.0...@quenty/colorpalette@10.9.0) (2024-10-04)
+
+**Note:** Version bump only for package @quenty/colorpalette
+
+
+
+
+
+# [10.8.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/colorpalette@10.7.0...@quenty/colorpalette@10.8.0) (2024-09-25)
+
+
+### Bug Fixes
+
+* Ensure backwards compatibility ([97995a8](https://github.com/Quenty/NevermoreEngine/commit/97995a812c8d1d8489104b16e7ac443fbb2effec))
+
+
+
+
+
 # [10.7.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/colorpalette@10.6.2...@quenty/colorpalette@10.7.0) (2024-09-25)
 
 **Note:** Version bump only for package @quenty/colorpalette

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/colorpalette",
-  "version": "10.7.0",
+  "version": "10.9.0",
   "description": "Color palette system for Roblox",
   "keywords": [
     "Roblox",
@@ -28,17 +28,18 @@
     "access": "public"
   },
   "dependencies": {
-    "@quenty/baseobject": "^10.5.0",
-    "@quenty/blend": "^12.6.0",
-    "@quenty/color3utils": "^11.6.0",
-    "@quenty/colorpicker": "^10.7.0",
-    "@quenty/loader": "^10.5.0",
-    "@quenty/maid": "^3.3.0",
+    "@quenty/baseobject": "^10.6.0",
+    "@quenty/blend": "^12.8.0",
+    "@quenty/color3utils": "^11.8.0",
+    "@quenty/colorpicker": "^10.9.0",
+    "@quenty/loader": "^10.6.0",
+    "@quenty/maid": "^3.4.0",
     "@quenty/math": "^2.7.0",
-    "@quenty/rx": "^13.6.0",
-    "@quenty/signal": "^7.5.0",
+    "@quenty/observablecollection": "^12.8.0",
+    "@quenty/rx": "^13.8.0",
+    "@quenty/signal": "^7.7.0",
     "@quenty/table": "^3.5.0",
-    "@quenty/valueobject": "^13.6.0"
+    "@quenty/valueobject": "^13.8.0"
   },
-  "gitHead": "41715b15e2b48b2d22ff4f5277a8d4b7a0d32ef3"
+  "gitHead": "035abfa088c854a73e1c65b350267eaa17669646"
 }

package/src/Shared/ColorPalette.lua

@@ -9,13 +9,11 @@ local ValueObject = require("ValueObject")
 local ColorSwatch = require("ColorSwatch")
 local ColorGradePalette = require("ColorGradePalette")
 local Rx = require("Rx")
-local Maid = require("Maid")
 local Blend = require("Blend")
 local Observable = require("Observable")
-local Signal = require("Signal")
-local Table = require("Table")
 local ColorGradeUtils = require("ColorGradeUtils")
 local LuvColor3Utils = require("LuvColor3Utils")
+local ObservableMap = require("ObservableMap")
 
 local ColorPalette = setmetatable({}, BaseObject)
 ColorPalette.ClassName = "ColorPalette"
@@ -25,23 +23,20 @@ function ColorPalette.new()
 	local self = setmetatable(BaseObject.new(), ColorPalette)
 
 	self._gradePalette = self._maid:Add(ColorGradePalette.new())
-	self._gradeMaid = self._maid:Add(Maid.new())
-	self._colorMaid = self._maid:Add(Maid.new())
-	self._vividMaid = self._maid:Add(Maid.new())
 
-	self._swatches = {}
+	self._swatchMap = self._maid:Add(ObservableMap.new())
+	self._colorGradeMap = self._maid:Add(ObservableMap.new())
 	self._colorValues = {}
-	self._colorGradeValues = {}
 	self._vividnessValues = {}
 
-	self.ColorSwatchAdded = self._maid:Add(Signal.new()) -- :Fire(name)
-	self.ColorGradeAdded = self._maid:Add(Signal.new()) -- :Fire(name)
+	self.ColorSwatchAdded = assert(self._swatchMap.KeyAdded, "No KeyAdded") -- :Fire(name)
+	self.ColorGradeAdded = assert(self._colorGradeMap.KeyAdded, "No KeyAdded") -- :Fire(name) -- :Fire(name)
 
 	return self
 end
 
 function ColorPalette:GetSwatchNames()
-	return Table.keys(self._swatches)
+	return self._swatchMap:GetKeyList()
 end
 
 function ColorPalette:ObserveSwatchNames()
@@ -52,8 +47,20 @@ function ColorPalette:ObserveSwatchNames()
 	})
 end
 
+function ColorPalette:ObserveSwatchNameList()
+	return self._swatchMap:ObserveKeyList()
+end
+
+function ColorPalette:ObserveSwatchNamesBrio()
+	return self._swatchMap:ObserveKeysBrio()
+end
+
 function ColorPalette:GetGradeNames()
-	return Table.keys(self._colorGradeValues)
+	return self._colorGradeMap:GetKeyList()
+end
+
+function ColorPalette:ObserveGradeNameList()
+	return self._colorGradeMap:ObserveKeyList()
 end
 
 function ColorPalette:ObserveGradeNames()
@@ -64,6 +71,10 @@ function ColorPalette:ObserveGradeNames()
 	})
 end
 
+function ColorPalette:ObserveGradeNamesBrio()
+	return self._colorGradeMap:ObserveKeysBrio()
+end
+
 function ColorPalette:GetColorValues()
 	return self._colorValues
 end
@@ -130,7 +141,7 @@ function ColorPalette:SetDefaultSurfaceName(surfaceName)
 end
 
 function ColorPalette:GetColorSwatch(colorName)
-	local swatch = self._swatches[colorName]
+	local swatch = self._swatchMap:Get(colorName)
 	if not swatch then
 		error(string.format("No swatch with name %q", colorName))
 	end
@@ -236,7 +247,7 @@ function ColorPalette:GetColorValue(colorName)
 end
 
 function ColorPalette:GetGradeValue(gradeName)
-	local gradeValue = self._colorGradeValues[gradeName]
+	local gradeValue = self._colorGradeMap:Get(gradeName)
 	if not gradeValue then
 		error(string.format("No grade with name %q", gradeName))
 	end
@@ -273,7 +284,7 @@ end
 function ColorPalette:GetSwatch(swatchName)
 	assert(type(swatchName) == "string", "Bad swatchName")
 
-	local swatch = self._swatches[swatchName]
+	local swatch = self._swatchMap:Get(swatchName)
 	if not swatch then
 		error(string.format("No swatch with name %q", swatchName))
 	end
@@ -281,6 +292,10 @@ function ColorPalette:GetSwatch(swatchName)
 	return swatch
 end
 
+--[=[
+	@param colorName string
+	@param color Observable<Color3> | Color3
+]=]
 function ColorPalette:SetColor(colorName, color)
 	assert(type(colorName) == "string", "Bad colorName")
 
@@ -288,7 +303,7 @@ function ColorPalette:SetColor(colorName, color)
 		error(string.format("No color grade with name %q", colorName))
 	end
 
-	self._colorMaid[colorName] = self._colorValues[colorName]:Mount(color)
+	return self._colorValues[colorName]:Mount(color)
 end
 
 function ColorPalette:SetVividness(gradeName, vividness)
@@ -298,18 +313,19 @@ function ColorPalette:SetVividness(gradeName, vividness)
 		error(string.format("No vividness with name %q", gradeName))
 	end
 
-	self._vividMaid[gradeName] = self._vividnessValues[gradeName]:Mount(vividness)
+	return self._vividnessValues[gradeName]:Mount(vividness)
 end
 
 function ColorPalette:SetColorGrade(gradeName, grade)
 	assert(type(gradeName) == "string", "Bad colorName")
 	assert(grade, "Bad grade")
 
-	if not self._colorGradeValues[gradeName] then
+	local gradeValue = self._colorGradeMap:Get(gradeName)
+	if not gradeValue then
 		error(string.format("No color grade with name %q", gradeName))
 	end
 
-	self._gradeMaid[gradeName] = self._colorGradeValues[gradeName]:Mount(grade)
+	return gradeValue:Mount(grade)
 end
 
 
@@ -322,26 +338,21 @@ end
 function ColorPalette:DefineColorGrade(gradeName, gradeValue, vividnessValue)
 	assert(type(gradeName) == "string", "Bad gradeName")
 
-	if self._colorGradeValues[gradeName] then
+	if self._colorGradeMap:Get(gradeName) then
 		warn(string.format("[ColorPalette.DefineColorGrade] - Already defined grade of name %q", gradeName))
 		return
 	end
 
-	local colorGrade = ValueObject.new(0, "number")
-	self._maid:GiveTask(colorGrade)
-
-	local vividness = ValueObject.new(nil)
-	self._maid:GiveTask(vividness)
+	local colorGrade = self._maid:Add(ValueObject.new(0, "number"))
+	colorGrade:Mount(gradeValue or 0)
 
-	self._gradePalette:Add(gradeName, colorGrade, vividness)
+	local vividness = self._maid:Add(ValueObject.new(nil))
+	vividness:Mount(vividnessValue)
 
-	self._colorGradeValues[gradeName] = colorGrade
 	self._vividnessValues[gradeName] = vividness
 
-	self:SetVividness(gradeName, vividnessValue)
-	self:SetColorGrade(gradeName, gradeValue or 0)
-
-	self.ColorGradeAdded:Fire(gradeName)
+	self._gradePalette:Add(gradeName, colorGrade, vividness)
+	self._colorGradeMap:Set(gradeName, colorGrade)
 
 	return colorGrade
 end
@@ -349,21 +360,17 @@ end
 function ColorPalette:DefineColorSwatch(colorName, value)
 	assert(type(colorName) == "string", "Bad colorName")
 
-	if self._swatches[colorName] then
+	if self._swatchMap:Get(colorName) then
 		warn(string.format("[ColorPalette.DefineColorGrade] -Already defined color of name %q", colorName))
 		return
 	end
 
-	local colorValue = ValueObject.new(value or Color3.new(0, 0, 0), "Color3")
-	self._maid:GiveTask(colorValue)
-
-	local colorSwatch = ColorSwatch.new(colorValue)
-	self._maid:GiveTask(colorSwatch)
+	local colorValue = self._maid:Add(ValueObject.new(value or Color3.new(0, 0, 0), "Color3"))
+	local colorSwatch = self._maid:Add(ColorSwatch.new(colorValue))
 
 	self._colorValues[colorName] = colorValue
-	self._swatches[colorName] = colorSwatch
 
-	self.ColorSwatchAdded:Fire(colorName)
+	self._swatchMap:Set(colorName, colorSwatch)
 
 	return colorSwatch
 end

package/src/Shared/Font/FontPalette.lua

@@ -7,10 +7,9 @@
 local require = require(script.Parent.loader).load(script)
 
 local BaseObject = require("BaseObject")
-local Signal = require("Signal")
-local Table = require("Table")
 local Rx = require("Rx")
 local ValueObject = require("ValueObject")
+local ObservableSet = require("ObservableSet")
 
 local FontPalette = setmetatable({}, BaseObject)
 FontPalette.ClassName = "FontPalette"
@@ -28,7 +27,9 @@ function FontPalette.new()
 	self._fontFaces = {}
 	self._defaultFontMap = {} -- [name] = Enum.Font.?
 
-	self.FontAdded = self._maid:Add(Signal.new()) -- :Fire(name)
+	self._fontKeys = self._maid:Add(ObservableSet.new())
+
+	self.FontAdded = assert(self._fontKeys.ItemAdded, "No ItemAdded") -- :Fire(name)
 
 	return self
 end
@@ -39,13 +40,12 @@ end
 	@return { string }
 ]=]
 function FontPalette:GetFontNames()
-	return Table.keys(self._fonts)
+	return self._fontKeys:GetList()
 end
 
 --[=[
 	Observes all available font names as they are added starting with
 	existing fonts.
-
 	@return Observable<string>
 ]=]
 function FontPalette:ObserveFontNames()
@@ -61,6 +61,16 @@ function FontPalette:ObserveFontNames()
 	})
 end
 
+--[=[
+	Observes all available font names as they are added starting with
+	existing fonts.
+
+	@return Observable<Brio<string>>
+]=]
+function FontPalette:ObserveFontNamesBrio()
+	return self._fontKeys:ObserveItemsBrio()
+end
+
 --[=[
 	Gets a font from name
 
@@ -181,11 +191,8 @@ function FontPalette:DefineFont(fontName, defaultFont)
 		error("Bad defaultFont")
 	end
 
-	local fontValue = ValueObject.new(defaultFontEnum)
-	self._maid:GiveTask(fontValue)
-
-	local fontFaceValue = ValueObject.new(defaultFontFace)
-	self._maid:GiveTask(fontFaceValue)
+	local fontValue = self._maid:Add(ValueObject.new(defaultFontEnum))
+	local fontFaceValue = self._maid:Add(ValueObject.new(defaultFontFace))
 
 	self._fonts[fontName] = fontValue
 	self._fontFaces[fontName] = fontFaceValue
@@ -204,7 +211,7 @@ function FontPalette:DefineFont(fontName, defaultFont)
 		end
 	end))
 
-	self.FontAdded:Fire(fontName)
+	self._fontKeys:Add(fontName)
 
 	return fontValue
 end