refactor: 1012263a9ddf60bc84e821d42da3638fb12ddac2

Author: serverpod_cloud

serverpod_cloud_cli/bin/serverpod_cloud_cli.dart

@@ -1,7 +1,6 @@
 import 'dart:async';
 import 'dart:io';
 
-import 'package:args/command_runner.dart';
 import 'package:cli_tools/cli_tools.dart';
 import 'package:serverpod_cloud_cli/command_logger/command_logger.dart';
 import 'package:serverpod_cloud_cli/command_runner/cloud_cli_command_runner.dart';

serverpod_cloud_cli/lib/command_runner/cloud_cli_command.dart

@@ -1,39 +1,29 @@
-import 'dart:io';
-
+import 'package:args/args.dart' show ArgResults;
 import 'package:args/command_runner.dart';
 import 'package:cli_tools/cli_tools.dart';
 import 'package:serverpod_cloud_cli/command_logger/command_logger.dart';
 import 'package:serverpod_cloud_cli/command_runner/cloud_cli_command_runner.dart';
 import 'package:serverpod_cloud_cli/shared/exceptions/cloud_cli_usage_exception.dart';
-import 'package:serverpod_cloud_cli/util/capitalize.dart';
 import 'package:serverpod_cloud_cli/util/cli_authentication_key_manager.dart';
-import 'package:serverpod_cloud_cli/util/config/configuration.dart';
-import 'package:serverpod_cloud_cli/util/scloud_config/scloud_config.dart';
+import 'package:serverpod_cloud_cli/util/scloud_config/scloud_config_broker.dart'
+    show scloudCliConfigBroker;
 
 import 'exit_exceptions.dart';
 
-abstract class CloudCliCommand<T extends OptionDefinition>
-    extends BetterCommand {
+abstract class CloudCliCommand<O extends OptionDefinition>
+    extends BetterCommand<O, void> {
   final CommandLogger logger;
 
-  /// The option definitions for this command.
-  final List<T> options;
-
   /// Whether the command requires the user to be logged in.
   /// The default is true, subclasses can override to false.
   final bool requireLogin = true;
 
   CloudCliCommand({
     required this.logger,
-    this.options = const [],
+    super.options = const [],
   }) : super(
-          passOutput: MessageOutput(
-            logUsage: logger.info,
-          ),
           wrapTextColumn: logger.wrapTextColumn,
-        ) {
-    options.prepareForParsing(argParser);
-  }
+        );
 
   /// Gets the top parent command for this command.
   Command get _topCommand {
@@ -62,25 +52,6 @@ abstract class CloudCliCommand<T extends OptionDefinition>
   /// Runs this command. Subclasses should instead override [runWithConfig].
   @override
   Future<void> run() async {
-    final config = Configuration.resolve(
-      options: options,
-      argResults: argResults,
-      env: Platform.environment,
-      configBroker: scloudCliConfigBroker(
-        globalConfig: globalConfiguration,
-        logger: logger,
-      ),
-    );
-
-    if (config.errors.isNotEmpty) {
-      final buffer = StringBuffer();
-      final errors = config.errors.map(
-        (final e) => '${e.capitalize()}.',
-      );
-      buffer.writeAll(errors, '\n');
-      usageException(buffer.toString());
-    }
-
     final apiCloudClient = runner.serviceProvider.cloudApiClient;
 
     if (requireLogin &&
@@ -95,7 +66,7 @@ abstract class CloudCliCommand<T extends OptionDefinition>
     }
 
     try {
-      await runWithConfig(config);
+      await super.run();
     } on CloudCliUsageException catch (e, stackTrace) {
       // TODO: Don't catch CloudCliUsageException,
       // it's a UsageException and is handled by the caller.
@@ -104,9 +75,23 @@ abstract class CloudCliCommand<T extends OptionDefinition>
     }
   }
 
+  @override
+  Configuration<O> resolveConfiguration(final ArgResults? argResults) {
+    return Configuration.resolve(
+      options: options,
+      argResults: argResults,
+      env: envVariables,
+      configBroker: scloudCliConfigBroker(
+        globalConfig: globalConfiguration,
+        logger: logger,
+      ),
+    );
+  }
+
   /// Runs this command with prepared configuration (options).
   /// Subclasses should override this method.
-  Future<void> runWithConfig(final Configuration<T> commandConfig) async {
+  @override
+  Future<void> runWithConfig(final Configuration<O> commandConfig) async {
     throw UnimplementedError(
         'CLI command $name has not implemented runWithConfig.');
   }

serverpod_cloud_cli/lib/command_runner/cloud_cli_command_runner.dart

@@ -4,6 +4,7 @@ import 'package:args/args.dart';
 import 'package:cli_tools/cli_tools.dart';
 import 'package:path/path.dart' as p;
 import 'package:pub_semver/pub_semver.dart';
+
 import 'package:serverpod_cloud_cli/command_logger/command_logger.dart';
 import 'package:serverpod_cloud_cli/command_runner/commands/custom_domain_command.dart';
 import 'package:serverpod_cloud_cli/command_runner/commands/db_command.dart';
@@ -21,15 +22,13 @@ import 'package:serverpod_cloud_cli/command_runner/helpers/cloud_cli_service_pro
 import 'package:serverpod_cloud_cli/command_runner/helpers/cli_version_checker.dart';
 import 'package:serverpod_cloud_cli/constants.dart';
 import 'package:serverpod_cloud_cli/persistent_storage/resource_manager.dart';
-import 'package:serverpod_cloud_cli/util/capitalize.dart';
 import 'package:serverpod_cloud_cli/util/common.dart';
-import 'package:serverpod_cloud_cli/util/config/config.dart';
 import 'package:serverpod_cloud_cli/util/pubspec_validator.dart';
 import 'package:serverpod_cloud_cli/util/scloud_config/scloud_config.dart';
 import 'package:serverpod_cloud_cli/util/scloud_version.dart';
 
 /// Represents the Serverpod Cloud CLI main command, its global options, and subcommands.
-class CloudCliCommandRunner extends BetterCommandRunner {
+class CloudCliCommandRunner extends BetterCommandRunner<GlobalOption, void> {
   final Version version;
   final CommandLogger logger;
   final CloudCliServiceProvider serviceProvider;
@@ -39,7 +38,7 @@ class CloudCliCommandRunner extends BetterCommandRunner {
   GlobalConfiguration? _globalConfiguration;
 
   /// The curremt global configuration for the Serverpod Cloud CLI.
-  /// (Since this object is re-entrant, the global config is regenerated each call to [runCommand].)
+  @override
   GlobalConfiguration get globalConfiguration {
     final globalConfig = _globalConfiguration;
     if (globalConfig == null) {
@@ -48,6 +47,16 @@ class CloudCliCommandRunner extends BetterCommandRunner {
     return globalConfig;
   }
 
+  /// Sets the curremt global configuration for the Serverpod Cloud CLI.
+  /// (Since this object is re-entrant, the global config is regenerated
+  /// each call to [run].)
+  @override
+  set globalConfiguration(final Configuration<GlobalOption> configuration) {
+    _globalConfiguration = GlobalConfiguration.from(
+      configuration: configuration,
+    );
+  }
+
   CloudCliCommandRunner._({
     required this.logger,
     required this.version,
@@ -57,9 +66,10 @@ class CloudCliCommandRunner extends BetterCommandRunner {
         super(
           'scloud',
           'Manage your Serverpod Cloud projects',
+          globalOptions: GlobalOption.values,
           wrapTextColumn: logger.wrapTextColumn,
           messageOutput: MessageOutput(
-            logUsage: logger.info,
+            usageLogger: logger.info,
           ),
         );
 
@@ -83,9 +93,6 @@ class CloudCliCommandRunner extends BetterCommandRunner {
       ),
     );
 
-    // Add global options
-    GlobalOption.values.prepareForParsing(runner.argParser);
-
     // Add commands (which may in turn have their own options and subcommands)
     runner.addCommands([
       runner._versionCommand,
@@ -106,22 +113,6 @@ class CloudCliCommandRunner extends BetterCommandRunner {
 
   @override
   Future<void> runCommand(final ArgResults topLevelResults) async {
-    _globalConfiguration = GlobalConfiguration(
-      argResults: topLevelResults,
-      env: Platform.environment,
-    );
-
-    if (globalConfiguration.errors.isNotEmpty) {
-      final buffer = StringBuffer();
-      final errors = globalConfiguration.errors.map(
-        (final e) => '${e.capitalize()}.',
-      );
-      buffer.writeAll(errors, '\n');
-      usageException(buffer.toString());
-    }
-
-    logger.configuration = globalConfiguration;
-
     serviceProvider.initialize(
       globalConfiguration: globalConfiguration,
       logger: logger,
@@ -379,8 +370,12 @@ File? _projectConfigFileFinder(final Configuration cfg) {
 }
 
 /// The current global configuration values for the Serverpod Cloud CLI.
-class GlobalConfiguration extends Configuration {
-  GlobalConfiguration({
+class GlobalConfiguration extends Configuration<GlobalOption> {
+  GlobalConfiguration.from({
+    required super.configuration,
+  }) : super.from();
+
+  GlobalConfiguration.resolve({
     super.argResults,
     super.args,
     super.env,

serverpod_cloud_cli/lib/command_runner/commands/auth_command.dart

@@ -1,11 +1,11 @@
 import 'dart:async';
 
+import 'package:cli_tools/config.dart';
 import 'package:serverpod_cloud_cli/command_runner/cloud_cli_command.dart';
 import 'package:serverpod_cloud_cli/command_runner/exit_exceptions.dart';
 import 'package:serverpod_cloud_cli/persistent_storage/models/serverpod_cloud_data.dart';
 import 'package:serverpod_cloud_cli/persistent_storage/resource_manager.dart';
 import 'package:serverpod_cloud_cli/util/browser_launcher.dart';
-import 'package:serverpod_cloud_cli/util/config/config.dart';
 import 'package:serverpod_cloud_cli/util/listener_server.dart';
 
 import 'categories.dart';

serverpod_cloud_cli/lib/command_runner/commands/custom_domain_command.dart

@@ -1,10 +1,10 @@
 import 'package:basic_utils/basic_utils.dart';
+import 'package:cli_tools/config.dart';
 import 'package:serverpod_cloud_cli/command_logger/command_logger.dart';
 import 'package:serverpod_cloud_cli/command_runner/cloud_cli_command.dart';
 import 'package:serverpod_cloud_cli/command_runner/exit_exceptions.dart';
 import 'package:serverpod_cloud_cli/command_runner/helpers/command_options.dart';
 import 'package:serverpod_cloud_cli/shared/helpers/common_exceptions_handler.dart';
-import 'package:serverpod_cloud_cli/util/config/config.dart';
 import 'package:serverpod_cloud_cli/util/printers/table_printer.dart';
 import 'package:ground_control_client/ground_control_client.dart';
 

serverpod_cloud_cli/lib/command_runner/commands/db_command.dart

@@ -1,8 +1,8 @@
+import 'package:cli_tools/config.dart';
 import 'package:serverpod_cloud_cli/command_runner/cloud_cli_command.dart';
 import 'package:serverpod_cloud_cli/command_runner/exit_exceptions.dart';
 import 'package:serverpod_cloud_cli/command_runner/helpers/command_options.dart';
 import 'package:serverpod_cloud_cli/shared/helpers/common_exceptions_handler.dart';
-import 'package:serverpod_cloud_cli/util/config/config.dart';
 
 import 'categories.dart';
 

serverpod_cloud_cli/lib/command_runner/commands/deploy_command.dart

@@ -1,7 +1,7 @@
+import 'package:cli_tools/config.dart';
 import 'package:serverpod_cloud_cli/command_runner/cloud_cli_command.dart';
 import 'package:serverpod_cloud_cli/command_runner/helpers/command_options.dart';
 import 'package:serverpod_cloud_cli/commands/deploy/deploy.dart';
-import 'package:serverpod_cloud_cli/util/config/config.dart';
 
 import 'categories.dart';
 

serverpod_cloud_cli/lib/command_runner/commands/env_command.dart

@@ -1,8 +1,8 @@
+import 'package:cli_tools/config.dart';
 import 'package:serverpod_cloud_cli/command_runner/cloud_cli_command.dart';
 import 'package:serverpod_cloud_cli/command_runner/exit_exceptions.dart';
 import 'package:serverpod_cloud_cli/command_runner/helpers/command_options.dart';
 import 'package:serverpod_cloud_cli/shared/helpers/common_exceptions_handler.dart';
-import 'package:serverpod_cloud_cli/util/config/config.dart';
 import 'package:serverpod_cloud_cli/util/printers/table_printer.dart';
 import 'package:ground_control_client/ground_control_client.dart';
 

serverpod_cloud_cli/lib/command_runner/commands/launch_command.dart

@@ -1,8 +1,8 @@
+import 'package:cli_tools/config.dart';
 import 'package:serverpod_cloud_cli/command_runner/cloud_cli_command.dart';
 import 'package:serverpod_cloud_cli/command_runner/commands/categories.dart';
 import 'package:serverpod_cloud_cli/command_runner/helpers/command_options.dart';
 import 'package:serverpod_cloud_cli/commands/launch/launch.dart';
-import 'package:serverpod_cloud_cli/util/config/config.dart';
 
 enum LaunchOption<V> implements OptionDefinition<V> {
   projectId(ProjectIdOption.nonMandatory()),

serverpod_cloud_cli/lib/command_runner/commands/log_command.dart

@@ -1,10 +1,10 @@
+import 'package:cli_tools/config.dart';
 import 'package:serverpod_cloud_cli/command_runner/cloud_cli_command.dart';
 import 'package:serverpod_cloud_cli/command_runner/exit_exceptions.dart';
 import 'package:serverpod_cloud_cli/command_runner/helpers/command_options.dart';
 import 'package:serverpod_cloud_cli/shared/helpers/common_exceptions_handler.dart';
 import 'package:serverpod_cloud_cli/commands/logs/logs.dart';
 import 'package:serverpod_cloud_cli/shared/exceptions/cloud_cli_usage_exception.dart';
-import 'package:serverpod_cloud_cli/util/config/config.dart';
 
 import 'categories.dart';