@rbxts/app-forge 0.7.2-prototype.6 → 0.7.2-prototype.8

package/out/appRegistry.d.ts

@@ -1,22 +1,23 @@
 import Vide from "@rbxts/vide";
 import type Types from "./types";
 import type AppForge from "./mount";
-export declare const AppRegistry: Map<string, Types.AppRegistry.Static>;
-export declare const AppsLoaded: Map<`${string}-${string}`, boolean>;
+export declare const AppRegistry: Map<string, Map<string, Types.AppRegistry.Static>>;
+export declare const AppSources: Map<string, Map<string, Vide.Source<boolean>>>;
 /**
  * Registers a Vide App with AppForge.
  *
  * This runs at definition time and validates static configuration.
  */
-export declare function App<N extends AppNames>(props: Types.AppRegistry.Props<N>): <T extends new (props: Types.Props.Main, name: AppNames) => Args>(constructor: T) => T;
+export declare function App<N extends AppNames>(props: Types.AppRegistry.Props<N>): <T extends new (props: Types.Props.Main, name: AppNames, group?: AppGroups) => Args>(constructor: T) => T;
 /**
  * Base class for all AppForge Apps.
  */
 export declare abstract class Args {
-    readonly forge: AppForge;
+    readonly source: Vide.Source<boolean>;
     readonly props: Types.Props.Class;
+    readonly forge: AppForge;
+    readonly group: AppGroups;
     readonly name: AppNames;
-    readonly source: Vide.Source<boolean>;
-    constructor(props: Types.Props.Main, name: AppNames);
+    constructor(props: Types.Props.Main, name: AppNames, group: AppGroups);
     abstract render(): Vide.Node;
 }

package/out/appRegistry.luau

@@ -4,11 +4,8 @@ local TS = _G[script]
 -- Types
 -- Hooks
 local px = TS.import(script, script.Parent, "hooks", "usePx").px
--- Debug
-local Logger = TS.import(script, script.Parent, "logger").default
-local logger = Logger.new("AppRegistry")
 local AppRegistry = {}
-local AppsLoaded = {}
+local AppSources = {}
 --[[
 	*
 	 * Registers a Vide App with AppForge.
@@ -18,34 +15,42 @@ local AppsLoaded = {}
 ]]
 local function App(props)
 	return function(constructor)
-		local _condition = props.renderGroup
-		if _condition == nil then
-			_condition = "None"
+		local _name = props.name
+		local _result = AppRegistry[_name]
+		if _result ~= nil then
+			local _condition = props.group
+			if not (_condition ~= "" and _condition) then
+				_condition = "None"
+			end
+			_result = _result[_condition] ~= nil
 		end
-		local _arg0 = `{_condition}-{props.name}`
-		if AppRegistry[_arg0] ~= nil then
-			logger:log("ERROR", "Duplicate App name detected", {
-				name = props.name,
-			})
-			error(`Duplicate registered App name "{props.name}". ` .. `App names must be globally unique.`, 2)
+		if _result then
+			error(`Duplicate registered App name "{props.name} in same Group name {props.group}". ` .. `App names must be globally unique.`, 2)
 		end
 		local _value = props.name
 		if not (_value ~= "" and _value) then
-			logger:log("ERROR", "Attempted to register App without a name", props)
 			error("App registration failed: missing app name", 2)
 		end
-		local _condition_1 = props.renderGroup
-		if _condition_1 == nil then
-			_condition_1 = "None"
+		local _name_1 = props.name
+		if not AppRegistry[_name_1] then
+			local _name_2 = props.name
+			AppRegistry[_name_2] = {}
+		end
+		local _name_2 = props.name
+		local _result_1 = AppRegistry[_name_2]
+		if _result_1 ~= nil then
+			local _condition = props.group
+			if not (_condition ~= "" and _condition) then
+				_condition = "None"
+			end
+			local _arg1 = {
+				constructor = constructor,
+				renderGroup = props.group,
+				visible = props.visible,
+				rules = props.rules,
+			}
+			_result_1[_condition] = _arg1
 		end
-		local _arg0_1 = `{_condition_1}-{props.name}`
-		local _arg1 = {
-			constructor = constructor,
-			renderGroup = props.renderGroup,
-			visible = props.visible,
-			rules = props.rules,
-		}
-		AppRegistry[_arg0_1] = _arg1
 		return constructor
 	end
 end
@@ -57,29 +62,23 @@ end
 local Args
 do
 	Args = {}
-	function Args:constructor(props, name)
+	function Args:constructor(props, name, group)
 		local _binding = props
 		local forge = _binding.forge
 		self.forge = forge
+		self.group = group
 		self.name = name
 		local _object = table.clone(props.props)
 		setmetatable(_object, nil)
-		_object.px = px
 		_object.forge = forge
+		_object.px = px
 		self.props = _object
-		local src = forge:getSource(name)
-		if not src then
-			logger:log("ERROR", "Missing visibility source for App", {
-				name = name,
-			})
-			error(`Failed to retrieve visibility source for app "{name}"`, 2)
-		end
-		self.source = src
+		self.source = forge:getSource(name, group)
 	end
 end
 return {
 	App = App,
 	AppRegistry = AppRegistry,
-	AppsLoaded = AppsLoaded,
+	AppSources = AppSources,
 	Args = Args,
 }

package/out/helpers/bindAppSource.d.ts

@@ -0,0 +1,2 @@
+import Vide from "@rbxts/vide";
+export default function bindAppSource(name: AppNames, group: AppGroups, value: Vide.Source<boolean>): void;

package/out/helpers/bindAppSource.luau

@@ -0,0 +1,22 @@
+-- Compiled with roblox-ts v3.0.0
+local TS = _G[script]
+-- Packages
+-- Components
+local AppSources = TS.import(script, script.Parent.Parent, "appRegistry").AppSources
+local function bindAppSource(name, group, value)
+	local _name = name
+	if not AppSources[_name] then
+		local _name_1 = name
+		AppSources[_name_1] = {}
+	end
+	local _name_1 = name
+	local _result = AppSources[_name_1]
+	if _result ~= nil then
+		local _group = group
+		local _value = value
+		_result[_group] = _value
+	end
+end
+return {
+	default = bindAppSource,
+}

package/out/helpers/getAppEntry.d.ts

@@ -0,0 +1,2 @@
+import type CreateForge from "../mount";
+export default function getAppEntry(forge: CreateForge, name: AppNames, group: AppGroups): import("../types").default.AppRegistry.Static | undefined;

package/out/helpers/getAppEntry.luau

@@ -0,0 +1,22 @@
+-- Compiled with roblox-ts v3.0.0
+local TS = _G[script]
+-- Types
+-- Components
+local AppRegistry = TS.import(script, script.Parent.Parent, "appRegistry").AppRegistry
+local function getAppEntry(forge, name, group)
+	local _name = name
+	local entryMap = AppRegistry[_name]
+	local _entry = entryMap
+	if _entry ~= nil then
+		local _group = group
+		_entry = _entry[_group]
+	end
+	local entry = _entry
+	if not entry then
+		forge.logger:log("WARN", `Failed to get entry for name {name} and group {group}`)
+	end
+	return entry
+end
+return {
+	default = getAppEntry,
+}

package/out/helpers/getAppSource.d.ts

@@ -0,0 +1,2 @@
+import type CreateForge from "../mount";
+export default function getAppSource(forge: CreateForge, name: AppNames, group: AppGroups): import("@rbxts/vide").Source<boolean> | undefined;

package/out/helpers/getAppSource.luau

@@ -0,0 +1,25 @@
+-- Compiled with roblox-ts v3.0.0
+local TS = _G[script]
+-- Types
+-- Components
+local AppSources = TS.import(script, script.Parent.Parent, "appRegistry").AppSources
+local function getAppSource(forge, name, group)
+	local _name = name
+	local sourceMap = AppSources[_name]
+	if not sourceMap then
+		forge.logger:log("WARN", `Failed to get source map for name {name} and group {group}`)
+	end
+	local _source = sourceMap
+	if _source ~= nil then
+		local _group = group
+		_source = _source[_group]
+	end
+	local source = _source
+	if not source then
+		forge.logger:log("WARN", `Failed to get source for name {name} and group {group}`)
+	end
+	return source
+end
+return {
+	default = getAppSource,
+}

package/out/helpers/hasAppSource.d.ts

@@ -0,0 +1 @@
+export default function hasAppSource(name: AppNames, group: AppGroups): boolean;

package/out/helpers/hasAppSource.luau

@@ -0,0 +1,24 @@
+-- Compiled with roblox-ts v3.0.0
+local TS = _G[script]
+-- Components
+local AppSources = TS.import(script, script.Parent.Parent, "appRegistry").AppSources
+local function hasAppSource(name, group)
+	local _name = name
+	local sourceMap = AppSources[_name]
+	if not sourceMap then
+		local _ = false
+	end
+	local _source = sourceMap
+	if _source ~= nil then
+		local _group = group
+		_source = _source[_group]
+	end
+	local source = _source
+	if not source then
+		local _ = false
+	end
+	return true
+end
+return {
+	default = hasAppSource,
+}

package/out/helpers/setAppSource.d.ts

@@ -0,0 +1 @@
+export default function setAppSource(name: AppNames, group: AppGroups, value: boolean): void;

package/out/helpers/setAppSource.luau

@@ -0,0 +1,34 @@
+-- Compiled with roblox-ts v3.0.0
+local TS = _G[script]
+-- Packages
+local source = TS.import(script, TS.getModule(script, "@rbxts", "vide").src).source
+-- Components
+local AppSources = TS.import(script, script.Parent.Parent, "appRegistry").AppSources
+local function setAppSource(name, group, value)
+	local _name = name
+	if not AppSources[_name] then
+		local _name_1 = name
+		AppSources[_name_1] = {}
+	end
+	local _name_1 = name
+	local _src = AppSources[_name_1]
+	if _src ~= nil then
+		local _group = group
+		_src = _src[_group]
+	end
+	local src = _src
+	if not src then
+		local newSource = source(value)
+		local _name_2 = name
+		local _result = AppSources[_name_2]
+		if _result ~= nil then
+			local _group = group
+			_result[_group] = newSource
+		end
+	else
+		src(false)
+	end
+end
+return {
+	default = setAppSource,
+}

package/out/mount.d.ts

@@ -1,22 +1,21 @@
 import Vide from "@rbxts/vide";
+import type Types from "./types";
 import Renders from "./renders";
 import Debugger from "./debugger";
 import Logger from "./logger";
-import Types from "./types";
 type Destructor = () => void;
 export default class AppForge extends Renders {
     readonly logger: Logger;
     readonly debug: Debugger;
-    private sources;
     private innerMount?;
     constructor();
     private createSource;
-    getSource(name: AppNames): Vide.Source<boolean>;
-    bind(name: AppNames, value: Vide.Source<boolean>): void;
-    set(name: AppNames, value: boolean, rules?: boolean): void;
-    open(name: AppNames, rules?: boolean): void;
-    close(name: AppNames, rules?: boolean): void;
-    toggle(name: AppNames, rules?: boolean): void;
+    getSource(name: AppNames, group?: AppGroups): Vide.Source<boolean> | undefined;
+    bind(name: AppNames, group: AppGroups | undefined, value: Vide.Source<boolean>): void;
+    set(name: AppNames, group: AppGroups | undefined, value: boolean, rules?: boolean): void;
+    open(name: AppNames, group?: AppGroups, rules?: boolean): void;
+    close(name: AppNames, group?: AppGroups, rules?: boolean): void;
+    toggle(name: AppNames, group?: AppGroups, rules?: boolean): void;
     story(props: AppProps, target: GuiObject, config?: {
         render?: Types.Props.Render;
         minScale?: number;

package/out/mount.luau

@@ -8,14 +8,21 @@ local Vide = _vide
 local apply = _vide.apply
 local create = _vide.create
 local effect = _vide.effect
-local source = _vide.source
 local untrack = _vide.untrack
+-- Types
 -- Classes
 local Renders = TS.import(script, script.Parent, "renders").default
--- Helpers
+-- Components
 local AppRegistry = TS.import(script, script.Parent, "appRegistry").AppRegistry
+-- Classes
 local Debugger = TS.import(script, script.Parent, "debugger").default
 local Logger = TS.import(script, script.Parent, "logger").default
+-- Helpers
+local bindAppSource = TS.import(script, script.Parent, "helpers", "bindAppSource").default
+local getAppSource = TS.import(script, script.Parent, "helpers", "getAppSource").default
+local hasAppSource = TS.import(script, script.Parent, "helpers", "hasAppSource").default
+local setAppSource = TS.import(script, script.Parent, "helpers", "setAppSource").default
+local getAppEntry = TS.import(script, script.Parent, "helpers", "getAppEntry").default
 local AppForge
 do
 	local super = Renders
@@ -36,70 +43,70 @@ do
 		self.debug = Debugger.new(function(level, msg, data, trace)
 			return self.logger:log(level, msg, data, trace)
 		end)
-		self.sources = {}
 		-- ▼ ReadonlyMap.forEach ▼
-		local _callback = function(_, name)
-			return self:createSource(name)
+		local _callback = function(_, key)
+			local _binding = string.split(key, "-")
+			local group = _binding[1]
+			local name = _binding[2]
+			self:createSource(name, group)
 		end
 		for _k, _v in AppRegistry do
 			_callback(_v, _k, AppRegistry)
 		end
 		-- ▲ ReadonlyMap.forEach ▲
 	end
-	function AppForge:createSource(name)
-		local _arg0 = `-{name}`
-		local app = AppRegistry[_arg0]
-		if not app then
-			self.logger:log("ERROR", "App not registered while creating source", {
+	function AppForge:createSource(name, group)
+		if group == nil then
+			group = "None"
+		end
+		local entry = getAppEntry(self, name, group)
+		if not entry then
+			self.logger:log("ERROR", "App Entry not registered while creating source", {
 				name = name,
 			})
 			return nil
 		end
-		local _sources = self.sources
-		local _name = name
-		if _sources[_name] ~= nil then
+		if hasAppSource(name, group) then
 			return nil
 		end
 		local _debug = self.debug
 		local _exp = name
 		local _object = {}
 		local _left = "default"
-		local _condition = app.visible
+		local _condition = entry.visible
 		if _condition == nil then
 			_condition = false
 		end
 		_object[_left] = _condition
 		_debug:logTag("state", _exp, "Creating visibility source", _object)
-		local _sources_1 = self.sources
 		local _exp_1 = name
-		local _condition_1 = app.visible
+		local _exp_2 = group
+		local _condition_1 = entry.visible
 		if _condition_1 == nil then
 			_condition_1 = false
 		end
-		local _arg1 = source(_condition_1)
-		_sources_1[_exp_1] = _arg1
+		setAppSource(_exp_1, _exp_2, _condition_1)
 	end
-	function AppForge:getSource(name)
-		local _sources = self.sources
-		local _name = name
-		if not (_sources[_name] ~= nil) then
-			self:createSource(name)
-		end
-		local _sources_1 = self.sources
-		local _name_1 = name
-		local src = _sources_1[_name_1]
+	function AppForge:getSource(name, group)
+		if group == nil then
+			group = "None"
+		end
+		if not hasAppSource(name, group) then
+			self:createSource(name, group)
+		end
+		local src = getAppSource(self, name, group)
 		if not src then
-			error(`AppForge invariant broken: missing visibility source for {name}`, 2)
+			self.logger:log("WARN", `Failed to get source for name {name} group {group}`)
 		end
 		return src
 	end
-	function AppForge:bind(name, value)
+	function AppForge:bind(name, group, value)
+		if group == nil then
+			group = "None"
+		end
 		if not RunService:IsRunning() then
 			self.debug:logTag("state", name, "Binding external visibility source")
-			local _sources = self.sources
-			local _name = name
-			local _value = value
-			_sources[_name] = _value
+			bindAppSource(name, group, value)
 			local prev
 			local log = function()
 				return self.debug:logTag("state", name, "Visibility changed", {
@@ -112,7 +119,7 @@ do
 				count += 1
 				prev = value()
 				untrack(function()
-					return self:checkRules(self, name)
+					return self:checkRules(self, name, group)
 				end)
 				if Vide.strict and count == 2 then
 					log()
@@ -128,23 +135,15 @@ do
 			})
 		end
 	end
-	function AppForge:set(name, value, rules)
+	function AppForge:set(name, group, value, rules)
+		if group == nil then
+			group = "None"
+		end
 		if rules == nil then
 			rules = true
 		end
-		local _sources = self.sources
-		local _name = name
-		local src = _sources[_name]
+		local src = getAppSource(self, name, group)
 		if not src then
-			self:createSource(name)
-			local _sources_1 = self.sources
-			local _name_1 = name
-			src = _sources_1[_name_1]
-		end
-		if not src then
-			self.logger:log("ERROR", "Failed to set visibility (missing source)", {
-				name = name,
-			})
 			return nil
 		end
 		local prev = src()
@@ -157,26 +156,39 @@ do
 			to = value,
 		})
 		if rules then
-			self:checkRules(self, name)
+			self:checkRules(self, name, group)
 		end
 	end
-	function AppForge:open(name, rules)
+	function AppForge:open(name, group, rules)
+		if group == nil then
+			group = "None"
+		end
 		if rules == nil then
 			rules = true
 		end
-		self:set(name, true, rules)
+		self:set(name, group, true, rules)
 	end
-	function AppForge:close(name, rules)
+	function AppForge:close(name, group, rules)
+		if group == nil then
+			group = "None"
+		end
 		if rules == nil then
 			rules = true
 		end
-		self:set(name, false, rules)
+		self:set(name, group, false, rules)
 	end
-	function AppForge:toggle(name, rules)
+	function AppForge:toggle(name, group, rules)
+		if group == nil then
+			group = "None"
+		end
 		if rules == nil then
 			rules = true
 		end
-		self:set(name, not self:getSource(name)(), rules)
+		local src = self:getSource(name, group)
+		if not src then
+			return self.logger:log("ERROR", `Failed to get Source for name {name} group {group}`)
+		end
+		self:set(name, group, not src(), rules)
 	end
 	function AppForge:story(props, target, config)
 		self.debug:logTag("lifecycle", "story", "Creating story mount")

package/out/renders.luau

@@ -6,6 +6,9 @@ local Vide = _vide
 local mount = _vide.mount
 -- Types
 -- Components
+local _appRegistry = TS.import(script, script.Parent, "appRegistry")
+local AppRegistry = _appRegistry.AppRegistry
+local AppSources = _appRegistry.AppSources
 -- Hooks
 local usePx = TS.import(script, script.Parent, "hooks", "usePx").usePx
 -- Classes
@@ -31,6 +34,8 @@ do
 	function Renders:Render(_param)
 		local props = _param.props
 		print(props)
+		print(AppRegistry)
+		print(AppSources)
 	end
 	function Renders:initalize(props, target, root)
 		if not self.__px then

package/out/ruleEngine/check/exclusiveGroup.d.ts

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

package/out/ruleEngine/check/exclusiveGroup.luau

@@ -3,19 +3,12 @@ local TS = _G[script]
 -- Types
 -- Components
 local AppRegistry = TS.import(script, script.Parent.Parent.Parent, "appRegistry").AppRegistry
-local function ExclusiveGroupRule(name, forge)
-	local _name = name
-	local entryApp = AppRegistry[_name]
-	local _group = entryApp
-	if _group ~= nil then
-		_group = _group.rules
-		if _group ~= nil then
-			_group = _group.exclusiveGroup
-		end
-	end
-	local group = _group
-	if not (group ~= "" and group) then
-		return nil
+-- Helpers
+local getAppEntry = TS.import(script, script.Parent.Parent.Parent, "helpers", "getAppEntry").default
+local function ExclusiveGroupRule(forge, name, group)
+	local entry = getAppEntry(forge, name, group)
+	if not entry then
+		forge.logger:log("ERROR", `Failed to find app entry for "ExclusiveGroupRule" name {name} group {group} `)
 	end
 	local entryVisible = forge:getSource(name)()
 	if not entryVisible then
@@ -23,26 +16,33 @@ local function ExclusiveGroupRule(name, forge)
 	end
 	forge.debug:logTag("rules", name, "Exclusive group activated", group)
 	-- ▼ ReadonlyMap.forEach ▼
-	local _callback = function(app, name)
-		if name == name then
-			return nil
-		end
-		local _result = app.rules
-		if _result ~= nil then
-			_result = _result.exclusiveGroup
-		end
-		if _result ~= group then
-			return nil
+	local _callback = function(entryMap, entryGroup)
+		-- ▼ ReadonlyMap.forEach ▼
+		local _callback_1 = function(entry, entryName)
+			if name == entryName then
+				return nil
+			end
+			local _result = entry.rules
+			if _result ~= nil then
+				_result = _result.exclusiveGroup
+			end
+			if _result ~= entryGroup then
+				return nil
+			end
+			local visible = forge:getSource(entryName)()
+			if not visible then
+				return nil
+			end
+			forge.debug:logTag("rules", entryName, "Closing app due to exclusive group", {
+				closed = entryName,
+				entryGroup = entryGroup,
+			})
+			forge:close(entryName, entryGroup, false)
 		end
-		local visible = forge:getSource(name)()
-		if not visible then
-			return nil
+		for _k, _v in entryMap do
+			_callback_1(_v, _k, entryMap)
 		end
-		forge.debug:logTag("rules", name, "Closing app due to exclusive group", {
-			closed = name,
-			group = group,
-		})
-		forge:close(name, false)
+		-- ▲ ReadonlyMap.forEach ▲
 	end
 	for _k, _v in AppRegistry do
 		_callback(_v, _k, AppRegistry)

package/out/ruleEngine/check/parent.d.ts

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

package/out/ruleEngine/check/parent.luau

@@ -1,11 +1,11 @@
 -- Compiled with roblox-ts v3.0.0
 local TS = _G[script]
 -- Types
--- Components
-local AppRegistry = TS.import(script, script.Parent.Parent.Parent, "appRegistry").AppRegistry
-local function ParentRule(name, forge)
-	local _name = name
-	local entry = AppRegistry[_name]
+-- Helpers
+local getAppSource = TS.import(script, script.Parent.Parent.Parent, "helpers", "getAppSource").default
+local getAppEntry = TS.import(script, script.Parent.Parent.Parent, "helpers", "getAppEntry").default
+local function ParentRule(forge, name, group)
+	local entry = getAppEntry(forge, name, group)
 	local _result = entry
 	if _result ~= nil then
 		_result = _result.rules
@@ -16,17 +16,18 @@ local function ParentRule(name, forge)
 	if not (_result ~= "" and _result) then
 		return nil
 	end
-	local _forge = forge
-	local _result_1 = entry
-	if _result_1 ~= nil then
-		_result_1 = _result_1.rules
-		if _result_1 ~= nil then
-			_result_1 = _result_1.parent
-		end
+	local _exp = forge
+	local _exp_1 = entry.rules.parent
+	local _condition = entry.rules.parentGroup
+	if _condition == nil then
+		_condition = "None"
 	end
-	local parentSource = _forge:getSource(_result_1)
-	if not parentSource() then
-		local source = forge:getSource(name)
+	local parentSource = getAppSource(_exp, _exp_1, _condition)
+	if parentSource and parentSource() == false then
+		local source = forge:getSource(name, group)
+		if not source then
+			return forge.logger:log("ERROR", `Failed to get Source for name {name} group {group}`)
+		end
 		if source() then
 			source(false)
 		end

package/out/ruleEngine/index.d.ts

@@ -2,6 +2,6 @@ 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;
+    protected renderRules(forge: AppForge, name: AppNames, group: AppGroups | undefined, props: Types.Props.Main): void;
+    protected checkRules(forge: AppForge, name: AppNames, group: AppGroups): void;
 }

package/out/ruleEngine/init.luau

@@ -2,11 +2,12 @@
 local TS = _G[script]
 -- Types
 -- Components
-local AppRegistry = TS.import(script, script.Parent, "appRegistry").AppRegistry
 -- Rules
 local ExclusiveGroupRule = TS.import(script, script, "check", "exclusiveGroup").default
-local ParentRule = TS.import(script, script, "check", "parent").default
 local AnchorRule = TS.import(script, script, "render", "anchor").default
+local ParentRule = TS.import(script, script, "check", "parent").default
+-- Helpers
+local getAppEntry = TS.import(script, script.Parent, "helpers", "getAppEntry").default
 local Rules
 do
 	Rules = setmetatable({}, {
@@ -22,13 +23,15 @@ do
 	function Rules:constructor()
 		self.processing = {}
 	end
-	function Rules:renderRules(forge, name, props)
-		local _name = name
-		local appClass = AppRegistry[_name]
-		if not appClass then
-			error(`renderRules: App "{name}" not registered`, 2)
+	function Rules:renderRules(forge, name, group, props)
+		if group == nil then
+			group = "None"
+		end
+		local entry = getAppEntry(forge, name, group)
+		if not entry then
+			error(`renderRules: App Entry name "{name}" group "{group}" not registered`, 2)
 		end
-		local rules = appClass.rules
+		local rules = entry.rules
 		if not rules then
 			return nil
 		end
@@ -41,7 +44,7 @@ do
 			forge.debug:logTag("rules", name, "Applying parent anchor", {
 				parent = rules.parent,
 			})
-			AnchorRule(name, props)
+			AnchorRule(name, group, props)
 		end
 		-- Index
 		if rules.zIndex ~= nil then
@@ -50,7 +53,7 @@ do
 			-- forge.index(name, rules.zIndex);
 		end
 	end
-	function Rules:checkRules(forge, name)
+	function Rules:checkRules(forge, name, group)
 		local _processing = self.processing
 		local _name = name
 		if _processing[_name] ~= nil then
@@ -62,8 +65,8 @@ do
 		_processing_1[_name_1] = true
 		forge.debug:logTag("rules", name, "Evaluating rules")
 		TS.try(function()
-			ParentRule(name, forge)
-			ExclusiveGroupRule(name, forge)
+			ParentRule(forge, name, group)
+			ExclusiveGroupRule(forge, name, group)
 		end, nil, function()
 			local _processing_2 = self.processing
 			local _name_2 = name

package/out/ruleEngine/render/anchor.d.ts

@@ -1,2 +1,2 @@
 import type Types from "../../types";
-export default function anchor(name: AppNames, props: Types.Props.Main): void;
+export default function anchor(name: AppNames, group: AppGroups | undefined, props: Types.Props.Main): void;

package/out/ruleEngine/render/anchor.luau

@@ -1,37 +1,10 @@
 -- Compiled with roblox-ts v3.0.0
-local TS = _G[script]
 -- Types
--- Components
-local _appRegistry = TS.import(script, script.Parent.Parent.Parent, "appRegistry")
-local AppRegistry = _appRegistry.AppRegistry
-local AppsLoaded = _appRegistry.AppsLoaded
-local function anchor(name, props)
-	local _binding = props
-	local forge = _binding.forge
-	local _name = name
-	local app = AppRegistry[_name]
-	local _result = app
-	if _result ~= nil then
-		_result = _result.renderGroup
+local function anchor(name, group, props)
+	if group == nil then
+		group = "None"
 	end
-	local _condition = _result
-	if _condition == nil then
-		_condition = "None"
-	end
-	local _arg0 = `{_condition}-{name}`
-	local loaded = AppsLoaded[_arg0]
-	local _result_1 = app
-	if _result_1 ~= nil then
-		_result_1 = _result_1.rules
-		if _result_1 ~= nil then
-			_result_1 = _result_1.parent
-		end
-	end
-	local parentApp = AppRegistry[_result_1]
-	if not parentApp then
-		forge.debug:logTag("rules", name, `Has no Parent to Anchor to, Remove the Anchor For {name}`)
-	end
-	print(`App: {app} \n Loaded: {loaded} \n parentApp: {parentApp}`)
+	-- TODO: FIX THIS TO ANCHOR APP TO PARENT IF HAS ONE WARN IF DOESN'T
 end
 return {
 	default = anchor,

package/out/types.d.ts

@@ -34,23 +34,23 @@ declare namespace Types {
 		type Props<N extends AppNames> = {
 			name: N;
 			visible?: boolean;
-			renderGroup?: AppGroups;
+			group?: AppGroups;
 			rules?: Rules.Generic<N>;
 		};
 
 		type Static = {
-			constructor: new (props: Types.Props.Main, name: AppNames) => Args;
+			constructor: new (props: Types.Props.Main, name: AppNames, group?: AppGroups) => Args;
 
 			visible?: boolean;
-			renderGroup?: AppGroups;
+			group?: AppGroups;
 			rules?: Rules.Static;
 		};
 
 		type Generic<N extends AppNames = AppNames> = {
-			constructor: new (props: Types.Props.Main, name: AppNames) => Args;
+			constructor: new (props: Types.Props.Main, name: AppNames, group?: AppGroups) => Args;
 
 			visible?: boolean;
-			renderGroup?: AppGroups;
+			group?: AppGroups;
 			rules?: Rules.Generic<N>;
 		};
 	}
@@ -58,11 +58,15 @@ declare namespace Types {
 	namespace Rules {
 		type WithParent<P> = {
 			parent: P;
+
+			parentGroup: AppGroups;
 			anchor?: boolean;
 		};
 
 		type WithoutParent = {
 			parent?: never;
+
+			parentGroup: never;
 			anchor?: never;
 		};
 

package/package.json

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