@rbxts/app-forge 0.7.2-alpha.26 → 0.7.2-alpha.28

package/out/hooks/usePx.luau

@@ -77,7 +77,7 @@ local function usePx(target, baseResolution, minScale)
 	if baseResolution then
 		BASE_RESOLUTION(baseResolution)
 	end
-	if minScale ~= nil then
+	if minScale ~= 0 and minScale == minScale and minScale then
 		MIN_SCALE(minScale)
 	end
 	if target then

package/out/renderManager.d.ts

@@ -13,13 +13,20 @@ export default class Renders extends Rules {
      * Decides render strategy based on props.
      */
     protected renderMount(this: AppForge, props: Types.Props.Main): Vide.Node;
+    /**
+     * Render multiple apps by name, avoiding duplicates.
+     */
     private renderNames;
+    /**
+     * Render children of a parent app recursively inside parent container
+     */
+    private renderChildren;
     private collectByGroup;
     private normalizeGroups;
-    protected renderApp(this: AppForge, props: Types.Props.Main): Vide.Node;
-    protected renderApps(this: AppForge, props: Types.Props.Main): Vide.Node[] | undefined;
-    protected renderGroup(this: AppForge, props: Types.Props.Main): Vide.Node[] | undefined;
-    protected renderGroupByName(this: AppForge, props: Types.Props.Main): Vide.Node[] | undefined;
-    protected renderGroupByNames(this: AppForge, props: Types.Props.Main): Vide.Node[] | undefined;
-    protected renderAll(this: AppForge, props: Types.Props.Main): Vide.Node[] | undefined;
+    protected renderApp(this: AppForge, props: Types.Props.Main, renderedSet?: Set<AppNames>, parentContainer?: Instance): Vide.Node;
+    protected renderApps(this: AppForge, props: Types.Props.Main, renderedSet?: Set<AppNames>): Instance[];
+    protected renderGroup(this: AppForge, props: Types.Props.Main, renderedSet?: Set<AppNames>): Instance[];
+    protected renderGroupByName(this: AppForge, props: Types.Props.Main, renderedSet?: Set<AppNames>): Instance[];
+    protected renderGroupByNames(this: AppForge, props: Types.Props.Main, renderedSet?: Set<AppNames>): Instance[];
+    protected renderAll(this: AppForge, props: Types.Props.Main, renderedSet?: Set<AppNames>): Instance[];
 }

package/out/renderManager.luau

@@ -58,39 +58,34 @@ do
 		else
 			forge.debug:logTag("px", "global", "Skipped duplicate px initialization")
 		end
+		local renderedSet = {}
 		if render then
 			local _condition = render.name
 			if _condition ~= "" and _condition then
 				_condition = render.group
 			end
 			if _condition ~= "" and _condition then
-				forge.debug:logTag("render", "global", "Rendering group by name", render)
-				return forge:renderGroupByName(props)
+				return self:renderGroupByName(props, renderedSet)
 			end
 			local _value = render.names and render.group
 			if _value ~= "" and _value then
-				forge.debug:logTag("render", "global", "Rendering group by names", render)
-				return forge:renderGroupByNames(props)
+				return self:renderGroupByNames(props, renderedSet)
 			end
 			local _value_1 = render.name
 			if _value_1 ~= "" and _value_1 then
-				forge.debug:logTag("render", render.name, "Rendering single app")
-				return forge:renderApp(props)
+				return self:renderApp(props, renderedSet)
 			end
 			if render.names then
-				forge.debug:logTag("render", "global", "Rendering multiple apps", render.names)
-				return forge:renderApps(props)
+				return self:renderApps(props, renderedSet)
 			end
 			local _value_2 = render.group
 			if _value_2 ~= "" and _value_2 then
-				forge.debug:logTag("render", "global", "Rendering group", render.group)
-				return forge:renderGroup(props)
+				return self:renderGroup(props, renderedSet)
 			end
 		end
-		forge.debug:logTag("render", "global", "Rendering all apps")
-		return self:renderAll(props)
+		return self:renderAll(props, renderedSet)
 	end
-	function Renders:renderNames(props, names, forge, context, details)
+	function Renders:renderNames(props, names, forge, context, renderedSet, details, parentContainer)
 		if not names then
 			local _logger = forge.logger
 			local _exp = `Renderer resolved 0 apps ({context})`
@@ -99,24 +94,60 @@ do
 				_condition = props.render
 			end
 			_logger:log("WARN", _exp, _condition)
-			return nil
+			return {}
 		end
-		-- ▼ ReadonlyArray.map ▼
-		local _newValue = table.create(#names)
-		local _callback = function(name)
+		local rendered = {}
+		for _, name in names do
+			if renderedSet[name] ~= nil then
+				continue
+			end
+			renderedSet[name] = true
 			local _forge = forge
 			local _object = table.clone(props)
 			setmetatable(_object, nil)
 			_object.render = {
 				name = name,
 			}
-			return _forge:renderApp(_object)
+			local appRender = _forge:renderApp(_object, renderedSet, parentContainer)
+			table.insert(rendered, appRender)
+			-- Render children inside this container
+			self:renderChildren(props, name, forge, renderedSet, rendered, appRender)
+		end
+		return rendered
+	end
+	function Renders:renderChildren(props, parentName, forge, renderedSet, accumulated, parentContainer)
+		-- ▼ ReadonlyMap.forEach ▼
+		local _callback = function(app, childName)
+			local _result = app.rules
+			if _result ~= nil then
+				_result = _result.parent
+			end
+			local _condition = _result == parentName
+			if _condition then
+				local _renderedSet = renderedSet
+				local _childName = childName
+				_condition = not (_renderedSet[_childName] ~= nil)
+			end
+			if _condition then
+				local _renderedSet = renderedSet
+				local _childName = childName
+				_renderedSet[_childName] = true
+				local _forge = forge
+				local _object = table.clone(props)
+				setmetatable(_object, nil)
+				_object.render = {
+					name = childName,
+				}
+				local childRender = _forge:renderApp(_object, renderedSet, parentContainer)
+				table.insert(accumulated, childRender)
+				-- recursively render grandchildren
+				self:renderChildren(props, childName, forge, renderedSet, accumulated, childRender)
+			end
 		end
-		for _k, _v in names do
-			_newValue[_k] = _callback(_v, _k - 1, names)
+		for _k, _v in AppRegistry do
+			_callback(_v, _k, AppRegistry)
 		end
-		-- ▲ ReadonlyArray.map ▲
-		return _newValue
+		-- ▲ ReadonlyMap.forEach ▲
 	end
 	function Renders:collectByGroup(groups, filter)
 		local result = {}
@@ -154,7 +185,7 @@ do
 		end
 		return _result
 	end
-	function Renders:renderApp(props)
+	function Renders:renderApp(props, renderedSet, parentContainer)
 		local _name = props.render
 		if _name ~= nil then
 			_name = _name.name
@@ -170,6 +201,9 @@ do
 		self.debug:time("render", name)
 		if not (self.loaded[name] ~= nil) then
 			local render = appClass.constructor.new(props, name):render()
+			if not render then
+				error(`App "{name}" returned undefined from render()`, 2)
+			end
 			apply(render)({
 				Name = "Render",
 			})
@@ -181,6 +215,9 @@ do
 				Size = UDim2.fromScale(1, 1),
 				[0] = render,
 			})
+			if parentContainer then
+				container.Parent = parentContainer
+			end
 			local _loaded = self.loaded
 			local _arg1 = {
 				container = container,
@@ -190,11 +227,18 @@ do
 		else
 			self.debug:logTag("render", name, "Reusing existing render instance")
 		end
+		local _result = renderedSet
+		if _result ~= nil then
+			_result[name] = true
+		end
 		self:renderRules(name, props)
 		self.debug:timeEnd("render", name)
 		return self.loaded[name].container
 	end
-	function Renders:renderApps(props)
+	function Renders:renderApps(props, renderedSet)
+		if renderedSet == nil then
+			renderedSet = {}
+		end
 		local _names = props.render
 		if _names ~= nil then
 			_names = _names.names
@@ -203,9 +247,12 @@ do
 		if not names then
 			error("renderApps requires app names", 2)
 		end
-		return self:renderNames(props, names, self, "renderApps", names)
+		return self:renderNames(props, names, self, "renderApps", renderedSet, names)
 	end
-	function Renders:renderGroup(props)
+	function Renders:renderGroup(props, renderedSet)
+		if renderedSet == nil then
+			renderedSet = {}
+		end
 		local _group = props.render
 		if _group ~= nil then
 			_group = _group.group
@@ -215,9 +262,12 @@ do
 			error("renderGroup requires a group", 2)
 		end
 		local groups = self:normalizeGroups(group)
-		return self:renderNames(props, self:collectByGroup(groups), self, "renderGroup", group)
+		return self:renderNames(props, self:collectByGroup(groups), self, "renderGroup", renderedSet, group)
 	end
-	function Renders:renderGroupByName(props)
+	function Renders:renderGroupByName(props, renderedSet)
+		if renderedSet == nil then
+			renderedSet = {}
+		end
 		local _binding = props.render or {}
 		local group = _binding.group
 		local name = _binding.name
@@ -227,12 +277,15 @@ do
 		local groups = self:normalizeGroups(group)
 		return self:renderNames(props, self:collectByGroup(groups, function(n)
 			return n == name
-		end), self, "renderGroupByName", {
+		end), self, "renderGroupByName", renderedSet, {
 			group = group,
 			name = name,
 		})
 	end
-	function Renders:renderGroupByNames(props)
+	function Renders:renderGroupByNames(props, renderedSet)
+		if renderedSet == nil then
+			renderedSet = {}
+		end
 		local _binding = props.render or {}
 		local group = _binding.group
 		local names = _binding.names
@@ -243,12 +296,15 @@ do
 		return self:renderNames(props, self:collectByGroup(groups, function(n)
 			local _n = n
 			return table.find(names, _n) ~= nil
-		end), self, "renderGroupByNames", {
+		end), self, "renderGroupByNames", renderedSet, {
 			group = group,
 			names = names,
 		})
 	end
-	function Renders:renderAll(props)
+	function Renders:renderAll(props, renderedSet)
+		if renderedSet == nil then
+			renderedSet = {}
+		end
 		local names = {}
 		-- ▼ ReadonlyMap.forEach ▼
 		local _callback = function(_, name)
@@ -260,7 +316,7 @@ do
 			_callback(_v, _k, AppRegistry)
 		end
 		-- ▲ ReadonlyMap.forEach ▲
-		return self:renderNames(props, names, self, "renderAll")
+		return self:renderNames(props, names, self, "renderAll", renderedSet)
 	end
 end
 return {

package/out/ruleEngine/init.luau

@@ -42,11 +42,6 @@ do
 			})
 			self:anchor(name, rules.parent, props)
 		end
-		-- Index
-		if rules.zIndex ~= nil then
-			self.debug:logTag("rules", name, "Applying ZIndex", rules.zIndex)
-			self:index(name, rules.zIndex)
-		end
 	end
 	function Rules:checkRules(name)
 		local _processing = self.processing

package/out/types.d.ts

@@ -68,12 +68,10 @@ declare namespace Types {
 
 		export type Static = {
 			exclusiveGroup?: string;
-			zIndex?: number;
 		} & (WithParent<string> | WithoutParent);
 
 		export type Generic<N extends AppNames = AppNames> = {
 			exclusiveGroup?: AppGroups;
-			zIndex?: number;
 		} & (WithParent<Exclude<AppNames, N>> | WithoutParent);
 	}
 }

package/package.json

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