@quenty/loader 10.3.0 → 10.3.1-canary.478.013677d.0

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [10.3.1-canary.478.013677d.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/loader@10.3.0...@quenty/loader@10.3.1-canary.478.013677d.0) (2024-08-24)
+
+
+### Features
+
+* Unedited all changes ([60e64e3](https://github.com/Quenty/NevermoreEngine/commit/60e64e3efce17c10c4b8965871187d231b338dd4))
+
+
+
+
+
 # [10.3.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/loader@10.2.0...@quenty/loader@10.3.0) (2024-05-09)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/loader",
-  "version": "10.3.0",
+  "version": "10.3.1-canary.478.013677d.0",
   "description": "A simple module loader for Roblox",
   "keywords": [
     "Roblox",
@@ -26,5 +26,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "3fd5cdca3128bf34c8d9dfae1e92d62533b6e6f5"
+  "gitHead": "013677ddf1f34b223c027d332d00450722b8fd41"
 }

package/src/Dependencies/DependencyUtils.lua

@@ -68,7 +68,7 @@ function DependencyUtils.iterPackages(requester)
 	assert(typeof(requester) == "Instance", "Bad requester")
 
 	return coroutine.wrap(function()
-		for nodeModules in DependencyUtils.iterNodeModules(requester) do
+		for nodeModules in DependencyUtils.iterNodeModulesUp(requester) do
 			coroutine.yield(nodeModules.Parent)
 
 			for packageInst in DependencyUtils.iterPackagesInModuleModules(nodeModules) do
@@ -78,7 +78,7 @@ function DependencyUtils.iterPackages(requester)
 	end)
 end
 
-function DependencyUtils.iterNodeModules(module)
+function DependencyUtils.iterNodeModulesUp(module)
 	assert(typeof(module) == "Instance", "Bad module")
 
 	return coroutine.wrap(function()

package/src/Dependencies/PackageTrackerProvider.lua

@@ -16,6 +16,7 @@ function PackageTrackerProvider.new()
 
 	self._maid = Maid.new()
 	self._packageTrackersRoots = {}
+	self._trackCount = 0
 
 	return self
 end
@@ -27,6 +28,8 @@ function PackageTrackerProvider:AddPackageRoot(instance)
 		return self._packageTrackersRoots[instance]
 	end
 
+	self._trackCount = self._trackCount + 1
+
 	local maid = Maid.new()
 
 	self._packageTrackersRoots[instance] = maid:Add(PackageTracker.new(self, instance))
@@ -42,12 +45,7 @@ end
 function PackageTrackerProvider:FindPackageTracker(instance)
 	assert(typeof(instance) == "Instance", "Bad instance")
 
-	local found = self._packageTrackersRoots[instance]
-	if found then
-		return found
-	end
-
-	local current = instance.Parent
+	local current = instance
 	while current do
 		if self._packageTrackersRoots[current] then
 			return self._packageTrackersRoots[current]

package/src/init.lua

@@ -18,6 +18,9 @@ local Replicator = require(script.Replication.Replicator)
 local ReplicatorReferences = require(script.Replication.ReplicatorReferences)
 
 local GLOBAL_PACKAGE_TRACKER = PackageTrackerProvider.new()
+script.Destroying:Connect(function()
+	GLOBAL_PACKAGE_TRACKER:Destroy()
+end)
 
 local Loader = {}
 Loader.__index = Loader
@@ -43,7 +46,7 @@ function Loader.bootstrapGame(packages)
 	local self = Loader.new(packages, ReplicationTypeUtils.inferReplicationType())
 
 	if self._replicationType == ReplicationType.SERVER then
-		self:_setupLoaderPopulation()
+		self:_setupLoaderPopulation(self._packages)
 
 		-- Trade off security for performance
 		if RunService:IsStudio() then
@@ -63,7 +66,7 @@ function Loader.bootstrapPlugin(packages)
 
 	local self = Loader.new(packages, ReplicationType.PLUGIN)
 
-	self:_setupLoaderPopulation()
+	self:_setupLoaderPopulation(self._packages)
 
 	GLOBAL_PACKAGE_TRACKER:AddPackageRoot(packages)
 
@@ -74,18 +77,19 @@ function Loader.bootstrapStory(storyScript)
 	assert(typeof(storyScript) == "Instance", "Bad storyScript")
 
 	-- Prepopulate global package roots
-	local topNodeModule = storyScript
-	for node_modules in DependencyUtils.iterNodeModules(storyScript) do
-		if not node_modules:IsDescendantOf(topNodeModule) then
-			topNodeModule = node_modules
-		end
+	local topNodeModules = storyScript
+	for node_modules in DependencyUtils.iterNodeModulesUp(storyScript) do
+		topNodeModules = node_modules
 	end
 
-	local self = Loader.new(topNodeModule.Parent, ReplicationType.PLUGIN)
+	local self = Loader.new(storyScript, ReplicationType.PLUGIN)
+
+	local root = topNodeModules.Parent
 
-	self:_setupLoaderPopulation()
+	self:_setupLoaderPopulation(root)
 
-	GLOBAL_PACKAGE_TRACKER:AddPackageRoot(topNodeModule.Parent)
+	-- Track the package root
+	GLOBAL_PACKAGE_TRACKER:AddPackageRoot(root)
 
 	return self
 end
@@ -144,7 +148,7 @@ function Loader:_findDependency(request)
 	-- Just standard dependency search
 	local foundBackup = DependencyUtils.findDependency(self._packages, request, self._replicationType)
 	if foundBackup then
-		warn(string.format("[Loader] - Failed to find package %q in package tracker\n%s", request, debug.traceback()))
+		warn(string.format("[Loader] - Failed to find package %q in package tracker of root %s\n%s", request, self._packages:GetFullName(), debug.traceback()))
 
 		-- Ensure hoarcekat story has a link to use
 		-- TODO: Maybe add to global package cache instead...
@@ -177,8 +181,8 @@ function Loader:_setupClientReplication()
 	copy.Parent = ReplicatedStorage
 end
 
-function Loader:_setupLoaderPopulation()
-	self._maid:Add(LoaderLinkCreator.new(self._packages, nil, true))
+function Loader:_setupLoaderPopulation(root)
+	self._maid:Add(LoaderLinkCreator.new(root, nil, true))
 end
 
 function Loader:Destroy()