@quenty/colorpalette 10.21.3 → 10.21.4-canary.559.339cfa7.0

package/src/Shared/ColorPalette.story.lua

@@ -2,12 +2,13 @@
 	@class ColorPalette.story
 ]]
 
-local require = require(game:GetService("ServerScriptService"):FindFirstChild("LoaderUtils", true).Parent).bootstrapStory(script)
+local require =
+	require(game:GetService("ServerScriptService"):FindFirstChild("LoaderUtils", true).Parent).bootstrapStory(script)
 
-local Maid = require("Maid")
 local Blend = require("Blend")
-local ColorPickerStoryUtils = require("ColorPickerStoryUtils")
 local ColorPalette = require("ColorPalette")
+local ColorPickerStoryUtils = require("ColorPickerStoryUtils")
+local Maid = require("Maid")
 local ValueObject = require("ValueObject")
 
 local DARK_MODE_ENABLED = true
@@ -70,174 +71,182 @@ return function(target)
 		local percentMouseOver = Blend.Spring(mouseOver, 60)
 
 		return Blend.New "Frame" {
-			BackgroundColor3 = palette:ObserveColor("surface");
-			Size = UDim2.new(0, 250, 0, 100);
+			BackgroundColor3 = palette:ObserveColor("surface"),
+			Size = UDim2.new(0, 250, 0, 100),
 
 			[Blend.Children] = {
 				Blend.New "TextLabel" {
-					TextColor3 = palette:ObserveColor("text");
-					Text = labelText;
-					Font = Enum.Font.FredokaOne;
-					Size = UDim2.new(1, 0, 1, 0);
-					BackgroundTransparency = 1;
-					TextScaled = true;
-					ZIndex = 2;
-				};
+					TextColor3 = palette:ObserveColor("text"),
+					Text = labelText,
+					Font = Enum.Font.FredokaOne,
+					Size = UDim2.new(1, 0, 1, 0),
+					BackgroundTransparency = 1,
+					TextScaled = true,
+					ZIndex = 2,
+				},
 
 				Blend.New "UIPadding" {
-					PaddingTop = UDim.new(0, 10);
-					PaddingBottom = UDim.new(0, 10);
-					PaddingLeft = UDim.new(0, 10);
-					PaddingRight = UDim.new(0, 10);
-				};
+					PaddingTop = UDim.new(0, 10),
+					PaddingBottom = UDim.new(0, 10),
+					PaddingLeft = UDim.new(0, 10),
+					PaddingRight = UDim.new(0, 10),
+				},
 
 				Blend.New "UIStroke" {
-					Color = palette:ObserveColor("surface", "border");
-					Thickness = 5;
-				};
+					Color = palette:ObserveColor("surface", "border"),
+					Thickness = 5,
+				},
 
 				Blend.New "UICorner" {
-					CornerRadius = UDim.new(0, 10);
-				};
+					CornerRadius = UDim.new(0, 10),
+				},
 
 				Blend.New "Frame" {
-					Name = "Highlight";
-					Size = UDim2.new(0.8, 0, 0, 20);
-					Position = UDim2.fromScale(0.5, 0.75);
-					AnchorPoint = Vector2.new(0.5, 0.5);
-					BackgroundColor3 = palette:ObserveColor("accent", "highlight");
+					Name = "Highlight",
+					Size = UDim2.new(0.8, 0, 0, 20),
+					Position = UDim2.fromScale(0.5, 0.75),
+					AnchorPoint = Vector2.new(0.5, 0.5),
+					BackgroundColor3 = palette:ObserveColor("accent", "highlight"),
 					[Blend.Children] = {
 						Blend.New "UICorner" {
-							CornerRadius = UDim.new(0, 10);
-						};
-					};
-				};
+							CornerRadius = UDim.new(0, 10),
+						},
+					},
+				},
 
 				Blend.New "Frame" {
-					Name ="Button";
-					Size = UDim2.new(0.5, 0, 0, 40);
-					AnchorPoint = Vector2.new(1, 1);
+					Name = "Button",
+					Size = UDim2.new(0.5, 0, 0, 40),
+					AnchorPoint = Vector2.new(1, 1),
 					BackgroundColor3 = palette:GetSwatch("action"):ObserveGraded(
-						palette:ObserveModifiedGrade("action", "mouseOver", percentMouseOver));
-					Position = UDim2.new(1, 30, 1, 40);
-					ZIndex = 2;
+						palette:ObserveModifiedGrade("action", "mouseOver", percentMouseOver)
+					),
+					Position = UDim2.new(1, 30, 1, 40),
+					ZIndex = 2,
 
 					[Blend.OnEvent "MouseEnter"] = function()
 						mouseOver.Value = 1
-					end;
+					end,
 
 					[Blend.OnEvent "MouseLeave"] = function()
 						mouseOver.Value = 0
-					end;
+					end,
 
 					[Blend.Children] = {
 						Blend.New "UICorner" {
-							CornerRadius = UDim.new(0, 10);
-						};
+							CornerRadius = UDim.new(0, 10),
+						},
 
 						Blend.New "TextLabel" {
-							TextColor3 = palette:ObserveColor("action", palette:ObserveModifiedGrade(
-								palette:ObserveGradeOn("text", "action"),
-								"mouseOver",
-								percentMouseOver));
-							Text = "Action";
-							TextScaled = true;
-							Font = Enum.Font.FredokaOne;
-							Size = UDim2.new(1, 0, 1, 0);
-							BackgroundTransparency = 1;
-							ZIndex = 2;
-						};
+							TextColor3 = palette:ObserveColor(
+								"action",
+								palette:ObserveModifiedGrade(
+									palette:ObserveGradeOn("text", "action"),
+									"mouseOver",
+									percentMouseOver
+								)
+							),
+							Text = "Action",
+							TextScaled = true,
+							Font = Enum.Font.FredokaOne,
+							Size = UDim2.new(1, 0, 1, 0),
+							BackgroundTransparency = 1,
+							ZIndex = 2,
+						},
 
 						[Blend.Children] = {
 							Blend.New "UIStroke" {
-								Color = palette:ObserveColor("action", palette:ObserveModifiedGrade(
-									palette:ObserveGradeOn("border", "action"),
-									"mouseOver",
-									percentMouseOver));
-								Thickness = 5;
-							};
-						};
+								Color = palette:ObserveColor(
+									"action",
+									palette:ObserveModifiedGrade(
+										palette:ObserveGradeOn("border", "action"),
+										"mouseOver",
+										percentMouseOver
+									)
+								),
+								Thickness = 5,
+							},
+						},
 
 						Blend.New "Frame" {
-							Name = "Highlight";
-							Size = UDim2.new(0.9, 0, 0, 10);
-							Position = UDim2.fromScale(0.5, 0.75);
-							AnchorPoint = Vector2.new(0.5, 0.5);
-							BackgroundColor3 = palette:ObserveColor("accent", palette:ObserveGradeOn("highlight", "action"));
+							Name = "Highlight",
+							Size = UDim2.new(0.9, 0, 0, 10),
+							Position = UDim2.fromScale(0.5, 0.75),
+							AnchorPoint = Vector2.new(0.5, 0.5),
+							BackgroundColor3 = palette:ObserveColor(
+								"accent",
+								palette:ObserveGradeOn("highlight", "action")
+							),
 							[Blend.Children] = {
 								Blend.New "UICorner" {
-									CornerRadius = UDim.new(0, 10);
-								};
-							};
-						};
-
+									CornerRadius = UDim.new(0, 10),
+								},
+							},
+						},
 
 						Blend.New "UIPadding" {
-							PaddingTop = UDim.new(0, 5);
-							PaddingBottom = UDim.new(0, 5);
-							PaddingLeft = UDim.new(0, 5);
-							PaddingRight = UDim.new(0, 5);
-						};
-					};
-				};
-			};
-		};
+							PaddingTop = UDim.new(0, 5),
+							PaddingBottom = UDim.new(0, 5),
+							PaddingLeft = UDim.new(0, 5),
+							PaddingRight = UDim.new(0, 5),
+						},
+					},
+				},
+			},
+		}
 	end
 
-
 	maid:GiveTask((Blend.New "ScrollingFrame" {
-		Size = UDim2.new(1, 0, 1, 0);
-		BackgroundColor3 = Color3.new(0, 0, 0);
-		AutomaticCanvasSize = Enum.AutomaticSize.Y;
-		CanvasSize = UDim2.new(1, 0, 0, 0);
-		Parent = target;
+		Size = UDim2.new(1, 0, 1, 0),
+		BackgroundColor3 = Color3.new(0, 0, 0),
+		AutomaticCanvasSize = Enum.AutomaticSize.Y,
+		CanvasSize = UDim2.new(1, 0, 0, 0),
+		Parent = target,
 		[Blend.Children] = {
 			ColorPickerStoryUtils.create(maid, function(createPicker)
-				createPicker("Surface", palette:GetColorValue("surface"));
-				createPicker("Text", palette:GetColorValue("text"));
-				createPicker("Accent", palette:GetColorValue("accent"));
-				createPicker("Action", palette:GetColorValue("action"));
-			end);
+				createPicker("Surface", palette:GetColorValue("surface"))
+				createPicker("Text", palette:GetColorValue("text"))
+				createPicker("Accent", palette:GetColorValue("accent"))
+				createPicker("Action", palette:GetColorValue("action"))
+			end),
 
 			Blend.New "Frame" {
-				Size = UDim2.new(1, 0, 0, 0);
-				BackgroundTransparency = 1;
-				AutomaticSize = Enum.AutomaticSize.Y;
+				Size = UDim2.new(1, 0, 0, 0),
+				BackgroundTransparency = 1,
+				AutomaticSize = Enum.AutomaticSize.Y,
 
 				[Blend.Children] = {
-					sampleGui("Light");
+					sampleGui("Light"),
 
 					Blend.New "UIListLayout" {
-						Padding = UDim.new(0, 50);
-						HorizontalAlignment = Enum.HorizontalAlignment.Center;
-						VerticalAlignment = Enum.VerticalAlignment.Top;
-						FillDirection = Enum.FillDirection.Vertical;
-					};
-				};
-			};
-
+						Padding = UDim.new(0, 50),
+						HorizontalAlignment = Enum.HorizontalAlignment.Center,
+						VerticalAlignment = Enum.VerticalAlignment.Top,
+						FillDirection = Enum.FillDirection.Vertical,
+					},
+				},
+			},
 
 			Blend.New "UIListLayout" {
-				Padding = UDim.new(0, 20);
-				HorizontalAlignment = Enum.HorizontalAlignment.Center;
-				VerticalAlignment = Enum.VerticalAlignment.Top;
-				FillDirection = Enum.FillDirection.Vertical;
-			};
+				Padding = UDim.new(0, 20),
+				HorizontalAlignment = Enum.HorizontalAlignment.Center,
+				VerticalAlignment = Enum.VerticalAlignment.Top,
+				FillDirection = Enum.FillDirection.Vertical,
+			},
 
 			Blend.New "UIPadding" {
-				PaddingTop = UDim.new(0, 10);
-			};
+				PaddingTop = UDim.new(0, 10),
+			},
 
 			Blend.New "Frame" {
-				Name = "TestCustomColor";
-				Size = UDim2.new(0, 30, 0, 30);
-				BackgroundColor3 = palette:ObserveColor(Color3.new(0, 0, 1), "text");
-			};
-		}
+				Name = "TestCustomColor",
+				Size = UDim2.new(0, 30, 0, 30),
+				BackgroundColor3 = palette:ObserveColor(Color3.new(0, 0, 1), "text"),
+			},
+		},
 	}):Subscribe())
 
-
 	return function()
 		maid:DoCleaning()
 	end
-end
+end

package/src/Shared/Font/FontPalette.lua

@@ -1,3 +1,4 @@
+--!strict
 --[=[
 	Holds fonts for reuse by giving fonts a semantic name. This makes theming easier in general.
 
@@ -7,22 +8,34 @@
 local require = require(script.Parent.loader).load(script)
 
 local BaseObject = require("BaseObject")
+local Observable = require("Observable")
+local ObservableSet = require("ObservableSet")
 local Rx = require("Rx")
+local Signal = require("Signal")
 local ValueObject = require("ValueObject")
-local ObservableSet = require("ObservableSet")
-local _Observable = require("Observable")
 
 local FontPalette = setmetatable({}, BaseObject)
 FontPalette.ClassName = "FontPalette"
 FontPalette.__index = FontPalette
 
+export type FontPalette = typeof(setmetatable(
+	{} :: {
+		FontAdded: Signal.Signal<string>,
+		_fontKeys: ObservableSet.ObservableSet<string>,
+		_fonts: { [string]: ValueObject.ValueObject<Enum.Font> },
+		_fontFaces: { [string]: ValueObject.ValueObject<Font> },
+		_defaultFontMap: { [string]: Enum.Font | Font },
+	},
+	{} :: typeof({ __index = FontPalette })
+)) & BaseObject.BaseObject
+
 --[=[
 	Constructs a new font palette.
 
 	@return FontPallete
 ]=]
-function FontPalette.new()
-	local self = setmetatable(BaseObject.new(), FontPalette)
+function FontPalette.new(): FontPalette
+	local self: FontPalette = setmetatable(BaseObject.new() :: any, FontPalette)
 
 	self._fonts = {}
 	self._fontFaces = {}
@@ -40,7 +53,7 @@ end
 
 	@return { string }
 ]=]
-function FontPalette:GetFontNames(): { string }
+function FontPalette.GetFontNames(self: FontPalette): { string }
 	return self._fontKeys:GetList()
 end
 
@@ -49,8 +62,8 @@ end
 	existing fonts.
 	@return Observable<string>
 ]=]
-function FontPalette:ObserveFontNames()
-	return Rx.fromSignal(self.FontAdded):Pipe({
+function FontPalette.ObserveFontNames(self: FontPalette): Observable.Observable<string>
+	return Rx.fromSignal(self.FontAdded :: any):Pipe({
 		Rx.startFrom(function()
 			if self.Destroy then
 				return self:GetFontNames()
@@ -58,8 +71,8 @@ function FontPalette:ObserveFontNames()
 				warn("[FontPalette.ObserveFontNames] - Calling when FontPalette is already dead")
 				return {}
 			end
-		end),
-	})
+		end) :: any,
+	}) :: any
 end
 
 --[=[
@@ -68,7 +81,7 @@ end
 
 	@return Observable<Brio<string>>
 ]=]
-function FontPalette:ObserveFontNamesBrio()
+function FontPalette.ObserveFontNamesBrio(self: FontPalette)
 	return self._fontKeys:ObserveItemsBrio()
 end
 
@@ -78,7 +91,7 @@ end
 	@param fontName string
 	@return Enum.Font
 ]=]
-function FontPalette:GetFont(fontName: string): Enum.Font
+function FontPalette.GetFont(self: FontPalette, fontName: string): Enum.Font
 	assert(type(fontName) == "string", "Bad fontName")
 
 	return self:GetFontValue(fontName).Value
@@ -90,7 +103,7 @@ end
 	@param fontName string
 	@return Observe<Enum.Font>
 ]=]
-function FontPalette:ObserveFont(fontName: string): _Observable.Observable<Enum.Font>
+function FontPalette.ObserveFont(self: FontPalette, fontName: string): Observable.Observable<Enum.Font>
 	assert(type(fontName) == "string", "Bad fontName")
 
 	return self:GetFontValue(fontName):Observe()
@@ -104,10 +117,11 @@ end
 	@param style (FontStyle | Observable<FontStyle>)?
 	@return Observable<Font>
 ]=]
-function FontPalette:ObserveFontFace(
+function FontPalette.ObserveFontFace(
+	self: FontPalette,
 	fontName: string,
-	weight: (Enum.FontWeight | _Observable.Observable<Enum.FontWeight>)?,
-	style: (Enum.FontStyle | _Observable.Observable<Enum.FontWeight>)?
+	weight: (Enum.FontWeight | Observable.Observable<Enum.FontWeight>)?,
+	style: (Enum.FontStyle | Observable.Observable<Enum.FontWeight>)?
 )
 	assert(type(fontName) == "string", "Bad fontName")
 
@@ -122,7 +136,7 @@ function FontPalette:ObserveFontFace(
 	}):Pipe({
 		Rx.map(function(state)
 			return Font.new(state.font.Family, state.weight or state.font.Weight, state.style or state.font.Style)
-		end),
+		end) :: any,
 	})
 end
 
@@ -132,7 +146,7 @@ end
 	@param fontName string
 	@return ValueObject<Font>
 ]=]
-function FontPalette:GetFontFaceValue(fontName: string): Font
+function FontPalette.GetFontFaceValue(self: FontPalette, fontName: string): ValueObject.ValueObject<Font>
 	assert(type(fontName) == "string", "Bad fontName")
 
 	local fontValue = self._fontFaces[fontName]
@@ -149,7 +163,7 @@ end
 	@param fontName string
 	@return ValueObject<Font>
 ]=]
-function FontPalette:GetFontValue(fontName: string): ValueObject.ValueObject<Enum.Font>
+function FontPalette.GetFontValue(self: FontPalette, fontName: string): ValueObject.ValueObject<Enum.Font>
 	assert(type(fontName) == "string", "Bad fontName")
 
 	local fontValue = self._fonts[fontName]
@@ -162,9 +176,9 @@ end
 
 --[=[
 	Gets the default font map
-	@return { string: Font }
+	@return { string: Font | Enum.Font }
 ]=]
-function FontPalette:GetDefaultFontMap(): { string: Font }
+function FontPalette.GetDefaultFontMap(self: FontPalette): { [string]: Font | Enum.Font }
 	return self._defaultFontMap
 end
 
@@ -173,9 +187,13 @@ end
 
 	@param fontName string
 	@param defaultFont Enum.Font | Font
-	@return ValueObject<Enum.Font | Font>
+	@return ValueObject<Enum.Font>
 ]=]
-function FontPalette:DefineFont(fontName: string, defaultFont: Enum.Font | Font): ValueObject.ValueObject<Enum.Font | Font>?
+function FontPalette.DefineFont(
+	self: FontPalette,
+	fontName: string,
+	defaultFont: Enum.Font | Font
+): ValueObject.ValueObject<Enum.Font>?
 	assert(type(fontName) == "string", "Bad fontName")
 	assert(typeof(defaultFont) == "EnumItem" or typeof(defaultFont) == "Font", "Bad defaultFont")
 
@@ -184,19 +202,20 @@ function FontPalette:DefineFont(fontName: string, defaultFont: Enum.Font | Font)
 		return nil
 	end
 
-	local defaultFontEnum
-	local defaultFontFace
+	local defaultFontEnum: any -- : Enum.Font
+	local defaultFontFace: Font
 	if typeof(defaultFont) == "EnumItem" then
 		defaultFontEnum = defaultFont
 		defaultFontFace = Font.fromEnum(defaultFont)
 	elseif typeof(defaultFont) == "Font" then
+		-- TODO: Fix this
 		defaultFontEnum = defaultFont
 		defaultFontFace = defaultFont
 	else
 		error("Bad defaultFont")
 	end
 
-	local fontValue = self._maid:Add(ValueObject.new(defaultFontEnum))
+	local fontValue: ValueObject.ValueObject<Enum.Font> = self._maid:Add(ValueObject.new(defaultFontEnum))
 	local fontFaceValue = self._maid:Add(ValueObject.new(defaultFontFace))
 
 	self._fonts[fontName] = fontValue
@@ -221,12 +240,12 @@ function FontPalette:DefineFont(fontName: string, defaultFont: Enum.Font | Font)
 	return fontValue
 end
 
-function FontPalette:_tryToGetFontFace(fontFace: Font)
+function FontPalette._tryToGetFontFace(_self: FontPalette, fontFace: Font)
 	local assetName = string.gmatch(fontFace.Family, "rbxasset://fonts/families/([%w]+).json$")()
 
 	local fontEnum
 	pcall(function()
-		fontEnum = Enum.Font[assetName]
+		fontEnum = (Enum.Font :: any)[assetName]
 	end)
 
 	if fontEnum then
@@ -236,4 +255,4 @@ function FontPalette:_tryToGetFontFace(fontFace: Font)
 	end
 end
 
-return FontPalette
+return FontPalette

package/src/Shared/Grade/ColorGradePalette.lua

@@ -5,18 +5,27 @@
 local require = require(script.Parent.loader).load(script)
 
 local BaseObject = require("BaseObject")
-local Rx = require("Rx")
 local Blend = require("Blend")
+local ColorGradeUtils = require("ColorGradeUtils")
 local Observable = require("Observable")
+local Rx = require("Rx")
 local ValueObject = require("ValueObject")
-local ColorGradeUtils = require("ColorGradeUtils")
 
 local ColorGradePalette = setmetatable({}, BaseObject)
 ColorGradePalette.ClassName = "ColorGradePalette"
 ColorGradePalette.__index = ColorGradePalette
 
-function ColorGradePalette.new()
-	local self = setmetatable(BaseObject.new(), ColorGradePalette)
+export type ColorGradePalette = typeof(setmetatable(
+	{} :: {
+		_grades: { [string]: Observable.Observable<number> },
+		_vividness: { [string]: Observable.Observable<number> },
+		_defaultSurfaceName: ValueObject.ValueObject<string>,
+	},
+	{} :: typeof({ __index = ColorGradePalette })
+)) & BaseObject.BaseObject
+
+function ColorGradePalette.new(): ColorGradePalette
+	local self: ColorGradePalette = setmetatable(BaseObject.new() :: any, ColorGradePalette)
 
 	self._grades = {}
 	self._vividness = {}
@@ -33,7 +42,7 @@ function ColorGradePalette:SetDefaultSurfaceName(gradeName: string)
 	self._defaultSurfaceName.Value = gradeName
 end
 
-function ColorGradePalette:HasGrade(gradeName)
+function ColorGradePalette:HasGrade(gradeName: string): boolean
 	if self._grades[gradeName] then
 		return true
 	else
@@ -87,7 +96,7 @@ function ColorGradePalette:GetVividness(gradeName: string)
 	return vividness
 end
 
-function ColorGradePalette:Add(gradeName, colorGrade, vividness)
+function ColorGradePalette:Add(gradeName: string, colorGrade, vividness)
 	assert(type(gradeName) == "string", "Bad gradeName")
 
 	self._grades[gradeName] = Blend.toPropertyObservable(colorGrade) or Rx.of(colorGrade)
@@ -107,18 +116,17 @@ end
 
 function ColorGradePalette:ObserveModified(gradeName, amount, multiplier)
 	return Rx.combineLatest({
-		grade = self:_observeGradeFromName(gradeName);
-		amount = self:_observeGradeFromName(amount);
-		multiplier = multiplier or 1;
+		grade = self:_observeGradeFromName(gradeName),
+		amount = self:_observeGradeFromName(amount),
+		multiplier = multiplier or 1,
 	}):Pipe({
 		Rx.map(function(state)
 			assert(type(state.grade) == "number", "Bad state.grade")
 			assert(type(state.amount) == "number", "Bad state.amount")
 			assert(type(state.multiplier) == "number", "Bad state.multiplier")
 
-
-			return state.grade + state.multiplier*state.amount
-		end);
+			return state.grade + state.multiplier * state.amount
+		end),
 	})
 end
 
@@ -132,9 +140,9 @@ function ColorGradePalette:ObserveOn(gradeName, newSurfaceName, baseSurfaceName)
 	end
 
 	return Rx.combineLatest({
-		grade = self:_observeGradeFromName(gradeName);
-		newSurfaceGrade = self:_observeGradeFromName(newSurfaceName);
-		baseSurfaceGrade = observeBaseSurfaceGrade;
+		grade = self:_observeGradeFromName(gradeName),
+		newSurfaceGrade = self:_observeGradeFromName(newSurfaceName),
+		baseSurfaceGrade = observeBaseSurfaceGrade,
 	}):Pipe({
 		Rx.map(function(state)
 			local difference = state.grade - state.baseSurfaceGrade
@@ -153,8 +161,9 @@ function ColorGradePalette:ObserveOn(gradeName, newSurfaceName, baseSurfaceName)
 			end
 
 			return finalGrade
-		end)
-	}), self._vividness[gradeName]
+		end),
+	}),
+		self._vividness[gradeName]
 end
 
 function ColorGradePalette:_observeGradeFromName(gradeName)
@@ -172,7 +181,7 @@ function ColorGradePalette:_observeGradeFromName(gradeName)
 				else
 					error("Bad grade value")
 				end
-			end)
+			end),
 		})
 	end
 
@@ -185,7 +194,7 @@ function ColorGradePalette:_observeGradeFromName(gradeName)
 	local colorOrObservable = Blend.toPropertyObservable(gradeName)
 	if colorOrObservable then
 		return colorOrObservable:Pipe({
-			Rx.map(ColorGradeUtils.getGrade)
+			Rx.map(ColorGradeUtils.getGrade),
 		})
 	end
 
@@ -200,8 +209,8 @@ function ColorGradePalette:ObserveDefaultSurfaceGrade()
 			else
 				return Rx.EMPTY
 			end
-		end)
+		end),
 	})
 end
 
-return ColorGradePalette
+return ColorGradePalette