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

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,52 @@ 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
+			local _exp = props.name
+			local _condition = props.group
+			if not (_condition ~= "" and _condition) then
+				_condition = "None"
+			end
+			error(`Duplicate registered App name "{_exp} in same Group name {_condition}". ` .. `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 _object = {
+				constructor = constructor,
+			}
+			local _left = "group"
+			local _condition_1 = props.group
+			if not (_condition_1 ~= "" and _condition_1) then
+				_condition_1 = "None"
+			end
+			_object[_left] = _condition_1
+			_object.visible = props.visible
+			_object.rules = props.rules
+			_result_1[_condition] = _object
 		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 +72,27 @@ 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
+		local _condition = group
+		if not (_condition ~= "" and _condition) then
+			_condition = "None"
+		end
+		self.group = _condition
 		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 @@
+export default function getAppEntry(name: AppNames, group: AppGroups): import("../types").default.AppRegistry.Static | undefined;

package/out/helpers/getAppEntry.luau

@@ -0,0 +1,21 @@
+-- Compiled with roblox-ts v3.0.0
+local TS = _G[script]
+-- Components
+local AppRegistry = TS.import(script, script.Parent.Parent, "appRegistry").AppRegistry
+local function getAppEntry(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
+		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 @@
+export default function getAppSource(name: AppNames, group: AppGroups): import("@rbxts/vide").Source<boolean> | undefined;

package/out/helpers/getAppSource.luau

@@ -0,0 +1,21 @@
+-- Compiled with roblox-ts v3.0.0
+local TS = _G[script]
+-- Components
+local AppSources = TS.import(script, script.Parent.Parent, "appRegistry").AppSources
+local function getAppSource(name, group)
+	local _name = name
+	local sourceMap = AppSources[_name]
+	local _source = sourceMap
+	if _source ~= nil then
+		local _group = group
+		_source = _source[_group]
+	end
+	local source = _source
+	if not source then
+		warn(`Failed to find source for name: {name} group: {group} \n {debug.traceback()}`)
+	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
+		return false
+	end
+	local _source = sourceMap
+	if _source ~= nil then
+		local _group = group
+		_source = _source[_group]
+	end
+	local source = _source
+	if not source then
+		return 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/hooks/useAppContext.luau

@@ -2,13 +2,9 @@
 local TS = _G[script]
 -- Components
 local Contexts = TS.import(script, script.Parent.Parent, "context").default
--- Debug
-local Logger = TS.import(script, script.Parent.Parent, "logger").default
-local logger = Logger.new("useAppContext")
 local default = function()
 	local context = Contexts.App()
 	if not context then
-		logger:log("ERROR", "Failed to retrieve App context")
 		error(`Failed to retrieve App Props for Vide\n{debug.traceback()}`, 2)
 	end
 	return context

package/out/hooks/useEventListener.luau

@@ -1,9 +1,6 @@
 -- Compiled with roblox-ts v3.0.0
 local TS = _G[script]
 local cleanup = TS.import(script, TS.getModule(script, "@rbxts", "vide").src).cleanup
--- Debug
-local Logger = TS.import(script, script.Parent.Parent, "logger").default
-local logger = Logger.new("useEventListener")
 local connect = function(event, callback)
 	local _event = event
 	if typeof(_event) == "RBXScriptSignal" then
@@ -22,7 +19,6 @@ local connect = function(event, callback)
 	elseif event.subscribe ~= nil then
 		return event:subscribe(callback)
 	end
-	logger:log("ERROR", "Unsupported event-like object", event)
 	error("Event-like object does not have a supported connect method.", 2)
 end
 local disconnect = function(connection)
@@ -40,7 +36,7 @@ local disconnect = function(connection)
 		elseif connection.disconnect ~= nil then
 			connection:disconnect()
 		else
-			logger:log("WARN", "Unsupported connection-like object during cleanup", connection)
+			warn("Unsupported connection-like object during cleanup", connection)
 		end
 	end
 end

package/out/hooks/usePx.luau

@@ -6,9 +6,6 @@ local Workspace = TS.import(script, TS.getModule(script, "@rbxts", "services")).
 local source = TS.import(script, TS.getModule(script, "@rbxts", "vide").src).source
 -- Helpers
 local useEventListener = TS.import(script, script.Parent, "useEventListener").useEventListener
--- Debug
-local Logger = TS.import(script, script.Parent.Parent, "logger").default
-local logger = Logger.new("usePx")
 --* Default reference resolution for px calculations 
 local BASE_RESOLUTION = source(Vector2.new(1920, 1080))
 --* Minimum allowed scale to prevent unreadable UI 
@@ -70,8 +67,7 @@ end
 ]]
 local function usePx(target, baseResolution, minScale)
 	if INITIALIZED then
-		logger:log("WARN", "usePx() called more than once")
-		return nil
+		return warn("usePx() called more than once")
 	end
 	INITIALIZED = true
 	if baseResolution then
@@ -85,8 +81,7 @@ local function usePx(target, baseResolution, minScale)
 	end
 	local resolvedTarget = TARGET()
 	if not resolvedTarget then
-		logger:log("WARN", "usePx(): no valid target to observe")
-		return nil
+		return warn("usePx(): no valid target to observe")
 	end
 	local signal = if resolvedTarget:IsA("Camera") then resolvedTarget:GetPropertyChangedSignal("ViewportSize") else resolvedTarget:GetPropertyChangedSignal("AbsoluteSize")
 	useEventListener(signal, calculateScale)

package/out/mount.d.ts

@@ -1,26 +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>;
+    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;
     }): Frame;
-    mount(node: Vide.Node, props: Exclude<Types.Props.Main, "forge">, target: Instance): Destructor;
+    mount(props: Omit<Types.Props.Main, "forge">, target: Instance, root?: GuiObject | Instance): Destructor | undefined;
 }
 export {};

package/out/mount.luau

@@ -8,15 +8,18 @@ local Vide = _vide
 local apply = _vide.apply
 local create = _vide.create
 local effect = _vide.effect
-local mount = _vide.mount
-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
-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
@@ -33,119 +36,82 @@ do
 	end
 	function AppForge:constructor()
 		super.constructor(self)
-		self.logger = Logger.new("AppForge")
-		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(entryMap, name)
+			-- ▼ ReadonlyMap.forEach ▼
+			local _callback_1 = function(_, group)
+				self:createSource(name, group)
+			end
+			for _k, _v in entryMap do
+				_callback_1(_v, _k, entryMap)
+			end
+			-- ▲ ReadonlyMap.forEach ▲
 		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", {
-				name = name,
-			})
+	function AppForge:createSource(name, group)
+		if group == nil then
+			group = "None"
+		end
+		local entry = getAppEntry(name, group)
+		if not entry then
 			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 _exp_1 = group
+		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
-		if _condition_1 == nil then
-			_condition_1 = false
-		end
-		local _arg1 = source(_condition_1)
-		_sources_1[_exp_1] = _arg1
+		setAppSource(_exp, _exp_1, _condition)
 	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]
-		if not src then
-			error(`AppForge invariant broken: missing visibility source for {name}`, 2)
+	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(name, group)
 		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
-			local prev
-			local log = function()
-				return self.debug:logTag("state", name, "Visibility changed", {
-					from = prev,
-					to = value,
-				})
-			end
+			bindAppSource(name, group, value)
 			local count = 0
+			local _prev
 			effect(function()
 				count += 1
-				prev = value()
+				_prev = value()
 				untrack(function()
-					return self:checkRules(self, name)
+					return self:checkRules(self, name, group)
 				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", {
-				name = name,
-			})
 		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]
-		if not src then
-			self:createSource(name)
-			local _sources_1 = self.sources
-			local _name_1 = name
-			src = _sources_1[_name_1]
-		end
+		local src = getAppSource(name, group)
 		if not src then
-			self.logger:log("ERROR", "Failed to set visibility (missing source)", {
-				name = name,
-			})
 			return nil
 		end
 		local prev = src()
@@ -153,34 +119,42 @@ do
 			return nil
 		end
 		src(value)
-		self.debug:logTag("state", name, "Visibility changed", {
-			from = prev,
-			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 nil
+		end
+		self:set(name, group, not src(), rules)
 	end
 	function AppForge:story(props, target, config)
-		self.debug:logTag("lifecycle", "story", "Creating story mount")
 		local Container = create("Frame")({
 			Name = "Story Container",
 			BackgroundTransparency = 1,
@@ -220,20 +194,12 @@ do
 		_fn(_object)
 		return Container
 	end
-	function AppForge:mount(node, props, target)
-		self.debug:logTag("lifecycle", "mount", "Mounting AppForge")
-		self.innerMount = mount(function()
-			local _fn = apply(node)
-			local _object = {}
-			local _left = 0
-			local _self = self
-			local _object_1 = table.clone(props)
-			setmetatable(_object_1, nil)
-			_object_1.forge = self
-			_object[_left] = _self:initalize(_object_1)
-			_fn(_object)
-			return node
-		end, target)
+	function AppForge:mount(props, target, root)
+		local _self = self
+		local _object = table.clone(props)
+		setmetatable(_object, nil)
+		_object.forge = self
+		_self:initalize(_object, target, root)
 		return self.innerMount
 	end
 end