commit 6ef06c4e76faaf437d825b2680b20b84cacc5512 · jonmsterling.com/swift-pterodactyl

+4 -1

Sources/PterodactylBuild/Keys.swift

···

       4
       4
        
       

     

       5
       5
        
       import Foundation

     

       6
       6
        
       

     

       7
       7
       -
       enum Keys {}

     

       7
       7
       +
       enum Keys {

     

       8
       8
       +
       	enum Blob {}

     

       9
       9
       +
       	enum SourceTree {}

     

       10
       10
       +
       }

+4 -4

Sources/PterodactylBuild/Keys/Blob-local operations/BlobContents.swift Sources/PterodactylBuild/Keys/Blob/ReadContents.swift

···

       6
       6
        
       import TSCBasic

     

       7
       7
        
       import llbuild2fx

     

       8
       8
        
       

     

       9
       9
       -
       extension Keys {

     

       10
       10
       -
       	struct BlobContents: BuildKey {

     

       11
       11
       -
       		typealias ValueType = String

     

       12
       12
       -
       

     

       9
       9
       +
       extension Keys.Blob {

     

       10
       10
       +
       	struct ReadContents: BuildKey {

     

       13
       11
        
       		let blobId: LLBDataID

     

       12
       12
       +
       		

     

       13
       13
       +
       		typealias ValueType = String

     

       14
       14
        
       

     

       15
       15
        
       		static let versionDependencies: [any FXVersioning.Type] = []

     

       16
       16

+21 -19

Sources/PterodactylBuild/Keys/Blob-local operations/BlobImports.swift Sources/PterodactylBuild/Keys/Blob/ParseImports.swift

···

       7
       7
        
       import llbuild2fx

     

       8
       8
        
       import PterodactylSyntax

     

       9
       9
        
       

     

       10
       10
       +
       extension Keys.Blob {

     

       11
       11
       +
       	struct ParseImports: BuildKey {

     

       12
       12
       +
       		let blobId: LLBDataID

     

       13
       13
       +
       		

     

       14
       14
       +
       		typealias ValueType = [UnitName]

     

       15
       15
       +
       		

     

       16
       16
       +
       		static let versionDependencies: [any FXVersioning.Type] = [ReadContents.self]

     

       17
       17
       +
       

     

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

     

       19
       19
       +
       			let code = try await ctx.request(ReadContents(blobId: blobId))

     

       20
       20
       +
       			var importParser = ImportParser(input: code)

     

       21
       21
       +
       			importParser.parseHeader()

     

       22
       22
       +
       			

     

       23
       23
       +
       			return importParser.imports.map { name in

     

       24
       24
       +
       				UnitName(basename: name)

     

       25
       25
       +
       			}

     

       26
       26
       +
       		}

     

       27
       27
       +
       	}

     

       28
       28
       +
       }

     

       29
       29
       +
       

     

       30
       30
       +
       

     

       10
       31
        
       private struct ImportParser {

     

       11
       32
        
       	private var lexer: PterodactylSyntax.Lexer

     

       12
       33
        
       	public private(set) var imports: [String] = []

     
···

       44
       65
        
       	}

     

       45
       66
        
       }

     

       46
       67
        
       

     

       47
       47
       -
       

     

       48
       48
       -
       extension Keys {

     

       49
       49
       -
       	struct BlobImports: BuildKey {

     

       50
       50
       -
       		typealias ValueType = [UnitName]

     

       51
       51
       -
       		let blobId: LLBDataID

     

       52
       52
       -
       		

     

       53
       53
       -
       		static let versionDependencies: [any FXVersioning.Type] = [BlobContents.self]

     

       54
       54
       -
       

     

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

     

       56
       56
       -
       			let code = try await ctx.request(BlobContents(blobId: blobId))

     

       57
       57
       -
       			var importParser = ImportParser(input: code)

     

       58
       58
       -
       			importParser.parseHeader()

     

       59
       59
       -
       			

     

       60
       60
       -
       			return importParser.imports.map { name in

     

       61
       61
       -
       				UnitName(basename: name)

     

       62
       62
       -
       			}

     

       63
       63
       -
       		}

     

       64
       64
       -
       	}

     

       65
       65
       -
       }

-26

Sources/PterodactylBuild/Keys/Blob-local operations/BlobSyntaxTree.swift

···

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

     

       2
       2
       -
       //

     

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

     

       4
       4
       -
       

     

       5
       5
       -
       import Foundation

     

       6
       6
       -
       import PterodactylSyntax

     

       7
       7
       -
       import TSCBasic

     

       8
       8
       -
       import llbuild2fx

     

       9
       9
       -
       

     

       10
       10
       -
       extension Keys {

     

       11
       11
       -
       	struct BlobSyntaxTree: BuildKey {

     

       12
       12
       -
       		typealias ValueType = SyntaxTree

     

       13
       13
       -
       

     

       14
       14
       -
       		let blobId: LLBDataID

     

       15
       15
       -
       

     

       16
       16
       -
       		static let versionDependencies: [any FXVersioning.Type] = [BlobContents.self, BlobTokens.self]

     

       17
       17
       -
       

     

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

     

       19
       19
       -
       			let code = try await ctx.request(BlobContents(blobId: blobId))

     

       20
       20
       -
       			let tokens = try await ctx.request(BlobTokens(blobId: blobId))

     

       21
       21
       -
       			var parser = Parser(source: code, tokens: tokens)

     

       22
       22
       -
       			PterodactylSyntax.Document.parse(&parser)

     

       23
       23
       -
       			return parser.tree

     

       24
       24
       -
       		}

     

       25
       25
       -
       	}

     

       26
       26
       -
       }

+6 -6

Sources/PterodactylBuild/Keys/Blob-local operations/BlobTokens.swift Sources/PterodactylBuild/Keys/Blob/Tokenise.swift

···

       7
       7
        
       import llbuild2fx

     

       8
       8
        
       import PterodactylSyntax

     

       9
       9
        
       

     

       10
       10
       -
       extension Keys {

     

       11
       11
       -
       	struct BlobTokens: BuildKey {

     

       12
       12
       -
       		typealias ValueType = [Token]

     

       13
       13
       -
       

     

       10
       10
       +
       extension Keys.Blob {

     

       11
       11
       +
       	struct Tokenise: BuildKey {

     

       14
       12
        
       		let blobId: LLBDataID

     

       13
       13
       +
       		

     

       14
       14
       +
       		typealias ValueType = [Token]

     

       15
       15
        
       

     

       16
       16
       -
       		static let versionDependencies: [any FXVersioning.Type] = [BlobContents.self]

     

       16
       16
       +
       		static let versionDependencies: [any FXVersioning.Type] = [ReadContents.self]

     

       17
       17
        
       

     

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

     

       19
       19
       -
       			let code = try await ctx.request(BlobContents(blobId: blobId))

     

       19
       19
       +
       			let code = try await ctx.request(ReadContents(blobId: blobId))

     

       20
       20
        
       			var lexer = PterodactylSyntax.Lexer(input: code)

     

       21
       21
        
       			let flatTokens = lexer.tokenize()

     

       22
       22
        
       			return BlockLayoutProcessor(tokens: flatTokens).layout()

Sources/PterodactylBuild/Keys/Blob-local operations/README.md Sources/PterodactylBuild/Keys/Blob/README.md

+23

Sources/PterodactylBuild/Keys/Blob/GetLineMap.swift

···

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

     

       2
       2
       +
       //

     

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

     

       4
       4
       +
       

     

       5
       5
       +
       import Foundation

     

       6
       6
       +
       import PterodactylSyntax

     

       7
       7
       +
       import TSCBasic

     

       8
       8
       +
       import llbuild2fx

     

       9
       9
       +
       

     

       10
       10
       +
       extension Keys.Blob {

     

       11
       11
       +
       	struct GetLineMap: BuildKey {

     

       12
       12
       +
       		let blobId: LLBDataID

     

       13
       13
       +
       		

     

       14
       14
       +
       		typealias ValueType = PterodactylSyntax.LineMap

     

       15
       15
       +
       

     

       16
       16
       +
       		static let versionDependencies: [any FXVersioning.Type] = [ReadContents.self]

     

       17
       17
       +
       

     

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

     

       19
       19
       +
       			let code = try await ctx.request(ReadContents(blobId: blobId))

     

       20
       20
       +
       			return PterodactylSyntax.LineMap(source: code)

     

       21
       21
       +
       		}

     

       22
       22
       +
       	}

     

       23
       23
       +
       }

+26

Sources/PterodactylBuild/Keys/Blob/ParseDocument.swift

···

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

     

       2
       2
       +
       //

     

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

     

       4
       4
       +
       

     

       5
       5
       +
       import Foundation

     

       6
       6
       +
       import PterodactylSyntax

     

       7
       7
       +
       import TSCBasic

     

       8
       8
       +
       import llbuild2fx

     

       9
       9
       +
       

     

       10
       10
       +
       extension Keys.Blob {

     

       11
       11
       +
       	struct ParseDocument: BuildKey {

     

       12
       12
       +
       		let blobId: LLBDataID

     

       13
       13
       +
       		

     

       14
       14
       +
       		typealias ValueType = PterodactylSyntax.SyntaxTree

     

       15
       15
       +
       

     

       16
       16
       +
       		static let versionDependencies: [any FXVersioning.Type] = [ReadContents.self, Tokenise.self]

     

       17
       17
       +
       

     

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

     

       19
       19
       +
       			let code = try await ctx.request(ReadContents(blobId: blobId))

     

       20
       20
       +
       			let tokens = try await ctx.request(Tokenise(blobId: blobId))

     

       21
       21
       +
       			var parser = Parser(source: code, tokens: tokens)

     

       22
       22
       +
       			PterodactylSyntax.Document.parse(&parser)

     

       23
       23
       +
       			return parser.tree

     

       24
       24
       +
       		}

     

       25
       25
       +
       	}

     

       26
       26
       +
       }

+8 -7

Sources/PterodactylBuild/Keys/DependencyGraphOfSourceTree.swift Sources/PterodactylBuild/Keys/SourceTree/GetDependencyGraph.swift

···

       6
       6
        
       import TSCBasic

     

       7
       7
        
       import llbuild2fx

     

       8
       8
        
       

     

       9
       9
       -
       extension Keys {

     

       10
       10
       -
       	struct DependencyGraphOfSourceTree: BuildKey {

     

       9
       9
       +
       extension Keys.SourceTree {

     

       10
       10
       +
       	struct GetDependencyGraph: BuildKey {

     

       11
       11
       +
       		let sourceTreeId: LLBDataID

     

       12
       12
       +
       		

     

       11
       13
        
       		typealias ValueType = Graph<UnitName>

     

       12
       12
       -
       

     

       13
       13
       -
       		let sourceTreeId: LLBDataID

     

       14
       14
       -
       		static let versionDependencies: [any FXVersioning.Type] = [Keys.UnitMapOfSourceTree.self, Keys.BlobImports.self]

     

       14
       14
       +
       		

     

       15
       15
       +
       		static let versionDependencies: [any FXVersioning.Type] = [Keys.SourceTree.GetUnitMap.self, Keys.Blob.ParseImports.self]

     

       15
       16
        
       

     

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

     

       17
       17
       -
       			let unitMap = try await ctx.request(Keys.UnitMapOfSourceTree(sourceTreeId: sourceTreeId))

     

       18
       18
       +
       			let unitMap = try await ctx.request(Keys.SourceTree.GetUnitMap(sourceTreeId: sourceTreeId))

     

       18
       19
        
       			var edges: [UnitName: Set<UnitName>] = [:]

     

       19
       20
        
       

     

       20
       21
        
       			for (unitName, unitInfo) in unitMap.units {

     

       21
       22
        
       				if edges[unitName] == nil { edges[unitName] = [] }

     

       22
       22
       -
       				let imports = try await ctx.request(Keys.BlobImports(blobId: unitInfo.blobId))

     

       23
       23
       +
       				let imports = try await ctx.request(Keys.Blob.ParseImports(blobId: unitInfo.blobId))

     

       23
       24
        
       				for importedUnitName in imports {

     

       24
       25
        
       					edges[unitName]!.insert(importedUnitName)

     

       25
       26
        
       				}

+7 -7

Sources/PterodactylBuild/Keys/NarrowSourceTree.swift Sources/PterodactylBuild/Keys/SourceTree/NarrowToUnit.swift

···

       6
       6
        
       import TSCBasic

     

       7
       7
        
       import llbuild2fx

     

       8
       8
        
       

     

       9
       9
       -
       extension Keys {

     

       9
       9
       +
       extension Keys.SourceTree {

     

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

     

       11
       11
       -
       	struct NarrowSourceTree: BuildKey {

     

       12
       12
       -
       		typealias ValueType = LLBDataID

     

       13
       13
       -
       		

     

       11
       11
       +
       	struct NarrowToUnit: BuildKey {

     

       14
       12
        
       		let sourceTreeId: LLBDataID

     

       15
       13
        
       		let unitName: UnitName

     

       16
       14
        
       

     

       17
       17
       -
       		static let versionDependencies: [any FXVersioning.Type] = [TransitiveDependencies.self, UnitMapOfSourceTree.self]

     

       15
       15
       +
       		typealias ValueType = LLBDataID

     

       16
       16
       +
       

     

       17
       17
       +
       		static let versionDependencies: [any FXVersioning.Type] = [GetDependencies.self, GetUnitMap.self]

     

       18
       18
        
       

     

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

     

       20
       20
       -
       			let dependencies = try await ctx.request(TransitiveDependencies(sourceTreeId: sourceTreeId, unitName: unitName))

     

       21
       21
       -
       			let unitMap = try await ctx.request(UnitMapOfSourceTree(sourceTreeId: sourceTreeId))

     

       20
       20
       +
       			let dependencies = try await ctx.request(GetDependencies(sourceTreeId: sourceTreeId, unitName: unitName))

     

       21
       21
       +
       			let unitMap = try await ctx.request(GetUnitMap(sourceTreeId: sourceTreeId))

     

       22
       22
        
       

     

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

     

       24
       24
        
       			for (unitName, unitInfo) in unitMap.units {

+6 -6

Sources/PterodactylBuild/Keys/TransitiveDependencies.swift Sources/PterodactylBuild/Keys/SourceTree/GetDependencies.swift

···

       6
       6
        
       import TSCBasic

     

       7
       7
        
       import llbuild2fx

     

       8
       8
        
       

     

       9
       9
       -
       extension Keys {

     

       10
       10
       -
       	struct TransitiveDependencies: BuildKey {

     

       11
       11
       -
       		typealias ValueType = Set<UnitName>

     

       12
       12
       -
       

     

       9
       9
       +
       extension Keys.SourceTree {

     

       10
       10
       +
       	struct GetDependencies: BuildKey {

     

       13
       11
        
       		let sourceTreeId: LLBDataID

     

       14
       12
        
       		let unitName: UnitName

     

       15
       13
        
       

     

       16
       16
       -
       		static let versionDependencies: [any FXVersioning.Type] = [Keys.DependencyGraphOfSourceTree.self]

     

       14
       14
       +
       		typealias ValueType = Set<UnitName>

     

       15
       15
       +
       		

     

       16
       16
       +
       		static let versionDependencies: [any FXVersioning.Type] = [Keys.SourceTree.GetDependencyGraph.self]

     

       17
       17
        
       

     

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

     

       19
       19
       -
       			let graph = try await ctx.request(Keys.DependencyGraphOfSourceTree(sourceTreeId: sourceTreeId))

     

       19
       19
       +
       			let graph = try await ctx.request(Keys.SourceTree.GetDependencyGraph(sourceTreeId: sourceTreeId))

     

       20
       20
        
       			return graph.verticesReachableFrom(unitName)

     

       21
       21
        
       		}

     

       22
       22
        
       	}

+4 -3

Sources/PterodactylBuild/Keys/UnitMapOfSourceTree.swift Sources/PterodactylBuild/Keys/SourceTree/GetUnitMap.swift

···

       6
       6
        
       import TSCBasic

     

       7
       7
        
       import llbuild2fx

     

       8
       8
        
       

     

       9
       9
       -
       extension Keys {

     

       10
       10
       -
       	struct UnitMapOfSourceTree: BuildKey {

     

       11
       11
       -
       		typealias ValueType = UnitMap

     

       9
       9
       +
       extension Keys.SourceTree {

     

       10
       10
       +
       	struct GetUnitMap: BuildKey {

     

       12
       11
        
       		let sourceTreeId: LLBDataID

     

       13
       12
        
       

     

       13
       13
       +
       		typealias ValueType = UnitMap

     

       14
       14
       +
       		

     

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

     

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

     

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

+2 -2

Tests/PterodactylBuildTests/Test.swift

···

       29
       29
        
       		)

     

       30
       30
        
       

     

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

     

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

     

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

     

       33
       33
        
       		let foo = UnitName(basename: "foo")

     

       34
       34
        
       		let bar = UnitName(basename: "bar")

     

       35
       35
        
       		let baz = UnitName(basename: "baz")

     
···

       42
       42
        
       			]

     

       43
       43
        
       		)

     

       44
       44
        
       

     

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

     

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

     

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

     

       47
       47
        
       		return

     

       48
       48
        
       	}