From 680a8ed3c31322056357808fa4d32656a493fd8b Mon Sep 17 00:00:00 2001 From: Kent Boogaart Date: Mon, 13 Jan 2025 13:56:35 +1000 Subject: [PATCH] chore: prepare 3.0.1 release --- analysis_options.yaml | 4 - lib/humanizer.dart | 2 +- lib/src/units_of_measurement/area.dart | 44 ++--- lib/src/units_of_measurement/information.dart | 45 ++--- lib/src/units_of_measurement/length.dart | 45 ++--- lib/src/units_of_measurement/quantity.dart | 45 ++--- lib/src/units_of_measurement/shared.dart | 8 +- lib/src/units_of_measurement/temperature.dart | 45 ++--- lib/src/units_of_measurement/time.dart | 44 ++--- lib/src/units_of_measurement/volume.dart | 45 ++--- lib/src/units_of_measurement/weight.dart | 45 ++--- pubspec.lock | 180 +++++++++--------- pubspec.yaml | 6 +- .../src/units_of_measurement/shared_test.dart | 45 ++--- 14 files changed, 237 insertions(+), 366 deletions(-) diff --git a/analysis_options.yaml b/analysis_options.yaml index a01c94a..bcec687 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -5,7 +5,6 @@ linter: # See this related issue: https://github.com/dart-lang/pedantic/issues/23 rules: # Error rules - - avoid_returning_null_for_future - avoid_slow_async_io - cancel_subscriptions - close_sinks @@ -13,8 +12,6 @@ linter: - control_flow_in_finally - empty_statements - hash_and_equals - - iterable_contains_unrelated_type - - list_remove_unrelated_type - literal_only_boolean_expressions - no_adjacent_strings_in_list - prefer_void_to_null @@ -28,7 +25,6 @@ linter: - always_declare_return_types - always_put_control_body_on_new_line - always_put_required_named_parameters_first - - always_require_non_null_named_parameters - annotate_overrides - avoid_bool_literals_in_conditional_expressions - avoid_catches_without_on_clauses diff --git a/lib/humanizer.dart b/lib/humanizer.dart index 852bdc6..14c05fb 100644 --- a/lib/humanizer.dart +++ b/lib/humanizer.dart @@ -1,5 +1,5 @@ /// A Dart library to convert values into human-friendly [String]s. -library humanizer; +library; export 'src/transformations/approximate_time.dart'; export 'src/transformations/approximate_time_extensions.dart'; diff --git a/lib/src/units_of_measurement/area.dart b/lib/src/units_of_measurement/area.dart index 8c69dd1..c628ca2 100644 --- a/lib/src/units_of_measurement/area.dart +++ b/lib/src/units_of_measurement/area.dart @@ -6,7 +6,7 @@ import 'package:meta/meta.dart'; /// A unit of measurement representing a two-dimensional area. class Area extends UnitOfMeasurement { /// Creates an [Area] given a [unit] and rational [value] for that unit. - Area.fromUnits(AreaUnit unit, Rational value) : super.fromUnits(unit, value); + Area.fromUnits(super.unit, super.value) : super.fromUnits(); /// Creates an [Area] representing the specified number of [squareNanometers]. factory Area.fromSquareNanometers(Rational squareNanometers) => @@ -422,12 +422,9 @@ extension AreaUnitExtensions on AreaUnit { /// Represents a rate of change in [Area]. class AreaRate extends UnitOfMeasurementRate { const AreaRate._({ - required Area value, - required Duration period, - }) : super( - value: value, - period: period, - ); + required super.value, + required super.period, + }) : super(); static final _defaultFormat = AreaRateFormat(); @@ -477,15 +474,12 @@ class AreaRate extends UnitOfMeasurementRate { /// * [UnitOfMeasurementFormat] class AreaFormat extends _BaseAreaFormat { AreaFormat({ - String pattern = + super.pattern = '0.##${UnitOfMeasurementFormat.valueUnitSymbolFormatSpecifier}', - Set permissibleValueUnits = AreaUnits.commonSi, - String? locale, + super.permissibleValueUnits = AreaUnits.commonSi, + super.locale, }) : super._( - pattern: pattern, - permissibleValueUnits: permissibleValueUnits, permissibleRateUnits: const {}, - locale: locale, ); @override @@ -522,17 +516,12 @@ class AreaFormat extends _BaseAreaFormat { /// * [AreaFormat] class AreaRateFormat extends _BaseAreaFormat { AreaRateFormat({ - String pattern = + super.pattern = "0.##${UnitOfMeasurementFormat.valueUnitSymbolFormatSpecifier}'/'${UnitOfMeasurementFormat.rateUnitSymbolFormatSpecifier}", - Set permissibleValueUnits = AreaUnits.commonSi, - Set permissibleRateUnits = RateUnits.hourOrLess, - String? locale, - }) : super._( - pattern: pattern, - permissibleValueUnits: permissibleValueUnits, - permissibleRateUnits: permissibleRateUnits, - locale: locale, - ); + super.permissibleValueUnits = AreaUnits.commonSi, + super.permissibleRateUnits = RateUnits.hourOrLess, + super.locale, + }) : super._(); @override AreaUnit getLargestUnit(AreaRate input) => @@ -556,14 +545,11 @@ class AreaRateFormat extends _BaseAreaFormat { abstract class _BaseAreaFormat extends UnitOfMeasurementFormat { _BaseAreaFormat._({ - required String pattern, + required super.pattern, required this.permissibleValueUnits, required this.permissibleRateUnits, - required String? locale, - }) : super( - pattern: pattern, - locale: locale, - ); + required super.locale, + }) : super(); final Set permissibleValueUnits; final Set permissibleRateUnits; diff --git a/lib/src/units_of_measurement/information.dart b/lib/src/units_of_measurement/information.dart index 2a7f648..1d32aab 100644 --- a/lib/src/units_of_measurement/information.dart +++ b/lib/src/units_of_measurement/information.dart @@ -7,8 +7,7 @@ import 'package:meta/meta.dart'; class InformationSize extends UnitOfMeasurement { /// Creates an [InformationSize] given a [unit] and rational [value] for that unit. - InformationSize.fromUnits(InformationUnit unit, Rational value) - : super.fromUnits(unit, value); + InformationSize.fromUnits(super.unit, super.value) : super.fromUnits(); /// Creates an [InformationSize] representing the specified number of [bits]. factory InformationSize.fromBits(Rational bits) => @@ -756,12 +755,9 @@ extension InformationUnitExtensions on InformationUnit { /// Represents a rate of transfer of [InformationSize]. class InformationRate extends UnitOfMeasurementRate { const InformationRate._({ - required InformationSize value, - required Duration period, - }) : super( - value: value, - period: period, - ); + required super.value, + required super.period, + }) : super(); static final _defaultFormat = InformationRateFormat(); @@ -835,15 +831,12 @@ class InformationRate extends UnitOfMeasurementRate { /// * [UnitOfMeasurementFormat] class InformationSizeFormat extends _BaseInformationFormat { InformationSizeFormat({ - String pattern = + super.pattern = '0.##${UnitOfMeasurementFormat.valueUnitSymbolFormatSpecifier}', - Set permissibleValueUnits = InformationUnits.iecBytes, - String? locale, + super.permissibleValueUnits = InformationUnits.iecBytes, + super.locale, }) : super._( - pattern: pattern, - permissibleValueUnits: permissibleValueUnits, permissibleRateUnits: const {}, - locale: locale, ); @override @@ -885,17 +878,12 @@ class InformationSizeFormat extends _BaseInformationFormat { /// * [InformationSizeFormat] class InformationRateFormat extends _BaseInformationFormat { InformationRateFormat({ - String pattern = + super.pattern = "0.##${UnitOfMeasurementFormat.valueUnitSymbolFormatSpecifier}'/'${UnitOfMeasurementFormat.rateUnitSymbolFormatSpecifier}", - Set permissibleValueUnits = InformationUnits.iecBytes, - Set permissibleRateUnits = RateUnits.hourOrLess, - String? locale, - }) : super._( - pattern: pattern, - permissibleValueUnits: permissibleValueUnits, - permissibleRateUnits: permissibleRateUnits, - locale: locale, - ); + super.permissibleValueUnits = InformationUnits.iecBytes, + super.permissibleRateUnits = RateUnits.hourOrLess, + super.locale, + }) : super._(); @override InformationUnit getLargestUnit(InformationRate input) => @@ -919,14 +907,11 @@ class InformationRateFormat extends _BaseInformationFormat { abstract class _BaseInformationFormat extends UnitOfMeasurementFormat { _BaseInformationFormat._({ - required String pattern, + required super.pattern, required this.permissibleValueUnits, required this.permissibleRateUnits, - required String? locale, - }) : super( - pattern: pattern, - locale: locale, - ); + required super.locale, + }) : super(); final Set permissibleValueUnits; final Set permissibleRateUnits; diff --git a/lib/src/units_of_measurement/length.dart b/lib/src/units_of_measurement/length.dart index 7709903..7cd42d9 100644 --- a/lib/src/units_of_measurement/length.dart +++ b/lib/src/units_of_measurement/length.dart @@ -6,8 +6,7 @@ import 'package:meta/meta.dart'; /// A unit of measurement representing a one-dimensional length. class Length extends UnitOfMeasurement { /// Creates a [Length] given a [unit] and rational [value] for that unit. - Length.fromUnits(LengthUnit unit, Rational value) - : super.fromUnits(unit, value); + Length.fromUnits(super.unit, super.value) : super.fromUnits(); /// Creates a [Length] representing the specified number of [nanometers]. factory Length.fromNanometers(Rational nanometers) => @@ -403,12 +402,9 @@ extension LengthUnitExtensions on LengthUnit { /// Represents a rate of change in [Length] (a.k.a. a speed). class LengthRate extends UnitOfMeasurementRate { const LengthRate._({ - required Length value, - required Duration period, - }) : super( - value: value, - period: period, - ); + required super.value, + required super.period, + }) : super(); static final _defaultFormat = LengthRateFormat(); @@ -457,15 +453,12 @@ class LengthRate extends UnitOfMeasurementRate { /// * [UnitOfMeasurementFormat] class LengthFormat extends _BaseLengthFormat { LengthFormat({ - String pattern = + super.pattern = '0.##${UnitOfMeasurementFormat.valueUnitSymbolFormatSpecifier}', - Set permissibleValueUnits = LengthUnits.commonSi, - String? locale, + super.permissibleValueUnits = LengthUnits.commonSi, + super.locale, }) : super._( - pattern: pattern, - permissibleValueUnits: permissibleValueUnits, permissibleRateUnits: const {}, - locale: locale, ); @override @@ -506,17 +499,12 @@ class LengthFormat extends _BaseLengthFormat { /// * [LengthFormat] class LengthRateFormat extends _BaseLengthFormat { LengthRateFormat({ - String pattern = + super.pattern = "0.##${UnitOfMeasurementFormat.valueUnitSymbolFormatSpecifier}'/'${UnitOfMeasurementFormat.rateUnitSymbolFormatSpecifier}", - Set permissibleValueUnits = LengthUnits.commonSi, - Set permissibleRateUnits = RateUnits.hourOrLess, - String? locale, - }) : super._( - pattern: pattern, - permissibleValueUnits: permissibleValueUnits, - permissibleRateUnits: permissibleRateUnits, - locale: locale, - ); + super.permissibleValueUnits = LengthUnits.commonSi, + super.permissibleRateUnits = RateUnits.hourOrLess, + super.locale, + }) : super._(); @override LengthUnit getLargestUnit(LengthRate input) => @@ -540,14 +528,11 @@ class LengthRateFormat extends _BaseLengthFormat { abstract class _BaseLengthFormat extends UnitOfMeasurementFormat { _BaseLengthFormat._({ - required String pattern, + required super.pattern, required this.permissibleValueUnits, required this.permissibleRateUnits, - required String? locale, - }) : super( - pattern: pattern, - locale: locale, - ); + required super.locale, + }) : super(); final Set permissibleValueUnits; final Set permissibleRateUnits; diff --git a/lib/src/units_of_measurement/quantity.dart b/lib/src/units_of_measurement/quantity.dart index f5f1ca1..a4ab893 100644 --- a/lib/src/units_of_measurement/quantity.dart +++ b/lib/src/units_of_measurement/quantity.dart @@ -7,8 +7,7 @@ import 'package:meta/meta.dart'; /// means it is a quantity that has no corresponding physical dimension associated with it. class Quantity extends UnitOfMeasurement { /// Creates a [Quantity] given a [unit] and rational [value] for that unit. - Quantity.fromUnits(QuantityUnit unit, Rational value) - : super.fromUnits(unit, value); + Quantity.fromUnits(super.unit, super.value) : super.fromUnits(); /// Creates a [Quantity] representing the specified number of [ones]. factory Quantity.fromOnes(Rational ones) => @@ -167,12 +166,9 @@ extension QuantityUnitExtensions on QuantityUnit { /// Represents a rate of change in [Quantity]. class QuantityRate extends UnitOfMeasurementRate { const QuantityRate._({ - required Quantity value, - required Duration period, - }) : super( - value: value, - period: period, - ); + required super.value, + required super.period, + }) : super(); static final _defaultFormat = QuantityRateFormat(); @@ -210,15 +206,12 @@ class QuantityRate extends UnitOfMeasurementRate { /// * [UnitOfMeasurementFormat] class QuantityFormat extends _BaseQuantityFormat { QuantityFormat({ - String pattern = + super.pattern = '0.##${UnitOfMeasurementFormat.valueUnitSymbolFormatSpecifier}', - Set permissibleValueUnits = QuantityUnits.all, - String? locale, + super.permissibleValueUnits = QuantityUnits.all, + super.locale, }) : super._( - pattern: pattern, - permissibleValueUnits: permissibleValueUnits, permissibleRateUnits: const {}, - locale: locale, ); @override @@ -263,17 +256,12 @@ class QuantityFormat extends _BaseQuantityFormat { /// * [QuantityFormat] class QuantityRateFormat extends _BaseQuantityFormat { QuantityRateFormat({ - String pattern = + super.pattern = "0.##${UnitOfMeasurementFormat.valueUnitSymbolFormatSpecifier}'/'${UnitOfMeasurementFormat.rateUnitSymbolFormatSpecifier}", - Set permissibleValueUnits = QuantityUnits.all, - Set permissibleRateUnits = RateUnits.hourOrLess, - String? locale, - }) : super._( - pattern: pattern, - permissibleValueUnits: permissibleValueUnits, - permissibleRateUnits: permissibleRateUnits, - locale: locale, - ); + super.permissibleValueUnits = QuantityUnits.all, + super.permissibleRateUnits = RateUnits.hourOrLess, + super.locale, + }) : super._(); @override QuantityUnit getLargestUnit(QuantityRate input) => @@ -297,14 +285,11 @@ class QuantityRateFormat extends _BaseQuantityFormat { abstract class _BaseQuantityFormat extends UnitOfMeasurementFormat { _BaseQuantityFormat._({ - required String pattern, + required super.pattern, required this.permissibleValueUnits, required this.permissibleRateUnits, - required String? locale, - }) : super( - pattern: pattern, - locale: locale, - ); + required super.locale, + }) : super(); final Set permissibleValueUnits; final Set permissibleRateUnits; diff --git a/lib/src/units_of_measurement/shared.dart b/lib/src/units_of_measurement/shared.dart index 04259a6..bf06527 100644 --- a/lib/src/units_of_measurement/shared.dart +++ b/lib/src/units_of_measurement/shared.dart @@ -760,7 +760,7 @@ abstract class _FixedValueUnitNode extends _Node { class _FixedValueUnitSymbolNode extends _FixedValueUnitNode { - _FixedValueUnitSymbolNode(TValueUnit unit) : super(unit); + _FixedValueUnitSymbolNode(super.unit) : super(); @override String evaluate(_NodeEvaluationContext context) => @@ -769,7 +769,7 @@ class _FixedValueUnitSymbolNode class _FixedValueUnitNameNode extends _FixedValueUnitNode { - _FixedValueUnitNameNode(TValueUnit unit) : super(unit); + _FixedValueUnitNameNode(super.unit) : super(); @override String evaluate(_NodeEvaluationContext context) => @@ -815,7 +815,7 @@ abstract class _FixedRateUnitNode extends _Node { class _FixedRateUnitSymbolNode extends _FixedRateUnitNode { - _FixedRateUnitSymbolNode(RateUnit unit) : super(unit); + _FixedRateUnitSymbolNode(super.unit) : super(); @override String evaluate(_NodeEvaluationContext context) => @@ -826,7 +826,7 @@ class _FixedRateUnitSymbolNode class _FixedRateUnitNameNode extends _FixedRateUnitNode { - _FixedRateUnitNameNode(RateUnit unit) : super(unit); + _FixedRateUnitNameNode(super.unit) : super(); @override String evaluate(_NodeEvaluationContext context) => diff --git a/lib/src/units_of_measurement/temperature.dart b/lib/src/units_of_measurement/temperature.dart index d41ad46..0a62ab1 100644 --- a/lib/src/units_of_measurement/temperature.dart +++ b/lib/src/units_of_measurement/temperature.dart @@ -6,8 +6,7 @@ import 'package:meta/meta.dart'; /// A unit of measurement representing a temperature. class Temperature extends UnitOfMeasurement { /// Creates a [Temperature] given a [unit] and rational [value] for that unit. - Temperature.fromUnits(TemperatureUnit unit, Rational value) - : super.fromUnits(unit, value); + Temperature.fromUnits(super.unit, super.value) : super.fromUnits(); /// Creates a [Temperature] representing the specified number of [nanokelvins]. factory Temperature.fromNanokelvins(Rational nanokelvins) => @@ -273,12 +272,9 @@ extension TemperatureUnitExtensions on TemperatureUnit { /// Represents a rate of change in [Temperature]. class TemperatureRate extends UnitOfMeasurementRate { const TemperatureRate._({ - required Temperature value, - required Duration period, - }) : super( - value: value, - period: period, - ); + required super.value, + required super.period, + }) : super(); static final _defaultFormat = TemperatureRateFormat(); @@ -322,15 +318,12 @@ class TemperatureRate extends UnitOfMeasurementRate { /// * [UnitOfMeasurementFormat] class TemperatureFormat extends _BaseTemperatureFormat { TemperatureFormat({ - String pattern = + super.pattern = '0.##${UnitOfMeasurementFormat.valueUnitSymbolFormatSpecifier}', - Set permissibleValueUnits = TemperatureUnits.celsius, - String? locale, + super.permissibleValueUnits = TemperatureUnits.celsius, + super.locale, }) : super._( - pattern: pattern, - permissibleValueUnits: permissibleValueUnits, permissibleRateUnits: const {}, - locale: locale, ); @override @@ -372,17 +365,12 @@ class TemperatureFormat extends _BaseTemperatureFormat { /// * [TemperatureFormat] class TemperatureRateFormat extends _BaseTemperatureFormat { TemperatureRateFormat({ - String pattern = + super.pattern = "0.##${UnitOfMeasurementFormat.valueUnitSymbolFormatSpecifier}'/'${UnitOfMeasurementFormat.rateUnitSymbolFormatSpecifier}", - Set permissibleValueUnits = TemperatureUnits.celsius, - Set permissibleRateUnits = RateUnits.hourOrLess, - String? locale, - }) : super._( - pattern: pattern, - permissibleValueUnits: permissibleValueUnits, - permissibleRateUnits: permissibleRateUnits, - locale: locale, - ); + super.permissibleValueUnits = TemperatureUnits.celsius, + super.permissibleRateUnits = RateUnits.hourOrLess, + super.locale, + }) : super._(); @override TemperatureUnit getLargestUnit(TemperatureRate input) => @@ -406,14 +394,11 @@ class TemperatureRateFormat extends _BaseTemperatureFormat { abstract class _BaseTemperatureFormat extends UnitOfMeasurementFormat { _BaseTemperatureFormat._({ - required String pattern, + required super.pattern, required this.permissibleValueUnits, required this.permissibleRateUnits, - required String? locale, - }) : super( - pattern: pattern, - locale: locale, - ); + required super.locale, + }) : super(); final Set permissibleValueUnits; final Set permissibleRateUnits; diff --git a/lib/src/units_of_measurement/time.dart b/lib/src/units_of_measurement/time.dart index 1705ead..4275d2d 100644 --- a/lib/src/units_of_measurement/time.dart +++ b/lib/src/units_of_measurement/time.dart @@ -6,7 +6,7 @@ import 'package:meta/meta.dart'; /// A unit of measurement representing time. class Time extends UnitOfMeasurement { /// Creates a [Time] given a [unit] and rational [value] for that unit. - Time.fromUnits(TimeUnit unit, Rational value) : super.fromUnits(unit, value); + Time.fromUnits(super.unit, super.value) : super.fromUnits(); /// Creates a [Time] representing the specified number of [nanoseconds]. factory Time.fromNanoseconds(Rational nanoseconds) => @@ -377,12 +377,9 @@ extension TimeUnitExtensions on TimeUnit { /// Represents a rate of change in [Time]. class TimeRate extends UnitOfMeasurementRate