Skip to content

Commit 37da39e

Browse files
hartbithartbit
committed
Only resolve dependencies that are visible from the root package
1 parent dcb2e99 commit 37da39e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+842
-211
lines changed

‎Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ let package = Package(
236236
dependencies: ["PackageLoading", "SPMTestSupport"]),
237237
.testTarget(
238238
name: "PackageModelTests",
239-
dependencies: ["PackageModel"]),
239+
dependencies: ["PackageModel", "SPMTestSupport"]),
240240
.testTarget(
241241
name: "PackageGraphTests",
242242
dependencies: ["PackageGraph", "SPMTestSupport"]),

‎Sources/Commands/SwiftPackageTool.swift

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,7 @@ public class SwiftPackageTool: SwiftTool<PackageToolOptions> {
112112
let builder = PackageBuilder(
113113
manifest: manifest,
114114
path: try getPackageRoot(),
115-
diagnostics: diagnostics,
116-
isRootPackage: true
115+
diagnostics: diagnostics
117116
)
118117
let package = try builder.construct()
119118

@@ -337,8 +336,7 @@ public class SwiftPackageTool: SwiftTool<PackageToolOptions> {
337336
let builder = PackageBuilder(
338337
manifest: manifest,
339338
path: try getPackageRoot(),
340-
diagnostics: diagnostics,
341-
isRootPackage: true
339+
diagnostics: diagnostics
342340
)
343341
let package = try builder.construct()
344342
describe(package, in: options.describeMode, on: stdoutStream)
@@ -823,15 +821,14 @@ fileprivate extension SwiftPackageTool {
823821
stream <<< "\n"
824822

825823
for (package, change) in changes {
826-
guard let packageName = package.name else { continue }
827824
let currentVersion = pins.pinsMap[package.identity]?.state.description ?? ""
828825
switch change {
829826
case let .added(requirement):
830-
stream <<< "+ \(packageName) \(requirement.prettyPrinted)"
827+
stream <<< "+ \(package.name) \(requirement.prettyPrinted)"
831828
case let .updated(requirement):
832-
stream <<< "~ \(packageName) \(currentVersion) -> \(packageName) \(requirement.prettyPrinted)"
829+
stream <<< "~ \(package.name) \(currentVersion) -> \(package.name) \(requirement.prettyPrinted)"
833830
case .removed:
834-
stream <<< "- \(packageName) \(currentVersion)"
831+
stream <<< "- \(package.name) \(currentVersion)"
835832
case .unchanged:
836833
continue
837834
}

‎Sources/PackageGraph/DependencyResolver.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1009,8 +1009,8 @@ public class DependencyResolver {
10091009
let incompatibleConstraints = constraints.filter{ $0.requirement == .unversioned }
10101010
guard incompatibleConstraints.isEmpty else {
10111011
self.error = DependencyResolverError.revisionDependencyContainsLocalPackage(
1012-
dependency: container.identifier.identity,
1013-
localPackage: incompatibleConstraints[0].identifier.identity
1012+
dependency: container.identifier.name,
1013+
localPackage: incompatibleConstraints[0].identifier.name
10141014
)
10151015
return AnySequence([])
10161016
}

‎Sources/PackageGraph/PackageGraphLoader.swift

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ extension PackageGraphError: CustomStringConvertible {
3535
public var description: String {
3636
switch self {
3737
case .noModules(let package):
38-
return "package '\(package)' contains no targets"
38+
return "package '\(package)' contains no products"
3939

4040
case .cycleDetected(let cycle):
4141
return "cyclic dependency declaration found: " +
@@ -82,7 +82,7 @@ public struct PackageGraphLoader {
8282
let manifestMapSequence = (root.manifests + externalManifests).map({ (PackageReference.computeIdentity(packageURL: $0.url), $0) })
8383
let manifestMap = Dictionary(uniqueKeysWithValues: manifestMapSequence)
8484
let successors: (Manifest) -> [Manifest] = { manifest in
85-
manifest.dependencies.compactMap({
85+
manifest.allRequiredDependencies.compactMap({
8686
let url = config.mirroredURL(forURL: $0.url)
8787
return manifestMap[PackageReference.computeIdentity(packageURL: url)]
8888
})
@@ -111,8 +111,6 @@ public struct PackageGraphLoader {
111111
// Create the packages.
112112
var manifestToPackage: [Manifest: Package] = [:]
113113
for manifest in allManifests {
114-
let isRootPackage = rootManifestSet.contains(manifest)
115-
116114
// Derive the path to the package.
117115
//
118116
// FIXME: Lift this out of the manifest.
@@ -124,17 +122,16 @@ public struct PackageGraphLoader {
124122
path: packagePath,
125123
fileSystem: fileSystem,
126124
diagnostics: diagnostics,
127-
isRootPackage: isRootPackage,
128125
shouldCreateMultipleTestProducts: shouldCreateMultipleTestProducts,
129-
createREPLProduct: isRootPackage ? createREPLProduct : false
126+
createREPLProduct: manifest.kind == .root ? createREPLProduct : false
130127
)
131128

132129
diagnostics.wrap(with: PackageLocation.Local(name: manifest.name, packagePath: packagePath), {
133130
let package = try builder.construct()
134131
manifestToPackage[manifest] = package
135132

136133
// Throw if any of the non-root package is empty.
137-
if package.targets.isEmpty && !isRootPackage {
134+
if package.targets.isEmpty && manifest.kind != .root {
138135
throw PackageGraphError.noModules(package)
139136
}
140137
})
@@ -230,7 +227,7 @@ private func createResolvedPackages(
230227
let package = packageBuilder.package
231228

232229
// Establish the manifest-declared package dependencies.
233-
packageBuilder.dependencies = package.manifest.dependencies.compactMap({
230+
packageBuilder.dependencies = package.manifest.allRequiredDependencies.compactMap({
234231
let url = config.mirroredURL(forURL: $0.url)
235232
return packageMap[PackageReference.computeIdentity(packageURL: url)]
236233
})

‎Sources/PackageGraph/PackageGraphRoot.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public struct PackageGraphRoot {
6161
return PackageReference(
6262
identity: PackageReference.computeIdentity(packageURL: effectiveURL),
6363
path: effectiveURL,
64-
isLocal: (requirement == .localPackage)
64+
kind: requirement == .localPackage ? .local : .remote
6565
)
6666
}
6767

@@ -96,7 +96,7 @@ public struct PackageGraphRoot {
9696
public init(input: PackageGraphRootInput, manifests: [Manifest]) {
9797
self.packageRefs = zip(input.packages, manifests).map { (path, manifest) in
9898
let identity = PackageReference.computeIdentity(packageURL: manifest.url)
99-
return PackageReference(identity: identity, path: path.pathString, isLocal: true)
99+
return PackageReference(identity: identity, path: path.pathString, kind: .root)
100100
}
101101
self.manifests = manifests
102102
self.dependencies = input.dependencies

‎Sources/PackageGraph/PinsStore.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,8 @@ extension PinsStore.Pin: JSONMappable, JSONSerializable, Equatable {
148148
public init(json: JSON) throws {
149149
let name: String? = json.get("package")
150150
let url: String = try json.get("repositoryURL")
151-
let ref = PackageReference(identity: PackageReference.computeIdentity(packageURL: url), path: url)
151+
let identity = PackageReference.computeIdentity(packageURL: url)
152+
let ref = PackageReference(identity: identity, path: url)
152153
self.packageRef = name.flatMap(ref.with(newName:)) ?? ref
153154
self.state = try json.get("state")
154155
}

‎Sources/PackageGraph/Pubgrub.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -842,8 +842,8 @@ public final class PubgrubDependencyResolver {
842842
constraints.append(dependency)
843843
case .unversioned:
844844
throw DependencyResolverError.revisionDependencyContainsLocalPackage(
845-
dependency: package.identity,
846-
localPackage: dependency.identifier.identity
845+
dependency: package.name,
846+
localPackage: dependency.identifier.name
847847
)
848848
}
849849
}
@@ -898,7 +898,7 @@ public final class PubgrubDependencyResolver {
898898
identity: "<synthesized-root>",
899899
path: "<synthesized-root-path>",
900900
name: nil,
901-
isLocal: true
901+
kind: .root
902902
)
903903

904904
self.root = root
@@ -1459,7 +1459,7 @@ private final class DiagnosticReportBuilder {
14591459
}
14601460

14611461
private func description(for term: Term, normalizeRange: Bool = false) -> String {
1462-
let name = term.package.name ?? term.package.lastPathComponent
1462+
let name = term.package.name
14631463

14641464
switch term.requirement {
14651465
case .any: return "every version of \(name)"

‎Sources/PackageGraph/RawPackageConstraints.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ extension PackageDependencyDescription {
1818
return PackageReference(
1919
identity: PackageReference.computeIdentity(packageURL: effectiveURL),
2020
path: effectiveURL,
21-
isLocal: (requirement == .localPackage)
21+
kind: requirement == .localPackage ? .local : .remote
2222
)
2323
}
2424
}
@@ -27,7 +27,7 @@ extension Manifest {
2727

2828
/// Constructs constraints of the dependencies in the raw package.
2929
public func dependencyConstraints(config: SwiftPMConfig) -> [RepositoryPackageConstraint] {
30-
return dependencies.map({
30+
return allRequiredDependencies.map({
3131
return RepositoryPackageConstraint(
3232
container: $0.createPackageRef(config: config),
3333
requirement: $0.requirement.toConstraintRequirement())

‎Sources/PackageGraph/RepositoryPackageContainerProvider.swift

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public class RepositoryPackageContainerProvider: PackageContainerProvider {
6262
completion: @escaping (Result<PackageContainer, AnyError>) -> Void
6363
) {
6464
// If the container is local, just create and return a local package container.
65-
if identifier.isLocal {
65+
if identifier.kind != .remote {
6666
callbacksQueue.async {
6767
let container = LocalPackageContainer(identifier,
6868
config: self.config,
@@ -107,7 +107,7 @@ extension PackageReference {
107107
///
108108
/// This should only be accessed when the reference is not local.
109109
public var repository: RepositorySpecifier {
110-
precondition(!isLocal)
110+
precondition(kind == .remote)
111111
return RepositorySpecifier(url: path)
112112
}
113113
}
@@ -210,6 +210,7 @@ public class LocalPackageContainer: BasePackageContainer, CustomStringConvertibl
210210
baseURL: identifier.path,
211211
version: nil,
212212
toolsVersion: toolsVersion,
213+
kind: identifier.kind,
213214
fileSystem: fs)
214215
return _manifest!
215216
}
@@ -469,6 +470,7 @@ public class RepositoryPackageContainer: BasePackageContainer, CustomStringConve
469470
baseURL: packageURL,
470471
version: version,
471472
toolsVersion: toolsVersion,
473+
kind: identifier.kind,
472474
fileSystem: fs)
473475
}
474476
}

‎Sources/PackageLoading/ManifestLoader.swift

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,16 @@ public protocol ManifestLoaderProtocol {
6262
/// - path: The root path of the package.
6363
/// - baseURL: The URL the manifest was loaded from.
6464
/// - version: The version the manifest is from, if known.
65-
/// - manifestVersion: The version of manifest to load.
65+
/// - toolsVersion: The version of the tools the manifest supports.
66+
/// - kind: The kind of package the manifest is from.
6667
/// - fileSystem: If given, the file system to load from (otherwise load from the local file system).
68+
/// - diagnostics: The diagnostics engine.
6769
func load(
6870
packagePath path: AbsolutePath,
6971
baseURL: String,
7072
version: Version?,
7173
toolsVersion: ToolsVersion,
74+
kind: PackageReference.Kind,
7275
fileSystem: FileSystem?,
7376
diagnostics: DiagnosticsEngine?
7477
) throws -> Manifest
@@ -81,12 +84,16 @@ extension ManifestLoaderProtocol {
8184
/// - path: The root path of the package.
8285
/// - baseURL: The URL the manifest was loaded from.
8386
/// - version: The version the manifest is from, if known.
84-
/// - fileSystem: The file system to load from.
87+
/// - toolsVersion: The version of the tools the manifest supports.
88+
/// - kind: The kind of package the manifest is from.
89+
/// - fileSystem: If given, the file system to load from (otherwise load from the local file system).
90+
/// - diagnostics: The diagnostics engine.
8591
public func load(
8692
package path: AbsolutePath,
8793
baseURL: String,
8894
version: Version? = nil,
8995
toolsVersion: ToolsVersion,
96+
kind: PackageReference.Kind,
9097
fileSystem: FileSystem? = nil,
9198
diagnostics: DiagnosticsEngine? = nil
9299
) throws -> Manifest {
@@ -95,6 +102,7 @@ extension ManifestLoaderProtocol {
95102
baseURL: baseURL,
96103
version: version,
97104
toolsVersion: toolsVersion,
105+
kind: kind,
98106
fileSystem: fileSystem,
99107
diagnostics: diagnostics
100108
)
@@ -160,17 +168,20 @@ public final class ManifestLoader: ManifestLoaderProtocol {
160168
/// - packagePath: The absolute path of the package root.
161169
/// - swiftCompiler: The absolute path of a `swiftc` executable.
162170
/// Its associated resources will be used by the loader.
171+
/// - kind: The kind of package the manifest is from.
163172
public static func loadManifest(
164173
packagePath: AbsolutePath,
165-
swiftCompiler: AbsolutePath
174+
swiftCompiler: AbsolutePath,
175+
kind: PackageReference.Kind
166176
) throws -> Manifest {
167177
let resources = try UserManifestResources(swiftCompiler: swiftCompiler)
168178
let loader = ManifestLoader(manifestResources: resources)
169179
let toolsVersion = try ToolsVersionLoader().load(at: packagePath, fileSystem: localFileSystem)
170180
return try loader.load(
171181
package: packagePath,
172182
baseURL: packagePath.pathString,
173-
toolsVersion: toolsVersion
183+
toolsVersion: toolsVersion,
184+
kind: kind
174185
)
175186
}
176187

@@ -179,6 +190,7 @@ public final class ManifestLoader: ManifestLoaderProtocol {
179190
baseURL: String,
180191
version: Version?,
181192
toolsVersion: ToolsVersion,
193+
kind: PackageReference.Kind,
182194
fileSystem: FileSystem? = nil,
183195
diagnostics: DiagnosticsEngine? = nil
184196
) throws -> Manifest {
@@ -187,6 +199,7 @@ public final class ManifestLoader: ManifestLoaderProtocol {
187199
baseURL: baseURL,
188200
version: version,
189201
toolsVersion: toolsVersion,
202+
kind: kind,
190203
fileSystem: fileSystem,
191204
diagnostics: diagnostics
192205
)
@@ -198,12 +211,14 @@ public final class ManifestLoader: ManifestLoaderProtocol {
198211
/// - path: The path to the manifest file (or a package root).
199212
/// - baseURL: The URL the manifest was loaded from.
200213
/// - version: The version the manifest is from, if known.
214+
/// - kind: The kind of package the manifest is from.
201215
/// - fileSystem: If given, the file system to load from (otherwise load from the local file system).
202216
func loadFile(
203217
path inputPath: AbsolutePath,
204218
baseURL: String,
205219
version: Version?,
206220
toolsVersion: ToolsVersion,
221+
kind: PackageReference.Kind,
207222
fileSystem: FileSystem? = nil,
208223
diagnostics: DiagnosticsEngine? = nil
209224
) throws -> Manifest {
@@ -248,6 +263,7 @@ public final class ManifestLoader: ManifestLoaderProtocol {
248263
url: baseURL,
249264
version: version,
250265
toolsVersion: toolsVersion,
266+
kind: kind,
251267
pkgConfig: manifestBuilder.pkgConfig,
252268
providers: manifestBuilder.providers,
253269
cLanguageStandard: manifestBuilder.cLanguageStandard,

0 commit comments

Comments
 (0)