commit 7112ae1e8f3393dbebcda3c2dff3f981cd84112e · jonmsterling.com/swift-pterodactyl

+10 -3

Package.swift

···

       21
        
       			targets: ["PterodactylSyntax"]

     

       22
        
       		),

     

       23
        
       		.library(

     

       24
       -
       			name: "PterodactylServer",

     

       25
       -
       			targets: ["PterodactylServer"]

     

       26
        
       		)

     

       27
        
       	],

     

       28
        
       	dependencies: [

     
···

       38
        
       			name: "PterodactylSyntax"

     

       39
        
       		),

     

       40
        
       		.target(

     

       41
       -
       			name: "PterodactylServer",

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       42
        
       			dependencies: [

     

       0
        
       
     

       43
        
       				.product(name: "llbuild2fx", package: "swift-llbuild2")

     

       44
        
       			]

     

       45
        
       		),

···

       21
        
       			targets: ["PterodactylSyntax"]

     

       22
        
       		),

     

       23
        
       		.library(

     

       24
       +
       			name: "PterodactylBuild",

     

       25
       +
       			targets: ["PterodactylBuild"]

     

       26
        
       		)

     

       27
        
       	],

     

       28
        
       	dependencies: [

     
···

       38
        
       			name: "PterodactylSyntax"

     

       39
        
       		),

     

       40
        
       		.target(

     

       41
       +
       			name: "PterodactylBuild",

     

       42
       +
       			dependencies: [

     

       43
       +
       				.product(name: "llbuild2fx", package: "swift-llbuild2")

     

       44
       +
       			]

     

       45
       +
       		),

     

       46
       +
       		.testTarget(

     

       47
       +
       			name: "PterodactylBuildTests",

     

       48
        
       			dependencies: [

     

       49
       +
       				"PterodactylBuild",

     

       50
        
       				.product(name: "llbuild2fx", package: "swift-llbuild2")

     

       51
        
       			]

     

       52
        
       		),

+51

Sources/PterodactylBuild/BuildContext.swift

···

       1
       +
       // SPDX-FileCopyrightText: 2025 The Project Pterodactyl Developers

     

       2
       +
       //

     

       3
       +
       // SPDX-License-Identifier: MPL-2.0

     

       4
       +
       

     

       5
       +
       import Foundation

     

       6
       +
       import TSCBasic

     

       7
       +
       import llbuild2fx

     

       8
       +
       

     

       9
       +
       /// A simplified API for `llbuild2fx` that bundles the arguments of `FXKey.computeValue(_:_)`.

     

       10
       +
       public struct BuildContext<Key: FXKey> {

     

       11
       +
       	fileprivate let functionInterface: FXFunctionInterface<Key>

     

       12
       +
       	fileprivate let context: Context

     

       13
       +
       

     

       14
       +
       	var db: any LLBCASDatabase { context.db }

     

       15
       +
       

     

       16
       +
       	func request<X: FXKey>(_ key: X) async throws -> X.ValueType {

     

       17
       +
       		try await functionInterface.request(key, context)

     

       18
       +
       	}

     

       19
       +
       

     

       20
       +
       	func load(_ id: LLBDataID, type hint: LLBFileType? = nil) async throws -> LLBCASFSNode {

     

       21
       +
       		try await LLBCASFSClient(context.db).load(id, type: hint, context).get()

     

       22
       +
       	}

     

       23
       +
       

     

       24
       +
       	func read(blob: LLBCASBlob) async throws -> LLBByteBufferView {

     

       25
       +
       		try await blob.read(context).get()

     

       26
       +
       	}

     

       27
       +
       }

     

       28
       +
       

     

       29
       +
       public protocol BuildKey: AsyncFXKey {

     

       30
       +
       	func computeValue(_ ctx: BuildContext<Self>) async throws -> ValueType

     

       31
       +
       }

     

       32
       +
       

     

       33
       +
       extension BuildKey {

     

       34
       +
       	func computeValue(_ fi: FXFunctionInterface<Self>, _ ctx: Context) async throws -> ValueType {

     

       35
       +
       		try await computeValue(BuildContext(functionInterface: fi, context: ctx))

     

       36
       +
       	}

     

       37
       +
       }

     

       38
       +
       

     

       39
       +
       extension LLBCASFileTree {

     

       40
       +
       	static func load<X: FXKey>(id: LLBDataID, in ctx: BuildContext<X>) async throws -> LLBCASFileTree {

     

       41
       +
           try await load(id: id, from: ctx.db, ctx.context).get()

     

       42
       +
       	}

     

       43
       +
       

     

       44
       +
         func remove<X: FXKey>(path: AbsolutePath, in ctx: BuildContext<X>) async throws -> LLBCASFileTree {

     

       45
       +
           try await remove(path: path, in: ctx.db, ctx.context).get()

     

       46
       +
         }

     

       47
       +
       

     

       48
       +
         func traverse<X: FXKey>(root: AbsolutePath, in ctx: BuildContext<X>, _ callback: (AbsolutePath, LLBDataID, LLBDirectoryEntry) async throws -> Void) async throws {

     

       49
       +
           try await traverse(root: root, in: ctx.db, ctx.context, callback)

     

       50
       +
         }

     

       51
       +
       }

+34

Sources/PterodactylBuild/Keys/AnalyseImports.swift

···

       1
       +
       // SPDX-FileCopyrightText: 2025 The Project Pterodactyl Developers

     

       2
       +
       //

     

       3
       +
       // SPDX-License-Identifier: MPL-2.0

     

       4
       +
       

     

       5
       +
       import Foundation

     

       6
       +
       import TSCBasic

     

       7
       +
       import llbuild2fx

     

       8
       +
       

     

       9
       +
       extension Keys {

     

       10
       +
       	struct AnalyseImports: BuildKey {

     

       11
       +
       		typealias ValueType = [UnitName]

     

       12
       +
       		let blobId: LLBDataID

     

       13
       +
       

     

       14
       +
       		func computeValue(_ ctx: BuildContext<Self>) async throws -> [UnitName] {

     

       15
       +
       			let contents = try await ctx.load(blobId)

     

       16
       +
       			let code = try await String(decoding: Data(ctx.read(blob: contents.blob!)), as: UTF8.self)

     

       17
       +
       

     

       18
       +
       			var results: [UnitName] = []

     

       19
       +
       			let lines = code.split(separator: "\n", omittingEmptySubsequences: false)

     

       20
       +
       

     

       21
       +
       			for line in lines {

     

       22
       +
       				let trimmed = line.trimmingCharacters(in: .whitespaces)

     

       23
       +
       				guard trimmed.hasPrefix("import ") else { continue }

     

       24
       +
       				let parts = trimmed.split(separator: " ", maxSplits: 1, omittingEmptySubsequences: true)

     

       25
       +
       				if parts.count == 2 {

     

       26
       +
       					let name = parts[1].trimmingCharacters(in: .whitespaces)

     

       27
       +
       					results.append(UnitName(name: name))

     

       28
       +
       				}

     

       29
       +
       			}

     

       30
       +
       

     

       31
       +
       			return results

     

       32
       +
       		}

     

       33
       +
       	}

     

       34
       +
       }

+33

Sources/PterodactylBuild/Keys/DependencyGraphOfSourceTree.swift

···

       1
       +
       // SPDX-FileCopyrightText: 2025 The Project Pterodactyl Developers

     

       2
       +
       //

     

       3
       +
       // SPDX-License-Identifier: MPL-2.0

     

       4
       +
       

     

       5
       +
       import Foundation

     

       6
       +
       import TSCBasic

     

       7
       +
       import llbuild2fx

     

       8
       +
       

     

       9
       +
       extension Graph: FXValue where Vertex: Codable {}

     

       10
       +
       

     

       11
       +
       extension Keys {

     

       12
       +
       	struct DependencyGraphOfSourceTree: BuildKey {

     

       13
       +
       		typealias ValueType = Graph<UnitName>

     

       14
       +
       

     

       15
       +
       		let sourceTreeId: LLBDataID

     

       16
       +
       		static let versionDependencies: [any FXVersioning.Type] = [Keys.UnitMapOfSourceTree.self, Keys.AnalyseImports.self]

     

       17
       +
       

     

       18
       +
       		func computeValue(_ ctx: BuildContext<Self>) async throws -> Graph<UnitName> {

     

       19
       +
       			let unitMap = try await ctx.request(Keys.UnitMapOfSourceTree(sourceTreeId: sourceTreeId))

     

       20
       +
       			var edges: [UnitName: Set<UnitName>] = [:]

     

       21
       +
       

     

       22
       +
       			for (unitName, unitInfo) in unitMap.units {

     

       23
       +
       				if edges[unitName] == nil { edges[unitName] = [] }

     

       24
       +
       				let imports = try await ctx.request(Keys.AnalyseImports(blobId: unitInfo.blobId))

     

       25
       +
       				for importedUnitName in imports {

     

       26
       +
       					edges[unitName]!.insert(importedUnitName)

     

       27
       +
       				}

     

       28
       +
       			}

     

       29
       +
       

     

       30
       +
       			return Graph(edges: edges)

     

       31
       +
       		}

     

       32
       +
       	}

     

       33
       +
       }

+7

Sources/PterodactylBuild/Keys/Keys.swift

···

       1
       +
       // SPDX-FileCopyrightText: 2025 The Project Pterodactyl Developers

     

       2
       +
       //

     

       3
       +
       // SPDX-License-Identifier: MPL-2.0

     

       4
       +
       

     

       5
       +
       import Foundation

     

       6
       +
       

     

       7
       +
       enum Keys {}

+35

Sources/PterodactylBuild/Keys/NarrowSourceTree.swift

···

       1
       +
       // SPDX-FileCopyrightText: 2025 The Project Pterodactyl Developers

     

       2
       +
       //

     

       3
       +
       // SPDX-License-Identifier: MPL-2.0

     

       4
       +
       

     

       5
       +
       import Foundation

     

       6
       +
       import TSCBasic

     

       7
       +
       import llbuild2fx

     

       8
       +
       

     

       9
       +
       extension Keys {

     

       10
       +
       	/// Narrows a source tree to just the transitive dependencies of a given unit

     

       11
       +
       	struct NarrowSourceTree: BuildKey {

     

       12
       +
       		struct ValueType: Codable, FXValue {

     

       13
       +
       			let sourceTreeId: LLBDataID

     

       14
       +
       		}

     

       15
       +
       

     

       16
       +
       		let sourceTreeId: LLBDataID

     

       17
       +
       		let unitName: UnitName

     

       18
       +
       

     

       19
       +
       		static let versionDependencies: [any FXVersioning.Type] = [TransitiveDependencies.self, UnitMapOfSourceTree.self]

     

       20
       +
       

     

       21
       +
       		func computeValue(_ ctx: BuildContext<Self>) async throws -> ValueType {

     

       22
       +
       			let dependencies = try await ctx.request(TransitiveDependencies(sourceTreeId: sourceTreeId, unitName: unitName)).dependencies

     

       23
       +
       			let unitMap = try await ctx.request(UnitMapOfSourceTree(sourceTreeId: sourceTreeId))

     

       24
       +
       

     

       25
       +
       			var sourceTree = try await LLBCASFileTree.load(id: sourceTreeId, in: ctx)

     

       26
       +
       			for (unitName, unitInfo) in unitMap.units {

     

       27
       +
       				if !dependencies.contains(unitName) {

     

       28
       +
       					sourceTree = try await sourceTree.remove(path: unitInfo.path, in: ctx)

     

       29
       +
       				}

     

       30
       +
       			}

     

       31
       +
       

     

       32
       +
       			return ValueType(sourceTreeId: sourceTree.id)

     

       33
       +
       		}

     

       34
       +
       	}

     

       35
       +
       }

+32

Sources/PterodactylBuild/Keys/SourceCode.swift

···

       1
       +
       // SPDX-FileCopyrightText: 2025 The Project Pterodactyl Developers

     

       2
       +
       //

     

       3
       +
       // SPDX-License-Identifier: MPL-2.0

     

       4
       +
       

     

       5
       +
       import Foundation

     

       6
       +
       import TSCBasic

     

       7
       +
       import llbuild2fx

     

       8
       +
       

     

       9
       +
       extension Keys {

     

       10
       +
       	struct SourceCode: BuildKey {

     

       11
       +
       		struct ValueType: Codable, FXValue {

     

       12
       +
       			let code: String

     

       13
       +
       		}

     

       14
       +
       

     

       15
       +
       		enum SourceCodeError: Error {

     

       16
       +
       			case unitNotFound

     

       17
       +
       		}

     

       18
       +
       

     

       19
       +
       		let sourceTreeId: LLBDataID

     

       20
       +
       		let unitName: UnitName

     

       21
       +
       

     

       22
       +
       		static let versionDependencies: [any FXVersioning.Type] = [UnitMapOfSourceTree.self]

     

       23
       +
       

     

       24
       +
       		func computeValue(_ ctx: BuildContext<Self>) async throws -> ValueType {

     

       25
       +
       			let unitMap = try await ctx.request(UnitMapOfSourceTree(sourceTreeId: sourceTreeId))

     

       26
       +
       			guard let unitInfo = unitMap.units[unitName] else { throw SourceCodeError.unitNotFound }

     

       27
       +
       			let contents = try await ctx.load(unitInfo.blobId)

     

       28
       +
       			let code = try await String(decoding: Data(ctx.read(blob: contents.blob!)), as: UTF8.self)

     

       29
       +
       			return ValueType(code: code)

     

       30
       +
       		}

     

       31
       +
       	}

     

       32
       +
       }

+25

Sources/PterodactylBuild/Keys/TransitiveDependencies.swift

···

       1
       +
       // SPDX-FileCopyrightText: 2025 The Project Pterodactyl Developers

     

       2
       +
       //

     

       3
       +
       // SPDX-License-Identifier: MPL-2.0

     

       4
       +
       

     

       5
       +
       import Foundation

     

       6
       +
       import TSCBasic

     

       7
       +
       import llbuild2fx

     

       8
       +
       

     

       9
       +
       extension Keys {

     

       10
       +
       	struct TransitiveDependencies: BuildKey {

     

       11
       +
       		struct ValueType: Codable, FXValue {

     

       12
       +
       			var dependencies: Set<UnitName>

     

       13
       +
       		}

     

       14
       +
       

     

       15
       +
       		let sourceTreeId: LLBDataID

     

       16
       +
       		let unitName: UnitName

     

       17
       +
       

     

       18
       +
       		static let versionDependencies: [any FXVersioning.Type] = [Keys.DependencyGraphOfSourceTree.self]

     

       19
       +
       

     

       20
       +
       		func computeValue(_ ctx: BuildContext<Self>) async throws -> ValueType {

     

       21
       +
       			let graph = try await ctx.request(Keys.DependencyGraphOfSourceTree(sourceTreeId: sourceTreeId))

     

       22
       +
       			return ValueType(dependencies: graph.verticesReachableFrom(unitName))

     

       23
       +
       		}

     

       24
       +
       	}

     

       25
       +
       }

+25

Sources/PterodactylBuild/Keys/UnitMapOfSourceTree.swift

···

       1
       +
       // SPDX-FileCopyrightText: 2025 The Project Pterodactyl Developers

     

       2
       +
       //

     

       3
       +
       // SPDX-License-Identifier: MPL-2.0

     

       4
       +
       

     

       5
       +
       import Foundation

     

       6
       +
       import TSCBasic

     

       7
       +
       import llbuild2fx

     

       8
       +
       

     

       9
       +
       extension Keys {

     

       10
       +
       	struct UnitMapOfSourceTree: BuildKey {

     

       11
       +
       		typealias ValueType = UnitMap

     

       12
       +
       		let sourceTreeId: LLBDataID

     

       13
       +
       

     

       14
       +
       		func computeValue(_ ctx: BuildContext<Self>) async throws -> UnitMap {

     

       15
       +
       			let sourceTree = try await LLBCASFileTree.load(id: sourceTreeId, in: ctx)

     

       16
       +
       			var units: [UnitName: UnitInfo] = [:]

     

       17
       +
       			try await sourceTree.traverse(root: .root, in: ctx) { path, blobID, directoryEntry in

     

       18
       +
               let unitName = UnitName.fromPath(path)

     

       19
       +
       				units[unitName] = UnitInfo(path: path, blobId: blobID)

     

       20
       +
       			}

     

       21
       +
       

     

       22
       +
       			return UnitMap(units: units)

     

       23
       +
       		}

     

       24
       +
       	}

     

       25
       +
       }

+24

Sources/PterodactylBuild/LLBCASFileTree+Traversal.swift

···

       1
       +
       // SPDX-FileCopyrightText: 2025 The Project Pterodactyl Developers

     

       2
       +
       //

     

       3
       +
       // SPDX-License-Identifier: MPL-2.0

     

       4
       +
       

     

       5
       +
       import Foundation

     

       6
       +
       import TSCBasic

     

       7
       +
       import llbuild2fx

     

       8
       +
       

     

       9
       +
       extension LLBCASFileTree {

     

       10
       +
       	func traverse(root: AbsolutePath, in db: any LLBCASDatabase, _ ctx: Context, _ callback: (AbsolutePath, LLBDataID, LLBDirectoryEntry) async throws -> Void) async throws {

     

       11
       +
       		for (index, fileId) in object.refs.enumerated() {

     

       12
       +
       			let directoryEntry = files[index]

     

       13
       +
       			switch directoryEntry.type {

     

       14
       +
       			case .directory:

     

       15
       +
       				let root = root.appending(component: directoryEntry.name)

     

       16
       +
       				let subtree = try await Self.load(id: fileId, from: db, ctx).get()

     

       17
       +
       				try await subtree.traverse(root: root, in: db, ctx, callback)

     

       18
       +
       			case .plainFile:

     

       19
       +
       				try await callback(root.appending(component: directoryEntry.name), fileId, directoryEntry)

     

       20
       +
       			default: continue

     

       21
       +
       			}

     

       22
       +
       		}

     

       23
       +
       	}

     

       24
       +
       }

+35

Sources/PterodactylBuild/Types/Graph.swift

···

       1
       +
       // SPDX-FileCopyrightText: 2025 The Project Pterodactyl Developers

     

       2
       +
       //

     

       3
       +
       // SPDX-License-Identifier: MPL-2.0

     

       4
       +
       

     

       5
       +
       import Foundation

     

       6
       +
       

     

       7
       +
       struct Graph<Vertex: Hashable> {

     

       8
       +
       	var edges: [Vertex: Set<Vertex>]

     

       9
       +
       }

     

       10
       +
       

     

       11
       +
       extension Graph: Codable where Vertex: Codable {}

     

       12
       +
       extension Graph: Sendable where Vertex: Sendable {}

     

       13
       +
       

     

       14
       +
       extension Graph {

     

       15
       +
       	func verticesReachableFrom(_ start: Vertex) -> Set<Vertex> {

     

       16
       +
       		var visited: Set<Vertex> = []

     

       17
       +
       		var stack: [Vertex] = []

     

       18
       +
       

     

       19
       +
       		if let neighbors = edges[start] {

     

       20
       +
       			stack.append(contentsOf: neighbors)

     

       21
       +
       		}

     

       22
       +
       

     

       23
       +
       		while let vertex = stack.popLast() {

     

       24
       +
       			guard !visited.contains(vertex) else { continue }

     

       25
       +
       			visited.insert(vertex)

     

       26
       +
       			if let neighbors = edges[vertex] {

     

       27
       +
       				for neighbor in neighbors where !visited.contains(neighbor) {

     

       28
       +
       					stack.append(neighbor)

     

       29
       +
       				}

     

       30
       +
       			}

     

       31
       +
       		}

     

       32
       +
       

     

       33
       +
       		return visited

     

       34
       +
       	}

     

       35
       +
       }

+12

Sources/PterodactylBuild/Types/UnitInfo.swift

···

       1
       +
       // SPDX-FileCopyrightText: 2025 The Project Pterodactyl Developers

     

       2
       +
       //

     

       3
       +
       // SPDX-License-Identifier: MPL-2.0

     

       4
       +
       

     

       5
       +
       import Foundation

     

       6
       +
       import TSCBasic

     

       7
       +
       import llbuild2fx

     

       8
       +
       

     

       9
       +
       struct UnitInfo: Equatable, Codable, FXValue {

     

       10
       +
       	let path: AbsolutePath

     

       11
       +
       	let blobId: LLBDataID

     

       12
       +
       }

+10

Sources/PterodactylBuild/Types/UnitMap.swift

···

       1
       +
       // SPDX-FileCopyrightText: 2025 The Project Pterodactyl Developers

     

       2
       +
       //

     

       3
       +
       // SPDX-License-Identifier: MPL-2.0

     

       4
       +
       

     

       5
       +
       import Foundation

     

       6
       +
       import llbuild2fx

     

       7
       +
       

     

       8
       +
       struct UnitMap: Codable, FXValue {

     

       9
       +
       	let units: [UnitName: UnitInfo]

     

       10
       +
       }

+19

Sources/PterodactylBuild/Types/UnitName.swift

···

       1
       +
       // SPDX-FileCopyrightText: 2025 The Project Pterodactyl Developers

     

       2
       +
       //

     

       3
       +
       // SPDX-License-Identifier: MPL-2.0

     

       4
       +
       

     

       5
       +
       import Foundation

     

       6
       +
       import llbuild2fx

     

       7
       +
       import TSCBasic

     

       8
       +
       

     

       9
       +
       struct UnitName: Codable, Equatable, Hashable {

     

       10
       +
       	var name: String

     

       11
       +
       }

     

       12
       +
       

     

       13
       +
       extension UnitName: FXValue {}

     

       14
       +
       

     

       15
       +
       extension UnitName {

     

       16
       +
         static func fromPath(_ path: AbsolutePath) -> Self {

     

       17
       +
           Self(name: path.basenameWithoutExt)

     

       18
       +
         }

     

       19
       +
       }

-2

Sources/PterodactylServer/PterodactylServer.swift

···

       1
       -
       import Foundation

     

       2
       -
       import llbuild2fx

+49

Tests/PterodactylBuildTests/Test.swift

···

       1
       +
       // SPDX-FileCopyrightText: 2025 The Project Pterodactyl Developers

     

       2
       +
       //

     

       3
       +
       // SPDX-License-Identifier: MPL-2.0

     

       4
       +
       

     

       5
       +
       import Testing

     

       6
       +
       

     

       7
       +
       @testable import PterodactylBuild

     

       8
       +
       @testable import llbuild2fx

     

       9
       +
       

     

       10
       +
       struct BuildTests {

     

       11
       +
       	@Test

     

       12
       +
       	func testImports() async throws {

     

       13
       +
       		let group = LLBMakeDefaultDispatchGroup()

     

       14
       +
       		let db = LLBInMemoryCASDatabase(group: group)

     

       15
       +
       		let functionCache = FXInMemoryFunctionCache(group: group)

     

       16
       +
       		let executor = FXLocalExecutor()

     

       17
       +
       		let engine = FXEngine(group: group, db: db, functionCache: functionCache, executor: executor)

     

       18
       +
       		let client = LLBCASFSClient(db)

     

       19
       +
       		let ctx = Context()

     

       20
       +
       

     

       21
       +
       		let declTree = LLBDeclFileTree.dir(

     

       22
       +
       			[

     

       23
       +
       				"src": .dir([

     

       24
       +
       					"bar.ext": .file(contents: Array("hello world".utf8)),

     

       25
       +
       					"foo.ext": .file(contents: Array("import bar".utf8)),

     

       26
       +
       					"baz.ext": .file(contents: Array("import foo".utf8))

     

       27
       +
       				])

     

       28
       +
       			]

     

       29
       +
       		)

     

       30
       +
       

     

       31
       +
       		let treeID: LLBDataID = try await client.store(declTree, ctx).get()

     

       32
       +
       		let dependencyGraph = try await engine.build(key: Keys.DependencyGraphOfSourceTree(sourceTreeId: treeID), ctx).get()

     

       33
       +
       		let foo = UnitName(name: "foo")

     

       34
       +
       		let bar = UnitName(name: "bar")

     

       35
       +
       		let baz = UnitName(name: "baz")

     

       36
       +
       

     

       37
       +
       		#expect(

     

       38
       +
       			dependencyGraph.edges == [

     

       39
       +
       				bar: [],

     

       40
       +
       				foo: [bar],

     

       41
       +
       				baz: [foo]

     

       42
       +
       			]

     

       43
       +
       		)

     

       44
       +
       

     

       45
       +
       		let dependenciesOfBaz = try await engine.build(key: Keys.TransitiveDependencies(sourceTreeId: treeID, unitName: baz), ctx).get().dependencies

     

       46
       +
       		#expect(dependenciesOfBaz == [foo, bar])

     

       47
       +
       		return

     

       48
       +
       	}

     

       49
       +
       }