@rbxts/app-forge 0.7.2-alpha.3 → 0.7.2-alpha.31

package/out/{vide/index.d.ts → mount.d.ts}

@@ -1,7 +1,8 @@
 import Vide from "@rbxts/vide";
-import Renders from "./classes/renders";
+import Renders from "./renderManager";
+import Debugger from "./debugger";
+import Logger from "./logger";
 import Types from "./types";
-import { Logger, Debugger } from "./debug";
 type Destructor = () => void;
 type Loaded = {
     container: Vide.Node;
@@ -26,8 +27,11 @@ export default class AppForge extends Renders {
     open(name: AppNames, rules?: boolean): void;
     close(name: AppNames, rules?: boolean): void;
     toggle(name: AppNames, rules?: boolean): void;
-    story(props: Types.Props.Main): Frame;
-    mount(callback: () => Vide.Node, props: Types.Props.Main, target: Instance): Destructor;
+    story(props: AppProps, target: GuiObject, conf?: {
+        render?: Types.Props.Render;
+        minScale?: number;
+    }): Frame;
+    mount(node: Vide.Node, props: Types.Props.Main, target: Instance): Destructor;
     unMount(): void;
 }
 export {};

package/out/{vide/init.luau → mount.luau}

@@ -4,6 +4,7 @@ local TS = _G[script]
 local RunService = TS.import(script, TS.getModule(script, "@rbxts", "services")).RunService
 -- Packages
 local _vide = TS.import(script, TS.getModule(script, "@rbxts", "vide").src)
+local Vide = _vide
 local apply = _vide.apply
 local create = _vide.create
 local effect = _vide.effect
@@ -11,13 +12,11 @@ local mount = _vide.mount
 local source = _vide.source
 local untrack = _vide.untrack
 -- Classes
-local Renders = TS.import(script, script, "classes", "renders").default
+local Renders = TS.import(script, script.Parent, "renderManager").default
 -- Helpers
-local AppRegistry = TS.import(script, script, "decorator").AppRegistry
--- Debug
-local _debug = TS.import(script, script, "debug")
-local Logger = _debug.Logger
-local Debugger = _debug.Debugger
+local AppRegistry = TS.import(script, script.Parent, "appRegistry").AppRegistry
+local Debugger = TS.import(script, script.Parent, "debugger").default
+local Logger = TS.import(script, script.Parent, "logger").default
 local AppForge
 do
 	local super = Renders
@@ -64,7 +63,7 @@ do
 		if _sources[_name_1] ~= nil then
 			return nil
 		end
-		local _debug_1 = self.debug
+		local _debug = self.debug
 		local _exp = name
 		local _object = {}
 		local _left = "default"
@@ -73,7 +72,7 @@ do
 			_condition = false
 		end
 		_object[_left] = _condition
-		_debug_1:logTag("state", _exp, "Creating visibility source", _object)
+		_debug:logTag("state", _exp, "Creating visibility source", _object)
 		local _sources_1 = self.sources
 		local _exp_1 = name
 		local _condition_1 = app.visible
@@ -109,11 +108,27 @@ do
 			local _name = name
 			local _value = value
 			_sources[_name] = _value
+			local prev
+			local log = function()
+				return self.debug:logTag("state", name, "Visibility changed", {
+					from = prev,
+					to = value,
+				})
+			end
+			local count = 0
 			effect(function()
-				value()
+				count += 1
+				prev = value()
 				untrack(function()
-					return self:checkRules(name)
+					return self:checkRules(self, name)
 				end)
+				if Vide.strict and count == 2 then
+					log()
+					count = 0
+				elseif not Vide.strict and count == 1 then
+					log()
+					count = 0
+				end
 			end)
 		else
 			self.logger:log("WARN", "forge.bind called while game is running", {
@@ -225,7 +240,7 @@ do
 			to = value,
 		})
 		if rules then
-			self:checkRules(name)
+			self:checkRules(self, name)
 		end
 	end
 	function AppForge:open(name, rules)
@@ -246,7 +261,7 @@ do
 		end
 		self:set(name, not self:getSource(name)(), rules)
 	end
-	function AppForge:story(props)
+	function AppForge:story(props, target, conf)
 		self.debug:logTag("lifecycle", "story", "Creating story mount")
 		local Container = create("Frame")({
 			Name = "Story Container",
@@ -255,19 +270,45 @@ do
 			Position = UDim2.fromScale(0.5, 0.5),
 			Size = UDim2.fromScale(1, 1),
 		})
-		apply(Container)({
-			[0] = self:renderMount(props),
-		})
+		local _fn = apply(Container)
+		local _object = {}
+		local _left = 0
+		local _self = self
+		local _object_1 = {
+			props = props,
+			forge = self,
+		}
+		local _left_1 = "render"
+		local _result = conf
+		if _result ~= nil then
+			_result = _result.render
+		end
+		_object_1[_left_1] = _result
+		local _left_2 = "config"
+		local _object_2 = {}
+		local _left_3 = "px"
+		local _object_3 = {
+			target = target,
+		}
+		local _left_4 = "minScale"
+		local _result_1 = conf
+		if _result_1 ~= nil then
+			_result_1 = _result_1.minScale
+		end
+		_object_3[_left_4] = _result_1
+		_object_2[_left_3] = _object_3
+		_object_1[_left_2] = _object_2
+		_object[_left] = _self:renderMount(_object_1)
+		_fn(_object)
 		return Container
 	end
-	function AppForge:mount(callback, props, target)
+	function AppForge:mount(node, props, target)
 		self.debug:logTag("lifecycle", "mount", "Mounting AppForge")
-		local Container = callback()
 		self.innerMount = mount(function()
-			apply(Container)({
+			apply(node)({
 				[0] = self:renderMount(props),
 			})
-			return Container
+			return node
 		end, target)
 		return self.innerMount
 	end

package/out/renderManager.d.ts

@@ -0,0 +1,32 @@
+import Vide from "@rbxts/vide";
+import type Types from "./types";
+import type AppForge from "./mount";
+import Rules from "./ruleEngine";
+export default class Renders extends Rules {
+    protected anchored: Map<string, {
+        id: AppNames;
+        render: Vide.Node;
+    }>;
+    constructor();
+    /**
+     * Entry point for mounting renders.
+     * 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, 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/{vide/classes/renders.luau → renderManager.luau}

@@ -6,11 +6,11 @@ local apply = _vide.apply
 local create = _vide.create
 -- Types
 -- Components
-local AppRegistry = TS.import(script, script.Parent.Parent, "decorator").AppRegistry
+local AppRegistry = TS.import(script, script.Parent, "appRegistry").AppRegistry
 -- Hooks
-local usePx = TS.import(script, script.Parent.Parent, "hooks", "usePx").usePx
+local usePx = TS.import(script, script.Parent, "hooks", "usePx").usePx
 -- Classes
-local Rules = TS.import(script, script.Parent, "rules").default
+local Rules = TS.import(script, script.Parent, "ruleEngine").default
 local Renders
 do
 	local super = Rules
@@ -58,58 +58,98 @@ 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)
-		if #names == 0 then
-			error("No app names provided to render", 2)
+	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})`
+			local _condition = details
+			if _condition == nil then
+				_condition = props.render
+			end
+			_logger:log("WARN", _exp, _condition)
+			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)
+			self:renderChildren(props, name, forge, renderedSet, rendered, appRender)
 		end
-		for _k, _v in names do
-			_newValue[_k] = _callback(_v, _k - 1, names)
+		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)
+				apply(childRender)({
+					Parent = parentContainer,
+				})
+				forge:index(parentName, 10)
+				self:renderChildren(props, childName, forge, renderedSet, accumulated, childRender)
+			end
 		end
-		-- ▲ ReadonlyArray.map ▲
-		return _newValue
+		for _k, _v in AppRegistry do
+			_callback(_v, _k, AppRegistry)
+		end
+		-- ▲ ReadonlyMap.forEach ▲
 	end
 	function Renders:collectByGroup(groups, filter)
 		local result = {}
@@ -147,7 +187,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
@@ -162,8 +202,10 @@ do
 		end
 		self.debug:time("render", name)
 		if not (self.loaded[name] ~= nil) then
-			self.debug:logTag("render", name, "Creating render instance")
 			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",
 			})
@@ -175,6 +217,9 @@ do
 				Size = UDim2.fromScale(1, 1),
 				[0] = render,
 			})
+			if parentContainer then
+				container.Parent = parentContainer
+			end
 			local _loaded = self.loaded
 			local _arg1 = {
 				container = container,
@@ -184,11 +229,18 @@ do
 		else
 			self.debug:logTag("render", name, "Reusing existing render instance")
 		end
-		self:renderRules(name, props)
+		local _result = renderedSet
+		if _result ~= nil then
+			_result[name] = true
+		end
+		self:renderRules(self, 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
@@ -197,9 +249,12 @@ do
 		if not names then
 			error("renderApps requires app names", 2)
 		end
-		return self:renderNames(props, names, self)
+		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
@@ -209,9 +264,12 @@ do
 			error("renderGroup requires a group", 2)
 		end
 		local groups = self:normalizeGroups(group)
-		return self:renderNames(props, self:collectByGroup(groups), self)
+		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
@@ -221,9 +279,15 @@ do
 		local groups = self:normalizeGroups(group)
 		return self:renderNames(props, self:collectByGroup(groups, function(n)
 			return n == name
-		end), self)
+		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
@@ -234,9 +298,15 @@ do
 		return self:renderNames(props, self:collectByGroup(groups, function(n)
 			local _n = n
 			return table.find(names, _n) ~= nil
-		end), self)
+		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)
@@ -248,7 +318,7 @@ do
 			_callback(_v, _k, AppRegistry)
 		end
 		-- ▲ ReadonlyMap.forEach ▲
-		return self:renderNames(props, names, self)
+		return self:renderNames(props, names, self, "renderAll", renderedSet)
 	end
 end
 return {

package/out/{vide/classes/rules → ruleEngine}/exclusiveGroup.d.ts

@@ -1,2 +1,2 @@
-import type AppForge from "../..";
+import type AppForge from "../mount";
 export default function ExclusiveGroupRule(entry: AppNames, forge: AppForge): void;

package/out/{vide/classes/rules → ruleEngine}/exclusiveGroup.luau

@@ -2,7 +2,7 @@
 local TS = _G[script]
 -- Types
 -- Components
-local AppRegistry = TS.import(script, script.Parent.Parent.Parent, "decorator").AppRegistry
+local AppRegistry = TS.import(script, script.Parent.Parent, "appRegistry").AppRegistry
 local function ExclusiveGroupRule(entry, forge)
 	local _entry = entry
 	local entryApp = AppRegistry[_entry]

package/out/ruleEngine/index.d.ts

@@ -0,0 +1,7 @@
+import type AppForge from "../mount";
+import type Types from "../types";
+export default class Rules {
+    protected processing: Set<string>;
+    protected renderRules(forge: AppForge, name: AppNames, props: Types.Props.Main): void;
+    protected checkRules(forge: AppForge, name: AppNames): void;
+}

package/out/{vide/classes/rules → ruleEngine}/init.luau

@@ -2,7 +2,7 @@
 local TS = _G[script]
 -- Types
 -- Components
-local AppRegistry = TS.import(script, script.Parent.Parent, "decorator").AppRegistry
+local AppRegistry = TS.import(script, script.Parent, "appRegistry").AppRegistry
 -- Rules
 local ExclusiveGroupRule = TS.import(script, script, "exclusiveGroup").default
 local ParentRule = TS.import(script, script, "parent").default
@@ -21,7 +21,7 @@ do
 	function Rules:constructor()
 		self.processing = {}
 	end
-	function Rules:renderRules(name, props)
+	function Rules:renderRules(forge, name, props)
 		local _name = name
 		local appClass = AppRegistry[_name]
 		if not appClass then
@@ -37,31 +37,31 @@ do
 			_condition = not rules.detach
 		end
 		if _condition ~= "" and _condition then
-			self.debug:logTag("rules", name, "Applying parent anchor", {
+			forge.debug:logTag("rules", name, "Applying parent anchor", {
 				parent = rules.parent,
 			})
-			self:anchor(name, rules.parent, props)
+			forge:anchor(name, rules.parent, props)
 		end
 		-- Index
-		if rules.index ~= nil then
-			self.debug:logTag("rules", name, "Applying ZIndex", rules.index)
-			self:index(name, rules.index)
+		if rules.zIndex ~= nil then
+			forge.debug:logTag("rules", name, "Applying ZIndex", rules.zIndex)
+			forge:index(name, rules.zIndex)
 		end
 	end
-	function Rules:checkRules(name)
+	function Rules:checkRules(forge, name)
 		local _processing = self.processing
 		local _name = name
 		if _processing[_name] ~= nil then
-			self.debug:logTag("rules", name, "Skipped rule processing (cycle detected)")
+			forge.debug:logTag("rules", name, "Skipped rule processing (cycle detected)")
 			return nil
 		end
 		local _processing_1 = self.processing
 		local _name_1 = name
 		_processing_1[_name_1] = true
-		self.debug:logTag("rules", name, "Evaluating rules")
+		forge.debug:logTag("rules", name, "Evaluating rules")
 		TS.try(function()
-			ParentRule(name, self)
-			ExclusiveGroupRule(name, self)
+			ParentRule(name, forge)
+			ExclusiveGroupRule(name, forge)
 		end, nil, function()
 			local _processing_2 = self.processing
 			local _name_2 = name

package/out/{react/rules → ruleEngine}/parent.d.ts

@@ -1,2 +1,2 @@
-import type AppForge from "..";
+import type AppForge from "../mount";
 export default function ParentRule(entry: AppNames, forge: AppForge): void;

package/out/{vide/classes/rules → ruleEngine}/parent.luau

@@ -2,7 +2,7 @@
 local TS = _G[script]
 -- Types
 -- Components
-local AppRegistry = TS.import(script, script.Parent.Parent.Parent, "decorator").AppRegistry
+local AppRegistry = TS.import(script, script.Parent.Parent, "appRegistry").AppRegistry
 local function ParentRule(entry, forge)
 	local entryVisible = forge:getSource(entry)()
 	-- ▼ ReadonlyMap.forEach ▼
@@ -19,6 +19,7 @@ local function ParentRule(entry, forge)
 			return nil
 		end
 		forge.debug:logTag("rules", entry, "Closing child app (parent closed)", {
+			parent = entry,
 			child = name,
 		})
 		forge:close(name, false)

package/out/{vide/types.d.ts → types.d.ts}

@@ -1,15 +1,15 @@
 // Types
-import type { Args } from "./decorator";
-import type AppForge from ".";
+import type { Args } from "./appRegistry";
+import type AppForge from "./mount";
 
 declare namespace Types {
 	namespace Props {
 		type Render =
 			| { name?: AppNames; names?: never; group?: never }
 			| { names?: AppNames[]; name?: never; group?: never }
-			| { group?: GroupNames[] | GroupNames; names?: AppNames[]; name?: never }
-			| { group?: GroupNames[] | GroupNames; name?: AppNames; names?: never }
-			| { group?: GroupNames[] | GroupNames; names?: never; name?: never };
+			| { group?: AppGroups[] | AppGroups; names?: AppNames[]; name?: never }
+			| { group?: AppGroups[] | AppGroups; name?: AppNames; names?: never }
+			| { group?: AppGroups[] | AppGroups; names?: never; name?: never };
 
 		type Main = {
 			props: AppProps;
@@ -34,7 +34,7 @@ declare namespace Types {
 		type Props<N extends AppNames> = {
 			name: N;
 			visible?: boolean;
-			renderGroup?: GroupNames;
+			renderGroup?: AppGroups;
 			rules?: Rules.Generic<N>;
 		};
 
@@ -42,7 +42,7 @@ declare namespace Types {
 			constructor: new (props: Types.Props.Main, name: AppNames) => Args;
 
 			visible?: boolean;
-			renderGroup?: GroupNames;
+			renderGroup?: AppGroups;
 			rules?: Rules.Static;
 		};
 
@@ -50,7 +50,7 @@ declare namespace Types {
 			constructor: new (props: Types.Props.Main, name: AppNames) => Args;
 
 			visible?: boolean;
-			renderGroup?: GroupNames;
+			renderGroup?: AppGroups;
 			rules?: Rules.Generic<N>;
 		};
 	}
@@ -68,17 +68,17 @@ declare namespace Types {
 
 		export type Static = {
 			exclusiveGroup?: string;
-			index?: number;
+			zIndex?: number;
 		} & (WithParent<string> | WithoutParent);
 
 		export type Generic<N extends AppNames = AppNames> = {
-			exclusiveGroup?: GroupNames;
-			index?: number;
+			exclusiveGroup?: AppGroups;
+			zIndex?: number;
 		} & (WithParent<Exclude<AppNames, N>> | WithoutParent);
 	}
 }
 
-export type MainProps = Types.Props.Main;
+export type ForgeProps = Types.Props.Main;
 export type ClassProps = Types.Props.Class;
 export type RenderProps = Types.Props.Render;
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@rbxts/app-forge",
-	"version": "0.7.2-alpha.3",
+	"version": "0.7.2-alpha.31",
 	"description": "An App Manager for Vide",
 	"main": "out/init.lua",
 	"types": "out/index.d.ts",
@@ -34,24 +34,18 @@
 		"access": "public"
 	},
 	"dependencies": {
+		"@rbxts/set-timeout": "^1.1.2",
 		"@rbxts/services": "^1.6.0",
-		"@rbxts/set-timeout": "^1.1.2"
-	},
-	"peerDependencies": {
-		"@rbxts/react": "^17.3.7-ts.1",
-		"@rbxts/vide": "^0.5.7"
+		"@rbxts/vide": "^0.6.0"
 	},
 	"peerDependenciesMeta": {
-		"@rbxts/react": {
-			"optional": true
-		},
 		"@rbxts/vide": {
 			"optional": true
 		}
 	},
 	"devDependencies": {
-		"@biomejs/biome": "^2.3.7",
 		"@rbxts/compiler-types": "3.0.0-types.0",
+		"@biomejs/biome": "^2.3.7",
 		"@rbxts/types": "^1.0.891",
 		"roblox-ts": "3.0.0",
 		"typescript": "^5.9.3"