Unstaged changes for posterity

Sources/apk/Graph/ApkPackageGraph.swift

@@ -1,5 +1,5 @@
 /*
- * darwin-apk © 2024 Gay Pizza Specifications
+ * darwin-apk © 2024, 2025 Gay Pizza Specifications
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -31,11 +31,17 @@ public class ApkPackageGraph {
     }
 
     for (id, package) in pkgIndex.packages.enumerated() {
-      let children: [ApkIndexRequirementRef] = package.dependencies.filter { dependency in dependency.requirement.versionSpec != .conflict }.compactMap { dependency in
+      let children: [ApkIndexRequirementRef] = package.dependencies.compactMap { dependency in
-        guard let id = provides[dependency.requirement.name] else {
+        guard dependency.requirement.versionSpec != .conflict,
+            let id = provides[dependency.requirement.name] else {
           return nil
         }
         return .init(self, id: id, constraint: .dep(version: dependency.requirement.versionSpec))
+      } + package.installIf.compactMap { installIf in
+        guard let id = provides[installIf.requirement.name] else {
+          return nil
+        }
+        return .init(self, id: id, constraint: .installIf(version: installIf.requirement.versionSpec ))
       }
       self._nodes.append(.init(self,
         id: id,
@@ -54,7 +60,6 @@ public class ApkPackageGraph {
     }
 
     for (ref, parents) in reverseDependencies {
-      let package = self._nodes[ref.packageID].package
       self._nodes[ref.packageID].parents = parents
     }
   }
@@ -75,7 +80,6 @@ extension ApkPackageGraph {
     for dependency in node.children {
       let depNode = self._nodes[dependency.packageID]
       if resolving.contains(depNode.packageID) {
-        print("VIA \(resolving.map({ self._nodes[$0].package.name } )) CYCLE \(node.package.name) \(depNode.package.name)")
         return (node, depNode)
       }
 
@@ -119,11 +123,10 @@ extension ApkPackageGraph {
 
     while !working.isEmpty {
       // Set of all nodes now with satisfied dependencies
-      var set = working
+      var set = Set(working
         .filter { _, children in children.isEmpty }
-        .map(\.key)
+        .map(\.key))
 
-      print("set \(set.count) working \(working.count)")
       // If nothing was satisfied in this loop, check for cycles
       // If no cycles exist and the working set is empty, resolve is complete
       if set.isEmpty {
@@ -143,14 +146,11 @@ extension ApkPackageGraph {
         }
 
         // Break cycles by setting the new resolution set to dependencies that cycled
-        set = cycles.flatMap { [$0.0, $0.1] }
+        set = Set(cycles.flatMap { [$0.0, $0.1] })
-        set = Array(Set(set))
       }
 
-      print(set.map({ $0.package.name + " " + String($0.packageID) }))
-      
       // Add installation set to list of installation sets
-      results.append(set)
+      results.append(Array(set))
 
       // Filter the working set for anything that wasn't dealt with this iteration
       working = working.filter { node, _ in
@@ -158,10 +158,6 @@ extension ApkPackageGraph {
       }.reduce(into: [ApkPackageGraphNode: Set<ApkPackageGraphNode>]()) { d, node in
         d[node.key] = node.value.subtracting(set)
       }
-      
-      for (what, deps) in working {
-        print("\(what.packageID) \(what.package.name): \(deps.map { $0.package.name + " " + String($0.packageID) })")
-      }
     }
 
     return results

Sources/apk/Index/ApkIndexReader.swift

@@ -8,7 +8,7 @@ import Foundation
 public struct ApkIndexReader {
   static func read(from indexURL: URL) throws -> ApkIndex {
     let timed = false
-    var timer: ContinuousClock.Instant!
+    var timer: ContinuousClock.Instant = .now
     let durFormat = Duration.UnitsFormatStyle(
       allowedUnits: [ .seconds, .milliseconds ],
       width: .condensedAbbreviated,

Sources/dpk-cli/Subcommands/DpkGraphCommand.swift

@@ -32,7 +32,7 @@ struct DpkGraphCommand: AsyncParsableCommand {
 #else
     do {
       let sorted = try graph.parallelOrderSort()
-      print(sorted.count)
+      print(sorted)
     } catch {
       fatalError(error.localizedDescription)
     }