cleanup

Author: tomerd

Sources/Build/BuildPlan.swift

@@ -1832,6 +1832,8 @@ public class BuildPlan {
                     case .artifactsArchive:
                         let tools = try self.parseArtifactsArchive(for: binaryTarget)
                         tools.forEach { availableTools[$0.name] = $0.executablePath  }
+                    case.unknown:
+                        throw InternalError("unknown binary target '\(target.name)' type")
                     }
                 case .plugin:
                     continue

Sources/PackageLoading/ManifestLoader.swift

@@ -405,7 +405,7 @@ public final class ManifestLoader: ManifestLoaderProtocol {
 
             var validExtensions = [self.supportedArchiveExtension]
             if target.isLocal {
-                validExtensions += BinaryTarget.Kind.allCases.map { $0.fileExtension }
+                validExtensions += BinaryTarget.Kind.allCases.filter{ $0 != .unknown }.map { $0.fileExtension }
             }
 
             if !validExtensions.contains(location.pathExtension) {

Sources/PackageLoading/PackageBuilder.swift

@@ -32,6 +32,9 @@ public enum ModuleError: Swift.Error {
     /// The artifact for the binary target could not be found.
     case artifactNotFound(String)
 
+    /// The artifact is not available on disk
+    case artifactNotAvailable(String)
+
     /// Invalid custom path.
     case invalidCustomPath(target: String, path: String)
 
@@ -83,6 +86,8 @@ extension ModuleError: CustomStringConvertible {
             return "Source files for target \(target) should be located under '\(folderName)/\(target)', or a custom sources path can be set with the 'path' property in Package.swift"
         case .artifactNotFound(let target):
             return "artifact not found for target '\(target)'"
+        case .artifactNotAvailable(let target):
+            return "artifact not available for target '\(target)'"
         case .invalidLayout(let type):
             return "package has unsupported layout; \(type)"
         case .invalidManifestConfig(let package, let message):
@@ -195,9 +200,9 @@ public struct BinaryArtifact {
     public let originURL: String?
 
     /// The path to the  artifact.
-    public let path: AbsolutePath
+    public let path: AbsolutePath?
 
-    public init(kind: BinaryTarget.Kind, originURL: String?, path: AbsolutePath) {
+    public init(kind: BinaryTarget.Kind, originURL: String?, path: AbsolutePath?) {
         self.kind = kind
         self.originURL = originURL
         self.path = path
@@ -533,10 +538,13 @@ public final class PackageBuilder {
         /// Returns the path of the given target.
         func findPath(for target: TargetDescription) throws -> AbsolutePath {
             if target.type == .binary {
-                guard let artifact = self.binaryArtifacts.first(where: { $0.path.basenameWithoutExt == target.name }) else {
+                guard let artifact = self.binaryArtifacts.first(where: { $0.path?.basenameWithoutExt == target.name }) else {
                     throw ModuleError.artifactNotFound(target.name)
                 }
-                return artifact.path
+                guard let path = artifact.path else {
+                    throw ModuleError.artifactNotAvailable(target.name)
+                }
+                return path
             } else if let subpath = target.path { // If there is a custom path defined, use that.
                 if subpath == "" || subpath == "." {
                     return packagePath

Sources/PackageModel/Target.swift

@@ -551,13 +551,16 @@ public final class BinaryTarget: Target {
     public enum Kind: String, RawRepresentable, Codable, CaseIterable {
         case xcframework
         case artifactsArchive
+        case unknown // for non-downloaded artifacts
 
         public var fileExtension: String {
             switch self {
             case .xcframework:
                 return "xcframework"
             case .artifactsArchive:
                 return "artifactbundle"
+            case .unknown:
+                return "unknown"
             }
         }
 

Sources/Workspace/Workspace.swift

@@ -1021,14 +1021,13 @@ extension Workspace {
 
                 // radar/82263304
                 // compute binary artifacts for the sake of constructing a project model
-                // note this does not actually download remote artifacts and as such does not have the artifact's correct path
+                // note this does not actually download remote artifacts and as such does not have the artifact's type or path
                 let binaryArtifacts = try manifest.targets.filter{ $0.type == .binary }.map { target -> BinaryArtifact in
                     if let path = target.path {
                         let absolutePath = try manifest.path.parentDirectory.appending(RelativePath(validating: path))
                         return try BinaryArtifact(kind: .forFileExtension(absolutePath.extension ?? "unknown") , originURL: .none, path: absolutePath)
                     } else if let url = target.url.flatMap(URL.init(string:)) {
-                        let fakePath = try manifest.path.parentDirectory.appending(components: "remote", "archive").appending(RelativePath(validating: url.lastPathComponent))
-                        return BinaryArtifact(kind: .xcframework , originURL: url.absoluteString, path: fakePath)
+                        return BinaryArtifact(kind: .unknown, originURL: url.absoluteString, path: .none)
                     } else {
                         throw InternalError("a binary target should have either a path or a URL and a checksum")
                     }