Support latest pkg:analyzer, prepare v2.2.11 (#193)

Author: kevmoo

build_cli/CHANGELOG.md

@@ -1,6 +1,10 @@
-## 2.2.11-wip
+## 2.2.11
 
 - Validate that `allowedHelp` keys match `allowed` values.
+- Required `analyzer: ">=10.0.0 <13.0.0"`
+- Required `build: ^4.0.4`
+- Required `source_gen: ^4.1.2`
+- Required `source_helper: ^1.3.10`
 
 ## 2.2.10
 

build_cli/lib/src/enum_helpers.dart

@@ -29,7 +29,7 @@ Map<FieldElement, String>? _enumFieldsMap(DartType targetType) {
   if (targetType is InterfaceType && targetType.element is EnumElement) {
     return Map<FieldElement, String>.fromEntries(
       targetType.element.fields
-          .where((p) => !p.isSynthetic)
+          .where((p) => p.isOriginDeclaration)
           .map((p) => MapEntry(p, p.name!)),
     );
   }

build_cli/lib/src/to_share.dart

@@ -31,7 +31,10 @@ Never throwUnsupported(FieldElement element, String message, {String? todo}) =>
 Set<FieldElement> createSortedFieldSet(InstanceElement element) {
   // Get all of the fields that need to be assigned
   // TODO: support overriding the field set with an annotation option
-  final fieldsList = element.fields.where((e) => !e.isStatic).toList();
+  final fieldsList = element.fields
+      .where((e) => !e.isStatic)
+      .cast<FieldElement>()
+      .toList();
 
   final manager = InheritanceManager3();
 
@@ -41,8 +44,8 @@ Set<FieldElement> createSortedFieldSet(InstanceElement element) {
       continue;
     }
 
-    if (v is PropertyAccessorElement && v.baseElement is FieldElement) {
-      fieldsList.add(v.baseElement as FieldElement);
+    if (v case PropertyAccessorElement(:final FieldElement variable)) {
+      fieldsList.add(variable);
     }
   }
 
@@ -74,7 +77,7 @@ int _sortByLocation(FieldElement a, FieldElement b) {
   /// Returns the offset of given field/property in its source file – with a
   /// preference for the getter if it's defined.
   int offsetFor(FieldElement e) {
-    if (e.isSynthetic) {
+    if (!e.isOriginDeclaration) {
       return (e.getter ?? e.setter)!.firstFragment.nameOffset ?? 0;
     }
     return e.firstFragment.nameOffset ?? 0;

build_cli/pubspec.yaml

@@ -1,5 +1,5 @@
 name: build_cli
-version: 2.2.11-wip
+version: 2.2.11
 description: >-
   Parse command line arguments directly into an annotation class
   using the power of build_runner and source_gen.
@@ -11,25 +11,25 @@ environment:
 resolution: workspace
 
 dependencies:
-  analyzer: ">=9.0.0 <11.0.0"
-  build: ^4.0.3
+  analyzer: ">=10.0.0 <13.0.0"
+  build: ^4.0.4
   # Limit version range on build_cli_annotations
   # new features need to stay in sync
   build_cli_annotations: ">=2.1.1 <2.2.0"
   build_config: ^1.2.0
   pub_semver: ^2.1.4
-  source_gen: ^4.1.1
-  source_helper: ^1.3.9
+  source_gen: ^4.1.2
+  source_helper: ^1.3.10
   yaml: ^3.1.3
 
 dev_dependencies:
   # Args is exported and restricted by `build_cli_annotation`, but tests in this
   # package assume the output of features in ^2.0.0
   args: ^2.6.0
-  build_runner: ^2.10.4
+  build_runner: ^2.10.5
   build_verify: ^3.0.0
   dart_flutter_team_lints: ^3.2.0
   io: ^1.0.0
   path: ^1.9.0
-  source_gen_test: ^1.3.3
-  test: ^1.27.0
+  source_gen_test: ^1.3.4
+  test: ^1.29.0

build_cli/test/build_cli_test.dart

@@ -21,6 +21,8 @@ Future<void> main() async {
       libraryReader,
       generator,
       expectedAnnotatedTests: [
+        'AllowedHelpKeyNoAllowed',
+        'AllowedHelpKeyNotInAllowed',
         'AnnotatedCommandNoParser',
         'AnnotatedCommandWithParser',
         'annotatedMethod',
@@ -34,18 +36,18 @@ Future<void> main() async {
         'FlagWithAllowedHelp',
         'FlagWithStringDefault',
         'FlagWithValueHelp',
+        'GenericSubClass',
         'LonelyWasParsed',
         'NegatableMultiOption',
         'NegatableOption',
+        'NonNullableTypes',
         'PrivateCtor',
         'SpecialNotAnnotated',
+        'SubClass',
         'theAnswer',
         'TwoNonDefaultConstructors',
         'UnsupportedFieldType',
         'WithCommand',
-        'NonNullableTypes',
-        'AllowedHelpKeyNotInAllowed',
-        'AllowedHelpKeyNoAllowed',
       ],
     );
   });

build_cli/test/test_input/test_input.dart

@@ -463,3 +463,106 @@ class NonNullableTypes {
     required this.number,
   });
 }
+
+class SuperClass {
+  String? superField;
+}
+
+@ShouldGenerate(r'''
+SubClass _$parseSubClassResult(ArgResults result) => SubClass()
+  ..superField = result['super-field'] as String?
+  ..yLocal = result['y-local'] as String?
+  ..xLocal = result['x-local'] as String?
+  ..wExplicitSetter = result['w-explicit-setter'] as String?
+  ..subclassField = result['subclass-field'] as String?;
+
+ArgParser _$populateSubClassParser(ArgParser parser) => parser
+  ..addOption(
+    'super-field',
+  )
+  ..addOption(
+    'y-local',
+  )
+  ..addOption(
+    'x-local',
+  )
+  ..addOption(
+    'w-explicit-setter',
+  )
+  ..addOption(
+    'subclass-field',
+  );
+
+final _$parserForSubClass = _$populateSubClassParser(ArgParser());
+
+SubClass parseSubClass(List<String> args) {
+  final result = _$parserForSubClass.parse(args);
+  return _$parseSubClassResult(result);
+}
+''')
+@CliOptions()
+class SubClass extends SuperClass {
+  String? yLocal;
+  String? xLocal;
+  String? get wExplicitSetter => null;
+  set wExplicitSetter(String? value) {}
+  String? subclassField;
+}
+
+abstract class GenericSuperClass<T> {
+  T? bField;
+  T? aField;
+}
+
+@ShouldGenerate(r'''
+T _$badNumberFormat<T extends num>(
+  String source,
+  String type,
+  String argName,
+) =>
+    throw FormatException(
+      'Cannot parse "$source" into `$type` for option "$argName".',
+    );
+
+GenericSubClass _$parseGenericSubClassResult(ArgResults result) =>
+    GenericSubClass()
+      ..bField = result['b-field'] != null
+          ? int.tryParse(result['b-field'] as String) ??
+              _$badNumberFormat(
+                result['b-field'] as String,
+                'int',
+                'b-field',
+              )
+          : null
+      ..aField = result['a-field'] != null
+          ? int.tryParse(result['a-field'] as String) ??
+              _$badNumberFormat(
+                result['a-field'] as String,
+                'int',
+                'a-field',
+              )
+          : null
+      ..subclassField = result['subclass-field'] as String?;
+
+ArgParser _$populateGenericSubClassParser(ArgParser parser) => parser
+  ..addOption(
+    'b-field',
+  )
+  ..addOption(
+    'a-field',
+  )
+  ..addOption(
+    'subclass-field',
+  );
+
+final _$parserForGenericSubClass = _$populateGenericSubClassParser(ArgParser());
+
+GenericSubClass parseGenericSubClass(List<String> args) {
+  final result = _$parserForGenericSubClass.parse(args);
+  return _$parseGenericSubClassResult(result);
+}
+''')
+@CliOptions()
+class GenericSubClass extends GenericSuperClass<int> {
+  String? subclassField;
+}