updates

Author: elsh

Sources/PackageGraph/PackageGraph+Loading.swift

@@ -816,12 +816,12 @@ extension Target {
 
   func validateDependency(target: Target) throws {
     if self.type == .plugin && target.type == .library {
-      throw PackageGraphError.unsupported(targetName: self.name, targetType: self.type.rawValue, dependencyName: target.name, dependencyType: target.type.rawValue, dependencyPackage: nil)
+      throw PackageGraphError.unsupportedPluginDependency(targetName: self.name, dependencyName: target.name, dependencyType: target.type.rawValue, dependencyPackage: nil)
     }
   }
   func validateDependency(product: Product, productPackage: PackageIdentity) throws {
     if self.type == .plugin && product.type.isLibrary {
-      throw PackageGraphError.unsupported(targetName: self.name, targetType: self.type.rawValue, dependencyName: product.name, dependencyType: product.type.description, dependencyPackage: productPackage.description)
+      throw PackageGraphError.unsupportedPluginDependency(targetName: self.name, dependencyName: product.name, dependencyType: product.type.description, dependencyPackage: productPackage.description)
     }
   }
 }

Sources/PackageGraph/PackageGraph.swift

@@ -35,8 +35,8 @@ enum PackageGraphError: Swift.Error {
         targetName: String,
         packageIdentifier: String
     )
-    /// Dependency between a given target of its type and a dependent target/product of its type is unsupported
-    case unsupported(targetName: String, targetType: String, dependencyName: String, dependencyType: String,  dependencyPackage: String?)
+    /// Dependency between a plugin and a dependent target/product of a given type is unsupported
+    case unsupportedPluginDependency(targetName: String, dependencyName: String, dependencyType: String, dependencyPackage: String?)
     /// A product was found in multiple packages.
     case duplicateProduct(product: String, packages: [String])
 
@@ -236,12 +236,12 @@ extension PackageGraphError: CustomStringConvertible {
             return "multiple aliases: ['\(aliases.joined(separator: "', '"))'] found for target '\(target)' in product '\(product)' from package '\(package)'"
         case .invalidSourcesForModuleAliasing(let target, let product, let package):
             return "module aliasing can only be used for Swift based targets; non-Swift sources found in target '\(target)' for product '\(product)' from package '\(package)'"
-        case .unsupported(let targetName, let targetType, let dependencyName, let dependencyType,  let dependencyPackage):
+        case .unsupportedPluginDependency(let targetName, let dependencyName, let dependencyType,  let dependencyPackage):
             var trailingMsg = ""
             if let depPkg = dependencyPackage {
               trailingMsg = " from package '\(depPkg)'"
             }
-            return "target '\(targetName)' of type '\(targetType)' cannot depend on '\(dependencyName)' of type '\(dependencyType)'\(trailingMsg); this dependency is unsupported"
+            return "plugin '\(targetName)' cannot depend on '\(dependencyName)' of type '\(dependencyType)'\(trailingMsg); this dependency is unsupported"
         }
     }
 }

Tests/SPMBuildCoreTests/PluginInvocationTests.swift

@@ -582,7 +582,7 @@ class PluginInvocationTests: XCTestCase {
 
     func testUnsupportedDependencyProduct() throws {
         try testWithTemporaryDirectory { tmpPath in
-            // Create a sample package with a library target and a plugin.
+            // Create a sample package with a library product and a plugin.
             let packageDir = tmpPath.appending(components: "MyPackage")
             try localFileSystem.createDirectory(packageDir, recursive: true)
             try localFileSystem.writeFileContents(packageDir.appending(component: "Package.swift"), string: """
@@ -667,7 +667,7 @@ class PluginInvocationTests: XCTestCase {
             XCTAssertThrowsError(try workspace.loadPackageGraph(rootInput: rootInput, observabilityScope: observability.topScope)) { error in
                 var diagnosed = false
                 if let realError = error as? PackageGraphError,
-                   realError.description == "target 'MyPlugin' of type 'plugin' cannot depend on 'FooLib' of type 'library' from package 'foopackage'; this dependency is unsupported" {
+                   realError.description == "plugin 'MyPlugin' cannot depend on 'FooLib' of type 'library' from package 'foopackage'; this dependency is unsupported" {
                     diagnosed = true
                 }
                 XCTAssertTrue(diagnosed)
@@ -685,9 +685,6 @@ class PluginInvocationTests: XCTestCase {
                 import PackageDescription
                 let package = Package(
                     name: "MyPackage",
-                    dependencies: [
-                      .package(path: "../FooPackage"),
-                    ],
                     targets: [
                         .target(
                             name: "MyLibrary",
@@ -697,8 +694,7 @@ class PluginInvocationTests: XCTestCase {
                             name: "MyPlugin",
                             capability: .buildTool(),
                             dependencies: [
-                                "MyLibrary",
-                                .product(name: "FooLib", package: "FooPackage"),
+                                "MyLibrary"
                             ]
                         ),
                     ]
@@ -747,7 +743,7 @@ class PluginInvocationTests: XCTestCase {
             XCTAssertThrowsError(try workspace.loadPackageGraph(rootInput: rootInput, observabilityScope: observability.topScope)) { error in
                 var diagnosed = false
                 if let realError = error as? PackageGraphError,
-                   realError.description == "target 'MyPlugin' of type 'plugin' cannot depend on 'MyLibrary' of type 'library'; this dependency is unsupported" {
+                   realError.description == "plugin 'MyPlugin' cannot depend on 'MyLibrary' of type 'library'; this dependency is unsupported" {
                     diagnosed = true
                 }
                 XCTAssertTrue(diagnosed)