Merge pull request #83 from netglade/update-analysis

Update analysis

.github/workflows/ci.yaml

@@ -21,5 +21,16 @@ jobs:
       - name: Analyze
         run: melos run lint:all
 
+      - name: Install DCM
+        run: |
+          sudo apt-get update
+          wget -qO- https://dcm.dev/pgp-key.public | sudo gpg --dearmor -o /usr/share/keyrings/dcm.gpg
+          echo 'deb [signed-by=/usr/share/keyrings/dcm.gpg arch=amd64] https://dcm.dev/debian stable main' | sudo tee /etc/apt/sources.list.d/dart_stable.list
+          sudo apt-get update
+          sudo apt-get install dcm
+
+      - name: DCM Analyze
+        run: dcm analyze --reporter=github --ci-key ${{ secrets.DCM_KEY }} --email ${{ secrets.DCM_EMAIL }} --fatal-style --fatal-performance --fatal-warnings .
+
       - name: Test
         run: melos run test

examples/drift/pubspec.yaml

@@ -15,5 +15,5 @@ dev_dependencies:
   auto_mappr: ^1.3.0
   build_runner: ^2.0.0
   drift_dev: ^2.7.0
-  netglade_analysis: ^1.2.3
+  netglade_analysis: ^2.0.0
   test: ^1.16.0

examples/example/pubspec.yaml

@@ -13,5 +13,5 @@ dependencies:
 dev_dependencies:
   auto_mappr: ^1.3.0
   build_runner: ^2.0.0
-  netglade_analysis: ^1.2.3
+  netglade_analysis: ^2.0.0
   test: ^1.16.0

examples/freezed/pubspec.yaml

@@ -15,5 +15,5 @@ dev_dependencies:
   auto_mappr: ^1.3.0
   build_runner: ^2.0.0
   freezed: ^2.3.2
-  netglade_analysis: ^1.2.3
+  netglade_analysis: ^2.0.0
   test: ^1.16.0

examples/injectable/pubspec.yaml

@@ -16,5 +16,5 @@ dev_dependencies:
   auto_mappr: ^1.3.0
   build_runner: ^2.0.0
   injectable_generator: ^2.1.5
-  netglade_analysis: 1.2.0
+  netglade_analysis: ^2.0.0
   test: ^1.16.0

examples/json_serializable/pubspec.yaml

@@ -14,5 +14,5 @@ dev_dependencies:
   auto_mappr: ^1.3.0
   build_runner: ^2.0.0
   json_serializable: ^6.6.1
-  netglade_analysis: ^1.2.3
+  netglade_analysis: ^2.0.0
   test: ^1.16.0

packages/auto_mappr/CHANGELOG.md

@@ -3,6 +3,7 @@
 ## Unreleased
 - Add support for library aliases, so mapping now supports types from different libraries with the same name.
 It also work in cases when library alias's exports. [#62](https://github.com/netglade/auto_mappr/pull/62)
+- Adhere to netglade_analysis 2.0.0.
 
 ## 1.4.0
 - Add modules. [#67](https://github.com/netglade/auto_mappr/pull/67)

packages/auto_mappr/README.md

@@ -515,6 +515,10 @@ Each AutoMappr class can include a list of modules
 that can be used to nest modules
 and use all of its underlying mappings.
 
+Note that modules work as disjunctive units
+and their mappings cannot be internally used by by mappr that imported it.
+They only work for grouping at the moment.
+
 Applications are often split into independent parts (we will call them **features**).
 Each feature should probably have its own independent mappr,
 that is used as a module.

packages/auto_mappr/analysis_options.yaml

@@ -2,16 +2,17 @@ include: package:netglade_analysis/lints.yaml
 # TODO include: package:netglade_analysis/lints_package.yaml
 
 analyzer:
-  plugins:
-    - dart_code_metrics
-
   exclude:
     - test/integration/error_fixture/**
 
 dart_code_metrics:
   extends:
     - package:netglade_analysis/dcm.yaml
+  pubspec-rules:
+    prefer-publish-to-none: false
   rules:
-    - format-comment: false
-    - avoid-non-null-assertion: false
-    - avoid-top-level-members-in-tests: false
+    avoid-non-null-assertion: false
+    avoid-top-level-members-in-tests:
+      exclude:
+        - test/integration/fixture/**
+    avoid-long-parameter-list: false

packages/auto_mappr/build.yaml

@@ -6,7 +6,7 @@ targets:
         generate_for:
           exclude:
             - test/integration/error_fixture/**
-            
+
 builders:
   auto_mappr:
     import: "package:auto_mappr/auto_mappr.dart"

packages/auto_mappr/example/pubspec.yaml

@@ -13,5 +13,5 @@ dependencies:
 dev_dependencies:
   auto_mappr: ^1.3.0
   build_runner: ^2.0.0
-  netglade_analysis: ^1.2.3
+  netglade_analysis: ^2.0.0
   test: ^1.16.0

packages/auto_mappr/lib/auto_mappr.dart

@@ -4,13 +4,13 @@ import 'package:auto_mappr/src/generator/auto_mappr_generator.dart';
 import 'package:build/build.dart';
 import 'package:source_gen/source_gen.dart';
 
-/// Main Builder for the `AutoMappr` Annotation
+/// Main Builder for the `AutoMappr` Annotation.
 Builder autoMapprBuilder(BuilderOptions _) => SharedPartBuilder(
-      [AutoMapprGenerator()],
+      [const AutoMapprGenerator()],
       'auto_mappr',
     );
 
 Builder autoMapprBuilderNotShared(BuilderOptions _) => PartBuilder(
-      [AutoMapprGenerator()],
+      [const AutoMapprGenerator()],
       '.auto_mappr.dart',
     );

packages/auto_mappr/lib/src/builder/auto_mappr_builder.dart

@@ -21,12 +21,12 @@ class AutoMapprBuilder {
     'unnecessary_raw_strings',
     'unnecessary_lambdas',
 
-    // Can we fix this somehow? (const defaults, const customs)
+    // Can we fix this somehow? (const defaults, const customs).
     'prefer_const_constructors',
     'prefer_const_literals_to_create_immutables'
   ];
 
-  AutoMapprBuilder({
+  const AutoMapprBuilder({
     required this.config,
     required this.mapperClassElement,
   });
@@ -54,9 +54,7 @@ class AutoMapprBuilder {
   List<Constructor> _buildConstructors() {
     return [
       // Constant constructor to allow usage of modules.
-      Constructor(
-        (builder) => builder..constant = true,
-      ),
+      Constructor((builder) => builder..constant = true),
     ];
   }
 
@@ -113,11 +111,11 @@ class AutoMapprBuilder {
         iterableTransformer: 'toSet',
       ).buildMethod(),
 
-      // Internal convert method
+      // Internal convert method.
       PrivateConvertMethodBuilder(config).buildMethod(),
 
       // Generate non-nullable mapping method.
-      // TODO(later): switch to MappingMethodBuilder
+      // TODO(later): switch to MappingMethodBuilder.
       for (final mapping in config.mappers)
         Method(
           (b) => b
@@ -140,7 +138,7 @@ class AutoMapprBuilder {
         ),
 
       // Generates nullable mapping method only when nullable method is used.
-      // TODO(later): switch to MappingMethodBuilder
+      // TODO(later): switch to MappingMethodBuilder.
       for (final mapping in config.mappers.where(nullableMappings.contains))
         Method(
           (b) => b

packages/auto_mappr/lib/src/builder/enum_assignment_builder.dart

@@ -8,7 +8,7 @@ class EnumAssignmentBuilder {
   final AutoMapprConfig mapperConfig;
   final TypeMapping mapping;
 
-  EnumAssignmentBuilder({
+  const EnumAssignmentBuilder({
     required this.mapperConfig,
     required this.mapping,
   });
@@ -30,14 +30,8 @@ class EnumAssignmentBuilder {
     final sourceEnum = mapping.source.element as EnumElement;
     final targetEnum = mapping.target.element as EnumElement;
 
-    final sourceValues = sourceEnum.fields
-        .where((e) => e.isEnumConstant && e.isPublic)
-        .map((e) => e.name)
-        .toSet();
-    final targetValues = targetEnum.fields
-        .where((e) => e.isEnumConstant && e.isPublic)
-        .map((e) => e.name)
-        .toSet();
+    final sourceValues = sourceEnum.fields.where((e) => e.isEnumConstant && e.isPublic).map((e) => e.name).toSet();
+    final targetValues = targetEnum.fields.where((e) => e.isEnumConstant && e.isPublic).map((e) => e.name).toSet();
 
     final sourceIsSubset = targetValues.containsAll(sourceValues);
 
@@ -51,7 +45,9 @@ class EnumAssignmentBuilder {
       );
     }
 
-    final targetReference = refer(mapping.target.getDisplayStringWithLibraryAlias(config: mapperConfig));
+    final targetReference = refer(
+      mapping.target.getDisplayStringWithLibraryAlias(config: mapperConfig),
+    );
 
     return targetReference
         .property('values')

packages/auto_mappr/lib/src/builder/map_model_body_method_builder.dart

@@ -18,7 +18,7 @@ class MapModelBodyMethodBuilder {
   final bool nullable;
   final void Function(TypeMapping? mapping)? usedNullableMethodCallback;
 
-  MapModelBodyMethodBuilder({
+  const MapModelBodyMethodBuilder({
     required this.mapperConfig,
     required this.mapping,
     this.usedNullableMethodCallback,
@@ -123,11 +123,20 @@ class MapModelBodyMethodBuilder {
 
     final targetConstructor = _findBestConstructor(mapping.target, forcedConstructor: mapping.constructor);
 
+    if (targetConstructor == null) {
+      throw InvalidGenerationSourceError(
+        'There is no target constructor in ${mapping.target}',
+      );
+    }
+
     final targetClassGetters = (mapping.target).getAllGetters();
 
     // Map constructor parameters
     for (var i = 0; i < targetConstructor.parameters.length; i++) {
-      final param = targetConstructor.parameters[i];
+      final param = targetConstructor.parameters.elementAtOrNull(i);
+
+      if (param == null) continue;
+
       final paramPosition = param.isPositional ? i : null;
       final constructorAssignment = ConstructorAssignment(param: param, position: paramPosition);
 
@@ -140,7 +149,9 @@ class MapModelBodyMethodBuilder {
       // Custom mapping has precedence.
       if (fieldMapping?.hasCustomMapping() ?? false) {
         final targetField =
-            targetClassGetters.firstWhere((targetField) => targetField.displayName == fieldMapping?.field);
+            targetClassGetters.firstWhereOrNull((targetField) => targetField.displayName == fieldMapping?.field);
+
+        if (targetField == null) continue;
 
         if (mapping.fieldShouldBeIgnored(targetField.displayName)) {
           _assertParamFieldCanBeIgnored(param, targetField);
@@ -164,9 +175,11 @@ class MapModelBodyMethodBuilder {
 
         final targetField = from != null
             // support custom field rename mapping
-            ? targetClassGetters.firstWhere((field) => field.displayName == fieldMapping?.field)
+            ? targetClassGetters.firstWhereOrNull((field) => field.displayName == fieldMapping?.field)
             // find target field based on matching source field
-            : targetClassGetters.firstWhere((field) => field.displayName == sourceField.displayName);
+            : targetClassGetters.firstWhereOrNull((field) => field.displayName == sourceField.displayName);
+
+        if (targetField == null) continue;
 
         if (mapping.fieldShouldBeIgnored(targetField.displayName)) {
           _assertParamFieldCanBeIgnored(param, sourceField);
@@ -289,7 +302,9 @@ class MapModelBodyMethodBuilder {
 
     var cascadedAssignments = constructorExpression;
     for (final sourceField in fields) {
-      final targetField = targetClassGetters.firstWhere((field) => field.displayName == sourceField.displayName);
+      final targetField = targetClassGetters.firstWhereOrNull((field) => field.displayName == sourceField.displayName);
+
+      if (targetField == null) continue;
 
       // Assign result.X = model.X
       cascadedAssignments = cascadedAssignments.cascade(sourceField.displayName).assign(
@@ -316,16 +331,14 @@ class MapModelBodyMethodBuilder {
   }) {
     final fieldsWithGetter = classType.getAllGetters();
 
-    return {
-      for (final field in fieldsWithGetter) field.name: field,
-    };
+    return {for (final field in fieldsWithGetter) field.name: field};
   }
 
   /// Tries to find best constructor for mapping.
   ///
   /// Returns a constructor with the most parameter count.
   /// Prefer non factory constructors over factory ones.
-  ConstructorElement _findBestConstructor(InterfaceType classType, {String? forcedConstructor}) {
+  ConstructorElement? _findBestConstructor(InterfaceType classType, {String? forcedConstructor}) {
     if (forcedConstructor != null) {
       final selectedConstructor = classType.constructors.firstWhereOrNull((c) => c.name == forcedConstructor);
       if (selectedConstructor != null) return selectedConstructor;
@@ -346,7 +359,7 @@ class MapModelBodyMethodBuilder {
         allConstructors.where((c) => c.isFactory && c.name != 'fromJson').sorted(sortConstructors);
 
     // Prefers non factory constructors over factory ones.
-    return [...nonFactoryConstructors, ...factoryConstructors].first;
+    return [...nonFactoryConstructors, ...factoryConstructors].firstOrNull;
   }
 
   Code _whenModelIsNullHandling() {

packages/auto_mappr/lib/src/builder/methods/callable_method.dart

@@ -2,7 +2,9 @@ import 'package:code_builder/code_builder.dart';
 
 // ignore: one_member_abstracts, it is implemented in builders
 abstract class CallableMethod {
-  Expression methodCall({
-    Map<String, Expression> namedArguments = const {},
-  });
+  const CallableMethod();
+
+  Expression methodCall({Map<String, Expression> namedArguments = const {}});
+
+
 }

packages/auto_mappr/lib/src/builder/methods/callable_property.dart

@@ -2,6 +2,8 @@ import 'package:code_builder/code_builder.dart';
 
 // ignore: one_member_abstracts, it is implemented in builders
 abstract class CallableProperty {
+  const CallableProperty();
+
   Expression propertyCall({
     required Reference on,
     Map<String, Expression> namedArguments = const {},

packages/auto_mappr/lib/src/builder/methods/can_convert_method_builder.dart

@@ -78,9 +78,7 @@ class CanConvertMethodBuilder extends MethodBuilderBase implements CallableMetho
   }
 
   @override
-  Expression methodCall({
-    Map<String, Expression> namedArguments = const {},
-  }) {
+  Expression methodCall({Map<String, Expression> namedArguments = const {}}) {
     return refer('canConvert').call(
       const [],
       namedArguments,

packages/auto_mappr/lib/src/builder/methods/try_convert_method_builder.dart

@@ -66,9 +66,7 @@ class TryConvertMethodBuilder extends MethodBuilderBase {
       ).code,
     );
 
-    block.addExpression(
-      literalNull.returned,
-    );
+    block.addExpression(literalNull.returned);
 
     return block.build();
   }