From 9306f6b3412990f0337c60397dd7acaf43dfd1f6 Mon Sep 17 00:00:00 2001 From: Greg Littlefield Date: Thu, 15 Feb 2024 12:47:01 -0700 Subject: [PATCH 1/5] Make ConnectPropsMixin implement builder_helpers.UiProps instead of just component_base --- lib/src/over_react_redux/over_react_redux.dart | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/lib/src/over_react_redux/over_react_redux.dart b/lib/src/over_react_redux/over_react_redux.dart index c9f021da9..bc11e0bef 100644 --- a/lib/src/over_react_redux/over_react_redux.dart +++ b/lib/src/over_react_redux/over_react_redux.dart @@ -18,10 +18,8 @@ library over_react_redux; import 'package:js/js.dart'; import 'package:meta/meta.dart'; -import 'package:over_react/component_base.dart'; -import 'package:over_react/src/component_declaration/annotations.dart'; -import 'package:over_react/src/component_declaration/builder_helpers.dart' as builder_helpers; -import 'package:over_react/src/component_declaration/builder_helpers.dart' show MissingRequiredPropsError; +import 'package:over_react/src/component_declaration/builder_helpers.dart'; +import 'package:over_react/src/component_declaration/component_base.dart' as component_base; import 'package:over_react/src/component_declaration/component_type_checking.dart'; import 'package:over_react/src/component_declaration/function_component.dart'; import 'package:over_react/src/util/context.dart'; @@ -157,7 +155,7 @@ typedef dynamic Dispatcher(dynamic action); /// - [forwardRef] if `true`, the `ref` prop provided to the connected component will be return the wrapped component. /// /// For more info see: https://react-redux.js.org/api/connect#connect -UiFactory Function(UiFactory) connect({ +UiFactory Function(UiFactory) connect({ Map Function(TReduxState state)? mapStateToProps, Map Function(TReduxState state, TProps ownProps)? mapStateToPropsWithOwnProps, Map Function(TReduxState state) Function(TReduxState initialState, TProps initialOwnProps)? makeMapStateToProps, @@ -196,7 +194,7 @@ UiFactory Function(UiFactory) connect jsBackingMapOrJsCopy(props is UiProps ? props.props : props); + JsMap jsMapFromProps(Map props) => jsBackingMapOrJsCopy(props is component_base.UiProps ? props.props : props); TProps jsPropsToTProps(JsMap jsProps) => factory(JsBackedMap.backedBy(jsProps)); @@ -444,7 +442,7 @@ mixin ReduxProviderPropsMixin on UiProps { /// - `context` - You may provide a context instance. If you do so, you will need to provide the same context instance to all of your connected components as well. /// /// See: -class ReduxProviderProps = builder_helpers.UiProps with ReduxProviderPropsMixin; +class ReduxProviderProps = UiProps with ReduxProviderPropsMixin; /// [ReduxProvider] makes the store available to any nested components that have been wrapped in the `connect()` function. /// From 53999664806ae3657575c5ac7a5840a7ae2f2795 Mon Sep 17 00:00:00 2001 From: Greg Littlefield Date: Thu, 15 Feb 2024 12:38:24 -0700 Subject: [PATCH 2/5] Stop exporting package:meta --- lib/src/builder/codegen/accessors_generator.dart | 2 +- lib/src/component_declaration/annotations.dart | 3 --- lib/src/component_declaration/builder_helpers.dart | 5 +++++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/src/builder/codegen/accessors_generator.dart b/lib/src/builder/codegen/accessors_generator.dart index bc4bd0eb8..a709ca183 100644 --- a/lib/src/builder/codegen/accessors_generator.dart +++ b/lib/src/builder/codegen/accessors_generator.dart @@ -376,7 +376,7 @@ abstract class TypedMapAccessorsGenerator extends BoilerplateDeclarationGenerato version != Version.v3_legacyDart2Only && version != Version.v2_legacyBackwardsCompat) { final validateRequiredPropsMethod = '\n @override\n' - ' @mustCallSuper\n' + ' @UiProps.\$mustCallSuper\n' ' void validateRequiredProps() {\n' ' super.validateRequiredProps();\n' ' ${requiredPropChecks.join('\n')}\n' diff --git a/lib/src/component_declaration/annotations.dart b/lib/src/component_declaration/annotations.dart index a53b1975f..dfd5919ed 100644 --- a/lib/src/component_declaration/annotations.dart +++ b/lib/src/component_declaration/annotations.dart @@ -15,9 +15,6 @@ // Dummy annotations that would be used by Pub code generator library over_react.component_declaration.annotations; -// Exported for use in generated code. -export 'package:meta/meta.dart' show mustCallSuper; - /// Annotation used with the `over_react` builder to declare a `UiFactory` for a component. /// /// @Factory() diff --git a/lib/src/component_declaration/builder_helpers.dart b/lib/src/component_declaration/builder_helpers.dart index e2b14eeb3..e04954ac8 100644 --- a/lib/src/component_declaration/builder_helpers.dart +++ b/lib/src/component_declaration/builder_helpers.dart @@ -146,6 +146,11 @@ abstract class UiProps extends component_base.UiProps with GeneratedClass { @toBeGenerated @visibleForOverriding String $getPropKey(void Function(Map m) accessMap) => throw UngeneratedError(member: #$getPropKey); + + /// An alias to [mustCallSuper] so that generated code can reference it without us having + /// to re-export it from `package:over_react/over_react.dart`. + @protected + static const $mustCallSuper = mustCallSuper; } class MissingRequiredPropsError extends Error { From f236c025f89a04ab3777556c510644676a9cf59d Mon Sep 17 00:00:00 2001 From: Greg Littlefield Date: Thu, 15 Feb 2024 12:55:41 -0700 Subject: [PATCH 3/5] Add changelog entry for ConnectPropsMixin --- CHANGELOG.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cfe3aac29..d4e7c738e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,8 +32,10 @@ - `ReduxMultiProviderProps.storesByContext` - `ReduxProviderProps.store` - UiPropsMapView (deprecated) is now abstract and requires subclasses to override `selfFactory` -- `PropsMeta`/`StateMeta` constructor arguments `fields` and `keys` are now required -- `ProviderProps.props` type has been widened from `JsMap` to `Map` (now matches `ConsumerProps` and other props classes) +- Other changes that we don't expect to affect consumers: + - `PropsMeta`/`StateMeta` constructor arguments `fields` and `keys` are now required + - `ProviderProps.props` type has been widened from `JsMap` to `Map` (now matches `ConsumerProps` and other props classes) + - `ConnectPropsMixin` now `implements UiProps` (the one exported from `package:over_react/over_react.dart`) instead of `UiProps`'s superclass of the name, `component_base.UiProps`. ## [4.10.3](https://github.com/Workiva/over_react/compare/4.10.2...4.10.3) - [#846] Update internals to prepare for react-dart 7.0.0 From 1cd247b78a3ec3e43f637a993042a43421440427 Mon Sep 17 00:00:00 2001 From: Greg Littlefield Date: Thu, 15 Feb 2024 12:56:34 -0700 Subject: [PATCH 4/5] Update generated code after mustCallSuper changes --- ...bstract_transition_props.over_react.g.dart | 2 +- .../error_boundary.over_react.g.dart | 2 +- .../component/resize_sensor.over_react.g.dart | 2 +- .../suspense_component.over_react.g.dart | 2 +- .../with_transition.over_react.g.dart | 2 +- .../flux_component.over_react.g.dart | 2 +- .../over_react_redux.over_react.g.dart | 2 +- lib/src/util/context.over_react.g.dart | 4 ++-- ...fe_render_manager_helper.over_react.g.dart | 2 +- ...abstract_transition_test.over_react.g.dart | 2 +- .../component/context_test.over_react.g.dart | 6 +++--- .../element_type_test.over_react.g.dart | 4 ++-- .../shared_stack_tests.over_react.g.dart | 6 +++--- .../lazy_load_me_props.over_react.g.dart | 2 +- .../pure_test_components.over_react.g.dart | 4 ++-- .../component/memo_test.over_react.g.dart | 2 +- .../component/ref_util_test.over_react.g.dart | 4 ++-- .../components.over_react.g.dart | 20 +++++++++---------- ...elf_typed_extension_test.over_react.g.dart | 2 +- .../cast_ui_factory_test.over_react.g.dart | 2 +- ...omponent_debug_name_test.over_react.g.dart | 2 +- .../util/js_component_test.over_react.g.dart | 4 ++-- .../prop_conversion_test.over_react.g.dart | 14 ++++++------- .../fixtures/counter_fn.over_react.g.dart | 6 +++--- .../hooks/use_dispatch_test.over_react.g.dart | 4 ++-- .../hooks/use_store_test.over_react.g.dart | 4 ++-- .../store_bindings_tests.over_react.g.dart | 4 ++-- 27 files changed, 56 insertions(+), 56 deletions(-) diff --git a/lib/src/component/abstract_transition_props.over_react.g.dart b/lib/src/component/abstract_transition_props.over_react.g.dart index 26286b537..a0fa441d0 100644 --- a/lib/src/component/abstract_transition_props.over_react.g.dart +++ b/lib/src/component/abstract_transition_props.over_react.g.dart @@ -105,7 +105,7 @@ mixin $TransitionPropsMixin on TransitionPropsMixin { ]; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } diff --git a/lib/src/component/error_boundary.over_react.g.dart b/lib/src/component/error_boundary.over_react.g.dart index 6c87bbb5b..e1f38acda 100644 --- a/lib/src/component/error_boundary.over_react.g.dart +++ b/lib/src/component/error_boundary.over_react.g.dart @@ -367,7 +367,7 @@ mixin $ErrorBoundaryProps on ErrorBoundaryProps { ]; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } diff --git a/lib/src/component/resize_sensor.over_react.g.dart b/lib/src/component/resize_sensor.over_react.g.dart index f3bcffc60..b29872253 100644 --- a/lib/src/component/resize_sensor.over_react.g.dart +++ b/lib/src/component/resize_sensor.over_react.g.dart @@ -281,7 +281,7 @@ mixin $ResizeSensorProps on ResizeSensorProps { ]; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } diff --git a/lib/src/component/suspense_component.over_react.g.dart b/lib/src/component/suspense_component.over_react.g.dart index 6534b6ea0..f84f72d45 100644 --- a/lib/src/component/suspense_component.over_react.g.dart +++ b/lib/src/component/suspense_component.over_react.g.dart @@ -30,7 +30,7 @@ mixin $SuspensePropsMixin on SuspensePropsMixin { static const List $propKeys = [_$key__fallback__SuspensePropsMixin]; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } diff --git a/lib/src/component/with_transition.over_react.g.dart b/lib/src/component/with_transition.over_react.g.dart index a9b1df8c8..dabd72720 100644 --- a/lib/src/component/with_transition.over_react.g.dart +++ b/lib/src/component/with_transition.over_react.g.dart @@ -315,7 +315,7 @@ mixin $WithTransitionPropsMixin on WithTransitionPropsMixin { ]; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } diff --git a/lib/src/component_declaration/flux_component.over_react.g.dart b/lib/src/component_declaration/flux_component.over_react.g.dart index 1e942fbf8..7f213aedd 100644 --- a/lib/src/component_declaration/flux_component.over_react.g.dart +++ b/lib/src/component_declaration/flux_component.over_react.g.dart @@ -51,7 +51,7 @@ mixin $FluxUiPropsMixin ]; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); if (!props.containsKey('FluxUiPropsMixin.actions') && 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 5b4277096..59cc1cc17 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 @@ -79,7 +79,7 @@ mixin $ReduxProviderPropsMixin on ReduxProviderPropsMixin { ]; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); if (!props.containsKey('store') && diff --git a/lib/src/util/context.over_react.g.dart b/lib/src/util/context.over_react.g.dart index ede1ea4e1..177e8a7d7 100644 --- a/lib/src/util/context.over_react.g.dart +++ b/lib/src/util/context.over_react.g.dart @@ -30,7 +30,7 @@ mixin $_ProviderPropsMixin on _ProviderPropsMixin { static const List $propKeys = [_$key__value___ProviderPropsMixin]; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); if (!props.containsKey('value') && @@ -77,7 +77,7 @@ mixin $_ConsumerPropsMixin on _ConsumerPropsMixin { ]; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } diff --git a/lib/src/util/safe_render_manager/safe_render_manager_helper.over_react.g.dart b/lib/src/util/safe_render_manager/safe_render_manager_helper.over_react.g.dart index f8a99d33d..25a2824d1 100644 --- a/lib/src/util/safe_render_manager/safe_render_manager_helper.over_react.g.dart +++ b/lib/src/util/safe_render_manager/safe_render_manager_helper.over_react.g.dart @@ -300,7 +300,7 @@ mixin $SafeRenderManagerHelperProps on SafeRenderManagerHelperProps { ]; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } diff --git a/test/over_react/component/abstract_transition_test.over_react.g.dart b/test/over_react/component/abstract_transition_test.over_react.g.dart index b89dfbe7c..8bd47f073 100644 --- a/test/over_react/component/abstract_transition_test.over_react.g.dart +++ b/test/over_react/component/abstract_transition_test.over_react.g.dart @@ -406,7 +406,7 @@ mixin $TransitionerPropsMixin on TransitionerPropsMixin { ]; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } diff --git a/test/over_react/component/context_test.over_react.g.dart b/test/over_react/component/context_test.over_react.g.dart index c43f9ff18..1b903f955 100644 --- a/test/over_react/component/context_test.over_react.g.dart +++ b/test/over_react/component/context_test.over_react.g.dart @@ -501,7 +501,7 @@ mixin $ContextTypeDynamicProps on ContextTypeDynamicProps { static const List $propKeys = []; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } @@ -526,7 +526,7 @@ mixin $ContextTypeWithoutDefaultProps on ContextTypeWithoutDefaultProps { static const List $propKeys = []; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } @@ -551,7 +551,7 @@ mixin $ContextTypeWithDefaultProps on ContextTypeWithDefaultProps { static const List $propKeys = []; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } diff --git a/test/over_react/component/element_type_test.over_react.g.dart b/test/over_react/component/element_type_test.over_react.g.dart index af6588461..38eb41f9e 100644 --- a/test/over_react/component/element_type_test.over_react.g.dart +++ b/test/over_react/component/element_type_test.over_react.g.dart @@ -175,7 +175,7 @@ mixin $CustomTestProps on CustomTestProps { static const List $propKeys = []; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } @@ -200,7 +200,7 @@ mixin $CustomFnTestProps on CustomFnTestProps { static const List $propKeys = []; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } 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 3920c20fe..175f6f5ae 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 @@ -276,7 +276,7 @@ mixin $ThrowingComponent2Props on ThrowingComponent2Props { static const List $propKeys = []; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } @@ -301,7 +301,7 @@ mixin $ThrowingFunctionComponentProps on ThrowingFunctionComponentProps { static const List $propKeys = []; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } @@ -326,7 +326,7 @@ mixin $ThrowingForwardRefComponentProps on ThrowingForwardRefComponentProps { static const List $propKeys = []; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } diff --git a/test/over_react/component/fixtures/lazy_load_me_props.over_react.g.dart b/test/over_react/component/fixtures/lazy_load_me_props.over_react.g.dart index 590806c8d..75246af1f 100644 --- a/test/over_react/component/fixtures/lazy_load_me_props.over_react.g.dart +++ b/test/over_react/component/fixtures/lazy_load_me_props.over_react.g.dart @@ -33,7 +33,7 @@ mixin $LazyLoadMePropsMixin on LazyLoadMePropsMixin { ]; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } diff --git a/test/over_react/component/fixtures/pure_test_components.over_react.g.dart b/test/over_react/component/fixtures/pure_test_components.over_react.g.dart index bbcf280d1..765f4d4c2 100644 --- a/test/over_react/component/fixtures/pure_test_components.over_react.g.dart +++ b/test/over_react/component/fixtures/pure_test_components.over_react.g.dart @@ -456,7 +456,7 @@ mixin $PureTestPropsMixin on PureTestPropsMixin { ]; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } @@ -508,7 +508,7 @@ mixin $SharedPureTestPropsMixin on SharedPureTestPropsMixin { ]; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } 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 8362211ec..d78ea89e5 100644 --- a/test/over_react/component/memo_test.over_react.g.dart +++ b/test/over_react/component/memo_test.over_react.g.dart @@ -220,7 +220,7 @@ mixin $FunctionCustomPropsProps on FunctionCustomPropsProps { ]; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } diff --git a/test/over_react/component/ref_util_test.over_react.g.dart b/test/over_react/component/ref_util_test.over_react.g.dart index 2d69a6f6d..55ae3552c 100644 --- a/test/over_react/component/ref_util_test.over_react.g.dart +++ b/test/over_react/component/ref_util_test.over_react.g.dart @@ -180,7 +180,7 @@ mixin $BasicProps on BasicProps { static const List $propKeys = [_$key__childId__BasicProps]; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } @@ -205,7 +205,7 @@ mixin $BasicUiFunctionProps on BasicUiFunctionProps { static const List $propKeys = []; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } diff --git a/test/over_react/component_declaration/function_type_checking_test/components.over_react.g.dart b/test/over_react/component_declaration/function_type_checking_test/components.over_react.g.dart index 5d87309dc..fac89af86 100644 --- a/test/over_react/component_declaration/function_type_checking_test/components.over_react.g.dart +++ b/test/over_react/component_declaration/function_type_checking_test/components.over_react.g.dart @@ -201,7 +201,7 @@ mixin $TestAProps on TestAProps { static const List $propKeys = []; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } @@ -226,7 +226,7 @@ mixin $TestBProps on TestBProps { static const List $propKeys = []; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } @@ -251,7 +251,7 @@ mixin $TestParentProps on TestParentProps { static const List $propKeys = []; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } @@ -276,7 +276,7 @@ mixin $TestSubtypeProps on TestSubtypeProps { static const List $propKeys = []; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } @@ -301,7 +301,7 @@ mixin $TestSubsubtypeProps on TestSubsubtypeProps { static const List $propKeys = []; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } @@ -326,7 +326,7 @@ mixin $TestExtendtypeProps on TestExtendtypeProps { static const List $propKeys = []; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } @@ -351,7 +351,7 @@ mixin $OneLevelWrapperProps on OneLevelWrapperProps { static const List $propKeys = []; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } @@ -376,7 +376,7 @@ mixin $TwoLevelWrapperProps on TwoLevelWrapperProps { static const List $propKeys = []; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } @@ -403,7 +403,7 @@ mixin $DoNotReferenceThisFactoryExceptForInASingleTestProps static const List $propKeys = []; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } @@ -429,7 +429,7 @@ mixin $TestUninitializedParentProps on TestUninitializedParentProps { static const List $propKeys = []; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } diff --git a/test/over_react/component_declaration/ui_props_self_typed_extension_test.over_react.g.dart b/test/over_react/component_declaration/ui_props_self_typed_extension_test.over_react.g.dart index b03344ddd..5b205119d 100644 --- a/test/over_react/component_declaration/ui_props_self_typed_extension_test.over_react.g.dart +++ b/test/over_react/component_declaration/ui_props_self_typed_extension_test.over_react.g.dart @@ -58,7 +58,7 @@ mixin $TestProps on TestProps { ]; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); if (!props.containsKey('TestProps.requiredProp') && diff --git a/test/over_react/util/cast_ui_factory_test.over_react.g.dart b/test/over_react/util/cast_ui_factory_test.over_react.g.dart index db131060c..2554192d0 100644 --- a/test/over_react/util/cast_ui_factory_test.over_react.g.dart +++ b/test/over_react/util/cast_ui_factory_test.over_react.g.dart @@ -173,7 +173,7 @@ mixin $BasicProps on BasicProps { static const List $propKeys = []; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } 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 cff1722a5..7715456e8 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 @@ -270,7 +270,7 @@ mixin $TestComponent2Props on TestComponent2Props { static const List $propKeys = []; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } diff --git a/test/over_react/util/js_component_test.over_react.g.dart b/test/over_react/util/js_component_test.over_react.g.dart index d586a164f..c41d800cf 100644 --- a/test/over_react/util/js_component_test.over_react.g.dart +++ b/test/over_react/util/js_component_test.over_react.g.dart @@ -72,7 +72,7 @@ mixin $TestPropsMixin on TestPropsMixin { ]; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } @@ -121,7 +121,7 @@ mixin $ASecondPropsMixin on ASecondPropsMixin { ]; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } diff --git a/test/over_react/util/prop_conversion_test.over_react.g.dart b/test/over_react/util/prop_conversion_test.over_react.g.dart index 6d5ec2589..6714c1b3c 100644 --- a/test/over_react/util/prop_conversion_test.over_react.g.dart +++ b/test/over_react/util/prop_conversion_test.over_react.g.dart @@ -190,7 +190,7 @@ mixin $ExpectsDartMapPropProps on ExpectsDartMapPropProps { ]; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } @@ -215,7 +215,7 @@ mixin $ExpectsDartStylePropProps on ExpectsDartStylePropProps { static const List $propKeys = []; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } @@ -240,7 +240,7 @@ mixin $ExpectsListChildrenPropProps on ExpectsListChildrenPropProps { static const List $propKeys = []; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } @@ -265,7 +265,7 @@ mixin $ClassComponentProps on ClassComponentProps { static const List $propKeys = []; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } @@ -290,7 +290,7 @@ mixin $BasicForwardRefProps on BasicForwardRefProps { static const List $propKeys = []; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } @@ -330,7 +330,7 @@ mixin $DartTestJsWrapperPropsMixin on DartTestJsWrapperPropsMixin { ]; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } @@ -443,7 +443,7 @@ mixin $TestJsProps on TestJsProps { ]; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } diff --git a/test/over_react_redux/fixtures/counter_fn.over_react.g.dart b/test/over_react_redux/fixtures/counter_fn.over_react.g.dart index dc091096d..ff0e970ef 100644 --- a/test/over_react_redux/fixtures/counter_fn.over_react.g.dart +++ b/test/over_react_redux/fixtures/counter_fn.over_react.g.dart @@ -34,7 +34,7 @@ mixin $CounterFnProps on CounterFnProps { ]; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } @@ -79,7 +79,7 @@ mixin $ModelCounterFnPropsMixin on ModelCounterFnPropsMixin { ]; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } @@ -124,7 +124,7 @@ mixin $CustomContextCounterFnPropsMixin on CustomContextCounterFnPropsMixin { ]; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } diff --git a/test/over_react_redux/hooks/use_dispatch_test.over_react.g.dart b/test/over_react_redux/hooks/use_dispatch_test.over_react.g.dart index 65dd014b5..a59c0a0c5 100644 --- a/test/over_react_redux/hooks/use_dispatch_test.over_react.g.dart +++ b/test/over_react_redux/hooks/use_dispatch_test.over_react.g.dart @@ -19,7 +19,7 @@ mixin $UseDispatchCounterFnProps on UseDispatchCounterFnProps { static const List $propKeys = []; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } @@ -45,7 +45,7 @@ mixin $CustomContextUseDispatchCounterFnProps static const List $propKeys = []; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } diff --git a/test/over_react_redux/hooks/use_store_test.over_react.g.dart b/test/over_react_redux/hooks/use_store_test.over_react.g.dart index 813834c73..34f72f6ac 100644 --- a/test/over_react_redux/hooks/use_store_test.over_react.g.dart +++ b/test/over_react_redux/hooks/use_store_test.over_react.g.dart @@ -19,7 +19,7 @@ mixin $UseStoreCounterFnProps on UseStoreCounterFnProps { static const List $propKeys = []; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } @@ -45,7 +45,7 @@ mixin $CustomContextUseStoreCounterFnProps static const List $propKeys = []; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } diff --git a/test/over_react_redux/store_bindings_tests.over_react.g.dart b/test/over_react_redux/store_bindings_tests.over_react.g.dart index 680589b0d..1af3ab464 100644 --- a/test/over_react_redux/store_bindings_tests.over_react.g.dart +++ b/test/over_react_redux/store_bindings_tests.over_react.g.dart @@ -47,7 +47,7 @@ mixin $TestSelectorProps on TestSelectorProps { ]; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } @@ -87,7 +87,7 @@ mixin $TestConnectPropsMixin on TestConnectPropsMixin { ]; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } From fca76c6c0c2f2ce4e700deed615c87af8ce2cafc Mon Sep 17 00:00:00 2001 From: Greg Littlefield Date: Thu, 15 Feb 2024 12:57:38 -0700 Subject: [PATCH 5/5] Update gold files after mustCallSuper changes --- .../mixin_based/basic.over_react.g.dart.goldFile | 2 +- .../basic_library.over_react.g.dart.goldFile | 6 +++--- .../basic_two_nine.over_react.g.dart.goldFile | 2 +- .../library.over_react.g.dart.goldFile | 2 +- .../mixin_based/props_mixin.over_react.g.dart.goldFile | 4 ++-- ..._with_multiple_factories.over_react.g.dart.goldfile | 2 +- .../type_parameters.over_react.g.dart.goldFile | 10 +++++----- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/test_fixtures/gold_output_files/mixin_based/basic.over_react.g.dart.goldFile b/test_fixtures/gold_output_files/mixin_based/basic.over_react.g.dart.goldFile index 11e41a2dc..f1b67ab9b 100644 --- a/test_fixtures/gold_output_files/mixin_based/basic.over_react.g.dart.goldFile +++ b/test_fixtures/gold_output_files/mixin_based/basic.over_react.g.dart.goldFile @@ -239,7 +239,7 @@ mixin $BasicProps on BasicProps { ]; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } diff --git a/test_fixtures/gold_output_files/mixin_based/basic_library.over_react.g.dart.goldFile b/test_fixtures/gold_output_files/mixin_based/basic_library.over_react.g.dart.goldFile index 919a9c5ac..0e694d21a 100644 --- a/test_fixtures/gold_output_files/mixin_based/basic_library.over_react.g.dart.goldFile +++ b/test_fixtures/gold_output_files/mixin_based/basic_library.over_react.g.dart.goldFile @@ -352,7 +352,7 @@ mixin $BasicPartOfLibPropsMixin on BasicPartOfLibPropsMixin { ]; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } @@ -592,7 +592,7 @@ mixin $SuperPartOfLibPropsMixin on SuperPartOfLibPropsMixin { ]; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } @@ -631,7 +631,7 @@ mixin $SubPartOfLibPropsMixin on SubPartOfLibPropsMixin { ]; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } diff --git a/test_fixtures/gold_output_files/mixin_based/basic_two_nine.over_react.g.dart.goldFile b/test_fixtures/gold_output_files/mixin_based/basic_two_nine.over_react.g.dart.goldFile index 3fbc47bd2..387beddcb 100644 --- a/test_fixtures/gold_output_files/mixin_based/basic_two_nine.over_react.g.dart.goldFile +++ b/test_fixtures/gold_output_files/mixin_based/basic_two_nine.over_react.g.dart.goldFile @@ -239,7 +239,7 @@ mixin $BasicProps on BasicProps { ]; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } diff --git a/test_fixtures/gold_output_files/mixin_based/missing_over_react_g_part/library.over_react.g.dart.goldFile b/test_fixtures/gold_output_files/mixin_based/missing_over_react_g_part/library.over_react.g.dart.goldFile index b839e80e9..fb156ca2a 100644 --- a/test_fixtures/gold_output_files/mixin_based/missing_over_react_g_part/library.over_react.g.dart.goldFile +++ b/test_fixtures/gold_output_files/mixin_based/missing_over_react_g_part/library.over_react.g.dart.goldFile @@ -189,7 +189,7 @@ mixin $BasicPartOfLibProps on BasicPartOfLibProps { static const List $propKeys = [_$key__basicProp__BasicPartOfLibProps]; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } diff --git a/test_fixtures/gold_output_files/mixin_based/props_mixin.over_react.g.dart.goldFile b/test_fixtures/gold_output_files/mixin_based/props_mixin.over_react.g.dart.goldFile index e5c6c8e62..ebfd5ee4f 100644 --- a/test_fixtures/gold_output_files/mixin_based/props_mixin.over_react.g.dart.goldFile +++ b/test_fixtures/gold_output_files/mixin_based/props_mixin.over_react.g.dart.goldFile @@ -32,7 +32,7 @@ mixin $ExamplePropsMixin on ExamplePropsMixin { static const List $propKeys = [_$key__propMixin1__ExamplePropsMixin]; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } @@ -74,7 +74,7 @@ mixin $RequiresOtherMixinPropsMixin ]; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } diff --git a/test_fixtures/gold_output_files/mixin_based/two_nine_with_multiple_factories.over_react.g.dart.goldfile b/test_fixtures/gold_output_files/mixin_based/two_nine_with_multiple_factories.over_react.g.dart.goldfile index 3f45ea6f4..7342553c6 100644 --- a/test_fixtures/gold_output_files/mixin_based/two_nine_with_multiple_factories.over_react.g.dart.goldfile +++ b/test_fixtures/gold_output_files/mixin_based/two_nine_with_multiple_factories.over_react.g.dart.goldfile @@ -184,7 +184,7 @@ mixin $CounterPropsMixin on CounterPropsMixin { static const List $propKeys = []; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } diff --git a/test_fixtures/gold_output_files/mixin_based/type_parameters.over_react.g.dart.goldFile b/test_fixtures/gold_output_files/mixin_based/type_parameters.over_react.g.dart.goldFile index f5dff5ea9..62510e51e 100644 --- a/test_fixtures/gold_output_files/mixin_based/type_parameters.over_react.g.dart.goldFile +++ b/test_fixtures/gold_output_files/mixin_based/type_parameters.over_react.g.dart.goldFile @@ -20,7 +20,7 @@ mixin $NoneProps on NoneProps { static const List $propKeys = []; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } @@ -52,7 +52,7 @@ mixin $SingleProps on SingleProps { static const List $propKeys = [_$key__single__SingleProps]; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } @@ -96,7 +96,7 @@ mixin $SingleThatWontBeSpecifiedProps on SingleThatWontBeSpecifiedProps { ]; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } @@ -135,7 +135,7 @@ mixin $SingleWithBoundProps on SingleWithBoundProps { ]; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); } @@ -180,7 +180,7 @@ mixin $DoubleProps on DoubleProps { ]; @override - @mustCallSuper + @UiProps.$mustCallSuper void validateRequiredProps() { super.validateRequiredProps(); }