ci: Fix lint (#451)

* Update action.yml

* fix lint

* dcm

* Update space_tokens.dart

* fix warnings

* fix generator

* Update helpers.dart

Author: tilucasoli

.github/actions/test/action.yml

@@ -62,16 +62,8 @@ runs:
         folders: packages/*/lib
 
     - name: Run DCM
-      if: ${{ inputs.run-dcm }}
-      uses: CQLabs/dcm-action@v1
-      with:
-        github_token: ${{ inputs.token }}
-        ci_key: oss
-        email: oss
-        folders: .
-        fatal_style: true
-        fatal_performance: true
-        fatal_warnings: true
+      run: dcm analyze .
+      shell: bash
 
     - name: Run melos fix
       run: melos run fix

lints.yaml

@@ -1,53 +1,9 @@
+include: package:flutter_lints/flutter.yaml
+
 analyzer:
   exclude: 
 linter:
   rules:
     # TODO: Turn this to true when all public apis are documented 
     public_member_api_docs: false
     prefer_relative_imports: true
-
-dart_code_metrics:
-  extends:
-    - package:dart_code_metrics_presets/recommended.yaml
-    - package:dart_code_metrics_presets/metrics_recommended.yaml
-  metrics-exclude:
-    - test/**
-  rules-exclude:
-    - test/**
-  rules:
-    # avoid-collection-mutating-methods: true
-    newline-before-return: true
-    avoid-importing-entrypoint-exports:
-        only-in-src: true
-    prefer-match-file-name: false
-    prefer-overriding-parent-equality: false
-    prefer-correct-callback-field-name: false
-    prefer-single-widget-per-file: false
-    match-getter-setter-field-names: false
-    prefer-dedicated-media-query-methods: false
-    avoid-shadowing: false
-    enum-constants-ordering: false
-    avoid-unsafe-collection-methods: false
-    prefer-prefixed-global-constants: false
-    avoid-returning-widgets: false
-    arguments-ordering:
-      child-last: true
-    avoid-nested-conditional-expressions:
-        acceptable-level: 3
-    member-ordering:
-        order:
-          - public-fields
-          - private-fields
-          - constructors
-          - static-methods
-          - private-methods
-          - private-getters
-          - private-setters
-          - public-getters
-          - public-setters
-          - public-methods
-          - overridden-public-methods
-          - overridden-public-getters
-          - build-method
-    prefer-named-boolean-parameters:
-      ignore-single: true

lints_with_dcm.yaml

@@ -0,0 +1,47 @@
+include: lints.yaml
+
+dart_code_metrics:
+  extends:
+    - package:dart_code_metrics_presets/recommended.yaml
+    - package:dart_code_metrics_presets/metrics_recommended.yaml
+  metrics-exclude:
+    - test/**
+  rules-exclude:
+    - test/**
+  rules:
+    # avoid-collection-mutating-methods: true
+    newline-before-return: true
+    avoid-importing-entrypoint-exports:
+        only-in-src: true
+    prefer-match-file-name: false
+    prefer-overriding-parent-equality: false
+    prefer-correct-callback-field-name: false
+    prefer-single-widget-per-file: false
+    match-getter-setter-field-names: false
+    prefer-dedicated-media-query-methods: false
+    avoid-shadowing: false
+    enum-constants-ordering: false
+    avoid-unsafe-collection-methods: false
+    prefer-prefixed-global-constants: false
+    avoid-returning-widgets: false
+    arguments-ordering:
+      child-last: true
+    avoid-nested-conditional-expressions:
+        acceptable-level: 3
+    member-ordering:
+        order:
+          - public-fields
+          - private-fields
+          - constructors
+          - static-methods
+          - private-methods
+          - private-getters
+          - private-setters
+          - public-getters
+          - public-setters
+          - public-methods
+          - overridden-public-methods
+          - overridden-public-getters
+          - build-method
+    prefer-named-boolean-parameters:
+      ignore-single: true

packages/mix/analysis_options.yaml

@@ -1,4 +1 @@
-
-includes:
-  - ../../lints.yaml
-  - package:flutter_lints/flutter.yaml
+include: ../../lints_with_dcm.yaml

packages/mix/lib/src/attributes/strut_style/strut_style_dto.dart

@@ -1,7 +1,7 @@
 // ignore_for_file: avoid-importing-entrypoint-exports, avoid-unused-ignores, prefer_relative_imports
 
 import 'package:flutter/material.dart';
-import 'package:mix/mix.dart';
+import '../../../mix.dart';
 import 'package:mix_annotations/mix_annotations.dart';
 
 part 'strut_style_dto.g.dart';

packages/mix/lib/src/core/helpers.dart

@@ -37,11 +37,10 @@ class MixHelpers {
 
   static const lerpShadowList = ui.Shadow.lerpList;
 
+  const MixHelpers._();
   static bool get isWeb => isWebOverride ?? kIsWeb;
   static TargetPlatform get targetPlatform =>
       targetPlatformOverride ?? defaultTargetPlatform;
-
-  const MixHelpers._();
 }
 
 P? _lerpSnap<P>(P? from, P? to, double t) {

packages/mix/lib/src/modifiers/transform_widget_modifier.dart

@@ -1,9 +1,10 @@
 // ignore_for_file: prefer-named-boolean-parameters
 
+import 'dart:math' as math;
+
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 import 'package:mix_annotations/mix_annotations.dart';
-import 'dart:math' as math;
 
 import '../core/attribute.dart';
 import '../core/factory/mix_data.dart';
@@ -40,6 +41,13 @@ final class TransformModifierSpec
 
 final class TransformModifierSpecUtility<T extends Attribute>
     extends MixUtility<T, TransformModifierSpecAttribute> {
+  late final rotate = TransformRotateModifierSpecUtility(
+    (value) => TransformModifierSpecAttribute(
+      transform: value,
+      alignment: Alignment.center,
+    ),
+  );
+
   TransformModifierSpecUtility(super.builder);
 
   T _flip(bool x, bool y) => builder(
@@ -65,13 +73,6 @@ final class TransformModifierSpecUtility<T extends Attribute>
           alignment: Alignment.center,
         ),
       );
-
-  late final rotate = TransformRotateModifierSpecUtility(
-    (value) => TransformModifierSpecAttribute(
-      transform: value,
-      alignment: Alignment.center,
-    ),
-  );
 }
 
 final class TransformRotateModifierSpecUtility<T extends Attribute>

packages/mix/lib/src/theme/material/material_theme.dart

@@ -18,14 +18,14 @@ final materialMixTheme = MixThemeData(
     _md.colorScheme.secondary: ColorResolver((c) => c.color.secondary),
     _md.colorScheme.tertiary: ColorResolver((c) => c.color.tertiary),
     _md.colorScheme.surface: ColorResolver((c) => c.color.surface),
-    _md.colorScheme.background: ColorResolver((c) => c.color.background),
+    _md.colorScheme.background: ColorResolver((c) => c.color.surface),
     _md.colorScheme.error: ColorResolver((c) => c.color.error),
     _md.colorScheme.onPrimary: ColorResolver((c) => c.color.onPrimary),
     _md.colorScheme.onSecondary: ColorResolver((c) => c.color.onSecondary),
     _md.colorScheme.onTertiary: ColorResolver((c) => c.color.onTertiary),
     _md.colorScheme.onSurface: ColorResolver((c) => c.color.onSurface),
     _md.colorScheme.onBackground:
-        ColorResolver((context) => context.color.onBackground),
+        ColorResolver((context) => context.color.onSurface),
     _md.colorScheme.onError: ColorResolver((context) => context.color.onError),
   },
   textStyles: {

packages/mix/lib/src/variants/context_variant_util/on_platform_util.dart

@@ -1,5 +1,7 @@
 import 'package:flutter/material.dart';
-import 'package:mix/mix.dart';
+
+import '../../core/helpers.dart';
+import '../context_variant.dart';
 
 class OnPlatformVariant extends ContextVariant {
   final TargetPlatform platform;
@@ -22,5 +24,5 @@ class OnWebVariant extends ContextVariant {
   const OnWebVariant();
 
   @override
-  bool when(_) => MixHelpers.isWeb;
+  bool when(BuildContext context) => MixHelpers.isWeb;
 }

packages/mix/lib/src/variants/context_variant_util/on_util.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
-import 'package:mix/src/variants/context_variant_util/on_platform_util.dart';
+import 'on_platform_util.dart';
 
 import '../../theme/tokens/breakpoints_token.dart';
 import '../widget_state_variant.dart';

packages/mix/pubspec.yaml

@@ -20,6 +20,3 @@ dev_dependencies:
     sdk: flutter
   mix_generator: ^0.2.2+1
 
-# flutter:
-  # assets:
-

packages/mix_annotations/analysis_options.yaml

@@ -1,3 +1 @@
-includes:
-  - ../../lints.yaml
-  - package:lints/recommended.yaml
+include: ../../lints_with_dcm.yaml

packages/mix_annotations/lib/src/annotations.dart

@@ -196,19 +196,14 @@ class MixableClassUtility {
   /// Map you should use to map the field utilities
   final Type? type;
   final bool generateCallMethod;
-  const MixableClassUtility({
-    this.type,
-    this.generateCallMethod = true,
-  });
+  const MixableClassUtility({this.type, this.generateCallMethod = true});
 }
 
 class MixableEnumUtility {
   /// Map you should use to map the field utilities
 
   final bool generateCallMethod;
-  const MixableEnumUtility({
-    this.generateCallMethod = true,
-  });
+  const MixableEnumUtility({this.generateCallMethod = true});
 }
 
 sealed class MixDeprecated {

packages/mix_annotations/pubspec.yaml

@@ -7,5 +7,6 @@ environment:
   sdk: ">=3.3.0 <4.0.0"
 
 dev_dependencies:
-  lints: ^3.0.0
   test: ^1.21.0
+  dart_code_metrics_presets: ^2.14.0
+  flutter_lints: ^4.0.0

packages/mix_generator/analysis_options.yaml

@@ -1,3 +1 @@
-includes:
-  - ../../lints.yaml
-  - package:lints/recommended.yaml
+include: ../../lints_with_dcm.yaml

packages/mix_generator/lib/mix_generator.dart

@@ -1,30 +1,32 @@
+// ignore_for_file: avoid-unused-parameters
+
 import 'package:build/build.dart';
-import 'package:mix_generator/src/mixable_class_utility_generator.dart';
-import 'package:mix_generator/src/mixable_dto_generator.dart';
-import 'package:mix_generator/src/mixable_enum_utility_generator.dart';
-import 'package:mix_generator/src/mixable_spec_generator.dart';
+import 'src/mixable_class_utility_generator.dart';
+import 'src/mixable_dto_generator.dart';
+import 'src/mixable_enum_utility_generator.dart';
+import 'src/mixable_spec_generator.dart';
 import 'package:source_gen/source_gen.dart';
 
 Builder specDefinition(BuilderOptions options) => SharedPartBuilder(
-      [MixableSpecGenerator()],
+      [const MixableSpecGenerator()],
       'spec',
       allowSyntaxErrors: true,
     );
 
 Builder dtoDefinition(BuilderOptions options) => SharedPartBuilder(
-      [MixableDtoGenerator()],
+      [const MixableDtoGenerator()],
       'dto',
       allowSyntaxErrors: true,
     );
 
 Builder classUtilityDefinition(BuilderOptions options) => SharedPartBuilder(
-      [MixableClassUtilityGenerator()],
+      [const MixableClassUtilityGenerator()],
       'class_utility',
       allowSyntaxErrors: true,
     );
 
 Builder enumUtilityDefinition(BuilderOptions options) => SharedPartBuilder(
-      [MixableEnumUtilityGenerator()],
+      [const MixableEnumUtilityGenerator()],
       'enum_utility',
       allowSyntaxErrors: true,
     );

packages/mix_generator/lib/src/builders/dto/class_utility_dto.dart

@@ -1,6 +1,6 @@
 import 'package:mix_annotations/mix_annotations.dart';
-import 'package:mix_generator/src/builders/utility_class_builder.dart';
-import 'package:mix_generator/src/helpers/field_info.dart';
+import '../utility_class_builder.dart';
+import '../../helpers/field_info.dart';
 
 String dtoUtilityClass(ClassBuilderContext<MixableDto> context) {
   final className = context.name;

packages/mix_generator/lib/src/builders/dto/extension_value.dart

@@ -1,5 +1,5 @@
 import 'package:mix_annotations/mix_annotations.dart';
-import 'package:mix_generator/src/helpers/field_info.dart';
+import '../../helpers/field_info.dart';
 
 String toDtoExtension(ClassBuilderContext<MixableDto> context) {
   final resolvedType = context.referenceClass;
@@ -14,20 +14,23 @@ String toDtoExtension(ClassBuilderContext<MixableDto> context) {
 
   final fieldStatements = context.fields.map((field) {
     final fieldName = field.name;
-    final paramIsNullable = params[fieldName]?.nullable ?? false;
-    final fieldNameRef = paramIsNullable ? '$fieldName?' : fieldName;
 
     if (field.hasDto) {
+      final paramIsNullable = params[fieldName]?.nullable ?? false;
+      final fieldNameRef = paramIsNullable ? '$fieldName?' : fieldName;
+
       if (field.isListType) {
         return '$fieldName: $fieldNameRef.map((e) => e.toDto()).toList(),';
       }
+
       return '$fieldName: $fieldNameRef.toDto(),';
     }
 
     return '$fieldName: $fieldName,';
   }).join('\n');
 
   final resolvedTypeName = resolvedType.name;
+
   return '''
 extension ${resolvedTypeName}MixExt on $resolvedTypeName {
   $className toDto() {

packages/mix_generator/lib/src/builders/dto/mixin_dto.dart

@@ -1,9 +1,9 @@
 import 'package:mix_annotations/mix_annotations.dart';
-import 'package:mix_generator/src/builders/getter_self_reference.dart';
-import 'package:mix_generator/src/builders/method_equality.dart';
-import 'package:mix_generator/src/builders/method_merge.dart';
-import 'package:mix_generator/src/builders/method_resolve.dart';
-import 'package:mix_generator/src/helpers/field_info.dart';
+import '../getter_self_reference.dart';
+import '../method_equality.dart';
+import '../method_merge.dart';
+import '../method_resolve.dart';
+import '../../helpers/field_info.dart';
 
 String dtoMixin(ClassBuilderContext<MixableDto> context) {
   final mixinName = context.generatedName;

packages/mix_generator/lib/src/builders/getter_self_reference.dart

@@ -1,6 +1,7 @@
-import 'package:mix_generator/src/helpers/field_info.dart';
+import '../helpers/field_info.dart';
 
 String getterSelfBuilder(ClassInfo instance) {
   final className = instance.name;
+
   return '$className get ${ParameterInfo.internalRefPrefix} => this as $className;';
 }