Merge branch 'main' into feat/bump-template-bundles

Author: marcossevilla

lib/src/commands/create/commands/app_ui_package.dart

@@ -9,7 +9,6 @@ class CreateAppUiPackage extends CreateSubCommand with Publishable {
   CreateAppUiPackage({
     required super.logger,
     required super.generatorFromBundle,
-    required super.generatorFromBrick,
   });
 
   @override

lib/src/commands/create/commands/create_subcommand.dart

@@ -12,18 +12,15 @@ import 'package:very_good_cli/src/commands/create/templates/templates.dart';
 // A valid Dart identifier that can be used for a package, i.e. no
 // capital letters.
 // https://dart.dev/guides/language/language-tour#important-concepts
-final RegExp _identifierRegExp = RegExp('[a-z_][a-z0-9_]*');
-final RegExp _orgNameRegExp = RegExp(r'^[a-zA-Z][\w-]*(\.[a-zA-Z][\w-]*)+$');
+final _identifierRegExp = RegExp('[a-z_][a-z0-9_]*');
+final _orgNameRegExp = RegExp(r'^[a-zA-Z][\w-]*(\.[a-zA-Z][\w-]*)+$');
 
 const _defaultOrgName = 'com.example.verygoodcore';
 const _defaultDescription = 'A Very Good Project created by Very Good CLI.';
 
 /// A method which returns a [Future<MasonGenerator>] given a [MasonBundle].
 typedef MasonGeneratorFromBundle = Future<MasonGenerator> Function(MasonBundle);
 
-/// A method which returns a [Future<MasonGenerator>] given a [Brick].
-typedef MasonGeneratorFromBrick = Future<MasonGenerator> Function(Brick);
-
 /// {@template create_subcommand}
 /// Generic class for sub commands of [CreateCommand].
 /// {@endtemplate}
@@ -50,9 +47,7 @@ abstract class CreateSubCommand extends Command<int> {
   CreateSubCommand({
     required this.logger,
     @visibleForTesting required MasonGeneratorFromBundle? generatorFromBundle,
-    @visibleForTesting required MasonGeneratorFromBrick? generatorFromBrick,
-  }) : _generatorFromBundle = generatorFromBundle ?? MasonGenerator.fromBundle,
-       _generatorFromBrick = generatorFromBrick ?? MasonGenerator.fromBrick {
+  }) : _generatorFromBundle = generatorFromBundle ?? MasonGenerator.fromBundle {
     argParser
       ..addOption(
         'output-directory',
@@ -69,20 +64,20 @@ abstract class CreateSubCommand extends Command<int> {
     // Add the templates arg if the command has multiple templates.
     if (this is MultiTemplates) {
       final multiTemplates = this as MultiTemplates;
-      final defaultTemplateName = multiTemplates.defaultTemplateName;
       final templates = multiTemplates.templates;
+      final defaultTemplateName = multiTemplates.defaultTemplateName;
 
       argParser.addOption(
         'template',
         abbr: 't',
         help: 'The template used to generate this new project.',
         defaultsTo: defaultTemplateName,
-        allowed: templates.map((element) => element.name).toList(),
+        allowed: templates.map((template) => template.name).toList(),
         allowedHelp: templates.fold<Map<String, String>>(
           {},
-          (previousValue, element) => {
-            ...previousValue,
-            element.name: element.help,
+          (previousTemplate, template) => {
+            ...previousTemplate,
+            template.name: template.help,
           },
         ),
       );
@@ -109,7 +104,6 @@ abstract class CreateSubCommand extends Command<int> {
   /// The logger user to notify the user of the command's progress.
   final Logger logger;
   final MasonGeneratorFromBundle _generatorFromBundle;
-  final MasonGeneratorFromBrick _generatorFromBrick;
 
   /// [ArgResults] which can be overridden for testing.
   @visibleForTesting
@@ -185,31 +179,17 @@ abstract class CreateSubCommand extends Command<int> {
     return match != null && match.end == name.length;
   }
 
-  Future<MasonGenerator> _getGeneratorForTemplate() async {
-    try {
-      final brick = Brick.version(
-        name: template.bundle.name,
-        version: '^${template.bundle.version}',
-      );
-      logger.detail(
-        '''Building generator from brick: ${brick.name} ${brick.location.version}''',
-      );
-      return await _generatorFromBrick(brick);
-    } on Exception catch (error) {
-      logger.detail('Building generator from brick failed: $error');
-    }
-    logger.detail(
-      '''Building generator from bundle ${template.bundle.name} ${template.bundle.version}''',
-    );
-    return _generatorFromBundle(template.bundle);
-  }
-
   @override
   Future<int> run() async {
     final template = this.template;
-    final generator = await _getGeneratorForTemplate();
-    final result = await runCreate(generator, template);
+    final bundle = template.bundle;
 
+    logger.detail(
+      'Building generator from bundle ${bundle.name} ${bundle.version}',
+    );
+
+    final generator = await _generatorFromBundle(bundle);
+    final result = await runCreate(generator, template);
     return result;
   }
 
@@ -325,7 +305,7 @@ mixin MultiTemplates on CreateSubCommand {
     final templateName =
         argResults['template'] as String? ?? defaultTemplateName;
 
-    return templates.firstWhere((element) => element.name == templateName);
+    return templates.firstWhere((template) => template.name == templateName);
   }
 }
 

lib/src/commands/create/commands/dart_cli.dart

@@ -9,7 +9,6 @@ class CreateDartCLI extends CreateSubCommand with Publishable {
   CreateDartCLI({
     required super.logger,
     required super.generatorFromBundle,
-    required super.generatorFromBrick,
   }) {
     argParser.addOption(
       'executable-name',

lib/src/commands/create/commands/dart_package.dart

@@ -9,7 +9,6 @@ class CreateDartPackage extends CreateSubCommand with Publishable {
   CreateDartPackage({
     required super.logger,
     required super.generatorFromBundle,
-    required super.generatorFromBrick,
   });
 
   @override

lib/src/commands/create/commands/docs_site.dart

@@ -9,7 +9,6 @@ class CreateDocsSite extends CreateSubCommand {
   CreateDocsSite({
     required super.logger,
     required super.generatorFromBundle,
-    required super.generatorFromBrick,
   }) {
     argParser.addOption(
       'org-name',

lib/src/commands/create/commands/flame_game.dart

@@ -9,7 +9,6 @@ class CreateFlameGame extends CreateSubCommand with OrgName {
   CreateFlameGame({
     required super.logger,
     required super.generatorFromBundle,
-    required super.generatorFromBrick,
   }) {
     argParser.addMultiOption(
       'platforms',

lib/src/commands/create/commands/flutter_app.dart

@@ -10,7 +10,6 @@ class CreateFlutterApp extends CreateSubCommand
   CreateFlutterApp({
     required super.logger,
     required super.generatorFromBundle,
-    required super.generatorFromBrick,
   }) {
     argParser
       ..addOption(

lib/src/commands/create/commands/flutter_package.dart

@@ -9,7 +9,6 @@ class CreateFlutterPackage extends CreateSubCommand with Publishable {
   CreateFlutterPackage({
     required super.logger,
     required super.generatorFromBundle,
-    required super.generatorFromBrick,
   });
 
   @override

lib/src/commands/create/commands/flutter_plugin.dart

@@ -9,7 +9,6 @@ class CreateFlutterPlugin extends CreateSubCommand with Publishable, OrgName {
   CreateFlutterPlugin({
     required super.logger,
     required super.generatorFromBundle,
-    required super.generatorFromBrick,
   }) {
     argParser.addMultiOption(
       'platforms',

lib/src/commands/create/create.dart

@@ -14,14 +14,12 @@ class CreateCommand extends Command<int> {
   CreateCommand({
     required Logger logger,
     @visibleForTesting MasonGeneratorFromBundle? generatorFromBundle,
-    @visibleForTesting MasonGeneratorFromBrick? generatorFromBrick,
   }) {
     // very_good create app_ui_package <args>
     addSubcommand(
       CreateAppUiPackage(
         logger: logger,
         generatorFromBundle: generatorFromBundle,
-        generatorFromBrick: generatorFromBrick,
       ),
     );
 
@@ -30,7 +28,6 @@ class CreateCommand extends Command<int> {
       CreateFlutterApp(
         logger: logger,
         generatorFromBundle: generatorFromBundle,
-        generatorFromBrick: generatorFromBrick,
       ),
     );
 
@@ -39,7 +36,6 @@ class CreateCommand extends Command<int> {
       CreateDartPackage(
         logger: logger,
         generatorFromBundle: generatorFromBundle,
-        generatorFromBrick: generatorFromBrick,
       ),
     );
 
@@ -48,7 +44,6 @@ class CreateCommand extends Command<int> {
       CreateDartCLI(
         logger: logger,
         generatorFromBundle: generatorFromBundle,
-        generatorFromBrick: generatorFromBrick,
       ),
     );
 
@@ -57,7 +52,6 @@ class CreateCommand extends Command<int> {
       CreateDocsSite(
         logger: logger,
         generatorFromBundle: generatorFromBundle,
-        generatorFromBrick: generatorFromBrick,
       ),
     );
 
@@ -66,7 +60,6 @@ class CreateCommand extends Command<int> {
       CreateFlutterPackage(
         logger: logger,
         generatorFromBundle: generatorFromBundle,
-        generatorFromBrick: generatorFromBrick,
       ),
     );
 
@@ -75,7 +68,6 @@ class CreateCommand extends Command<int> {
       CreateFlutterPlugin(
         logger: logger,
         generatorFromBundle: generatorFromBundle,
-        generatorFromBrick: generatorFromBrick,
       ),
     );
 
@@ -84,7 +76,6 @@ class CreateCommand extends Command<int> {
       CreateFlameGame(
         logger: logger,
         generatorFromBundle: generatorFromBundle,
-        generatorFromBrick: generatorFromBrick,
       ),
     );
   }