@rbxts/uiblox 0.1.27 → 0.1.29

package/out/theme/styles/index.d.ts

@@ -1,5 +1,6 @@
 export { ClassNameMap } from "./types/index";
 export { WriteableStyle } from "./types/index";
+export { ConditionalStylesMap } from "./types/index";
 export { createStyles } from "./utilities/index";
 export { makeStyles } from "./utilities/index";
 export { classNames } from "./utilities/index";

package/out/theme/styles/types/ConditionalStylesMap.d.ts

@@ -0,0 +1,2 @@
+import { WriteableStyle } from "./WriteableStyle";
+export type ConditionalStylesMap<T extends Instance> = Map<WriteableStyle<T>, boolean>;

package/out/theme/styles/types/ConditionalStylesMap.luau

@@ -0,0 +1,2 @@
+-- Compiled with roblox-ts v3.0.0
+return nil

package/out/theme/styles/types/index.d.ts

@@ -1,2 +1,3 @@
 export { ClassNameMap } from "./styles";
 export { WriteableStyle } from "./WriteableStyle";
+export { ConditionalStylesMap } from "./ConditionalStylesMap";

package/out/theme/styles/utilities/classNames.d.ts

@@ -1,7 +1,3 @@
-import { WriteableStyle } from "../types/WriteableStyle";
-export type GenericStyle = {
-    [property: string]: boolean;
-};
-export type ConditionalStyles<T extends Instance> = Map<WriteableStyle<T>, boolean>;
-declare function classNames<T extends Instance>(...args: [...Array<WriteableStyle<T>>, ConditionalStyles<T>] | [...Array<WriteableStyle<T>>]): WriteableStyle<T>;
+import { WriteableStyle, ConditionalStylesMap } from "../types/index";
+declare function classNames<T extends Instance>(...args: [...Array<WriteableStyle<T>>, ConditionalStylesMap<T>] | [...Array<WriteableStyle<T>>]): WriteableStyle<T>;
 export default classNames;

package/out/theme/styles/utilities/classNames.luau

@@ -1,12 +1,27 @@
 -- Compiled with roblox-ts v3.0.0
--- eslint-disable-next-line @typescript-eslint/no-explicit-any
+local TS = _G[script]
 local classNamesInternal = function(conditionalStyles, ...)
 	local styles = { ... }
 	local style = {}
+	-- ▼ ReadonlyArray.forEach ▼
+	local _callback = function(value)
+		if value ~= 0 and value == value and value ~= "" and value then
+			local _object = table.clone(style)
+			setmetatable(_object, nil)
+			for _k, _v in value do
+				_object[_k] = _v
+			end
+			style = _object
+		end
+	end
+	for _k, _v in styles do
+		_callback(_v, _k - 1, styles)
+	end
+	-- ▲ ReadonlyArray.forEach ▲
 	local _result = conditionalStyles
 	if _result ~= nil then
 		-- ▼ ReadonlyMap.forEach ▼
-		local _callback = function(value, key)
+		local _callback_1 = function(value, key)
 			if value then
 				local _object = table.clone(style)
 				setmetatable(_object, nil)
@@ -17,25 +32,10 @@ local classNamesInternal = function(conditionalStyles, ...)
 			end
 		end
 		for _k, _v in _result do
-			_callback(_v, _k, _result)
+			_callback_1(_v, _k, _result)
 		end
 		-- ▲ ReadonlyMap.forEach ▲
 	end
-	-- ▼ ReadonlyArray.forEach ▼
-	local _callback = function(value)
-		if value ~= 0 and value == value and value ~= "" and value then
-			local _object = table.clone(style)
-			setmetatable(_object, nil)
-			for _k, _v in value do
-				_object[_k] = _v
-			end
-			style = _object
-		end
-	end
-	for _k, _v in styles do
-		_callback(_v, _k - 1, styles)
-	end
-	-- ▲ ReadonlyArray.forEach ▲
 	local _object = table.clone(style)
 	setmetatable(_object, nil)
 	return _object
@@ -45,23 +45,66 @@ local function classNames(...)
 	local args = { ... }
 	-- Check if last argument is ConditionalStyles
 	local hasConditionalStyles = function(args)
-		local lastArg = args[#args]
-		if lastArg == nil then
-			return false
+		local _exitType, _returns = TS.try(function()
+			local lastArg = args[#args]
+			-- If the last argument is undefined or not a table then its not a ConditionalStyles<T>
+			-- Map<K, V> compiles to a table literal (ref: https://roblox-ts.com/docs/api/constructors)
+			if lastArg == nil or not (type(lastArg) == "table") then
+				return TS.TRY_RETURN, { false }
+			end
+			local lastArgAsConditionalStylesMap = lastArg
+			local matchesMapFormat = true
+			local _result = lastArgAsConditionalStylesMap
+			if _result ~= nil then
+				-- ▼ ReadonlyMap.forEach ▼
+				local _callback = function(value, key)
+					-- Assume that the last argument is a ConditionalStyles<T> with correct format (Map<WriteableStyle<T>, boolean>)
+					-- If the key is not a WriteableStyle<T> then it does not match the format
+					-- If the value is not a boolean then it does not match the format
+					local _value = value
+					local _condition = not (type(_value) == "boolean")
+					if not _condition then
+						local _key = key
+						_condition = not (type(_key) == "table")
+					end
+					if _condition then
+						matchesMapFormat = false
+					end
+				end
+				for _k, _v in _result do
+					_callback(_v, _k, _result)
+				end
+				-- ▲ ReadonlyMap.forEach ▲
+			end
+			return TS.TRY_RETURN, { matchesMapFormat }
+		end, function()
+			-- If we catch an error, it means that the last argument is not a ConditionalStyles<T>
+			return TS.TRY_RETURN, { false }
+		end)
+		if _exitType then
+			return unpack(_returns)
 		end
-		return type(lastArg) == "table"
 	end
-	if hasConditionalStyles(args) then
-		-- Handle case with ConditionalStyles
-		-- ▼ Array.pop ▼
-		local _length = #args
-		local _result = args[_length]
-		args[_length] = nil
-		-- ▲ Array.pop ▲
-		local conditionalStyles = _result
+	local _exitType, _returns = TS.try(function()
+		if hasConditionalStyles(args) then
+			-- Handle case with ConditionalStyles
+			-- ▼ Array.pop ▼
+			local _length = #args
+			local _result = args[_length]
+			args[_length] = nil
+			-- ▲ Array.pop ▲
+			local conditionalStyles = _result
+			local styles = args
+			-- ConditionalStyles<T> is the last argument
+			return TS.TRY_RETURN, { classNamesInternal(conditionalStyles, unpack(styles)) }
+		end
+	end, function()
+		-- If we catch an error, like attempt to iterate over a string value, it means that the last argument is not a ConditionalStyles<T>
 		local styles = args
-		-- ConditionalStyles<T> is the last argument
-		return classNamesInternal(conditionalStyles, unpack(styles))
+		return TS.TRY_RETURN, { classNamesInternal(nil, unpack(styles)) }
+	end)
+	if _exitType then
+		return unpack(_returns)
 	end
 	-- Handle case without ConditionalStyles
 	-- All args are WriteableStyle<T>

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@rbxts/uiblox",
-	"version": "0.1.27",
+	"version": "0.1.29",
 	"description": "UI Library and theming for roblox-ts projects",
 	"main": "out/init.lua",
 	"scripts": {