From fb12a4989e5f1b6d7c44e28a6dce25fb41103040 Mon Sep 17 00:00:00 2001 From: Greg Littlefield Date: Tue, 2 Dec 2025 17:33:39 -0700 Subject: [PATCH 01/11] Fix typo in condition resulting in check always getting skipped --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 404a3f496..88d9409c8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -81,7 +81,7 @@ jobs: # due to different resolved dependencies. git diff --exit-code -- ":(exclude)test/over_react/component_declaration/redux_component_test/test_reducer.g.dart" fi - if: always() && steps.install.outcome == 'success' && steps.install.build == 'success' + if: always() && steps.install.outcome == 'success' && steps.build.outcome == 'success' # Analyze again after generated files are created to verify that those generated classes don't cause analysis errors - name: Analyze project source (post-build) From 26e6c637fe172ae648adb0e5118bb9abc8cf72a9 Mon Sep 17 00:00:00 2001 From: Greg Littlefield Date: Tue, 2 Dec 2025 19:55:30 -0700 Subject: [PATCH 02/11] Fix legacy boilerplate generated mixin errors on language versions >=3.0 Example of error: example/boilerplate_versions/dart2_only/basic_component2.over_react.g.dart:120:44: Error: The class '_$BasicPropsAccessorsMixin' can't be used as a mixin because it isn't a mixin class nor a mixin. class BasicProps extends _$BasicProps with _$BasicPropsAccessorsMixin { ^ For some reason, this is coming up in master CI in Dart 3, even though we have a pubspec.yaml language version of 2.19. This Seems like a build package bug, which I plan on reporting. Since we'll need to fix this issue anyway, fix it now as a workaround. --- lib/src/builder/codegen/accessors_generator.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/src/builder/codegen/accessors_generator.dart b/lib/src/builder/codegen/accessors_generator.dart index 4d0dd3a68..2951cc3f7 100644 --- a/lib/src/builder/codegen/accessors_generator.dart +++ b/lib/src/builder/codegen/accessors_generator.dart @@ -82,7 +82,7 @@ abstract class TypedMapAccessorsGenerator extends BoilerplateDeclarationGenerato final implementsClause = 'implements ${names.consumerName}$typeParamsOnSuper'; generatedClass ..write(generatedCodeUseOnlyDeprecation) - ..writeln('abstract class $accessorsMixinName$typeParamsOnClass $implementsClause {\n' + ..writeln('mixin $accessorsMixinName$typeParamsOnClass $implementsClause {\n' ' @override' ' Map get ${type.isProps ? 'props' : 'state'};\n'); if (type.isMixin) { From 8eb3ad934ca8358371a5ec4b8915648fdca60745 Mon Sep 17 00:00:00 2001 From: Greg Littlefield Date: Tue, 2 Dec 2025 20:01:14 -0700 Subject: [PATCH 03/11] Update generated code --- .../basic_component1.over_react.g.dart | 2 +- .../basic_component2.over_react.g.dart | 2 +- .../abstract_transition.over_react.g.dart | 4 +- ...bstract_transition_props.over_react.g.dart | 2 +- .../error_boundary.over_react.g.dart | 6 +-- .../error_boundary_mixins.over_react.g.dart | 4 +- ...ror_boundary_recoverable.over_react.g.dart | 4 +- .../resize_sensor.over_react.g.dart | 5 +-- .../component/aria_mixin.over_react.g.dart | 2 +- .../dummy_component2.over_react.g.dart | 2 +- .../component/prop_mixins.over_react.g.dart | 8 ++-- .../over_react_flux.over_react.g.dart | 2 +- .../over_react_redux.over_react.g.dart | 2 +- .../redux_multi_provider.over_react.g.dart | 2 +- lib/src/util/class_names.over_react.g.dart | 2 +- ...abstract_transition_test.over_react.g.dart | 7 +-- ...error_boundary_component.over_react.g.dart | 4 +- .../shared_stack_tests.over_react.g.dart | 2 +- .../basic_child_component.over_react.g.dart | 2 +- .../basic_ui_component.over_react.g.dart | 3 +- ...ntext_provider_component.over_react.g.dart | 4 +- .../dummy_component.over_react.g.dart | 2 +- .../flawed_component.over_react.g.dart | 4 +- ...lawed_component_on_mount.over_react.g.dart | 3 +- ...nt_that_renders_a_string.over_react.g.dart | 2 +- ...ent_that_renders_nothing.over_react.g.dart | 2 +- .../prop_typedef_fixtures.over_react.g.dart | 16 +++---- .../component/memo_test.over_react.g.dart | 2 +- .../typed_factory_test.over_react.g.dart | 4 +- ...ccessor_integration_test.over_react.g.dart | 10 ++--- ...r_mixin_integration_test.over_react.g.dart | 10 ++--- ...ccessor_integration_test.over_react.g.dart | 10 ++--- ...r_mixin_integration_test.over_react.g.dart | 10 ++--- ...n_error_integration_test.over_react.g.dart | 15 +++---- ...mponent_integration_test.over_react.g.dart | 8 ++-- ...ccessor_integration_test.over_react.g.dart | 3 +- ...ccessor_integration_test.over_react.g.dart | 4 +- ...ccessor_integration_test.over_react.g.dart | 4 +- ...ccessor_integration_test.over_react.g.dart | 6 +-- .../private_props_ddc_bug.over_react.g.dart | 2 +- ...ccessor_integration_test.over_react.g.dart | 3 +- ...mponent_integration_test.over_react.g.dart | 4 +- ...ed_prop_integration_test.over_react.g.dart | 2 +- ...mponent_integration_test.over_react.g.dart | 3 +- ...ccessor_integration_test.over_react.g.dart | 3 +- ...ccessor_integration_test.over_react.g.dart | 5 +-- ...ccessor_integration_test.over_react.g.dart | 5 +-- ...ccessor_integration_test.over_react.g.dart | 7 +-- .../private_props_ddc_bug.over_react.g.dart | 2 +- ...ccessor_integration_test.over_react.g.dart | 3 +- ...mponent_integration_test.over_react.g.dart | 5 +-- ...ed_prop_integration_test.over_react.g.dart | 2 +- .../test_a2.over_react.g.dart | 2 +- .../test_b2.over_react.g.dart | 2 +- .../abstract2.over_react.g.dart | 3 +- .../extendedtype2.over_react.g.dart | 3 +- .../parent2.over_react.g.dart | 2 +- .../subsubtype2.over_react.g.dart | 3 +- ...subsubtype_of_component1.over_react.g.dart | 2 +- .../subtype2.over_react.g.dart | 3 +- .../subtype_of_component1.over_react.g.dart | 2 +- .../test_a.over_react.g.dart | 2 +- .../test_b.over_react.g.dart | 2 +- .../abstract.over_react.g.dart | 3 +- .../extendedtype.over_react.g.dart | 3 +- .../type_inheritance/parent.over_react.g.dart | 2 +- .../subsubtype.over_react.g.dart | 3 +- .../subtype.over_react.g.dart | 2 +- .../flux_component_test.over_react.g.dart | 37 ++++++++-------- .../flux_component_test.over_react.g.dart | 43 ++++++++----------- ...ccessor_integration_test.over_react.g.dart | 10 ++--- ...r_mixin_integration_test.over_react.g.dart | 10 ++--- ...ccessor_integration_test.over_react.g.dart | 10 ++--- ...r_mixin_integration_test.over_react.g.dart | 10 ++--- ...n_error_integration_test.over_react.g.dart | 15 +++---- ...mponent_integration_test.over_react.g.dart | 8 ++-- ...ccessor_integration_test.over_react.g.dart | 3 +- ...ccessor_integration_test.over_react.g.dart | 4 +- ...ccessor_integration_test.over_react.g.dart | 4 +- .../private_props_ddc_bug.over_react.g.dart | 2 +- ...ccessor_integration_test.over_react.g.dart | 3 +- ...mponent_integration_test.over_react.g.dart | 4 +- ...ed_prop_integration_test.over_react.g.dart | 2 +- ...mponent_integration_test.over_react.g.dart | 3 +- ...ccessor_integration_test.over_react.g.dart | 3 +- ...ccessor_integration_test.over_react.g.dart | 5 +-- ...ccessor_integration_test.over_react.g.dart | 5 +-- .../private_props_ddc_bug.over_react.g.dart | 2 +- ...ccessor_integration_test.over_react.g.dart | 3 +- ...mponent_integration_test.over_react.g.dart | 5 +-- ...ed_prop_integration_test.over_react.g.dart | 2 +- ...ummy_composite_component.over_react.g.dart | 2 +- ...omponent_debug_name_test.over_react.g.dart | 3 +- .../util/dom_util_test.over_react.g.dart | 2 +- ...prop_key_util_test_dart2.over_react.g.dart | 2 +- .../test_component.over_react.g.dart | 2 +- .../connect_flux_counter.over_react.g.dart | 2 +- .../fixtures/counter.over_react.g.dart | 2 +- .../fixtures/flux_counter.over_react.g.dart | 2 +- ...on_component_two_counter.over_react.g.dart | 2 +- .../one_level_wrapper2.over_react.g.dart | 3 +- .../two_level_wrapper2.over_react.g.dart | 3 +- .../one_level_wrapper.over_react.g.dart | 3 +- .../two_level_wrapper.over_react.g.dart | 3 +- .../demo_components/button.over_react.g.dart | 5 +-- .../button_group.over_react.g.dart | 5 +-- .../list_group.over_react.g.dart | 2 +- .../list_group_item.over_react.g.dart | 3 +- .../progress.over_react.g.dart | 5 +-- .../src/demo_components/tag.over_react.g.dart | 2 +- .../toggle_button.over_react.g.dart | 7 +-- .../toggle_button_group.over_react.g.dart | 5 +-- .../src/shared/constants.over_react.g.dart | 4 +- 113 files changed, 225 insertions(+), 308 deletions(-) diff --git a/example/boilerplate_versions/dart2_only/basic_component1.over_react.g.dart b/example/boilerplate_versions/dart2_only/basic_component1.over_react.g.dart index 5ead27501..8603ac7e2 100644 --- a/example/boilerplate_versions/dart2_only/basic_component1.over_react.g.dart +++ b/example/boilerplate_versions/dart2_only/basic_component1.over_react.g.dart @@ -19,7 +19,7 @@ final $BasicComponentFactory = registerComponent( ); @Deprecated('This is deprecated') -abstract class _$BasicPropsAccessorsMixin implements _$BasicProps { +mixin _$BasicPropsAccessorsMixin implements _$BasicProps { @override Map get props; diff --git a/example/boilerplate_versions/dart2_only/basic_component2.over_react.g.dart b/example/boilerplate_versions/dart2_only/basic_component2.over_react.g.dart index 84e890630..669393f1f 100644 --- a/example/boilerplate_versions/dart2_only/basic_component2.over_react.g.dart +++ b/example/boilerplate_versions/dart2_only/basic_component2.over_react.g.dart @@ -18,7 +18,7 @@ final $Basic2ComponentFactory = registerComponent2( parentType: null, ); -abstract class _$BasicPropsAccessorsMixin implements _$BasicProps { +mixin _$BasicPropsAccessorsMixin implements _$BasicProps { @override Map get props; diff --git a/lib/src/component/_deprecated/abstract_transition.over_react.g.dart b/lib/src/component/_deprecated/abstract_transition.over_react.g.dart index 4ee3431f9..550dc4e6d 100644 --- a/lib/src/component/_deprecated/abstract_transition.over_react.g.dart +++ b/lib/src/component/_deprecated/abstract_transition.over_react.g.dart @@ -9,7 +9,7 @@ part of 'abstract_transition.dart'; @Deprecated( 'Use the `AbstractTransitionProps` mixin exported from `package:over_react/components.dart` instead. Will be removed in the 4.0.0 release.') -abstract class _$AbstractTransitionPropsAccessorsMixin +mixin _$AbstractTransitionPropsAccessorsMixin implements _$AbstractTransitionProps { @override Map get props; @@ -34,7 +34,7 @@ abstract class AbstractTransitionProps extends _$AbstractTransitionProps @Deprecated( 'Use the `AbstractTransitionState` mixin exported from `package:over_react/components.dart` instead. Will be removed in the 4.0.0 release.') -abstract class _$AbstractTransitionStateAccessorsMixin +mixin _$AbstractTransitionStateAccessorsMixin implements _$AbstractTransitionState { @override Map get state; diff --git a/lib/src/component/_deprecated/abstract_transition_props.over_react.g.dart b/lib/src/component/_deprecated/abstract_transition_props.over_react.g.dart index 72c4c8e0c..06033d1ae 100644 --- a/lib/src/component/_deprecated/abstract_transition_props.over_react.g.dart +++ b/lib/src/component/_deprecated/abstract_transition_props.over_react.g.dart @@ -9,7 +9,7 @@ part of 'abstract_transition_props.dart'; @Deprecated( 'Use the `TransitionPropsMixin` mixin exported from `package:over_react/components.dart` instead. Will be removed in the 4.0.0 release.') -abstract class TransitionPropsMixin implements _$TransitionPropsMixin { +mixin TransitionPropsMixin implements _$TransitionPropsMixin { @override Map get props; diff --git a/lib/src/component/_deprecated/error_boundary.over_react.g.dart b/lib/src/component/_deprecated/error_boundary.over_react.g.dart index 19dc9ebdc..3150fb95e 100644 --- a/lib/src/component/_deprecated/error_boundary.over_react.g.dart +++ b/lib/src/component/_deprecated/error_boundary.over_react.g.dart @@ -21,8 +21,7 @@ final $ErrorBoundaryComponentFactory = registerComponent2( @Deprecated( 'Use the `ErrorBoundaryProps` mixin exported from `package:over_react/components.dart` instead. Will be removed in the 4.0.0 release of over_react.') -abstract class _$ErrorBoundaryPropsAccessorsMixin - implements _$ErrorBoundaryProps { +mixin _$ErrorBoundaryPropsAccessorsMixin implements _$ErrorBoundaryProps { @override Map get props; @@ -130,8 +129,7 @@ class _$$ErrorBoundaryProps$JsMap extends _$$ErrorBoundaryProps { @Deprecated( 'Use the `ErrorBoundaryState` mixin exported from `package:over_react/components.dart` instead. Will be removed in the 4.0.0 release of over_react.') -abstract class _$ErrorBoundaryStateAccessorsMixin - implements _$ErrorBoundaryState { +mixin _$ErrorBoundaryStateAccessorsMixin implements _$ErrorBoundaryState { @override Map get state; diff --git a/lib/src/component/_deprecated/error_boundary_mixins.over_react.g.dart b/lib/src/component/_deprecated/error_boundary_mixins.over_react.g.dart index 805304dfd..4917394b7 100644 --- a/lib/src/component/_deprecated/error_boundary_mixins.over_react.g.dart +++ b/lib/src/component/_deprecated/error_boundary_mixins.over_react.g.dart @@ -10,7 +10,7 @@ part of 'error_boundary_mixins.dart'; @Deprecated( 'Building custom error boundaries with this mixin will no longer be supported in version 4.0.0.' 'Use ErrorBoundary and its prop API to customize error handling instead.') -abstract class ErrorBoundaryPropsMixin implements _$ErrorBoundaryPropsMixin { +mixin ErrorBoundaryPropsMixin implements _$ErrorBoundaryPropsMixin { @override Map get props; @@ -322,7 +322,7 @@ const PropsMeta _$metaForErrorBoundaryPropsMixin = PropsMeta( @Deprecated( 'Building custom error boundaries with this mixin will no longer be supported in version 4.0.0.' 'Use ErrorBoundary and its prop API to customize error handling instead.') -abstract class ErrorBoundaryStateMixin implements _$ErrorBoundaryStateMixin { +mixin ErrorBoundaryStateMixin implements _$ErrorBoundaryStateMixin { @override Map get state; diff --git a/lib/src/component/_deprecated/error_boundary_recoverable.over_react.g.dart b/lib/src/component/_deprecated/error_boundary_recoverable.over_react.g.dart index f1e234990..2e46527c9 100644 --- a/lib/src/component/_deprecated/error_boundary_recoverable.over_react.g.dart +++ b/lib/src/component/_deprecated/error_boundary_recoverable.over_react.g.dart @@ -21,7 +21,7 @@ final $RecoverableErrorBoundaryComponentFactory = registerComponent2( @Deprecated( 'For internal use with deprecated ErrorBoundary components only. Remove in the 4.0.0 release.') -abstract class _$RecoverableErrorBoundaryPropsAccessorsMixin +mixin _$RecoverableErrorBoundaryPropsAccessorsMixin implements _$RecoverableErrorBoundaryProps { @override Map get props; @@ -127,7 +127,7 @@ class _$$RecoverableErrorBoundaryProps$JsMap @Deprecated( 'For internal use with deprecated ErrorBoundary components only. Remove in the 4.0.0 release.') -abstract class _$RecoverableErrorBoundaryStateAccessorsMixin +mixin _$RecoverableErrorBoundaryStateAccessorsMixin implements _$RecoverableErrorBoundaryState { @override Map get state; diff --git a/lib/src/component/_deprecated/resize_sensor.over_react.g.dart b/lib/src/component/_deprecated/resize_sensor.over_react.g.dart index f3e6328e9..14781c3fe 100644 --- a/lib/src/component/_deprecated/resize_sensor.over_react.g.dart +++ b/lib/src/component/_deprecated/resize_sensor.over_react.g.dart @@ -20,8 +20,7 @@ final $ResizeSensorComponentFactory = registerComponent2( @Deprecated( 'Use the `ResizeSensorProps` mixin exported from `package:over_react/components.dart` instead. Will be removed in the 4.0.0 release of over_react.') -abstract class _$ResizeSensorPropsAccessorsMixin - implements _$ResizeSensorProps { +mixin _$ResizeSensorPropsAccessorsMixin implements _$ResizeSensorProps { @override Map get props; @@ -168,7 +167,7 @@ class _$ResizeSensorComponent extends ResizeSensorComponent { @Deprecated( 'Use the `ResizeSensorProps` mixin exported from `package:over_react/components.dart` instead. Will be removed in the 4.0.0 release of over_react.') -abstract class ResizeSensorPropsMixin implements _$ResizeSensorPropsMixin { +mixin ResizeSensorPropsMixin implements _$ResizeSensorPropsMixin { @override Map get props; diff --git a/lib/src/component/aria_mixin.over_react.g.dart b/lib/src/component/aria_mixin.over_react.g.dart index 59b798f69..59d3442d0 100644 --- a/lib/src/component/aria_mixin.over_react.g.dart +++ b/lib/src/component/aria_mixin.over_react.g.dart @@ -7,7 +7,7 @@ part of 'aria_mixin.dart'; // OverReactBuilder (package:over_react/src/builder.dart) // ************************************************************************** -abstract class AriaPropsMixin implements _$AriaPropsMixin { +mixin AriaPropsMixin implements _$AriaPropsMixin { @override Map get props; diff --git a/lib/src/component/dummy_component2.over_react.g.dart b/lib/src/component/dummy_component2.over_react.g.dart index d340fabbd..5cbc2ae6f 100644 --- a/lib/src/component/dummy_component2.over_react.g.dart +++ b/lib/src/component/dummy_component2.over_react.g.dart @@ -18,7 +18,7 @@ final $_Dummy2ComponentFactory = registerComponent2( parentType: null, ); -abstract class _$_Dummy2PropsAccessorsMixin implements _$_Dummy2Props { +mixin _$_Dummy2PropsAccessorsMixin implements _$_Dummy2Props { @override Map get props; diff --git a/lib/src/component/prop_mixins.over_react.g.dart b/lib/src/component/prop_mixins.over_react.g.dart index 11b10b033..9f549fecc 100644 --- a/lib/src/component/prop_mixins.over_react.g.dart +++ b/lib/src/component/prop_mixins.over_react.g.dart @@ -7,7 +7,7 @@ part of 'prop_mixins.dart'; // OverReactBuilder (package:over_react/src/builder.dart) // ************************************************************************** -abstract class ReactPropsMixin implements _$ReactPropsMixin { +mixin ReactPropsMixin implements _$ReactPropsMixin { @override Map get props; @@ -85,7 +85,7 @@ const PropsMeta _$metaForReactPropsMixin = PropsMeta( keys: ReactPropsMixin.$propKeys, ); -abstract class DomPropsMixin implements _$DomPropsMixin { +mixin DomPropsMixin implements _$DomPropsMixin { @override Map get props; @@ -3273,7 +3273,7 @@ const PropsMeta _$metaForDomPropsMixin = PropsMeta( keys: DomPropsMixin.$propKeys, ); -abstract class SvgPropsMixin implements _$SvgPropsMixin { +mixin SvgPropsMixin implements _$SvgPropsMixin { @override Map get props; @@ -6786,7 +6786,7 @@ const PropsMeta _$metaForSvgPropsMixin = PropsMeta( keys: SvgPropsMixin.$propKeys, ); -abstract class UbiquitousDomPropsMixin implements _$UbiquitousDomPropsMixin { +mixin UbiquitousDomPropsMixin implements _$UbiquitousDomPropsMixin { @override Map get props; diff --git a/lib/src/over_react_redux/over_react_flux.over_react.g.dart b/lib/src/over_react_redux/over_react_flux.over_react.g.dart index f3887e9e7..9452b01d5 100644 --- a/lib/src/over_react_redux/over_react_flux.over_react.g.dart +++ b/lib/src/over_react_redux/over_react_flux.over_react.g.dart @@ -7,7 +7,7 @@ part of 'over_react_flux.dart'; // OverReactBuilder (package:over_react/src/builder.dart) // ************************************************************************** -abstract class ConnectFluxPropsMixin +mixin ConnectFluxPropsMixin implements _$ConnectFluxPropsMixin { @override Map get props; diff --git a/lib/src/over_react_redux/over_react_redux.over_react.g.dart b/lib/src/over_react_redux/over_react_redux.over_react.g.dart index 5802b87bf..2d26b1731 100644 --- a/lib/src/over_react_redux/over_react_redux.over_react.g.dart +++ b/lib/src/over_react_redux/over_react_redux.over_react.g.dart @@ -7,7 +7,7 @@ part of 'over_react_redux.dart'; // OverReactBuilder (package:over_react/src/builder.dart) // ************************************************************************** -abstract class ConnectPropsMixin implements _$ConnectPropsMixin { +mixin ConnectPropsMixin implements _$ConnectPropsMixin { @override Map get props; diff --git a/lib/src/over_react_redux/redux_multi_provider.over_react.g.dart b/lib/src/over_react_redux/redux_multi_provider.over_react.g.dart index c5f6b6865..bfb404450 100644 --- a/lib/src/over_react_redux/redux_multi_provider.over_react.g.dart +++ b/lib/src/over_react_redux/redux_multi_provider.over_react.g.dart @@ -18,7 +18,7 @@ final $ReduxMultiProviderComponentFactory = registerComponent2( parentType: null, ); -abstract class _$ReduxMultiProviderPropsAccessorsMixin +mixin _$ReduxMultiProviderPropsAccessorsMixin implements _$ReduxMultiProviderProps { @override Map get props; diff --git a/lib/src/util/class_names.over_react.g.dart b/lib/src/util/class_names.over_react.g.dart index 76cd54853..c05eb965d 100644 --- a/lib/src/util/class_names.over_react.g.dart +++ b/lib/src/util/class_names.over_react.g.dart @@ -7,7 +7,7 @@ part of 'class_names.dart'; // OverReactBuilder (package:over_react/src/builder.dart) // ************************************************************************** -abstract class CssClassPropsMixin implements _$CssClassPropsMixin { +mixin CssClassPropsMixin implements _$CssClassPropsMixin { @override Map get props; diff --git a/test/over_react/component/_deprecated/abstract_transition_test.over_react.g.dart b/test/over_react/component/_deprecated/abstract_transition_test.over_react.g.dart index b9672275b..c2225e8d6 100644 --- a/test/over_react/component/_deprecated/abstract_transition_test.over_react.g.dart +++ b/test/over_react/component/_deprecated/abstract_transition_test.over_react.g.dart @@ -18,8 +18,7 @@ final $TransitionerComponentFactory = registerComponent( parentType: null, ); -abstract class _$TransitionerPropsAccessorsMixin - implements _$TransitionerProps { +mixin _$TransitionerPropsAccessorsMixin implements _$TransitionerProps { @override Map get props; @@ -248,9 +247,7 @@ class _$$TransitionerProps extends _$TransitionerProps /// An alias for [getPropKey] so it can be referenced within the props class impl /// without being shadowed by the `getPropKey` instance extension member. const _$getPropKey$_$$TransitionerProps = getPropKey; - -abstract class _$TransitionerStateAccessorsMixin - implements _$TransitionerState { +mixin _$TransitionerStateAccessorsMixin implements _$TransitionerState { @override Map get state; diff --git a/test/over_react/component/_deprecated/fixtures/custom_error_boundary_component.over_react.g.dart b/test/over_react/component/_deprecated/fixtures/custom_error_boundary_component.over_react.g.dart index 29d901ef5..f5b1281e7 100644 --- a/test/over_react/component/_deprecated/fixtures/custom_error_boundary_component.over_react.g.dart +++ b/test/over_react/component/_deprecated/fixtures/custom_error_boundary_component.over_react.g.dart @@ -19,7 +19,7 @@ final $CustomErrorBoundaryComponentFactory = registerComponent2( skipMethods: const [], ); -abstract class _$CustomErrorBoundaryPropsAccessorsMixin +mixin _$CustomErrorBoundaryPropsAccessorsMixin implements _$CustomErrorBoundaryProps { @override Map get props; @@ -117,7 +117,7 @@ class _$$CustomErrorBoundaryProps$JsMap extends _$$CustomErrorBoundaryProps { JsBackedMap _props; } -abstract class _$CustomErrorBoundaryStateAccessorsMixin +mixin _$CustomErrorBoundaryStateAccessorsMixin implements _$CustomErrorBoundaryState { @override Map get state; diff --git a/test/over_react/component/error_boundary/shared_stack_tests.over_react.g.dart b/test/over_react/component/error_boundary/shared_stack_tests.over_react.g.dart index 175f6f5ae..01ba2c184 100644 --- a/test/over_react/component/error_boundary/shared_stack_tests.over_react.g.dart +++ b/test/over_react/component/error_boundary/shared_stack_tests.over_react.g.dart @@ -176,7 +176,7 @@ final $ThrowingComponentComponentFactory = registerComponent( parentType: null, ); -abstract class _$ThrowingComponentPropsAccessorsMixin +mixin _$ThrowingComponentPropsAccessorsMixin implements _$ThrowingComponentProps { @override Map get props; diff --git a/test/over_react/component/fixtures/basic_child_component.over_react.g.dart b/test/over_react/component/fixtures/basic_child_component.over_react.g.dart index 56692559c..8f2edc9e0 100644 --- a/test/over_react/component/fixtures/basic_child_component.over_react.g.dart +++ b/test/over_react/component/fixtures/basic_child_component.over_react.g.dart @@ -18,7 +18,7 @@ final $BasicChildComponentFactory = registerComponent2( parentType: null, ); -abstract class _$BasicChildPropsAccessorsMixin implements _$BasicChildProps { +mixin _$BasicChildPropsAccessorsMixin implements _$BasicChildProps { @override Map get props; diff --git a/test/over_react/component/fixtures/basic_ui_component.over_react.g.dart b/test/over_react/component/fixtures/basic_ui_component.over_react.g.dart index def202156..003f4a586 100644 --- a/test/over_react/component/fixtures/basic_ui_component.over_react.g.dart +++ b/test/over_react/component/fixtures/basic_ui_component.over_react.g.dart @@ -18,8 +18,7 @@ final $BasicUiComponentComponentFactory = registerComponent( parentType: null, ); -abstract class _$BasicUiComponentPropsAccessorsMixin - implements _$BasicUiComponentProps { +mixin _$BasicUiComponentPropsAccessorsMixin implements _$BasicUiComponentProps { @override Map get props; diff --git a/test/over_react/component/fixtures/context_provider_component.over_react.g.dart b/test/over_react/component/fixtures/context_provider_component.over_react.g.dart index 4126071b6..68a12c0c6 100644 --- a/test/over_react/component/fixtures/context_provider_component.over_react.g.dart +++ b/test/over_react/component/fixtures/context_provider_component.over_react.g.dart @@ -18,7 +18,7 @@ final $ContextProviderWrapperComponentFactory = registerComponent2( parentType: null, ); -abstract class _$ContextProviderWrapperPropsAccessorsMixin +mixin _$ContextProviderWrapperPropsAccessorsMixin implements _$ContextProviderWrapperProps { @override Map get props; @@ -119,7 +119,7 @@ class _$$ContextProviderWrapperProps$JsMap JsBackedMap _props; } -abstract class _$ContextProviderWrapperStateAccessorsMixin +mixin _$ContextProviderWrapperStateAccessorsMixin implements _$ContextProviderWrapperState { @override Map get state; diff --git a/test/over_react/component/fixtures/dummy_component.over_react.g.dart b/test/over_react/component/fixtures/dummy_component.over_react.g.dart index abd40b1ee..89f602c83 100644 --- a/test/over_react/component/fixtures/dummy_component.over_react.g.dart +++ b/test/over_react/component/fixtures/dummy_component.over_react.g.dart @@ -18,7 +18,7 @@ final $DummyComponentFactory = registerComponent2( parentType: null, ); -abstract class _$DummyPropsAccessorsMixin implements _$DummyProps { +mixin _$DummyPropsAccessorsMixin implements _$DummyProps { @override Map get props; diff --git a/test/over_react/component/fixtures/flawed_component.over_react.g.dart b/test/over_react/component/fixtures/flawed_component.over_react.g.dart index 4691e6d32..9e01ed662 100644 --- a/test/over_react/component/fixtures/flawed_component.over_react.g.dart +++ b/test/over_react/component/fixtures/flawed_component.over_react.g.dart @@ -18,7 +18,7 @@ final $FlawedComponentFactory = registerComponent2( parentType: null, ); -abstract class _$FlawedPropsAccessorsMixin implements _$FlawedProps { +mixin _$FlawedPropsAccessorsMixin implements _$FlawedProps { @override Map get props; @@ -129,7 +129,7 @@ class _$$FlawedProps$JsMap extends _$$FlawedProps { JsBackedMap _props; } -abstract class _$FlawedStateAccessorsMixin implements _$FlawedState { +mixin _$FlawedStateAccessorsMixin implements _$FlawedState { @override Map get state; diff --git a/test/over_react/component/fixtures/flawed_component_on_mount.over_react.g.dart b/test/over_react/component/fixtures/flawed_component_on_mount.over_react.g.dart index 267152779..9691ecdf3 100644 --- a/test/over_react/component/fixtures/flawed_component_on_mount.over_react.g.dart +++ b/test/over_react/component/fixtures/flawed_component_on_mount.over_react.g.dart @@ -18,8 +18,7 @@ final $FlawedOnMountComponentFactory = registerComponent2( parentType: null, ); -abstract class _$FlawedOnMountPropsAccessorsMixin - implements _$FlawedOnMountProps { +mixin _$FlawedOnMountPropsAccessorsMixin implements _$FlawedOnMountProps { @override Map get props; diff --git a/test/over_react/component/fixtures/flawed_component_that_renders_a_string.over_react.g.dart b/test/over_react/component/fixtures/flawed_component_that_renders_a_string.over_react.g.dart index d22705551..22c47b310 100644 --- a/test/over_react/component/fixtures/flawed_component_that_renders_a_string.over_react.g.dart +++ b/test/over_react/component/fixtures/flawed_component_that_renders_a_string.over_react.g.dart @@ -18,7 +18,7 @@ final $FlawedWithStringChildComponentFactory = registerComponent2( parentType: null, ); -abstract class _$FlawedWithStringChildPropsAccessorsMixin +mixin _$FlawedWithStringChildPropsAccessorsMixin implements _$FlawedWithStringChildProps { @override Map get props; diff --git a/test/over_react/component/fixtures/flawed_component_that_renders_nothing.over_react.g.dart b/test/over_react/component/fixtures/flawed_component_that_renders_nothing.over_react.g.dart index 8f31c60ea..e4f6bfa14 100644 --- a/test/over_react/component/fixtures/flawed_component_that_renders_nothing.over_react.g.dart +++ b/test/over_react/component/fixtures/flawed_component_that_renders_nothing.over_react.g.dart @@ -18,7 +18,7 @@ final $FlawedWithNoChildComponentFactory = registerComponent2( parentType: null, ); -abstract class _$FlawedWithNoChildPropsAccessorsMixin +mixin _$FlawedWithNoChildPropsAccessorsMixin implements _$FlawedWithNoChildProps { @override Map get props; diff --git a/test/over_react/component/fixtures/prop_typedef_fixtures.over_react.g.dart b/test/over_react/component/fixtures/prop_typedef_fixtures.over_react.g.dart index 73fc193cf..3dac63145 100644 --- a/test/over_react/component/fixtures/prop_typedef_fixtures.over_react.g.dart +++ b/test/over_react/component/fixtures/prop_typedef_fixtures.over_react.g.dart @@ -7,7 +7,7 @@ part of 'prop_typedef_fixtures.dart'; // OverReactBuilder (package:over_react/src/builder.dart) // ************************************************************************** -abstract class _$TestAbstractCustomRendererComponentPropsAccessorsMixin +mixin _$TestAbstractCustomRendererComponentPropsAccessorsMixin implements _$TestAbstractCustomRendererComponentProps { @override Map get props; @@ -113,7 +113,7 @@ abstract class TestAbstractCustomRendererComponentProps _$metaForTestAbstractCustomRendererComponentProps; } -abstract class _$TestAbstractCustomRendererComponentStateAccessorsMixin +mixin _$TestAbstractCustomRendererComponentStateAccessorsMixin implements _$TestAbstractCustomRendererComponentState { @override Map get state; @@ -170,7 +170,7 @@ final $TestConsumingAbstractCustomRendererComponentComponentFactory = parentType: null, ); -abstract class _$TestConsumingAbstractCustomRendererComponentPropsAccessorsMixin +mixin _$TestConsumingAbstractCustomRendererComponentPropsAccessorsMixin implements _$TestConsumingAbstractCustomRendererComponentProps { @override Map get props; @@ -395,7 +395,7 @@ final $TestConsumingCustomRendererComponentComponentFactory = parentType: null, ); -abstract class _$TestConsumingCustomRendererComponentPropsAccessorsMixin +mixin _$TestConsumingCustomRendererComponentPropsAccessorsMixin implements _$TestConsumingCustomRendererComponentProps { @override Map get props; @@ -607,7 +607,7 @@ final $TestCustomRendererFromAbstractComponentComponentFactory = parentType: null, ); -abstract class _$TestCustomRendererFromAbstractComponentPropsAccessorsMixin +mixin _$TestCustomRendererFromAbstractComponentPropsAccessorsMixin implements _$TestCustomRendererFromAbstractComponentProps { @override Map get props; @@ -739,7 +739,7 @@ class _$$TestCustomRendererFromAbstractComponentProps$JsMap JsBackedMap _props; } -abstract class _$TestCustomRendererFromAbstractComponentStateAccessorsMixin +mixin _$TestCustomRendererFromAbstractComponentStateAccessorsMixin implements _$TestCustomRendererFromAbstractComponentState { @override Map get state; @@ -909,7 +909,7 @@ final $TestCustomRendererComponentComponentFactory = registerComponent2( parentType: null, ); -abstract class _$TestCustomRendererComponentPropsAccessorsMixin +mixin _$TestCustomRendererComponentPropsAccessorsMixin implements _$TestCustomRendererComponentProps { @override Map get props; @@ -1110,7 +1110,7 @@ class _$$TestCustomRendererComponentProps$JsMap JsBackedMap _props; } -abstract class _$TestCustomRendererComponentStateAccessorsMixin +mixin _$TestCustomRendererComponentStateAccessorsMixin implements _$TestCustomRendererComponentState { @override Map get state; diff --git a/test/over_react/component/memo_test.over_react.g.dart b/test/over_react/component/memo_test.over_react.g.dart index d78ea89e5..db1d6fa74 100644 --- a/test/over_react/component/memo_test.over_react.g.dart +++ b/test/over_react/component/memo_test.over_react.g.dart @@ -18,7 +18,7 @@ final $BasicUiComponent2ComponentFactory = registerComponent2( parentType: null, ); -abstract class _$BasicUiComponent2PropsAccessorsMixin +mixin _$BasicUiComponent2PropsAccessorsMixin implements _$BasicUiComponent2Props { @override Map get props; diff --git a/test/over_react/component/typed_factory_test.over_react.g.dart b/test/over_react/component/typed_factory_test.over_react.g.dart index 1a06744a7..d62ffa41b 100644 --- a/test/over_react/component/typed_factory_test.over_react.g.dart +++ b/test/over_react/component/typed_factory_test.over_react.g.dart @@ -18,7 +18,7 @@ final $TypedFactoryTesterComponentFactory = registerComponent2( parentType: null, ); -abstract class _$TypedFactoryTesterPropsAccessorsMixin +mixin _$TypedFactoryTesterPropsAccessorsMixin implements _$TypedFactoryTesterProps { @override Map get props; @@ -133,7 +133,7 @@ class _$$TypedFactoryTesterProps$JsMap extends _$$TypedFactoryTesterProps { JsBackedMap _props; } -abstract class _$TypedFactoryTesterStateAccessorsMixin +mixin _$TypedFactoryTesterStateAccessorsMixin implements _$TypedFactoryTesterState { @override Map get state; diff --git a/test/over_react/component_declaration/builder_integration_tests/abstract_accessor_integration_test.over_react.g.dart b/test/over_react/component_declaration/builder_integration_tests/abstract_accessor_integration_test.over_react.g.dart index 4817a03d8..3872f54c2 100644 --- a/test/over_react/component_declaration/builder_integration_tests/abstract_accessor_integration_test.over_react.g.dart +++ b/test/over_react/component_declaration/builder_integration_tests/abstract_accessor_integration_test.over_react.g.dart @@ -7,8 +7,7 @@ part of 'abstract_accessor_integration_test.dart'; // OverReactBuilder (package:over_react/src/builder.dart) // ************************************************************************** -abstract class _$TestAbstractPropsAccessorsMixin - implements _$TestAbstractProps { +mixin _$TestAbstractPropsAccessorsMixin implements _$TestAbstractProps { @override Map get props; @@ -133,7 +132,7 @@ abstract class TestAbstractProps extends _$TestAbstractProps static const PropsMeta meta = _$metaForTestAbstractProps; } -abstract class _$TestCustomNamespaceAbstractPropsAccessorsMixin +mixin _$TestCustomNamespaceAbstractPropsAccessorsMixin implements _$TestCustomNamespaceAbstractProps { @override Map get props; @@ -275,8 +274,7 @@ abstract class TestCustomNamespaceAbstractProps static const PropsMeta meta = _$metaForTestCustomNamespaceAbstractProps; } -abstract class _$TestAbstractStateAccessorsMixin - implements _$TestAbstractState { +mixin _$TestAbstractStateAccessorsMixin implements _$TestAbstractState { @override Map get state; @@ -402,7 +400,7 @@ abstract class TestAbstractState extends _$TestAbstractState static const StateMeta meta = _$metaForTestAbstractState; } -abstract class _$TestCustomNamespaceAbstractStateAccessorsMixin +mixin _$TestCustomNamespaceAbstractStateAccessorsMixin implements _$TestCustomNamespaceAbstractState { @override Map get state; diff --git a/test/over_react/component_declaration/builder_integration_tests/accessor_mixin_integration_test.over_react.g.dart b/test/over_react/component_declaration/builder_integration_tests/accessor_mixin_integration_test.over_react.g.dart index 41dc0b5f0..4c628d7d1 100644 --- a/test/over_react/component_declaration/builder_integration_tests/accessor_mixin_integration_test.over_react.g.dart +++ b/test/over_react/component_declaration/builder_integration_tests/accessor_mixin_integration_test.over_react.g.dart @@ -7,7 +7,7 @@ part of 'accessor_mixin_integration_test.dart'; // OverReactBuilder (package:over_react/src/builder.dart) // ************************************************************************** -abstract class TestPropsMixin implements _$TestPropsMixin { +mixin TestPropsMixin implements _$TestPropsMixin { @override Map get props; @@ -127,8 +127,7 @@ const PropsMeta _$metaForTestPropsMixin = PropsMeta( keys: TestPropsMixin.$propKeys, ); -abstract class TestCustomNamespacePropsMixin - implements _$TestCustomNamespacePropsMixin { +mixin TestCustomNamespacePropsMixin implements _$TestCustomNamespacePropsMixin { @override Map get props; @@ -265,7 +264,7 @@ const PropsMeta _$metaForTestCustomNamespacePropsMixin = PropsMeta( keys: TestCustomNamespacePropsMixin.$propKeys, ); -abstract class TestStateMixin implements _$TestStateMixin { +mixin TestStateMixin implements _$TestStateMixin { @override Map get state; @@ -386,8 +385,7 @@ const StateMeta _$metaForTestStateMixin = StateMeta( keys: TestStateMixin.$stateKeys, ); -abstract class TestCustomNamespaceStateMixin - implements _$TestCustomNamespaceStateMixin { +mixin TestCustomNamespaceStateMixin implements _$TestCustomNamespaceStateMixin { @override Map get state; diff --git a/test/over_react/component_declaration/builder_integration_tests/component2/abstract_accessor_integration_test.over_react.g.dart b/test/over_react/component_declaration/builder_integration_tests/component2/abstract_accessor_integration_test.over_react.g.dart index 4817a03d8..3872f54c2 100644 --- a/test/over_react/component_declaration/builder_integration_tests/component2/abstract_accessor_integration_test.over_react.g.dart +++ b/test/over_react/component_declaration/builder_integration_tests/component2/abstract_accessor_integration_test.over_react.g.dart @@ -7,8 +7,7 @@ part of 'abstract_accessor_integration_test.dart'; // OverReactBuilder (package:over_react/src/builder.dart) // ************************************************************************** -abstract class _$TestAbstractPropsAccessorsMixin - implements _$TestAbstractProps { +mixin _$TestAbstractPropsAccessorsMixin implements _$TestAbstractProps { @override Map get props; @@ -133,7 +132,7 @@ abstract class TestAbstractProps extends _$TestAbstractProps static const PropsMeta meta = _$metaForTestAbstractProps; } -abstract class _$TestCustomNamespaceAbstractPropsAccessorsMixin +mixin _$TestCustomNamespaceAbstractPropsAccessorsMixin implements _$TestCustomNamespaceAbstractProps { @override Map get props; @@ -275,8 +274,7 @@ abstract class TestCustomNamespaceAbstractProps static const PropsMeta meta = _$metaForTestCustomNamespaceAbstractProps; } -abstract class _$TestAbstractStateAccessorsMixin - implements _$TestAbstractState { +mixin _$TestAbstractStateAccessorsMixin implements _$TestAbstractState { @override Map get state; @@ -402,7 +400,7 @@ abstract class TestAbstractState extends _$TestAbstractState static const StateMeta meta = _$metaForTestAbstractState; } -abstract class _$TestCustomNamespaceAbstractStateAccessorsMixin +mixin _$TestCustomNamespaceAbstractStateAccessorsMixin implements _$TestCustomNamespaceAbstractState { @override Map get state; diff --git a/test/over_react/component_declaration/builder_integration_tests/component2/accessor_mixin_integration_test.over_react.g.dart b/test/over_react/component_declaration/builder_integration_tests/component2/accessor_mixin_integration_test.over_react.g.dart index 41dc0b5f0..4c628d7d1 100644 --- a/test/over_react/component_declaration/builder_integration_tests/component2/accessor_mixin_integration_test.over_react.g.dart +++ b/test/over_react/component_declaration/builder_integration_tests/component2/accessor_mixin_integration_test.over_react.g.dart @@ -7,7 +7,7 @@ part of 'accessor_mixin_integration_test.dart'; // OverReactBuilder (package:over_react/src/builder.dart) // ************************************************************************** -abstract class TestPropsMixin implements _$TestPropsMixin { +mixin TestPropsMixin implements _$TestPropsMixin { @override Map get props; @@ -127,8 +127,7 @@ const PropsMeta _$metaForTestPropsMixin = PropsMeta( keys: TestPropsMixin.$propKeys, ); -abstract class TestCustomNamespacePropsMixin - implements _$TestCustomNamespacePropsMixin { +mixin TestCustomNamespacePropsMixin implements _$TestCustomNamespacePropsMixin { @override Map get props; @@ -265,7 +264,7 @@ const PropsMeta _$metaForTestCustomNamespacePropsMixin = PropsMeta( keys: TestCustomNamespacePropsMixin.$propKeys, ); -abstract class TestStateMixin implements _$TestStateMixin { +mixin TestStateMixin implements _$TestStateMixin { @override Map get state; @@ -386,8 +385,7 @@ const StateMeta _$metaForTestStateMixin = StateMeta( keys: TestStateMixin.$stateKeys, ); -abstract class TestCustomNamespaceStateMixin - implements _$TestCustomNamespaceStateMixin { +mixin TestCustomNamespaceStateMixin implements _$TestCustomNamespaceStateMixin { @override Map get state; diff --git a/test/over_react/component_declaration/builder_integration_tests/component2/annotation_error_integration_test.over_react.g.dart b/test/over_react/component_declaration/builder_integration_tests/component2/annotation_error_integration_test.over_react.g.dart index 7b31f8e47..a23b2d07a 100644 --- a/test/over_react/component_declaration/builder_integration_tests/component2/annotation_error_integration_test.over_react.g.dart +++ b/test/over_react/component_declaration/builder_integration_tests/component2/annotation_error_integration_test.over_react.g.dart @@ -18,7 +18,7 @@ final $AnnotationErrorDefaultPropsComponentFactory = registerComponent( parentType: null, ); -abstract class _$AnnotationErrorDefaultPropsPropsAccessorsMixin +mixin _$AnnotationErrorDefaultPropsPropsAccessorsMixin implements _$AnnotationErrorDefaultPropsProps { @override Map get props; @@ -124,8 +124,7 @@ final $AnnotationErrorComponentFactory = registerComponent( parentType: null, ); -abstract class _$AnnotationErrorPropsAccessorsMixin - implements _$AnnotationErrorProps { +mixin _$AnnotationErrorPropsAccessorsMixin implements _$AnnotationErrorProps { @override Map get props; @@ -223,7 +222,7 @@ final $AnnotationErrorStatefulComponentFactory = registerComponent( parentType: null, ); -abstract class _$AnnotationErrorStatefulPropsAccessorsMixin +mixin _$AnnotationErrorStatefulPropsAccessorsMixin implements _$AnnotationErrorStatefulProps { @override Map get props; @@ -287,8 +286,7 @@ class _$$AnnotationErrorStatefulProps extends _$AnnotationErrorStatefulProps /// An alias for [getPropKey] so it can be referenced within the props class impl /// without being shadowed by the `getPropKey` instance extension member. const _$getPropKey$_$$AnnotationErrorStatefulProps = getPropKey; - -abstract class _$AnnotationErrorStatefulStateAccessorsMixin +mixin _$AnnotationErrorStatefulStateAccessorsMixin implements _$AnnotationErrorStatefulState { @override Map get state; @@ -371,7 +369,7 @@ final $AnnotationErrorStatefulDefaultPropsComponentFactory = registerComponent( parentType: null, ); -abstract class _$AnnotationErrorStatefulDefaultPropsPropsAccessorsMixin +mixin _$AnnotationErrorStatefulDefaultPropsPropsAccessorsMixin implements _$AnnotationErrorStatefulDefaultPropsProps { @override Map get props; @@ -443,8 +441,7 @@ class _$$AnnotationErrorStatefulDefaultPropsProps /// An alias for [getPropKey] so it can be referenced within the props class impl /// without being shadowed by the `getPropKey` instance extension member. const _$getPropKey$_$$AnnotationErrorStatefulDefaultPropsProps = getPropKey; - -abstract class _$AnnotationErrorStatefulDefaultPropsStateAccessorsMixin +mixin _$AnnotationErrorStatefulDefaultPropsStateAccessorsMixin implements _$AnnotationErrorStatefulDefaultPropsState { @override Map get state; diff --git a/test/over_react/component_declaration/builder_integration_tests/component2/component_integration_test.over_react.g.dart b/test/over_react/component_declaration/builder_integration_tests/component2/component_integration_test.over_react.g.dart index 358870290..2245f75f1 100644 --- a/test/over_react/component_declaration/builder_integration_tests/component2/component_integration_test.over_react.g.dart +++ b/test/over_react/component_declaration/builder_integration_tests/component2/component_integration_test.over_react.g.dart @@ -18,8 +18,7 @@ final $ComponentTestComponentFactory = registerComponent2( parentType: null, ); -abstract class _$ComponentTestPropsAccessorsMixin - implements _$ComponentTestProps { +mixin _$ComponentTestPropsAccessorsMixin implements _$ComponentTestProps { @override Map get props; @@ -319,8 +318,7 @@ final $IsErrorBoundaryComponentFactory = registerComponent2( skipMethods: const [], ); -abstract class _$IsErrorBoundaryPropsAccessorsMixin - implements _$IsErrorBoundaryProps { +mixin _$IsErrorBoundaryPropsAccessorsMixin implements _$IsErrorBoundaryProps { @override Map get props; @@ -475,7 +473,7 @@ final $IsNotErrorBoundaryComponentFactory = registerComponent2( parentType: null, ); -abstract class _$IsNotErrorBoundaryPropsAccessorsMixin +mixin _$IsNotErrorBoundaryPropsAccessorsMixin implements _$IsNotErrorBoundaryProps { @override Map get props; diff --git a/test/over_react/component_declaration/builder_integration_tests/component2/constant_required_accessor_integration_test.over_react.g.dart b/test/over_react/component_declaration/builder_integration_tests/component2/constant_required_accessor_integration_test.over_react.g.dart index 581e43bc9..d446aae78 100644 --- a/test/over_react/component_declaration/builder_integration_tests/component2/constant_required_accessor_integration_test.over_react.g.dart +++ b/test/over_react/component_declaration/builder_integration_tests/component2/constant_required_accessor_integration_test.over_react.g.dart @@ -18,8 +18,7 @@ final $ComponentTestComponentFactory = registerComponent2( parentType: null, ); -abstract class _$ComponentTestPropsAccessorsMixin - implements _$ComponentTestProps { +mixin _$ComponentTestPropsAccessorsMixin implements _$ComponentTestProps { @override Map get props; diff --git a/test/over_react/component_declaration/builder_integration_tests/component2/do_not_generate_accessor_integration_test.over_react.g.dart b/test/over_react/component_declaration/builder_integration_tests/component2/do_not_generate_accessor_integration_test.over_react.g.dart index e4b0ac6d1..6d30c7753 100644 --- a/test/over_react/component_declaration/builder_integration_tests/component2/do_not_generate_accessor_integration_test.over_react.g.dart +++ b/test/over_react/component_declaration/builder_integration_tests/component2/do_not_generate_accessor_integration_test.over_react.g.dart @@ -18,7 +18,7 @@ final $DoNotGenerateAccessorTestComponentFactory = registerComponent2( parentType: null, ); -abstract class _$DoNotGenerateAccessorTestPropsAccessorsMixin +mixin _$DoNotGenerateAccessorTestPropsAccessorsMixin implements _$DoNotGenerateAccessorTestProps { @override Map get props; @@ -181,7 +181,7 @@ class _$$DoNotGenerateAccessorTestProps$JsMap JsBackedMap _props; } -abstract class _$DoNotGenerateAccessorTestStateAccessorsMixin +mixin _$DoNotGenerateAccessorTestStateAccessorsMixin implements _$DoNotGenerateAccessorTestState { @override Map get state; diff --git a/test/over_react/component_declaration/builder_integration_tests/component2/namespaced_accessor_integration_test.over_react.g.dart b/test/over_react/component_declaration/builder_integration_tests/component2/namespaced_accessor_integration_test.over_react.g.dart index eec4be87a..a3725e65e 100644 --- a/test/over_react/component_declaration/builder_integration_tests/component2/namespaced_accessor_integration_test.over_react.g.dart +++ b/test/over_react/component_declaration/builder_integration_tests/component2/namespaced_accessor_integration_test.over_react.g.dart @@ -18,7 +18,7 @@ final $NamespacedAccessorTestComponentFactory = registerComponent2( parentType: null, ); -abstract class _$NamespacedAccessorTestPropsAccessorsMixin +mixin _$NamespacedAccessorTestPropsAccessorsMixin implements _$NamespacedAccessorTestProps { @override Map get props; @@ -237,7 +237,7 @@ class _$$NamespacedAccessorTestProps$JsMap JsBackedMap _props; } -abstract class _$NamespacedAccessorTestStateAccessorsMixin +mixin _$NamespacedAccessorTestStateAccessorsMixin implements _$NamespacedAccessorTestState { @override Map get state; diff --git a/test/over_react/component_declaration/builder_integration_tests/component2/null_safe_accessor_integration_test.over_react.g.dart b/test/over_react/component_declaration/builder_integration_tests/component2/null_safe_accessor_integration_test.over_react.g.dart index 3a0eddcbc..1c9b895fe 100644 --- a/test/over_react/component_declaration/builder_integration_tests/component2/null_safe_accessor_integration_test.over_react.g.dart +++ b/test/over_react/component_declaration/builder_integration_tests/component2/null_safe_accessor_integration_test.over_react.g.dart @@ -18,8 +18,7 @@ final $NullSafeTestComponentFactory = registerComponent2( parentType: null, ); -abstract class _$NullSafeTestPropsAccessorsMixin - implements _$NullSafeTestProps { +mixin _$NullSafeTestPropsAccessorsMixin implements _$NullSafeTestProps { @override Map get props; @@ -291,8 +290,7 @@ class _$$NullSafeTestProps$JsMap extends _$$NullSafeTestProps { JsBackedMap _props; } -abstract class _$NullSafeTestStateAccessorsMixin - implements _$NullSafeTestState { +mixin _$NullSafeTestStateAccessorsMixin implements _$NullSafeTestState { @override Map get state; diff --git a/test/over_react/component_declaration/builder_integration_tests/component2/private_props_ddc_bug.over_react.g.dart b/test/over_react/component_declaration/builder_integration_tests/component2/private_props_ddc_bug.over_react.g.dart index ae5b4f8d0..311655c78 100644 --- a/test/over_react/component_declaration/builder_integration_tests/component2/private_props_ddc_bug.over_react.g.dart +++ b/test/over_react/component_declaration/builder_integration_tests/component2/private_props_ddc_bug.over_react.g.dart @@ -18,7 +18,7 @@ final $FooComponentFactory = registerComponent2( parentType: null, ); -abstract class _$FooPropsAccessorsMixin implements _$FooProps { +mixin _$FooPropsAccessorsMixin implements _$FooProps { @override Map get props; diff --git a/test/over_react/component_declaration/builder_integration_tests/component2/required_accessor_integration_test.over_react.g.dart b/test/over_react/component_declaration/builder_integration_tests/component2/required_accessor_integration_test.over_react.g.dart index a6e9e0ebb..28a213fa0 100644 --- a/test/over_react/component_declaration/builder_integration_tests/component2/required_accessor_integration_test.over_react.g.dart +++ b/test/over_react/component_declaration/builder_integration_tests/component2/required_accessor_integration_test.over_react.g.dart @@ -18,8 +18,7 @@ final $ComponentTestComponentFactory = registerComponent2( parentType: null, ); -abstract class _$ComponentTestPropsAccessorsMixin - implements _$ComponentTestProps { +mixin _$ComponentTestPropsAccessorsMixin implements _$ComponentTestProps { @override Map get props; diff --git a/test/over_react/component_declaration/builder_integration_tests/component2/stateful_component_integration_test.over_react.g.dart b/test/over_react/component_declaration/builder_integration_tests/component2/stateful_component_integration_test.over_react.g.dart index 9d4269cb1..47c97dc92 100644 --- a/test/over_react/component_declaration/builder_integration_tests/component2/stateful_component_integration_test.over_react.g.dart +++ b/test/over_react/component_declaration/builder_integration_tests/component2/stateful_component_integration_test.over_react.g.dart @@ -18,7 +18,7 @@ final $StatefulComponentTestComponentFactory = registerComponent2( parentType: null, ); -abstract class _$StatefulComponentTestPropsAccessorsMixin +mixin _$StatefulComponentTestPropsAccessorsMixin implements _$StatefulComponentTestProps { @override Map get props; @@ -146,7 +146,7 @@ class _$$StatefulComponentTestProps$JsMap JsBackedMap _props; } -abstract class _$StatefulComponentTestStateAccessorsMixin +mixin _$StatefulComponentTestStateAccessorsMixin implements _$StatefulComponentTestState { @override Map get state; diff --git a/test/over_react/component_declaration/builder_integration_tests/component2/unassigned_prop_integration_test.over_react.g.dart b/test/over_react/component_declaration/builder_integration_tests/component2/unassigned_prop_integration_test.over_react.g.dart index e1a7f6ad3..9d13d46ff 100644 --- a/test/over_react/component_declaration/builder_integration_tests/component2/unassigned_prop_integration_test.over_react.g.dart +++ b/test/over_react/component_declaration/builder_integration_tests/component2/unassigned_prop_integration_test.over_react.g.dart @@ -18,7 +18,7 @@ final $FooComponentFactory = registerComponent2( parentType: null, ); -abstract class _$FooPropsAccessorsMixin implements _$FooProps { +mixin _$FooPropsAccessorsMixin implements _$FooProps { @override Map get props; diff --git a/test/over_react/component_declaration/builder_integration_tests/component_integration_test.over_react.g.dart b/test/over_react/component_declaration/builder_integration_tests/component_integration_test.over_react.g.dart index bfb3a39dd..6fc54c6c7 100644 --- a/test/over_react/component_declaration/builder_integration_tests/component_integration_test.over_react.g.dart +++ b/test/over_react/component_declaration/builder_integration_tests/component_integration_test.over_react.g.dart @@ -18,8 +18,7 @@ final $ComponentTestComponentFactory = registerComponent( parentType: null, ); -abstract class _$ComponentTestPropsAccessorsMixin - implements _$ComponentTestProps { +mixin _$ComponentTestPropsAccessorsMixin implements _$ComponentTestProps { @override Map get props; diff --git a/test/over_react/component_declaration/builder_integration_tests/constant_required_accessor_integration_test.over_react.g.dart b/test/over_react/component_declaration/builder_integration_tests/constant_required_accessor_integration_test.over_react.g.dart index a2a6ceca9..0bb8d34f8 100644 --- a/test/over_react/component_declaration/builder_integration_tests/constant_required_accessor_integration_test.over_react.g.dart +++ b/test/over_react/component_declaration/builder_integration_tests/constant_required_accessor_integration_test.over_react.g.dart @@ -18,8 +18,7 @@ final $ComponentTestComponentFactory = registerComponent( parentType: null, ); -abstract class _$ComponentTestPropsAccessorsMixin - implements _$ComponentTestProps { +mixin _$ComponentTestPropsAccessorsMixin implements _$ComponentTestProps { @override Map get props; diff --git a/test/over_react/component_declaration/builder_integration_tests/do_not_generate_accessor_integration_test.over_react.g.dart b/test/over_react/component_declaration/builder_integration_tests/do_not_generate_accessor_integration_test.over_react.g.dart index 2850c429d..891ddf5a5 100644 --- a/test/over_react/component_declaration/builder_integration_tests/do_not_generate_accessor_integration_test.over_react.g.dart +++ b/test/over_react/component_declaration/builder_integration_tests/do_not_generate_accessor_integration_test.over_react.g.dart @@ -18,7 +18,7 @@ final $DoNotGenerateAccessorTestComponentFactory = registerComponent( parentType: null, ); -abstract class _$DoNotGenerateAccessorTestPropsAccessorsMixin +mixin _$DoNotGenerateAccessorTestPropsAccessorsMixin implements _$DoNotGenerateAccessorTestProps { @override Map get props; @@ -142,8 +142,7 @@ class _$$DoNotGenerateAccessorTestProps extends _$DoNotGenerateAccessorTestProps /// An alias for [getPropKey] so it can be referenced within the props class impl /// without being shadowed by the `getPropKey` instance extension member. const _$getPropKey$_$$DoNotGenerateAccessorTestProps = getPropKey; - -abstract class _$DoNotGenerateAccessorTestStateAccessorsMixin +mixin _$DoNotGenerateAccessorTestStateAccessorsMixin implements _$DoNotGenerateAccessorTestState { @override Map get state; diff --git a/test/over_react/component_declaration/builder_integration_tests/namespaced_accessor_integration_test.over_react.g.dart b/test/over_react/component_declaration/builder_integration_tests/namespaced_accessor_integration_test.over_react.g.dart index 6eb5ad9cf..964c76954 100644 --- a/test/over_react/component_declaration/builder_integration_tests/namespaced_accessor_integration_test.over_react.g.dart +++ b/test/over_react/component_declaration/builder_integration_tests/namespaced_accessor_integration_test.over_react.g.dart @@ -18,7 +18,7 @@ final $NamespacedAccessorTestComponentFactory = registerComponent( parentType: null, ); -abstract class _$NamespacedAccessorTestPropsAccessorsMixin +mixin _$NamespacedAccessorTestPropsAccessorsMixin implements _$NamespacedAccessorTestProps { @override Map get props; @@ -199,8 +199,7 @@ class _$$NamespacedAccessorTestProps extends _$NamespacedAccessorTestProps /// An alias for [getPropKey] so it can be referenced within the props class impl /// without being shadowed by the `getPropKey` instance extension member. const _$getPropKey$_$$NamespacedAccessorTestProps = getPropKey; - -abstract class _$NamespacedAccessorTestStateAccessorsMixin +mixin _$NamespacedAccessorTestStateAccessorsMixin implements _$NamespacedAccessorTestState { @override Map get state; diff --git a/test/over_react/component_declaration/builder_integration_tests/null_safe_accessor_integration_test.over_react.g.dart b/test/over_react/component_declaration/builder_integration_tests/null_safe_accessor_integration_test.over_react.g.dart index bb27e880c..d0c192d46 100644 --- a/test/over_react/component_declaration/builder_integration_tests/null_safe_accessor_integration_test.over_react.g.dart +++ b/test/over_react/component_declaration/builder_integration_tests/null_safe_accessor_integration_test.over_react.g.dart @@ -18,8 +18,7 @@ final $NullSafeTestComponentFactory = registerComponent( parentType: null, ); -abstract class _$NullSafeTestPropsAccessorsMixin - implements _$NullSafeTestProps { +mixin _$NullSafeTestPropsAccessorsMixin implements _$NullSafeTestProps { @override Map get props; @@ -257,9 +256,7 @@ class _$$NullSafeTestProps extends _$NullSafeTestProps /// An alias for [getPropKey] so it can be referenced within the props class impl /// without being shadowed by the `getPropKey` instance extension member. const _$getPropKey$_$$NullSafeTestProps = getPropKey; - -abstract class _$NullSafeTestStateAccessorsMixin - implements _$NullSafeTestState { +mixin _$NullSafeTestStateAccessorsMixin implements _$NullSafeTestState { @override Map get state; diff --git a/test/over_react/component_declaration/builder_integration_tests/private_props_ddc_bug.over_react.g.dart b/test/over_react/component_declaration/builder_integration_tests/private_props_ddc_bug.over_react.g.dart index c56d749fd..7833eb742 100644 --- a/test/over_react/component_declaration/builder_integration_tests/private_props_ddc_bug.over_react.g.dart +++ b/test/over_react/component_declaration/builder_integration_tests/private_props_ddc_bug.over_react.g.dart @@ -18,7 +18,7 @@ final $FooComponentFactory = registerComponent( parentType: null, ); -abstract class _$FooPropsAccessorsMixin implements _$FooProps { +mixin _$FooPropsAccessorsMixin implements _$FooProps { @override Map get props; diff --git a/test/over_react/component_declaration/builder_integration_tests/required_accessor_integration_test.over_react.g.dart b/test/over_react/component_declaration/builder_integration_tests/required_accessor_integration_test.over_react.g.dart index edfffc298..599303760 100644 --- a/test/over_react/component_declaration/builder_integration_tests/required_accessor_integration_test.over_react.g.dart +++ b/test/over_react/component_declaration/builder_integration_tests/required_accessor_integration_test.over_react.g.dart @@ -18,8 +18,7 @@ final $ComponentTestComponentFactory = registerComponent( parentType: null, ); -abstract class _$ComponentTestPropsAccessorsMixin - implements _$ComponentTestProps { +mixin _$ComponentTestPropsAccessorsMixin implements _$ComponentTestProps { @override Map get props; diff --git a/test/over_react/component_declaration/builder_integration_tests/stateful_component_integration_test.over_react.g.dart b/test/over_react/component_declaration/builder_integration_tests/stateful_component_integration_test.over_react.g.dart index 60cf66362..ae55c0b9b 100644 --- a/test/over_react/component_declaration/builder_integration_tests/stateful_component_integration_test.over_react.g.dart +++ b/test/over_react/component_declaration/builder_integration_tests/stateful_component_integration_test.over_react.g.dart @@ -18,7 +18,7 @@ final $StatefulComponentTestComponentFactory = registerComponent( parentType: null, ); -abstract class _$StatefulComponentTestPropsAccessorsMixin +mixin _$StatefulComponentTestPropsAccessorsMixin implements _$StatefulComponentTestProps { @override Map get props; @@ -81,8 +81,7 @@ class _$$StatefulComponentTestProps extends _$StatefulComponentTestProps /// An alias for [getPropKey] so it can be referenced within the props class impl /// without being shadowed by the `getPropKey` instance extension member. const _$getPropKey$_$$StatefulComponentTestProps = getPropKey; - -abstract class _$StatefulComponentTestStateAccessorsMixin +mixin _$StatefulComponentTestStateAccessorsMixin implements _$StatefulComponentTestState { @override Map get state; diff --git a/test/over_react/component_declaration/builder_integration_tests/unassigned_prop_integration_test.over_react.g.dart b/test/over_react/component_declaration/builder_integration_tests/unassigned_prop_integration_test.over_react.g.dart index 58261f2f9..37da4bf08 100644 --- a/test/over_react/component_declaration/builder_integration_tests/unassigned_prop_integration_test.over_react.g.dart +++ b/test/over_react/component_declaration/builder_integration_tests/unassigned_prop_integration_test.over_react.g.dart @@ -18,7 +18,7 @@ final $FooComponentFactory = registerComponent( parentType: null, ); -abstract class _$FooPropsAccessorsMixin implements _$FooProps { +mixin _$FooPropsAccessorsMixin implements _$FooProps { @override Map get props; diff --git a/test/over_react/component_declaration/component2_type_checking_test/test_a2.over_react.g.dart b/test/over_react/component_declaration/component2_type_checking_test/test_a2.over_react.g.dart index 471730ba0..aca0a3055 100644 --- a/test/over_react/component_declaration/component2_type_checking_test/test_a2.over_react.g.dart +++ b/test/over_react/component_declaration/component2_type_checking_test/test_a2.over_react.g.dart @@ -18,7 +18,7 @@ final $TestA2ComponentFactory = registerComponent2( parentType: null, ); -abstract class _$TestA2PropsAccessorsMixin implements _$TestA2Props { +mixin _$TestA2PropsAccessorsMixin implements _$TestA2Props { @override Map get props; diff --git a/test/over_react/component_declaration/component2_type_checking_test/test_b2.over_react.g.dart b/test/over_react/component_declaration/component2_type_checking_test/test_b2.over_react.g.dart index 0f39c659a..033693f54 100644 --- a/test/over_react/component_declaration/component2_type_checking_test/test_b2.over_react.g.dart +++ b/test/over_react/component_declaration/component2_type_checking_test/test_b2.over_react.g.dart @@ -18,7 +18,7 @@ final $TestB2ComponentFactory = registerComponent2( parentType: null, ); -abstract class _$TestB2PropsAccessorsMixin implements _$TestB2Props { +mixin _$TestB2PropsAccessorsMixin implements _$TestB2Props { @override Map get props; diff --git a/test/over_react/component_declaration/component2_type_checking_test/type_inheritance/abstract_inheritance/abstract2.over_react.g.dart b/test/over_react/component_declaration/component2_type_checking_test/type_inheritance/abstract_inheritance/abstract2.over_react.g.dart index 99de8d942..3a6d9632e 100644 --- a/test/over_react/component_declaration/component2_type_checking_test/type_inheritance/abstract_inheritance/abstract2.over_react.g.dart +++ b/test/over_react/component_declaration/component2_type_checking_test/type_inheritance/abstract_inheritance/abstract2.over_react.g.dart @@ -7,8 +7,7 @@ part of 'abstract2.dart'; // OverReactBuilder (package:over_react/src/builder.dart) // ************************************************************************** -abstract class _$TestAbstract2PropsAccessorsMixin - implements _$TestAbstract2Props { +mixin _$TestAbstract2PropsAccessorsMixin implements _$TestAbstract2Props { @override Map get props; diff --git a/test/over_react/component_declaration/component2_type_checking_test/type_inheritance/abstract_inheritance/extendedtype2.over_react.g.dart b/test/over_react/component_declaration/component2_type_checking_test/type_inheritance/abstract_inheritance/extendedtype2.over_react.g.dart index d5875d76e..b2a13e6b7 100644 --- a/test/over_react/component_declaration/component2_type_checking_test/type_inheritance/abstract_inheritance/extendedtype2.over_react.g.dart +++ b/test/over_react/component_declaration/component2_type_checking_test/type_inheritance/abstract_inheritance/extendedtype2.over_react.g.dart @@ -19,8 +19,7 @@ final $TestExtendtype2ComponentFactory = registerComponent2( $TestAbstract2ComponentFactory, /* from `subtypeOf: TestAbstract2Component` */ ); -abstract class _$TestExtendtype2PropsAccessorsMixin - implements _$TestExtendtype2Props { +mixin _$TestExtendtype2PropsAccessorsMixin implements _$TestExtendtype2Props { @override Map get props; diff --git a/test/over_react/component_declaration/component2_type_checking_test/type_inheritance/parent2.over_react.g.dart b/test/over_react/component_declaration/component2_type_checking_test/type_inheritance/parent2.over_react.g.dart index 618090a5d..bd28b5bba 100644 --- a/test/over_react/component_declaration/component2_type_checking_test/type_inheritance/parent2.over_react.g.dart +++ b/test/over_react/component_declaration/component2_type_checking_test/type_inheritance/parent2.over_react.g.dart @@ -18,7 +18,7 @@ final $TestParent2ComponentFactory = registerComponent2( parentType: null, ); -abstract class _$TestParent2PropsAccessorsMixin implements _$TestParent2Props { +mixin _$TestParent2PropsAccessorsMixin implements _$TestParent2Props { @override Map get props; diff --git a/test/over_react/component_declaration/component2_type_checking_test/type_inheritance/subsubtype2.over_react.g.dart b/test/over_react/component_declaration/component2_type_checking_test/type_inheritance/subsubtype2.over_react.g.dart index ed2bcf61f..a5e93d438 100644 --- a/test/over_react/component_declaration/component2_type_checking_test/type_inheritance/subsubtype2.over_react.g.dart +++ b/test/over_react/component_declaration/component2_type_checking_test/type_inheritance/subsubtype2.over_react.g.dart @@ -19,8 +19,7 @@ final $TestSubsubtype2ComponentFactory = registerComponent2( $TestSubtype2ComponentFactory, /* from `subtypeOf: TestSubtype2Component` */ ); -abstract class _$TestSubsubtype2PropsAccessorsMixin - implements _$TestSubsubtype2Props { +mixin _$TestSubsubtype2PropsAccessorsMixin implements _$TestSubsubtype2Props { @override Map get props; diff --git a/test/over_react/component_declaration/component2_type_checking_test/type_inheritance/subsubtype_of_component1.over_react.g.dart b/test/over_react/component_declaration/component2_type_checking_test/type_inheritance/subsubtype_of_component1.over_react.g.dart index 7b2deaae6..268e4fa50 100644 --- a/test/over_react/component_declaration/component2_type_checking_test/type_inheritance/subsubtype_of_component1.over_react.g.dart +++ b/test/over_react/component_declaration/component2_type_checking_test/type_inheritance/subsubtype_of_component1.over_react.g.dart @@ -19,7 +19,7 @@ final $TestSubsubtypeOfComponent1ComponentFactory = registerComponent2( $TestSubtypeOfComponent1ComponentFactory, /* from `subtypeOf: TestSubtypeOfComponent1Component` */ ); -abstract class _$TestSubsubtypeOfComponent1PropsAccessorsMixin +mixin _$TestSubsubtypeOfComponent1PropsAccessorsMixin implements _$TestSubsubtypeOfComponent1Props { @override Map get props; diff --git a/test/over_react/component_declaration/component2_type_checking_test/type_inheritance/subtype2.over_react.g.dart b/test/over_react/component_declaration/component2_type_checking_test/type_inheritance/subtype2.over_react.g.dart index e5a5c970e..633d30eee 100644 --- a/test/over_react/component_declaration/component2_type_checking_test/type_inheritance/subtype2.over_react.g.dart +++ b/test/over_react/component_declaration/component2_type_checking_test/type_inheritance/subtype2.over_react.g.dart @@ -19,8 +19,7 @@ final $TestSubtype2ComponentFactory = registerComponent2( $TestParent2ComponentFactory, /* from `subtypeOf: TestParent2Component` */ ); -abstract class _$TestSubtype2PropsAccessorsMixin - implements _$TestSubtype2Props { +mixin _$TestSubtype2PropsAccessorsMixin implements _$TestSubtype2Props { @override Map get props; diff --git a/test/over_react/component_declaration/component2_type_checking_test/type_inheritance/subtype_of_component1.over_react.g.dart b/test/over_react/component_declaration/component2_type_checking_test/type_inheritance/subtype_of_component1.over_react.g.dart index d0ee60f17..8123ab74b 100644 --- a/test/over_react/component_declaration/component2_type_checking_test/type_inheritance/subtype_of_component1.over_react.g.dart +++ b/test/over_react/component_declaration/component2_type_checking_test/type_inheritance/subtype_of_component1.over_react.g.dart @@ -19,7 +19,7 @@ final $TestSubtypeOfComponent1ComponentFactory = registerComponent2( $TestParentComponentFactory, /* from `subtypeOf: TestParentComponent` */ ); -abstract class _$TestSubtypeOfComponent1PropsAccessorsMixin +mixin _$TestSubtypeOfComponent1PropsAccessorsMixin implements _$TestSubtypeOfComponent1Props { @override Map get props; diff --git a/test/over_react/component_declaration/component_type_checking_test/test_a.over_react.g.dart b/test/over_react/component_declaration/component_type_checking_test/test_a.over_react.g.dart index d24fe4333..e5292564b 100644 --- a/test/over_react/component_declaration/component_type_checking_test/test_a.over_react.g.dart +++ b/test/over_react/component_declaration/component_type_checking_test/test_a.over_react.g.dart @@ -18,7 +18,7 @@ final $TestAComponentFactory = registerComponent( parentType: null, ); -abstract class _$TestAPropsAccessorsMixin implements _$TestAProps { +mixin _$TestAPropsAccessorsMixin implements _$TestAProps { @override Map get props; diff --git a/test/over_react/component_declaration/component_type_checking_test/test_b.over_react.g.dart b/test/over_react/component_declaration/component_type_checking_test/test_b.over_react.g.dart index cad9082d6..a7591e25a 100644 --- a/test/over_react/component_declaration/component_type_checking_test/test_b.over_react.g.dart +++ b/test/over_react/component_declaration/component_type_checking_test/test_b.over_react.g.dart @@ -18,7 +18,7 @@ final $TestBComponentFactory = registerComponent( parentType: null, ); -abstract class _$TestBPropsAccessorsMixin implements _$TestBProps { +mixin _$TestBPropsAccessorsMixin implements _$TestBProps { @override Map get props; diff --git a/test/over_react/component_declaration/component_type_checking_test/type_inheritance/abstract_inheritance/abstract.over_react.g.dart b/test/over_react/component_declaration/component_type_checking_test/type_inheritance/abstract_inheritance/abstract.over_react.g.dart index 3f9d7d478..bc48de82e 100644 --- a/test/over_react/component_declaration/component_type_checking_test/type_inheritance/abstract_inheritance/abstract.over_react.g.dart +++ b/test/over_react/component_declaration/component_type_checking_test/type_inheritance/abstract_inheritance/abstract.over_react.g.dart @@ -7,8 +7,7 @@ part of 'abstract.dart'; // OverReactBuilder (package:over_react/src/builder.dart) // ************************************************************************** -abstract class _$TestAbstractPropsAccessorsMixin - implements _$TestAbstractProps { +mixin _$TestAbstractPropsAccessorsMixin implements _$TestAbstractProps { @override Map get props; diff --git a/test/over_react/component_declaration/component_type_checking_test/type_inheritance/abstract_inheritance/extendedtype.over_react.g.dart b/test/over_react/component_declaration/component_type_checking_test/type_inheritance/abstract_inheritance/extendedtype.over_react.g.dart index 95f432cfe..5f836825e 100644 --- a/test/over_react/component_declaration/component_type_checking_test/type_inheritance/abstract_inheritance/extendedtype.over_react.g.dart +++ b/test/over_react/component_declaration/component_type_checking_test/type_inheritance/abstract_inheritance/extendedtype.over_react.g.dart @@ -19,8 +19,7 @@ final $TestExtendtypeComponentFactory = registerComponent( $TestAbstractComponentFactory, /* from `subtypeOf: TestAbstractComponent` */ ); -abstract class _$TestExtendtypePropsAccessorsMixin - implements _$TestExtendtypeProps { +mixin _$TestExtendtypePropsAccessorsMixin implements _$TestExtendtypeProps { @override Map get props; diff --git a/test/over_react/component_declaration/component_type_checking_test/type_inheritance/parent.over_react.g.dart b/test/over_react/component_declaration/component_type_checking_test/type_inheritance/parent.over_react.g.dart index 3a858be3c..7e14c8721 100644 --- a/test/over_react/component_declaration/component_type_checking_test/type_inheritance/parent.over_react.g.dart +++ b/test/over_react/component_declaration/component_type_checking_test/type_inheritance/parent.over_react.g.dart @@ -18,7 +18,7 @@ final $TestParentComponentFactory = registerComponent( parentType: null, ); -abstract class _$TestParentPropsAccessorsMixin implements _$TestParentProps { +mixin _$TestParentPropsAccessorsMixin implements _$TestParentProps { @override Map get props; diff --git a/test/over_react/component_declaration/component_type_checking_test/type_inheritance/subsubtype.over_react.g.dart b/test/over_react/component_declaration/component_type_checking_test/type_inheritance/subsubtype.over_react.g.dart index 767ac5353..e91915848 100644 --- a/test/over_react/component_declaration/component_type_checking_test/type_inheritance/subsubtype.over_react.g.dart +++ b/test/over_react/component_declaration/component_type_checking_test/type_inheritance/subsubtype.over_react.g.dart @@ -19,8 +19,7 @@ final $TestSubsubtypeComponentFactory = registerComponent( $TestSubtypeComponentFactory, /* from `subtypeOf: TestSubtypeComponent` */ ); -abstract class _$TestSubsubtypePropsAccessorsMixin - implements _$TestSubsubtypeProps { +mixin _$TestSubsubtypePropsAccessorsMixin implements _$TestSubsubtypeProps { @override Map get props; diff --git a/test/over_react/component_declaration/component_type_checking_test/type_inheritance/subtype.over_react.g.dart b/test/over_react/component_declaration/component_type_checking_test/type_inheritance/subtype.over_react.g.dart index 83c6ca2a3..39e094458 100644 --- a/test/over_react/component_declaration/component_type_checking_test/type_inheritance/subtype.over_react.g.dart +++ b/test/over_react/component_declaration/component_type_checking_test/type_inheritance/subtype.over_react.g.dart @@ -19,7 +19,7 @@ final $TestSubtypeComponentFactory = registerComponent( $TestParentComponentFactory, /* from `subtypeOf: TestParentComponent` */ ); -abstract class _$TestSubtypePropsAccessorsMixin implements _$TestSubtypeProps { +mixin _$TestSubtypePropsAccessorsMixin implements _$TestSubtypeProps { @override Map get props; diff --git a/test/over_react/component_declaration/flux_component_test/component2/flux_component_test.over_react.g.dart b/test/over_react/component_declaration/flux_component_test/component2/flux_component_test.over_react.g.dart index c987c0226..0f0de1835 100644 --- a/test/over_react/component_declaration/flux_component_test/component2/flux_component_test.over_react.g.dart +++ b/test/over_react/component_declaration/flux_component_test/component2/flux_component_test.over_react.g.dart @@ -18,7 +18,7 @@ final $TestBasicComponentFactory = registerComponent2( parentType: null, ); -abstract class _$TestBasicPropsAccessorsMixin implements _$TestBasicProps { +mixin _$TestBasicPropsAccessorsMixin implements _$TestBasicProps { @override Map get props; @@ -172,7 +172,7 @@ final $TestHandlerLifecycleComponentFactory = registerComponent2( parentType: null, ); -abstract class _$TestHandlerLifecyclePropsAccessorsMixin +mixin _$TestHandlerLifecyclePropsAccessorsMixin implements _$TestHandlerLifecycleProps { @override Map get props; @@ -330,7 +330,7 @@ final $TestHandlerPrecedenceComponentFactory = registerComponent2( parentType: null, ); -abstract class _$TestHandlerPrecedencePropsAccessorsMixin +mixin _$TestHandlerPrecedencePropsAccessorsMixin implements _$TestHandlerPrecedenceProps { @override Map get props; @@ -490,7 +490,7 @@ final $TestPropValidationComponentFactory = registerComponent2( parentType: null, ); -abstract class _$TestPropValidationPropsAccessorsMixin +mixin _$TestPropValidationPropsAccessorsMixin implements _$TestPropValidationProps { @override Map get props; @@ -667,8 +667,7 @@ final $TestRedrawOnComponentFactory = registerComponent2( parentType: null, ); -abstract class _$TestRedrawOnPropsAccessorsMixin - implements _$TestRedrawOnProps { +mixin _$TestRedrawOnPropsAccessorsMixin implements _$TestRedrawOnProps { @override Map get props; @@ -822,7 +821,7 @@ final $TestStoreHandlersComponentFactory = registerComponent2( parentType: null, ); -abstract class _$TestStoreHandlersPropsAccessorsMixin +mixin _$TestStoreHandlersPropsAccessorsMixin implements _$TestStoreHandlersProps { @override Map get props; @@ -979,7 +978,7 @@ final $TestStatefulBasicComponentFactory = registerComponent2( parentType: null, ); -abstract class _$TestStatefulBasicPropsAccessorsMixin +mixin _$TestStatefulBasicPropsAccessorsMixin implements _$TestStatefulBasicProps { @override Map get props; @@ -1077,7 +1076,7 @@ class _$$TestStatefulBasicProps$JsMap extends _$$TestStatefulBasicProps { JsBackedMap _props; } -abstract class _$TestStatefulBasicStateAccessorsMixin +mixin _$TestStatefulBasicStateAccessorsMixin implements _$TestStatefulBasicState { @override Map get state; @@ -1234,7 +1233,7 @@ final $TestStatefulHandlerLifecycleComponentFactory = registerComponent2( parentType: null, ); -abstract class _$TestStatefulHandlerLifecyclePropsAccessorsMixin +mixin _$TestStatefulHandlerLifecyclePropsAccessorsMixin implements _$TestStatefulHandlerLifecycleProps { @override Map get props; @@ -1338,7 +1337,7 @@ class _$$TestStatefulHandlerLifecycleProps$JsMap JsBackedMap _props; } -abstract class _$TestStatefulHandlerLifecycleStateAccessorsMixin +mixin _$TestStatefulHandlerLifecycleStateAccessorsMixin implements _$TestStatefulHandlerLifecycleState { @override Map get state; @@ -1501,7 +1500,7 @@ final $TestStatefulHandlerPrecedenceComponentFactory = registerComponent2( parentType: null, ); -abstract class _$TestStatefulHandlerPrecedencePropsAccessorsMixin +mixin _$TestStatefulHandlerPrecedencePropsAccessorsMixin implements _$TestStatefulHandlerPrecedenceProps { @override Map get props; @@ -1605,7 +1604,7 @@ class _$$TestStatefulHandlerPrecedenceProps$JsMap JsBackedMap _props; } -abstract class _$TestStatefulHandlerPrecedenceStateAccessorsMixin +mixin _$TestStatefulHandlerPrecedenceStateAccessorsMixin implements _$TestStatefulHandlerPrecedenceState { @override Map get state; @@ -1768,7 +1767,7 @@ final $TestStatefulPropValidationComponentFactory = registerComponent2( parentType: null, ); -abstract class _$TestStatefulPropValidationPropsAccessorsMixin +mixin _$TestStatefulPropValidationPropsAccessorsMixin implements _$TestStatefulPropValidationProps { @override Map get props; @@ -1895,7 +1894,7 @@ class _$$TestStatefulPropValidationProps$JsMap JsBackedMap _props; } -abstract class _$TestStatefulPropValidationStateAccessorsMixin +mixin _$TestStatefulPropValidationStateAccessorsMixin implements _$TestStatefulPropValidationState { @override Map get state; @@ -2057,7 +2056,7 @@ final $TestStatefulRedrawOnComponentFactory = registerComponent2( parentType: null, ); -abstract class _$TestStatefulRedrawOnPropsAccessorsMixin +mixin _$TestStatefulRedrawOnPropsAccessorsMixin implements _$TestStatefulRedrawOnProps { @override Map get props; @@ -2156,7 +2155,7 @@ class _$$TestStatefulRedrawOnProps$JsMap extends _$$TestStatefulRedrawOnProps { JsBackedMap _props; } -abstract class _$TestStatefulRedrawOnStateAccessorsMixin +mixin _$TestStatefulRedrawOnStateAccessorsMixin implements _$TestStatefulRedrawOnState { @override Map get state; @@ -2314,7 +2313,7 @@ final $TestStatefulStoreHandlersComponentFactory = registerComponent2( parentType: null, ); -abstract class _$TestStatefulStoreHandlersPropsAccessorsMixin +mixin _$TestStatefulStoreHandlersPropsAccessorsMixin implements _$TestStatefulStoreHandlersProps { @override Map get props; @@ -2417,7 +2416,7 @@ class _$$TestStatefulStoreHandlersProps$JsMap JsBackedMap _props; } -abstract class _$TestStatefulStoreHandlersStateAccessorsMixin +mixin _$TestStatefulStoreHandlersStateAccessorsMixin implements _$TestStatefulStoreHandlersState { @override Map get state; diff --git a/test/over_react/component_declaration/flux_component_test/flux_component_test.over_react.g.dart b/test/over_react/component_declaration/flux_component_test/flux_component_test.over_react.g.dart index 46b885c06..becc9f159 100644 --- a/test/over_react/component_declaration/flux_component_test/flux_component_test.over_react.g.dart +++ b/test/over_react/component_declaration/flux_component_test/flux_component_test.over_react.g.dart @@ -18,7 +18,7 @@ final $TestBasicComponentFactory = registerComponent( parentType: null, ); -abstract class _$TestBasicPropsAccessorsMixin implements _$TestBasicProps { +mixin _$TestBasicPropsAccessorsMixin implements _$TestBasicProps { @override Map get props; @@ -116,7 +116,7 @@ final $TestHandlerLifecycleComponentFactory = registerComponent( parentType: null, ); -abstract class _$TestHandlerLifecyclePropsAccessorsMixin +mixin _$TestHandlerLifecyclePropsAccessorsMixin implements _$TestHandlerLifecycleProps { @override Map get props; @@ -215,7 +215,7 @@ final $TestHandlerPrecedenceComponentFactory = registerComponent( parentType: null, ); -abstract class _$TestHandlerPrecedencePropsAccessorsMixin +mixin _$TestHandlerPrecedencePropsAccessorsMixin implements _$TestHandlerPrecedenceProps { @override Map get props; @@ -314,7 +314,7 @@ final $TestPropValidationComponentFactory = registerComponent( parentType: null, ); -abstract class _$TestPropValidationPropsAccessorsMixin +mixin _$TestPropValidationPropsAccessorsMixin implements _$TestPropValidationProps { @override Map get props; @@ -433,8 +433,7 @@ final $TestRedrawOnComponentFactory = registerComponent( parentType: null, ); -abstract class _$TestRedrawOnPropsAccessorsMixin - implements _$TestRedrawOnProps { +mixin _$TestRedrawOnPropsAccessorsMixin implements _$TestRedrawOnProps { @override Map get props; @@ -532,7 +531,7 @@ final $TestStoreHandlersComponentFactory = registerComponent( parentType: null, ); -abstract class _$TestStoreHandlersPropsAccessorsMixin +mixin _$TestStoreHandlersPropsAccessorsMixin implements _$TestStoreHandlersProps { @override Map get props; @@ -631,7 +630,7 @@ final $TestStatefulBasicComponentFactory = registerComponent( parentType: null, ); -abstract class _$TestStatefulBasicPropsAccessorsMixin +mixin _$TestStatefulBasicPropsAccessorsMixin implements _$TestStatefulBasicProps { @override Map get props; @@ -694,8 +693,7 @@ class _$$TestStatefulBasicProps extends _$TestStatefulBasicProps /// An alias for [getPropKey] so it can be referenced within the props class impl /// without being shadowed by the `getPropKey` instance extension member. const _$getPropKey$_$$TestStatefulBasicProps = getPropKey; - -abstract class _$TestStatefulBasicStateAccessorsMixin +mixin _$TestStatefulBasicStateAccessorsMixin implements _$TestStatefulBasicState { @override Map get state; @@ -777,7 +775,7 @@ final $TestStatefulHandlerLifecycleComponentFactory = registerComponent( parentType: null, ); -abstract class _$TestStatefulHandlerLifecyclePropsAccessorsMixin +mixin _$TestStatefulHandlerLifecyclePropsAccessorsMixin implements _$TestStatefulHandlerLifecycleProps { @override Map get props; @@ -843,8 +841,7 @@ class _$$TestStatefulHandlerLifecycleProps /// An alias for [getPropKey] so it can be referenced within the props class impl /// without being shadowed by the `getPropKey` instance extension member. const _$getPropKey$_$$TestStatefulHandlerLifecycleProps = getPropKey; - -abstract class _$TestStatefulHandlerLifecycleStateAccessorsMixin +mixin _$TestStatefulHandlerLifecycleStateAccessorsMixin implements _$TestStatefulHandlerLifecycleState { @override Map get state; @@ -929,7 +926,7 @@ final $TestStatefulHandlerPrecedenceComponentFactory = registerComponent( parentType: null, ); -abstract class _$TestStatefulHandlerPrecedencePropsAccessorsMixin +mixin _$TestStatefulHandlerPrecedencePropsAccessorsMixin implements _$TestStatefulHandlerPrecedenceProps { @override Map get props; @@ -995,8 +992,7 @@ class _$$TestStatefulHandlerPrecedenceProps /// An alias for [getPropKey] so it can be referenced within the props class impl /// without being shadowed by the `getPropKey` instance extension member. const _$getPropKey$_$$TestStatefulHandlerPrecedenceProps = getPropKey; - -abstract class _$TestStatefulHandlerPrecedenceStateAccessorsMixin +mixin _$TestStatefulHandlerPrecedenceStateAccessorsMixin implements _$TestStatefulHandlerPrecedenceState { @override Map get state; @@ -1081,7 +1077,7 @@ final $TestStatefulPropValidationComponentFactory = registerComponent( parentType: null, ); -abstract class _$TestStatefulPropValidationPropsAccessorsMixin +mixin _$TestStatefulPropValidationPropsAccessorsMixin implements _$TestStatefulPropValidationProps { @override Map get props; @@ -1170,8 +1166,7 @@ class _$$TestStatefulPropValidationProps /// An alias for [getPropKey] so it can be referenced within the props class impl /// without being shadowed by the `getPropKey` instance extension member. const _$getPropKey$_$$TestStatefulPropValidationProps = getPropKey; - -abstract class _$TestStatefulPropValidationStateAccessorsMixin +mixin _$TestStatefulPropValidationStateAccessorsMixin implements _$TestStatefulPropValidationState { @override Map get state; @@ -1255,7 +1250,7 @@ final $TestStatefulRedrawOnComponentFactory = registerComponent( parentType: null, ); -abstract class _$TestStatefulRedrawOnPropsAccessorsMixin +mixin _$TestStatefulRedrawOnPropsAccessorsMixin implements _$TestStatefulRedrawOnProps { @override Map get props; @@ -1318,8 +1313,7 @@ class _$$TestStatefulRedrawOnProps extends _$TestStatefulRedrawOnProps /// An alias for [getPropKey] so it can be referenced within the props class impl /// without being shadowed by the `getPropKey` instance extension member. const _$getPropKey$_$$TestStatefulRedrawOnProps = getPropKey; - -abstract class _$TestStatefulRedrawOnStateAccessorsMixin +mixin _$TestStatefulRedrawOnStateAccessorsMixin implements _$TestStatefulRedrawOnState { @override Map get state; @@ -1401,7 +1395,7 @@ final $TestStatefulStoreHandlersComponentFactory = registerComponent( parentType: null, ); -abstract class _$TestStatefulStoreHandlersPropsAccessorsMixin +mixin _$TestStatefulStoreHandlersPropsAccessorsMixin implements _$TestStatefulStoreHandlersProps { @override Map get props; @@ -1465,8 +1459,7 @@ class _$$TestStatefulStoreHandlersProps extends _$TestStatefulStoreHandlersProps /// An alias for [getPropKey] so it can be referenced within the props class impl /// without being shadowed by the `getPropKey` instance extension member. const _$getPropKey$_$$TestStatefulStoreHandlersProps = getPropKey; - -abstract class _$TestStatefulStoreHandlersStateAccessorsMixin +mixin _$TestStatefulStoreHandlersStateAccessorsMixin implements _$TestStatefulStoreHandlersState { @override Map get state; diff --git a/test/over_react/component_declaration/non_null_safe_builder_integration_tests/abstract_accessor_integration_test.over_react.g.dart b/test/over_react/component_declaration/non_null_safe_builder_integration_tests/abstract_accessor_integration_test.over_react.g.dart index 07483ff73..c36da849e 100644 --- a/test/over_react/component_declaration/non_null_safe_builder_integration_tests/abstract_accessor_integration_test.over_react.g.dart +++ b/test/over_react/component_declaration/non_null_safe_builder_integration_tests/abstract_accessor_integration_test.over_react.g.dart @@ -8,8 +8,7 @@ part of 'abstract_accessor_integration_test.dart'; // OverReactBuilder (package:over_react/src/builder.dart) // ************************************************************************** -abstract class _$TestAbstractPropsAccessorsMixin - implements _$TestAbstractProps { +mixin _$TestAbstractPropsAccessorsMixin implements _$TestAbstractProps { @override Map get props; @@ -134,7 +133,7 @@ abstract class TestAbstractProps extends _$TestAbstractProps static const PropsMeta meta = _$metaForTestAbstractProps; } -abstract class _$TestCustomNamespaceAbstractPropsAccessorsMixin +mixin _$TestCustomNamespaceAbstractPropsAccessorsMixin implements _$TestCustomNamespaceAbstractProps { @override Map get props; @@ -276,8 +275,7 @@ abstract class TestCustomNamespaceAbstractProps static const PropsMeta meta = _$metaForTestCustomNamespaceAbstractProps; } -abstract class _$TestAbstractStateAccessorsMixin - implements _$TestAbstractState { +mixin _$TestAbstractStateAccessorsMixin implements _$TestAbstractState { @override Map get state; @@ -403,7 +401,7 @@ abstract class TestAbstractState extends _$TestAbstractState static const StateMeta meta = _$metaForTestAbstractState; } -abstract class _$TestCustomNamespaceAbstractStateAccessorsMixin +mixin _$TestCustomNamespaceAbstractStateAccessorsMixin implements _$TestCustomNamespaceAbstractState { @override Map get state; diff --git a/test/over_react/component_declaration/non_null_safe_builder_integration_tests/accessor_mixin_integration_test.over_react.g.dart b/test/over_react/component_declaration/non_null_safe_builder_integration_tests/accessor_mixin_integration_test.over_react.g.dart index afc10e5b4..01dfcab0b 100644 --- a/test/over_react/component_declaration/non_null_safe_builder_integration_tests/accessor_mixin_integration_test.over_react.g.dart +++ b/test/over_react/component_declaration/non_null_safe_builder_integration_tests/accessor_mixin_integration_test.over_react.g.dart @@ -8,7 +8,7 @@ part of 'accessor_mixin_integration_test.dart'; // OverReactBuilder (package:over_react/src/builder.dart) // ************************************************************************** -abstract class TestPropsMixin implements _$TestPropsMixin { +mixin TestPropsMixin implements _$TestPropsMixin { @override Map get props; @@ -128,8 +128,7 @@ const PropsMeta _$metaForTestPropsMixin = PropsMeta( keys: TestPropsMixin.$propKeys, ); -abstract class TestCustomNamespacePropsMixin - implements _$TestCustomNamespacePropsMixin { +mixin TestCustomNamespacePropsMixin implements _$TestCustomNamespacePropsMixin { @override Map get props; @@ -266,7 +265,7 @@ const PropsMeta _$metaForTestCustomNamespacePropsMixin = PropsMeta( keys: TestCustomNamespacePropsMixin.$propKeys, ); -abstract class TestStateMixin implements _$TestStateMixin { +mixin TestStateMixin implements _$TestStateMixin { @override Map get state; @@ -387,8 +386,7 @@ const StateMeta _$metaForTestStateMixin = StateMeta( keys: TestStateMixin.$stateKeys, ); -abstract class TestCustomNamespaceStateMixin - implements _$TestCustomNamespaceStateMixin { +mixin TestCustomNamespaceStateMixin implements _$TestCustomNamespaceStateMixin { @override Map get state; diff --git a/test/over_react/component_declaration/non_null_safe_builder_integration_tests/component2/abstract_accessor_integration_test.over_react.g.dart b/test/over_react/component_declaration/non_null_safe_builder_integration_tests/component2/abstract_accessor_integration_test.over_react.g.dart index 07483ff73..c36da849e 100644 --- a/test/over_react/component_declaration/non_null_safe_builder_integration_tests/component2/abstract_accessor_integration_test.over_react.g.dart +++ b/test/over_react/component_declaration/non_null_safe_builder_integration_tests/component2/abstract_accessor_integration_test.over_react.g.dart @@ -8,8 +8,7 @@ part of 'abstract_accessor_integration_test.dart'; // OverReactBuilder (package:over_react/src/builder.dart) // ************************************************************************** -abstract class _$TestAbstractPropsAccessorsMixin - implements _$TestAbstractProps { +mixin _$TestAbstractPropsAccessorsMixin implements _$TestAbstractProps { @override Map get props; @@ -134,7 +133,7 @@ abstract class TestAbstractProps extends _$TestAbstractProps static const PropsMeta meta = _$metaForTestAbstractProps; } -abstract class _$TestCustomNamespaceAbstractPropsAccessorsMixin +mixin _$TestCustomNamespaceAbstractPropsAccessorsMixin implements _$TestCustomNamespaceAbstractProps { @override Map get props; @@ -276,8 +275,7 @@ abstract class TestCustomNamespaceAbstractProps static const PropsMeta meta = _$metaForTestCustomNamespaceAbstractProps; } -abstract class _$TestAbstractStateAccessorsMixin - implements _$TestAbstractState { +mixin _$TestAbstractStateAccessorsMixin implements _$TestAbstractState { @override Map get state; @@ -403,7 +401,7 @@ abstract class TestAbstractState extends _$TestAbstractState static const StateMeta meta = _$metaForTestAbstractState; } -abstract class _$TestCustomNamespaceAbstractStateAccessorsMixin +mixin _$TestCustomNamespaceAbstractStateAccessorsMixin implements _$TestCustomNamespaceAbstractState { @override Map get state; diff --git a/test/over_react/component_declaration/non_null_safe_builder_integration_tests/component2/accessor_mixin_integration_test.over_react.g.dart b/test/over_react/component_declaration/non_null_safe_builder_integration_tests/component2/accessor_mixin_integration_test.over_react.g.dart index afc10e5b4..01dfcab0b 100644 --- a/test/over_react/component_declaration/non_null_safe_builder_integration_tests/component2/accessor_mixin_integration_test.over_react.g.dart +++ b/test/over_react/component_declaration/non_null_safe_builder_integration_tests/component2/accessor_mixin_integration_test.over_react.g.dart @@ -8,7 +8,7 @@ part of 'accessor_mixin_integration_test.dart'; // OverReactBuilder (package:over_react/src/builder.dart) // ************************************************************************** -abstract class TestPropsMixin implements _$TestPropsMixin { +mixin TestPropsMixin implements _$TestPropsMixin { @override Map get props; @@ -128,8 +128,7 @@ const PropsMeta _$metaForTestPropsMixin = PropsMeta( keys: TestPropsMixin.$propKeys, ); -abstract class TestCustomNamespacePropsMixin - implements _$TestCustomNamespacePropsMixin { +mixin TestCustomNamespacePropsMixin implements _$TestCustomNamespacePropsMixin { @override Map get props; @@ -266,7 +265,7 @@ const PropsMeta _$metaForTestCustomNamespacePropsMixin = PropsMeta( keys: TestCustomNamespacePropsMixin.$propKeys, ); -abstract class TestStateMixin implements _$TestStateMixin { +mixin TestStateMixin implements _$TestStateMixin { @override Map get state; @@ -387,8 +386,7 @@ const StateMeta _$metaForTestStateMixin = StateMeta( keys: TestStateMixin.$stateKeys, ); -abstract class TestCustomNamespaceStateMixin - implements _$TestCustomNamespaceStateMixin { +mixin TestCustomNamespaceStateMixin implements _$TestCustomNamespaceStateMixin { @override Map get state; diff --git a/test/over_react/component_declaration/non_null_safe_builder_integration_tests/component2/annotation_error_integration_test.over_react.g.dart b/test/over_react/component_declaration/non_null_safe_builder_integration_tests/component2/annotation_error_integration_test.over_react.g.dart index 280b528eb..83cacb474 100644 --- a/test/over_react/component_declaration/non_null_safe_builder_integration_tests/component2/annotation_error_integration_test.over_react.g.dart +++ b/test/over_react/component_declaration/non_null_safe_builder_integration_tests/component2/annotation_error_integration_test.over_react.g.dart @@ -19,7 +19,7 @@ final $AnnotationErrorDefaultPropsComponentFactory = registerComponent( parentType: null, ); -abstract class _$AnnotationErrorDefaultPropsPropsAccessorsMixin +mixin _$AnnotationErrorDefaultPropsPropsAccessorsMixin implements _$AnnotationErrorDefaultPropsProps { @override Map get props; @@ -131,8 +131,7 @@ final $AnnotationErrorComponentFactory = registerComponent( parentType: null, ); -abstract class _$AnnotationErrorPropsAccessorsMixin - implements _$AnnotationErrorProps { +mixin _$AnnotationErrorPropsAccessorsMixin implements _$AnnotationErrorProps { @override Map get props; @@ -236,7 +235,7 @@ final $AnnotationErrorStatefulComponentFactory = registerComponent( parentType: null, ); -abstract class _$AnnotationErrorStatefulPropsAccessorsMixin +mixin _$AnnotationErrorStatefulPropsAccessorsMixin implements _$AnnotationErrorStatefulProps { @override Map get props; @@ -305,8 +304,7 @@ class _$$AnnotationErrorStatefulProps extends _$AnnotationErrorStatefulProps /// An alias for [getPropKey] so it can be referenced within the props class impl /// without being shadowed by the `getPropKey` instance extension member. const _$getPropKey$_$$AnnotationErrorStatefulProps = getPropKey; - -abstract class _$AnnotationErrorStatefulStateAccessorsMixin +mixin _$AnnotationErrorStatefulStateAccessorsMixin implements _$AnnotationErrorStatefulState { @override Map get state; @@ -389,7 +387,7 @@ final $AnnotationErrorStatefulDefaultPropsComponentFactory = registerComponent( parentType: null, ); -abstract class _$AnnotationErrorStatefulDefaultPropsPropsAccessorsMixin +mixin _$AnnotationErrorStatefulDefaultPropsPropsAccessorsMixin implements _$AnnotationErrorStatefulDefaultPropsProps { @override Map get props; @@ -467,8 +465,7 @@ class _$$AnnotationErrorStatefulDefaultPropsProps /// An alias for [getPropKey] so it can be referenced within the props class impl /// without being shadowed by the `getPropKey` instance extension member. const _$getPropKey$_$$AnnotationErrorStatefulDefaultPropsProps = getPropKey; - -abstract class _$AnnotationErrorStatefulDefaultPropsStateAccessorsMixin +mixin _$AnnotationErrorStatefulDefaultPropsStateAccessorsMixin implements _$AnnotationErrorStatefulDefaultPropsState { @override Map get state; diff --git a/test/over_react/component_declaration/non_null_safe_builder_integration_tests/component2/component_integration_test.over_react.g.dart b/test/over_react/component_declaration/non_null_safe_builder_integration_tests/component2/component_integration_test.over_react.g.dart index 47d7ab1d3..47b42efe0 100644 --- a/test/over_react/component_declaration/non_null_safe_builder_integration_tests/component2/component_integration_test.over_react.g.dart +++ b/test/over_react/component_declaration/non_null_safe_builder_integration_tests/component2/component_integration_test.over_react.g.dart @@ -19,8 +19,7 @@ final $ComponentTestComponentFactory = registerComponent2( parentType: null, ); -abstract class _$ComponentTestPropsAccessorsMixin - implements _$ComponentTestProps { +mixin _$ComponentTestPropsAccessorsMixin implements _$ComponentTestProps { @override Map get props; @@ -326,8 +325,7 @@ final $IsErrorBoundaryComponentFactory = registerComponent2( skipMethods: const [], ); -abstract class _$IsErrorBoundaryPropsAccessorsMixin - implements _$IsErrorBoundaryProps { +mixin _$IsErrorBoundaryPropsAccessorsMixin implements _$IsErrorBoundaryProps { @override Map get props; @@ -488,7 +486,7 @@ final $IsNotErrorBoundaryComponentFactory = registerComponent2( parentType: null, ); -abstract class _$IsNotErrorBoundaryPropsAccessorsMixin +mixin _$IsNotErrorBoundaryPropsAccessorsMixin implements _$IsNotErrorBoundaryProps { @override Map get props; diff --git a/test/over_react/component_declaration/non_null_safe_builder_integration_tests/component2/constant_required_accessor_integration_test.over_react.g.dart b/test/over_react/component_declaration/non_null_safe_builder_integration_tests/component2/constant_required_accessor_integration_test.over_react.g.dart index df8aa9061..e66ea6db4 100644 --- a/test/over_react/component_declaration/non_null_safe_builder_integration_tests/component2/constant_required_accessor_integration_test.over_react.g.dart +++ b/test/over_react/component_declaration/non_null_safe_builder_integration_tests/component2/constant_required_accessor_integration_test.over_react.g.dart @@ -19,8 +19,7 @@ final $ComponentTestComponentFactory = registerComponent2( parentType: null, ); -abstract class _$ComponentTestPropsAccessorsMixin - implements _$ComponentTestProps { +mixin _$ComponentTestPropsAccessorsMixin implements _$ComponentTestProps { @override Map get props; diff --git a/test/over_react/component_declaration/non_null_safe_builder_integration_tests/component2/do_not_generate_accessor_integration_test.over_react.g.dart b/test/over_react/component_declaration/non_null_safe_builder_integration_tests/component2/do_not_generate_accessor_integration_test.over_react.g.dart index 2034393b6..408760823 100644 --- a/test/over_react/component_declaration/non_null_safe_builder_integration_tests/component2/do_not_generate_accessor_integration_test.over_react.g.dart +++ b/test/over_react/component_declaration/non_null_safe_builder_integration_tests/component2/do_not_generate_accessor_integration_test.over_react.g.dart @@ -19,7 +19,7 @@ final $DoNotGenerateAccessorTestComponentFactory = registerComponent2( parentType: null, ); -abstract class _$DoNotGenerateAccessorTestPropsAccessorsMixin +mixin _$DoNotGenerateAccessorTestPropsAccessorsMixin implements _$DoNotGenerateAccessorTestProps { @override Map get props; @@ -187,7 +187,7 @@ class _$$DoNotGenerateAccessorTestProps$JsMap JsBackedMap _props; } -abstract class _$DoNotGenerateAccessorTestStateAccessorsMixin +mixin _$DoNotGenerateAccessorTestStateAccessorsMixin implements _$DoNotGenerateAccessorTestState { @override Map get state; diff --git a/test/over_react/component_declaration/non_null_safe_builder_integration_tests/component2/namespaced_accessor_integration_test.over_react.g.dart b/test/over_react/component_declaration/non_null_safe_builder_integration_tests/component2/namespaced_accessor_integration_test.over_react.g.dart index 6a3cc75dd..549fc2786 100644 --- a/test/over_react/component_declaration/non_null_safe_builder_integration_tests/component2/namespaced_accessor_integration_test.over_react.g.dart +++ b/test/over_react/component_declaration/non_null_safe_builder_integration_tests/component2/namespaced_accessor_integration_test.over_react.g.dart @@ -19,7 +19,7 @@ final $NamespacedAccessorTestComponentFactory = registerComponent2( parentType: null, ); -abstract class _$NamespacedAccessorTestPropsAccessorsMixin +mixin _$NamespacedAccessorTestPropsAccessorsMixin implements _$NamespacedAccessorTestProps { @override Map get props; @@ -244,7 +244,7 @@ class _$$NamespacedAccessorTestProps$JsMap JsBackedMap _props; } -abstract class _$NamespacedAccessorTestStateAccessorsMixin +mixin _$NamespacedAccessorTestStateAccessorsMixin implements _$NamespacedAccessorTestState { @override Map get state; diff --git a/test/over_react/component_declaration/non_null_safe_builder_integration_tests/component2/private_props_ddc_bug.over_react.g.dart b/test/over_react/component_declaration/non_null_safe_builder_integration_tests/component2/private_props_ddc_bug.over_react.g.dart index 0e4b7aa67..f1b07f847 100644 --- a/test/over_react/component_declaration/non_null_safe_builder_integration_tests/component2/private_props_ddc_bug.over_react.g.dart +++ b/test/over_react/component_declaration/non_null_safe_builder_integration_tests/component2/private_props_ddc_bug.over_react.g.dart @@ -19,7 +19,7 @@ final $FooComponentFactory = registerComponent2( parentType: null, ); -abstract class _$FooPropsAccessorsMixin implements _$FooProps { +mixin _$FooPropsAccessorsMixin implements _$FooProps { @override Map get props; diff --git a/test/over_react/component_declaration/non_null_safe_builder_integration_tests/component2/required_accessor_integration_test.over_react.g.dart b/test/over_react/component_declaration/non_null_safe_builder_integration_tests/component2/required_accessor_integration_test.over_react.g.dart index c9384f8d0..592153477 100644 --- a/test/over_react/component_declaration/non_null_safe_builder_integration_tests/component2/required_accessor_integration_test.over_react.g.dart +++ b/test/over_react/component_declaration/non_null_safe_builder_integration_tests/component2/required_accessor_integration_test.over_react.g.dart @@ -19,8 +19,7 @@ final $ComponentTestComponentFactory = registerComponent2( parentType: null, ); -abstract class _$ComponentTestPropsAccessorsMixin - implements _$ComponentTestProps { +mixin _$ComponentTestPropsAccessorsMixin implements _$ComponentTestProps { @override Map get props; diff --git a/test/over_react/component_declaration/non_null_safe_builder_integration_tests/component2/stateful_component_integration_test.over_react.g.dart b/test/over_react/component_declaration/non_null_safe_builder_integration_tests/component2/stateful_component_integration_test.over_react.g.dart index e6306cda3..534a62315 100644 --- a/test/over_react/component_declaration/non_null_safe_builder_integration_tests/component2/stateful_component_integration_test.over_react.g.dart +++ b/test/over_react/component_declaration/non_null_safe_builder_integration_tests/component2/stateful_component_integration_test.over_react.g.dart @@ -19,7 +19,7 @@ final $StatefulComponentTestComponentFactory = registerComponent2( parentType: null, ); -abstract class _$StatefulComponentTestPropsAccessorsMixin +mixin _$StatefulComponentTestPropsAccessorsMixin implements _$StatefulComponentTestProps { @override Map get props; @@ -153,7 +153,7 @@ class _$$StatefulComponentTestProps$JsMap JsBackedMap _props; } -abstract class _$StatefulComponentTestStateAccessorsMixin +mixin _$StatefulComponentTestStateAccessorsMixin implements _$StatefulComponentTestState { @override Map get state; diff --git a/test/over_react/component_declaration/non_null_safe_builder_integration_tests/component2/unassigned_prop_integration_test.over_react.g.dart b/test/over_react/component_declaration/non_null_safe_builder_integration_tests/component2/unassigned_prop_integration_test.over_react.g.dart index c19b33235..cb10db046 100644 --- a/test/over_react/component_declaration/non_null_safe_builder_integration_tests/component2/unassigned_prop_integration_test.over_react.g.dart +++ b/test/over_react/component_declaration/non_null_safe_builder_integration_tests/component2/unassigned_prop_integration_test.over_react.g.dart @@ -19,7 +19,7 @@ final $FooComponentFactory = registerComponent2( parentType: null, ); -abstract class _$FooPropsAccessorsMixin implements _$FooProps { +mixin _$FooPropsAccessorsMixin implements _$FooProps { @override Map get props; diff --git a/test/over_react/component_declaration/non_null_safe_builder_integration_tests/component_integration_test.over_react.g.dart b/test/over_react/component_declaration/non_null_safe_builder_integration_tests/component_integration_test.over_react.g.dart index 5fd1f8ca3..c54c81425 100644 --- a/test/over_react/component_declaration/non_null_safe_builder_integration_tests/component_integration_test.over_react.g.dart +++ b/test/over_react/component_declaration/non_null_safe_builder_integration_tests/component_integration_test.over_react.g.dart @@ -19,8 +19,7 @@ final $ComponentTestComponentFactory = registerComponent( parentType: null, ); -abstract class _$ComponentTestPropsAccessorsMixin - implements _$ComponentTestProps { +mixin _$ComponentTestPropsAccessorsMixin implements _$ComponentTestProps { @override Map get props; diff --git a/test/over_react/component_declaration/non_null_safe_builder_integration_tests/constant_required_accessor_integration_test.over_react.g.dart b/test/over_react/component_declaration/non_null_safe_builder_integration_tests/constant_required_accessor_integration_test.over_react.g.dart index 23bbc64d1..d6801df9e 100644 --- a/test/over_react/component_declaration/non_null_safe_builder_integration_tests/constant_required_accessor_integration_test.over_react.g.dart +++ b/test/over_react/component_declaration/non_null_safe_builder_integration_tests/constant_required_accessor_integration_test.over_react.g.dart @@ -19,8 +19,7 @@ final $ComponentTestComponentFactory = registerComponent( parentType: null, ); -abstract class _$ComponentTestPropsAccessorsMixin - implements _$ComponentTestProps { +mixin _$ComponentTestPropsAccessorsMixin implements _$ComponentTestProps { @override Map get props; diff --git a/test/over_react/component_declaration/non_null_safe_builder_integration_tests/do_not_generate_accessor_integration_test.over_react.g.dart b/test/over_react/component_declaration/non_null_safe_builder_integration_tests/do_not_generate_accessor_integration_test.over_react.g.dart index 2497eb58d..f43a7f8f8 100644 --- a/test/over_react/component_declaration/non_null_safe_builder_integration_tests/do_not_generate_accessor_integration_test.over_react.g.dart +++ b/test/over_react/component_declaration/non_null_safe_builder_integration_tests/do_not_generate_accessor_integration_test.over_react.g.dart @@ -19,7 +19,7 @@ final $DoNotGenerateAccessorTestComponentFactory = registerComponent( parentType: null, ); -abstract class _$DoNotGenerateAccessorTestPropsAccessorsMixin +mixin _$DoNotGenerateAccessorTestPropsAccessorsMixin implements _$DoNotGenerateAccessorTestProps { @override Map get props; @@ -149,8 +149,7 @@ class _$$DoNotGenerateAccessorTestProps extends _$DoNotGenerateAccessorTestProps /// An alias for [getPropKey] so it can be referenced within the props class impl /// without being shadowed by the `getPropKey` instance extension member. const _$getPropKey$_$$DoNotGenerateAccessorTestProps = getPropKey; - -abstract class _$DoNotGenerateAccessorTestStateAccessorsMixin +mixin _$DoNotGenerateAccessorTestStateAccessorsMixin implements _$DoNotGenerateAccessorTestState { @override Map get state; diff --git a/test/over_react/component_declaration/non_null_safe_builder_integration_tests/namespaced_accessor_integration_test.over_react.g.dart b/test/over_react/component_declaration/non_null_safe_builder_integration_tests/namespaced_accessor_integration_test.over_react.g.dart index 74a533cba..e350260fd 100644 --- a/test/over_react/component_declaration/non_null_safe_builder_integration_tests/namespaced_accessor_integration_test.over_react.g.dart +++ b/test/over_react/component_declaration/non_null_safe_builder_integration_tests/namespaced_accessor_integration_test.over_react.g.dart @@ -19,7 +19,7 @@ final $NamespacedAccessorTestComponentFactory = registerComponent( parentType: null, ); -abstract class _$NamespacedAccessorTestPropsAccessorsMixin +mixin _$NamespacedAccessorTestPropsAccessorsMixin implements _$NamespacedAccessorTestProps { @override Map get props; @@ -206,8 +206,7 @@ class _$$NamespacedAccessorTestProps extends _$NamespacedAccessorTestProps /// An alias for [getPropKey] so it can be referenced within the props class impl /// without being shadowed by the `getPropKey` instance extension member. const _$getPropKey$_$$NamespacedAccessorTestProps = getPropKey; - -abstract class _$NamespacedAccessorTestStateAccessorsMixin +mixin _$NamespacedAccessorTestStateAccessorsMixin implements _$NamespacedAccessorTestState { @override Map get state; diff --git a/test/over_react/component_declaration/non_null_safe_builder_integration_tests/private_props_ddc_bug.over_react.g.dart b/test/over_react/component_declaration/non_null_safe_builder_integration_tests/private_props_ddc_bug.over_react.g.dart index 9b0596f0c..e1ee25e58 100644 --- a/test/over_react/component_declaration/non_null_safe_builder_integration_tests/private_props_ddc_bug.over_react.g.dart +++ b/test/over_react/component_declaration/non_null_safe_builder_integration_tests/private_props_ddc_bug.over_react.g.dart @@ -19,7 +19,7 @@ final $FooComponentFactory = registerComponent( parentType: null, ); -abstract class _$FooPropsAccessorsMixin implements _$FooProps { +mixin _$FooPropsAccessorsMixin implements _$FooProps { @override Map get props; diff --git a/test/over_react/component_declaration/non_null_safe_builder_integration_tests/required_accessor_integration_test.over_react.g.dart b/test/over_react/component_declaration/non_null_safe_builder_integration_tests/required_accessor_integration_test.over_react.g.dart index 620cef07c..49ac0d994 100644 --- a/test/over_react/component_declaration/non_null_safe_builder_integration_tests/required_accessor_integration_test.over_react.g.dart +++ b/test/over_react/component_declaration/non_null_safe_builder_integration_tests/required_accessor_integration_test.over_react.g.dart @@ -19,8 +19,7 @@ final $ComponentTestComponentFactory = registerComponent( parentType: null, ); -abstract class _$ComponentTestPropsAccessorsMixin - implements _$ComponentTestProps { +mixin _$ComponentTestPropsAccessorsMixin implements _$ComponentTestProps { @override Map get props; diff --git a/test/over_react/component_declaration/non_null_safe_builder_integration_tests/stateful_component_integration_test.over_react.g.dart b/test/over_react/component_declaration/non_null_safe_builder_integration_tests/stateful_component_integration_test.over_react.g.dart index c31f665b0..67aebe8a1 100644 --- a/test/over_react/component_declaration/non_null_safe_builder_integration_tests/stateful_component_integration_test.over_react.g.dart +++ b/test/over_react/component_declaration/non_null_safe_builder_integration_tests/stateful_component_integration_test.over_react.g.dart @@ -19,7 +19,7 @@ final $StatefulComponentTestComponentFactory = registerComponent( parentType: null, ); -abstract class _$StatefulComponentTestPropsAccessorsMixin +mixin _$StatefulComponentTestPropsAccessorsMixin implements _$StatefulComponentTestProps { @override Map get props; @@ -88,8 +88,7 @@ class _$$StatefulComponentTestProps extends _$StatefulComponentTestProps /// An alias for [getPropKey] so it can be referenced within the props class impl /// without being shadowed by the `getPropKey` instance extension member. const _$getPropKey$_$$StatefulComponentTestProps = getPropKey; - -abstract class _$StatefulComponentTestStateAccessorsMixin +mixin _$StatefulComponentTestStateAccessorsMixin implements _$StatefulComponentTestState { @override Map get state; diff --git a/test/over_react/component_declaration/non_null_safe_builder_integration_tests/unassigned_prop_integration_test.over_react.g.dart b/test/over_react/component_declaration/non_null_safe_builder_integration_tests/unassigned_prop_integration_test.over_react.g.dart index 3ff1e8529..4ba7da897 100644 --- a/test/over_react/component_declaration/non_null_safe_builder_integration_tests/unassigned_prop_integration_test.over_react.g.dart +++ b/test/over_react/component_declaration/non_null_safe_builder_integration_tests/unassigned_prop_integration_test.over_react.g.dart @@ -19,7 +19,7 @@ final $FooComponentFactory = registerComponent( parentType: null, ); -abstract class _$FooPropsAccessorsMixin implements _$FooProps { +mixin _$FooPropsAccessorsMixin implements _$FooProps { @override Map get props; diff --git a/test/over_react/dom/fixtures/dummy_composite_component.over_react.g.dart b/test/over_react/dom/fixtures/dummy_composite_component.over_react.g.dart index 68e6a21cf..b612f00eb 100644 --- a/test/over_react/dom/fixtures/dummy_composite_component.over_react.g.dart +++ b/test/over_react/dom/fixtures/dummy_composite_component.over_react.g.dart @@ -18,7 +18,7 @@ final $TestCompositeComponentComponentFactory = registerComponent( parentType: null, ); -abstract class _$TestCompositeComponentPropsAccessorsMixin +mixin _$TestCompositeComponentPropsAccessorsMixin implements _$TestCompositeComponentProps { @override Map get props; diff --git a/test/over_react/util/component_debug_name_test.over_react.g.dart b/test/over_react/util/component_debug_name_test.over_react.g.dart index 7715456e8..8eb1be42a 100644 --- a/test/over_react/util/component_debug_name_test.over_react.g.dart +++ b/test/over_react/util/component_debug_name_test.over_react.g.dart @@ -175,8 +175,7 @@ final $TestComponentComponentFactory = registerComponent( parentType: null, ); -abstract class _$TestComponentPropsAccessorsMixin - implements _$TestComponentProps { +mixin _$TestComponentPropsAccessorsMixin implements _$TestComponentProps { @override Map get props; diff --git a/test/over_react/util/dom_util_test.over_react.g.dart b/test/over_react/util/dom_util_test.over_react.g.dart index dcc1d0431..3ab08bce3 100644 --- a/test/over_react/util/dom_util_test.over_react.g.dart +++ b/test/over_react/util/dom_util_test.over_react.g.dart @@ -18,7 +18,7 @@ final $DomTestComponentFactory = registerComponent2( parentType: null, ); -abstract class _$DomTestPropsAccessorsMixin implements _$DomTestProps { +mixin _$DomTestPropsAccessorsMixin implements _$DomTestProps { @override Map get props; diff --git a/test/over_react/util/prop_key_util_test_dart2.over_react.g.dart b/test/over_react/util/prop_key_util_test_dart2.over_react.g.dart index a554ef947..0e80b0f5a 100644 --- a/test/over_react/util/prop_key_util_test_dart2.over_react.g.dart +++ b/test/over_react/util/prop_key_util_test_dart2.over_react.g.dart @@ -18,7 +18,7 @@ final $TestComponentFactory = registerComponent2( parentType: null, ); -abstract class _$TestPropsAccessorsMixin implements _$TestProps { +mixin _$TestPropsAccessorsMixin implements _$TestProps { @override Map get props; diff --git a/test/over_react/util/safe_render_manager/test_component.over_react.g.dart b/test/over_react/util/safe_render_manager/test_component.over_react.g.dart index 42997a960..0bedcb31c 100644 --- a/test/over_react/util/safe_render_manager/test_component.over_react.g.dart +++ b/test/over_react/util/safe_render_manager/test_component.over_react.g.dart @@ -18,7 +18,7 @@ final $TestComponentFactory = registerComponent( parentType: null, ); -abstract class _$TestPropsAccessorsMixin implements _$TestProps { +mixin _$TestPropsAccessorsMixin implements _$TestProps { @override Map get props; diff --git a/test/over_react_redux/fixtures/connect_flux_counter.over_react.g.dart b/test/over_react_redux/fixtures/connect_flux_counter.over_react.g.dart index 83956bea7..4f4e6391d 100644 --- a/test/over_react_redux/fixtures/connect_flux_counter.over_react.g.dart +++ b/test/over_react_redux/fixtures/connect_flux_counter.over_react.g.dart @@ -18,7 +18,7 @@ final $ConnectFluxCounterComponentFactory = registerComponent2( parentType: null, ); -abstract class _$ConnectFluxCounterPropsAccessorsMixin +mixin _$ConnectFluxCounterPropsAccessorsMixin implements _$ConnectFluxCounterProps { @override Map get props; diff --git a/test/over_react_redux/fixtures/counter.over_react.g.dart b/test/over_react_redux/fixtures/counter.over_react.g.dart index b21e7edac..aa09eccf3 100644 --- a/test/over_react_redux/fixtures/counter.over_react.g.dart +++ b/test/over_react_redux/fixtures/counter.over_react.g.dart @@ -18,7 +18,7 @@ final $CounterComponentFactory = registerComponent2( parentType: null, ); -abstract class _$CounterPropsAccessorsMixin implements _$CounterProps { +mixin _$CounterPropsAccessorsMixin implements _$CounterProps { @override Map get props; diff --git a/test/over_react_redux/fixtures/flux_counter.over_react.g.dart b/test/over_react_redux/fixtures/flux_counter.over_react.g.dart index 5e3034ad5..f144401c7 100644 --- a/test/over_react_redux/fixtures/flux_counter.over_react.g.dart +++ b/test/over_react_redux/fixtures/flux_counter.over_react.g.dart @@ -18,7 +18,7 @@ final $FluxCounterComponentFactory = registerComponent2( parentType: null, ); -abstract class _$FluxCounterPropsAccessorsMixin implements _$FluxCounterProps { +mixin _$FluxCounterPropsAccessorsMixin implements _$FluxCounterProps { @override Map get props; diff --git a/test/over_react_redux/fixtures/non_component_two_counter.over_react.g.dart b/test/over_react_redux/fixtures/non_component_two_counter.over_react.g.dart index efe9d051e..5486b354c 100644 --- a/test/over_react_redux/fixtures/non_component_two_counter.over_react.g.dart +++ b/test/over_react_redux/fixtures/non_component_two_counter.over_react.g.dart @@ -18,7 +18,7 @@ final $NonComponentTwoCounterComponentFactory = registerComponent( parentType: null, ); -abstract class _$NonComponentTwoCounterPropsAccessorsMixin +mixin _$NonComponentTwoCounterPropsAccessorsMixin implements _$NonComponentTwoCounterProps { @override Map get props; diff --git a/test/test_util/component2/one_level_wrapper2.over_react.g.dart b/test/test_util/component2/one_level_wrapper2.over_react.g.dart index 77452c3bd..c9b1ab29b 100644 --- a/test/test_util/component2/one_level_wrapper2.over_react.g.dart +++ b/test/test_util/component2/one_level_wrapper2.over_react.g.dart @@ -18,8 +18,7 @@ final $OneLevelWrapper2ComponentFactory = registerComponent2( parentType: null, ); -abstract class _$OneLevelWrapper2PropsAccessorsMixin - implements _$OneLevelWrapper2Props { +mixin _$OneLevelWrapper2PropsAccessorsMixin implements _$OneLevelWrapper2Props { @override Map get props; diff --git a/test/test_util/component2/two_level_wrapper2.over_react.g.dart b/test/test_util/component2/two_level_wrapper2.over_react.g.dart index 5ece4832a..5c5e56031 100644 --- a/test/test_util/component2/two_level_wrapper2.over_react.g.dart +++ b/test/test_util/component2/two_level_wrapper2.over_react.g.dart @@ -18,8 +18,7 @@ final $TwoLevelWrapper2ComponentFactory = registerComponent2( parentType: null, ); -abstract class _$TwoLevelWrapper2PropsAccessorsMixin - implements _$TwoLevelWrapper2Props { +mixin _$TwoLevelWrapper2PropsAccessorsMixin implements _$TwoLevelWrapper2Props { @override Map get props; diff --git a/test/test_util/one_level_wrapper.over_react.g.dart b/test/test_util/one_level_wrapper.over_react.g.dart index c8186f3b8..cb3ecfe4a 100644 --- a/test/test_util/one_level_wrapper.over_react.g.dart +++ b/test/test_util/one_level_wrapper.over_react.g.dart @@ -18,8 +18,7 @@ final $OneLevelWrapperComponentFactory = registerComponent( parentType: null, ); -abstract class _$OneLevelWrapperPropsAccessorsMixin - implements _$OneLevelWrapperProps { +mixin _$OneLevelWrapperPropsAccessorsMixin implements _$OneLevelWrapperProps { @override Map get props; diff --git a/test/test_util/two_level_wrapper.over_react.g.dart b/test/test_util/two_level_wrapper.over_react.g.dart index 4bd35accf..f29882a8b 100644 --- a/test/test_util/two_level_wrapper.over_react.g.dart +++ b/test/test_util/two_level_wrapper.over_react.g.dart @@ -18,8 +18,7 @@ final $TwoLevelWrapperComponentFactory = registerComponent( parentType: null, ); -abstract class _$TwoLevelWrapperPropsAccessorsMixin - implements _$TwoLevelWrapperProps { +mixin _$TwoLevelWrapperPropsAccessorsMixin implements _$TwoLevelWrapperProps { @override Map get props; diff --git a/web/component1/src/demo_components/button.over_react.g.dart b/web/component1/src/demo_components/button.over_react.g.dart index e6b1908c2..9b818b58a 100644 --- a/web/component1/src/demo_components/button.over_react.g.dart +++ b/web/component1/src/demo_components/button.over_react.g.dart @@ -18,7 +18,7 @@ final $ButtonComponentFactory = registerComponent( parentType: null, ); -abstract class _$ButtonPropsAccessorsMixin implements _$ButtonProps { +mixin _$ButtonPropsAccessorsMixin implements _$ButtonProps { @override Map get props; @@ -299,8 +299,7 @@ class _$$ButtonProps extends _$ButtonProps /// An alias for [getPropKey] so it can be referenced within the props class impl /// without being shadowed by the `getPropKey` instance extension member. const _$getPropKey$_$$ButtonProps = getPropKey; - -abstract class _$ButtonStateAccessorsMixin implements _$ButtonState { +mixin _$ButtonStateAccessorsMixin implements _$ButtonState { @override Map get state; diff --git a/web/component1/src/demo_components/button_group.over_react.g.dart b/web/component1/src/demo_components/button_group.over_react.g.dart index af241c720..a239e7acf 100644 --- a/web/component1/src/demo_components/button_group.over_react.g.dart +++ b/web/component1/src/demo_components/button_group.over_react.g.dart @@ -18,7 +18,7 @@ final $ButtonGroupComponentFactory = registerComponent( parentType: null, ); -abstract class _$ButtonGroupPropsAccessorsMixin implements _$ButtonGroupProps { +mixin _$ButtonGroupPropsAccessorsMixin implements _$ButtonGroupProps { @override Map get props; @@ -158,8 +158,7 @@ class _$$ButtonGroupProps extends _$ButtonGroupProps /// An alias for [getPropKey] so it can be referenced within the props class impl /// without being shadowed by the `getPropKey` instance extension member. const _$getPropKey$_$$ButtonGroupProps = getPropKey; - -abstract class _$ButtonGroupStateAccessorsMixin implements _$ButtonGroupState { +mixin _$ButtonGroupStateAccessorsMixin implements _$ButtonGroupState { @override Map get state; diff --git a/web/component1/src/demo_components/list_group.over_react.g.dart b/web/component1/src/demo_components/list_group.over_react.g.dart index 08eb8aec3..d5c35acce 100644 --- a/web/component1/src/demo_components/list_group.over_react.g.dart +++ b/web/component1/src/demo_components/list_group.over_react.g.dart @@ -18,7 +18,7 @@ final $ListGroupComponentFactory = registerComponent( parentType: null, ); -abstract class _$ListGroupPropsAccessorsMixin implements _$ListGroupProps { +mixin _$ListGroupPropsAccessorsMixin implements _$ListGroupProps { @override Map get props; diff --git a/web/component1/src/demo_components/list_group_item.over_react.g.dart b/web/component1/src/demo_components/list_group_item.over_react.g.dart index b9ff9de3d..713471ada 100644 --- a/web/component1/src/demo_components/list_group_item.over_react.g.dart +++ b/web/component1/src/demo_components/list_group_item.over_react.g.dart @@ -18,8 +18,7 @@ final $ListGroupItemComponentFactory = registerComponent( parentType: null, ); -abstract class _$ListGroupItemPropsAccessorsMixin - implements _$ListGroupItemProps { +mixin _$ListGroupItemPropsAccessorsMixin implements _$ListGroupItemProps { @override Map get props; diff --git a/web/component1/src/demo_components/progress.over_react.g.dart b/web/component1/src/demo_components/progress.over_react.g.dart index 800b69c41..6fe198e0e 100644 --- a/web/component1/src/demo_components/progress.over_react.g.dart +++ b/web/component1/src/demo_components/progress.over_react.g.dart @@ -18,7 +18,7 @@ final $ProgressComponentFactory = registerComponent( parentType: null, ); -abstract class _$ProgressPropsAccessorsMixin implements _$ProgressProps { +mixin _$ProgressPropsAccessorsMixin implements _$ProgressProps { @override Map get props; @@ -351,8 +351,7 @@ class _$$ProgressProps extends _$ProgressProps /// An alias for [getPropKey] so it can be referenced within the props class impl /// without being shadowed by the `getPropKey` instance extension member. const _$getPropKey$_$$ProgressProps = getPropKey; - -abstract class _$ProgressStateAccessorsMixin implements _$ProgressState { +mixin _$ProgressStateAccessorsMixin implements _$ProgressState { @override Map get state; diff --git a/web/component1/src/demo_components/tag.over_react.g.dart b/web/component1/src/demo_components/tag.over_react.g.dart index 6ffde50f7..356ebcae8 100644 --- a/web/component1/src/demo_components/tag.over_react.g.dart +++ b/web/component1/src/demo_components/tag.over_react.g.dart @@ -18,7 +18,7 @@ final $TagComponentFactory = registerComponent( parentType: null, ); -abstract class _$TagPropsAccessorsMixin implements _$TagProps { +mixin _$TagPropsAccessorsMixin implements _$TagProps { @override Map get props; diff --git a/web/component1/src/demo_components/toggle_button.over_react.g.dart b/web/component1/src/demo_components/toggle_button.over_react.g.dart index 40b84377b..1be1a1d8f 100644 --- a/web/component1/src/demo_components/toggle_button.over_react.g.dart +++ b/web/component1/src/demo_components/toggle_button.over_react.g.dart @@ -18,8 +18,7 @@ final $ToggleButtonComponentFactory = registerComponent( parentType: $ButtonComponentFactory, /* from `subtypeOf: ButtonComponent` */ ); -abstract class _$ToggleButtonPropsAccessorsMixin - implements _$ToggleButtonProps { +mixin _$ToggleButtonPropsAccessorsMixin implements _$ToggleButtonProps { @override Map get props; @@ -199,9 +198,7 @@ class _$$ToggleButtonProps extends _$ToggleButtonProps /// An alias for [getPropKey] so it can be referenced within the props class impl /// without being shadowed by the `getPropKey` instance extension member. const _$getPropKey$_$$ToggleButtonProps = getPropKey; - -abstract class _$ToggleButtonStateAccessorsMixin - implements _$ToggleButtonState { +mixin _$ToggleButtonStateAccessorsMixin implements _$ToggleButtonState { @override Map get state; diff --git a/web/component1/src/demo_components/toggle_button_group.over_react.g.dart b/web/component1/src/demo_components/toggle_button_group.over_react.g.dart index 48411f2a2..4c9f69066 100644 --- a/web/component1/src/demo_components/toggle_button_group.over_react.g.dart +++ b/web/component1/src/demo_components/toggle_button_group.over_react.g.dart @@ -19,7 +19,7 @@ final $ToggleButtonGroupComponentFactory = registerComponent( $ButtonGroupComponentFactory, /* from `subtypeOf: ButtonGroupComponent` */ ); -abstract class _$ToggleButtonGroupPropsAccessorsMixin +mixin _$ToggleButtonGroupPropsAccessorsMixin implements _$ToggleButtonGroupProps { @override Map get props; @@ -85,8 +85,7 @@ class _$$ToggleButtonGroupProps extends _$ToggleButtonGroupProps /// An alias for [getPropKey] so it can be referenced within the props class impl /// without being shadowed by the `getPropKey` instance extension member. const _$getPropKey$_$$ToggleButtonGroupProps = getPropKey; - -abstract class _$ToggleButtonGroupStateAccessorsMixin +mixin _$ToggleButtonGroupStateAccessorsMixin implements _$ToggleButtonGroupState { @override Map get state; diff --git a/web/component1/src/shared/constants.over_react.g.dart b/web/component1/src/shared/constants.over_react.g.dart index e91398d26..33228b46e 100644 --- a/web/component1/src/shared/constants.over_react.g.dart +++ b/web/component1/src/shared/constants.over_react.g.dart @@ -7,7 +7,7 @@ part of 'constants.dart'; // OverReactBuilder (package:over_react/src/builder.dart) // ************************************************************************** -abstract class AbstractInputPropsMixin implements _$AbstractInputPropsMixin { +mixin AbstractInputPropsMixin implements _$AbstractInputPropsMixin { @override Map get props; @@ -118,7 +118,7 @@ const PropsMeta _$metaForAbstractInputPropsMixin = PropsMeta( keys: AbstractInputPropsMixin.$propKeys, ); -abstract class AbstractInputStateMixin implements _$AbstractInputStateMixin { +mixin AbstractInputStateMixin implements _$AbstractInputStateMixin { @override Map get state; From ba7e2af7a5e9cfda3f2fd83d0a2184a1fb636786 Mon Sep 17 00:00:00 2001 From: Greg Littlefield Date: Tue, 2 Dec 2025 20:03:46 -0700 Subject: [PATCH 04/11] Update gold files --- .../basic.over_react.g.dart.goldFile | 2 +- .../basic_library.over_react.g.dart.goldFile | 13 ++++--------- .../props_mixin.over_react.g.dart.goldFile | 4 ++-- .../state_mixin.over_react.g.dart.goldFile | 2 +- .../dart2_only/basic.over_react.g.dart.goldFile | 2 +- .../basic_library.over_react.g.dart.goldFile | 13 ++++--------- .../component2/basic.over_react.g.dart.goldFile | 2 +- .../basic_library.over_react.g.dart.goldFile | 12 ++++-------- .../library.over_react.g.dart.goldFile | 3 +-- .../props_mixin.over_react.g.dart.goldFile | 6 +++--- .../state_mixin.over_react.g.dart.goldFile | 2 +- 11 files changed, 23 insertions(+), 38 deletions(-) diff --git a/test_fixtures/gold_output_files/backwards_compatible/basic.over_react.g.dart.goldFile b/test_fixtures/gold_output_files/backwards_compatible/basic.over_react.g.dart.goldFile index 924a97bf2..97953bc92 100644 --- a/test_fixtures/gold_output_files/backwards_compatible/basic.over_react.g.dart.goldFile +++ b/test_fixtures/gold_output_files/backwards_compatible/basic.over_react.g.dart.goldFile @@ -19,7 +19,7 @@ final $BasicComponentFactory = registerComponent( parentType: null, ); -abstract class _$BasicPropsAccessorsMixin implements _$BasicProps { +mixin _$BasicPropsAccessorsMixin implements _$BasicProps { @override Map get props; diff --git a/test_fixtures/gold_output_files/backwards_compatible/basic_library.over_react.g.dart.goldFile b/test_fixtures/gold_output_files/backwards_compatible/basic_library.over_react.g.dart.goldFile index bc380821c..529e8729f 100644 --- a/test_fixtures/gold_output_files/backwards_compatible/basic_library.over_react.g.dart.goldFile +++ b/test_fixtures/gold_output_files/backwards_compatible/basic_library.over_react.g.dart.goldFile @@ -19,8 +19,7 @@ final $BasicPartOfLibComponentFactory = registerComponent( parentType: null, ); -abstract class _$BasicPartOfLibPropsAccessorsMixin - implements _$BasicPartOfLibProps { +mixin _$BasicPartOfLibPropsAccessorsMixin implements _$BasicPartOfLibProps { @override Map get props; @@ -187,9 +186,7 @@ class _$$BasicPartOfLibProps extends _$BasicPartOfLibProps /// An alias for [getPropKey] so it can be referenced within the props class impl /// without being shadowed by the `getPropKey` instance extension member. const _$getPropKey$_$$BasicPartOfLibProps = getPropKey; - -abstract class _$BasicPartOfLibStateAccessorsMixin - implements _$BasicPartOfLibState { +mixin _$BasicPartOfLibStateAccessorsMixin implements _$BasicPartOfLibState { @override Map get state; @@ -282,8 +279,7 @@ final $SubPartOfLibComponentFactory = registerComponent( parentType: null, ); -abstract class _$SubPartOfLibPropsAccessorsMixin - implements _$SubPartOfLibProps { +mixin _$SubPartOfLibPropsAccessorsMixin implements _$SubPartOfLibProps { @override Map get props; @@ -389,8 +385,7 @@ class _$SubPartOfLibComponent extends SubPartOfLibComponent { ]; } -abstract class _$SuperPartOfLibPropsAccessorsMixin - implements _$SuperPartOfLibProps { +mixin _$SuperPartOfLibPropsAccessorsMixin implements _$SuperPartOfLibProps { @override Map get props; diff --git a/test_fixtures/gold_output_files/backwards_compatible/props_mixin.over_react.g.dart.goldFile b/test_fixtures/gold_output_files/backwards_compatible/props_mixin.over_react.g.dart.goldFile index a94a79aaa..fb38d2d70 100644 --- a/test_fixtures/gold_output_files/backwards_compatible/props_mixin.over_react.g.dart.goldFile +++ b/test_fixtures/gold_output_files/backwards_compatible/props_mixin.over_react.g.dart.goldFile @@ -8,7 +8,7 @@ part of 'props_mixin.dart'; // OverReactBuilder (package:over_react/src/builder.dart) // ************************************************************************** -abstract class $ExamplePropsMixinClass implements ExamplePropsMixinClass { +mixin $ExamplePropsMixinClass implements ExamplePropsMixinClass { @override Map get props; @@ -42,7 +42,7 @@ const PropsMeta _$metaForExamplePropsMixinClass = PropsMeta( keys: $ExamplePropsMixinClass.$propKeys, ); -abstract class $MixesInOtherMixinMixin +mixin $MixesInOtherMixinMixin implements MixesInOtherMixinMixin { @override Map get props; diff --git a/test_fixtures/gold_output_files/backwards_compatible/state_mixin.over_react.g.dart.goldFile b/test_fixtures/gold_output_files/backwards_compatible/state_mixin.over_react.g.dart.goldFile index 50e872cc7..50441b831 100644 --- a/test_fixtures/gold_output_files/backwards_compatible/state_mixin.over_react.g.dart.goldFile +++ b/test_fixtures/gold_output_files/backwards_compatible/state_mixin.over_react.g.dart.goldFile @@ -8,7 +8,7 @@ part of 'state_mixin.dart'; // OverReactBuilder (package:over_react/src/builder.dart) // ************************************************************************** -abstract class $ExampleStateMixinClass implements ExampleStateMixinClass { +mixin $ExampleStateMixinClass implements ExampleStateMixinClass { @override Map get state; diff --git a/test_fixtures/gold_output_files/dart2_only/basic.over_react.g.dart.goldFile b/test_fixtures/gold_output_files/dart2_only/basic.over_react.g.dart.goldFile index d55ef3341..40adb283b 100644 --- a/test_fixtures/gold_output_files/dart2_only/basic.over_react.g.dart.goldFile +++ b/test_fixtures/gold_output_files/dart2_only/basic.over_react.g.dart.goldFile @@ -20,7 +20,7 @@ final $BasicComponentFactory = registerComponent( ); @deprecated -abstract class _$BasicPropsAccessorsMixin implements _$BasicProps { +mixin _$BasicPropsAccessorsMixin implements _$BasicProps { @override Map get props; diff --git a/test_fixtures/gold_output_files/dart2_only/basic_library.over_react.g.dart.goldFile b/test_fixtures/gold_output_files/dart2_only/basic_library.over_react.g.dart.goldFile index c4931ffed..4db37e942 100644 --- a/test_fixtures/gold_output_files/dart2_only/basic_library.over_react.g.dart.goldFile +++ b/test_fixtures/gold_output_files/dart2_only/basic_library.over_react.g.dart.goldFile @@ -19,8 +19,7 @@ final $BasicPartOfLibComponentFactory = registerComponent( parentType: null, ); -abstract class _$BasicPartOfLibPropsAccessorsMixin - implements _$BasicPartOfLibProps { +mixin _$BasicPartOfLibPropsAccessorsMixin implements _$BasicPartOfLibProps { @override Map get props; @@ -192,9 +191,7 @@ class _$$BasicPartOfLibProps extends _$BasicPartOfLibProps /// An alias for [getPropKey] so it can be referenced within the props class impl /// without being shadowed by the `getPropKey` instance extension member. const _$getPropKey$_$$BasicPartOfLibProps = getPropKey; - -abstract class _$BasicPartOfLibStateAccessorsMixin - implements _$BasicPartOfLibState { +mixin _$BasicPartOfLibStateAccessorsMixin implements _$BasicPartOfLibState { @override Map get state; @@ -292,8 +289,7 @@ final $SubPartOfLibComponentFactory = registerComponent( parentType: null, ); -abstract class _$SubPartOfLibPropsAccessorsMixin - implements _$SubPartOfLibProps { +mixin _$SubPartOfLibPropsAccessorsMixin implements _$SubPartOfLibProps { @override Map get props; @@ -404,8 +400,7 @@ class _$SubPartOfLibComponent extends SubPartOfLibComponent { ]; } -abstract class _$SuperPartOfLibPropsAccessorsMixin - implements _$SuperPartOfLibProps { +mixin _$SuperPartOfLibPropsAccessorsMixin implements _$SuperPartOfLibProps { @override Map get props; diff --git a/test_fixtures/gold_output_files/dart2_only/component2/basic.over_react.g.dart.goldFile b/test_fixtures/gold_output_files/dart2_only/component2/basic.over_react.g.dart.goldFile index d1c678ff7..883eb676d 100644 --- a/test_fixtures/gold_output_files/dart2_only/component2/basic.over_react.g.dart.goldFile +++ b/test_fixtures/gold_output_files/dart2_only/component2/basic.over_react.g.dart.goldFile @@ -19,7 +19,7 @@ final $Basic2ComponentFactory = registerComponent2( parentType: null, ); -abstract class _$BasicPropsAccessorsMixin implements _$BasicProps { +mixin _$BasicPropsAccessorsMixin implements _$BasicProps { @override Map get props; diff --git a/test_fixtures/gold_output_files/dart2_only/component2/basic_library.over_react.g.dart.goldFile b/test_fixtures/gold_output_files/dart2_only/component2/basic_library.over_react.g.dart.goldFile index 99f0ffc4b..c49f58364 100644 --- a/test_fixtures/gold_output_files/dart2_only/component2/basic_library.over_react.g.dart.goldFile +++ b/test_fixtures/gold_output_files/dart2_only/component2/basic_library.over_react.g.dart.goldFile @@ -19,8 +19,7 @@ final $BasicPartOfLibComponentFactory = registerComponent2( parentType: null, ); -abstract class _$BasicPartOfLibPropsAccessorsMixin - implements _$BasicPartOfLibProps { +mixin _$BasicPartOfLibPropsAccessorsMixin implements _$BasicPartOfLibProps { @override Map get props; @@ -227,8 +226,7 @@ class _$$BasicPartOfLibProps$JsMap extends _$$BasicPartOfLibProps { JsBackedMap _props; } -abstract class _$BasicPartOfLibStateAccessorsMixin - implements _$BasicPartOfLibState { +mixin _$BasicPartOfLibStateAccessorsMixin implements _$BasicPartOfLibState { @override Map get state; @@ -399,8 +397,7 @@ final $SubPartOfLibComponentFactory = registerComponent2( parentType: null, ); -abstract class _$SubPartOfLibPropsAccessorsMixin - implements _$SubPartOfLibProps { +mixin _$SubPartOfLibPropsAccessorsMixin implements _$SubPartOfLibProps { @override Map get props; @@ -567,8 +564,7 @@ class _$SubPartOfLibComponent extends SubPartOfLibComponent { ]; } -abstract class _$SuperPartOfLibPropsAccessorsMixin - implements _$SuperPartOfLibProps { +mixin _$SuperPartOfLibPropsAccessorsMixin implements _$SuperPartOfLibProps { @override Map get props; diff --git a/test_fixtures/gold_output_files/dart2_only/missing_over_react_g_part/library.over_react.g.dart.goldFile b/test_fixtures/gold_output_files/dart2_only/missing_over_react_g_part/library.over_react.g.dart.goldFile index 0d549a568..63aae2737 100644 --- a/test_fixtures/gold_output_files/dart2_only/missing_over_react_g_part/library.over_react.g.dart.goldFile +++ b/test_fixtures/gold_output_files/dart2_only/missing_over_react_g_part/library.over_react.g.dart.goldFile @@ -19,8 +19,7 @@ final $BasicPartOfLibComponentFactory = registerComponent( parentType: null, ); -abstract class _$BasicPartOfLibPropsAccessorsMixin - implements _$BasicPartOfLibProps { +mixin _$BasicPartOfLibPropsAccessorsMixin implements _$BasicPartOfLibProps { @override Map get props; diff --git a/test_fixtures/gold_output_files/dart2_only/props_mixin.over_react.g.dart.goldFile b/test_fixtures/gold_output_files/dart2_only/props_mixin.over_react.g.dart.goldFile index ec84247e1..fcbc1480f 100644 --- a/test_fixtures/gold_output_files/dart2_only/props_mixin.over_react.g.dart.goldFile +++ b/test_fixtures/gold_output_files/dart2_only/props_mixin.over_react.g.dart.goldFile @@ -9,7 +9,7 @@ part of 'props_mixin.dart'; // ************************************************************************** @deprecated -abstract class ExamplePropsMixinClass implements _$ExamplePropsMixinClass { +mixin ExamplePropsMixinClass implements _$ExamplePropsMixinClass { @override Map get props; @@ -44,7 +44,7 @@ const PropsMeta _$metaForExamplePropsMixinClass = PropsMeta( ); @deprecated -abstract class MixesInOtherMixinMixin +mixin MixesInOtherMixinMixin implements _$MixesInOtherMixinMixin { @override Map get props; @@ -81,7 +81,7 @@ const PropsMeta _$metaForMixesInOtherMixinMixin = PropsMeta( ); @deprecated -abstract class _PrivateMixin implements _$_PrivateMixin { +mixin _PrivateMixin implements _$_PrivateMixin { @override Map get props; diff --git a/test_fixtures/gold_output_files/dart2_only/state_mixin.over_react.g.dart.goldFile b/test_fixtures/gold_output_files/dart2_only/state_mixin.over_react.g.dart.goldFile index fdf2aebe0..9b9ae55ba 100644 --- a/test_fixtures/gold_output_files/dart2_only/state_mixin.over_react.g.dart.goldFile +++ b/test_fixtures/gold_output_files/dart2_only/state_mixin.over_react.g.dart.goldFile @@ -9,7 +9,7 @@ part of 'state_mixin.dart'; // ************************************************************************** @deprecated -abstract class ExampleStateMixinClass implements _$ExampleStateMixinClass { +mixin ExampleStateMixinClass implements _$ExampleStateMixinClass { @override Map get state; From 438e449f82a55ff645ccad72d26da88da7ef8d99 Mon Sep 17 00:00:00 2001 From: Greg Littlefield Date: Tue, 2 Dec 2025 20:31:57 -0700 Subject: [PATCH 05/11] Update tests --- test/vm_tests/builder/codegen_test.dart | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/vm_tests/builder/codegen_test.dart b/test/vm_tests/builder/codegen_test.dart index 29ba77ca8..4a7ca0a99 100644 --- a/test/vm_tests/builder/codegen_test.dart +++ b/test/vm_tests/builder/codegen_test.dart @@ -121,9 +121,9 @@ main() { descriptorType = '${isProps ? 'Prop' : 'State'}Descriptor'; }); - test('with proper accessors class declaration, retaining type parameters', () { + test('with proper accessors mixin declaration, retaining type parameters', () { expect(implGenerator!.outputContentsBuffer.toString(), contains( - 'abstract class _\$${className}AccessorsMixin${ors.typeParamSrc} ' + 'mixin _\$${className}AccessorsMixin${ors.typeParamSrc} ' 'implements _\$$className${ors.typeParamSrcWithoutBounds} {')); }); @@ -213,9 +213,9 @@ main() { className = '${backwardsCompatible ? '' : '_\$'}$nameBuilder'; }); - test('with proper accessors class declaration, retaining type parameters', () { + test('with proper accessors mixin declaration, retaining type parameters', () { expect(implGenerator!.outputContentsBuffer.toString(), contains( - 'abstract class $consumableClassName${ors.typeParamSrc} ' + 'mixin $consumableClassName${ors.typeParamSrc} ' 'implements $className${ors.typeParamSrcWithoutBounds} {')); }); @@ -636,7 +636,7 @@ main() { .propsOrStateOrMixinClassName}AccessorsMixin'; final propsOrStateOrMixinClassName = ors.propsOrStateOrMixinClassName; final annotatedPropsOrStateOrMixinClassName = testName.contains('mixin') ? propsOrStateOrMixinClassName : '_\$$propsOrStateOrMixinClassName'; - final expectedAccessorsMixinClass = 'abstract class $accessorsClassName implements $annotatedPropsOrStateOrMixinClassName'; + final expectedAccessorsMixin = 'mixin $accessorsClassName implements $annotatedPropsOrStateOrMixinClassName'; final metaStructName = ors.metaStructName(ors.annotation); final expectedMetaForInstance = (StringBuffer() ..writeln('const $metaStructName _\$metaFor$propsOrStateOrMixinClassName = $metaStructName(') @@ -645,7 +645,7 @@ main() { ..writeln(');') ).toString(); - expect(implGenerator!.outputContentsBuffer.toString(), contains(expectedAccessorsMixinClass)); + expect(implGenerator!.outputContentsBuffer.toString(), contains(expectedAccessorsMixin)); expect(implGenerator!.outputContentsBuffer.toString(), contains(expectedMetaForInstance)); }); } From 37f6f1af2735a61ed32effc03e9b79f7d77d2570 Mon Sep 17 00:00:00 2001 From: Greg Littlefield Date: Tue, 2 Dec 2025 20:51:29 -0700 Subject: [PATCH 06/11] Work around compilation issue in test --- .../backwards_compatible/accessor_mixin_integration_test.dart | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/over_react/component_declaration/builder_integration_tests/backwards_compatible/accessor_mixin_integration_test.dart b/test/over_react/component_declaration/builder_integration_tests/backwards_compatible/accessor_mixin_integration_test.dart index 1df983ee1..53ce47c97 100644 --- a/test/over_react/component_declaration/builder_integration_tests/backwards_compatible/accessor_mixin_integration_test.dart +++ b/test/over_react/component_declaration/builder_integration_tests/backwards_compatible/accessor_mixin_integration_test.dart @@ -1,3 +1,5 @@ +//@dart=2.19 +// ^ Work around build issue on Dart 3 not allowing mixins of classes, due to pubspec 2.19 language version not being respected // Copyright 2016 Workiva Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); From 40532ce214345897433b0c28fd9673cbda8910d4 Mon Sep 17 00:00:00 2001 From: Greg Littlefield Date: Thu, 4 Dec 2025 15:50:32 -0700 Subject: [PATCH 07/11] Fix false positive git diff check --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 88d9409c8..079056d1f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -54,6 +54,8 @@ jobs: if [[ "$DART_VERSION" =~ ^3 ]]; then ./tool/delete_dart_2_only_files.sh ./tool/update_tests_for_dart_3.sh + git add . + git commit -m "Commit Dart-2-only removals so they don't interfere with the generated file git diff check below" fi # Analyze before generated files are created to verify that component boilerplate analysis is "clean" without the need for building From 441163fbfa997c43221f2c9350cd9f645307a821 Mon Sep 17 00:00:00 2001 From: Greg Littlefield Date: Thu, 4 Dec 2025 15:51:06 -0700 Subject: [PATCH 08/11] Clean up old, unused case in git diff check --- .github/workflows/ci.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 079056d1f..2f5ab8b90 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -76,13 +76,7 @@ jobs: - name: Verify that generated files are up-to-date run: | - if [ ${{ matrix.sdk }} = '2.19.6' ]; then - git diff --exit-code - else - # Don't check these generated files for other SDKs, since they may generate differently - # due to different resolved dependencies. - git diff --exit-code -- ":(exclude)test/over_react/component_declaration/redux_component_test/test_reducer.g.dart" - fi + git diff --exit-code if: always() && steps.install.outcome == 'success' && steps.build.outcome == 'success' # Analyze again after generated files are created to verify that those generated classes don't cause analysis errors From 94eb7990fd67377c58b8c067ef6cf8840b21ce14 Mon Sep 17 00:00:00 2001 From: Greg Littlefield Date: Thu, 4 Dec 2025 15:52:31 -0700 Subject: [PATCH 09/11] Add link to issue --- .../backwards_compatible/accessor_mixin_integration_test.dart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/over_react/component_declaration/builder_integration_tests/backwards_compatible/accessor_mixin_integration_test.dart b/test/over_react/component_declaration/builder_integration_tests/backwards_compatible/accessor_mixin_integration_test.dart index 53ce47c97..23beb01f2 100644 --- a/test/over_react/component_declaration/builder_integration_tests/backwards_compatible/accessor_mixin_integration_test.dart +++ b/test/over_react/component_declaration/builder_integration_tests/backwards_compatible/accessor_mixin_integration_test.dart @@ -1,5 +1,6 @@ //@dart=2.19 -// ^ Work around build issue on Dart 3 not allowing mixins of classes, due to pubspec 2.19 language version not being respected +// ^ Work around build_web_compilers issue on Dart 3 not allowing mixins of classes, due to +// pubspec's 2.19 language version not being respected: https://github.com/dart-lang/build/issues/4302 // Copyright 2016 Workiva Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); From cedd7c2265be16eb172f00f10b7ec1edb9873630 Mon Sep 17 00:00:00 2001 From: Greg Littlefield Date: Thu, 4 Dec 2025 16:43:50 -0700 Subject: [PATCH 10/11] Just stage changes so we don't have to configure a commiter identity --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2f5ab8b90..030dcf219 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -54,8 +54,8 @@ jobs: if [[ "$DART_VERSION" =~ ^3 ]]; then ./tool/delete_dart_2_only_files.sh ./tool/update_tests_for_dart_3.sh + # Stage these changes so they don't show up in the generated file `git diff` check below git add . - git commit -m "Commit Dart-2-only removals so they don't interfere with the generated file git diff check below" fi # Analyze before generated files are created to verify that component boilerplate analysis is "clean" without the need for building From 75571c7404bcce3aee6819997029213ff37f9644 Mon Sep 17 00:00:00 2001 From: Greg Littlefield Date: Thu, 4 Dec 2025 16:51:42 -0700 Subject: [PATCH 11/11] Add changelog entry --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index dbfe05abb..84e37872a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # OverReact Changelog +## Unreleased +- [#992] Fix compilation errors for legacy boilerplate defined in libraries with a Dart language version of >=3.0 + ## 5.4.6 - [#986] Set up gha-dart-oss - [#985] Remove entrypoint imports