strips/darwin-apk
2
0
Fork 0
mirror of https://github.com/GayPizzaSpecifications/darwin-apk.git synced 2025-08-07 15:11:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Factor out resolution responsibilities

Browse Source
This commit is contained in:
a dinosaur
2025-07-11 20:40:23 +10:00
parent 08a05a44eb
commit 1ba8e14ef4
5 changed files with 59 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Sources/apk/Graph/ApkPackageGraph.swift
View File

@ -6,31 +6,27 @@
import Foundation
public class ApkPackageGraph {
public var pkgIndex: ApkIndex
private var _nodes = [ApkPackageGraphNode]()
public var nodes: [ApkPackageGraphNode] { self._nodes }
public var shallowIsolates: [ApkPackageGraphNode] { self._nodes.filter(\.isShallow) }
public var deepIsolates: [ApkPackageGraphNode] { self._nodes.filter(\.isDeep) }
public init(index: ApkIndex) {
self.pkgIndex = index
}
public init() {}
public func buildGraphNode() {
public func buildGraphNode(index pkgIndex: ApkIndex, providers: ApkIndexProviderCache) {
for (packageID, package) in pkgIndex.packages.enumerated() {
let children: [ApkPackageGraphNode.ChildRef] = package.dependencies.compactMap { dependency in
guard let providerID = pkgIndex.resolveIndex(requirement: dependency.requirement) else {
guard let providerID = providers.resolve(index: pkgIndex, requirement: dependency.requirement) else {
return nil
}
return .init(constraint: .dependency, packageID: providerID, versionSpec: dependency.requirement.versionSpec)
} + package.installIf.compactMap { installIf in
guard let prvID = pkgIndex.resolveIndex(requirement: installIf.requirement) else {
} /* + package.installIf.compactMap { installIf in
guard let prvID = providers.resolve(index: pkgIndex, requirement: installIf.requirement) else {
return nil
}
return .init(constraint: .installIf, packageID: prvID, versionSpec: installIf.requirement.versionSpec)
}
} */
self._nodes.append(.init(self,
id: packageID,
children: children

42
Sources/apk/Graph/ApkPackageGraphNode.swift
View File

@ -10,23 +10,10 @@ public class ApkPackageGraphNode {
public var parentIDs = [ApkIndex.Index]()
public var children: [ChildRef]
private weak var _graph: ApkPackageGraph?
public var package: ApkIndexPackage {
self._graph!.pkgIndex.packages[self.packageID]
}
public var parents: [ApkIndexPackage] {
self.parentIDs.map { index in self._graph!.pkgIndex.packages[index] }
}
public var childPackages: [ApkIndexPackage] {
self.children.map { child in self._graph!.pkgIndex.packages[child.packageID] }
}
@inlinable public var isShallow: Bool { self.parentIDs.isEmpty }
@inlinable public var isDeep: Bool { self.children.isEmpty }
internal init(_ graph: ApkPackageGraph, id: Int, children: [ChildRef]) {
self._graph = graph
self.packageID = id
self.children = children
}
@ -54,31 +41,8 @@ extension ApkPackageGraphNode {
}
}
extension ApkPackageGraphNode: CustomStringConvertible {
public var description: String {
let package = self.package
var result = " \(package.nameDescription):\n"
if !self.parentIDs.isEmpty {
result += " parents:\n"
for parent in self.parents {
result += " \(parent.nameDescription)\n"
}
}
if !self.children.isEmpty {
result += " children:\n"
for child in self.children {
let childPackage = self._graph!.pkgIndex.packages[child.packageID]
result += " "
switch child.constraint {
case .dependency: result += "dep="
case .installIf: result += "installIf="
}
result += childPackage.nameDescription
result += ", "
result += child.versionSpec.description
result += "\n"
}
}
return result
extension ApkIndex {
public func at(node: ApkPackageGraphNode) -> ApkIndexPackage {
self.packages[node.packageID]
}
}