@rbxts/uiblox 0.1.27 → 0.1.28

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,5 +1,5 @@
 -- 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 = {}
@@ -45,23 +45,37 @@ 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]
+			return TS.TRY_RETURN, { lastArg ~= nil and type(lastArg) == "table" }
+		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.28",
 	"description": "UI Library and theming for roblox-ts projects",
 	"main": "out/init.lua",
 	"scripts": {