@rbxts/app-forge 0.1.2 → 0.1.4

package/out/container.d.ts

@@ -1,5 +1,2 @@
-import type AppForge from ".";
-export declare function AppContainer(props: AppProps & {
-    name: AppNames[number];
-    manager: AppForge;
-}): JSX.Element;
+import type Types from "./types";
+export declare function AppContainer(props: Types.MainProps): JSX.Element;

package/out/container.luau

@@ -26,33 +26,35 @@ local function createBinding(name, manager)
 	_binds[_name_1] = binding
 	return unpack(binding)
 end
-local function createInstance(props, name, forge)
-	local _name = name
-	local appClass = AppRegistry[_name]
+local function createInstance(props)
+	local _binding = props
+	local name = _binding.name
+	local forge = _binding.forge
+	if not (name ~= "" and name) then
+		error("App name is required to create instance")
+	end
+	local appClass = AppRegistry[name]
 	if not appClass then
 		error(`App "{name}" not registered`)
 	end
-	local _loaded = forge.loaded
-	local _name_1 = name
-	if not (_loaded[_name_1] ~= nil) then
-		local instance = appClass.constructor.new(props, forge, name)
+	if not (forge.loaded[name] ~= nil) then
+		local instance = appClass.constructor.new(props)
 		local element = cloneElement(instance:render(), {
 			key = "Main",
 		})
-		local _loaded_1 = forge.loaded
-		local _name_2 = name
-		_loaded_1[_name_2] = element
+		forge.loaded[name] = element
 	end
-	local _loaded_1 = forge.loaded
-	local _name_2 = name
-	return _loaded_1[_name_2]
+	return forge.loaded[name]
 end
 local function AppContainer(props)
 	local _binding = props
 	local name = _binding.name
-	local manager = _binding.manager
-	createBinding(name, manager)
-	local element = createInstance(props, name, manager)
+	local forge = _binding.forge
+	if not (name ~= "" and name) then
+		error("App name is required in AppContainer")
+	end
+	createBinding(name, forge)
+	local element = createInstance(props)
 	if not element then
 		error(`Failed to create instance for app "{name}"`)
 	end

package/out/decorator.d.ts

@@ -1,13 +1,17 @@
+import { usePx } from "@rbxts/loners-pretty-react-hooks";
 import React from "@rbxts/react";
 import type Types from "./types";
 import type AppForge from ".";
+import ReactRoblox from "@rbxts/react-roblox";
 export declare const AppRegistry: Map<string, Types.AppRegistry>;
-export declare function App(props: Types.AppRegistryProps): <T extends new (props: AppProps, forge: AppForge, name: AppNames[number]) => Args>(constructor: T) => T;
+export declare function App(props: Types.AppRegistryProps): <T extends new (props: Types.MainProps) => Args>(constructor: T) => T;
 export declare abstract class Args {
     readonly Forge: AppForge;
+    readonly root: ReactRoblox.Root | undefined;
     readonly props: AppProps;
     readonly name: AppNames[number];
     readonly bind: React.Binding<boolean>;
-    constructor(props: AppProps, forge: AppForge, name: AppNames[number]);
+    readonly px: ReturnType<typeof usePx>;
+    constructor(props: Types.MainProps);
     abstract render(): JSX.Element;
 }

package/out/decorator.luau

@@ -1,5 +1,8 @@
 -- Compiled with roblox-ts v3.0.0
+local TS = _G[script]
+-- Services
 -- Packages
+local usePx = TS.import(script, TS.getModule(script, "@rbxts", "loners-pretty-react-hooks").out).usePx
 -- Types
 local AppRegistry = {}
 local function App(props)
@@ -21,11 +24,21 @@ end
 local Args
 do
 	Args = {}
-	function Args:constructor(props, forge, name)
+	function Args:constructor(props)
+		local _binding = props
+		local root = _binding.root
+		local target = _binding.target
+		local forge = _binding.forge
+		local name = _binding.name
+		if not (name ~= "" and name) then
+			error("App name is required in Args constructor")
+		end
 		self.Forge = forge
+		self.root = root
 		self.props = props
 		self.name = name
 		self.bind = forge:getBind(name)
+		self.px = usePx(target)
 	end
 end
 return {

package/out/global.d.ts

@@ -1,9 +1,9 @@
 declare global {
-    // These will be overridden by the user
-    // They are only placeholders for your build
+	// These will be overridden by the user
+	// They are only placeholders for your build
 
-    type AppGroups = readonly string[];
-    type AppNames = readonly string[];
-    type AppProps = {}
+	type AppGroups = readonly string[];
+	type AppNames = readonly string[];
+	type AppProps = {};
 }
 export {};

package/out/helpers.d.ts

@@ -1,6 +1,4 @@
-import type AppForge from ".";
-export declare function Render({ props, forge, names, }: {
-    props: AppProps;
-    forge: AppForge;
-    names?: AppNames[number] | AppNames[number][];
+import Types from "./types";
+export declare function Render({ props }: {
+    props: Types.MainProps;
 }): JSX.Element | JSX.Element[];

package/out/helpers.luau

@@ -2,14 +2,13 @@
 -- Types
 local function Render(_param)
 	local props = _param.props
-	local forge = _param.forge
-	local names = _param.names
-	if names ~= "" and names then
-		if type(names) == "table" then
-			return forge:renderApps(props, names)
-		else
-			return forge:renderApp(props, names)
-		end
+	local names = props.names
+	local name = props.name
+	local forge = props.forge
+	if name ~= "" and name then
+		return forge:renderApp(props)
+	elseif names then
+		return forge:renderApps(props)
 	end
 	return forge:renderAll(props)
 end

package/out/index.d.ts

@@ -1,4 +1,5 @@
 import React from "@rbxts/react";
+import type Types from "./types";
 import { Args, App } from "./decorator";
 export default class AppForge {
     binds: Map<string, [React.Binding<boolean>, (T: boolean) => void]>;
@@ -10,9 +11,9 @@ export default class AppForge {
     open(name: AppNames[number]): void;
     close(name: AppNames[number]): void;
     toggle(name: AppNames[number]): void;
-    renderApp(props: AppProps, name: AppNames[number]): JSX.Element;
-    renderApps(props: AppProps, names: AppNames[number][]): JSX.Element[];
-    renderAll(props: AppProps): JSX.Element[];
+    renderApp(props: Types.MainProps): JSX.Element;
+    renderApps(props: Types.MainProps): JSX.Element | JSX.Element[];
+    renderAll(props: Types.MainProps): JSX.Element | JSX.Element[];
 }
 export { App, Args };
 export { Render } from "./helpers";

package/out/init.luau

@@ -3,6 +3,7 @@ local TS = _G[script]
 local exports = {}
 -- Packages
 local React = TS.import(script, TS.getModule(script, "@rbxts", "react"))
+-- Types
 -- Components
 local _decorator = TS.import(script, script, "decorator")
 local AppRegistry = _decorator.AppRegistry
@@ -64,41 +65,55 @@ do
 	function AppForge:toggle(name)
 		self:set(name, not self:getState(name))
 	end
-	function AppForge:renderApp(props, name)
-		local _attributes = {
-			key = `{name}_Container`,
-			name = name,
-			manager = self,
-		}
-		for _k, _v in props do
-			_attributes[_k] = _v
-		end
+	function AppForge:renderApp(props)
+		local _attributes = table.clone(props)
+		setmetatable(_attributes, nil)
 		return React.createElement(AppContainer, _attributes)
 	end
-	function AppForge:renderApps(props, names)
-		-- ▼ ReadonlyArray.map ▼
-		local _newValue = table.create(#names)
-		local _callback = function(n)
-			return self:renderApp(props, n)
-		end
-		for _k, _v in names do
-			_newValue[_k] = _callback(_v, _k - 1, names)
+	function AppForge:renderApps(props)
+		local _binding = props
+		local name = _binding.name
+		local names = _binding.names
+		if name ~= "" and name then
+			return self:renderApp({
+				props = props,
+				name = name,
+				forge = self,
+			})
+		elseif names then
+			-- ▼ ReadonlyArray.map ▼
+			local _newValue = table.create(#names)
+			local _callback = function(n)
+				return self:renderApp({
+					props = props,
+					name = n,
+					forge = self,
+				})
+			end
+			for _k, _v in names do
+				_newValue[_k] = _callback(_v, _k - 1, names)
+			end
+			-- ▲ ReadonlyArray.map ▲
+			return _newValue
 		end
-		-- ▲ ReadonlyArray.map ▲
-		return _newValue
+		error("Invalid props: must provide name or names")
 	end
 	function AppForge:renderAll(props)
-		local keys = {}
+		local names = {}
 		-- ▼ ReadonlyMap.forEach ▼
 		local _callback = function(_, name)
 			local _name = name
-			table.insert(keys, _name)
+			table.insert(names, _name)
 		end
 		for _k, _v in AppRegistry do
 			_callback(_v, _k, AppRegistry)
 		end
 		-- ▲ ReadonlyMap.forEach ▲
-		return self:renderApps(props, keys)
+		return self:renderApps({
+			props = props,
+			names = names,
+			forge = self,
+		})
 	end
 end
 exports.Render = TS.import(script, script, "helpers").Render

package/out/types.d.ts

@@ -9,8 +9,18 @@ declare namespace Types {
 		rules?: Rules.All;
 	};
 
+	type MainProps = {
+		props: AppProps;
+	} & ExtraProps;
+
+	type ExtraProps = {
+		target?: GuiObject | Camera;
+		root?: ReactRoblox.Root;
+		forge: AppForge;
+	} & ({ name: AppNames[number]; names?: never } | { names: AppNames[number][]; name?: never });
+
 	type AppRegistry = {
-		constructor: new (props: AppProps, forge: AppForge, name: AppNames[number]) => Args;
+		constructor: new (props: MainProps) => Args;
 		visible?: boolean;
 		rules?: Rules.All;
 	};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@rbxts/app-forge",
-	"version": "0.1.2",
+	"version": "0.1.4",
 	"description": "An App Manager for react",
 	"main": "out/init.lua",
 	"packageManager": "bun@1.3.1",
@@ -45,13 +45,14 @@
 	},
 	"dependencies": {
 		"@rbxts/charm": "^0.10.0",
-		"@rbxts/loners-pretty-react-hooks": "^0.0.3",
+		"@rbxts/loners-pretty-react-hooks": "^0.2.9",
 		"@rbxts/react-charm": "^0.3.0",
 		"@rbxts/ripple": "^0.9.3",
 		"@rbxts/services": "^1.6.0",
 		"@rbxts/set-timeout": "^1.1.2"
 	},
 	"peerDependencies": {
+		"@rbxts/loners-pretty-react-hooks": "*",
 		"@rbxts/react-roblox": "*",
 		"@rbxts/react": "*"
 	}