feat: modifiers in spec

examples/todo_list/lib/main.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:mix/mix.dart';
-import 'package:todo_list/pages/todo_list_page.dart';
 
+import 'pages/todo_list_page.dart';
 import 'style/design_tokens.dart';
 
 void main() {

examples/todo_list/lib/style/components/checkbox.dart

@@ -30,7 +30,15 @@ class TodoCheckbox extends StatelessWidget {
         $box.borderRadius(3),
         scaleEffect(),
         outlinePattern(),
+        $icon.size(16),
+        $icon.color.ref($token.color.surface),
+        $icon.wrap.opacity(0),
+        $icon.wrap.padding.top(5),
+        $icon.wrap.scale(0.5),
         _CheckboxVariant.checked(
+          $icon.wrap.padding.top(0),
+          $icon.wrap.scale(2),
+          $icon.wrap.opacity(1),
           $box.color.ref($token.color.primary),
           $box.border.color.ref($token.color.primary),
         ),
@@ -41,24 +49,8 @@ class TodoCheckbox extends StatelessWidget {
           .animate(
             duration: const Duration(milliseconds: 150),
           ),
-      child: StyledIcon(
+      child: const StyledIcon(
         Icons.check,
-        style: Style(
-          $icon.weight(16),
-          $icon.color.ref($token.color.surface),
-          $with.opacity(0),
-          $with.padding.top(5),
-          _CheckboxVariant.checked(
-            $with.padding.top(0),
-            $with.opacity(1),
-          ),
-        )
-            .applyVariant(
-              value ? _CheckboxVariant.checked : _CheckboxVariant.unchecked,
-            )
-            .animate(
-              duration: const Duration(milliseconds: 300),
-            ),
       ),
     );
   }

melos.yaml

@@ -43,6 +43,10 @@ scripts:
   custom_lint_analyze:
     run: dart pub global activate custom_lint && melos exec --depends-on="mix_lint" custom_lint
 
+  mix_exports:
+    run: melos exec --scope="packages/mix" dart run ./scripts/exports.dart
+    description: Generate exports for the mix package
+
   analyze:
     run: | 
       dcm analyze --fatal-warnings --fatal-style --fatal-performance .

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

@@ -24,6 +24,9 @@ export 'enum/enum_util.dart';
 export 'gap/gap_util.dart';
 export 'gap/spacing_side_dto.dart';
 export 'gradient/gradient_dto.dart';
+export 'modifiers/widget_modifiers_data.dart';
+export 'modifiers/widget_modifiers_data_dto.dart';
+export 'modifiers/widget_modifiers_util.dart';
 export 'nested_style/nested_style_attribute.dart';
 export 'nested_style/nested_style_util.dart';
 export 'scalars/scalar_util.dart';

packages/mix/lib/src/attributes/modifiers/widget_modifiers_data.dart

@@ -0,0 +1,7 @@
+import '../../core/modifier.dart';
+
+class WidgetModifiersData {
+  // ignore: avoid-dynamic
+  final List<WidgetModifierSpec<dynamic>> value;
+  const WidgetModifiersData(this.value);
+}

packages/mix/lib/src/attributes/modifiers/widget_modifiers_data_dto.dart

@@ -0,0 +1,29 @@
+import '../../core/core.dart';
+import 'widget_modifiers_data.dart';
+
+class WidgetModifiersDataDto extends Dto<WidgetModifiersData> {
+  final List<WidgetModifierAttribute> value;
+
+  const WidgetModifiersDataDto(this.value);
+
+  @override
+  WidgetModifiersDataDto merge(WidgetModifiersDataDto? other) {
+    if (other == null) return this;
+    final thisMap = AttributeMap(value);
+    final otherMap = AttributeMap(other.value);
+    final mergedMap = thisMap.merge(otherMap).values;
+
+    return WidgetModifiersDataDto(mergedMap);
+  }
+
+  @override
+  WidgetModifiersData resolve(MixData mix) {
+    return WidgetModifiersData(value.map((e) => e.resolve(mix)).toList());
+  }
+
+  @override
+  WidgetModifiersData get defaultValue => const WidgetModifiersData([]);
+
+  @override
+  List<Object?> get props => [value];
+}

packages/mix/lib/src/attributes/modifiers/widget_modifiers_util.dart

@@ -0,0 +1,13 @@
+import '../../core/core.dart';
+import '../../modifiers/modifiers.dart';
+import 'widget_modifiers_data_dto.dart';
+
+final class SpecModifierUtility<T extends Attribute>
+    extends ModifierUtility<T, WidgetModifiersDataDto> {
+  SpecModifierUtility(super.builder);
+
+  @override
+  T only(WidgetModifierAttribute attribute) {
+    return builder(WidgetModifiersDataDto([attribute]));
+  }
+}

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

@@ -53,7 +53,8 @@ class AttributeMap<T extends Attribute> {
 
   Attr? attributeOfType<Attr extends SpecAttribute>() => _map?[Attr] as Attr?;
 
-  Iterable<Attr> whereType<Attr extends T>() => _map?.values.whereType() ?? [];
+  Iterable<Attr> whereType<Attr extends T>() =>
+      _map?.values.whereType<Attr>() ?? [];
 
   AttributeMap<T> merge(AttributeMap<T>? other) {
     return other == null ? this : AttributeMap([...values, ...other.values]);

packages/mix/lib/src/core/factory/mix_data.dart

@@ -1,3 +1,4 @@
+// ignore_for_file: avoid-dynamic
 import 'package:flutter/widgets.dart';
 
 import '../../attributes/animated/animated_data.dart';
@@ -59,6 +60,13 @@ class MixData {
   @visibleForTesting
   AttributeMap get attributes => _attributes;
 
+  List<WidgetModifierSpec<dynamic>> get modifiers {
+    return _attributes
+        .whereType<WidgetModifierAttribute>()
+        .map((e) => e.resolve(this))
+        .toList();
+  }
+
   MixData toInheritable() {
     final inheritableAttributes = _attributes.values.where(
       (attr) => attr is! WidgetModifierAttribute,
@@ -75,6 +83,11 @@ class MixData {
     return _mergeAttributes(attributes) ?? attributes.last;
   }
 
+  List<WidgetModifierSpec<dynamic>>
+      modifiersOf<M extends WidgetModifierSpec<dynamic>>() {
+    return modifiers.whereType<M>().toList();
+  }
+
   Iterable<A> whereType<A extends StyledAttribute>() {
     return _attributes.whereType();
   }

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

@@ -7,7 +7,6 @@ import 'utility.dart';
 
 abstract base class WidgetModifierSpec<Self extends WidgetModifierSpec<Self>>
     extends Spec<Self> {
-  @override
   const WidgetModifierSpec({super.animated});
 
   static WidgetModifierSpec? lerpValue(

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

@@ -1,7 +1,10 @@
 import 'package:flutter/foundation.dart';
+import 'package:mix_annotations/mix_annotations.dart';
 
 import '../attributes/animated/animated_data.dart';
 import '../attributes/animated/animated_data_dto.dart';
+import '../attributes/modifiers/widget_modifiers_data.dart';
+import '../attributes/modifiers/widget_modifiers_data_dto.dart';
 import '../internal/compare_mixin.dart';
 import 'attribute.dart';
 import 'factory/mix_data.dart';
@@ -11,7 +14,10 @@ import 'utility.dart';
 abstract class Spec<T extends Spec<T>> with EqualityMixin {
   final AnimatedData? animated;
 
-  const Spec({this.animated});
+  @MixableProperty(utilities: [MixableUtility(alias: 'wrap')])
+  final WidgetModifiersData? modifiers;
+
+  const Spec({this.animated, this.modifiers});
 
   Type get type => T;
 
@@ -31,8 +37,9 @@ abstract class Spec<T extends Spec<T>> with EqualityMixin {
 /// The [Self] type represents the concrete implementation of the attribute, while the [Value] type represents the resolvable value.
 abstract base class SpecAttribute<Value> extends StyledAttribute {
   final AnimatedDataDto? animated;
+  final WidgetModifiersDataDto? modifiers;
 
-  const SpecAttribute({this.animated});
+  const SpecAttribute({this.animated, this.modifiers});
 
   Value resolve(MixData mix);
   @override

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

@@ -1,9 +1,7 @@
 import 'package:flutter/widgets.dart';
 
-import '../modifiers/render_widget_modifier.dart';
-import 'factory/mix_data.dart';
-import 'factory/mix_provider.dart';
-import 'factory/style_mix.dart';
+import '../modifiers/modifiers.dart';
+import 'core.dart';
 
 /// An abstract widget for applying custom styles.
 ///
@@ -60,16 +58,21 @@ abstract class StyledWidget extends StatelessWidget {
   }
 
   Widget applyModifiers(MixData mix, Widget child) {
+    final modifiers = mix
+        .whereType<WidgetModifierAttribute>()
+        .map((e) => e.resolve(mix))
+        .toList();
+
     return mix.isAnimated
         ? RenderAnimatedModifiers(
-            mix: mix,
-            orderOfModifiers: orderOfModifiers,
+            modifiers: modifiers,
             duration: mix.animation!.duration,
+            orderOfModifiers: orderOfModifiers,
             curve: mix.animation!.curve,
             child: child,
           )
         : RenderModifiers(
-            mix: mix,
+            modifiers: modifiers,
             orderOfModifiers: orderOfModifiers,
             child: child,
           );