diff --git a/lib/dart_scope.dart b/lib/dart_scope.dart index 160d115..8e1d1cc 100644 --- a/lib/dart_scope.dart +++ b/lib/dart_scope.dart @@ -50,6 +50,6 @@ export 'src/dart_scope/dart_scope.dart' ScopePush, ConfigurableScope, Scope, - ValueDispose, + DisposeValue, ValueExpose, Equal; diff --git a/lib/src/dart_scope/configurables/async_final.dart b/lib/src/dart_scope/configurables/async_final.dart index 26596aa..7de73ea 100644 --- a/lib/src/dart_scope/configurables/async_final.dart +++ b/lib/src/dart_scope/configurables/async_final.dart @@ -13,7 +13,7 @@ class AsyncFinal implements Configurable { Object? name, required Equal> equal, ValueExpose? expose, - ValueDispose? dispose, + DisposeValue? dispose, }): _name = name, _equal = equal, _expose = expose, @@ -22,7 +22,7 @@ class AsyncFinal implements Configurable { final Object? _name; final Equal> _equal; final ValueExpose? _expose; - final ValueDispose? _dispose; + final DisposeValue? _dispose; @override FutureOr configure(ConfigurableScope scope) async { diff --git a/lib/src/dart_scope/configurables/final.dart b/lib/src/dart_scope/configurables/final.dart index b2d4cf8..d2e7d58 100644 --- a/lib/src/dart_scope/configurables/final.dart +++ b/lib/src/dart_scope/configurables/final.dart @@ -13,7 +13,7 @@ class Final implements Configurable { Object? name, required Equal equal, ValueExpose? expose, - ValueDispose? dispose, + DisposeValue? dispose, bool lazy = true, }): _name = name, _equal = equal, @@ -24,7 +24,7 @@ class Final implements Configurable { final Object? _name; final Equal _equal; final ValueExpose? _expose; - final ValueDispose? _dispose; + final DisposeValue? _dispose; final bool _lazy; @override diff --git a/lib/src/dart_scope/configurables/final_states.dart b/lib/src/dart_scope/configurables/final_states.dart index 6afc7ee..c1086fd 100644 --- a/lib/src/dart_scope/configurables/final_states.dart +++ b/lib/src/dart_scope/configurables/final_states.dart @@ -34,6 +34,6 @@ ValueExpose> _superExpose(Object? name) { }; } -ValueDispose> _superDispose() { +DisposeValue> _superDispose() { return (activated) => activated.dispose(); } diff --git a/lib/src/dart_scope/configurables/final_states_convertible.dart b/lib/src/dart_scope/configurables/final_states_convertible.dart index 9b866b5..73ccf14 100644 --- a/lib/src/dart_scope/configurables/final_states_convertible.dart +++ b/lib/src/dart_scope/configurables/final_states_convertible.dart @@ -24,7 +24,7 @@ class FinalStatesConvertible implements Configurable { Object? statesName, required States Function(T it) statesEqual, StatesConvertibleExpose? expose, - ValueDispose? dispose, + DisposeValue? dispose, bool lazy = true, }): _name = name, _equal = equal, @@ -39,7 +39,7 @@ class FinalStatesConvertible implements Configurable { final Object? _statesName; final States Function(T it) _statesEqual; final StatesConvertibleExpose? _expose; - final ValueDispose? _dispose; + final DisposeValue? _dispose; final bool _lazy; @override diff --git a/lib/src/dart_scope/dart_scope.dart b/lib/src/dart_scope/dart_scope.dart index c02251b..cca3013 100644 --- a/lib/src/dart_scope/dart_scope.dart +++ b/lib/src/dart_scope/dart_scope.dart @@ -62,6 +62,6 @@ export 'scopes/scope.dart' Scope; export 'shared/typedefs.dart' show - ValueDispose, + DisposeValue, ValueExpose, Equal; diff --git a/lib/src/dart_scope/shared/expose_in_scope.dart b/lib/src/dart_scope/shared/expose_in_scope.dart index fe3c6f9..edbf87c 100644 --- a/lib/src/dart_scope/shared/expose_in_scope.dart +++ b/lib/src/dart_scope/shared/expose_in_scope.dart @@ -12,7 +12,7 @@ void exposeInScope({ required Object? name, required Getter getValue, required ValueExpose? expose, - required ValueDispose? dispose, + required DisposeValue? dispose, }) { final valueExpose = expose ?? defaultExpose(name); diff --git a/lib/src/dart_scope/shared/typedefs.dart b/lib/src/dart_scope/shared/typedefs.dart index e8f6cee..b16ab64 100644 --- a/lib/src/dart_scope/shared/typedefs.dart +++ b/lib/src/dart_scope/shared/typedefs.dart @@ -4,6 +4,6 @@ import 'package:typedef_foundation/typedef_foundation.dart'; import '../scope_methods/scope_expose.dart'; import '../scope_methods/scope_get.dart'; -typedef ValueDispose = void Function(T); +typedef DisposeValue = void Function(T); typedef ValueExpose = void Function(ScopeExpose scope, Getter getValue); typedef Equal = T Function(ScopeGet scope);