Steel thread through fantasyland.

This includes a mostly feature-identical version of tool/migrate_ecosystem.sh, written in Dart.


Bug: #40280

Change-Id: Ib3fe2f353208038ac6c3f035fcdb17f638c68e49
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/134786
Reviewed-by: Paul Berry <[email protected]>
Commit-Queue: Janice Collins <[email protected]>

Author: jcollins-g

pkg/nnbd_migration/bin/steamroll_ecosystem.dart

@@ -0,0 +1,87 @@
+// Copyright (c) 2020, the Dart project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+import 'dart:io';
+
+/// This binary can generate and update an integrated workspace for upgrading
+/// individual packages and their dependencies simultaneously.
+
+import 'package:nnbd_migration/src/fantasyland/fantasy_workspace.dart';
+import 'package:path/path.dart' as path;
+import 'package:args/args.dart';
+
+final parser = ArgParser()
+  ..addMultiOption('extra-packages', abbr: 'e', splitCommas: true)
+  ..addOption('package-name', abbr: 'p')
+  ..addFlag('analysis-options-hack', defaultsTo: true, negatable: true)
+  ..addFlag('strip-sdk-constraint-hack', defaultsTo: true, negatable: true)
+  ..addFlag('force-migrate-deps', defaultsTo: true, negatable: true)
+  ..addFlag('force-migrate-package', defaultsTo: false, negatable: true)
+  ..addFlag('force-migrate-extras', defaultsTo: true, negatable: true)
+  ..addFlag('help', abbr: 'h');
+
+Future<void> main(List<String> args) async {
+  ArgResults results = parser.parse(args);
+
+  if (results['help'] as bool) {
+    _showHelp(null, useStdError: false);
+    exit(0);
+  }
+
+  if (results.rest.length != 1) {
+    _showHelp('error: only one argument allowed for workspace directory');
+    exit(1);
+  }
+
+  List<String> extraPackages = results['extra-packages'] as List<String>;
+  String packageName = results['package-name'] as String;
+
+  if (packageName == null) {
+    _showHelp('error: --package_name required');
+    exit(1);
+  }
+  assert(packageName != null);
+  assert(extraPackages != null);
+
+  FantasyWorkspace workspace = await buildFantasyLand(
+      packageName, extraPackages, path.canonicalize(results.rest.first));
+  workspace.makeAllSymlinks();
+
+  if (results['analysis-options-hack'] as bool) {
+    stderr.writeln('warning: analysis options hack not implemented');
+  }
+
+  if (results['strip-sdk-constraint-hack'] as bool) {
+    stderr.writeln('warning: sdk constraint hack not implemented');
+  }
+
+  if (results['force-migrate-deps'] as bool ||
+      results['force-migrate-package'] as bool ||
+      results['force-migrate-extras'] as bool) {
+    stderr.writeln('warning: auto-migration not implemented');
+  }
+}
+
+// TODO(jcollins-g): add symbolic link support to analyzer filesystem.
+extension _Symlinks on FantasyWorkspace {
+  void makeAllSymlinks() {
+    for (var package in subPackages.values) {
+      Link l = Link(path.join(workspaceRootPath, package.name));
+      if (!l.existsSync()) {
+        l.createSync(
+            path.relative(package.packageRoot.path, from: workspaceRootPath));
+      }
+    }
+  }
+}
+
+void _showHelp(String message, {bool useStdError = true}) {
+  var writer = useStdError ? stderr : stdout;
+
+  writer.writeln(message ?? '');
+  writer.writeln(
+      'Usage: dart ${Platform.script.toFilePath()} [options] workspace_dir');
+  writer.writeln();
+  writer.writeln(parser.usage);
+}

pkg/nnbd_migration/lib/src/fantasyland/fantasy_repo.dart

@@ -16,8 +16,8 @@ final Map<String, FantasyRepoSettings> _repoTable = {
       'build_version', '$githubHost:kevmoo/build_version.git'),
   'csv': FantasyRepoSettings('csv', '$githubHost:close2/csv.git'),
   'git': FantasyRepoSettings('git', '$githubHost:kevmoo/git.git'),
-  'node_interop': FantasyRepoSettings(
-      'node_interop', '$githubHost:pulyaevskiy/node-interop.git'),
+  'node-interop': FantasyRepoSettings(
+      'node-interop', '$githubHost:pulyaevskiy/node-interop.git'),
   'node_preamble': FantasyRepoSettings(
       'package_config', '$githubHost:mbullington/node_preamble.dart.git'),
   'package_config': FantasyRepoSettings('package_config',

pkg/nnbd_migration/lib/src/fantasyland/fantasy_repo_impl.dart

@@ -73,9 +73,7 @@ class FantasyRepoGitImpl extends FantasyRepo {
   /// initializing.
   Future<void> _clone(SubprocessLauncher launcher) async {
     assert(_isInitialized == false);
-    if (!repoRoot.parent.exists) {
-      await repoRoot.parent.create();
-    }
+    repoRoot.parent.create();
     await launcher.runStreamed('git', ['init', repoRoot.path]);
     await launcher.runStreamed(
         'git',
@@ -111,34 +109,17 @@ class FantasyRepoGitImpl extends FantasyRepo {
       '!**/pubspec.lock\n',
       '!**/.dart_tool/package_config.json\n'
     ].join());
-    try {
-      await _update(launcher);
-    } catch (e) {
-      if (e is FantasyRepoUpdateException) {
-        throw FantasyRepoCloneException(
-            'Unable to initialize clone for: $repoSettings');
-      }
-      // Other kinds of exceptions are not expected, so rethrow.
-      rethrow;
-    }
+    await launcher.runStreamed(
+        'git', ['pull', '--depth=1', '--rebase', 'originHTTP'],
+        workingDirectory: repoRoot.path, retries: 5);
   }
 
   Future<void> _update(SubprocessLauncher launcher) async {
     assert(_isInitialized == false);
     try {
-      List<String> args;
-      if (repoSettings.branch == 'master') {
-        args = [
-          'pull',
-          '--depth=1',
-          '--rebase',
-          'originHTTP',
-          repoSettings.revision
-        ];
-      } else {
-        args = ['pull', '--rebase', 'originHTTP', repoSettings.revision];
-      }
-      await launcher.runStreamed('git', args, workingDirectory: repoRoot.path);
+      await launcher.runStreamed(
+          'git', ['pull', '--rebase', 'originHTTP', repoSettings.revision],
+          workingDirectory: repoRoot.path, retries: 5);
     } catch (e) {
       if (e is ProcessException) {
         throw FantasyRepoUpdateException(

pkg/nnbd_migration/lib/src/fantasyland/fantasy_sub_package.dart

@@ -123,6 +123,9 @@ final Map<String, FantasySubPackageSettings> _subPackageTable = {
       subDir: path.join('pkg', 'vm_service')),
   'quiver': FantasySubPackageSettings(
       'quiver', FantasyRepoSettings.fromName('quiver-dart')),
+  'webkit_inspection_protocol': FantasySubPackageSettings(
+      'webkit_inspection_protocol',
+      FantasyRepoSettings.fromName('webkit_inspection_protocol.dart')),
 };
 
 /// Data class containing settings for a package within a [FantasyWorkspaceImpl].

pkg/nnbd_migration/lib/src/fantasyland/fantasy_workspace.dart

@@ -2,20 +2,23 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-// TODO(jcollins-g): finish port away from io
-import 'dart:io' show Directory;
-
 import 'package:nnbd_migration/src/fantasyland/fantasy_sub_package.dart';
 import 'package:nnbd_migration/src/fantasyland/fantasy_workspace_impl.dart';
 
 export 'package:nnbd_migration/src/fantasyland/fantasy_sub_package.dart';
 
 /// Represent a single [FantasyWorkspace].
 abstract class FantasyWorkspace {
-  Directory get workspaceRoot;
+  String get workspaceRootPath;
 
   /// Fully initialized subpackages.
-  Map<String, FantasySubPackage> subPackages;
+  Map<FantasySubPackageSettings, FantasySubPackage> subPackages;
+
+  /// Add a package to the workspace, given [packageSettings].
+  ///
+  /// Completes when the repository and subPackage is added.
+  Future<FantasySubPackage> addPackageToWorkspace(
+      FantasySubPackageSettings packageSettings);
 }
 
 /// Build a "fantasyland"-style repository structure suitable for applying