Supports parsing .target(name:) syntax (#13)

* Supports parsing .target(name:) syntax

* Fixes SwiftLint errors

Sources/Library/Parsing/PackageSwiftFileParserLive/Internal/IntermediatePackageSwiftFile+Target+Dependency.swift

@@ -2,6 +2,7 @@ extension IntermediatePackageSwiftFile.Target {
     enum Dependency: Decodable {
         private enum CodingKeys: CodingKey {
             case byName
+            case target
             case product
         }
 
@@ -20,7 +21,9 @@ extension IntermediatePackageSwiftFile.Target {
         init(from decoder: Decoder) throws {
             let container = try decoder.container(keyedBy: CodingKeys.self)
             if container.allKeys.contains(CodingKeys.byName) {
-                self = try .decodeByName(using: container)
+                self = try .decodeName(using: container, forKey: .byName)
+            } else if container.allKeys.contains(CodingKeys.target) {
+                self = try .decodeName(using: container, forKey: .target)
             } else if container.allKeys.contains(CodingKeys.product) {
                 self = try .decodeProduct(using: container)
             } else {
@@ -33,8 +36,8 @@ extension IntermediatePackageSwiftFile.Target {
 }
 
 private extension IntermediatePackageSwiftFile.Target.Dependency {
-    private static func decodeByName(using container: KeyedDecodingContainer<Self.CodingKeys>) throws -> Self {
-        let values = try container.decode([ByNameComponent].self, forKey: .byName)
+    private static func decodeName(using container: KeyedDecodingContainer<Self.CodingKeys>, forKey key: CodingKeys) throws -> Self {
+        let values = try container.decode([NameComponent].self, forKey: key)
         guard values.count >= 1 else {
             let debugDescription = "Expected to decode at least 1 string but found \(values.count)"
             throw DecodingError.dataCorrupted(.init(codingPath: container.codingPath, debugDescription: debugDescription))
@@ -67,7 +70,7 @@ private extension IntermediatePackageSwiftFile.Target.Dependency {
 }
 
 extension IntermediatePackageSwiftFile.Target.Dependency {
-    private enum ByNameComponent: Decodable {
+    private enum NameComponent: Decodable {
         struct PlatformNamesContainer: Decodable {
             let platformNames: [String]
         }

Tests/PackageSwiftFileParserLiveTests/Mock/DumpPackageServiceMock.swift

@@ -3,10 +3,11 @@ import Foundation
 
 struct DumpPackageServiceMock: DumpPackageService {
     private let fileURLMap: [URL: URL] = [
-        URL.Mock.examplePackageA: Bundle.module.url(forMockDumpPackageNamed: "example-package-a"),
-        URL.Mock.examplePackageB: Bundle.module.url(forMockDumpPackageNamed: "example-package-b"),
-        URL.Mock.examplePackageC: Bundle.module.url(forMockDumpPackageNamed: "example-package-c"),
-        URL.Mock.examplePackageD: Bundle.module.url(forMockDumpPackageNamed: "example-package-d")
+        URL.Mock.Example.packageA: Bundle.module.url(forMockDataNamed: "example-package-a"),
+        URL.Mock.Example.packageB: Bundle.module.url(forMockDataNamed: "example-package-b"),
+        URL.Mock.Example.packageC: Bundle.module.url(forMockDataNamed: "example-package-c"),
+        URL.Mock.DependencySyntax.byNameWithPlatformNames: Bundle.module.url(forMockDataNamed: "dependency-syntax-byname-with-platform-names"),
+        URL.Mock.DependencySyntax.target: Bundle.module.url(forMockDataNamed: "dependency-syntax-target")
     ]
 
     func dumpPackageForSwiftPackageFile(at fileURL: URL) throws -> Data {
@@ -16,7 +17,7 @@ struct DumpPackageServiceMock: DumpPackageService {
 }
 
 private extension Bundle {
-    func url(forMockDumpPackageNamed filename: String) -> URL {
+    func url(forMockDataNamed filename: String) -> URL {
         return url(forResource: "MockData/" + filename, withExtension: "json")!
     }
 }

Tests/PackageSwiftFileParserLiveTests/Mock/URL+Mock.swift

@@ -2,20 +2,28 @@ import Foundation
 
 extension URL {
     enum Mock {
-        static var examplePackageA: URL {
-            return NSURL.fileURL(withPath: "/Users/simon/Developer/Example/ExamplePackageA/Package.swift")
-        }
+        enum Example {
+            static var packageA: URL {
+                return NSURL.fileURL(withPath: "/Users/simon/Developer/Example/PackageA/Package.swift")
+            }
 
-        static var examplePackageB: URL {
-            return NSURL.fileURL(withPath: "/Users/simon/Developer/Example/ExamplePackageB/Package.swift")
-        }
+            static var packageB: URL {
+                return NSURL.fileURL(withPath: "/Users/simon/Developer/Example/PackageB/Package.swift")
+            }
 
-        static var examplePackageC: URL {
-            return NSURL.fileURL(withPath: "/Users/simon/Developer/Example/ExamplePackageC/Package.swift")
+            static var packageC: URL {
+                return NSURL.fileURL(withPath: "/Users/simon/Developer/Example/PackageC/Package.swift")
+            }
         }
 
-        static var examplePackageD: URL {
-            return NSURL.fileURL(withPath: "/Users/simon/Developer/Example/ExamplePackageD/Package.swift")
+        enum DependencySyntax {
+            static var byNameWithPlatformNames: URL {
+                return NSURL.fileURL(withPath: "/Users/simon/Developer/DependencySyntax/ByNamePlatformNames/Package.swift")
+            }
+
+            static var target: URL {
+                return NSURL.fileURL(withPath: "/Users/simon/Developer/DependencySyntax/Target/Package.swift")
+            }
         }
     }
 }

Tests/PackageSwiftFileParserLiveTests/MockData/example-package-d.json → Tests/PackageSwiftFileParserLiveTests/MockData/dependency-syntax-byname-with-platform-names.json

@@ -6,16 +6,16 @@
       "fileSystem" : [
         {
           "identity" : "examplepackagec",
-          "path" : "/Users/simon/Developer/Example/ExamplePackageC",
+          "path" : "/Users/simon/Developer/Example/PackageC",
           "productFilter" : null
         }
       ]
     }
   ],
-  "name" : "ExamplePackageD",
+  "name" : "DependencySyntaxByNameWithPlatformNames",
   "packageKind" : {
     "root" : [
-      "/Users/simon/Developer/Example/ExamplePackageD"
+      "/Users/simon/Developer/DependencySyntax/ByNameWithPlatformNames"
     ]
   },
   "pkgConfig" : null,

Tests/PackageSwiftFileParserLiveTests/MockData/dependency-syntax-target.json

@@ -0,0 +1,75 @@
+{
+  "cLanguageStandard" : null,
+  "cxxLanguageStandard" : null,
+  "dependencies" : [
+    {
+      "fileSystem" : [
+        {
+          "identity" : "examplepackagec",
+          "path" : "/Users/simon/Developer/Example/PackageC",
+          "productFilter" : null
+        }
+      ]
+    }
+  ],
+  "name" : "DependencySyntaxTarget",
+  "packageKind" : {
+    "root" : [
+      "/Users/simon/Developer/DependencySyntax/Target"
+    ]
+  },
+  "pkgConfig" : null,
+  "platforms" : [
+    {
+      "options" : [
+
+      ],
+      "platformName" : "ios",
+      "version" : "14.0"
+    }
+  ],
+  "products" : [
+    {
+      "name" : "ExampleLibraryD",
+      "settings" : [
+
+      ],
+      "targets" : [
+        "ExampleLibraryD"
+      ],
+      "type" : {
+        "library" : [
+          "automatic"
+        ]
+      }
+    }
+  ],
+  "providers" : null,
+  "swiftLanguageVersions" : null,
+  "targets" : [
+    {
+      "dependencies" : [
+        {
+          "target" : [
+            "ExampleLibraryC",
+            null
+          ]
+        }
+      ],
+      "exclude" : [
+
+      ],
+      "name" : "ExampleLibraryD",
+      "resources" : [
+
+      ],
+      "settings" : [
+
+      ],
+      "type" : "regular"
+    }
+  ],
+  "toolsVersion" : {
+    "_version" : "5.7.0"
+  }
+}

Tests/PackageSwiftFileParserLiveTests/MockData/example-package-a.json

@@ -7,7 +7,7 @@
   "name" : "ExamplePackageA",
   "packageKind" : {
     "root" : [
-      "/Users/simon/Developer/Example/ExamplePackageA"
+      "/Users/simon/Developer/Example/PackageA"
     ]
   },
   "pkgConfig" : null,

Tests/PackageSwiftFileParserLiveTests/MockData/example-package-b.json

@@ -6,7 +6,7 @@
       "fileSystem" : [
         {
           "identity" : "examplepackagec",
-          "path" : "/Users/simon/Developer/Example/ExamplePackageC",
+          "path" : "/Users/simon/Developer/Example/PackageC",
           "productFilter" : null
         }
       ]
@@ -36,7 +36,7 @@
   "name" : "ExamplePackageB",
   "packageKind" : {
     "root" : [
-      "/Users/simon/Developer/Example/ExamplePackageB"
+      "/Users/simon/Developer/Example/PackageB"
     ]
   },
   "pkgConfig" : null,

Tests/PackageSwiftFileParserLiveTests/MockData/example-package-c.json

@@ -7,7 +7,7 @@
   "name" : "ExamplePackageC",
   "packageKind" : {
     "root" : [
-      "/Users/simon/Developer/Example/ExamplePackageC"
+      "/Users/simon/Developer/Example/PackageC"
     ]
   },
   "pkgConfig" : null,

Tests/PackageSwiftFileParserLiveTests/PackageSwiftFileParserLiveTests.swift

@@ -8,15 +8,15 @@ final class PackageSwiftFileParserLiveTests: XCTestCase {
         let cache = PackageSwiftFileParserCacheMock()
         let dumpPackageService = DumpPackageServiceMock()
         let parser = PackageSwiftFileParserLive(cache: cache, dumpPackageService: dumpPackageService)
-        let packageSwiftFile = try parser.parseFile(at: URL.Mock.examplePackageA)
+        let packageSwiftFile = try parser.parseFile(at: URL.Mock.Example.packageA)
         XCTAssertEqual(packageSwiftFile.name, "ExamplePackageA")
     }
 
     func testParsesProducts() throws {
         let cache = PackageSwiftFileParserCacheMock()
         let dumpPackageService = DumpPackageServiceMock()
         let parser = PackageSwiftFileParserLive(cache: cache, dumpPackageService: dumpPackageService)
-        let packageSwiftFile = try parser.parseFile(at: URL.Mock.examplePackageA)
+        let packageSwiftFile = try parser.parseFile(at: URL.Mock.Example.packageA)
         XCTAssertEqual(packageSwiftFile.products, [
             PackageSwiftFile.Product(name: "ExampleLibraryA", targets: ["ExampleLibraryA"])
         ])
@@ -26,7 +26,7 @@ final class PackageSwiftFileParserLiveTests: XCTestCase {
         let cache = PackageSwiftFileParserCacheMock()
         let dumpPackageService = DumpPackageServiceMock()
         let parser = PackageSwiftFileParserLive(cache: cache, dumpPackageService: dumpPackageService)
-        let packageSwiftFile = try parser.parseFile(at: URL.Mock.examplePackageA)
+        let packageSwiftFile = try parser.parseFile(at: URL.Mock.Example.packageA)
         XCTAssertEqual(packageSwiftFile.targets, [
             PackageSwiftFile.Target(name: "ExampleLibraryA")
         ])
@@ -36,11 +36,11 @@ final class PackageSwiftFileParserLiveTests: XCTestCase {
         let cache = PackageSwiftFileParserCacheMock()
         let dumpPackageService = DumpPackageServiceMock()
         let parser = PackageSwiftFileParserLive(cache: cache, dumpPackageService: dumpPackageService)
-        let swiftPackageFile = try parser.parseFile(at: URL.Mock.examplePackageB)
+        let swiftPackageFile = try parser.parseFile(at: URL.Mock.Example.packageB)
         XCTAssertEqual(swiftPackageFile.dependencies, [
             .fileSystem(
                 identity: "examplepackagec",
-                path: "/Users/simon/Developer/Example/ExamplePackageC",
+                path: "/Users/simon/Developer/Example/PackageC",
                 packageSwiftFile: PackageSwiftFile(
                     name: "ExamplePackageC",
                     products: [
@@ -66,13 +66,13 @@ final class PackageSwiftFileParserLiveTests: XCTestCase {
         XCTAssertEqual(parsedPackageSwiftFile, cachedPackageSwiftFile)
     }
 
-    func testParsesByNameDependencyWithPlatformNames() throws {
+    func testParsesDependencySyntaxByNameDependencyWithPlatformNames() throws {
         let cache = PackageSwiftFileParserCacheMock()
         let dumpPackageService = DumpPackageServiceMock()
         let parser = PackageSwiftFileParserLive(cache: cache, dumpPackageService: dumpPackageService)
-        let packageSwiftFile = try parser.parseFile(at: URL.Mock.examplePackageD)
+        let packageSwiftFile = try parser.parseFile(at: URL.Mock.DependencySyntax.byNameWithPlatformNames)
         let expectedPackageSwiftFile = PackageSwiftFile(
-            name: "ExamplePackageD",
+            name: "DependencySyntaxByNameWithPlatformNames",
             products: [
                 PackageSwiftFile.Product(name: "ExampleLibraryD", targets: ["ExampleLibraryD"])
             ],
@@ -84,7 +84,40 @@ final class PackageSwiftFileParserLiveTests: XCTestCase {
             dependencies: [
                 .fileSystem(
                     identity: "examplepackagec",
-                    path: "/Users/simon/Developer/Example/ExamplePackageC",
+                    path: "/Users/simon/Developer/Example/PackageC",
+                    packageSwiftFile: PackageSwiftFile(
+                        name: "ExamplePackageC",
+                        products: [
+                            .init(name: "ExampleLibraryC", targets: ["ExampleLibraryC"])
+                        ],
+                        targets: [
+                            .init(name: "ExampleLibraryC")
+                        ]
+                    )
+                )
+            ])
+        XCTAssertEqual(packageSwiftFile, expectedPackageSwiftFile)
+    }
+
+    func testParsesDependencySyntaxTarget() throws {
+        let cache = PackageSwiftFileParserCacheMock()
+        let dumpPackageService = DumpPackageServiceMock()
+        let parser = PackageSwiftFileParserLive(cache: cache, dumpPackageService: dumpPackageService)
+        let packageSwiftFile = try parser.parseFile(at: URL.Mock.DependencySyntax.target)
+        let expectedPackageSwiftFile = PackageSwiftFile(
+            name: "DependencySyntaxTarget",
+            products: [
+                PackageSwiftFile.Product(name: "ExampleLibraryD", targets: ["ExampleLibraryD"])
+            ],
+            targets: [
+                PackageSwiftFile.Target(name: "ExampleLibraryD", dependencies: [
+                    .name("ExampleLibraryC")
+                ])
+            ],
+            dependencies: [
+                .fileSystem(
+                    identity: "examplepackagec",
+                    path: "/Users/simon/Developer/Example/PackageC",
                     packageSwiftFile: PackageSwiftFile(
                         name: "ExamplePackageC",
                         products: [