@rbxts/app-forge 0.7.2-prototype.2 → 0.7.2-prototype.4

package/out/appRegistry.d.ts

@@ -2,6 +2,7 @@ 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>;
 /**
  * Registers a Vide App with AppForge.
  *

package/out/appRegistry.luau

@@ -8,6 +8,7 @@ local px = TS.import(script, script.Parent, "hooks", "usePx").px
 local Logger = TS.import(script, script.Parent, "logger").default
 local logger = Logger.new("AppRegistry")
 local AppRegistry = {}
+local AppsLoaded = {}
 --[[
 	*
 	 * Registers a Vide App with AppForge.
@@ -17,8 +18,12 @@ local AppRegistry = {}
 ]]
 local function App(props)
 	return function(constructor)
-		local _name = props.name
-		if AppRegistry[_name] ~= nil then
+		local _condition = props.renderGroup
+		if _condition == nil then
+			_condition = "None"
+		end
+		local _arg0 = `{_condition}-{props.name}`
+		if AppRegistry[_arg0] ~= nil then
 			logger:log("ERROR", "Duplicate App name detected", {
 				name = props.name,
 			})
@@ -29,14 +34,18 @@ local function App(props)
 			logger:log("ERROR", "Attempted to register App without a name", props)
 			error("App registration failed: missing app name", 2)
 		end
-		local _name_1 = props.name
+		local _condition_1 = props.renderGroup
+		if _condition_1 == nil then
+			_condition_1 = "None"
+		end
+		local _arg0_1 = `{_condition_1}-{props.name}`
 		local _arg1 = {
 			constructor = constructor,
 			renderGroup = props.renderGroup,
 			visible = props.visible,
 			rules = props.rules,
 		}
-		AppRegistry[_name_1] = _arg1
+		AppRegistry[_arg0_1] = _arg1
 		return constructor
 	end
 end
@@ -71,5 +80,6 @@ end
 return {
 	App = App,
 	AppRegistry = AppRegistry,
+	AppsLoaded = AppsLoaded,
 	Args = Args,
 }

package/out/mount.d.ts

@@ -1,24 +1,17 @@
 import Vide from "@rbxts/vide";
-import Renders from "./renderManager";
+import Renders from "./renders";
 import Debugger from "./debugger";
 import Logger from "./logger";
 import Types from "./types";
 type Destructor = () => void;
-type Loaded = {
-    container: Vide.Node;
-    render: Vide.Node;
-    anchor?: Vide.Node;
-};
 export default class AppForge extends Renders {
     readonly logger: Logger;
     readonly debug: Debugger;
-    protected sources: Map<string, Vide.Source<boolean>>;
-    protected loaded: Map<string, Loaded>;
-    protected innerMount?: Destructor;
+    private sources;
+    private innerMount?;
     constructor();
-    protected createSource(name: AppNames): void;
+    private createSource;
     getSource(name: AppNames): Vide.Source<boolean>;
-    isLoaded(name: AppNames): boolean;
     bind(name: AppNames, value: Vide.Source<boolean>): void;
     set(name: AppNames, value: boolean, rules?: boolean): void;
     open(name: AppNames, rules?: boolean): void;
@@ -28,6 +21,6 @@ export default class AppForge extends Renders {
         render?: Types.Props.Render;
         minScale?: number;
     }): Frame;
-    mount(node: Vide.Node, props: Types.Props.Main, target: Instance): Destructor;
+    mount(props: Exclude<Types.Props.Main, "forge">, target: Instance, root?: () => GuiObject | Instance): Destructor | undefined;
 }
 export {};

package/out/mount.luau

@@ -8,11 +8,10 @@ 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
 -- Classes
-local Renders = TS.import(script, script.Parent, "renderManager").default
+local Renders = TS.import(script, script.Parent, "renders").default
 -- Helpers
 local AppRegistry = TS.import(script, script.Parent, "appRegistry").AppRegistry
 local Debugger = TS.import(script, script.Parent, "debugger").default
@@ -38,7 +37,6 @@ do
 			return self.logger:log(level, msg, data, trace)
 		end)
 		self.sources = {}
-		self.loaded = {}
 		-- ▼ ReadonlyMap.forEach ▼
 		local _callback = function(_, name)
 			return self:createSource(name)
@@ -49,8 +47,8 @@ do
 		-- ▲ ReadonlyMap.forEach ▲
 	end
 	function AppForge:createSource(name)
-		local _name = name
-		local app = AppRegistry[_name]
+		local _arg0 = `-{name}`
+		local app = AppRegistry[_arg0]
 		if not app then
 			self.logger:log("ERROR", "App not registered while creating source", {
 				name = name,
@@ -58,8 +56,8 @@ do
 			return nil
 		end
 		local _sources = self.sources
-		local _name_1 = name
-		if _sources[_name_1] ~= nil then
+		local _name = name
+		if _sources[_name] ~= nil then
 			return nil
 		end
 		local _debug = self.debug
@@ -95,11 +93,6 @@ do
 		end
 		return src
 	end
-	function AppForge:isLoaded(name)
-		local _loaded = self.loaded
-		local _name = name
-		return _loaded[_name] ~= nil
-	end
 	function AppForge:bind(name, value)
 		if not RunService:IsRunning() then
 			self.debug:logTag("state", name, "Binding external visibility source")
@@ -226,14 +219,13 @@ do
 		_fn(_object)
 		return Container
 	end
-	function AppForge:mount(node, props, target)
+	function AppForge:mount(props, target, root)
 		self.debug:logTag("lifecycle", "mount", "Mounting AppForge")
-		self.innerMount = mount(function()
-			apply(node)({
-				[0] = self:initalize(props),
-			})
-			return node
-		end, target)
+		local _self = self
+		local _object = table.clone(props)
+		setmetatable(_object, nil)
+		_object.forge = self
+		_self:initalize(_object, target, root)
 		return self.innerMount
 	end
 end

package/out/renders.d.ts

@@ -0,0 +1,9 @@
+import Vide from "@rbxts/vide";
+import type Types from "./types";
+import Rules from "./ruleEngine";
+export default class Renders extends Rules {
+    private __px;
+    constructor();
+    private Render;
+    protected initalize(props: Types.Props.Main, target?: GuiObject | Instance, root?: () => GuiObject | Instance): Vide.Node;
+}

package/out/renders.luau

@@ -0,0 +1,70 @@
+-- Compiled with roblox-ts v3.0.0
+local TS = _G[script]
+-- Packages
+local _vide = TS.import(script, TS.getModule(script, "@rbxts", "vide").src)
+local Vide = _vide
+local mount = _vide.mount
+-- Types
+-- Components
+-- Hooks
+local usePx = TS.import(script, script.Parent, "hooks", "usePx").usePx
+-- Classes
+local Rules = TS.import(script, script.Parent, "ruleEngine").default
+local Renders
+do
+	local super = Rules
+	Renders = setmetatable({}, {
+		__tostring = function()
+			return "Renders"
+		end,
+		__index = super,
+	})
+	Renders.__index = Renders
+	function Renders.new(...)
+		local self = setmetatable({}, Renders)
+		return self:constructor(...) or self
+	end
+	function Renders:constructor()
+		super.constructor(self)
+		self.__px = false
+	end
+	function Renders:Render(props)
+		print(props)
+	end
+	function Renders:initalize(props, target, root)
+		if not self.__px then
+			local _result = props.config
+			if _result ~= nil then
+				_result = _result.px.target
+			end
+			local _result_1 = props.config
+			if _result_1 ~= nil then
+				_result_1 = _result_1.px.resolution
+			end
+			local _result_2 = props.config
+			if _result_2 ~= nil then
+				_result_2 = _result_2.px.minScale
+			end
+			usePx(_result, _result_1, _result_2)
+			self.__px = true
+		end
+		if target then
+			mount(if root then root else function()
+				local _attributes = table.clone(props)
+				setmetatable(_attributes, nil)
+				return Vide.jsx("screengui", {
+					Name = "App Tree",
+					ZIndexBehavior = "Sibling",
+					ResetOnSpawn = false,
+				}, Vide.jsx(self.Render, _attributes))
+			end, target)
+		else
+			local _attributes = table.clone(props)
+			setmetatable(_attributes, nil)
+			return Vide.jsx(self.Render, _attributes)
+		end
+	end
+end
+return {
+	default = Renders,
+}

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

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

package/out/ruleEngine/{exclusiveGroup.luau → check/exclusiveGroup.luau}

@@ -2,10 +2,10 @@
 local TS = _G[script]
 -- Types
 -- Components
-local AppRegistry = TS.import(script, script.Parent.Parent, "appRegistry").AppRegistry
-local function ExclusiveGroupRule(entry, forge)
-	local _entry = entry
-	local entryApp = AppRegistry[_entry]
+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
@@ -17,14 +17,14 @@ local function ExclusiveGroupRule(entry, forge)
 	if not (group ~= "" and group) then
 		return nil
 	end
-	local entryVisible = forge:getSource(entry)()
+	local entryVisible = forge:getSource(name)()
 	if not entryVisible then
 		return nil
 	end
-	forge.debug:logTag("rules", entry, "Exclusive group activated", group)
+	forge.debug:logTag("rules", name, "Exclusive group activated", group)
 	-- ▼ ReadonlyMap.forEach ▼
 	local _callback = function(app, name)
-		if name == entry then
+		if name == name then
 			return nil
 		end
 		local _result = app.rules
@@ -38,7 +38,7 @@ local function ExclusiveGroupRule(entry, forge)
 		if not visible then
 			return nil
 		end
-		forge.debug:logTag("rules", entry, "Closing app due to exclusive group", {
+		forge.debug:logTag("rules", name, "Closing app due to exclusive group", {
 			closed = name,
 			group = group,
 		})

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

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

package/out/ruleEngine/check/parent.luau

@@ -0,0 +1,37 @@
+-- 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]
+	local _result = entry
+	if _result ~= nil then
+		_result = _result.rules
+		if _result ~= nil then
+			_result = _result.parent
+		end
+	end
+	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
+	end
+	local parentSource = _forge:getSource(_result_1)
+	if not parentSource() then
+		local source = forge:getSource(name)
+		if source() then
+			source(false)
+		end
+	end
+end
+return {
+	default = ParentRule,
+}

package/out/ruleEngine/init.luau

@@ -4,8 +4,9 @@ local TS = _G[script]
 -- Components
 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
+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 Rules
 do
 	Rules = setmetatable({}, {
@@ -34,14 +35,13 @@ do
 		-- Parent Anchor
 		local _condition = rules.parent
 		if _condition ~= "" and _condition then
-			_condition = not rules.detach
+			_condition = not rules.anchor
 		end
 		if _condition ~= "" and _condition then
 			forge.debug:logTag("rules", name, "Applying parent anchor", {
 				parent = rules.parent,
 			})
-			-- TODO: will be a separate file under ruleEngine
-			-- forge.anchor(name, rules.parent, props);
+			AnchorRule(name, props)
 		end
 		-- Index
 		if rules.zIndex ~= nil then

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

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

package/out/ruleEngine/render/anchor.luau

@@ -0,0 +1,38 @@
+-- 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
+	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}`)
+end
+return {
+	default = anchor,
+}

package/out/types.d.ts

@@ -58,12 +58,12 @@ declare namespace Types {
 	namespace Rules {
 		type WithParent<P> = {
 			parent: P;
-			detach?: boolean;
+			anchor?: boolean;
 		};
 
 		type WithoutParent = {
 			parent?: never;
-			detach?: never;
+			anchor?: never;
 		};
 
 		export type Static = {

package/package.json

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

package/out/renderManager.d.ts

@@ -1,7 +0,0 @@
-import type Types from "./types";
-import Rules from "./ruleEngine";
-export default class Renders extends Rules {
-    private __px;
-    constructor();
-    protected initalize(props: Types.Props.Main): void;
-}

package/out/renderManager.luau

@@ -1,36 +0,0 @@
--- Compiled with roblox-ts v3.0.0
-local TS = _G[script]
--- Packages
--- Types
--- Components
--- Hooks
--- Classes
-local Rules = TS.import(script, script.Parent, "ruleEngine").default
-local Renders
-do
-	local super = Rules
-	Renders = setmetatable({}, {
-		__tostring = function()
-			return "Renders"
-		end,
-		__index = super,
-	})
-	Renders.__index = Renders
-	function Renders.new(...)
-		local self = setmetatable({}, Renders)
-		return self:constructor(...) or self
-	end
-	function Renders:constructor()
-		super.constructor(self)
-		self.__px = false
-	end
-	function Renders:initalize(props)
-		if not self.__px then
-			self.__px = true
-		end
-		props.forge.logger:log("INFO", "Initalized Renders", props.renders)
-	end
-end
-return {
-	default = Renders,
-}

package/out/ruleEngine/exclusiveGroup.d.ts

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

package/out/ruleEngine/parent.d.ts

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

package/out/ruleEngine/parent.luau

@@ -1,34 +0,0 @@
--- 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 ParentRule(entry, forge)
-	local entryVisible = forge:getSource(entry)()
-	-- ▼ ReadonlyMap.forEach ▼
-	local _callback = function(app, name)
-		local rules = app.rules
-		if not rules or rules.parent ~= entry then
-			return nil
-		end
-		if name == entry then
-			return nil
-		end
-		local childVisible = forge:getSource(name)()
-		if entryVisible or not childVisible then
-			return nil
-		end
-		forge.debug:logTag("rules", entry, "Closing child app (parent closed)", {
-			parent = entry,
-			child = name,
-		})
-		forge:close(name, false)
-	end
-	for _k, _v in AppRegistry do
-		_callback(_v, _k, AppRegistry)
-	end
-	-- ▲ ReadonlyMap.forEach ▲
-end
-return {
-	default = ParentRule,
-}