Support for resolving all packages in workspace together

lib/src/command/add.dart

@@ -208,7 +208,11 @@ Specify multiple sdk packages with descriptors.''');
       solveResult = await resolveVersions(
         SolveType.upgrade,
         cache,
-        Package(resolutionPubspec, entrypoint.rootDir),
+        Package(
+          resolutionPubspec,
+          entrypoint.rootDir,
+          entrypoint.root.workspaceChildren,
+        ),
       );
     } on GitException {
       final name = updates.first.ref.name;
@@ -356,6 +360,7 @@ Specify multiple sdk packages with descriptors.''');
       dependencies: dependencies,
       devDependencies: devDependencies,
       dependencyOverrides: dependencyOverrides,
+      workspace: original.workspace,
     );
   }
 

lib/src/command/dependency_services.dart

@@ -69,13 +69,21 @@ class DependencyServicesReportCommand extends PubCommand {
     final breakingPubspec = stripVersionBounds(compatiblePubspec);
 
     final compatiblePackagesResult = await _tryResolve(
-      Package(compatiblePubspec, entrypoint.rootDir),
+      Package(
+        compatiblePubspec,
+        entrypoint.rootDir,
+        entrypoint.root.workspaceChildren,
+      ),
       cache,
       additionalConstraints: additionalConstraints,
     );
 
     final breakingPackagesResult = await _tryResolve(
-      Package(breakingPubspec, entrypoint.rootDir),
+      Package(
+        breakingPubspec,
+        entrypoint.rootDir,
+        entrypoint.root.workspaceChildren,
+      ),
       cache,
       additionalConstraints: additionalConstraints,
     );
@@ -101,6 +109,7 @@ class DependencyServicesReportCommand extends PubCommand {
         sdkConstraints: compatiblePubspec.sdkConstraints,
         dependencies: compatiblePubspec.dependencies.values,
         devDependencies: compatiblePubspec.devDependencies.values,
+        workspace: compatiblePubspec.workspace,
       );
       final dependencySet =
           _dependencySetOfPackage(singleBreakingPubspec, package);
@@ -111,7 +120,11 @@ class DependencyServicesReportCommand extends PubCommand {
             .toRef()
             .withConstraint(stripUpperBound(package.toRange().constraint));
         final singleBreakingPackagesResult = await _tryResolve(
-          Package(singleBreakingPubspec, entrypoint.rootDir),
+          Package(
+            singleBreakingPubspec,
+            entrypoint.rootDir,
+            entrypoint.root.workspaceChildren,
+          ),
           cache,
         );
         singleBreakingVersion = singleBreakingPackagesResult
@@ -128,7 +141,11 @@ class DependencyServicesReportCommand extends PubCommand {
         );
 
         final smallestUpgradeResult = await _tryResolve(
-          Package(atLeastCurrentPubspec, entrypoint.rootDir),
+          Package(
+            atLeastCurrentPubspec,
+            entrypoint.rootDir,
+            entrypoint.root.workspaceChildren,
+          ),
           cache,
           solveType: SolveType.downgrade,
           additionalConstraints: additionalConstraints,
@@ -216,7 +233,14 @@ class DependencyServicesListCommand extends PubCommand {
 
     final currentPackages = fileExists(entrypoint.lockFilePath)
         ? entrypoint.lockFile.packages.values.toList()
-        : (await _tryResolve(Package(pubspec, entrypoint.rootDir), cache) ??
+        : (await _tryResolve(
+              Package(
+                pubspec,
+                entrypoint.rootDir,
+                entrypoint.root.workspaceChildren,
+              ),
+              cache,
+            ) ??
             <PackageId>[]);
 
     final dependencies = <Object>[];
@@ -428,6 +452,7 @@ class DependencyServicesApplyCommand extends PubCommand {
               location: toUri(entrypoint.pubspecPath),
             ),
             entrypoint.rootDir,
+            entrypoint.root.workspaceChildren,
           ),
           lockFile: updatedLockfile,
         );
@@ -720,6 +745,7 @@ Future<List<Object>> _computeUpgradeSet(
           dependencies: rootPubspec.dependencies.values,
           devDependencies: rootPubspec.devDependencies.values,
           sdkConstraints: rootPubspec.sdkConstraints,
+          workspace: rootPubspec.workspace,
         );
 
   final dependencySet = _dependencySetOfPackage(pubspec, package);
@@ -734,7 +760,7 @@ Future<List<Object>> _computeUpgradeSet(
         ? SolveType.downgrade
         : SolveType.get,
     cache,
-    Package(pubspec, entrypoint.rootDir),
+    Package(pubspec, entrypoint.rootDir, entrypoint.root.workspaceChildren),
     lockFile: lockFile,
     additionalConstraints: additionalConstraints,
   );

lib/src/command/outdated.dart

@@ -146,15 +146,23 @@ Consider using the Dart 2.19 sdk to migrate to null safety.''');
       'Resolving',
       () async {
         final upgradablePackagesResult = await _tryResolve(
-          Package(upgradablePubspec, entrypoint.rootDir),
+          Package(
+            upgradablePubspec,
+            entrypoint.rootDir,
+            entrypoint.root.workspaceChildren,
+          ),
           cache,
           lockFile: entrypoint.lockFile,
         );
         hasUpgradableResolution = upgradablePackagesResult != null;
         upgradablePackages = upgradablePackagesResult ?? [];
 
         final resolvablePackagesResult = await _tryResolve(
-          Package(resolvablePubspec, entrypoint.rootDir),
+          Package(
+            resolvablePubspec,
+            entrypoint.rootDir,
+            entrypoint.root.workspaceChildren,
+          ),
           cache,
           lockFile: entrypoint.lockFile,
         );

lib/src/command/remove.dart

@@ -130,6 +130,7 @@ To remove a dependency override of a package prefix the package name with
       dependencies: dependencies.values,
       devDependencies: devDependencies.values,
       dependencyOverrides: overrides.values,
+      workspace: original.workspace,
     );
   }
 

lib/src/command/upgrade.dart

@@ -278,7 +278,11 @@ be direct 'dependencies' or 'dev_dependencies', following packages are not:
         return await resolveVersions(
           SolveType.upgrade,
           cache,
-          Package(resolvablePubspec, entrypoint.rootDir),
+          Package(
+            resolvablePubspec,
+            entrypoint.rootDir,
+            entrypoint.root.workspaceChildren,
+          ),
         );
       },
       condition: _shouldShowSpinner,
@@ -331,6 +335,7 @@ be direct 'dependencies' or 'dev_dependencies', following packages are not:
         Package(
           _updatedPubspec(newPubspecText, entrypoint),
           entrypoint.rootDir,
+          entrypoint.root.workspaceChildren,
         ),
       );
       changes = tighten(

lib/src/entrypoint.dart

@@ -234,8 +234,10 @@ class Entrypoint {
   Entrypoint(
     this.rootDir,
     this.cache, {
-    Pubspec? pubspec,
-  })  : _root = pubspec == null ? null : Package(pubspec, rootDir),
+    ({Pubspec pubspec, List<Package> workspacePackages})? preloaded,
+  })  : _root = preloaded == null
+            ? null
+            : Package(preloaded.pubspec, rootDir, preloaded.workspacePackages),
         globalDir = null {
     if (p.isWithin(cache.rootDir, rootDir)) {
       fail('Cannot operate on packages inside the cache.');
@@ -251,7 +253,11 @@ class Entrypoint {
       _example,
       _packageGraph,
       cache,
-      Package(pubspec, rootDir),
+      Package(
+        pubspec,
+        rootDir,
+        root.workspaceChildren,
+      ),
       globalDir,
     );
   }
@@ -330,14 +336,20 @@ class Entrypoint {
     }
 
     if (!isGlobal) {
-      entries.add(
-        PackageConfigEntry(
-          name: root.name,
-          rootUri: p.toUri('../'),
-          packageUri: p.toUri('lib/'),
-          languageVersion: root.pubspec.languageVersion,
-        ),
-      );
+      /// Run through the entire workspace transitive closure and add an entry
+      /// for each package.
+      for (final package in root.transitiveWorkspace) {
+        entries.add(
+          PackageConfigEntry(
+            name: package.name,
+            rootUri: p.toUri(
+              p.relative(package.dir, from: p.join(rootDir, '.dart_tool')),
+            ),
+            packageUri: p.toUri('lib/'),
+            languageVersion: package.pubspec.languageVersion,
+          ),
+        );
+      }
     }
 
     final packageConfig = PackageConfig(

lib/src/global_packages.dart

@@ -219,6 +219,7 @@ class GlobalPackages {
         sources: cache.sources,
       ),
       _packageDir(name),
+      [],
     );
 
     // Resolve it and download its dependencies.

lib/src/package.dart

@@ -44,6 +44,22 @@ class Package {
   /// The parsed pubspec associated with this package.
   final Pubspec pubspec;
 
+  /// The (non-transitive) workspace packages.
+  final List<Package> workspaceChildren;
+
+  /// The transitive closure of [workspaceChildren] rooted at this package.
+  ///
+  /// Includes this package.
+  Iterable<Package> get transitiveWorkspace sync* {
+    final stack = [this];
+
+    while (stack.isNotEmpty) {
+      final current = stack.removeLast();
+      yield current;
+      stack.addAll(current.workspaceChildren);
+    }
+  }
+
   /// The immediate dependencies this package specifies in its pubspec.
   Map<String, PackageRange> get dependencies => pubspec.dependencies;
 
@@ -119,14 +135,17 @@ class Package {
       expectedName: name,
       allowOverridesFile: withPubspecOverrides,
     );
-    return Package(pubspec, dir);
+    final workspacePackages = pubspec.workspace
+        .map((e) => Package.load(null, p.join(dir, e), sources))
+        .toList();
+    return Package(pubspec, dir, workspacePackages);
   }
 
   /// Creates a package with [pubspec] associated with [dir].
   ///
   /// For temporary resolution attempts [pubspec] does not have to correspond
   /// to the one at disk.
-  Package(this.pubspec, this.dir);
+  Package(this.pubspec, this.dir, this.workspaceChildren);
 
   /// Given a relative path within this package, returns its absolute path.
   ///

lib/src/package_graph.dart

@@ -37,11 +37,12 @@ class PackageGraph {
   ) {
     final packages = {
       for (final id in result.packages)
-        id.name: id.name == entrypoint.root.name
+        id.name: id.isRoot
             ? entrypoint.root
             : Package(
                 result.pubspecs[id.name]!,
                 entrypoint.cache.getDirectory(id),
+                [],
               ),
     };
 

lib/src/pubspec_utils.dart

@@ -22,6 +22,7 @@ Pubspec stripDevDependencies(Pubspec original) {
     dependencies: original.dependencies.values,
     devDependencies: [], // explicitly give empty list, to prevent lazy parsing
     dependencyOverrides: original.dependencyOverrides.values,
+    workspace: original.workspace,
   );
 }
 
@@ -36,6 +37,7 @@ Pubspec stripDependencyOverrides(Pubspec original) {
     dependencies: original.dependencies.values,
     devDependencies: original.devDependencies.values,
     dependencyOverrides: [],
+    workspace: original.workspace,
   );
 }
 
@@ -85,6 +87,7 @@ Pubspec stripVersionBounds(
     dependencies: stripBounds(original.dependencies),
     devDependencies: stripBounds(original.devDependencies),
     dependencyOverrides: original.dependencyOverrides.values,
+    workspace: original.workspace,
   );
 }
 
@@ -121,6 +124,7 @@ Pubspec atLeastCurrent(Pubspec original, List<PackageId> current) {
     dependencies: fixBounds(original.dependencies),
     devDependencies: fixBounds(original.devDependencies),
     dependencyOverrides: original.dependencyOverrides.values,
+    workspace: original.workspace,
   );
 }