@rbxts/app-forge 0.6.0-alpha.63 → 0.6.0-alpha.65

package/out/vide/decorator.luau

@@ -13,6 +13,7 @@ local function App(props)
 		local _name_1 = props.name
 		local _arg1 = {
 			constructor = constructor,
+			renderGroup = props.renderGroup,
 			visible = props.visible,
 			rules = props.rules,
 		}

package/out/vide/helpers.d.ts

@@ -2,4 +2,7 @@ import Vide from "@rbxts/vide";
 import type Types from "./types";
 import type AppForge from ".";
 export declare function createSource(name: AppNames, forge: AppForge): typeof Vide.source | undefined;
+export declare function normalizeGroups(group: GroupNames | GroupNames[]): GroupNames[];
+export declare function collectByGroup(groups: GroupNames[], filter?: (name: AppNames) => boolean): AppNames[];
+export declare function renderNames(props: Types.Props.Main, names: AppNames[], forge: AppForge): (ScreenGui | Frame)[];
 export declare function Render(props: Types.Props.Main): Vide.Node;

package/out/vide/helpers.luau

@@ -28,6 +28,63 @@ local function createSource(name, forge)
 	_sources_1[_exp] = _arg1
 	return source
 end
+local function normalizeGroups(group)
+	local _group = group
+	local _result
+	if type(_group) == "table" then
+		local _array = {}
+		local _length = #_array
+		table.move(group, 1, #group, _length + 1, _array)
+		_result = _array
+	else
+		_result = { group }
+	end
+	return _result
+end
+local function collectByGroup(groups, filter)
+	local result = {}
+	-- ▼ ReadonlyMap.forEach ▼
+	local _callback = function(app, name)
+		local appGroup = app.renderGroup
+		if not (appGroup ~= "" and appGroup) then
+			return nil
+		end
+		if not (table.find(groups, appGroup) ~= nil) then
+			return nil
+		end
+		if filter and not filter(name) then
+			return nil
+		end
+		local _name = name
+		table.insert(result, _name)
+	end
+	for _k, _v in AppRegistry do
+		_callback(_v, _k, AppRegistry)
+	end
+	-- ▲ ReadonlyMap.forEach ▲
+	return result
+end
+local function renderNames(props, names, forge)
+	if #names == 0 then
+		error("No app names provided to renderApps")
+	end
+	-- ▼ ReadonlyArray.map ▼
+	local _newValue = table.create(#names)
+	local _callback = function(name)
+		local _forge = forge
+		local _object = table.clone(props)
+		setmetatable(_object, nil)
+		_object.render = {
+			name = name,
+		}
+		return _forge:renderApp(_object)
+	end
+	for _k, _v in names do
+		_newValue[_k] = _callback(_v, _k - 1, names)
+	end
+	-- ▲ ReadonlyArray.map ▲
+	return _newValue
+end
 local function Render(props)
 	local _binding = props
 	local config = _binding.config
@@ -60,15 +117,31 @@ local function Render(props)
 		warn("Rendering twice making a second px")
 	end
 	if render then
-		local _value = render.name
-		if _value ~= "" and _value then
-			return forge:renderApp(props)
-		elseif render.names then
-			return forge:renderApps(props)
+		local _condition = render.name
+		if _condition ~= "" and _condition then
+			_condition = render.group
+		end
+		if _condition ~= "" and _condition then
+			return forge:renderGroupByName(props)
 		else
-			local _value_1 = render.group
-			if _value_1 ~= "" and _value_1 then
-				return forge:renderGroup(props)
+			local _value = render.names and render.group
+			if _value ~= "" and _value then
+				return forge:renderGroupByNames(props)
+			else
+				local _result = render
+				if _result ~= nil then
+					_result = _result.name
+				end
+				if _result ~= "" and _result then
+					return forge:renderApp(props)
+				elseif render.names then
+					return forge:renderApps(props)
+				else
+					local _value_1 = render.group
+					if _value_1 ~= "" and _value_1 then
+						return forge:renderGroup(props)
+					end
+				end
 			end
 		end
 	end
@@ -76,5 +149,8 @@ local function Render(props)
 end
 return {
 	createSource = createSource,
+	normalizeGroups = normalizeGroups,
+	collectByGroup = collectByGroup,
+	renderNames = renderNames,
 	Render = Render,
 }

package/out/vide/index.d.ts

@@ -13,5 +13,7 @@ export default class AppForge {
     renderApp(props: Types.Props.Main): ScreenGui | Frame;
     renderApps(props: Types.Props.Main): (ScreenGui | Frame)[];
     renderGroup(props: Types.Props.Main): (ScreenGui | Frame)[];
+    renderGroupByName(props: Types.Props.Main): (ScreenGui | Frame)[];
+    renderGroupByNames(props: Types.Props.Main): (ScreenGui | Frame)[];
     renderAll(props: Types.Props.Main): (ScreenGui | Frame)[];
 }

package/out/vide/init.luau

@@ -1,5 +1,7 @@
 -- Compiled with roblox-ts v3.0.0
 local TS = _G[script]
+-- Services
+local RunService = TS.import(script, TS.getModule(script, "@rbxts", "services")).RunService
 -- Packages
 local _vide = TS.import(script, TS.getModule(script, "@rbxts", "vide").src)
 local effect = _vide.effect
@@ -11,8 +13,11 @@ local AppRegistry = TS.import(script, script, "decorator").AppRegistry
 -- Classes
 local RulesManager = TS.import(script, script, "rules").default
 -- Helpers
-local createSource = TS.import(script, script, "helpers").createSource
-local RunService = TS.import(script, TS.getModule(script, "@rbxts", "services")).RunService
+local _helpers = TS.import(script, script, "helpers")
+local createSource = _helpers.createSource
+local renderNames = _helpers.renderNames
+local collectByGroup = _helpers.collectByGroup
+local normalizeGroups = _helpers.normalizeGroups
 local AppForge
 do
 	AppForge = setmetatable({}, {
@@ -104,86 +109,47 @@ do
 			_names = _names.names
 		end
 		local names = _names
-		if names then
-			-- ▼ ReadonlyArray.map ▼
-			local _newValue = table.create(#names)
-			local _callback = function(name)
-				local render = {
-					name = name,
-				}
-				local _self = self
-				local _object = table.clone(props)
-				setmetatable(_object, nil)
-				_object.render = render
-				return _self:renderApp(_object)
-			end
-			for _k, _v in names do
-				_newValue[_k] = _callback(_v, _k - 1, names)
-			end
-			-- ▲ ReadonlyArray.map ▲
-			return _newValue
-		end
-		error("No app names provided to renderApps")
+		if not names then
+			error("No app names provided to renderApps")
+		end
+		return renderNames(props, names, self)
 	end
 	function AppForge:renderGroup(props)
-		local _selectedGroup = props.render
-		if _selectedGroup ~= nil then
-			_selectedGroup = _selectedGroup.group
-		end
-		local selectedGroup = _selectedGroup
-		if selectedGroup ~= "" and selectedGroup then
-			local names = {}
-			-- ▼ ReadonlyMap.forEach ▼
-			local _callback = function(app, name)
-				local _foundGroup = app.rules
-				if _foundGroup ~= nil then
-					_foundGroup = _foundGroup.renderGroup
-				end
-				local foundGroup = _foundGroup
-				if not (foundGroup ~= "" and foundGroup) then
-					return nil
-				end
-				local _result
-				if type(selectedGroup) == "table" then
-					local _array = {}
-					local _length = #_array
-					table.move(selectedGroup, 1, #selectedGroup, _length + 1, _array)
-					_result = _array
-				else
-					_result = { selectedGroup }
-				end
-				local allGroups = _result
-				if table.find(allGroups, foundGroup) ~= nil then
-					local _name = name
-					table.insert(names, _name)
-					return #names
-				end
-			end
-			for _k, _v in AppRegistry do
-				_callback(_v, _k, AppRegistry)
-			end
-			-- ▲ ReadonlyMap.forEach ▲
-			if names then
-				-- ▼ ReadonlyArray.map ▼
-				local _newValue = table.create(#names)
-				local _callback_1 = function(name)
-					local render = {
-						name = name,
-					}
-					local _self = self
-					local _object = table.clone(props)
-					setmetatable(_object, nil)
-					_object.render = render
-					return _self:renderApp(_object)
-				end
-				for _k, _v in names do
-					_newValue[_k] = _callback_1(_v, _k - 1, names)
-				end
-				-- ▲ ReadonlyArray.map ▲
-				return _newValue
-			end
-		end
-		error("No app names provided to renderApps")
+		local _group = props.render
+		if _group ~= nil then
+			_group = _group.group
+		end
+		local group = _group
+		if not (group ~= "" and group) then
+			error("No app names provided to renderApps")
+		end
+		local groups = normalizeGroups(group)
+		return renderNames(props, collectByGroup(groups), self)
+	end
+	function AppForge:renderGroupByName(props)
+		local _binding = props.render or {}
+		local group = _binding.group
+		local name = _binding.name
+		if not (group ~= "" and group) or not (name ~= "" and name) then
+			error("No app names provided to renderApps")
+		end
+		local groups = normalizeGroups(group)
+		return renderNames(props, collectByGroup(groups, function(n)
+			return n == name
+		end), self)
+	end
+	function AppForge:renderGroupByNames(props)
+		local _binding = props.render or {}
+		local group = _binding.group
+		local names = _binding.names
+		if not (group ~= "" and group) or not names then
+			error("No app names provided to renderApps")
+		end
+		local groups = normalizeGroups(group)
+		return renderNames(props, collectByGroup(groups, function(n)
+			local _n = n
+			return table.find(names, _n) ~= nil
+		end), self)
 	end
 	function AppForge:renderAll(props)
 		local names = {}
@@ -191,19 +157,13 @@ do
 		local _callback = function(_, name)
 			local _name = name
 			table.insert(names, _name)
+			return #names
 		end
 		for _k, _v in AppRegistry do
 			_callback(_v, _k, AppRegistry)
 		end
 		-- ▲ ReadonlyMap.forEach ▲
-		local render = {
-			names = names,
-		}
-		local _self = self
-		local _object = table.clone(props)
-		setmetatable(_object, nil)
-		_object.render = render
-		return _self:renderApps(_object)
+		return renderNames(props, names, self)
 	end
 end
 return {

package/out/vide/types.d.ts

@@ -7,7 +7,9 @@ declare namespace Types {
 		type Render =
 			| { name?: AppNames; names?: never; group?: never }
 			| { names?: AppNames[]; name?: never; group?: never }
-			| { names?: never; name?: never; group?: GroupNames[] | GroupNames };
+			| { group?: GroupNames[] | GroupNames; names?: AppNames[]; name?: never }
+			| { group?: GroupNames[] | GroupNames; name?: AppNames; names?: never }
+			| { group?: GroupNames[] | GroupNames; names?: never; name?: never };
 
 		type Main = {
 			props: AppProps;
@@ -32,18 +34,23 @@ declare namespace Types {
 		type Props<N extends AppNames> = {
 			name: N;
 			visible?: boolean;
+			renderGroup?: GroupNames;
 			rules?: Rules.Generic<N>;
 		};
 
 		type Static = {
 			constructor: new (props: Types.Props.Main, name: AppNames) => Args;
+
 			visible?: boolean;
+			renderGroup?: GroupNames;
 			rules?: Rules.Static;
 		};
 
 		type Generic<N extends AppNames = AppNames> = {
 			constructor: new (props: Types.Props.Main, name: AppNames) => Args;
+
 			visible?: boolean;
+			renderGroup?: GroupNames;
 			rules?: Rules.Generic<N>;
 		};
 	}
@@ -52,13 +59,11 @@ declare namespace Types {
 		type Static = {
 			parent?: string;
 			exclusiveGroup?: string;
-			renderGroup?: string;
 		};
 
 		type Generic<N extends AppNames = AppNames> = {
 			parent?: Exclude<AppNames, N>;
 			exclusiveGroup?: GroupNames;
-			renderGroup?: GroupNames;
 		};
 	}
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@rbxts/app-forge",
-	"version": "0.6.0-alpha.63",
+	"version": "0.6.0-alpha.65",
 	"description": "An App Manager for Vide",
 	"main": "out/init.lua",
 	"types": "out/index.d.ts",