overhaul/simplify infra

Author: jkelaty-rbx

lute/cli/commands/pkg/loom-core/extern/pp.luau

@@ -2,7 +2,7 @@ local fs = require("@std/fs")
 local luau = require("@std/luau")
 local path = require("@std/path")
 local process = require("@std/process")
-local pp = require("../../extern/pp")
+local pp = require("@batteries/pp")
 
 export type AuthenticationEntry = {
 	token: string,
@@ -20,23 +20,8 @@ end
 local function loadAuthenticationStore(): AuthenticationStore
 	local authPath = getAuthenticationFilePath()
 
-	local ok, content = pcall(fs.readFileToString, authPath)
-	if not ok then
-		return {}
-	end
-
-	local compileOk, bytecode = pcall(luau.compile, content)
-	if not compileOk then
-		return {}
-	end
-
-	local loadOk, func = pcall(luau.load, bytecode, authPath, nil)
-	if not loadOk then
-		return {}
-	end
-
-	local execOk, result = pcall(func)
-	if not execOk or type(result) ~= "table" then
+	local ok, result = pcall(luau.loadModule, authPath, nil)
+	if not ok or type(result) ~= "table" then
 		return {}
 	end
 

…/authentication/authenticationstore.luau …g/loom-core/src/authenticationstore.luaulute/cli/commands/pkg/loom-core/src/authentication/authenticationstore.luau renamed to lute/cli/commands/pkg/loom-core/src/authenticationstore.luau lute/cli/commands/pkg/loom-core/src/authentication/authenticationstore.luau renamed to lute/cli/commands/pkg/loom-core/src/authenticationstore.luau

@@ -1,5 +1,5 @@
 local cli = require("@batteries/cli")
-local authStore = require("../authentication/authenticationstore")
+local authStore = require("../authenticationstore")
 
 local function authenticate(...: string)
 	local args = cli.parser()

lute/cli/commands/pkg/loom-core/src/commands/authenticate.luau

@@ -1,35 +1,30 @@
-local git = require("../packagesource/git")
-local resolution = require("../resolver/resolution")
-local projectManifest = require("../manifest/projectmanifest")
-local pp = require("../../extern/pp")
+local packageresolution = require("../packageresolution")
+local path = require("@std/path")
+local process = require("@std/process")
 
-local fsUtils = require("../utils/fsutils")
-local luau = require("@std/luau")
+local function printDiagnostics(graph: packageresolution.ResolvedGraph)
+	local depCount = 0
+	for _ in graph.dependencies do
+		depCount += 1
+	end
+	print(`Resolved {depCount} package(s).`)
 
-local function executeLuauSource(source: string): any
-	local bytecode = luau.compile(source)
-	local func = luau.load(bytecode, "loom.config.luau", {})
-	return func()
+	for key, pkg in graph.dependencies do
+		local transitive = 0
+		local deps = graph.graph[key]
+		if deps then
+			for _ in deps do
+				transitive += 1
+			end
+		end
+		print(`  {key} ({pkg.sourceKind}, {transitive} dep(s))`)
+	end
 end
 
 local function install()
-	local manifestPath = "loom.config.luau"
-	local manifestContent = fsUtils.readfiletostring(manifestPath)
-	local manifestTable = executeLuauSource(manifestContent)
-	local manifest = projectManifest.fromTable(manifestTable)
-
-	local projectResolution = resolution.fromManifest(manifest)
-
-	local lockfile = resolution.toLockFile(projectResolution)
-	fsUtils.writestringtofile("loom.lock.luau", "return " .. pp(lockfile))
-
-	for _, pkg in projectResolution.packages do
-		print(`package: {pkg.name}, Rev: {pkg.rev}, Source: {pkg.sourceKind} - {pkg.source}`)
-		if pkg.sourceKind == "github" then
-			local zipArchive = git:downloadFromGitHubArchive(pkg.source)
-			git:installZipArchive(pkg.name, pkg.rev, zipArchive)
-		end
-	end
+	local rootDirectory = path.format(process.cwd())
+	local graph = packageresolution.resolve(rootDirectory)
+	printDiagnostics(graph)
 end
 
 return install

lute/cli/commands/pkg/loom-core/src/commands/install.luau

@@ -1,15 +1,9 @@
-local authenticationStore = require("../authentication/authenticationstore")
-local fsUtils = require("../utils/fsutils")
+local authenticationStore = require("./authenticationstore.luau")
+local fs = require("@std/fs")
 local net = require("@std/net")
 local process = require("@std/process")
-local unzip = require("../../extern/unzip")
-
-export type Git = {
-	installZipArchive: (self: Git, name: string, version: string, content: string) -> (),
-	downloadFromGitHubArchive: (self: Git, url: string) -> string,
-}
-
-local Git = {} :: Git
+local projectmanifest = require("./projectmanifest")
+local unzip = require("../extern/unzip")
 
 local function sanitizePath(path: string): string
 	-- Input validation
@@ -60,7 +54,7 @@ local function getGithubAuthenticationToken(): string?
 	return nil
 end
 
-function Git:installZipArchive(name: string, _version: string, content: string)
+local function installZipArchive(content: string, installPath: string)
 	local reader = unzip.load(buffer.fromstring(content))
 
 	reader:walk(function(entry, _depth)
@@ -74,12 +68,12 @@ function Git:installZipArchive(name: string, _version: string, content: string)
 		local slash = string.find(sanitized, "/")
 		assert(slash, `Expected entry name to contain a slash: {sanitized}`)
 
-		local outputPath = `Packages/{name}/{string.sub(sanitized, slash)}`
-		fsUtils.writestringtofile(outputPath, content)
+		local outputPath = `{installPath}/{string.sub(sanitized, slash)}`
+		fs.writeStringToFile(outputPath, content)
 	end)
 end
 
-function Git:downloadFromGitHubArchive(url: string): string
+local function downloadFromGitHubArchive(url: string): string
 	local headers = {}
 
 	local token = getGithubAuthenticationToken()
@@ -94,4 +88,12 @@ function Git:downloadFromGitHubArchive(url: string): string
 	return response.body
 end
 
-return Git
+local function installPackage(pkg: projectmanifest.DependencySpec, installPath: string): ()
+	local url = `{pkg.source}/archive/{pkg.rev}.zip`
+	local zipArchive = downloadFromGitHubArchive(url)
+	installZipArchive(zipArchive, installPath)
+end
+
+return {
+	installPackage = installPackage,
+}