@rbxts/app-forge 0.7.2-prototype.26 → 0.7.2-prototype.28

package/out/helpers/hasAppSource.luau

@@ -6,7 +6,7 @@ local function hasAppSource(name, group)
 	local _name = name
 	local sourceMap = AppSources[_name]
 	if not sourceMap then
-		local _ = false
+		return false
 	end
 	local _source = sourceMap
 	if _source ~= nil then
@@ -15,7 +15,7 @@ local function hasAppSource(name, group)
 	end
 	local source = _source
 	if not source then
-		local _ = false
+		return false
 	end
 	return true
 end

package/out/renders.d.ts

@@ -4,12 +4,13 @@ import Rules from "./ruleEngine";
 type Render = {
     instance: Instance;
     container: Instance;
+    entry: Types.AppRegistry.Static;
 };
 export default class Renders extends Rules {
     private __px;
     protected Loaded: Map<string, Map<string, Render>>;
     constructor();
-    Render: (props: Types.Props.Main) => Instance[];
+    Load: (props: Types.Props.Main) => Instance[];
     private resolveGroupEntries;
     private getGroupEntries;
     private createInstance;

package/out/renders.luau

@@ -31,11 +31,10 @@ do
 		super.constructor(self)
 		self.__px = false
 		self.Loaded = {}
-		self.Render = function(props)
+		self.Load = function(props)
 			local _binding = props
-			local forge = _binding.forge
 			local renders = _binding.renders
-			local toRender = {}
+			local toLoad = {}
 			if not renders then
 				return {}
 			end
@@ -45,7 +44,7 @@ do
 				local _callback = function(group)
 					local entries = self:resolveGroupEntries(group, renders.names, renders.name)
 					for _, entry in entries do
-						table.insert(toRender, entry)
+						table.insert(toLoad, entry)
 					end
 				end
 				for _k, _v in _exp do
@@ -57,7 +56,7 @@ do
 			if _value ~= "" and _value then
 				local entries = self:resolveGroupEntries(renders.group, renders.names, renders.name)
 				for _, entry in entries do
-					table.insert(toRender, entry)
+					table.insert(toLoad, entry)
 				end
 			end
 			-- ▼ ReadonlyArray.forEach ▼
@@ -84,7 +83,7 @@ do
 							return nil
 						end
 						local _childEntry = childEntry
-						table.insert(toRender, _childEntry)
+						table.insert(toLoad, _childEntry)
 					end
 					for _k, _v in groupEntries do
 						_callback_2(_v, _k, groupEntries)
@@ -96,44 +95,46 @@ do
 				end
 				-- ▲ ReadonlyMap.forEach ▲
 			end
-			for _k, _v in toRender do
-				_callback(_v, _k - 1, toRender)
+			for _k, _v in toLoad do
+				_callback(_v, _k - 1, toLoad)
 			end
 			-- ▲ ReadonlyArray.forEach ▲
-			local rendered = {}
+			local load = {}
 			-- ▼ ReadonlyArray.forEach ▼
 			local _callback_1 = function(entry)
 				local name = tostring(entry.constructor)
 				local group = entry.group
-				local parent
-				local _result = entry.rules
-				if _result ~= nil then
-					_result = _result.parent
-				end
-				if _result ~= "" and _result then
-					local _condition = entry.rules.parentGroup
-					if not (_condition ~= "" and _condition) then
-						_condition = "None"
+				self:createInstance(props, name, group)
+				local _exp = self.Loaded
+				-- ▼ ReadonlyMap.forEach ▼
+				local _callback_2 = function(renderGroup, loadedName)
+					if name ~= loadedName then
+						return nil
 					end
-					local group = _condition
-					local _loaded = self.Loaded
-					local _parent = entry.rules.parent
-					local parentMap = _loaded[_parent]
-					if parentMap then
-						local parentEntry = parentMap[group]
-						if parentEntry then
-							parent = parentEntry.container
+					-- ▼ ReadonlyMap.forEach ▼
+					local _callback_3 = function(render, group)
+						if group ~= group then
+							return nil
 						end
+						local _container = render.container
+						table.insert(load, _container)
 					end
+					for _k, _v in renderGroup do
+						_callback_3(_v, _k, renderGroup)
+					end
+					-- ▲ ReadonlyMap.forEach ▲
+				end
+				for _k, _v in _exp do
+					_callback_2(_v, _k, _exp)
 				end
-				self:createInstance(props, name, group, parent)
+				-- ▲ ReadonlyMap.forEach ▲
 			end
-			for _k, _v in toRender do
-				_callback_1(_v, _k - 1, toRender)
+			for _k, _v in toLoad do
+				_callback_1(_v, _k - 1, toLoad)
 			end
 			-- ▲ ReadonlyArray.forEach ▲
-			print(self.Loaded)
-			return rendered
+			print(load)
+			return load
 		end
 	end
 	function Renders:resolveGroupEntries(group, names, name)
@@ -197,25 +198,51 @@ do
 		-- ▲ ReadonlyMap.forEach ▲
 		return entries
 	end
-	function Renders:createInstance(props, name, group, parent)
+	function Renders:createInstance(props, name, group)
 		local entry = getAppEntry(name, group)
 		if not entry then
 			return nil
 		end
+		local parentContainer
+		local _result = entry.rules
+		if _result ~= nil then
+			_result = _result.parent
+		end
+		if _result ~= "" and _result then
+			local _value = entry.rules.parent
+			if _value ~= "" and _value then
+				local _condition = entry.rules.parentGroup
+				if not (_condition ~= "" and _condition) then
+					_condition = "None"
+				end
+				local group = _condition
+				local _loaded = self.Loaded
+				local _parent = entry.rules.parent
+				local parentMap = _loaded[_parent]
+				if parentMap then
+					local parentEntry = parentMap[group]
+					if parentEntry then
+						parentContainer = parentEntry.container
+					end
+				end
+			end
+		end
 		local instance = entry.constructor.new(props, name, group):render()
+		instance.Name = "Render"
 		local container = (Vide.jsx("frame", {
 			Name = name,
 			BackgroundTransparency = 1,
 			AnchorPoint = Vector2.new(0.5, 0.5),
 			Position = UDim2.fromScale(0.5, 0.5),
 			Size = UDim2.fromScale(1, 1),
-			Parent = parent,
+			Parent = parentContainer,
 		}, instance))
 		local newMap = {}
 		local _group = group
 		local _arg1 = {
 			container = container,
 			instance = instance,
+			entry = entry,
 		}
 		newMap[_group] = _arg1
 		local _loaded = self.Loaded
@@ -251,14 +278,14 @@ do
 						Name = "App Tree",
 						ZIndexBehavior = "Sibling",
 						ResetOnSpawn = false,
-					}, Vide.jsx(self.Render, _attributes)))
+					}, Vide.jsx(self.Load, _attributes)))
 				end
 				return _result
 			end)
 		else
 			local _attributes = table.clone(props)
 			setmetatable(_attributes, nil)
-			return Vide.jsx(self.Render, _attributes)
+			return Vide.jsx(self.Load, _attributes)
 		end
 	end
 end

package/package.json

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