Merge pull request #8 from devSparkle/development

Add support for NamedImports

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+	"robloxLsp.diagnostics.disable": [
+		"trailing-space"
+	]
+}

default.project.json

@@ -1,6 +1,6 @@
 {
 	"name": "Overture",
 	"tree": {
-		"$path": "src/Overture.module.lua"
+		"$path": "src/Overture.lua"
 	}
 }

src/Overture.module.lua → src/Overture.lua

@@ -61,6 +61,29 @@ local function BindToTag(Tag: string, Function: (Instance) -> ()): RBXScriptConn
 	return CollectionService:GetInstanceAddedSignal(Tag):Connect(Function)
 end
 
+--[=[
+	@within Overture
+	@ignore
+	
+	@param Module -- The ModuleScript to require
+	@param NamedImports -- When provided, returns the named variables instead of the entire ModuleScript
+	@return any?
+]=]
+local function RequireModule(Module: ModuleScript, NamedImports: {string}?)
+	if NamedImports then
+		local Exports = require(Module)
+		local Imports = {}
+
+		for ImportIndex, ImportName in ipairs(NamedImports) do
+			Imports[ImportIndex] = Exports[ImportName]
+		end
+
+		return unpack(Imports)
+	else
+		return require(Module)
+	end
+end
+
 --[=[
 	Finds a ModuleScript with the CollectionService `oLibrary` tag,
 	and returns the value that was returned by the given ModuleScript,
@@ -93,16 +116,17 @@ end
 	
 	@yields
 	@param Index -- The name of the ModuleScript
+	@param NamedImports -- When provided, returns the named variables instead of the entire ModuleScript
 	@return any?
 ]=]
-function Overture:LoadLibrary(Index: string)
+function Overture:LoadLibrary(Index: string, NamedImports: {string}?)
 	if Libraries[Index] then
-		return require(Libraries[Index])
+		return RequireModule(Libraries[Index], NamedImports)
 	else
 		assert(not RunService:IsServer(), "The library \"" .. Index .. "\" does not exist!")
 
 		table.insert(LibraryThreadCache, {Thread = coroutine.running(), RequestedIndex = Index, RequestedAt = time()})
-		return require(coroutine.yield())
+		return RequireModule(coroutine.yield(), NamedImports)
 	end
 end
 

test-place.project.json

@@ -0,0 +1,10 @@
+{
+	"name": "Overture",
+	"tree": {
+		"$className": "DataModel",
+
+		"ReplicatedStorage": {
+			"$path": "src"
+		}
+	}
+}

wally.toml

@@ -1,7 +1,7 @@
 [package]
 name = "devsparkle/overture"
 description = "Source code management engine for Roblox"
-version = "2.0.1"
+version = "2.1.0"
 license = "MIT"
 registry = "https://github.com/UpliftGames/wally-index"
 realm = "shared"